[csw-devel] SF.net SVN: gar:[2986] csw/mgar/pkg/gnupg/trunk

[valholla at users.sourceforge.net]

Revision: 2986
          http://gar.svn.sourceforge.net/gar/?rev=2986&view=rev
Author:   valholla
Date:     2009-02-04 15:12:47 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
update Makefile and add patchfile

Modified Paths:
--------------
    csw/mgar/pkg/gnupg/trunk/Makefile
    csw/mgar/pkg/gnupg/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gnupg/trunk/files/patch-keyserver_and_sm.diff

Modified: csw/mgar/pkg/gnupg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg/trunk/Makefile	2009-02-04 08:39:56 UTC (rev 2985)
+++ csw/mgar/pkg/gnupg/trunk/Makefile	2009-02-04 15:12:47 UTC (rev 2986)
@@ -13,15 +13,27 @@
 
 SPKG_SOURCEURL = http://www.gnupg.org/
 
-# We define upstream file regex so we can be notifed of new upstream software release
+# fix some missing libraries for Keyserver tools and gpgsm
+PATCHFILES = patch-keyserver_and_sm.diff
+
+# We define upstream file regex so we can be notifed of 
+# new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2
 
+PREREQUISITE_PKGS =  CSWcommon
+PREREQUISITE_PKGS += CSWlibksba CSWgpgerr CSWgcrypt CSWlibassuan
+PREREQUISITE_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth
+PREREQUISITE_PKGS += CSWbzip2 CSWreadline CSWncurses
+
 # This is somehow not correctly detected from autoconf
 EXTRA_LINKER_FLAGS = -lgpg-error
 
 # Needed for nanosleep()
 EXTRA_LINKER_FLAGS += -lrt
 
+BUILD64 = 1
+NO_ISAEXEC = 1
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libcurl
 CONFIGURE_ARGS += --with-ldap

Modified: csw/mgar/pkg/gnupg/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnupg/trunk/checksums	2009-02-04 08:39:56 UTC (rev 2985)
+++ csw/mgar/pkg/gnupg/trunk/checksums	2009-02-04 15:12:47 UTC (rev 2986)
@@ -1,2 +1,3 @@
 1cb778dd555f87685a8fde2f7113725e  download/gnupg-2.0.10.tar.bz2
 7978eaabeceaa781a1600ede3a6d3f67  download/CSWgnupg.gspec
+37677df3905ce0e4b23a2fb3cc4d7207  download/patch-keyserver_and_sm.diff

Added: csw/mgar/pkg/gnupg/trunk/files/patch-keyserver_and_sm.diff
===================================================================
--- csw/mgar/pkg/gnupg/trunk/files/patch-keyserver_and_sm.diff	                        (rev 0)
+++ csw/mgar/pkg/gnupg/trunk/files/patch-keyserver_and_sm.diff	2009-02-04 15:12:47 UTC (rev 2986)
@@ -0,0 +1,40 @@
+diff -Nru gnupg-2.0.10.orig/keyserver/Makefile.in gnupg-2.0.10/keyserver/Makefile.in
+--- gnupg-2.0.10.orig/keyserver/Makefile.in	2009-01-12 03:29:44.000000000 -0600
++++ gnupg-2.0.10/keyserver/Makefile.in	2009-02-03 21:29:41.031225041 -0600
+@@ -395,7 +395,7 @@
+ libexec_SCRIPTS = $(GPGKEYS_MAILTO)
+ noinst_SCRIPTS = gpg2keys_test
+ common_libs = ../gl/libgnu.a  ../common/libcommon.a ../jnlib/libjnlib.a
+-other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
++other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ../jnlib/libjnlib.a
+ gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
+ gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
+ gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(GPG_ERROR_LIBS) \
+@@ -417,13 +417,13 @@
+ 	$(am__append_8)
+ @FAKE_CURL_FALSE at gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
+ @FAKE_CURL_TRUE at gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
+- at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
++ at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) $(other_libs)
+ @FAKE_CURL_TRUE at gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
+ @FAKE_CURL_TRUE@	              $(other_libs) 
+ 
+ @FAKE_CURL_FALSE at gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
+ @FAKE_CURL_TRUE at gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
+- at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
++ at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) $(other_libs)
+ @FAKE_CURL_TRUE at gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
+ @FAKE_CURL_TRUE@	             $(other_libs) 
+ 
+diff -Nru gnupg-2.0.10.orig/sm/Makefile.in gnupg-2.0.10/sm/Makefile.in
+--- gnupg-2.0.10.orig/sm/Makefile.in	2009-01-12 03:29:44.000000000 -0600
++++ gnupg-2.0.10/sm/Makefile.in	2009-02-03 21:30:03.836999289 -0600
+@@ -375,7 +375,7 @@
+ common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
+               ../gl/libgnu.a
+ 
+-gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
++gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \
+               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
+               $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV)
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.