Upgrade to 0.95.

5 files changed, 47 insertions, 28 deletions

diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index e7f46d58e5bc..e789542bd85e 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gambas
-PORTVERSION=		0.94a
+PORTVERSION=		0.95
 CATEGORIES=		lang
 MASTER_SITES=		http://gambas.sourceforge.net/
 
@@ -15,7 +15,7 @@ COMMENT=		Gambas Almost Means BASic
 LIB_DEPENDS=		curl.3:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=		pgrep:${PORTSDIR}/sysutils/pkill
 
-USE_LIBLTDL=		YES
+USE_LIBLTDL=		yes
 USE_KDELIBS_VER=	3
 USE_GETTEXT=		yes
 USE_BZIP2=		yes
@@ -86,6 +86,13 @@ CONFIGURE_ARGS+=	--disable-sqlite
 PLIST_SUB+=		SQLITE="@comment "
 .endif
 
+.if exists(${LOCALBASE}/bin/rpmbuild)
+WITH_RPMBUILD=		yes
+.endif
+.if defined(WITH_RPMBUILD)
+RUN_DEPENDS+=		rpmbuild:${PORTSDIR}/archivers/rpm4
+.endif
+
 pre-configure:
 .for src in ${SRC2FIX1}
 	@${REINPLACE_CMD} -e "s|libqt-mt.so.3|${NEWLIBQT-MT}|g"			\
diff --git a/lang/gambas/distinfo b/lang/gambas/distinfo
index c3bfd0aee246..72accfefb6f1 100644
--- a/lang/gambas/distinfo
+++ b/lang/gambas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gambas-0.94a.tar.bz2) = 00e9e481bd1d9069aad124b21f06e110
-SIZE (gambas-0.94a.tar.bz2) = 3700855
+MD5 (gambas-0.95.tar.bz2) = 046e14eece120c72c0dba7587365a793
+SIZE (gambas-0.95.tar.bz2) = 3698616
diff --git a/lang/gambas/files/patch-Makefile.in b/lang/gambas/files/patch-Makefile.in
index 8aaa478e03dc..7f9a1664b097 100644
--- a/lang/gambas/files/patch-Makefile.in
+++ b/lang/gambas/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Jun 22 12:45:17 2004
-+++ Makefile.in	Tue Jun 22 23:51:34 2004
+--- Makefile.in.orig	Mon Jul 19 23:57:54 2004
++++ Makefile.in	Sat Jul 31 17:31:52 2004
 @@ -35,6 +35,7 @@
  DESTDIR =
  
@@ -8,20 +8,23 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  
-@@ -379,16 +380,16 @@
+@@ -378,19 +379,18 @@
+ 
  
  install-exec-local:
+-	@echo "Installing with ROOT=$(ROOT)"
  	@echo
--	@if test "$(bindir)" != "/usr/bin" && test "$(bindir)" != "/usr/bin/"; then \
+ 
+-	@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
 -	 echo "Making symbolic links in /usr/bin..."; \
--	 rm -f /usr/bin/gbx; \
--	 ln -s $(bindir)/gbx /usr/bin/gbx; \
--	 rm -f /usr/bin/gbc; \
--	 ln -s $(bindir)/gbc /usr/bin/gbc; \
--	 rm -f /usr/bin/gba; \
--	 ln -s $(bindir)/gba /usr/bin/gba; \
--	 rm -f /usr/bin/gbi; \
--	 ln -s $(bindir)/gbi /usr/bin/gbi; \
+-	 rm -f $(ROOT)/usr/bin/gbx; \
+-	 ln -s $(bindir)/gbx $(ROOT)/usr/bin/gbx; \
+-	 rm -f $(ROOT)/usr/bin/gbc; \
+-	 ln -s $(bindir)/gbc $(ROOT)/usr/bin/gbc; \
+-	 rm -f $(ROOT)/usr/bin/gba; \
+-	 ln -s $(bindir)/gba $(ROOT)/usr/bin/gba; \
+-	 rm -f $(ROOT)/usr/bin/gbi; \
+-	 ln -s $(bindir)/gbi $(ROOT)/usr/bin/gbi; \
 +	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
 +	 echo "Making symbolic links in %%PREFIX%%/bin..."; \
 +	 rm -f %%PREFIX%%/bin/gbx; \
