From owner-svn-ports-all@FreeBSD.ORG Mon Nov 4 14:33:57 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 79217DB9; Mon, 4 Nov 2013 14:33:57 +0000 (UTC) (envelope-from wg@FreeBSD.org) 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 55FCD2918; Mon, 4 Nov 2013 14:33:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4EXvuo006439; Mon, 4 Nov 2013 14:33:57 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4EXuAS006437; Mon, 4 Nov 2013 14:33:56 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311041433.rA4EXuAS006437@svn.freebsd.org> From: William Grzybowski Date: Mon, 4 Nov 2013 14:33:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332732 - head/databases/jasperreports X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 14:33:57 -0000 Author: wg Date: Mon Nov 4 14:33:56 2013 New Revision: 332732 URL: http://svnweb.freebsd.org/changeset/ports/332732 Log: databases/jasperreports: update to 5.1.2 - Update to 5.1.2 [1] - Convert to options - Allow staging PR: ports/181332 [1] Submitted by: Pedro Giffuni Modified: head/databases/jasperreports/Makefile head/databases/jasperreports/distinfo Modified: head/databases/jasperreports/Makefile ============================================================================== --- head/databases/jasperreports/Makefile Mon Nov 4 14:29:44 2013 (r332731) +++ head/databases/jasperreports/Makefile Mon Nov 4 14:33:56 2013 (r332732) @@ -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:${P ${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 +.include -.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 +.include Modified: head/databases/jasperreports/distinfo ============================================================================== --- head/databases/jasperreports/distinfo Mon Nov 4 14:29:44 2013 (r332731) +++ head/databases/jasperreports/distinfo Mon Nov 4 14:33:56 2013 (r332732) @@ -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