From owner-svn-ports-head@freebsd.org Fri Dec 11 08:05:11 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D50B9D7D7A; Fri, 11 Dec 2015 08:05:11 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 368661D62; Fri, 11 Dec 2015 08:05:11 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBB85Aes067951; Fri, 11 Dec 2015 08:05:10 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBB859Ka067947; Fri, 11 Dec 2015 08:05:09 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201512110805.tBB859Ka067947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Fri, 11 Dec 2015 08:05:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403503 - in head/devel/jep: . files 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.20 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: Fri, 11 Dec 2015 08:05:11 -0000 Author: vanilla Date: Fri Dec 11 08:05:09 2015 New Revision: 403503 URL: https://svnweb.freebsd.org/changeset/ports/403503 Log: 1: Upgrade to 3.4.2. 2: switch to CHEESESHOP 3: add NUMPY support. Added: head/devel/jep/files/ head/devel/jep/files/patch-commands_python.py (contents, props changed) Modified: head/devel/jep/Makefile head/devel/jep/distinfo head/devel/jep/pkg-plist Modified: head/devel/jep/Makefile ============================================================================== --- head/devel/jep/Makefile Fri Dec 11 06:24:55 2015 (r403502) +++ head/devel/jep/Makefile Fri Dec 11 08:05:09 2015 (r403503) @@ -2,33 +2,37 @@ # $FreeBSD$ PORTNAME= jep -PORTVERSION= 2.4 -PORTREVISION= 2 +PORTVERSION= 3.4.2 CATEGORIES= devel java python -MASTER_SITES= SF/${PORTNAME}p/${PORTNAME}/${PORTVERSION} +MASTER_SITES= CHEESESHOP MAINTAINER= ports@FreeBSD.org COMMENT= Java Embedded Python LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} MAKE_ENV= JAVA_HOME=${JAVA_HOME} -CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} USE_JAVA= yes JAVA_VERSION= 1.6+ -GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= libtool python +USES= python +USE_PYTHON= distutils +PLIST_SUB+= VERSION=${PORTVERSION} + # Necessary, since the configure script does the LIBS and # LDFLAGS detection wrong +CFLAGS+= -I${JAVA_HOME}/include/freebsd LDFLAGS+= -L${LOCALBASE}/lib -MAKE_JOBS_UNSAFE= yes +OPTIONS_DEFINE= NUMPY +OPTIONS_DEFAULT= NUMPY +NUMPY_BUILD_DEPENDS= ${PYNUMPY} +NUMPY_RUN_DEPENDS= ${PYNUMPY} post-install: - ${INSTALL_DATA} ${WRKSRC}/jep.jar ${STAGEDIR}${JAVAJARDIR}/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjep.so + ${INSTALL_DATA} ${WRKSRC}/build/java/jep-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jep.jar + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jep/jep.so .include Modified: head/devel/jep/distinfo ============================================================================== --- head/devel/jep/distinfo Fri Dec 11 06:24:55 2015 (r403502) +++ head/devel/jep/distinfo Fri Dec 11 08:05:09 2015 (r403503) @@ -1,2 +1,2 @@ -SHA256 (jep-2.4.tar.gz) = 7f57b2874e36c33f0207be5bc47da29e5547ec48523962ac03fc56aab83087f8 -SIZE (jep-2.4.tar.gz) = 637141 +SHA256 (jep-3.4.2.tar.gz) = 231987055d59a56668af7b09e04c8da6dff0c3faf49d43647c08b8ddaf563aa1 +SIZE (jep-3.4.2.tar.gz) = 242895 Added: head/devel/jep/files/patch-commands_python.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/jep/files/patch-commands_python.py Fri Dec 11 08:05:09 2015 (r403503) @@ -0,0 +1,11 @@ +--- commands/python.py.orig 2015-12-11 07:27:06 UTC ++++ commands/python.py +@@ -13,8 +13,6 @@ def get_python_libs(): + if ldv: + v = ldv + libs = ['python' + v] +- if not is_windows(): +- libs.append('dl') + return libs + + def get_python_linker_args(): Modified: head/devel/jep/pkg-plist ============================================================================== --- head/devel/jep/pkg-plist Fri Dec 11 06:24:55 2015 (r403502) +++ head/devel/jep/pkg-plist Fri Dec 11 08:05:09 2015 (r403503) @@ -1,6 +1,10 @@ -lib/libjep.a -lib/libjep.so.2 -lib/libjep.so.2.0.1 -lib/libjep.so -man/man1/jep.1.gz +bin/jep +%%PYTHON_SITELIBDIR%%/jep/__init__.py +%%PYTHON_SITELIBDIR%%/jep/console.py +%%PYTHON_SITELIBDIR%%/jep/hook.py +%%PYTHON_SITELIBDIR%%/jep/jdbc.py +%%PYTHON_SITELIBDIR%%/jep/jep-%%VERSION%%.jar +%%PYTHON_SITELIBDIR%%/jep/jep.so +%%PYTHON_SITELIBDIR%%/jep/libjep.so +%%PYTHON_SITELIBDIR%%/jep/version.py %%JAVAJARDIR%%/jep.jar