From 9e2c612a95e8f788084d4064e7035a6aeba62e54 Mon Sep 17 00:00:00 2001
From: fjoe <fjoe@FreeBSD.org>
Date: Tue, 28 Nov 2006 17:53:36 +0000
Subject: - 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
---
 x11-toolkits/wxgtk29/Makefile                 |  1 +
 x11-toolkits/wxgtk29/files/patch-wx-config.in | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'x11-toolkits/wxgtk29')

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
  
-- 
cgit