From owner-svn-ports-head@freebsd.org  Tue Jan 10 11:42:39 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C273CCA9383;
 Tue, 10 Jan 2017 11:42:39 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7AD4D1C49;
 Tue, 10 Jan 2017 11:42:39 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0ABgc8p048672;
 Tue, 10 Jan 2017 11:42:38 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0ABgcMk048671;
 Tue, 10 Jan 2017 11:42:38 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201701101142.v0ABgcMk048671@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 10 Jan 2017 11:42:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431077 - 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2017 11:42:39 -0000

Author: amdmi3
Date: Tue Jan 10 11:42:38 2017
New Revision: 431077
URL: https://svnweb.freebsd.org/changeset/ports/431077

Log:
  - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
  - Switch to new test framework
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/security/libscrypt/Makefile

Modified: head/security/libscrypt/Makefile
==============================================================================
--- head/security/libscrypt/Makefile	Tue Jan 10 11:41:57 2017	(r431076)
+++ head/security/libscrypt/Makefile	Tue Jan 10 11:42:38 2017	(r431077)
@@ -12,12 +12,12 @@ COMMENT=	C library for the scrypt key de
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
 
-MAKE_ARGS+=	CC="${CC}" LIBDIR="${PREFIX}"/lib
+MAKE_ARGS=	CC="${CC}" LIBDIR="${PREFIX}"/lib
+TEST_TARGET=	check
 
 PLIST_FILES=	include/libscrypt.h \
 		lib/libscrypt.so \
@@ -27,29 +27,18 @@ PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|?=-|+=-|; s|-O2 ||' ${WRKSRC}/Makefile
-
-.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc && ${OSVERSION} < 1000036
-	@${REINPLACE_CMD} -e 's|-lscrypt|& -lssp_nonshared|; \
-		s|\.version|&,-lssp_nonshared|' ${WRKSRC}/Makefile
-.else
 	@${REINPLACE_CMD} -e 's|-fstack-protector ||' ${WRKSRC}/Makefile
-.endif
-
 	@${REINPLACE_CMD} -e \
 		's|strcpy(mcf2, mcf);|strlcpy(mcf2, mcf, SCRYPT_MCF_LEN);|' \
 			${WRKSRC}/main.c
 
-regression-test: build
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0
 
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>