aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk29
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2006-11-28 17:53:36 +0000
committerMax Khon <fjoe@FreeBSD.org>2006-11-28 17:53:36 +0000
commit79867d566585916d544bfcde127dad0f849422c5 (patch)
tree703d387597e259370793745e9a9322ba2fe97d76 /x11-toolkits/wxgtk29
parent38413c03ddd61475e690e9d3175df992c35e0f28 (diff)
downloadports-79867d566585916d544bfcde127dad0f849422c5.tar.gz
ports-79867d566585916d544bfcde127dad0f849422c5.zip
- Fix wxgtk2-2.6-config and wxgtk2u-2.6-config when HOME is not set --
execute /bin/sh instead of bash in this case. - Bump PORTREVISION PR: 105561
Notes
Notes: svn path=/head/; revision=178190
Diffstat (limited to 'x11-toolkits/wxgtk29')
-rw-r--r--x11-toolkits/wxgtk29/Makefile1
-rw-r--r--x11-toolkits/wxgtk29/files/patch-wx-config.in25
2 files changed, 23 insertions, 3 deletions
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 5f168618aeef..7cb920ef7080 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -51,6 +51,7 @@ PLIST= ${.CURDIR}/pkg-plist
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
+PORTREVISION= 1
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
diff --git a/x11-toolkits/wxgtk29/files/patch-wx-config.in b/x11-toolkits/wxgtk29/files/patch-wx-config.in
index 434032d26493..a36b094b2dad 100644
--- a/x11-toolkits/wxgtk29/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk29/files/patch-wx-config.in
@@ -1,6 +1,25 @@
---- wx-config.in.orig Thu Apr 21 00:32:34 2005
-+++ wx-config.in Thu May 5 16:36:09 2005
-@@ -1142,7 +1142,7 @@
+--- wx-config.in.orig Wed Mar 22 05:42:05 2006
++++ wx-config.in Tue Nov 28 23:49:30 2006
+@@ -25,15 +25,15 @@
+
+ if [ ~ = '~' ]
+ then
+- if (bash -c echo) >/dev/null 2>&1
++ if (/bin/sh -c echo) >/dev/null 2>&1
+ then
+- exec bash "$0" "$@"
++ exec /bin/sh "$0" "$@"
+ fi
+ if (ksh -c echo) >/dev/null 2>&1
+ then
+ exec ksh "$0" "$@"
+ fi
+- echo "$0: this script requires bash or ksh"
++ echo "$0: this script requires bourne shell or ksh"
+ exit 1
+ fi
+
+@@ -1143,7 +1143,7 @@
_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
fi