- 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

3 files changed, 3 insertions, 69 deletions

diff --git a/databases/jasperserver/Makefile b/databases/jasperserver/Makefile
index 2a504e553b1e..c434de375d2a 100644
--- a/databases/jasperserver/Makefile
+++ b/databases/jasperserver/Makefile
@@ -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
 
diff --git a/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml b/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml
deleted file mode 100644
index 12438e9ec3b9..000000000000
--- a/databases/jasperserver/files/alt-patch-jasperserver__common__shared-config__applicationContext.xml
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./jasperserver/common/shared-config/applicationContext.xml.orig	2012-03-22 12:35:55.000000000 -0700
-+++ ./jasperserver/common/shared-config/applicationContext.xml	2012-03-22 12:36:00.000000000 -0700
-@@ -1092,14 +1092,14 @@
-     
-     <bean id="xlsExportParameters" class="com.jaspersoft.jasperserver.api.engine.jasperreports.common.XlsExportParametersBean">
-         <property name="detectCellType" value="true"/>
--        <property name="onePagePerSheet" value="false"/>
--        <property name="removeEmptySpaceBetweenRows" value="true"/>
-+        <property name="onePagePerSheet" value="true"/>
-+        <property name="removeEmptySpaceBetweenRows" value="false"/>
-         <property name="removeEmptySpaceBetweenColumns" value="true"/>
-         <property name="whitePageBackground" value="false"/>
-         <property name="ignoreGraphics" value="true"/>
-         <property name="collapseRowSpan" value="true"/>
-         <property name="ignoreCellBorder" value="true"/>
--        <property name="fontSizeFixEnabled" value="true"/>
-+        <property name="fontSizeFixEnabled" value="false"/>
-         <property name="maximumRowsPerSheet" value="0"/>
-         <property name="xlsFormatPatternsMap" ref="formatPatternsMap"/>
-     </bean>
-@@ -1124,6 +1124,8 @@
-     
-     <util:map id="formatPatternsMap">
-         <!-- entry key="¤ #,##0.00" value="$ #,##0.00"/-->
-+	<entry key="" value="0"/>
-+	<entry key="M/d/yyyy h:mm aa" value="m/d/yyyy h:mm"/>
-     </util:map> 
- 
-     <!-- end export parameters -->
diff --git a/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties b/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties
deleted file mode 100644
index 479fd409c8cf..000000000000
--- a/databases/jasperserver/files/alt-patch-jasperserver__jasperserver-war__src__main__webappAdditions__WEB-INF__classes__jasperreports.properties
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./jasperserver/jasperserver-war/src/main/webappAdditions/WEB-INF/classes/jasperreports.properties.orig	2012-03-22 12:38:28.000000000 -0700
-+++ ./jasperserver/jasperserver-war/src/main/webappAdditions/WEB-INF/classes/jasperreports.properties	2012-03-22 12:39:04.000000000 -0700
-@@ -5,10 +5,10 @@
- net.sf.jasperreports.crosstab.bucket.measure.limit=100000

- 

- #suppress page and column footers and all but the first page and column headers when exporting to XLS

--net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1=pageHeader

--net.sf.jasperreports.export.xls.exclude.origin.band.2=pageFooter

--net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.3=columnHeader

--net.sf.jasperreports.export.xls.exclude.origin.band.4=columnFooter

-+#net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1=pageHeader

-+#net.sf.jasperreports.export.xls.exclude.origin.band.2=pageFooter

-+#net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.3=columnHeader

-+#net.sf.jasperreports.export.xls.exclude.origin.band.4=columnFooter

- 

- # report exporter hints override export parameters

- net.sf.jasperreports.export.parameters.override.report.hints=false