Attachment 140746 Details for Bug 187441 – libgcrypt.patch

[patch] libgcrypt.patch

libgcrypt.patch (text/x-patch), 4.53 KB, created by Tijl Coosemans on 2014-03-16 16:57:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-03-16 16:57:25 UTC

Size: 4.53 KB

patch

obsolete

>Index: security/libgcrypt/Makefile
>===================================================================
>--- security/libgcrypt/Makefile	(revision 348404)
>+++ security/libgcrypt/Makefile	(working copy)
>@@ -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>
>Index: security/libgcrypt/files/patch-ltmain.sh
>===================================================================
>--- security/libgcrypt/files/patch-ltmain.sh	(revision 348404)
>+++ security/libgcrypt/files/patch-ltmain.sh	(working copy)
>@@ -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
>- 	;;
>- 
>Index: security/libgcrypt/files/patch-mpi-config.links
>===================================================================
>--- security/libgcrypt/files/patch-mpi-config.links	(revision 0)
>+++ security/libgcrypt/files/patch-mpi-config.links	(working copy)
>@@ -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
>
>Property changes on: security/libgcrypt/files/patch-mpi-config.links
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/libgcrypt/pkg-plist
>===================================================================
>--- security/libgcrypt/pkg-plist	(revision 348404)
>+++ security/libgcrypt/pkg-plist	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 187441: 140744 | 140745 | 140746