Update to 0.3.2.

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

6 files changed, 78 insertions, 10 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 0d2363322..0cc01e44c 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomekeyring
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-keyring/0.3
@@ -18,9 +18,9 @@ COMMENT=	A program that keeps passwords and other secrets
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack lthack gtk20
+USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 4fad597e1..fc65a8a52 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-keyring-0.3.1.tar.bz2) = 526de61788e96b4c8a6e7cfb74335aa5
-SIZE (gnome2/gnome-keyring-0.3.1.tar.bz2) = 328787
+MD5 (gnome2/gnome-keyring-0.3.2.tar.bz2) = 9abb4cb041d593de295ee94121676a13
+SIZE (gnome2/gnome-keyring-0.3.2.tar.bz2) = 332362
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c
new file mode 100644
index 000000000..293df59b9
--- /dev/null
+++ b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c
@@ -0,0 +1,34 @@
+--- gnome-keyring-daemon.c.orig	Tue Jul 20 22:41:27 2004
++++ gnome-keyring-daemon.c	Tue Jul 20 22:43:03 2004
+@@ -121,7 +121,7 @@
+ 	int i;
+ 
+ 	got_random = FALSE;
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+ 	{
+ 		int fd;
+ 
+@@ -352,6 +352,22 @@
+ 			app_ref->pathname[len] = 0;
+ 		}
+ 		
++	}
++#elif defined(__FreeBSD__)
++	{
++		char buffer[1024];
++		int len;
++		char *path;
++
++		path = g_strdup_printf ("/proc/%d/file", pid);
++		len = readlink (path, buffer, sizeof (buffer));
++		g_free (path);
++
++		if (len > 0) {
++			app_ref->pathname = g_malloc (len + 1);
++			memcpy (app_ref->pathname, buffer, len);
++			app_ref->pathname[len] = 0;
++		}
+ 	}
+ #endif
+ 
diff --git a/security/gnomekeyring/Makefile b/security/gnomekeyring/Makefile
index 0d2363322..0cc01e44c 100644
--- a/security/gnomekeyring/Makefile
+++ b/security/gnomekeyring/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomekeyring
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-keyring/0.3
@@ -18,9 +18,9 @@ COMMENT=	A program that keeps passwords and other secrets
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack lthack gtk20
+USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnomekeyring/distinfo b/security/gnomekeyring/distinfo
index 4fad597e1..fc65a8a52 100644
--- a/security/gnomekeyring/distinfo
+++ b/security/gnomekeyring/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-keyring-0.3.1.tar.bz2) = 526de61788e96b4c8a6e7cfb74335aa5
-SIZE (gnome2/gnome-keyring-0.3.1.tar.bz2) = 328787
+MD5 (gnome2/gnome-keyring-0.3.2.tar.bz2) = 9abb4cb041d593de295ee94121676a13
+SIZE (gnome2/gnome-keyring-0.3.2.tar.bz2) = 332362
diff --git a/security/gnomekeyring/files/patch-gnome-keyring-daemon.c b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c
new file mode 100644
index 000000000..293df59b9
--- /dev/null
+++ b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c
@@ -0,0 +1,34 @@
+--- gnome-keyring-daemon.c.orig	Tue Jul 20 22:41:27 2004
++++ gnome-keyring-daemon.c	Tue Jul 20 22:43:03 2004
+@@ -121,7 +121,7 @@
+ 	int i;
+ 
+ 	got_random = FALSE;
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+ 	{
+ 		int fd;
+ 
+@@ -352,6 +352,22 @@
+ 			app_ref->pathname[len] = 0;
+ 		}
+ 		
++	}
++#elif defined(__FreeBSD__)
++	{
++		char buffer[1024];
++		int len;
++		char *path;
++
++		path = g_strdup_printf ("/proc/%d/file", pid);
++		len = readlink (path, buffer, sizeof (buffer));
++		g_free (path);
++
++		if (len > 0) {
++			app_ref->pathname = g_malloc (len + 1);
++			memcpy (app_ref->pathname, buffer, len);
++			app_ref->pathname[len] = 0;
++		}
+ 	}
+ #endif
+