2 files changed, 27 insertions, 47 deletions

diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index 4e708dcc287c..deb83f9cf049 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jasperreports
-PORTVERSION=	3.7.6
+PORTVERSION=	5.1.2
 CATEGORIES=	databases print java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JasperReports%20${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar
@@ -19,15 +19,12 @@ RUN_DEPENDS=	${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext			\
 		${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils\
 		${JAVALIBDIR}/commons-digester.jar:${PORTSDIR}/textproc/jakarta-commons-digester
 
-.if !defined(WITHOUT_MYSQL)
-RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
-.else
-RUN_DEPENDS+=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
-.endif
+OPTIONS_DEFINE=	MYSQL PGSQL ORACLE8 ORACLE9 HSQLDB
+OPTIONS_DEFAULT=MYSQL PGSQL
 
-.if !defined(WITHOUT_PGSQL)
-RUN_DEPENDS+=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
-.endif
+ORACLE8_DESC=	Install libraries required for Oracle 8
+ORACLE9_DESC=	Install libraries required for Oracle 9
+HSQLDB_DESC=	Install libraries required for HSQLDB
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -40,50 +37,33 @@ LICENSE=	LGPL3
 
 PLIST_FILES=	${DISTFILES:S|^|%%JAVAJARDIR%%/|:S|-${PORTVERSION}||}
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if exists(${JAVALIBDIR}/classes12.zip)
-WITH_ORACLE8=	yes
+.if ${PORT_OPTIONS:MMYSQL}
+RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
+.else
+RUN_DEPENDS+=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+RUN_DEPENDS+=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
 .endif
-.if defined(WITH_ORACLE8)
+
+
+.if ${PORT_OPTIONS:MORACLE8}
+WITH_ORACLE8=	yes
 RUN_DEPENDS+=	${JAVALIBDIR}/classes12.zip:${PORTSDIR}/databases/jdbc-oracle8i
 .endif
 
-.if exists(${JAVALIBDIR}/ojdbc14.jar)
+.if ${PORT_OPTIONS:MORACLE9}
 WITH_ORACLE9=	yes
-.endif
-.if defined(WITH_ORACLE9)
 RUN_DEPENDS+=	${JAVALIBDIR}/ojdbc14.jar:${PORTSDIR}/databases/jdbc-oracle9i
 .endif
 
-.if exists(${JAVALIBDIR}/hsqldb.jar)
-WITH_HSQLDB=	yes
-.endif
-.if defined(WITH_HSQLDB)
+.if ${PORT_OPTIONS:MHSQLDB}
 RUN_DEPENDS+=	${JAVALIBDIR}/hsqldb.jar:${PORTSDIR}/databases/hsqldb
 .endif
 
-pre-everything::
-	@${ECHO_MSG} '*********************************************************'
-	@${ECHO_MSG} '* You need at least one JDBC driver.                    *'
-.if !defined(WITHOUT_MYSQL)
-	@${ECHO_MSG} '* Define WITHOUT_MYSQL to remove MySQL support.         *'
-.endif
-.if !defined(WITHOUT_PGSQL)
-	@${ECHO_MSG} '* Define WITHOUT_PGSQL to remove PostgreSQL support.    *'
-.endif
-.if !defined(WITH_ORACLE8)
-	@${ECHO_MSG} '* Define WITH_ORACLE8 to add Oracle 8i support.         *'
-.endif
-.if !defined(WITH_ORACLE9)
-	@${ECHO_MSG} '* Define WITH_ORACLE9 to add Oracle 9i support.         *'
-.endif
-.if !defined(WITH_HSQLDB)
-	@${ECHO_MSG} '* Define WITH_HSQLDB to add HSQLDB support.            *'
-.endif
-	@${ECHO_MSG} '*********************************************************'
-
 post-extract:
 .for jf in ${DISTFILES}
 	${MV} ${WRKDIR}/${jf} ${WRKDIR}/${jf:S|-${PORTVERSION}||}
@@ -91,6 +71,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA} ${DISTFILES:S|^|${WRKDIR}/|:S|-${PORTVERSION}||}	\
-		${JAVAJARDIR}
+		${STAGEDIR}${JAVAJARDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/jasperreports/distinfo b/databases/jasperreports/distinfo
index 3acc871c5ea2..b67f8628d133 100644
--- a/databases/jasperreports/distinfo
+++ b/databases/jasperreports/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jasperreports-3.7.6.jar) = fc8b919452c367eecb62c9649d4a58be598fd8a7c42e6943be61e2ebf16416f5
-SIZE (jasperreports-3.7.6.jar) = 3015437
-SHA256 (jasperreports-applet-3.7.6.jar) = a8e49cdb349a4ad6b50df341f969920b9f565d12ae9e9972c92406736a948479
-SIZE (jasperreports-applet-3.7.6.jar) = 440490
+SHA256 (jasperreports-5.1.2.jar) = fd349ecd5e21547491e865042ac3277de1e550c3b6946c2d87d71a125d87477e
+SIZE (jasperreports-5.1.2.jar) = 4530683
+SHA256 (jasperreports-applet-5.1.2.jar) = e31dc3ce36a37ef9692394030cf8f4831aba363c780cf30f3232f3f6046ae954
+SIZE (jasperreports-applet-5.1.2.jar) = 513918