4 files changed, 37 insertions, 45 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 7030037aaa17..c9ecd3155671 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -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 INSTALL NEWS README \
 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>
diff --git a/security/libgcrypt/files/patch-ltmain.sh b/security/libgcrypt/files/patch-ltmain.sh
deleted file mode 100644
index e6f8a974395a..000000000000
--- a/security/libgcrypt/files/patch-ltmain.sh
+++ /dev/null
@@ -1,32 +0,0 @@
---- ltmain.sh	Wed Jul 17 15:42:41 2002
-+++ ltmain.sh	Wed Jul 17 15:47:36 2002
-@@ -2077,10 +2077,12 @@
- 	fi
-
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	func_basename "$file"
- 	name="$func_basename_result"
- 	instname="$dir/$name"i
- 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+	fi
-
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -4560,8 +4562,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+        compile_command="$compile_command %%PTHREAD_LIBS%%"
-+	finalize_command="$finalize_command %%PTHREAD_LIBS%%"
-+	compiler_flags="$compiler_flags %%PTHREAD_LIBS%%"
-+	continue;
-+	;;	
-+
-       -module)
- 	module=yes
-+	build_old_libs=yes
- 	continue
- 	;;
- 
diff --git a/security/libgcrypt/files/patch-mpi-config.links b/security/libgcrypt/files/patch-mpi-config.links
new file mode 100644
index 000000000000..3a75a6053dec
--- /dev/null
+++ b/security/libgcrypt/files/patch-mpi-config.links
@@ -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
diff --git a/security/libgcrypt/pkg-plist b/security/libgcrypt/pkg-plist
index aa67d293bd7a..6aacf8801de3 100644
--- a/security/libgcrypt/pkg-plist
+++ b/security/libgcrypt/pkg-plist
@@ -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