ports/174529: devel/opengrok: drop tomcat55 support (end-of-life very soon), fix plist
Jason Helfman
jgh at FreeBSD.org
Mon Dec 17 23:30:00 UTC 2012
>Number: 174529
>Category: ports
>Synopsis: devel/opengrok: drop tomcat55 support (end-of-life very soon), fix plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 17 23:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r243869M: Tue Dec 4 21:58:48 UTC 2012 root at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
- update historical header
- drop tomcat55 support, as it is end-of-life at end-of-year (non-default)
- fix plist, and bump portrevision
>How-To-Repeat:
>Fix:
Index: pkg-plist
===================================================================
--- pkg-plist (revision 305516)
+++ pkg-plist (working copy)
@@ -1,4 +1,4 @@
- at unexec if cmp -s %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%; then rm -f %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
+ at unexec if cmp -s %D/%%T%%/webapps/opengrok/WEB-INF/web.xml %D/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
bin/opengrok
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE.txt
@@ -19,7 +19,7 @@
%%T%%/webapps/opengrok/WEB-INF/lib/opengrok.jar
%%T%%/webapps/opengrok/WEB-INF/lib/swing-layout-0.9.jar
%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%
- at exec if [ ! -f %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml ]; then cp %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%% %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
+ at exec if [ ! -f %D/%%T%%/webapps/opengrok/WEB-INF/web.xml ]; then cp %D/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%% %D/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
%%T%%/webapps/opengrok/default/img/Logo.png
%%T%%/webapps/opengrok/default/img/bg.png
%%T%%/webapps/opengrok/default/img/button1.png
Index: Makefile
===================================================================
--- Makefile (revision 305516)
+++ Makefile (working copy)
@@ -1,12 +1,9 @@
-# New ports collection makefile for: opengrok
-# Date created: 10/13/2009
-# Whom: stas
-#
+# Created by: stas
# $FreeBSD$
-#
PORTNAME= opengrok
PORTVERSION= 0.11.1
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= http://hub.opensolaris.org/bin/download/Project+opengrok/files/
@@ -31,7 +28,7 @@
CONF_EXT= sample
OPTIONS_SINGLE= AS
-OPTIONS_SINGLE_AS= TOMCAT5 TOMCAT6 RESIN3
+OPTIONS_SINGLE_AS= TOMCAT6 RESIN3
OPTIONS_DEFAULT= TOMCAT6
.include <bsd.port.pre.mk>
@@ -51,12 +48,6 @@
RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
.endif
-.if ${PORT_OPTIONS:MTOMCAT5}
-WEBAPP_DIRS= tomcat5.5
-BUILD_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
-RUN_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
-.endif
-
.if ${PORT_OPTIONS:MRESIN3}
WEBAPP_DIRS= resin3
BUILD_DEPENDS+= ${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list