From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 13 16:07:39 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0C4DFF4E;
 Thu, 13 Mar 2014 16:07:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4645C08;
 Thu, 13 Mar 2014 16:07:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2DG7cLv066531;
 Thu, 13 Mar 2014 16:07:38 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2DG7cOb066529;
 Thu, 13 Mar 2014 16:07:38 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201403131607.s2DG7cOb066529@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 13 Mar 2014 16:07:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348094 - head/security/libscrypt
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Mar 2014 16:07:39 -0000

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@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@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