Mon Mar 31 11:41:09 2008 UTC ()

Separate 'make clean' from 'make package', so that clean is not
skipped with -r.  DISTNAME++.  Fixes PR pkg/38283.

Reviewed and tested by tnn@.


(gdt)

diff -r1.17 -r1.18 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
diff -r1.17 -r1.18 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh

--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile 2008/02/17 10:47:47 1.17
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile 2008/03/31 11:41:09 1.18

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.17 2008/02/17 10:47:47 apb Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/31 11:41:09 gdt Exp $
-DISTNAME=	pkg_rolling-replace-0.14
+DISTNAME=	pkg_rolling-replace-0.15
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	ngoffee@bbn.com
 COMMENT=	Replace/upgrade packages in-place
 DEPENDS+=	pkg_chk>=1.76:../../pkgtools/pkg_chk
 DEPENDS+=	pkg_tarup>=1.6.6:../../pkgtools/pkg_tarup
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 USE_TOOLS+=	patch

--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh 2008/02/17 10:47:47 1.17
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh 2008/03/31 11:41:09 1.18

 @@ -1,16 +1,16 @@
 #!/bin/sh
-# $NetBSD: pkg_rolling-replace.sh,v 1.17 2008/02/17 10:47:47 apb Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.18 2008/03/31 11:41:09 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. Neither the name of BBN Technologies nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 @@ -389,36 +389,42 @@ while [ -n "$REPLACE_TODO" ]; do
 	echo "${OPI} Would run: $cmd"
     else
 	eval "$cmd"
     	[ -z "$fail" ] || abort "'make replace' failed for package $pkg."
     fi
     if [ -z "$opt_n" ]; then
 	[ -z "$(${PKG_INFO} -Q unsafe_depends_strict $pkg)" ] || \
 	    abort "package $pkg still has unsafe_depends_strict."
 	[ -z "$(${PKG_INFO} -Q unsafe_depends $pkg)" ] || \
 	    abort "package $pkg still has unsafe_depends."
 	[ -z "$(${PKG_INFO} -Q rebuild $pkg)" ] || \
 	    abort "package $pkg is still requested to be rebuilt."
     fi
     # If -r not given, make a binary package.
     if [ -z "$opt_r" ]; then
 	echo "${OPI} Packaging $(${PKG_INFO} -e $pkg)"
-	    cmd="${MAKE} package && ${MAKE} clean || fail=1"
+	    cmd="${MAKE} package || fail=1"
 	if [ -n "$opt_n" ]; then
 	    echo "${OPI} Would run: $cmd"
 	else
 	    eval "$cmd"
     	    [ -z "$fail" ] || abort "'make package' failed for package $pkg."
 	fi
     fi
     # Clean
     if [ -z "$opt_n" ]; then
 	${MAKE} clean || abort "'make clean' failed for package $pkg."
     fi
     sleep 1
     # remove just-replaced package from all *_TODO lists
     MISMATCH_TODO=$(exclude $pkg --from $MISMATCH_TODO)
     REBUILD_TODO=$(exclude $pkg --from $REBUILD_TODO)
     UNSAFE_TODO=$(exclude $pkg --from $UNSAFE_TODO)
     echo "${OPI} Re-checking for unsafe installed packages (${UNSAFE_VAR}=YES)"
     if [ -n "$opt_n" ]; then
 	# With -n, the replace didn't happen, and thus the packages that would
 	# have been marked unsafe_depends=YES were not.  Add the set that
 	# would have been marked so we can watch what pkg_rolling-replace
 	# would have done (approximately).