From owner-svn-ports-head@FreeBSD.ORG Sun Dec 1 17:59:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4FC86D0; Sun, 1 Dec 2013 17:59:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 80B2F126C; Sun, 1 Dec 2013 17:59:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB1Hx8Ok041222; Sun, 1 Dec 2013 17:59:08 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB1Hx7Ka041219; Sun, 1 Dec 2013 17:59:07 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312011759.rB1Hx7Ka041219@svn.freebsd.org> From: Marcus von Appen Date: Sun, 1 Dec 2013 17:59:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335418 - head/lang/jython X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2013 17:59:08 -0000 Author: mva Date: Sun Dec 1 17:59:07 2013 New Revision: 335418 URL: http://svnweb.freebsd.org/changeset/ports/335418 Log: - Update to version 2.5.3 - Enable staging support - Pet portlint Modified: head/lang/jython/Makefile (contents, props changed) head/lang/jython/distinfo (contents, props changed) head/lang/jython/pkg-plist (contents, props changed) Modified: head/lang/jython/Makefile ============================================================================== --- head/lang/jython/Makefile Sun Dec 1 17:58:31 2013 (r335417) +++ head/lang/jython/Makefile Sun Dec 1 17:59:07 2013 (r335418) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= jython -PORTVERSION= 2.5.2 +PORTVERSION= 2.5.3 CATEGORIES= lang python java -MASTER_SITES= SF -DISTNAME= jython_installer-${PORTVERSION} +MASTER_SITES= http://central.maven.org/maven2/org/python/jython-installer/${PORTVERSION}/ +DISTNAME= jython-installer-${PORTVERSION} EXTRACT_SUFX= .jar EXTRACT_ONLY= # none @@ -26,27 +26,28 @@ PLIST_SUB+= JYTHON_DIR=${INST_TARGET} CACHEDIR_SPEC= -Dpython.cachedir=${WRKDIR}/jython-cachedir -NO_STAGE= yes +# Do tons of backflips so that the cachedir is put into the user's home +# directory (it's irritating to not be able to cache stuff if you're +# not root). Furthermore, don't leave a cachedir around from either a +# port install or a package install, but do cache the *.py files in Lib +# during a port install or a package install. do-install: - @# Do tons of backflips so that the cachedir is put into the user's home - @# directory (it's irritating to not be able to cache stuff if you're - @# not root). Furthermore, don't leave a cachedir around from either a - @# port install or a package install, but do cache the *.py files in Lib - @# during a port install or a package install. cd ${DISTDIR} && ${JAVA} ${CACHEDIR_SPEC} \ -jar ${DISTNAME}${EXTRACT_SUFX} \ - --silent -d ${JYTHON_PREFIX} -t standard + --silent -d ${STAGEDIR}${JYTHON_PREFIX} -t standard ${REINPLACE_CMD} \ - 's/-cl/"-Dpython.cachedir=$${HOME}\/.jython-cachedir" -cl/g' \ - ${JYTHON_PREFIX}/jython + 's|-cl|"-Dpython.cachedir=$${HOME}/.jython-cachedir" -cl|g ; \ + s|${STAGEDIR}||' \ + ${STAGEDIR}${JYTHON_PREFIX}/jython ${REINPLACE_CMD} \ 's,if expr "$$link" : '\''/'\'' > /dev/null; then,if expr "$$link" : '\''^/'\'' > /dev/null; then,' \ - ${JYTHON_PREFIX}/jython - ${REINPLACE_CMD} 's/^python\.cachedir/#&/g' ${JYTHON_PREFIX}/registry - ${JYTHON_PREFIX}/jython ${CACHEDIR_SPEC} -c None - - @# Install symbolic links for convenience. - -${LN} -sf ${JYTHON_PREFIX}/jython ${PREFIX}/bin/jython - -${LN} -sf ${JYTHON_PREFIX}/registry ${PREFIX}/etc/jython.reg + ${STAGEDIR}${JYTHON_PREFIX}/jython + ${REINPLACE_CMD} 's/^python\.cachedir/#&/g' \ + ${STAGEDIR}${JYTHON_PREFIX}/registry + ${STAGEDIR}${JYTHON_PREFIX}/jython ${CACHEDIR_SPEC} -c None + +# Install symbolic links for convenience. + -${LN} -sf ${JYTHON_PREFIX}/jython ${STAGEDIR}${PREFIX}/bin/jython + -${LN} -sf ${JYTHON_PREFIX}/registry ${STAGEDIR}${PREFIX}/etc/jython.reg .include Modified: head/lang/jython/distinfo ============================================================================== --- head/lang/jython/distinfo Sun Dec 1 17:58:31 2013 (r335417) +++ head/lang/jython/distinfo Sun Dec 1 17:59:07 2013 (r335418) @@ -1,2 +1,2 @@ -SHA256 (jython_installer-2.5.2.jar) = 1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29 -SIZE (jython_installer-2.5.2.jar) = 18435770 +SHA256 (jython-installer-2.5.3.jar) = 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e +SIZE (jython-installer-2.5.3.jar) = 18487200 Modified: head/lang/jython/pkg-plist ============================================================================== --- head/lang/jython/pkg-plist Sun Dec 1 17:58:31 2013 (r335417) +++ head/lang/jython/pkg-plist Sun Dec 1 17:59:07 2013 (r335418) @@ -488,6 +488,7 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/_LWPCookieJar.py %%JYTHON_DIR%%/Lib/_MozillaCookieJar.py %%JYTHON_DIR%%/Lib/__future__.py +%%JYTHON_DIR%%/Lib/_google_ipaddr_r234.py %%JYTHON_DIR%%/Lib/_rawffi.py %%JYTHON_DIR%%/Lib/_strptime.py %%JYTHON_DIR%%/Lib/_threading_local.py @@ -1161,6 +1162,8 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/inspect_fodder.py %%JYTHON_DIR%%/Lib/test/inspect_fodder2.py %%JYTHON_DIR%%/Lib/test/invalid_utf_8_declared_encoding.py +%%JYTHON_DIR%%/Lib/test/issue1811/__init__.py +%%JYTHON_DIR%%/Lib/test/issue1811/foo.py %%JYTHON_DIR%%/Lib/test/jser2_classes.py %%JYTHON_DIR%%/Lib/test/junit_xml.py %%JYTHON_DIR%%/Lib/test/latin1_no_encoding.py @@ -1348,8 +1351,10 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_ctypes.py %%JYTHON_DIR%%/Lib/test/test_curses.py %%JYTHON_DIR%%/Lib/test/test_datetime.py +%%JYTHON_DIR%%//Lib/test/test_datetime_jy.py %%JYTHON_DIR%%/Lib/test/test_dbm.py %%JYTHON_DIR%%/Lib/test/test_decimal.py +%%JYTHON_DIR%%/Lib/test/test_decimal_jy.py %%JYTHON_DIR%%/Lib/test/test_decorators.py %%JYTHON_DIR%%/Lib/test/test_decorators_jy.py %%JYTHON_DIR%%/Lib/test/test_defaultdict.py @@ -1408,6 +1413,7 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_func_syntax_jy.py %%JYTHON_DIR%%/Lib/test/test_funcattrs.py %%JYTHON_DIR%%/Lib/test/test_functools.py +%%JYTHON_DIR%%/Lib/test/test_functools_jy.py %%JYTHON_DIR%%/Lib/test/test_future.py %%JYTHON_DIR%%/Lib/test/test_future1.py %%JYTHON_DIR%%/Lib/test/test_future2.py @@ -1451,6 +1457,7 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_inspect.py %%JYTHON_DIR%%/Lib/test/test_inspect_jy.py %%JYTHON_DIR%%/Lib/test/test_int_jy.py +%%JYTHON_DIR%%/Lib/test/test_io_jy.py %%JYTHON_DIR%%/Lib/test/test_ioctl.py %%JYTHON_DIR%%/Lib/test/test_isatty.py %%JYTHON_DIR%%/Lib/test/test_isinstance.py @@ -1480,6 +1487,7 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_locale.py %%JYTHON_DIR%%/Lib/test/test_logging.py %%JYTHON_DIR%%/Lib/test/test_long.py +%%JYTHON_DIR%%/Lib/test/test_long_jy.py %%JYTHON_DIR%%/Lib/test/test_long_future.py %%JYTHON_DIR%%/Lib/test/test_long_int_args.py %%JYTHON_DIR%%/Lib/test/test_longexp.py @@ -1520,6 +1528,7 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_operator_jy.py %%JYTHON_DIR%%/Lib/test/test_optparse.py %%JYTHON_DIR%%/Lib/test/test_os.py +%%JYTHON_DIR%%/Lib/test/test_os_jy.py %%JYTHON_DIR%%/Lib/test/test_ossaudiodev.py %%JYTHON_DIR%%/Lib/test/test_parser.py %%JYTHON_DIR%%/Lib/test/test_pbcvm.py @@ -1533,6 +1542,7 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_pickle.py %%JYTHON_DIR%%/Lib/test/test_pickletools.py %%JYTHON_DIR%%/Lib/test/test_pkg.py +%%JYTHON_DIR%%/Lib/test/test_pkg_jy.py %%JYTHON_DIR%%/Lib/test/test_pkgimport.py %%JYTHON_DIR%%/Lib/test/test_platform.py %%JYTHON_DIR%%/Lib/test/test_plistlib.py @@ -1583,7 +1593,6 @@ etc/jython.reg %%JYTHON_DIR%%/Lib/test/test_slice.py %%JYTHON_DIR%%/Lib/test/test_slots_jy.py %%JYTHON_DIR%%/Lib/test/test_socket.py -%%JYTHON_DIR%%/Lib/test/test_socket_jy.py %%JYTHON_DIR%%/Lib/test/test_socket_ssl.py %%JYTHON_DIR%%/Lib/test/test_socketserver.py %%JYTHON_DIR%%/Lib/test/test_socketserver_jython.py @@ -1779,6 +1788,7 @@ etc/jython.reg %%JYTHON_DIR%%/tests/java/javatests/BigDecimalTest.java %%JYTHON_DIR%%/tests/java/javatests/Dict2JavaTest.java %%JYTHON_DIR%%/tests/java/javatests/Foo.java +%%JYTHON_DIR%%/tests/java/javatests/Issue1833.java %%JYTHON_DIR%%/tests/java/javatests/JOverload.java %%JYTHON_DIR%%/tests/java/javatests/ListTest.java %%JYTHON_DIR%%/tests/java/javatests/ProxyTests.java @@ -1845,6 +1855,7 @@ etc/jython.reg %%JYTHON_DIR%%/tests/java/org/python/tests/constructor_kwargs/KWArgsObject.java %%JYTHON_DIR%%/tests/java/org/python/tests/identity/IdentityObject.java %%JYTHON_DIR%%/tests/java/org/python/tests/identity/IdentityTest.java +%%JYTHON_DIR%%/tests/java/org/python/tests/imp/ImportTests.java %%JYTHON_DIR%%/tests/java/org/python/tests/inbred/Metis.java %%JYTHON_DIR%%/tests/java/org/python/tests/inbred/Zeus.java %%JYTHON_DIR%%/tests/java/org/python/tests/mro/ConfusedOnGetitemAdd.java @@ -1869,6 +1880,7 @@ etc/jython.reg @dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/multihidden @dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/mro @dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/inbred +@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/imp @dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/identity @dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/constructor_kwargs @dirrm %%JYTHON_DIR%%/tests/java/org/python/tests @@ -1903,6 +1915,7 @@ etc/jython.reg @dirrm %%JYTHON_DIR%%/Lib/test/pbcvm @dirrm %%JYTHON_DIR%%/Lib/test/output @dirrm %%JYTHON_DIR%%/Lib/test/leakers +@dirrm %%JYTHON_DIR%%/Lib/test/issue1811 @dirrm %%JYTHON_DIR%%/Lib/test/decimaltestdata @dirrm %%JYTHON_DIR%%/Lib/test/crashers @dirrm %%JYTHON_DIR%%/Lib/test/bugs/pr133