5 files changed, 52 insertions, 18 deletions

diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile
index eb5ebb719c22..f70f7a9904a2 100644
--- a/lang/gnomebasic/Makefile
+++ b/lang/gnomebasic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomebasic
-PORTVERSION=	0.0.18
+PORTVERSION=	0.0.20
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gb
@@ -17,9 +17,16 @@ MAINTAINER=	gnome@FreeBSD.org
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
 .include <bsd.port.mk>
diff --git a/lang/gnomebasic/distinfo b/lang/gnomebasic/distinfo
index 533c392ab072..1ff60f506b4a 100644
--- a/lang/gnomebasic/distinfo
+++ b/lang/gnomebasic/distinfo
@@ -1 +1 @@
-MD5 (gb-0.0.18.tar.gz) = a23c4ee3d79a8cc454390ed429f78a24
+MD5 (gb-0.0.20.tar.gz) = 19e35bd7f24ad619250484a997c0e02d
diff --git a/lang/gnomebasic/files/patch-aa b/lang/gnomebasic/files/patch-aa
index d18a12476c08..538e9062f3e7 100644
--- a/lang/gnomebasic/files/patch-aa
+++ b/lang/gnomebasic/files/patch-aa
@@ -1,11 +1,11 @@
---- configure.orig	Tue Mar 13 05:50:33 2001
-+++ configure	Wed Mar 28 13:59:56 2001
-@@ -3010,3 +3010,3 @@
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
-@@ -4704,5 +4704,5 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Jul  9 18:56:49 2001
++++ configure	Mon Jul  9 19:02:33 2001
+@@ -8248,9 +8248,9 @@
+   
+   rm -f conf.glibtest
  
 -GMODULE_CFLAGS=`glib-config --cflags gmodule`
 +GMODULE_CFLAGS=`$GLIB_CONFIG --cflags gmodule`
@@ -13,17 +13,27 @@
 -GMODULE_LIBS=`glib-config --libs gmodule`
 +GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
  
-@@ -4957,4 +4957,4 @@
- echo "configure:4958: checking for GTK >= 1.2.2" >&5
+ 
+ for ac_prog in 'bison -y' byacc
+@@ -8501,8 +8501,8 @@
+ 
+ echo $ac_n "checking for GTK >= 1.2.2""... $ac_c" 1>&6
+ echo "configure:8504: checking for GTK >= 1.2.2" >&5
 -if gtk-config --version > /dev/null 2>&1; then 
 -        vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 +if $GTK_CONFIG --version > /dev/null 2>&1; then 
 +        vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
      if test "$vers" -ge 1002002; then
-@@ -5629,4 +5629,4 @@
+         echo "$ac_t""found" 1>&6
+     else
+@@ -9173,8 +9173,8 @@
+ 
+ GB_LIBDIR='-L${libdir}'
  GB_INCLUDEDIR='-I${includedir}'
 -GB_INCLUDEDIR="$GB_INCLUDEDIR `glib-config --cflags glib`"
 -GB_LIBS="-lgb `glib-config --libs glib`"
 +GB_INCLUDEDIR="$GB_INCLUDEDIR `$GLIB_CONFIG --cflags glib`"
-+GB_LIBS="-lgb `$GLIB_CONFIG --libs glib`"
++GB_LIBS="-lgbrun `$GLIB_CONFIG --libs glib`"
+ 
+ 
  
diff --git a/lang/gnomebasic/files/patch-ltmain.sh b/lang/gnomebasic/files/patch-ltmain.sh
new file mode 100644
index 000000000000..66ac8861ddf0
--- /dev/null
+++ b/lang/gnomebasic/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/09 15:27:26	1.1
++++ ltmain.sh	2001/07/09 15:27:47
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/lang/gnomebasic/pkg-plist b/lang/gnomebasic/pkg-plist
index 90908abac3e9..333434ca7eb6 100644
--- a/lang/gnomebasic/pkg-plist
+++ b/lang/gnomebasic/pkg-plist
@@ -25,14 +25,13 @@ include/gbrun/gbrun.h
 include/gbrun/libgbrun.h
 include/gbrun/objects/gbrun-form.h
 include/gbrun/objects/libgbobj.h
-lib/libgb.a
-lib/libgb.so
-lib/libgb.so.0
 lib/libgbrun.a
 lib/libgbrun.so
 lib/libgbrun.so.0
 share/locale/az/LC_MESSAGES/gb.mo
+share/locale/ca/LC_MESSAGES/gb.mo
 share/locale/da/LC_MESSAGES/gb.mo
+share/locale/de/LC_MESSAGES/gb.mo
 share/locale/el/LC_MESSAGES/gb.mo
 share/locale/fr/LC_MESSAGES/gb.mo
 share/locale/no/LC_MESSAGES/gb.mo