svn commit: r459650 - in head/security/libtomcrypt: . files

[Pietro Cerutti]

Author: gahr
Date: Mon Jan 22 13:36:10 2018
New Revision: 459650
URL: https://svnweb.freebsd.org/changeset/ports/459650

Log:
  security/libtomcrypt: update to 1.18.1
  
  Changes: https://github.com/libtom/libtomcrypt/blob/v1.18.1/changes
  
  Please note that the PDF documentation is not distributed anymore. You can find
  the latest version pre-built at the release page:
  https://github.com/libtom/libtomcrypt/releases/tag/v1.18.1

Deleted:
  head/security/libtomcrypt/files/
Modified:
  head/security/libtomcrypt/Makefile
  head/security/libtomcrypt/distinfo
  head/security/libtomcrypt/pkg-plist

Modified: head/security/libtomcrypt/Makefile
==============================================================================
--- head/security/libtomcrypt/Makefile	Mon Jan 22 13:07:46 2018	(r459649)
+++ head/security/libtomcrypt/Makefile	Mon Jan 22 13:36:10 2018	(r459650)
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libtomcrypt
-PORTVERSION=	1.17
-PORTREVISION=	4
+PORTVERSION=	1.18.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
-MASTER_SITES=	http://libtom.net/files/
-DISTNAME=	crypt-${PORTVERSION}
 
 MAINTAINER=	gahr at FreeBSD.org
 COMMENT=	Comprehensive, modular, and portable cryptographic toolkit
@@ -18,11 +16,14 @@ CFLAGS+=	-I${LOCALBASE}/include
 EXTRALIBS=	-L${LOCALBASE}/lib
 MAKEFILE=	makefile.shared
 ALL_TARGET=	library
-MAKE_ARGS=	IGNORE_SPEED=yes INCPATH="${PREFIX}/include" \
-		LIBPATH="${PREFIX}/lib" EXTRALIBS="${EXTRALIBS}"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES=		gmake libtool:build tar:bzip2
+MAKE_ARGS=	INCPATH="${PREFIX}/include" LIBPATH="${PREFIX}/lib" \
+		EXTRALIBS="${EXTRALIBS}"
+USES=		gmake libtool:build
+USE_LDCONFIG=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	libtom
+
 OPTIONS_DEFINE=		DOCS
 OPTIONS_MULTI=		MATH
 OPTIONS_MULTI_MATH=	LIBTOMMATH TOMSFASTMATH GMP
@@ -48,32 +49,29 @@ DOCS_MAKE_ARGS_OFF=		NODOCS=yes
 post-patch:
 	@${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
+		${WRKSRC}/makefile.shared ${WRKSRC}/makefile_include.mk
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt_prof.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtomcrypt.so.1
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
-	${INSTALL_DATA} ${WRKSRC}/doc/crypt.pdf ${STAGEDIR}${DOCSDIR}/pdf
-
 do-test:
-	@${ECHO_MSG} "Testing with -DUSE_TFM..."
-	(cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_TFM" EXTRALIBS="-L${PREFIX}/lib -ltfm" ${MAKE_CMD} test && ${WRKSRC}/test)
-
-	@${ECHO_MSG} "Cleaning up test binary..."
-	@${RM} ${WRKSRC}/test
-	@${RM} ${WRKSRC}/demos/test.o
-
-	@${ECHO_MSG} "Testing with -DUSE_LTM..."
-	(cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_LTM" EXTRALIBS="-L${PREFIX}/lib -ltommath" ${MAKE_CMD} test && ${WRKSRC}/test)
-
-	@${ECHO_MSG} "Cleaning up test binary..."
-	@${RM} ${WRKSRC}/test
-	@${RM} ${WRKSRC}/demos/test.o
-
-	@${ECHO_MSG} "Testing with -DUSE_GMP..."
-	(cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_GMP" EXTRALIBS="-L${PREFIX}/lib -lgmp" ${MAKE_CMD} test && ${WRKSRC}/test)
+	# TomsFastMath
+	@${ECHO_CMD} "Testing TomsFastMath"
+	${MAKE_CMD} -C ${WRKSRC} \
+	    CFLAGS="-I${LOCALBASE}/include -DUSE_TFM -DTFM_DESC" \
+	    EXTRALIBS="-L${LOCALBASE}/lib -ltfm" clean test
+	(cd ${WRKSRC} && ./test)
+	# LibTomMath
+	@${ECHO_CMD} "Testing LibTomMath"
+	${MAKE_CMD} -C ${WRKSRC} \
+	    CFLAGS="-I${LOCALBASE}/include -DUSE_LTM -DLTM_DESC" \
+	    EXTRALIBS="-L${LOCALBASE}/lib -ltommath" clean test
+	(cd ${WRKSRC} && ./test)
+	# GMP
+	@${ECHO_CMD} "Testing GMP"
+	${MAKE_CMD} -C ${WRKSRC} \
+	    CFLAGS="-I${LOCALBASE}/include -DUSE_GMP -DGMP_DESC" \
+	    EXTRALIBS="-L${LOCALBASE}/lib -lgmp" clean test
+	(cd ${WRKSRC} && ./test)
 
 .include <bsd.port.mk>

Modified: head/security/libtomcrypt/distinfo
==============================================================================
--- head/security/libtomcrypt/distinfo	Mon Jan 22 13:07:46 2018	(r459649)
+++ head/security/libtomcrypt/distinfo	Mon Jan 22 13:36:10 2018	(r459650)
@@ -1,2 +1,3 @@
-SHA256 (crypt-1.17.tar.bz2) = e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116
-SIZE (crypt-1.17.tar.bz2) = 1599215
+TIMESTAMP = 1516618104
+SHA256 (libtom-libtomcrypt-v1.18.1_GH0.tar.gz) = e1319d77bf8ac296b69cf68f66e4dadfb68a8519bd684cc83d29b8d6754d10ef
+SIZE (libtom-libtomcrypt-v1.18.1_GH0.tar.gz) = 2299746

Modified: head/security/libtomcrypt/pkg-plist
==============================================================================
--- head/security/libtomcrypt/pkg-plist	Mon Jan 22 13:07:46 2018	(r459649)
+++ head/security/libtomcrypt/pkg-plist	Mon Jan 22 13:36:10 2018	(r459650)
@@ -11,13 +11,8 @@ include/tomcrypt_misc.h
 include/tomcrypt_pk.h
 include/tomcrypt_pkcs.h
 include/tomcrypt_prng.h
-include/tomcrypt_test.h
 lib/libtomcrypt.a
 lib/libtomcrypt.so
-lib/libtomcrypt.so.0
-lib/libtomcrypt.so.0.0.117
-lib/libtomcrypt_prof.a
-lib/libtomcrypt_prof.so
-lib/libtomcrypt_prof.so.0
-lib/libtomcrypt_prof.so.0.0.117
-%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
+lib/libtomcrypt.so.1
+lib/libtomcrypt.so.1.0.1
+libdata/pkgconfig/libtomcrypt.pc