Revision: 147378 https://trac.macports.org/changeset/147378 Author: devans@macports.org Date: 2016-04-02 14:31:22 -0700 (Sat, 02 Apr 2016) Log Message: ----------- gnome-keyring: update to version 3.20.0, remove outdated patch file. Modified Paths: -------------- trunk/dports/gnome/gnome-keyring/Portfile trunk/dports/gnome/gnome-keyring/files/autogen.sh Removed Paths: ------------- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff Property Changed: ---------------- trunk/dports/gnome/gnome-keyring/ Property changes on: trunk/dports/gnome/gnome-keyring ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-140741 /users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156,125236-125738,133845-134673,139149-140633 /users/rmstonecipher/gnome/gnome-keyring:102363-103172 + /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-147295 /users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156,125236-125738,133845-134673,139149-140633,144878-147068 /users/rmstonecipher/gnome/gnome-keyring:102363-103172 Modified: trunk/dports/gnome/gnome-keyring/Portfile =================================================================== --- trunk/dports/gnome/gnome-keyring/Portfile 2016-04-02 21:30:57 UTC (rev 147377) +++ trunk/dports/gnome/gnome-keyring/Portfile 2016-04-02 21:31:22 UTC (rev 147378) @@ -6,7 +6,7 @@ name gnome-keyring epoch 1 -version 3.18.3 +version 3.20.0 set branch [join [lrange [split ${version} .] 0 1] .] maintainers devans openmaintainer categories gnome @@ -23,8 +23,8 @@ use_xz yes -checksums rmd160 a836c50350789a385978be2a2ec8e13397f606d2 \ - sha256 3f670dd61789bdda75b9c9e31e289bf7b1d23ba012433474790081ba7dc0ed98 +checksums rmd160 fd59722dde7aeb3ab96b7a0e8aeb335a3ea96349 \ + sha256 bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99 depends_build port:pkgconfig \ port:intltool \ @@ -44,7 +44,6 @@ patchfiles patch-egg-egg-asn1x.h.diff \ patch-egg-egg-armor.c.diff \ - patch-egg-egg-spawn.h.diff \ patch-pkcs11-wrap-layer-mock-secret-store.c.diff # reconfigure using upstream autogen.sh for intltool 0.51 compatibility Modified: trunk/dports/gnome/gnome-keyring/files/autogen.sh =================================================================== --- trunk/dports/gnome/gnome-keyring/files/autogen.sh 2016-04-02 21:30:57 UTC (rev 147377) +++ trunk/dports/gnome/gnome-keyring/files/autogen.sh 2016-04-02 21:31:22 UTC (rev 147378) @@ -5,6 +5,7 @@ USE_GNOME2_MACROS=1 REQUIRED_AUTOMAKE_VERSION=1.7 +olddir=`pwd` srcdir=`dirname $0` test -z "$srcdir" && srcdir=. @@ -21,3 +22,9 @@ } . gnome-autogen.sh + +# Put a redirect makefile here +if [ ! -f $srcdir/Makefile ]; then + cat $srcdir/build/Makefile.redirect > $srcdir/Makefile + printf "\nREDIRECT = %s\n" "$(realpath $olddir)" >> $srcdir/Makefile +fi Deleted: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff =================================================================== --- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff 2016-04-02 21:30:57 UTC (rev 147377) +++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-spawn.h.diff 2016-04-02 21:31:22 UTC (rev 147378) @@ -1,11 +0,0 @@ ---- egg/egg-spawn.h.orig 2014-09-23 17:45:13.000000000 +1000 -+++ egg/egg-spawn.h 2015-05-20 15:27:47.000000000 +1000 -@@ -21,7 +21,7 @@ - */ - - #ifndef EGG_SPAWN_H_ --#define EGG_SUB_PROCESS_H_ -+#define EGG_SPAWN_H_ - - #include <glib-object.h> -