Attachment #140746 for bug #187441





PORTNAME=	libgcrypt
PORTVERSION=	1.5.3
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR=	${PORTNAME}

BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error

USES=		libtool:oldver tar:bzip2
USE_AUTOTOOLS=	libtool
USE_CSTD=	gnu89
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"

INFO=		gcrypt
PORTDOCS=	*

.include <bsd.port.options.mk>

.if ${ARCH} == "powerpc"
CONFIGURE_ARGS+=	--disable-asm

.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}

.endif

regression-test: build
	cd ${WRKSRC} && ${MAKE_CMD} check

.include <bsd.port.mk>




--- 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
 	;;
 

Line 0 Link Here

(-)security/libgcrypt/files/patch-mpi-config.links (+32 lines)
	1	--- mpi/config.links.orig 2013-07-25 11:10:04.000000000 +0200
	2	+++ mpi/config.links 2014-03-16 17:53:55.000000000 +0100
	3	@@ -46,9 +46,7 @@
	4	path=""
	5	;;
	6	i[3467]86--openbsd* \| \
	7	- i[3467]86--freebsd*-elf \| \
	8	- i[3467]86--freebsd[3-9]* \| \
	9	- i[3467]86--freebsdelf* \| \
	10	+ i[3467]86--freebsd* \| \
	11	i[3467]86--netbsd* \| \
	12	i[3467]86--kbsd)
	13	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
	14	@@ -56,9 +54,7 @@
	15	path="i386"
	16	;;
	17	i586--openbsd* \| \
	18	- i586--freebsd*-elf \| \
	19	- i586--freebsd[3-9]* \| \
	20	- i586--freebsdelf* \| \
	21	+ i586--freebsd* \| \
	22	i586--netbsd* \| \
	23	i586--kbsd \| \
	24	pentium--netbsd \| \
	25	@@ -112,6 +108,7 @@
	26	cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
	27	path="i586 i386"
	28	;;
	29	+ amd64-- \| \
	30	x86_64--)
	31	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
	32	cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h

Lines 3-9 bin/hmac256 Link Here

(-)security/libgcrypt/pkg-plist (-1 lines)
3	bin/libgcrypt-config	3	bin/libgcrypt-config
4	include/gcrypt.h	4	include/gcrypt.h
5	include/gcrypt-module.h	5	include/gcrypt-module.h
6	lib/libgcrypt.a
7	lib/libgcrypt.la	6	lib/libgcrypt.la
8	lib/libgcrypt.so	7	lib/libgcrypt.so
9	lib/libgcrypt.so.19	8	lib/libgcrypt.so.19

Return to bug 187441

Lines 3-8 Link Here

(-)security/libgcrypt/Makefile (-12 / +5 lines)
3		3
4	PORTNAME= libgcrypt	4	PORTNAME= libgcrypt
5	PORTVERSION= 1.5.3	5	PORTVERSION= 1.5.3
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= ${MASTER_SITE_GNUPG}	8	MASTER_SITES= ${MASTER_SITE_GNUPG}
8	MASTER_SITE_SUBDIR= ${PORTNAME}	9	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-23 LICENSE_COMB= multi Link Here
16	BUILD_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error	17	BUILD_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
17	RUN_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error	18	RUN_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
18		19
19	USE_BZIP2= yes	20	USES= libtool:oldver tar:bzip2
20	USE_AUTOTOOLS= libtool
21	USE_CSTD= gnu89	21	USE_CSTD= gnu89
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"	23	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
Lines 28-34 DOCS= AUTHORS ChangeLog ChangeLog-2011 Link Here
28	INFO= gcrypt	28	INFO= gcrypt
29	PORTDOCS= *	29	PORTDOCS= *
30		30
31	.include <bsd.port.pre.mk>	31	.include <bsd.port.options.mk>
32		32
33	.if ${ARCH} == "powerpc"	33	.if ${ARCH} == "powerpc"
34	CONFIGURE_ARGS+= --disable-asm	34	CONFIGURE_ARGS+= --disable-asm
Lines 39-55 USE_GCC= any Link Here
39	.elif ${ARCH} == "i386"	39	.elif ${ARCH} == "i386"
40	.if (${OSVERSION} < 900033)	40	.if (${OSVERSION} < 900033)
41	CONFIGURE_ARGS+= --disable-aesni-support	41	CONFIGURE_ARGS+= --disable-aesni-support
42	#workaround for FreeBSD 10.0
43	.elif (${OSVERSION} >= 1000000)
44	CONFIGURE_ARGS+= --disable-asm
45	.endif	42	.endif
46	.endif	43	.endif
47		44
48	post-patch:	45	post-patch:
49	@${REINPLACE_CMD} -e "s\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|" \
50	${WRKSRC}/ltmain.sh
51
52	pre-configure:
53	@${RM} -f ${WRKSRC}/doc/gcrypt.info*	46	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
54		47
55	.if ${PORT_OPTIONS:MDOCS}	48	.if ${PORT_OPTIONS:MDOCS}
Lines 59-64 post-install: Link Here
59	.endif	52	.endif
60		53
61	regression-test: build	54	regression-test: build
62	cd ${WRKSRC} && ${MAKE} check	55	cd ${WRKSRC} && ${MAKE_CMD} check
63		56
64	.include <bsd.port.post.mk>	57	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)security/libgcrypt/files/patch-ltmain.sh (-32 lines)
1	--- ltmain.sh Wed Jul 17 15:42:41 2002
2	+++ ltmain.sh Wed Jul 17 15:47:36 2002
3	@@ -2077,10 +2077,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false; then
8	func_basename "$file"
9	name="$func_basename_result"
10	instname="$dir/$name"i
11	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
16	@@ -4560,8 +4562,16 @@
17	continue
18	;;
19
20	+ -pthread)
21	+ compile_command="$compile_command %%PTHREAD_LIBS%%"
22	+ finalize_command="$finalize_command %%PTHREAD_LIBS%%"
23	+ compiler_flags="$compiler_flags %%PTHREAD_LIBS%%"
24	+ continue;
25	+ ;;
26	+
27	-module)
28	module=yes
29	+ build_old_libs=yes
30	continue
31	;;
32