Wed Jun 10 14:58:50 2015 UTC ()
Explicitly use local array type. Fix deletes on arrays. Bump revision.


(joerg)
diff -r1.27 -r1.28 pkgsrc/lang/basic256/Makefile
diff -r1.3 -r1.4 pkgsrc/lang/basic256/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/basic256/patches/patch-Interpreter.cpp
cvs diff -r1.27 -r1.28 pkgsrc/lang/basic256/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/basic256/Attic/Makefile 2015/04/25 14:23:26 1.27
+++ pkgsrc/lang/basic256/Attic/Makefile 2015/06/10 14:58:50 1.28
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:26 tnn Exp $ 1# $NetBSD: Makefile,v 1.28 2015/06/10 14:58:50 joerg Exp $
2# 2#
3 3
4DISTNAME= basic256_0.9.6.71 4DISTNAME= basic256_0.9.6.71
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6PKGREVISION= 17 6PKGREVISION= 18
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kidbasic/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kidbasic/}
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.basic256.org/ 12HOMEPAGE= http://www.basic256.org/
13COMMENT= BASIC language with traditional control structures 13COMMENT= BASIC language with traditional control structures
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18WRKSRC= ${WRKDIR} 18WRKSRC= ${WRKDIR}
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_TOOLS+= bison flex gmake 20USE_TOOLS+= bison flex gmake
21 21
22SUBST_CLASSES+= fix-path 22SUBST_CLASSES+= fix-path
23SUBST_STAGE.fix-path= pre-configure 23SUBST_STAGE.fix-path= pre-configure
24SUBST_MESSAGE.fix-path= Fix hard coded paths for qt4 24SUBST_MESSAGE.fix-path= Fix hard coded paths for qt4
25SUBST_FILES.fix-path= Makefile 25SUBST_FILES.fix-path= Makefile
26SUBST_FILES.fix-path+= Makefile.Release 26SUBST_FILES.fix-path+= Makefile.Release
27SUBST_SED.fix-path= -e 's,/usr/share,${PREFIX},g' 27SUBST_SED.fix-path= -e 's,/usr/share,${PREFIX},g'
28SUBST_SED.fix-path+= -e 's,/usr/bin/qmake,${QTDIR}/bin/qmake,' 28SUBST_SED.fix-path+= -e 's,/usr/bin/qmake,${QTDIR}/bin/qmake,'
29SUBST_SED.fix-path+= -e 's,/usr/bin/moc-qt4,${QTDIR}/bin/moc,' 29SUBST_SED.fix-path+= -e 's,/usr/bin/moc-qt4,${QTDIR}/bin/moc,'
30SUBST_SED.fix-path+= -e 's,/usr/bin/rcc,${QTDIR}/bin/rcc,' 30SUBST_SED.fix-path+= -e 's,/usr/bin/rcc,${QTDIR}/bin/rcc,'
31SUBST_SED.fix-path+= -e 's,-I/usr/include/qt4,-I${QTDIR}/include,g' 31SUBST_SED.fix-path+= -e 's,-I/usr/include/qt4,-I${QTDIR}/include,g'
32 32
33SUBST_CLASSES+= fix-path2 33SUBST_CLASSES+= fix-path2
34SUBST_STAGE.fix-path2= pre-configure 34SUBST_STAGE.fix-path2= pre-configure
35SUBST_MESSAGE.fix-path2= Fix hard coded paths 35SUBST_MESSAGE.fix-path2= Fix hard coded paths
36SUBST_FILES.fix-path2+= BASIC256.pro 36SUBST_FILES.fix-path2+= BASIC256.pro
37SUBST_SED.fix-path2= -e 's,/usr/share,${PREFIX}/share,g' 37SUBST_SED.fix-path2= -e 's,/usr/share,${PREFIX}/share,g'
38SUBST_SED.fix-path2+= -e 's,/usr/local,${PREFIX},g' 38SUBST_SED.fix-path2+= -e 's,/usr/local,${PREFIX},g'
39 39
40MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 40MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
41 41
42.include "../../audio/SDL_mixer/buildlink3.mk" 42.include "../../audio/SDL_mixer/buildlink3.mk"
43.include "../../audio/espeak/buildlink3.mk" 43.include "../../audio/espeak/buildlink3.mk"
44.include "../../databases/sqlite3/buildlink3.mk" 44.include "../../databases/sqlite3/buildlink3.mk"
45.include "../../security/openssl/buildlink3.mk" 45.include "../../security/openssl/buildlink3.mk"
46.include "../../x11/qt4-libs/buildlink3.mk" 46.include "../../x11/qt4-libs/buildlink3.mk"
47.include "../../x11/qt4-tools/buildlink3.mk" 47.include "../../x11/qt4-tools/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/lang/basic256/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/basic256/Attic/distinfo 2013/05/04 12:48:33 1.3
+++ pkgsrc/lang/basic256/Attic/distinfo 2015/06/10 14:58:50 1.4
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.3 2013/05/04 12:48:33 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2015/06/10 14:58:50 joerg Exp $
2 2
3SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f 3SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f
4RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883 4RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883
5Size (basic256_0.9.6.71.tgz) = 7924162 bytes 5Size (basic256_0.9.6.71.tgz) = 7924162 bytes
6SHA1 (patch-Interpreter.cpp) = 01800b5cd85f7c947b20ad803e04730839007ef0 6SHA1 (patch-Interpreter.cpp) = 23e0c4d7b611dff4366dbd6859d8c4eddf9d31ad
7SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138 7SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138
 8SHA1 (patch-Variables.h) = a350770e86e8b6913c92785b893e72d6a641f0eb
