- Update to 0.3.16

PR:		ports/60711
Submitted by:	ijliao

8 files changed, 38 insertions, 22 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 2150478d916e..14301755741a 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpgme
-PORTVERSION=	0.3.15
-PORTREVISION=	1
+PORTVERSION=	0.3.16
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -19,10 +18,11 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+INFO=	gpgme
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/bin/gpgsm)
@@ -35,7 +35,4 @@ BUILD_DEPENDS+=	gpgsm:${PORTSDIR}/security/newpg
 CONFIGURE_ARGS+=	--without-gpgsm
 .endif
 
-pre-configure:
-	@${RM} -r ${WRKSRC}/doc/gpgme.info*
-
 .include <bsd.port.post.mk>
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index e4a87099a0ee..c265c67d8d8f 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1 +1 @@
-MD5 (gpgme-0.3.15.tar.gz) = 1acbe4b49e60d4b882a43328bc840d42
+MD5 (gpgme-0.3.16.tar.gz) = 0476b219695ea25cb2a97b18b717e381
diff --git a/security/gpgme/files/patch-ltmain.sh b/security/gpgme/files/patch-ltmain.sh
new file mode 100644
index 000000000000..85e86e5ae349
--- /dev/null
+++ b/security/gpgme/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Tue Dec 30 09:32:46 2003
++++ ltmain.sh	Tue Dec 30 09:32:59 2003
+@@ -4333,10 +4333,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index 759c3aa288b8..0a003a2416f1 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -1,10 +1,6 @@
 bin/gpgme-config
 include/gpgme.h
-@unexec install-info --delete %D/info/gpgme.info %D/info/dir
-info/gpgme.info
-@exec install-info %D/info/gpgme.info %D/info/dir
 lib/libgpgme.a
-lib/libgpgme.la
 lib/libgpgme.so
 lib/libgpgme.so.9
 share/aclocal/gpgme.m4
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 2150478d916e..14301755741a 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpgme
-PORTVERSION=	0.3.15
-PORTREVISION=	1
+PORTVERSION=	0.3.16
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -19,10 +18,11 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+INFO=	gpgme
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/bin/gpgsm)
@@ -35,7 +35,4 @@ BUILD_DEPENDS+=	gpgsm:${PORTSDIR}/security/newpg
 CONFIGURE_ARGS+=	--without-gpgsm
 .endif
 
-pre-configure:
-	@${RM} -r ${WRKSRC}/doc/gpgme.info*
-
 .include <bsd.port.post.mk>
diff --git a/security/gpgme03/distinfo b/security/gpgme03/distinfo
index e4a87099a0ee..c265c67d8d8f 100644
--- a/security/gpgme03/distinfo
+++ b/security/gpgme03/distinfo
@@ -1 +1 @@
-MD5 (gpgme-0.3.15.tar.gz) = 1acbe4b49e60d4b882a43328bc840d42
+MD5 (gpgme-0.3.16.tar.gz) = 0476b219695ea25cb2a97b18b717e381
diff --git a/security/gpgme03/files/patch-ltmain.sh b/security/gpgme03/files/patch-ltmain.sh
new file mode 100644
index 000000000000..85e86e5ae349
--- /dev/null
+++ b/security/gpgme03/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Tue Dec 30 09:32:46 2003
++++ ltmain.sh	Tue Dec 30 09:32:59 2003
+@@ -4333,10 +4333,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/gpgme03/pkg-plist b/security/gpgme03/pkg-plist
index 759c3aa288b8..0a003a2416f1 100644
--- a/security/gpgme03/pkg-plist
+++ b/security/gpgme03/pkg-plist
@@ -1,10 +1,6 @@
 bin/gpgme-config
 include/gpgme.h
-@unexec install-info --delete %D/info/gpgme.info %D/info/dir
-info/gpgme.info
-@exec install-info %D/info/gpgme.info %D/info/dir
 lib/libgpgme.a
-lib/libgpgme.la
 lib/libgpgme.so
 lib/libgpgme.so.9
 share/aclocal/gpgme.m4