summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2001-12-29 13:07:14 +0000
committerhubertf <hubertf@pkgsrc.org>2001-12-29 13:07:14 +0000
commit96c95aaca695969c5c968fe9c8794f9e75961429 (patch)
tree99edb7f6d790609b99adfc93be3021e636bb8c94 /pkgtools
parent040d9a4ff07c8cbbe236b8c06f283c6475017753 (diff)
downloadpkgsrc-96c95aaca695969c5c968fe9c8794f9e75961429.tar.gz
Bump to 1.17: properly recognize .tar.Z files
Patch sent by Amitai Schlair <schmonz@schmonz.com> in private mail.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/url2pkg/Makefile4
-rwxr-xr-xpkgtools/url2pkg/files/url2pkg5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 21932a0ac85..ab4e9dde383 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2001/10/31 18:45:42 zuntum Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/29 13:07:14 hubertf Exp $
#
-DISTNAME= url2pkg-1.16
+DISTNAME= url2pkg-1.17
CATEGORIES= pkgtools sysutils
MASTER_SITES= # Nothing
DISTFILES= # Nothing
diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg
index f4cc41a6dc7..72e00d6e124 100755
--- a/pkgtools/url2pkg/files/url2pkg
+++ b/pkgtools/url2pkg/files/url2pkg
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: url2pkg,v 1.17 2001/10/31 18:45:43 zuntum Exp $
+# $NetBSD: url2pkg,v 1.18 2001/12/29 13:07:14 hubertf Exp $
#
# url2pkg
# (c) 1999 Hubert Feyrer
@@ -46,6 +46,9 @@ if [ ! -f w*/.extract_done ]; then
*.tgz) EXTRACT_SUFX=".tgz"
DISTNAME=`expr ${DISTNAME} : '\(.*\)\.[^.]*'`
;;
+ *.tar.Z) EXTRACT_SUFX=.tar.Z
+ DISTNAME=`expr ${DISTNAME} : '\(.*\)\.[^.]*\.[^.]*'`
+ ;;
*.tar.gz) EXTRACT_SUFX=.tar.gz
DISTNAME=`expr ${DISTNAME} : '\(.*\)\.[^.]*\.[^.]*'`
;;