aboutsummaryrefslogtreecommitdiff
path: root/security/libscrypt
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2014-03-13 16:07:38 +0000
committerSteve Wills <swills@FreeBSD.org>2014-03-13 16:07:38 +0000
commit5ac3e734164541772a75d0cd1667960651d5290f (patch)
tree213da1875b33c70528816d60ac8a3ea0e37bd61c /security/libscrypt
parent3defa59ccb1f69572abe9f21600e85ba2600114f (diff)
downloadports-5ac3e734164541772a75d0cd1667960651d5290f.tar.gz
ports-5ac3e734164541772a75d0cd1667960651d5290f.zip
Notes
Diffstat (limited to 'security/libscrypt')
-rw-r--r--security/libscrypt/Makefile25
-rw-r--r--security/libscrypt/distinfo4
2 files changed, 13 insertions, 16 deletions
diff --git a/security/libscrypt/Makefile b/security/libscrypt/Makefile
index e44dad11f2c0..025e4adc7a17 100644
--- a/security/libscrypt/Makefile
+++ b/security/libscrypt/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libscrypt
-PORTVERSION= 1.14
-PORTREVISION= 1
+PORTVERSION= 1.18
CATEGORIES= security
MAINTAINER= horia@racoviceanu.com
@@ -16,22 +15,24 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= technion
GH_TAGNAME= ${GH_COMMIT}
-GH_COMMIT= 8e6966e
+GH_COMMIT= 35b6894
PLIST_FILES= include/libscrypt.h \
- lib/libscrypt.a \
lib/libscrypt.so \
lib/libscrypt.so.0
PORTDOCS= README.md
-
OPTIONS_DEFINE= DOCS
+.include <bsd.port.pre.mk>
+
post-patch:
- @${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s|$$| ${CFLAGS}|' \
- -e 's|/usr/local|${PREFIX}| ; \
- s|install: library|& install-static| ; \
- s|$$(LDFLAGS)||' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|CC?=gcc|CC?=${CC}|; s|CFLAGS?=|CFLAGS+=|; \
+ s|LIBDIR ?|LIBDIR |' ${WRKSRC}/Makefile
+
+.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc
+ @${REINPLACE_CMD} -e 's|stack-protector|no-&|' ${WRKSRC}/Makefile
+.endif
regression-test: build
(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
@@ -40,10 +41,6 @@ post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc
-CFLAGS+= -fno-stack-protector
-.endif
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0
.include <bsd.port.post.mk>
diff --git a/security/libscrypt/distinfo b/security/libscrypt/distinfo
index 488c5a25964a..1fa0dc8800f6 100644
--- a/security/libscrypt/distinfo
+++ b/security/libscrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.14.tar.gz) = 08d9f83eee4f2eb00c740357fd3648ce7d038ba4b5af2ee9fdc4319f76113e8b
-SIZE (libscrypt-1.14.tar.gz) = 20562
+SHA256 (libscrypt-1.18.tar.gz) = 5c8c59cc76bbbcb9d674fb72a668938cd2d6c5e1d5a302a8dc83f541f33b65ea
+SIZE (libscrypt-1.18.tar.gz) = 17418