- Update to 2.15.0

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

8 files changed, 15 insertions, 23 deletions

diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile
index 246ddf3cb903..455ff70d8a0a 100644
--- a/lang/gambas2-base/Makefile
+++ b/lang/gambas2-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gambas2
-PORTVERSION=	2.13.0
+PORTVERSION=	2.15.0
 CATEGORIES?=	lang kde
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:S/2//g}
@@ -28,6 +28,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=		--disable-debug \
 			--disable-optimization \
+			--disable-preloading \
 			--with-intl-includes=${LOCALBASE}/include \
 			--with-intl-libraries=${LOCALBASE}/lib \
 			--with-conv-includes=${LOCALBASE}/include \
diff --git a/lang/gambas2-base/Makefile.components b/lang/gambas2-base/Makefile.components
index 5bc6b2d284af..25ae874729a1 100644
--- a/lang/gambas2-base/Makefile.components
+++ b/lang/gambas2-base/Makefile.components
@@ -1,6 +1,5 @@
 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
@@ -196,6 +195,9 @@ CONFIGURE_ARGS+=	--with-qtopengl-includes=${LOCALBASE}/include/GL \
 .endif
 
 post-patch:
+.if ${PKGNAMESUFFIX} == "-ide"
+	@${REINPLACE_CMD} -e 's|#$$hOut |#$$hOut, |g' ${WRKSRC}/app/src/gbs2/MServerPage.module
+.endif
 	@cd ${WRKSRC} && \
 		${FIND} * -type f -name configure -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 			-e 's|-pipe -Wall -Wno-unused-value -fsigned-char|$$CFLAGS|g' \
diff --git a/lang/gambas2-base/distinfo b/lang/gambas2-base/distinfo
index 3ea713c2aa2c..11adaf575b4f 100644
--- a/lang/gambas2-base/distinfo
+++ b/lang/gambas2-base/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gambas/gambas2-2.15.0.tar.bz2) = bd109e93c94980c3a6b2d01427992617
+SHA256 (gambas/gambas2-2.15.0.tar.bz2) = 55ac73e7c86b1506c44de2bc2805e75c8e422a9cbde83c258c4aaadb3c55f472
+SIZE (gambas/gambas2-2.15.0.tar.bz2) = 12751038
diff --git a/lang/gambas2-base/files/patch-main-share_gb_common.h b/lang/gambas2-base/files/patch-main-share_gb_common.h
deleted file mode 100644
index 1a17edeeca8e..000000000000
--- a/lang/gambas2-base/files/patch-main-share_gb_common.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-base/pkg-plist b/lang/gambas2-base/pkg-plist
index 7bec6f50c78b..501e950d13a6 100644
--- a/lang/gambas2-base/pkg-plist
+++ b/lang/gambas2-base/pkg-plist
@@ -39,6 +39,7 @@ lib/gambas2/gb.gui.so.0
 lib/gambas2/gb.gui.so
 lib/gambas2/gb.gui.la
 lib/gambas2/gb.component
+%%DATADIR%%/icons/application-x-gambas.png
 %%DATADIR%%/info/gb.debug.info
 %%DATADIR%%/info/gb.debug.list
 %%DATADIR%%/info/gb.eval.info
@@ -56,5 +57,6 @@ lib/gambas2/gb.component
 %%DATADIR%%/info/gb.info
 %%DATADIR%%/info/gb.list
 @dirrmtry lib/gambas2
+@dirrmtry %%DATADIR%%/icons
 @dirrmtry %%DATADIR%%/info
 @dirrmtry %%DATADIR%%
diff --git a/lang/gambas2-examples/Makefile b/lang/gambas2-examples/Makefile
index ad64c294ed3a..d6d596b92249 100644
--- a/lang/gambas2-examples/Makefile
+++ b/lang/gambas2-examples/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gambas2
-PORTVERSION=	2.13.0
+PORTVERSION=	2.15.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 3ea713c2aa2c..11adaf575b4f 100644
--- a/lang/gambas2-examples/distinfo
+++ b/lang/gambas2-examples/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gambas/gambas2-2.15.0.tar.bz2) = bd109e93c94980c3a6b2d01427992617
+SHA256 (gambas/gambas2-2.15.0.tar.bz2) = 55ac73e7c86b1506c44de2bc2805e75c8e422a9cbde83c258c4aaadb3c55f472
+SIZE (gambas/gambas2-2.15.0.tar.bz2) = 12751038
diff --git a/lang/gambas2/Makefile b/lang/gambas2/Makefile
index 30057d448439..be328ce4aef8 100644
--- a/lang/gambas2/Makefile
+++ b/lang/gambas2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gambas2
-PORTVERSION=	2.13.0
+PORTVERSION=	2.15.0
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty