[42286] trunk/dports/gnome/gnome-keyring
jmr at macports.org
jmr at macports.org
Mon Nov 17 23:10:21 PST 2008
Revision: 42286
http://trac.macports.org/changeset/42286
Author: jmr at macports.org
Date: 2008-11-17 23:10:20 -0800 (Mon, 17 Nov 2008)
Log Message:
-----------
gnome-keyring: add upstream patch to fix detection of libtasn1. Fixes #17197.
Modified Paths:
--------------
trunk/dports/gnome/gnome-keyring/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile 2008-11-18 01:59:01 UTC (rev 42285)
+++ trunk/dports/gnome/gnome-keyring/Portfile 2008-11-18 07:10:20 UTC (rev 42286)
@@ -26,7 +26,8 @@
rmd160 17c6701ef7b35902780b6c72b79a3f0eaafe2378
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:autoconf
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gtk2 \
@@ -36,8 +37,11 @@
port:libtasn1 \
port:gconf
-patchfiles patch-library-gnome-keyring.c.diff
+patchfiles patch-library-gnome-keyring.c.diff \
+ patch-configure.in.diff
+use_autoconf yes
+
test.run yes
test.target check
Added: trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff 2008-11-18 07:10:20 UTC (rev 42286)
@@ -0,0 +1,147 @@
+--- /tmp/gnome-keyring-2.22.3/configure.in 2008-07-01 01:29:13.000000000 +1000
++++ configure.in 2008-11-15 10:04:18.000000000 +1100
+@@ -379,15 +379,136 @@
+ # libtasn1
+ #
+
+-GKR_LIBTASN1_VERSION=0.3.4
++min_libtasn1_version=0.3.4
+
+-AM_PATH_LIBTASN1($GKR_LIBTASN1_VERSION,,
+- AC_MSG_ERROR([[
+-***
+-*** LibtASN1 ${GKR_LIBTASN1_VERSION} was not found.
+-]]))
+-libtasn=yes
+-AC_DEFINE_UNQUOTED(GKR_LIBGCRYPT_VERSION, "$GKR_LIBTASN1_VERSION", [Version of libtasn1 we expect])
++# shamelessly stolen from upstream devs
++
++AC_PATH_PROG(LIBTASN1_CONFIG, libtasn1-config, no)
++no_libtasn1=""
++if test "$LIBTASN1_CONFIG" = "no" ; then
++ PKG_CHECK_MODULES(LIBTASN1, libtasn1 >= $min_libtasn1_version)
++ no_libtasn1=no
++else
++ AC_MSG_CHECKING(for libtasn1 - version >= $min_libtasn1_version)
++ LIBTASN1_CFLAGS=`$LIBTASN1_CONFIG --cflags`
++ LIBTASN1_LIBS=`$LIBTASN1_CONFIG --libs`
++ libtasn1_config_version=`$LIBTASN1_CONFIG --version`
++
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $LIBTASN1_CFLAGS"
++ LIBS="$LIBS $LIBTASN1_LIBS"
++
++ rm -f conf.libtasn1test
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <libtasn1.h>
++
++int
++main ()
++{
++ system ("touch conf.libtasn1test");
++
++ if( strcmp( asn1_check_version(NULL), "$libtasn1_config_version" ) )
++ {
++ printf("\n*** 'libtasn1-config --version' returned %s, but LIBTASN1 (%s)\n",
++ "$libtasn1_config_version", asn1_check_version(NULL) );
++ printf("*** was found! If libtasn1-config was correct, then it is best\n");
++ printf("*** to remove the old version of LIBTASN1. You may also be able to fix the error\n");
++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++ printf("*** required on your system.\n");
++ printf("*** If libtasn1-config was wrong, set the environment variable LIBTASN1_CONFIG\n");
++ printf("*** to point to the correct copy of libtasn1-config, and remove the file config.cache\n");
++ printf("*** before re-running configure\n");
++ }
++ else if ( strcmp(asn1_check_version(NULL), LIBTASN1_VERSION ) )
++ {
++ printf("\n*** LIBTASN1 header file (version %s) does not match\n", LIBTASN1_VERSION);
++ printf("*** library (version %s)\n", asn1_check_version(NULL) );
++ }
++ else
++ {
++ if ( asn1_check_version( "$min_libtasn1_version" ) )
++ {
++ return 0;
++ }
++ else
++ {
++ printf("no\n*** An old version of LIBTASN1 (%s) was found.\n",
++ asn1_check_version(NULL) );
++ printf("*** You need a version of LIBTASN1 newer than %s. The latest version of\n",
++ "$min_libtasn1_version" );
++ printf("*** LIBTASN1 is always available from ftp://gnutls.hellug.gr/pub/gnutls/libtasn1.\n");
++ printf("*** \n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the libtasn1-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of LIBTASN1, but you can also set the LIBTASN1_CONFIG environment to point to the\n");
++ printf("*** correct copy of libtasn1-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ }
++ return 1;
++}
++ ],, no_libtasn1=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++
++ if test "x$no_libtasn1" = x ; then
++ AC_MSG_RESULT(yes)
++ else
++ if test -f conf.libtasn1test ; then
++ :
++ else
++ AC_MSG_RESULT(no)
++ fi
++ if test "$LIBTASN1_CONFIG" = "no" ; then
++ echo "*** The libtasn1-config script installed by LIBTASN1 could not be found"
++ echo "*** If LIBTASN1 was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the LIBTASN1_CONFIG environment variable to the"
++ echo "*** full path to libtasn1-config."
++ else
++ if test -f conf.libtasn1test ; then
++ :
++ else
++ echo "*** Could not run libtasn1 test program, checking why..."
++ CFLAGS="$CFLAGS $LIBTASN1_CFLAGS"
++ LIBS="$LIBS $LIBTASN1_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <libtasn1.h>
++], [ return !!asn1_check_version(NULL); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding LIBTASN1 or finding the wrong"
++ echo "*** version of LIBTASN1. If it is not finding LIBTASN1, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***" ],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means LIBTASN1 was incorrectly installed"
++ echo "*** or that you have moved LIBTASN1 since it was installed. In the latter case, you"
++ echo "*** may want to edit the libtasn1-config script: $LIBTASN1_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ LIBTASN1_CFLAGS=""
++ LIBTASN1_LIBS=""
++ fi
++ rm -f conf.libtasn1test
++fi
++
++AC_DEFINE_UNQUOTED(GKR_LIBTASN1_VERSION, "$min_libtasn1_version", [Version of libtasn1 we expect])
+
+ DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBTASN1_CFLAGS"
+ DAEMON_LIBS="$DAEMON_LIBS $LIBTASN1_LIBS"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081117/b6d0756e/attachment.html>
More information about the macports-changes
mailing list