svn commit: r349852 - in head/security/libgcrypt: . files

[Tijl Coosemans]

Author: tijl
Date: Tue Apr  1 13:12:28 2014
New Revision: 349852
URL: http://svnweb.freebsd.org/changeset/ports/349852
QAT: https://qat.redports.org/buildarchive/r349852/

Log:
  - USES=libtool tar:bzip2.
  - Enable asm on FreeBSD/i386 >= 10.0.
  - Enable asm on FreeBSD/amd64. [1]
  - Use MAKE_CMD instead of MAKE to run regression tests.
  
  PR:		ports/187441
  Submitted by:	Stoyan Dimov <pr.freebsd.org at registrations.systeem.com> [1]
  Approved by:	maintainer timeout (2 weeks)

Added:
  head/security/libgcrypt/files/patch-mpi-config.links   (contents, props changed)
Deleted:
  head/security/libgcrypt/files/patch-ltmain.sh
Modified:
  head/security/libgcrypt/Makefile
  head/security/libgcrypt/pkg-plist

Modified: head/security/libgcrypt/Makefile
==============================================================================
--- head/security/libgcrypt/Makefile	Tue Apr  1 13:02:31 2014	(r349851)
+++ head/security/libgcrypt/Makefile	Tue Apr  1 13:12:28 2014	(r349852)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +17,7 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 
-USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool
+USES=		libtool:oldver tar:bzip2
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
@@ -28,7 +28,7 @@ DOCS=		AUTHORS ChangeLog ChangeLog-2011 
 INFO=		gcrypt
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "powerpc"
 CONFIGURE_ARGS+=	--disable-asm
@@ -39,17 +39,10 @@ USE_GCC=	any
 .elif ${ARCH} == "i386"
 .if (${OSVERSION} < 900033)
 CONFIGURE_ARGS+=	--disable-aesni-support
-#workaround for FreeBSD 10.0
-.elif (${OSVERSION} >= 1000000)
-CONFIGURE_ARGS+=	--disable-asm
 .endif
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \
-		${WRKSRC}/ltmain.sh
-
-pre-configure:
 	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -59,6 +52,6 @@ post-install:
 .endif
 
 regression-test: build
-	cd ${WRKSRC} && ${MAKE} check
+	cd ${WRKSRC} && ${MAKE_CMD} check
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/security/libgcrypt/files/patch-mpi-config.links
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libgcrypt/files/patch-mpi-config.links	Tue Apr  1 13:12:28 2014	(r349852)
@@ -0,0 +1,32 @@
+--- mpi/config.links.orig	2013-07-25 11:10:04.000000000 +0200
++++ mpi/config.links	2014-03-16 17:53:55.000000000 +0100
+@@ -46,9 +46,7 @@
+        path=""
+        ;;
+     i[3467]86*-*-openbsd*      | \
+-    i[3467]86*-*-freebsd*-elf  | \
+-    i[3467]86*-*-freebsd[3-9]* | \
+-    i[3467]86*-*-freebsdelf*   | \
++    i[3467]86*-*-freebsd*      | \
+     i[3467]86*-*-netbsd*       | \
+     i[3467]86*-*-k*bsd*)
+        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+@@ -56,9 +54,7 @@
+        path="i386"
+        ;;
+     i586*-*-openbsd*         | \
+-    i586*-*-freebsd*-elf     | \
+-    i586*-*-freebsd[3-9]*    | \
+-    i586*-*-freebsdelf*      | \
++    i586*-*-freebsd*         | \
+     i586*-*-netbsd*	     | \
+     i586*-*-k*bsd*	     | \
+     pentium-*-netbsd*	     | \
+@@ -112,6 +108,7 @@
+ 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
+ 	path="i586 i386"
+ 	;;
++    amd64-*-* | \
+     x86_64-*-*)
+ 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+ 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h

Modified: head/security/libgcrypt/pkg-plist
==============================================================================
--- head/security/libgcrypt/pkg-plist	Tue Apr  1 13:02:31 2014	(r349851)
+++ head/security/libgcrypt/pkg-plist	Tue Apr  1 13:12:28 2014	(r349852)
@@ -3,7 +3,6 @@ bin/hmac256
 bin/libgcrypt-config
 include/gcrypt.h
 include/gcrypt-module.h
-lib/libgcrypt.a
 lib/libgcrypt.la
 lib/libgcrypt.so
 lib/libgcrypt.so.19