Index: head/devel/py-jcc/pkg-plist =================================================================== --- head/devel/py-jcc/pkg-plist (revision 447880) +++ head/devel/py-jcc/pkg-plist (nonexistent) @@ -1,34 +0,0 @@ -%%PYTHON_SITELIBDIR%%/jcc/__init__.py -%%PYTHON_SITELIBDIR%%/jcc/__init__.pyc -%%PYTHON_SITELIBDIR%%/jcc/__init__.pyo -%%PYTHON_SITELIBDIR%%/jcc/__main__.py -%%PYTHON_SITELIBDIR%%/jcc/__main__.pyc -%%PYTHON_SITELIBDIR%%/jcc/__main__.pyo -%%PYTHON_SITELIBDIR%%/jcc/_jcc.so -%%PYTHON_SITELIBDIR%%/jcc/config.py -%%PYTHON_SITELIBDIR%%/jcc/config.pyc -%%PYTHON_SITELIBDIR%%/jcc/config.pyo -%%PYTHON_SITELIBDIR%%/jcc/cpp.py -%%PYTHON_SITELIBDIR%%/jcc/cpp.pyc -%%PYTHON_SITELIBDIR%%/jcc/cpp.pyo -%%PYTHON_SITELIBDIR%%/jcc/patches/patch.4195 -%%PYTHON_SITELIBDIR%%/jcc/patches/patch.43.0.6c11 -%%PYTHON_SITELIBDIR%%/jcc/patches/patch.43.0.6c7 -%%PYTHON_SITELIBDIR%%/jcc/python.py -%%PYTHON_SITELIBDIR%%/jcc/python.pyc -%%PYTHON_SITELIBDIR%%/jcc/python.pyo -%%PYTHON_SITELIBDIR%%/jcc/sources/JArray.cpp -%%PYTHON_SITELIBDIR%%/jcc/sources/JArray.h -%%PYTHON_SITELIBDIR%%/jcc/sources/JCCEnv.cpp -%%PYTHON_SITELIBDIR%%/jcc/sources/JCCEnv.h -%%PYTHON_SITELIBDIR%%/jcc/sources/JObject.cpp -%%PYTHON_SITELIBDIR%%/jcc/sources/JObject.h -%%PYTHON_SITELIBDIR%%/jcc/sources/functions.cpp -%%PYTHON_SITELIBDIR%%/jcc/sources/functions.h -%%PYTHON_SITELIBDIR%%/jcc/sources/jcc.cpp -%%PYTHON_SITELIBDIR%%/jcc/sources/jccfuncs.h -%%PYTHON_SITELIBDIR%%/jcc/sources/macros.h -%%PYTHON_SITELIBDIR%%/jcc/sources/types.cpp -%%PYTHON_SITELIBDIR%%/jcc/windows.py -%%PYTHON_SITELIBDIR%%/jcc/windows.pyc -%%PYTHON_SITELIBDIR%%/jcc/windows.pyo Property changes on: head/devel/py-jcc/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/py-jcc/Makefile =================================================================== --- head/devel/py-jcc/Makefile (revision 447880) +++ head/devel/py-jcc/Makefile (revision 447881) @@ -1,40 +1,41 @@ # Created by: clsung@FreeBSD.org # $FreeBSD$ PORTNAME= jcc -PORTVERSION= 2.23 +PORTVERSION= 3.0 CATEGORIES= devel java python MASTER_SITES= CHEESESHOP/source/J/JCC PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= JCC-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dbaio@FreeBSD.org COMMENT= C++ code generator for calling Java from C++/Python LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= fails to link: /nxb-bin/usr/bin/ld: cannot find -ljava USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist PYDISTUTILS_PKGNAME= JCC USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk JCC_INCLUDES= '${JAVA_HOME}/include;${JAVA_HOME}/include/freebsd' JCC_CFLAGS= '-fno-strict-aliasing;-pipe' JCC_LFLAGS= '-L${JAVA_HOME}/jre/lib/${ARCH};-ljava;-ljvm;-lverify;-L${JAVA_HOME}/jre/lib/${ARCH}/server;-L${JAVA_HOME}/jre/lib/${ARCH}/client;-Wl,-rpath=${JAVA_HOME}/jre/lib/${ARCH}:${JAVA_HOME}/jre/lib/${ARCH}/server:${JAVA_HOME}/jre/lib/${ARCH}/client' JCC_DEBUG_CFLAGS= "-O0 -g -DDEBUG" MAKE_ENV+= JCC_INCLUDES=${JCC_INCLUDES} JCC_CFLAGS=${JCC_CFLAGS} \ JCC_LFLAGS=${JCC_LFLAGS} \ JCC_JDK=${JAVA_HOME} \ JCC_DEBUG_CFLAGS=${JCC_DEBUG_CFLAGS} \ JCC_JAVADOC=${JAVADOC} \ JCC_JAVAC=javac JCC_ARGSEP=";" post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jcc/_jcc.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jcc/_jcc${PYTHON_MAJOR_VER}.so .include Index: head/devel/py-jcc/distinfo =================================================================== --- head/devel/py-jcc/distinfo (revision 447880) +++ head/devel/py-jcc/distinfo (revision 447881) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487559424 -SHA256 (JCC-2.23.tar.gz) = d463c8592f79ac0b8e67208c504899a6c2a9d410586a769e2a670f55c7487c5f -SIZE (JCC-2.23.tar.gz) = 97242 +TIMESTAMP = 1502582487 +SHA256 (JCC-3.0.tar.gz) = 52dc7ae13a8e81d78afbc0f13e88ecbdf969673923425a4d65021ae241d99b91 +SIZE (JCC-3.0.tar.gz) = 176276 Index: head/devel/py-jcc/files/patch-jcc_sources_JArray.cpp =================================================================== --- head/devel/py-jcc/files/patch-jcc_sources_JArray.cpp (revision 447880) +++ head/devel/py-jcc/files/patch-jcc_sources_JArray.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- jcc/sources/JArray.cpp.orig 2014-02-05 23:36:44 UTC -+++ jcc/sources/JArray.cpp -@@ -312,7 +312,7 @@ static PyObject *seq_concat(U *self, PyO - PyObject *list = toSequence(self); - - if (list != NULL && -- PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) < 0) -+ PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) == NULL) - { - Py_DECREF(list); - return NULL; -@@ -327,7 +327,7 @@ static PyObject *seq_repeat(U *self, Py_ - PyObject *list = toSequence(self); - - if (list != NULL && -- PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) < 0) -+ PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) == NULL) - { - Py_DECREF(list); - return NULL; Property changes on: head/devel/py-jcc/files/patch-jcc_sources_JArray.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/py-jcc/files/patch-jcc2_sources_JArray.cpp =================================================================== --- head/devel/py-jcc/files/patch-jcc2_sources_JArray.cpp (nonexistent) +++ head/devel/py-jcc/files/patch-jcc2_sources_JArray.cpp (revision 447881) @@ -0,0 +1,20 @@ +--- jcc2/sources/JArray.cpp.orig 2017-08-13 00:37:59 UTC ++++ jcc2/sources/JArray.cpp +@@ -312,7 +312,7 @@ static PyObject *seq_concat(U *self, PyObject *arg) + PyObject *list = toSequence(self); + + if (list != NULL && +- PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) < 0) ++ PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) == NULL) + { + Py_DECREF(list); + return NULL; +@@ -327,7 +327,7 @@ static PyObject *seq_repeat(U *self, Py_ssize_t n) + PyObject *list = toSequence(self); + + if (list != NULL && +- PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) < 0) ++ PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) == NULL) + { + Py_DECREF(list); + return NULL; Property changes on: head/devel/py-jcc/files/patch-jcc2_sources_JArray.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp =================================================================== --- head/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp (nonexistent) +++ head/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp (revision 447881) @@ -0,0 +1,20 @@ +--- jcc3/sources/JArray.cpp.orig 2017-08-13 00:38:32 UTC ++++ jcc3/sources/JArray.cpp +@@ -312,7 +312,7 @@ static PyObject *seq_concat(U *self, PyObject *arg) + PyObject *list = toSequence(self); + + if (list != NULL && +- PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) < 0) ++ PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) == NULL) + { + Py_DECREF(list); + return NULL; +@@ -327,7 +327,7 @@ static PyObject *seq_repeat(U *self, Py_ssize_t n) + PyObject *list = toSequence(self); + + if (list != NULL && +- PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) < 0) ++ PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) == NULL) + { + Py_DECREF(list); + return NULL; Property changes on: head/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property