Attachment #107307 for bug #148061

View | Details | Raw Unified | Return to bug 148061
Collapse All | Expand All




#

PORTNAME=	gpgme
PORTVERSION=	1.3.0
PORTREVISION=	2
CATEGORIES=	security
MASTER_SITES=	${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR=	gpgme

USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gpgme \
		--with-g13=no

INFO=		gpgme
PORTDOCS=	AUTHORS ChangeLog COPYING COPYING.LESSER INSTALL \
		NEWS README THANKS TODO

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

OPTIONS=	GNUPG1 "Use GNUPG 1.x instead of GNUPG 2.x" off \
		PTH "Build alternate lib with GNU portable threads" off \
		UISERVER "Enable the GNUPG UI Server support" off

.include <bsd.port.pre.mk>


CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg2 \
		--with-gpgconf=${LOCALBASE}/bin/gpgconf
.if exists(${LOCALBASE}/bin/gpgsm)
LIB_DEPENDS+=	assuan.0:${PORTSDIR}/security/libassuan
CONFIGURE_ARGS+=--with-gpgsm=${LOCALBASE}/bin/gpgsm
.else
CONFIGURE_ARGS+=--with-gpgsm=no

PLIST_SUB+=	WITH_PTH='@comment '
.endif

.if defined(WITH_UISERVER)
CONFIGURE_ARGS+=--enable-fd-passing
LIB_DEPENDS+=	assuan.0:${PORTSDIR}/security/libassuan
.endif

verify: checksum
	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig

post-patch:
	@${REINPLACE_CMD} -e 's|EOF||g' ${WRKSRC}/assuan/assuan-errors.c
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
					${WRKSRC}/${CONFIGURE_SCRIPT} \
					${WRKSRC}/src/Makefile.in \

Lines 1-6 Link Here

(-)gpgme/distinfo (-6 / +6 lines)
1	MD5 (gpgme-1.2.0.tar.bz2) = 508ee686bd275d908d1dc1938810e045	1	MD5 (gpgme-1.3.0.tar.bz2) = 4784e3c6086c9c25e9a1b4d9f7c5aa96
2	SHA256 (gpgme-1.2.0.tar.bz2) = c4ba555ea795a42061f0b03fffe22b3f1cb22fcdbcc0bbbeb0419e59b04ef801	2	SHA256 (gpgme-1.3.0.tar.bz2) = 74e040fcd46061f6b0d8b621a2a2a48100a7ba5c9f69e7cf207259a6e2e3e6a1
3	SIZE (gpgme-1.2.0.tar.bz2) = 845063	3	SIZE (gpgme-1.3.0.tar.bz2) = 869470
4	MD5 (gpgme-1.2.0.tar.bz2.sig) = ead07c74f6b82fe77ca632c69897c562	4	MD5 (gpgme-1.3.0.tar.bz2.sig) = 417b83ac578213de8a3300b8215866ba
5	SHA256 (gpgme-1.2.0.tar.bz2.sig) = 267d6f05d81da2f86c3b34d193cd86ea8ffcdf9b560cc09f6cfec680cd1fac92	5	SHA256 (gpgme-1.3.0.tar.bz2.sig) = cfaa7322d69e22b8dbfde379106499c8e558fa6ca0a2626722c4cd5e5a0a464e
6	SIZE (gpgme-1.2.0.tar.bz2.sig) = 315	6	SIZE (gpgme-1.3.0.tar.bz2.sig) = 315

Lines 1-10 Link Here

(-)gpgme/files/patch-assuan-assuan.h (-10 lines)
1	--- assuan/assuan.h.orig Wed Sep 13 15:55:53 2006
2	+++ assuan/assuan.h Wed Sep 13 15:56:59 2006
3	@@ -23,6 +23,7 @@
4
5	#include <stdio.h>
6	#include <sys/types.h>
7	+#include <sys/socket.h>
8	#include <unistd.h>
9
10




--- ./src/Makefile.in.orig	2010-01-11 06:06:54.000000000 -0500
+++ ./src/Makefile.in	2010-06-21 15:31:11.000000000 -0400
@@ -158,13 +158,52 @@
 	vfs-create.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \
 	posix-sema.c posix-io.c w32-util.c w32-sema.c dirinfo.c \
 	debug.c debug.h gpgme.c version.c error.c ath-pth.c w32-io.c
-@HAVE_DOSISH_SYSTEM_TRUE@am__objects_8 = w32-io.lo
-am_libgpgme_pth_la_OBJECTS = $(am__objects_7) ath-pth.lo \
-	$(am__objects_8)
+@HAVE_GPGSM_TRUE@am__objects_8 = libgpgme_pth_la-engine-gpgsm.lo
+@HAVE_ASSUAN_TRUE@am__objects_9 = libgpgme_pth_la-assuan-support.lo \
+@HAVE_ASSUAN_TRUE@	libgpgme_pth_la-engine-assuan.lo
+@HAVE_GPGCONF_TRUE@am__objects_10 = libgpgme_pth_la-engine-gpgconf.lo
+@HAVE_UISERVER_TRUE@am__objects_11 =  \
+@HAVE_UISERVER_TRUE@	libgpgme_pth_la-engine-uiserver.lo
+@HAVE_G13_TRUE@am__objects_12 = libgpgme_pth_la-engine-g13.lo
+@HAVE_DOSISH_SYSTEM_FALSE@am__objects_13 =  \
+@HAVE_DOSISH_SYSTEM_FALSE@	libgpgme_pth_la-posix-util.lo \
+@HAVE_DOSISH_SYSTEM_FALSE@	libgpgme_pth_la-posix-sema.lo \
+@HAVE_DOSISH_SYSTEM_FALSE@	libgpgme_pth_la-posix-io.lo
+@HAVE_DOSISH_SYSTEM_TRUE@am__objects_13 = libgpgme_pth_la-w32-util.lo \
+@HAVE_DOSISH_SYSTEM_TRUE@	libgpgme_pth_la-w32-sema.lo
+am__objects_14 = libgpgme_pth_la-conversion.lo \
+	libgpgme_pth_la-get-env.lo libgpgme_pth_la-data.lo \
+	libgpgme_pth_la-data-fd.lo libgpgme_pth_la-data-stream.lo \
+	libgpgme_pth_la-data-mem.lo libgpgme_pth_la-data-user.lo \

+	libgpgme_pth_la-import.lo libgpgme_pth_la-export.lo \
+	libgpgme_pth_la-genkey.lo libgpgme_pth_la-delete.lo \
+	libgpgme_pth_la-edit.lo libgpgme_pth_la-getauditlog.lo \
+	libgpgme_pth_la-opassuan.lo libgpgme_pth_la-passwd.lo \
+	libgpgme_pth_la-engine.lo libgpgme_pth_la-engine-gpg.lo \
+	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
+	$(am__objects_11) $(am__objects_12) \
+	libgpgme_pth_la-vfs-mount.lo libgpgme_pth_la-vfs-create.lo \
+	libgpgme_pth_la-gpgconf.lo $(am__objects_13) \
+	libgpgme_pth_la-dirinfo.lo libgpgme_pth_la-debug.lo \
+	libgpgme_pth_la-gpgme.lo libgpgme_pth_la-version.lo \
+	libgpgme_pth_la-error.lo
+@HAVE_DOSISH_SYSTEM_TRUE@am__objects_15 = libgpgme_pth_la-w32-io.lo
+am_libgpgme_pth_la_OBJECTS = $(am__objects_14) \
+	libgpgme_pth_la-ath-pth.lo $(am__objects_15)
 libgpgme_pth_la_OBJECTS = $(am_libgpgme_pth_la_OBJECTS)
 libgpgme_pth_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 @HAVE_PTH_TRUE@am_libgpgme_pth_la_rpath = -rpath $(libdir)
 am__libgpgme_pthread_la_SOURCES_DIST = util.h conversion.c get-env.c \
 	context.h ops.h data.h data.c data-fd.c data-stream.c \
@@ -181,8 +220,9 @@
 	posix-sema.c posix-io.c w32-util.c w32-sema.c dirinfo.c \
 	debug.c debug.h gpgme.c version.c error.c ath-pthread.c \
 	w32-io.c
+@HAVE_DOSISH_SYSTEM_TRUE@am__objects_16 = w32-io.lo
 am_libgpgme_pthread_la_OBJECTS = $(am__objects_7) ath-pthread.lo \
-	$(am__objects_8)
+	$(am__objects_16)
 libgpgme_pthread_la_OBJECTS = $(am_libgpgme_pthread_la_OBJECTS)
 libgpgme_pthread_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -224,7 +264,7 @@
 	gpgconf.c sema.h priv-io.h ath.h posix-util.c posix-sema.c \
 	posix-io.c w32-util.c w32-sema.c dirinfo.c debug.c debug.h \
 	gpgme.c version.c error.c ath.c w32-io.c
-am_libgpgme_la_OBJECTS = $(am__objects_7) ath.lo $(am__objects_8)
+am_libgpgme_la_OBJECTS = $(am__objects_7) ath.lo $(am__objects_16)
 libgpgme_la_OBJECTS = $(am_libgpgme_la_OBJECTS)
 libgpgme_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -515,10 +555,10 @@
 
 # We use a global CFLAGS and CPPFLAGS setting for all library
 # versions, because then every object file is only compiled once.
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @PTH_CPPFLAGS@ \
+AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ \
 	@QT4_CORE_CFLAGS@
 
-AM_CFLAGS = @LIBASSUAN_CFLAGS@ @PTH_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@
+AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@
 @HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 @HAVE_W32_SYSTEM_TRUE@	$(AM_CPPFLAGS) $(CPPFLAGS)
 
@@ -546,6 +586,7 @@
 libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	-lpthread @GPG_ERROR_LIBS@
 
+libgpgme_pth_la_CFLAGS = ${CFLAGS} @PTH_CFLAGS@
 libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
@@ -760,7 +801,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ttyname_r.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-support.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pthread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conversion.Plo@am__quote@
@@ -798,6 +838,64 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdpipeiodevice.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keylist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-assuan-support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-ath-pth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-conversion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-data-compat.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-encrypt-sign.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-encrypt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-assuan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-g13.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpgsm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-uiserver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-export.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-op-support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-opassuan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-passphrase.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-passwd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-sema.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-util.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-trustlist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-verify.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-version.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-vfs-create.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-vfs-mount.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-w32-io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-w32-sema.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-w32-util.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/op-support.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opassuan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passphrase.Plo@am__quote@
@@ -846,6 +944,412 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-opassuan.lo `test -f 'opassuan.c' || echo '$(srcdir)/'`opassuan.c
+
+libgpgme_pth_la-passwd.lo: passwd.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-passwd.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-passwd.Tpo -c -o libgpgme_pth_la-passwd.lo `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-passwd.Tpo $(DEPDIR)/libgpgme_pth_la-passwd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='passwd.c' object='libgpgme_pth_la-passwd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-passwd.lo `test -f 'passwd.c' || echo '$(srcdir)/'`passwd.c
+
+libgpgme_pth_la-engine.lo: engine.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine.Tpo -c -o libgpgme_pth_la-engine.lo `test -f 'engine.c' || echo '$(srcdir)/'`engine.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-engine.Tpo $(DEPDIR)/libgpgme_pth_la-engine.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-gpgsm.lo `test -f 'engine-gpgsm.c' || echo '$(srcdir)/'`engine-gpgsm.c
+
+libgpgme_pth_la-assuan-support.lo: assuan-support.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-assuan-support.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-assuan-support.Tpo -c -o libgpgme_pth_la-assuan-support.lo `test -f 'assuan-support.c' || echo '$(srcdir)/'`assuan-support.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-assuan-support.Tpo $(DEPDIR)/libgpgme_pth_la-assuan-support.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='assuan-support.c' object='libgpgme_pth_la-assuan-support.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-assuan-support.lo `test -f 'assuan-support.c' || echo '$(srcdir)/'`assuan-support.c
+
+libgpgme_pth_la-engine-assuan.lo: engine-assuan.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-assuan.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-assuan.Tpo -c -o libgpgme_pth_la-engine-assuan.lo `test -f 'engine-assuan.c' || echo '$(srcdir)/'`engine-assuan.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-engine-assuan.Tpo $(DEPDIR)/libgpgme_pth_la-engine-assuan.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-gpgconf.lo `test -f 'engine-gpgconf.c' || echo '$(srcdir)/'`engine-gpgconf.c
+
+libgpgme_pth_la-engine-uiserver.lo: engine-uiserver.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-uiserver.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-uiserver.Tpo -c -o libgpgme_pth_la-engine-uiserver.lo `test -f 'engine-uiserver.c' || echo '$(srcdir)/'`engine-uiserver.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-engine-uiserver.Tpo $(DEPDIR)/libgpgme_pth_la-engine-uiserver.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='engine-uiserver.c' object='libgpgme_pth_la-engine-uiserver.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-uiserver.lo `test -f 'engine-uiserver.c' || echo '$(srcdir)/'`engine-uiserver.c
+
+libgpgme_pth_la-engine-g13.lo: engine-g13.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-g13.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-g13.Tpo -c -o libgpgme_pth_la-engine-g13.lo `test -f 'engine-g13.c' || echo '$(srcdir)/'`engine-g13.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-engine-g13.Tpo $(DEPDIR)/libgpgme_pth_la-engine-g13.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='engine-g13.c' object='libgpgme_pth_la-engine-g13.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-g13.lo `test -f 'engine-g13.c' || echo '$(srcdir)/'`engine-g13.c
+
+libgpgme_pth_la-vfs-mount.lo: vfs-mount.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-vfs-mount.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-vfs-mount.Tpo -c -o libgpgme_pth_la-vfs-mount.lo `test -f 'vfs-mount.c' || echo '$(srcdir)/'`vfs-mount.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-vfs-mount.Tpo $(DEPDIR)/libgpgme_pth_la-vfs-mount.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vfs-mount.c' object='libgpgme_pth_la-vfs-mount.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-vfs-mount.lo `test -f 'vfs-mount.c' || echo '$(srcdir)/'`vfs-mount.c
+
+libgpgme_pth_la-vfs-create.lo: vfs-create.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-vfs-create.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-vfs-create.Tpo -c -o libgpgme_pth_la-vfs-create.lo `test -f 'vfs-create.c' || echo '$(srcdir)/'`vfs-create.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-vfs-create.Tpo $(DEPDIR)/libgpgme_pth_la-vfs-create.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vfs-create.c' object='libgpgme_pth_la-vfs-create.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-vfs-create.lo `test -f 'vfs-create.c' || echo '$(srcdir)/'`vfs-create.c
+
+libgpgme_pth_la-gpgconf.lo: gpgconf.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-gpgconf.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-gpgconf.Tpo -c -o libgpgme_pth_la-gpgconf.lo `test -f 'gpgconf.c' || echo '$(srcdir)/'`gpgconf.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgpgme_pth_la-gpgconf.Tpo $(DEPDIR)/libgpgme_pth_la-gpgconf.Plo

+
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

Return to bug 148061

Lines 6-13 Link Here

(-)gpgme/Makefile (-5 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= gpgme	8	PORTNAME= gpgme
9	PORTVERSION= 1.2.0	9	PORTVERSION= 1.3.0
10	PORTREVISION= 2
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= ${MASTER_SITE_GNUPG}	11	MASTER_SITES= ${MASTER_SITE_GNUPG}
13	MASTER_SITE_SUBDIR= gpgme	12	MASTER_SITE_SUBDIR= gpgme
Lines 25-38 Link Here
25	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
26	MAKE_JOBS_SAFE= yes	25	MAKE_JOBS_SAFE= yes
27		26
28	CONFIGURE_ARGS= --includedir=${PREFIX}/include/gpgme	27	CONFIGURE_ARGS= --includedir=${PREFIX}/include/gpgme \
		28	--with-g13=no
29		29
30	INFO= gpgme	30	INFO= gpgme
31	PORTDOCS= AUTHORS ChangeLog COPYING COPYING.LESSER INSTALL \	31	PORTDOCS= AUTHORS ChangeLog COPYING COPYING.LESSER INSTALL \
32	NEWS README THANKS TODO	32	NEWS README THANKS TODO
33		33
		34	LICENSE= GPLv2
		35	LICENSE_FILE= ${WRKSRC}/COPYING
		36
34	OPTIONS= GNUPG1 "Use GNUPG 1.x instead of GNUPG 2.x" off \	37	OPTIONS= GNUPG1 "Use GNUPG 1.x instead of GNUPG 2.x" off \
35	PTH "Build alternate lib with GNU portable threads" off	38	PTH "Build alternate lib with GNU portable threads" off \
		39	UISERVER "Enable the GNUPG UI Server support" off
36		40
37	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
38		42
Lines 48-53 Link Here
48	CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg2 \	52	CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg2 \
49	--with-gpgconf=${LOCALBASE}/bin/gpgconf	53	--with-gpgconf=${LOCALBASE}/bin/gpgconf
50	.if exists(${LOCALBASE}/bin/gpgsm)	54	.if exists(${LOCALBASE}/bin/gpgsm)
		55	LIB_DEPENDS+= assuan.0:${PORTSDIR}/security/libassuan
51	CONFIGURE_ARGS+=--with-gpgsm=${LOCALBASE}/bin/gpgsm	56	CONFIGURE_ARGS+=--with-gpgsm=${LOCALBASE}/bin/gpgsm
52	.else	57	.else
53	CONFIGURE_ARGS+=--with-gpgsm=no	58	CONFIGURE_ARGS+=--with-gpgsm=no
Lines 62-72 Link Here
62	PLIST_SUB+= WITH_PTH='@comment '	67	PLIST_SUB+= WITH_PTH='@comment '
63	.endif	68	.endif
64		69
		70	.if defined(WITH_UISERVER)
		71	CONFIGURE_ARGS+=--enable-fd-passing
		72	LIB_DEPENDS+= assuan.0:${PORTSDIR}/security/libassuan
		73	.endif
		74
65	verify: checksum	75	verify: checksum
66	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig	76	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
67		77
68	post-patch:	78	post-patch:
69	@${REINPLACE_CMD} -e 's\|EOF\|\|g' ${WRKSRC}/assuan/assuan-errors.c
70	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \	79	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
71	${WRKSRC}/${CONFIGURE_SCRIPT} \	80	${WRKSRC}/${CONFIGURE_SCRIPT} \
72	${WRKSRC}/src/Makefile.in \	81	${WRKSRC}/src/Makefile.in \