@@ -35,14 +38,14 @@
  	fi
  
  	@echo
-@@ -401,28 +402,28 @@
+@@ -404,28 +404,28 @@
  	@echo
  	@echo "Installing the development environment..."
  	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
--	  gbc -ag; gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
--	@if test "$(bindir)" != "/usr/bin" && test "$(bindir)" != "/usr/bin/"; then \
--	 rm -f /usr/bin/gambas; \
--	 ln -s $(bindir)/gambas /usr/bin/gambas; \
+-	  $(bindir)/gbc -ag; $(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
+-	@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
+-	 rm -f $(ROOT)/usr/bin/gambas; \
+-	 ln -s $(bindir)/gambas $(ROOT)/usr/bin/gambas; \
 +	  %%PREFIX%%/bin/gbc -ag; %%PREFIX%%/bin/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
 +	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
 +	 rm -f %%PREFIX%%/bin/gambas; \
@@ -62,7 +65,7 @@
 -	@cp -R $(srcdir)/examples $(pkgdatadir)
 -	@(cd $(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
 -	  if test -e .project; then \
--	    echo "Compiling $$p..."; cd $$d/$$p; gbc -ag; gba; \
+-	    echo "Compiling $$p..."; cd $$d/$$p; $(bindir)/gbc -ag; $(bindir)/gba; \
 -	  fi \
 -	done)
 +# FreeBSD-Doc-Comment	@echo
@@ -83,4 +86,4 @@
 +# FreeBSD-Doc-Comment	done)
  
  uninstall-local:
- 	@rm -f /usr/bin/gbx
+ 	@rm -f $(ROOT)/usr/bin/gbx
diff --git a/lang/gambas/files/patch-src::share::gb_common.h b/lang/gambas/files/patch-src::share::gb_common.h
new file mode 100644
index 000000000000..92d9f2246afa
--- /dev/null
+++ b/lang/gambas/files/patch-src::share::gb_common.h
@@ -0,0 +1,14 @@
+--- ./src/share/gb_common.h.orig	Fri Mar  5 14:57:08 2004
++++ ./src/share/gb_common.h	Sat Jul 31 18:02:59 2004
+@@ -58,6 +58,11 @@
+   unsigned long ulong;
+ #endif
+ 
++#ifdef __FreeBSD__
++/* Get definition for PATH_MAX */
++#include <limits.h>
++#endif
++
+ #ifdef __sun__
+  /* PGS: The following #define prevents /usr/include/sys/mman.h on solaris
+     from #define'ing PRIVATE to 0x20, thus breaking Gambas.
diff --git a/lang/gambas/pkg-plist b/lang/gambas/pkg-plist
index 4e6fb53f9560..56f7ea75ce04 100644
--- a/lang/gambas/pkg-plist
+++ b/lang/gambas/pkg-plist
@@ -5,7 +5,6 @@ bin/gba
 bin/gbc
 bin/gbi
 bin/gbx
-include/gambas.h
 lib/gambas/lib.gb.a
 lib/gambas/lib.gb.component
 lib/gambas/lib.gb.compress.a
@@ -48,10 +47,6 @@ lib/gambas/lib.gb.eval.component
 lib/gambas/lib.gb.eval.la
 lib/gambas/lib.gb.eval.so
 lib/gambas/lib.gb.eval.so.0
-lib/gambas/lib.gb.example.a
-lib/gambas/lib.gb.example.la
-lib/gambas/lib.gb.example.so
-lib/gambas/lib.gb.example.so.0
 lib/gambas/lib.gb.net.a
 lib/gambas/lib.gb.net.component
 lib/gambas/lib.gb.net.curl.a