[csw-devel] SF.net SVN: gar:[6053] csw/mgar/pkg/wget/trunk

[dmichelsen at users.sourceforge.net]

Revision: 6053
          http://gar.svn.sourceforge.net/gar/?rev=6053&view=rev
Author:   dmichelsen
Date:     2009-08-19 11:28:47 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
wget: Some minor GAR fixes

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

Removed Paths:
-------------
    csw/mgar/pkg/wget/trunk/files/CSWwget.gspec

Modified: csw/mgar/pkg/wget/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wget/trunk/Makefile	2009-08-19 11:24:28 UTC (rev 6052)
+++ csw/mgar/pkg/wget/trunk/Makefile	2009-08-19 11:28:47 UTC (rev 6053)
@@ -13,15 +13,14 @@
   whole file has been retrieved.
 endef
 
-MASTER_SITES = http://www.gnu.org/software/wget/
+MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWwget)
 
-UPSTREAM_MASTER_SITES = $(GNU_MIRROR)
-
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
+SPKG_SOURCEURL = http://www.gnu.org/software/wget/
+
 EXTRA_MODULATORS = STATIC
 MODULATIONS_STATIC = disable enable
 
@@ -36,29 +35,21 @@
 CONFIGURE_ARGS += $(EXTRA_CONFIGURE_STATIC-$(STATIC))
 
 TEST_TARGET = check
-REQUIRED_PKGS = CSWosslrt CSWcswclassutils
+REQUIRED_PKGS = CSWosslrt
 
-SPKG_CLASSES = none cswcpsampleconf
-PROTOTYPE_FILTER = awk '$$$$3 ~ /\/wgetrc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' 
+SAMPLECONF = $(sysconfdir)/wgetrc.CSW
+EXTRA_PAX_ARGS = -s ",^\(.$(sysconfdir)/wgetrc\)\$$,\1.CSW,p"
 
 MERGE_SCRIPTS_isa-sparcv8-static-disable = copy-all
- MERGE_SCRIPTS_isa-sparcv8-static-enable = rename-wget copy-only
+ MERGE_SCRIPTS_isa-sparcv8-static-enable = copy-static-wget-only
     MERGE_DIRS_isa-sparcv8-static-enable = $(bindir)
 
     MERGE_SCRIPTS_isa-i386-static-disable = copy-all
      MERGE_SCRIPTS_isa-i386-static-enable = rename-wget copy-only
         MERGE_DIRS_isa-i386-static-enable = $(bindir)
 
-merge-rename-wget:
-	@mv $(DESTDIR)$(bindir)/wget $(DESTDIR)$(bindir)/wget.static
+merge-copy-static-wget-only:
+	ginstall $(INSTALLISADIR)$(bindir)/wget $(PKGROOT)$(bindir)/wget.static
+	@$(MAKECOOKIE)
 
-post-install-modulated:
-	(cd $(DESTDIR)$(prefix)/etc; \
-	for i in wgetrc; do \
-		if [ -r "$$i" ]; then \
-			echo "$$i -> $$i.CSW"; \
-			mv "$$i" "$$i.CSW";     \
-		fi \
-	done)
-
 include gar/category.mk

Modified: csw/mgar/pkg/wget/trunk/checksums
===================================================================
--- csw/mgar/pkg/wget/trunk/checksums	2009-08-19 11:24:28 UTC (rev 6052)
+++ csw/mgar/pkg/wget/trunk/checksums	2009-08-19 11:28:47 UTC (rev 6053)
@@ -1,2 +1 @@
 f5076a8c2ec2b7f334cb6e3059820f9c  download/wget-1.11.4.tar.bz2
-0232e26f1324e2b2c0c6c1ab4bf3f2e3  download/CSWwget.gspec

Deleted: csw/mgar/pkg/wget/trunk/files/CSWwget.gspec
===================================================================
--- csw/mgar/pkg/wget/trunk/files/CSWwget.gspec	2009-08-19 11:24:28 UTC (rev 6052)
+++ csw/mgar/pkg/wget/trunk/files/CSWwget.gspec	2009-08-19 11:28:47 UTC (rev 6053)
@@ -1,4 +0,0 @@
-%var            bitname wget
-%var            pkgname CSWwget
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE


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