[csw-devel] SF.net SVN: gar:[4189] csw/mgar/pkg/wput/trunk

[hson at users.sourceforge.net]

Revision: 4189
          http://gar.svn.sourceforge.net/gar/?rev=4189&view=rev
Author:   hson
Date:     2009-04-05 00:07:48 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
wput: Patches for gnutls

Modified Paths:
--------------
    csw/mgar/pkg/wput/trunk/Makefile
    csw/mgar/pkg/wput/trunk/checksums
    csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff
    csw/mgar/pkg/wput/trunk/files/configure.diff

Modified: csw/mgar/pkg/wput/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wput/trunk/Makefile	2009-04-04 22:55:42 UTC (rev 4188)
+++ csw/mgar/pkg/wput/trunk/Makefile	2009-04-05 00:07:48 UTC (rev 4189)
@@ -17,7 +17,7 @@
 
 PREREQUISITE_PKGS = CSWgnutlsdevel
 
-REQUIRED_PKGS = CSWggettextrt CSWgnutls
+REQUIRED_PKGS = CSWggettextrt CSWgnutls CSWgcrypt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=141519

Modified: csw/mgar/pkg/wput/trunk/checksums
===================================================================
--- csw/mgar/pkg/wput/trunk/checksums	2009-04-04 22:55:42 UTC (rev 4188)
+++ csw/mgar/pkg/wput/trunk/checksums	2009-04-05 00:07:48 UTC (rev 4189)
@@ -1,4 +1,4 @@
 a14c4c13d91d04d6119bdc977e8a8bdf  download/wput-0.6.2.tgz
-90369c3a9dbb27432bdb5ae2611b6a96  download/configure.diff
+424b62a6981cd7372281eb5b143e516d  download/configure.diff
 b9f350b039a04e6ad5af3c4151d06b31  download/Makefile.in.diff
-e6e15f2a2fdac44f31ad4e3403993ff3  download/Makefile.in.src.diff
+ad2fee9c34f44b2c812ba300823eafe0  download/Makefile.in.src.diff

Modified: csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff
===================================================================
--- csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff	2009-04-04 22:55:42 UTC (rev 4188)
+++ csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff	2009-04-05 00:07:48 UTC (rev 4189)
@@ -1,12 +1,11 @@
-diff -ru ../build-global/wput-0.6.2/src/Makefile.in wput-0.6.2/src/Makefile.in
 --- ../build-global/wput-0.6.2/src/Makefile.in	2008-09-27 12:31:23.000000000 +0200
-+++ wput-0.6.2/src/Makefile.in	2009-03-29 18:24:32.132443546 +0200
++++ wput-0.6.2/src/Makefile.in	2009-04-05 01:53:24.184186828 +0200
 @@ -6,7 +6,7 @@
  localedir=$(prefix)/share/locale
  CC=@CC@
  CFLAGS= @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@
 -LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@
-+LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@ -lsocket -lnsl
++LIBS=@LDFLAGS@ @LIBINTL@ @LIBS@ @GNUTLS_LIBS@ -lsocket -lnsl
  EXE=../wput
  GETOPT=@GETOPT@
  MEMDBG=@MEMDBG@

Modified: csw/mgar/pkg/wput/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/wput/trunk/files/configure.diff	2009-04-04 22:55:42 UTC (rev 4188)
+++ csw/mgar/pkg/wput/trunk/files/configure.diff	2009-04-05 00:07:48 UTC (rev 4189)
@@ -1,6 +1,5 @@
-diff -ru ../build-global/wput-0.6.2/configure wput-0.6.2/configure
 --- ../build-global/wput-0.6.2/configure	2008-09-27 12:31:23.000000000 +0200
-+++ wput-0.6.2/configure	2009-03-29 18:17:59.596861076 +0200
++++ wput-0.6.2/configure	2009-04-05 02:02:56.976236308 +0200
 @@ -1736,7 +1736,7 @@
  
  
@@ -10,3 +9,21 @@
  PACKAGE="wput"
  VERSION="0.6.2"
  
+@@ -6632,7 +6632,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes"
+ 
+ 
+-for ac_header in gnutls/gnutls.h, gnutls/openssl.h
++for ac_header in gnutls/gnutls.h gnutls/openssl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -6879,7 +6879,7 @@
+ _ACEOF
+ 
+ 			msg_gnutls="GNUTLS"
+-			GNUTLS_LIBS="$with_gnutls_libs -lgnutls-openssl"
++			GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt -lgnutls-openssl"
+ 
+ 			with_ssl="yes"
+ 		else


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