aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2019-08-12 05:23:59 +0800
committerrene <rene@FreeBSD.org>2019-08-12 05:23:59 +0800
commitb16d3e66c203905f84d21dace0f8955bf97cf125 (patch)
tree497cae60ccf0cbb8c0d810c1fa9f8ea383bc6524
parent4e6c673f06aa3486b91df4c7762acc93b025ced7 (diff)
downloadfreebsd-ports-gnome-b16d3e66c203905f84d21dace0f8955bf97cf125.tar.gz
freebsd-ports-gnome-b16d3e66c203905f84d21dace0f8955bf97cf125.tar.zst
freebsd-ports-gnome-b16d3e66c203905f84d21dace0f8955bf97cf125.zip
graphics/barbecue: remove support for EOL tomcat6, bump PORTREVISION
-rw-r--r--graphics/barbecue/Makefile15
1 files changed, 2 insertions, 13 deletions
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index 7c5d6b864378..173452bb5f40 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -3,6 +3,7 @@
PORTNAME= barbecue
DISTVERSION= 1.5-beta1
+PORTREVISION= 1
CATEGORIES= graphics print java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
DIST_SUBDIR= java
@@ -29,25 +30,13 @@ PORTEXAMPLES= *
PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
-OPTIONS_SINGLE= AS
-OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7
-OPTIONS_DEFAULT= TOMCAT6
-
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MTOMCAT6}
-TOMCATVER= apache-tomcat-6.0
-BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6
-RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6
-.endif
-
-.if ${PORT_OPTIONS:MTOMCAT7}
TOMCATVER= apache-tomcat-7.0
BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7
RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7
-.endif
post-extract:
${MV} ${WRKSRC}/${JARFILES} ${WRKSRC}/${JARFILES:S|-${DISTVERSION}||}
@@ -58,7 +47,7 @@ do-install:
${INSTALL_DATA} ${JARFILES:S|-${DISTVERSION}||:S|^|${WRKSRC}/|} \
${STAGEDIR}${JAVAJARDIR}
-.if ${PORT_OPTIONS:MTOMCAT6} || ${PORT_OPTIONS:MTOMCAT7}
+.if ${PORT_OPTIONS:MTOMCAT7}
${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${STAGEDIR}${WEBAPPDIR}/${PORTNAME}
@(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . \
${STAGEDIR}${WEBAPPDIR}/${PORTNAME})