[107298] trunk/dports/gnome/gnome-keyring

[devans at macports.org]

Revision: 107298
          https://trac.macports.org/changeset/107298
Author:   devans at macports.org
Date:     2013-06-25 07:54:28 -0700 (Tue, 25 Jun 2013)
Log Message:
-----------
gnome-keyring: update to verson 2.32.1.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-keyring/Portfile
    trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff

Added Paths:
-----------
    trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff

Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile	2013-06-25 14:54:13 UTC (rev 107297)
+++ trunk/dports/gnome/gnome-keyring/Portfile	2013-06-25 14:54:28 UTC (rev 107298)
@@ -5,8 +5,7 @@
 
 name            gnome-keyring
 epoch           1
-version         2.30.3
-revision        6
+version         2.32.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     devans openmaintainer
 categories      gnome
@@ -22,44 +21,34 @@
 
 homepage        http://live.gnome.org/GnomeKeyring/
 master_sites    gnome:sources/${name}/${branch}/
+
 use_bzip2       yes
 
-checksums       md5     54cb1835c02a40f27fda73e58da17cc6 \
-                sha1    0e0a2a1f4127dc6a01583fb3e81386370d9335f0 \
-                rmd160  9bd3cea25e10e1dcd93cfbc75a6a448e8ab338ca
+checksums       rmd160  cb72f171f5918ff26f40feb7bba90dc7e2e120ec \
+                sha256  31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
 
 patchfiles      patch-pkcs11-secret-store-Makefile.am.diff \
                 patch-configure.in.diff \
-                patch-pam-gkr-pam-module.c.diff
+                patch-pam-gkr-pam-module.c.diff \
+                patch-egg-egg-asn1x.c.diff
 
 depends_build   port:pkgconfig \
                 port:intltool \
                 port:gtk-doc
 
-depends_lib     port:libgcrypt \
-                port:libpng \
-                port:libtasn1 \
-                port:gconf
+depends_lib     port:gtk2 \
+                port:dbus \
+                port:libgcrypt \
+                port:libtasn1
 
 use_autoreconf  yes
 
 configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
-configure.args  --with-pam-dir=/usr/lib/pam \
-                --disable-schemas-install
+configure.args  --with-gtk=2.0 \
+                --with-pam-dir=/usr/lib/pam \
+                --disable-silent-rules \
+                --disable-schemas-compile
 
-test.run        yes
-test.target     check
-
-pre-test {
-    if {! [variant_isset test]} {
-        return -code 1 "You must enable test variant to test this port."
-    }
-}
-
-variant test description {Enable build of tests} {
-    configure.args-append   --enable-tests
-}
-
 destroot.violate_mtree yes
 
 post-destroot {
@@ -67,8 +56,7 @@
 }
 
 post-activate {
-    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
-        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
 livecheck.type  gnome

Modified: trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff	2013-06-25 14:54:13 UTC (rev 107297)
+++ trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff	2013-06-25 14:54:28 UTC (rev 107298)
@@ -1,15 +1,15 @@
---- configure.in.orig	2010-06-21 06:51:38.000000000 -0700
-+++ configure.in	2010-10-07 15:14:13.000000000 -0700
+--- configure.in.orig	2010-10-25 15:46:18.000000000 -0700
++++ configure.in	2013-05-07 19:09:07.000000000 -0700
 @@ -1,7 +1,7 @@
  AC_INIT(daemon/gkd-main.c)
  
- AM_INIT_AUTOMAKE(gnome-keyring, 2.30.3)
+ AM_INIT_AUTOMAKE(gnome-keyring, 2.32.1)
 -AM_CONFIG_HEADER(config.h)
 +AC_CONFIG_HEADERS(config.h)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  
  dnl ****************************************************************************
-@@ -47,7 +47,7 @@ GTK_DOC_CHECK(1.9)
+@@ -66,7 +66,7 @@
  DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
  
@@ -18,14 +18,3 @@
  AC_SUBST(GLIB_CFLAGS)
  AC_SUBST(GLIB_LIBS)
  
-@@ -235,8 +235,8 @@
- 
- pam_status="no"
- if test "$enable_pam" != "no"; then
--	AC_CHECK_HEADER(security/pam_modules.h, have_pam=yes, have_pam=no)
--	if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
-+	AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h, [have_pam=yes; break], have_pam=no)
-+        if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
- 		AC_MSG_ERROR(The PAM headers are missing)
- 	elif test "$have_pam" = "yes"; then
- 		old_LIBS=$LIBS

Added: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff	2013-06-25 14:54:28 UTC (rev 107298)
@@ -0,0 +1,13 @@
+--- egg/egg-asn1x.c.orig	2013-04-07 16:21:41.000000000 -0700
++++ egg/egg-asn1x.c	2013-04-07 16:22:19.000000000 -0700
+@@ -1988,8 +1988,8 @@
+ 	guchar buf[sizeof (gulong)];
+ 	gint bytes, i, off;
+ 
+-	for (i = 0; i < sizeof (ulong); ++i) {
+-		off = sizeof (ulong) - (i + 1);
++	for (i = 0; i < sizeof (gulong); ++i) {
++		off = sizeof (gulong) - (i + 1);
+ 		buf[i] = (value >> (off * 8)) & 0xFF;
+ 	}
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130625/03993373/attachment-0001.html>