Date: Thu, 6 Dec 2012 18:20:44 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308395 - in head/databases/jasperserver: . files Message-ID: <201212061820.qB6IKiDe008032@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Thu Dec 6 18:20:44 2012 New Revision: 308395 URL: http://svnweb.freebsd.org/changeset/ports/308395 Log: - fix leftover of mysql for backend (spotted by tj@) - while here drop non-default tomcat5 as a dependency (eol coming soon) as well as non-default alternative xls patch - trim historical header Feature safe: yes Deleted: head/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml head/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties Modified: head/databases/jasperserver/Makefile Modified: head/databases/jasperserver/Makefile ============================================================================== --- head/databases/jasperserver/Makefile Thu Dec 6 17:46:10 2012 (r308394) +++ head/databases/jasperserver/Makefile Thu Dec 6 18:20:44 2012 (r308395) @@ -1,9 +1,5 @@ -# New ports collection makefile for: jasperserver -# Date created: 27 August 2010 -# Whom: Jason Helfman -# +# Created by: Jason Helfman <jgh@FreeBSD.org> # $FreeBSD$ -# PORTNAME= jasperserver PORTVERSION= 4.7.0 @@ -41,10 +37,8 @@ USE_ZIP= yes # use own DOS2UNIX in pre-patch, not the one from bsd.port.mk! DOS2UNIX_REGEX= .*(css|dtd|java|js|txt|wsdd|xml|xsl)$$ -OPTIONS_DEFINE= XLS -XLS_DESC= Alternative Patches for XLS Spreadsheets OPTIONS_SINGLE= AS DB -OPTIONS_SINGLE_AS= TOMCAT5 TOMCAT6 TOMCAT7 +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 OPTIONS_SINGLE_DB= MYSQL PGSQL OPTIONS_DEFAULT= TOMCAT6 PGSQL @@ -95,15 +89,6 @@ PLIST_SUB+= JDBC=${JDBC} MASTER_SITES+= http://jdbc.postgresql.org/download/:source2 .endif -.if ${PORT_OPTIONS:MTOMCAT5} -APPHOME?= ${LOCALBASE}/tomcat5.5 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 -RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 -APPTYPE= tomcat5 -PLIST_SUB+= APP_VERSION="tomcat5.5" -JDBCLOC= common/lib -.endif - .if ${PORT_OPTIONS:MTOMCAT6} APPHOME?= ${LOCALBASE}/apache-tomcat-6.0 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 @@ -164,12 +149,6 @@ post-patch: .endfor @${REINPLACE_CMD} -e 's|--DROP|-- DROP|' ${SQLSRC}/mysql/quartz.ddl -.if ${PORT_OPTIONS:MXLS} - @${ECHO} "Applying alternative patches for Xls." - @cd ${PATCH_WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/alt-patch-jasperserver__common__shared-config__applicationContext.xml - @cd ${PATCH_WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties -.endif - post-patch-script: @${ECHO_MSG} -n ">> Removing unneeded patched files..." @${FIND} ${WRKDIR} -type f \( -name '*.orig' \) -delete @@ -243,6 +222,7 @@ do-install: ${INSTALL_DATA} ${DISTDIR}/${JDBC} ${APPHOME}/${JDBCLOC} @${RM} ${APPHOME}/${JDBCLOC}/postgresql-9.0-801.jdbc4.jar .else + @${RM} ${APPHOME}/${JDBCLOC}/mysql-connector-java-5.1.17-bin.jar ${LN} -s ${JAVAJARDIR}/mysql-connector-java.jar ${APPHOME}/${JDBCLOC} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212061820.qB6IKiDe008032>