Update to 2.19.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9037 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 24 insertions, 8 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 4ae164132..1a5569f6e 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.34 2007/05/12 15:52:38 marcus Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.35 2007/05/19 21:36:21 marcus Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.19.2
-PORTREVISION=	1
+PORTVERSION=	2.19.4
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,10 +21,10 @@ LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
     		gcrypt.13:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 18ccbb20d..325fbc014 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.19.2.tar.bz2) = 523d858597e85d7213ee52df30f654ef
-SHA256 (gnome2/gnome-keyring-2.19.2.tar.bz2) = b75f717863dc59abfd1b1efe6715182faaeefdf8051eeba61d0608dff3aa5341
-SIZE (gnome2/gnome-keyring-2.19.2.tar.bz2) = 437230
+MD5 (gnome2/gnome-keyring-2.19.4.tar.bz2) = b2eb5afa68154b7bc7dea88cad43b6d7
+SHA256 (gnome2/gnome-keyring-2.19.4.tar.bz2) = 3c27467cd591ba34051088421516fe837aa6b1b971df023691427fe39c54aaec
+SIZE (gnome2/gnome-keyring-2.19.4.tar.bz2) = 476463
diff --git a/security/gnome-keyring/files/patch-common_gkr-secure-memory.c b/security/gnome-keyring/files/patch-common_gkr-secure-memory.c
new file mode 100644
index 000000000..8b368a526
--- /dev/null
+++ b/security/gnome-keyring/files/patch-common_gkr-secure-memory.c
@@ -0,0 +1,11 @@
+--- common/gkr-secure-memory.c.orig	Mon Jun 18 21:08:53 2007
++++ common/gkr-secure-memory.c	Mon Jun 18 21:09:11 2007
+@@ -409,7 +409,7 @@ get_locked_pages (unsigned long *sz)
+ 	lock_warning = 0;
+ 	return NULL;
+ #else
+-	pages = mmap (0, *sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
++	pages = mmap (0, *sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+ 	if (pages == MAP_FAILED) {
+ 		if (lock_warning)
+ 			fprintf (stderr, "couldn't map %lu bytes of private memory: %s\n", 
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 56b66a498..c4cba40f3 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,11 +1,14 @@
 bin/gnome-keyring-daemon
+include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring.h
+lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
 libdata/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
 %%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring.html
 %%DOCSDIR%%/gnome-keyring.devhelp
 %%DOCSDIR%%/gnome-keyring.devhelp2
@@ -61,6 +64,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring.mo
 share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
@@ -92,6 +96,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES