From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 16 16:50:00 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 22B65F41;
 Mon, 16 Dec 2013 16:50:00 +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 E7DCF11F0;
 Mon, 16 Dec 2013 16:49:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGGnxIU019725;
 Mon, 16 Dec 2013 16:49:59 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGGnxTA019724;
 Mon, 16 Dec 2013 16:49:59 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201312161649.rBGGnxTA019724@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Mon, 16 Dec 2013 16:49:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336645 - 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: Mon, 16 Dec 2013 16:50:00 -0000

Author: nemysis
Date: Mon Dec 16 16:49:59 2013
New Revision: 336645
URL: http://svnweb.freebsd.org/changeset/ports/336645

Log:
  - Bump PORTREVISION
  - Change license BSD --> BSD2CLAUSE
  - Add USES compiler
  - Add DOCS and Option
  - Change REINPLACE_CMD
  - Fix build, tabs
  - Support STAGEDIR
  
  PR:		ports/184723
  Submitted by:	Reed Loefgren <rloefgren@forethought.net>
  Approved by:	wg (mentor)

Modified:
  head/security/libscrypt/Makefile

Modified: head/security/libscrypt/Makefile
==============================================================================
--- head/security/libscrypt/Makefile	Mon Dec 16 15:49:55 2013	(r336644)
+++ head/security/libscrypt/Makefile	Mon Dec 16 16:49:59 2013	(r336645)
@@ -3,40 +3,47 @@
 
 PORTNAME=	libscrypt
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	C library for the scrypt key derivation function
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
-NO_STAGE=	yes
+USES=		compiler
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
-GH_COMMIT=	8e6966e
 GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	8e6966e
 
 PLIST_FILES=	include/libscrypt.h \
 		lib/libscrypt.a \
 		lib/libscrypt.so \
 		lib/libscrypt.so.0
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s,$$, ${CFLAGS},' \
-		-e 's,/usr/local,${PREFIX},' -e 's,install: library,& install-static,' \
-		-e 's,$$(LDFLAGS),,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s|$$| ${CFLAGS}|' \
+		-e 's|/usr/local|${PREFIX}| ; \
+		s|install: library|& install-static| ; \
+		s|$$(LDFLAGS)||' ${WRKSRC}/Makefile
 
 regression-test: build
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
 
-.if ${ARCH} == i386
-CCVERSION!= ${CC} --version
-.if !empty(CCVERSION:tl:M*gcc*)
-CFLAGS+=    -fno-stack-protector
-.endif
+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
 
 .include <bsd.port.post.mk>