- Update to 2.13.0

- Remove obsolete patch files
- Fix build on amd64 (1). Also it could compile without problems on pointyhat.

See the ChangeLog:	http://gambas.sourceforge.net/en/changelog2.html

Tested by:	pgollucci
Reported by:	QAT (1)

9 files changed, 36 insertions, 45 deletions

diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile
index 63eef9de3f66..e0309d23f82c 100644
--- a/lang/gambas2-base/Makefile
+++ b/lang/gambas2-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gambas2
-PORTVERSION=	2.12
+PORTVERSION=	2.13.0
 CATEGORIES?=	lang kde
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:S/2//g}
@@ -44,15 +44,17 @@ USE_KDELIBS_VER=	3
 .include <${PORTSDIR}/Mk/bsd.kde.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 37,39d ${WRKSRC}/main/share/gb_common.h
 	@cd ${WRKSRC} && \
 		${FIND} * -type f -name configure -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 			-e 's|-pipe -Wall -Wno-unused-value -fsigned-char|$$CFLAGS|g' \
-			-e 's|-O0||g' -e 's|-ldl||g' -e 's|-lml||g'
+			-e 's|-pipe -Wall -fno-exceptions -Wno-unused-value -fsigned-char|$$CXXFLAGS|g' \
+			-e 's|-O0||g'
 	@cd ${WRKSRC} && \
 		${FIND} -E * -type f -iregex ".*\.(c|h)" -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-			-e 's|#ifdef __GNU_LIBRARY__|#if defined (__GNU_LIBRARY__) \|\| \
-				defined (__FreeBSD__)|g' -e 's|.so.4|.so|g' -e 's|.so.3|.so|g'
+			-e 's|.so.4|.so|g' -e 's|.so.3|.so|g'
+	@cd ${WRKSRC} && \
+		${FIND} * -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+			-e 's|(GAMBAS_VERSION) -r|(GAMBAS_VERSION) -p -r|g'
 .else
 .include "${MASTERDIR}/Makefile.components"
 .endif
diff --git a/lang/gambas2-base/Makefile.components b/lang/gambas2-base/Makefile.components
index c47fb63a78e0..7207d0ffbe06 100644
--- a/lang/gambas2-base/Makefile.components
+++ b/lang/gambas2-base/Makefile.components
@@ -1,9 +1,12 @@
 PLIST=			${.CURDIR}/pkg-plist
 PATCHDIR=		${.CURDIR}/files
