Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/web
In directory vz-cvs-3.sog:/tmp/cvs-serv30424/10.4/stable/main/finkinfo/web

Modified Files:
        wget.info 
Log Message:
Variantize the hell out of this beast.

Index: wget.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/web/wget.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- wget.info   10 Nov 2011 13:24:30 -0000      1.15
+++ wget.info   11 Nov 2011 00:58:50 -0000      1.16
@@ -1,44 +1,69 @@
-Package:  wget
+Info2: <<
+Package:  wget%type_pkg[-gnutls]%type_pkg[-idn]
 Version: 1.13.4
-Revision: 2
+Revision: 3
+Type: -gnutls (boolean), -idn (boolean)
 Description: Automatic web site retriever (SSL)
-Conflicts: wget-ssl ( << 1.10.1-1 ),fink ( << 0.24.11-1 )
-Replaces: wget-ssl ( << 1.10.1-1 )
+Conflicts: <<
+       %{ni}-ssl ( << 1.10.1-1 ),
+       %{ni},
+       %{ni}-gnutls,
+       %{ni}-idn,
+       %{ni}-gnutls-idn,
+       fink ( << 0.24.11-1 )
+<<
+Replaces: <<
+       %{ni}-ssl ( << 1.10.1-1 ),
+       %{ni},
+       %{ni}-gnutls,
+       %{ni}-idn,
+       %{ni}-gnutls-idn
+<<     
 BuildDepends: <<
-libgettext8-dev,
-gettext-bin ( >= 0.17-19 ),
-gettext-tools ( >= 0.17-17 ),
-gnutls26,
-libiconv-dev,
-libgcrypt,
-libgpg-error,
-libidn,
-fink-package-precedence
+       libgettext8-dev,
+       gettext-bin ( >= 0.17-19 ),
+       gettext-tools ( >= 0.17-17 ),
+       libiconv-dev,
+       ( %type_raw[-gnutls] = . )                      system-openssl-dev,
+       ( %type_raw[-gnutls] = -gnutls )        gnutls26,
+       ( %type_raw[-idn] = -idn )                      libidn,
+       fink-package-precedence
 <<
 Depends: <<
-        libgcrypt-shlibs,
-        gnutls26-shlibs,
-        libgpg-error-shlibs,
-        libiconv,
-        libidn-shlibs,
-        libgettext8-shlibs
+        libgettext8-shlibs,
+        ( %type_raw[-gnutls] = -gnutls )       gnutls26-shlibs,
+        ( %type_raw[-gnutls] = -idn )          libidn-shlibs,
+        ( %type_raw[-idn] = -idn )             libiconv
 <<
 Suggests: ca-bundle
-Source: mirror:gnu:wget/wget-%v.tar.gz
+
+Source: mirror:gnu:%{ni}/%{ni}-%v.tar.gz
 Source-MD5: 1df489976a118b9cbe1b03502adbfc27
+
+PatchScript: perl -pi -e's|/usr/local|%p|' doc/wget.texi doc/sample.wgetrc
+
+SetLDFLAGS: -Wl,-dead_strip_dylibs
+
 ConfigureParams: <<
---with-ssl=%p/lib/system-openssl\
- --infodir=%p/share/info\
- --mandir=%p/share/man\
- --enable-dependency-tracking
-<<
-PatchScript: <<
-perl -pi -e's|/usr/local|%p|' doc/wget.texi doc/sample.wgetrc
+       ( %type_raw[-gnutls] = . )                      --with-ssl=openssl \
+       ( %type_raw[-gnutls] = . )                      
--with-libssl-prefix=/usr \
+       ( %type_raw[-gnutls] = -gnutls )        --with-ssl=gnutls \
+       ( %type_raw[-idn] = . )                         --disable-iri \
+       ( %type_raw[-idn] = -idn )                      --with-libidn=%p \
+       --infodir=%p/share/info \
+       --mandir=%p/share/man \
+       --enable-dependency-tracking
 <<
 
 CompileScript: <<
-%{default_script}
-fink-package-precedence .
+       #!/bin/sh -ev
+    if [ "%type_raw[-gnutls]" = "." ] 
+       then 
+       export CPPFLAGS=$CPPFLAGS:-I%p/lib/system-openssl/include
+       export LDFLAGS=$LDFLAGS:-L%p/lib/system-openssl/lib
+       fi
+       %{default_script}
+       fink-package-precedence .
 <<
 
 InstallScript: <<
@@ -58,6 +83,15 @@
 supported -- you can use Wget to make mirrors of archives and home
 pages, or traverse the web like a WWW robot.
 
+There have been significant changes in the 1.13.x line.
+* All variants include internationalization support.
+* The "wget" package is essentially like what has been in Fink since version
+  1.10.1:  using the system's OpenSSL.
+  support.
+* The "wget-gnutls" package uses GNUTLS instead of OpenSSL.
+* The "wget-idn" and "wget-gnutls-idn" packages add IDN/IRIs support.
+<<
+DescUsage: <<
 To have wget automatically use certificates on 10.4 or 10.5, 
 do the following:
  
@@ -84,7 +118,8 @@
  present, because wget-1.10.x switched to a more GNU-standard 
  --no-verbose.
  Now uses gettext8.
- No longer uses OpenSSL. 
+ Either uses the system's openssl or GNUTLS, depdending on which variant
+ is chosen.
 
  Previous revisions by Christoph Pfisterer <chr...@users.sourceforge.net> 
  and Sylvain Cuaz (z...@users.sourceforge.net)
@@ -92,3 +127,4 @@
 License: GPL
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 Homepage: http://www.gnu.org/software/wget/wget.html
+<<
\ No newline at end of file


------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to