From a6259f4ed80f68bf57866ff33482a519376c55d5 Mon Sep 17 00:00:00 2001
From: vanilla <vanilla@FreeBSD.org>
Date: Fri, 11 Dec 2015 08:05:09 +0000
Subject: 1: Upgrade to 3.4.2. 2: switch to CHEESESHOP 3: add NUMPY support.

---
 devel/jep/Makefile                       | 24 ++++++++++++++----------
 devel/jep/distinfo                       |  4 ++--
 devel/jep/files/patch-commands_python.py | 11 +++++++++++
 devel/jep/pkg-plist                      | 14 +++++++++-----
 4 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 devel/jep/files/patch-commands_python.py

(limited to 'devel/jep')

diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 0c814af9766..5b34a33f3a2 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -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 <bsd.port.mk>
diff --git a/devel/jep/distinfo b/devel/jep/distinfo
index 24787d5d8cc..7e67f16e3d8 100644
--- a/devel/jep/distinfo
+++ b/devel/jep/distinfo
@@ -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
diff --git a/devel/jep/files/patch-commands_python.py b/devel/jep/files/patch-commands_python.py
new file mode 100644
index 00000000000..63418528f69
--- /dev/null
+++ b/devel/jep/files/patch-commands_python.py
@@ -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():
diff --git a/devel/jep/pkg-plist b/devel/jep/pkg-plist
index 0743312e49a..8b9ad556be7 100644
--- a/devel/jep/pkg-plist
+++ b/devel/jep/pkg-plist
@@ -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
-- 
cgit