cvs diff -r1.1 -r1.2 pkgsrc/lang/basic256/patches/Attic/patch-Interpreter.cpp (switch to unified diff)

--- pkgsrc/lang/basic256/patches/Attic/patch-Interpreter.cpp 2013/05/04 12:48:33 1.1
+++ pkgsrc/lang/basic256/patches/Attic/patch-Interpreter.cpp 2015/06/10 14:58:50 1.2
@@ -1,15 +1,51 @@ @@ -1,15 +1,51 @@
1$NetBSD: patch-Interpreter.cpp,v 1.1 2013/05/04 12:48:33 joerg Exp $ 1$NetBSD: patch-Interpreter.cpp,v 1.2 2015/06/10 14:58:50 joerg Exp $
2 2
3Avoid overlap with std::mutex. 3Avoid overlap with std::mutex.
4 4
5--- Interpreter.cpp.orig 2013-05-04 00:26:28.000000000 +0000 5--- Interpreter.cpp.orig 2012-08-06 14:57:58.000000000 +0000
6+++ Interpreter.cpp 6+++ Interpreter.cpp
7@@ -69,6 +69,8 @@ using namespace std; 7@@ -69,6 +69,8 @@ using namespace std;
8 QMutex keymutex; 8 QMutex keymutex;
9 int currentKey; 9 int currentKey;
10  10
11+#define mutex my_mutex 11+#define mutex my_mutex
12+ 12+
13 extern QMutex mutex; 13 extern QMutex mutex;
14 extern QMutex debugmutex; 14 extern QMutex debugmutex;
15 extern QWaitCondition waitCond; 15 extern QWaitCondition waitCond;
 16@@ -2446,7 +2448,7 @@ Interpreter::execByteCode()
 17 poly.drawPolygon(points, pairs);
 18 poly.end();
 19 if (!fastgraphics) waitForGraphics();
 20- delete points;
 21+ delete[] points;
 22 }
 23 } else {
 24 errornum = ERROR_POLYARRAY;
 25@@ -2487,7 +2489,7 @@ Interpreter::execByteCode()
 26 poly.end();
 27
 28 if (!fastgraphics) waitForGraphics();
 29- delete points;
 30+ delete[] points;
 31 }
 32 }
 33 break;
 34@@ -2538,7 +2540,7 @@ Interpreter::execByteCode()
 35 poly.end();
 36 if (!fastgraphics) waitForGraphics();
 37
 38- delete points;
 39+ delete[] points;
 40 }
 41 }
 42 } else {
 43@@ -2608,7 +2610,7 @@ Interpreter::execByteCode()
 44 poly.end();
 45
 46 if (!fastgraphics) waitForGraphics();
 47- delete points;
 48+ delete[] points;
 49 }
 50 }
 51 }