- Quick fix: change 'make config' with 'make config-conditional'.

  It's exactly I meant.

Reported by:	Larry Rosenman <ler at lerctr.org>

8 files changed, 48 insertions, 0 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 862d6f36ff40..264e5200846b 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..3c82130afe9d
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
@@ -0,0 +1,11 @@
+--- bin/portupgrade.orig	Sun Jun 18 22:23:44 2006
++++ bin/portupgrade	Sun Jun 18 22:24:10 2006
+@@ -774,7 +774,7 @@
+     cmdargs << 'ECHO_MSG=/usr/bin/true'
+   end
+ 
+-  cmdargs << 'config'
++  cmdargs << 'config-conditional'
+ 
+   progress_message "Run 'make config' for #{origin}"
+   if ! system "cd #{portdir} && #{shelljoin(*cmdargs)}"
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 862d6f36ff40..264e5200846b 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..3c82130afe9d
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-bin-portupgrade
@@ -0,0 +1,11 @@
+--- bin/portupgrade.orig	Sun Jun 18 22:23:44 2006
++++ bin/portupgrade	Sun Jun 18 22:24:10 2006
+@@ -774,7 +774,7 @@
+     cmdargs << 'ECHO_MSG=/usr/bin/true'
+   end
+ 
+-  cmdargs << 'config'
++  cmdargs << 'config-conditional'
+ 
+   progress_message "Run 'make config' for #{origin}"
+   if ! system "cd #{portdir} && #{shelljoin(*cmdargs)}"
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 862d6f36ff40..264e5200846b 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/sysutils/portupgrade-devel/files/patch-bin-portupgrade b/sysutils/portupgrade-devel/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..3c82130afe9d
--- /dev/null
+++ b/sysutils/portupgrade-devel/files/patch-bin-portupgrade
@@ -0,0 +1,11 @@
+--- bin/portupgrade.orig	Sun Jun 18 22:23:44 2006
++++ bin/portupgrade	Sun Jun 18 22:24:10 2006
+@@ -774,7 +774,7 @@
+     cmdargs << 'ECHO_MSG=/usr/bin/true'
+   end
+ 
+-  cmdargs << 'config'
++  cmdargs << 'config-conditional'
+ 
+   progress_message "Run 'make config' for #{origin}"
+   if ! system "cd #{portdir} && #{shelljoin(*cmdargs)}"
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 862d6f36ff40..264e5200846b 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/sysutils/portupgrade/files/patch-bin-portupgrade b/sysutils/portupgrade/files/patch-bin-portupgrade
new file mode 100644
index 000000000000..3c82130afe9d
--- /dev/null
+++ b/sysutils/portupgrade/files/patch-bin-portupgrade
@@ -0,0 +1,11 @@
+--- bin/portupgrade.orig	Sun Jun 18 22:23:44 2006
++++ bin/portupgrade	Sun Jun 18 22:24:10 2006
+@@ -774,7 +774,7 @@
+     cmdargs << 'ECHO_MSG=/usr/bin/true'
+   end
+ 
+-  cmdargs << 'config'
++  cmdargs << 'config-conditional'
+ 
+   progress_message "Run 'make config' for #{origin}"
+   if ! system "cd #{portdir} && #{shelljoin(*cmdargs)}"