Index: head/misc/pkg_tarup/Makefile =================================================================== --- head/misc/pkg_tarup/Makefile (revision 43778) +++ head/misc/pkg_tarup/Makefile (revision 43779) @@ -1,29 +1,29 @@ # New ports collection makefile for: pkg_tarup # Date created: 21 Sep 2000 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= pkg_tarup PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/pkgtools/pkg_tarup/files/ DISTNAME= ${PORTNAME}\?rev=${PORTVERSION}\&content-type=text%2fplain EXTRACT_SUFX= # empty EXTRACT_ONLY= # empty MAINTAINER= knu@FreeBSD.org NO_WRKSUBDIR= yes NO_BUILD= yes do-extract: ${MKDIR} ${WRKSRC} ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${PORTNAME} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/${PORTNAME} .include Property changes on: head/misc/pkg_tarup/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/misc/pkg_tarup/files/patch-aa =================================================================== --- head/misc/pkg_tarup/files/patch-aa (revision 43778) +++ head/misc/pkg_tarup/files/patch-aa (revision 43779) @@ -1,69 +1,70 @@ ---- pkg_tarup.orig Fri Jun 1 11:12:44 2001 -+++ pkg_tarup Fri Jun 1 11:21:06 2001 +--- pkg_tarup.orig Sun Jun 10 12:51:53 2001 ++++ pkg_tarup Sun Jun 10 12:58:15 2001 @@ -7,21 +7,26 @@ # PKG_DBDIR=${PKG_DBDIR:-/var/db/pkg} -PKGREPOSITORY=${PKGREPOSITORY:-/tmp} PKG_SUFX=${PKG_SUFX:-tgz} +# A package file can be very big beyond /tmp's capacity +PKGREPOSITORY=${PKGREPOSITORY:-${TMPDIR:-/var/tmp}} + PKG="$1" -rPKG="`pkg_info -e \"$PKG\"`" -if [ "$PKG" = "" -o "$rPKG" = "" -o -f "${PKG_DBDIR}/${rPKG}" ] +if [ "$PKG" = "" ] then - echo Usage: $0 installed_pkg + echo Usage: $0 installed_package exit 1 fi -PKG=$rPKG -echo "Taring up $PKG" +if ! pkg_info -e "$PKG" +then + echo $PKG is not installed. + exit 1 +fi +echo "Taring up $PKG" check_and_add() { opt="$1" @@ -40,10 +45,10 @@ check_and_add -c ${PKG_DBDIR}/${PKG}/+COMMENT check_and_add -d ${PKG_DBDIR}/${PKG}/+DESC -check_and_add -b ${PKG_DBDIR}/${PKG}/+BUILD_VERSION -check_and_add -B ${PKG_DBDIR}/${PKG}/+BUILD_INFO +#check_and_add -b ${PKG_DBDIR}/${PKG}/+BUILD_VERSION +#check_and_add -B ${PKG_DBDIR}/${PKG}/+BUILD_INFO check_and_add -s ${PKG_DBDIR}/${PKG}/+SIZE_PKG -check_and_add -S ${PKG_DBDIR}/${PKG}/+SIZE_ALL +#check_and_add -S ${PKG_DBDIR}/${PKG}/+SIZE_ALL check_and_add -i ${PKG_DBDIR}/${PKG}/+INSTALL check_and_add -k ${PKG_DBDIR}/${PKG}/+DEINSTALL check_and_add -r ${PKG_DBDIR}/${PKG}/+REQUIRE -@@ -54,7 +59,7 @@ +@@ -54,7 +59,8 @@ sed -n \ -e '/^@comment MD5:/d' \ -e '/^@cwd \.$/,$d' \ - -e '/\$NetBSD/,$p' \ ++ -e '/^@srcdir /d' \ + -e 'p' \ <${PKG_DBDIR}/${PKG}/+CONTENTS >$PLIST # Duplicate first @cwd (work around pkg_create "feature" ...) -@@ -80,10 +85,8 @@ +@@ -80,10 +86,8 @@ ${PKG_ARGS} \ -v \ -f ${PLIST} \ - -l \ -p "`pkg_info -qp ${PKG} | head -1 | awk '{ print $2 }'`" \ -P "`pkg_info -qf ${PKG} | grep ^@pkgdep | awk '{ print $2 }'`" \ - -C "`pkg_info -qf ${PKG} | grep ^@pkgcfl | awk '{ print $2 }'`" \ ${PKGREPOSITORY}/${PKG}.${PKG_SUFX} rm -f ${PLIST} Property changes on: head/misc/pkg_tarup/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/sysutils/pkg_tarup/Makefile =================================================================== --- head/sysutils/pkg_tarup/Makefile (revision 43778) +++ head/sysutils/pkg_tarup/Makefile (revision 43779) @@ -1,29 +1,29 @@ # New ports collection makefile for: pkg_tarup # Date created: 21 Sep 2000 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= pkg_tarup PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/pkgtools/pkg_tarup/files/ DISTNAME= ${PORTNAME}\?rev=${PORTVERSION}\&content-type=text%2fplain EXTRACT_SUFX= # empty EXTRACT_ONLY= # empty MAINTAINER= knu@FreeBSD.org NO_WRKSUBDIR= yes NO_BUILD= yes do-extract: ${MKDIR} ${WRKSRC} ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${PORTNAME} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/${PORTNAME} .include Property changes on: head/sysutils/pkg_tarup/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/sysutils/pkg_tarup/files/patch-aa =================================================================== --- head/sysutils/pkg_tarup/files/patch-aa (revision 43778) +++ head/sysutils/pkg_tarup/files/patch-aa (revision 43779) @@ -1,69 +1,70 @@ ---- pkg_tarup.orig Fri Jun 1 11:12:44 2001 -+++ pkg_tarup Fri Jun 1 11:21:06 2001 +--- pkg_tarup.orig Sun Jun 10 12:51:53 2001 ++++ pkg_tarup Sun Jun 10 12:58:15 2001 @@ -7,21 +7,26 @@ # PKG_DBDIR=${PKG_DBDIR:-/var/db/pkg} -PKGREPOSITORY=${PKGREPOSITORY:-/tmp} PKG_SUFX=${PKG_SUFX:-tgz} +# A package file can be very big beyond /tmp's capacity +PKGREPOSITORY=${PKGREPOSITORY:-${TMPDIR:-/var/tmp}} + PKG="$1" -rPKG="`pkg_info -e \"$PKG\"`" -if [ "$PKG" = "" -o "$rPKG" = "" -o -f "${PKG_DBDIR}/${rPKG}" ] +if [ "$PKG" = "" ] then - echo Usage: $0 installed_pkg + echo Usage: $0 installed_package exit 1 fi -PKG=$rPKG -echo "Taring up $PKG" +if ! pkg_info -e "$PKG" +then + echo $PKG is not installed. + exit 1 +fi +echo "Taring up $PKG" check_and_add() { opt="$1" @@ -40,10 +45,10 @@ check_and_add -c ${PKG_DBDIR}/${PKG}/+COMMENT check_and_add -d ${PKG_DBDIR}/${PKG}/+DESC -check_and_add -b ${PKG_DBDIR}/${PKG}/+BUILD_VERSION -check_and_add -B ${PKG_DBDIR}/${PKG}/+BUILD_INFO +#check_and_add -b ${PKG_DBDIR}/${PKG}/+BUILD_VERSION +#check_and_add -B ${PKG_DBDIR}/${PKG}/+BUILD_INFO check_and_add -s ${PKG_DBDIR}/${PKG}/+SIZE_PKG -check_and_add -S ${PKG_DBDIR}/${PKG}/+SIZE_ALL +#check_and_add -S ${PKG_DBDIR}/${PKG}/+SIZE_ALL check_and_add -i ${PKG_DBDIR}/${PKG}/+INSTALL check_and_add -k ${PKG_DBDIR}/${PKG}/+DEINSTALL check_and_add -r ${PKG_DBDIR}/${PKG}/+REQUIRE -@@ -54,7 +59,7 @@ +@@ -54,7 +59,8 @@ sed -n \ -e '/^@comment MD5:/d' \ -e '/^@cwd \.$/,$d' \ - -e '/\$NetBSD/,$p' \ ++ -e '/^@srcdir /d' \ + -e 'p' \ <${PKG_DBDIR}/${PKG}/+CONTENTS >$PLIST # Duplicate first @cwd (work around pkg_create "feature" ...) -@@ -80,10 +85,8 @@ +@@ -80,10 +86,8 @@ ${PKG_ARGS} \ -v \ -f ${PLIST} \ - -l \ -p "`pkg_info -qp ${PKG} | head -1 | awk '{ print $2 }'`" \ -P "`pkg_info -qf ${PKG} | grep ^@pkgdep | awk '{ print $2 }'`" \ - -C "`pkg_info -qf ${PKG} | grep ^@pkgcfl | awk '{ print $2 }'`" \ ${PKGREPOSITORY}/${PKG}.${PKG_SUFX} rm -f ${PLIST} Property changes on: head/sysutils/pkg_tarup/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property