[csw-devel] SF.net SVN: gar:[15580] csw/mgar/pkg/wget/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Sep 8 21:56:29 CEST 2011
Revision: 15580
http://gar.svn.sourceforge.net/gar/?rev=15580&view=rev
Author: dmichelsen
Date: 2011-09-08 19:56:28 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
wget: Update to 1.13.3
Modified Paths:
--------------
csw/mgar/pkg/wget/trunk/Makefile
csw/mgar/pkg/wget/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/wget/trunk/files/0001-Features-patch.patch
csw/mgar/pkg/wget/trunk/files/0002-Make-sure-FIONBIO-is-defined.patch
Modified: csw/mgar/pkg/wget/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wget/trunk/Makefile 2011-09-08 19:45:20 UTC (rev 15579)
+++ csw/mgar/pkg/wget/trunk/Makefile 2011-09-08 19:56:28 UTC (rev 15580)
@@ -4,10 +4,10 @@
# https://lists.gnu.org/archive/html/bug-wget/2011-09/msg00001.html
NAME = wget
-VERSION = 1.12
+VERSION = 1.13.3
CATEGORIES = net
-DESCRIPTION = A network utility to retrieve files from the Web
+DESCRIPTION = A network utility to retrieve files from the web
define BLURB
GNU Wget is a utility for noninteractive download of files from the Web. It
supports HTTP and FTP protocols, as well as retrieval through HTTP proxies. It
@@ -19,31 +19,44 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+DISTFILES = $(NAME)-$(VERSION).tar.xz
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+# This is the reformatted patch wget-1.13.3.patch from
+# https://lists.gnu.org/archive/html/bug-wget/2011-09/msg00001.html
+PATCHFILES += 0001-Features-patch.patch
-SPKG_SOURCEURL = http://www.gnu.org/software/wget/
+# This is from
+# https://lists.gnu.org/archive/html/bug-wget/2011-09/msg00004.html
+PATCHFILES += 0002-Make-sure-FIONBIO-is-defined.patch
+VENDOR_URL = http://www.gnu.org/software/wget/
+
+PACKAGES += CSWwget
+SPKG_DESC_CSWwget = A network utility to retrieve files from the web
+RUNTIME_DEP_PKGS_CSWwget += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWwget += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWwget += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWwget += CSWlibz1
+RUNTIME_DEP_PKGS_CSWwget += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWwget += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWwget += CSWlibidn11
+
EXTRA_MODULATORS = STATIC
MODULATIONS_STATIC = disable enable
-EXTRA_CONFIGURE_STATIC-disable = --with-ssl
-EXTRA_CONFIGURE_STATIC-enable = --disable-shared
-EXTRA_CONFIGURE_STATIC-enable += --enable-static
+EXTRA_CONFIGURE_STATIC-disable += --with-ssl
+
EXTRA_CONFIGURE_STATIC-enable += --without-ssl
+EXTRA_CONFIGURE_STATIC-enable += --disable-nls
+EXTRA_CONFIGURE_STATIC-enable += --disable-iri
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-ssl
-CONFIGURE_ARGS += --disable-nls
CONFIGURE_ARGS += $(EXTRA_CONFIGURE_STATIC-$(STATIC))
-TEST_TARGET = check
-RUNTIME_DEP_PKGS = CSWosslrt
+PRESERVECONF = $(sysconfdir)/wgetrc
+MIGRATE_FILES = wgetrc
-SAMPLECONF = $(sysconfdir)/wgetrc
-#EXTRA_PAX_ARGS = -s ",^\(.$(sysconfdir)/wgetrc\)\$$,\1.CSW,p"
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias
MERGE_SCRIPTS_isa-sparcv8-static-disable = copy-all
MERGE_SCRIPTS_isa-sparcv8-static-enable = copy-static-wget-only
@@ -53,8 +66,23 @@
MERGE_SCRIPTS_isa-i386-static-enable = rename-wget copy-only
MERGE_DIRS_isa-i386-static-enable = $(bindir)
+# This is ok, it is just one example occurrence, all others have been replaced
+CHECKPKG_OVERRIDES_CSWwget += file-with-bad-content|/usr/local|root/opt/csw/share/info/wget.info
+
+include gar/category.mk
+
+post-extract-modulated:
+ @# Make sure our perl is used as the /usr/bin/perl lacks some needed modules
+ -perl -pi -e 's,#!/usr/bin/env perl,#!/opt/csw/bin/perl,' \
+ $(WORKSRC)/tests/*.px \
+ $(WORKSRC)/tests/run-px
+
merge-copy-static-wget-only:
ginstall $(INSTALLISADIR)$(bindir)/wget $(PKGROOT)$(bindir)/wget.static
@$(MAKECOOKIE)
-include gar/category.mk
+post-install-modulated:
+ perl -pi -e 's,/usr/local/etc,$(sysconfdir),g' \
+ $(DESTDIR)$(infodir)/wget.info \
+ $(DESTDIR)$(mandir)/man1/wget.1 \
+ $(DESTDIR)$(sysconfdir)/wgetrc
Modified: csw/mgar/pkg/wget/trunk/checksums
===================================================================
--- csw/mgar/pkg/wget/trunk/checksums 2011-09-08 19:45:20 UTC (rev 15579)
+++ csw/mgar/pkg/wget/trunk/checksums 2011-09-08 19:56:28 UTC (rev 15580)
@@ -1 +1 @@
-308a5476fc096a8a525d07279a6f6aa3 download/wget-1.12.tar.bz2
+540cbd50909885fe11bd7bc4f75268d1 wget-1.13.3.tar.xz
Added: csw/mgar/pkg/wget/trunk/files/0001-Features-patch.patch
===================================================================
--- csw/mgar/pkg/wget/trunk/files/0001-Features-patch.patch (rev 0)
+++ csw/mgar/pkg/wget/trunk/files/0001-Features-patch.patch 2011-09-08 19:56:28 UTC (rev 15580)
@@ -0,0 +1,25 @@
+From 6be9f8dbd84b5e1c61d46c1348f172afface0318 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 8 Sep 2011 10:45:42 +0200
+Subject: [PATCH] Features patch
+
+---
+ src/main.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index ff5e6af..9b704d1 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -824,7 +824,7 @@ print_version (void)
+ int line_length = MAX_CHARS_PER_LINE;
+ while ((line_length > 0) && (compiled_features[i] != NULL))
+ {
+- if (printf ("%s ", compiled_features[i]))
++ if (printf ("%s ", compiled_features[i]) < 0)
+ exit (3);
+ line_length -= strlen (compiled_features[i]) + 2;
+ i++;
+--
+1.7.6
+
Added: csw/mgar/pkg/wget/trunk/files/0002-Make-sure-FIONBIO-is-defined.patch
===================================================================
--- csw/mgar/pkg/wget/trunk/files/0002-Make-sure-FIONBIO-is-defined.patch (rev 0)
+++ csw/mgar/pkg/wget/trunk/files/0002-Make-sure-FIONBIO-is-defined.patch 2011-09-08 19:56:28 UTC (rev 15580)
@@ -0,0 +1,25 @@
+From cbac50c7c355cbff05fcbb2322934e475bd526a2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 8 Sep 2011 11:07:39 +0200
+Subject: [PATCH] Make sure FIONBIO is defined
+
+---
+ src/gnutls.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/gnutls.c b/src/gnutls.c
+index dfff00c..40a04ef 100644
+--- a/src/gnutls.c
++++ b/src/gnutls.c
+@@ -48,6 +48,8 @@ as that of the covered work. */
+ #include "ptimer.h"
+ #include "ssl.h"
+
++#include <sys/fcntl.h>
++
+ #ifdef WIN32
+ # include "w32sock.h"
+ #endif
+--
+1.7.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list