Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Nov 2015 23:20:56 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401617 - head/security/libtomcrypt
Message-ID:  <201511142320.tAENKu6G092658@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Nov 14 23:20:56 2015
New Revision: 401617
URL: https://svnweb.freebsd.org/changeset/ports/401617

Log:
  - Update MASTER_SITES and WWW
  - Switch to options helpers
  - Switch to new test framework
  - Silence patching

Modified:
  head/security/libtomcrypt/Makefile
  head/security/libtomcrypt/pkg-descr

Modified: head/security/libtomcrypt/Makefile
==============================================================================
--- head/security/libtomcrypt/Makefile	Sat Nov 14 23:16:09 2015	(r401616)
+++ head/security/libtomcrypt/Makefile	Sat Nov 14 23:20:56 2015	(r401617)
@@ -5,7 +5,7 @@ PORTNAME=	libtomcrypt
 PORTVERSION=	1.17
 PORTREVISION=	4
 CATEGORIES=	security
-MASTER_SITES=	http://libtom.org/files/
+MASTER_SITES=	http://libtom.net/files/
 DISTNAME=	crypt-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -26,49 +26,41 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 USES=		gmake libtool:build tar:bzip2
 
 OPTIONS_DEFINE=		DOCS
-OPTIONS_DEFAULT=	LIBTOMMATH
 OPTIONS_MULTI=		MATH
 OPTIONS_MULTI_MATH=	LIBTOMMATH TOMSFASTMATH GMP
+OPTIONS_DEFAULT=	LIBTOMMATH
+
 LIBTOMMATH_DESC=	Use LibTomMath
 TOMSFASTMATH_DESC=	Use TomsFastMath
 
-.include <bsd.port.options.mk>
+LIBTOMMATH_BUILD_DEPENDS=	${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath
+LIBTOMMATH_CFLAGS=		-DLTM_DESC
+LIBTOMMATH_VARS=		EXTRALIBS+=-ltommath
+
+LIBTOMSFASTMATH_BUILD_DEPENDS=	${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath
+LIBTOMSFASTMATH_CFLAGS=		-DTFM_DESC
+LIBTOMSFASTMATH_VARS=		EXTRALIBS+=-ltfm
+
+GMP_LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp
+GMP_CFLAGS=			-DGMP_DESC
+GMP_VARS=			EXTRALIBS+=-lgmp
 
-.if ${PORT_OPTIONS:MLIBTOMMATH}
-BUILD_DEPENDS+=	${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath
-CFLAGS+=	-DLTM_DESC
-EXTRALIBS+=	-ltommath
-.endif
-
-.if ${PORT_OPTIONS:MTOMSFASTMATH}
-BUILD_DEPENDS+=	${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath
-CFLAGS+=	-DTFM_DESC
-EXTRALIBS+=	-ltfm
-.endif
-
-.if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
-CFLAGS+=	-DGMP_DESC
-EXTRALIBS+=	-lgmp
-.endif
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+=	NODOCS=yes
-.endif
+DOCS_MAKE_ARGS_OFF=		NODOCS=yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's| make | $$(MAKE) |' \
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's| make | $$(MAKE) |' \
 		-e 's|-g $$(GROUP)||' -e 's|-o $$(USER)||' \
 		${WRKSRC}/makefile.shared ${WRKSRC}/testprof/makefile.shared
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt_prof.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt.so.0
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	${INSTALL_DATA} ${WRKSRC}/doc/crypt.pdf ${STAGEDIR}${DOCSDIR}/pdf
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt_prof.so.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt.so.0
 
-.if defined(MAINTAINER_MODE)
-test:	build
+do-test:
 	@${ECHO_MSG} "Testing with -DUSE_TFM..."
 	(cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_TFM" EXTRALIBS="-L${PREFIX}/lib -ltfm" ${MAKE_CMD} test && ${WRKSRC}/test)
 
@@ -85,6 +77,5 @@ test:	build
 
 	@${ECHO_MSG} "Testing with -DUSE_GMP..."
 	(cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_GMP" EXTRALIBS="-L${PREFIX}/lib -lgmp" ${MAKE_CMD} test && ${WRKSRC}/test)
-.endif
 
 .include <bsd.port.mk>

Modified: head/security/libtomcrypt/pkg-descr
==============================================================================
--- head/security/libtomcrypt/pkg-descr	Sat Nov 14 23:16:09 2015	(r401616)
+++ head/security/libtomcrypt/pkg-descr	Sat Nov 14 23:20:56 2015	(r401617)
@@ -2,4 +2,4 @@ LibTomCrypt is a portable ANSI C cryptog
 ciphers, one-way hashes, pseudo-random number generators, public key
 cryptography (via RSA,DH or ECC/DH) and a plethora of support routines.
 
-WWW: http://www.libtomcrypt.com
+WWW: http://libtom.net/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511142320.tAENKu6G092658>