[csw-devel] SF.net SVN: gar:[7344] csw/mgar/pkg/axel/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Wed Nov 18 19:38:18 CET 2009
Revision: 7344
http://gar.svn.sourceforge.net/gar/?rev=7344&view=rev
Author: skayser
Date: 2009-11-18 18:38:18 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
axel: version bump to 2.4
Modified Paths:
--------------
csw/mgar/pkg/axel/trunk/Makefile
csw/mgar/pkg/axel/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch
csw/mgar/pkg/axel/trunk/files/changelog.CSW
Modified: csw/mgar/pkg/axel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 17:12:31 UTC (rev 7343)
+++ csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 18:38:18 UTC (rev 7344)
@@ -1,5 +1,7 @@
+# TODO
+# - Migrate configuration from /opt to /etc
GARNAME = axel
-GARVERSION = 2.3
+GARVERSION = 2.4
CATEGORIES = utils
DESCRIPTION = Lightweight command-line download accelerator
@@ -9,42 +11,44 @@
very useful on bootdisks or other small systems as a wget replacement
endef
-MASTER_SITES = http://alioth.debian.org/frs/download.php/2717/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-
+# Beware: When bumping the version, you also need to visit the download page
+# and get the correct DOWNLOAD_ID for the new version. If you don't change it,
+# you will get the tarball with the corrent name, but with the old content.
SPKG_SOURCEURL = http://axel.alioth.debian.org/
-SPKG_CLASSES = none cswcpsampleconf
+MASTER_SITES = http://alioth.debian.org/frs/download.php/$(DOWNLOAD_ID)/
+DOWNLOAD_ID = 3015
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-REQUIRED_PKGS = CSWcswclassutils
+# upstream_watch currently uses lftp and lftp only lists files when
+# they are offered via the SAME scheme as the requested page. The
+# axel download page can be accessed via http:// and https:// but
+# the files themselves are only offered via https://, thus https://.
+UPSTREAM_MASTER_SITES = https://alioth.debian.org/frs/?group_id=100070
-# Doesn't work yet, upstream watch needs to be improved first
-#UPSTREAM_MASTER_SITES = http://alioth.debian.org/frs/?group_id=100070
-#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+# Make ./configure play nicely with /bin/sh and /opt/csw prefix
+PATCHFILES = 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --i18n=0
+# axel doesn't come with a test suite
TEST_SCRIPTS =
-PROTOTYPE_FILTER = awk '\
- $$$$3 ~ /axelrc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
- { print }'
+SAMPLECONF = $(sysconfdir)/axelrc
include gar/category.mk
-# ./configure is not your usual kind of configure ...
-post-configure-modulated:
- @perl -pi -e 's|-g -Os||' $(WORKSRC)/Makefile.settings
- @echo CFLAGS+=$(CFLAGS) >> $(WORKSRC)/Makefile.settings
- @$(MAKECOOKIE)
-
+# Get rid of hard-coded -Wall gcc'ism
pre-build-modulated:
- @perl -pi -e 's/-Wall//g' $(WORKSRC)/Makefile
+ perl -pi -e 's/-Wall//g' $(WORKSRC)/Makefile
@$(MAKECOOKIE)
+post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
post-install-modulated:
- @perl -pi -e "s#/etc/axelrc#$(sysconfdir)/axelrc#" \
+ ginstall -d $(DOCDEST)
+ cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+ perl -pi -e "s#/etc/axelrc#$(sysconfdir)/axelrc#" \
$(DESTDIR)$(mandir)/man1/axel.1 \
$(DESTDIR)$(mandir)/zh_CN/man1/axel.1
- @mv $(DESTDIR)$(sysconfdir)/axelrc \
- $(DESTDIR)$(sysconfdir)/axelrc.CSW
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/axel/trunk/checksums
===================================================================
--- csw/mgar/pkg/axel/trunk/checksums 2009-11-18 17:12:31 UTC (rev 7343)
+++ csw/mgar/pkg/axel/trunk/checksums 2009-11-18 18:38:18 UTC (rev 7344)
@@ -1 +1,2 @@
-6f49813ffc1dd10829d74b73712cb5ed download/axel-2.3.tar.gz
+717e172161023dd7ad5ca4bdd3cd2678 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch
+a2a762fce0c96781965c8f9786a3d09d axel-2.4.tar.gz
Added: csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch
===================================================================
--- csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch (rev 0)
+++ csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch 2009-11-18 18:38:18 UTC (rev 7344)
@@ -0,0 +1,40 @@
+From 7de9123636a2d04d6d8bdeec4a8de367c666d031 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Wed, 18 Nov 2009 18:33:30 +0100
+Subject: [PATCH] configure: use backticks and honor prefix for gettext
+
+---
+ configure | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index 81ecb99..535a0af 100755
+--- a/configure
++++ b/configure
+@@ -42,8 +42,8 @@ EOF
+ exit;
+ fi
+
+- keyname=$(expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g')
+- value=$(expr "$e" : '.*=\(.*\)' | sed "s/'/_/g")
++ keyname=`expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g'`
++ value=`expr "$e" : '.*=\(.*\)' | sed "s/'/_/g"`
+
+ eval "$keyname='$value'"
+ shift;
+@@ -106,9 +106,9 @@ fi
+ if [ "$i18n" = "1" ]; then
+ echo 'I18N=1' >> Makefile.settings
+ echo '#define I18N' >> config.h
+- if cat /usr/local/include/libintl.h > /dev/null 2> /dev/null; then
+- echo 'CFLAGS+=-I/usr/local/include' >> Makefile.settings
+- echo 'LFLAGS+=-L/usr/local/lib' >> Makefile.settings;
++ if [ -f "${prefix}/include/libintl.h" ]; then
++ echo "CFLAGS+=-I${prefix}/include" >> Makefile.settings
++ echo "LFLAGS+=-L${prefix}/lib" >> Makefile.settings;
+ fi;
+ fi
+
+--
+1.6.5.1
+
Added: csw/mgar/pkg/axel/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/axel/trunk/files/changelog.CSW (rev 0)
+++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-18 18:38:18 UTC (rev 7344)
@@ -0,0 +1,5 @@
+axel (2.4,REV=2009.11.18)
+
+ * Updated to 2.4. (Fixes #4032)
+
+ -- Sebastian Kayser <skayser at opencsw.org> Wed, 18 Nov 2009 16:13:33 +0100
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