summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-01-03 10:45:50 +0000
committerjmmv <jmmv@pkgsrc.org>2004-01-03 10:45:50 +0000
commit953515e3488176527608116b245dbdd961f3bd8c (patch)
tree52508a020e760bff32a8d8a9ec08e4ece49629b3 /pkgtools
parentfa27d555bbff66cb84eb94aadf6d3b9b6697bbf7 (diff)
downloadpkgsrc-953515e3488176527608116b245dbdd961f3bd8c.tar.gz
Update to 1.13:
- Fix detection of outdated pkg_install. The 'grep' failed because the error message shown was recently changed in pkgsrc.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_comp/Makefile4
-rw-r--r--pkgtools/pkg_comp/files/pkg_comp.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 9dff18bac8f..7b18fae9886 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2003/12/19 09:51:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/03 10:45:50 jmmv Exp $
-DISTNAME= pkg_comp-1.12
+DISTNAME= pkg_comp-1.13
WRKSRC= ${WRKDIR}
CATEGORIES= pkgtools
MASTER_SITES= # empty
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index bdbcdfbf0ab..36d3a75cf9b 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.sh
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh
@@ -1,9 +1,9 @@
#!/bin/sh
#
-# $NetBSD: pkg_comp.sh,v 1.13 2003/12/19 09:51:55 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.14 2004/01/03 10:45:50 jmmv Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
-# Copyright (c) 2002, 2003, Julio M. Merino Vidal <jmmv@NetBSD.org>
+# Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -560,7 +560,7 @@ check_pkg_install()
#!/bin/sh
cd /usr/pkgsrc/pkgtools/pkg_comp
fail=\$(make show-var VARNAME=PKG_FAIL_REASON)
-if echo \$fail | grep "package tools need to be updated" >/dev/null; then
+if echo \$fail | grep "package tools installed on this system are out of date" >/dev/null; then
echo "PKG_COMP ==> pkg_install is out of date; rebuilding"
cd /usr/pkgsrc/pkgtools/pkg_install
make && make install && make clean