svn commit: r348094 - head/security/libscrypt

[Steve Wills]

Author: swills
Date: Thu Mar 13 16:07:38 2014
New Revision: 348094
URL: http://svnweb.freebsd.org/changeset/ports/348094
QAT: https://qat.redports.org/buildarchive/r348094/

Log:
  - Version update to 1.18
  - Remove STATIC lib
  - Change REINPLACE for CC, CFLAGS, LDFLAGS and LIBDIR
  - Remove CFLAGS, now in REINPLACE
  - Strip library
  
  PR:		ports/187513
  Submitted by:	Horia Racoviceanu <horia at racoviceanu.com> (maintainer)

Modified:
  head/security/libscrypt/Makefile
  head/security/libscrypt/distinfo

Modified: head/security/libscrypt/Makefile
==============================================================================
--- head/security/libscrypt/Makefile	Thu Mar 13 16:01:10 2014	(r348093)
+++ head/security/libscrypt/Makefile	Thu Mar 13 16:07:38 2014	(r348094)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libscrypt
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.18
 CATEGORIES=	security
 
 MAINTAINER=	horia at 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>

Modified: head/security/libscrypt/distinfo
==============================================================================
--- head/security/libscrypt/distinfo	Thu Mar 13 16:01:10 2014	(r348093)
+++ head/security/libscrypt/distinfo	Thu Mar 13 16:07:38 2014	(r348094)
@@ -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