+EXTRA_PATCHES+=		${.CURDIR}/../../lang/gambas2-base/files/patch-main-share_gb_common.h
 
 GAMBAS_COMPONENT?=	${PKGNAMESUFFIX:S/-/./g:S/^.//g}
 GAMBAS_COMPDIRE=	${LOCALBASE}/lib/gambas2
 
+GBI2_CMD=		${LOCALBASE}/bin/gbi2
+
 CONFIGURE_WRKSRC=	${WRKSRC}/${GAMBAS_COMPONENT}
 BUILD_WRKSRC=		${WRKSRC}/${GAMBAS_COMPONENT}
 INSTALL_WRKSRC=		${WRKSRC}/${GAMBAS_COMPONENT}
@@ -159,19 +162,18 @@ USE_QT_VER=	3
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 37,39d ${WRKSRC}/main/share/gb_common.h
 	@cd ${WRKSRC} && \
 		${FIND} * -type f -name configure -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 			-e 's|-pipe -Wall -Wno-unused-value -fsigned-char|$$CFLAGS|g' \
+			-e 's|-pipe -Wall -fno-exceptions -Wno-unused-value -fsigned-char|$$CXXFLAGS|g' \
 			-e 's|-O0||g'
 	@cd ${WRKSRC} && \
-		${FIND} -E * -type f -iregex ".*\.(c|h)" -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-			-e 's|#ifdef __GNU_LIBRARY__|#if defined (__GNU_LIBRARY__) \|\| \
-				defined (__FreeBSD__)|g'
+		${FIND} * -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+			-e 's|(GAMBAS_VERSION) -r|(GAMBAS_VERSION) -p -r|g'
 
 pre-install:
-.if exists(${LOCALBASE}/bin/gbi2)
-	@${LOCALBASE}/bin/gbi2 -r ${PREFIX}
+.if exists(${GBI2_CMD})
+	@${GBI2_CMD} -p -r ${PREFIX}
 .endif
 
 security-check: gambas2-check-install
diff --git a/lang/gambas2-base/distinfo b/lang/gambas2-base/distinfo
index 720c30b6b990..3ea713c2aa2c 100644
--- a/lang/gambas2-base/distinfo
+++ b/lang/gambas2-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (gambas/gambas2-2.12.tar.bz2) = 58118cc26f7c8b56a24a35e51fd6cbca
-SHA256 (gambas/gambas2-2.12.tar.bz2) = 7abdc802896f505097f352a3927cddde479baaae1cccba82674a0454422fc8c2
-SIZE (gambas/gambas2-2.12.tar.bz2) = 12739402
+MD5 (gambas/gambas2-2.13.0.tar.bz2) = c9810bd6b8231734f193d5325c8af5fe
+SHA256 (gambas/gambas2-2.13.0.tar.bz2) = f5c1dd827823c24818f2c12052dcdeabbc9874d86c2f1f3e078ba2356d8347a2
+SIZE (gambas/gambas2-2.13.0.tar.bz2) = 12752888
diff --git a/lang/gambas2-base/files/patch-main-gbx_gbx_math.c b/lang/gambas2-base/files/patch-main-gbx_gbx_math.c
deleted file mode 100644
index d10cfe22b804..000000000000
--- a/lang/gambas2-base/files/patch-main-gbx_gbx_math.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- main/gbx/gbx_math.c	2009-05-08 17:34:14.000000000 -0500
-+++ main/gbx/gbx_math.c	2009-05-08 17:34:45.000000000 -0500
-@@ -207,10 +207,6 @@
- 	return log(x) / M_LN2;
- }
- 
--#endif
--
--#ifdef OS_OPENBSD
--
- double exp2(double x)
- {
- 	return pow(2, x);
diff --git a/lang/gambas2-base/files/patch-main-gbx_gbx_math.h b/lang/gambas2-base/files/patch-main-gbx_gbx_math.h
deleted file mode 100644
index a802b488fdf1..000000000000
--- a/lang/gambas2-base/files/patch-main-gbx_gbx_math.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/gbx/gbx_math.h	2009-05-08 17:35:50.000000000 -0500
-+++ main/gbx/gbx_math.h	2009-05-08 17:36:10.000000000 -0500
-@@ -47,9 +47,6 @@
- #if defined(OS_FREEBSD) || defined(OS_OPENBSD)
- double exp10(double x);
- double log2(double x);
--#endif
--
--#ifdef OS_OPENBSD
- double exp2(double x);
- long double log10l(long double x);
- long double fabsl(long double x);
diff --git a/lang/gambas2-base/files/patch-main-share_gb_common.h b/lang/gambas2-base/files/patch-main-share_gb_common.h
new file mode 100644
index 000000000000..1a17edeeca8e
--- /dev/null
+++ b/lang/gambas2-base/files/patch-main-share_gb_common.h
@@ -0,0 +1,13 @@
+--- main/share/gb_common.h	2009-05-20 19:03:15.000000000 -0500
++++ main/share/gb_common.h	2009-05-20 19:10:35.000000000 -0500
+@@ -51,6 +51,10 @@
+ #define HAVE_GETOPT_LONG 1
+ #endif
+ 
++#if defined(OS_FREEBSD) && (defined(__amd64__) || defined(__ia64__) || defined(__sparc64__))
++#define __WORDSIZE 64
++#endif
++
+ #if defined(OS_FREEBSD) || defined(OS_OPENBSD)
+ 
+   /* Get definition for PATH_MAX */
diff --git a/lang/gambas2-examples/Makefile b/lang/gambas2-examples/Makefile
index ee6ace4ca26f..ad64c294ed3a 100644
--- a/lang/gambas2-examples/Makefile
+++ b/lang/gambas2-examples/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gambas2
-PORTVERSION=	2.12
+PORTVERSION=	2.13.0
 CATEGORIES=	lang
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:S/2//g}
diff --git a/lang/gambas2-examples/distinfo b/lang/gambas2-examples/distinfo
index 720c30b6b990..3ea713c2aa2c 100644
--- a/lang/gambas2-examples/distinfo
+++ b/lang/gambas2-examples/distinfo
@@ -1,3 +1,3 @@
-MD5 (gambas/gambas2-2.12.tar.bz2) = 58118cc26f7c8b56a24a35e51fd6cbca
-SHA256 (gambas/gambas2-2.12.tar.bz2) = 7abdc802896f505097f352a3927cddde479baaae1cccba82674a0454422fc8c2
-SIZE (gambas/gambas2-2.12.tar.bz2) = 12739402
+MD5 (gambas/gambas2-2.13.0.tar.bz2) = c9810bd6b8231734f193d5325c8af5fe
+SHA256 (gambas/gambas2-2.13.0.tar.bz2) = f5c1dd827823c24818f2c12052dcdeabbc9874d86c2f1f3e078ba2356d8347a2
+SIZE (gambas/gambas2-2.13.0.tar.bz2) = 12752888
diff --git a/lang/gambas2/Makefile b/lang/gambas2/Makefile
index efb3b9416052..30057d448439 100644
--- a/lang/gambas2/Makefile
+++ b/lang/gambas2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gambas2
-PORTVERSION=	2.12
-PORTREVISION=	1
+PORTVERSION=	2.13.0
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty