From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 24 05:30:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A3E51F9 for ; Wed, 24 Oct 2012 05:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 3FBB98FC0A for ; Wed, 24 Oct 2012 05:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9O5U1lN073396 for ; Wed, 24 Oct 2012 05:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9O5U12t073393; Wed, 24 Oct 2012 05:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 24 Oct 2012 05:30:01 GMT Resent-Message-Id: <201210240530.q9O5U12t073393@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Helfman Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9865F91 for ; Wed, 24 Oct 2012 05:21:05 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 8530B8FC0C for ; Wed, 24 Oct 2012 05:21:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9O5L5SZ073254 for ; Wed, 24 Oct 2012 05:21:05 GMT (envelope-from jgh@freefall.freebsd.org) Received: (from jgh@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9O5L58S073253; Wed, 24 Oct 2012 05:21:05 GMT (envelope-from jgh) Message-Id: <201210240521.q9O5L58S073253@freefall.freebsd.org> Date: Wed, 24 Oct 2012 05:21:05 GMT From: Jason Helfman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173011: [patch] www/axis: drop tomcat55, in favor of tomcat6/7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Jason Helfman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2012 05:30:01 -0000 >Number: 173011 >Category: ports >Synopsis: [patch] www/axis: drop tomcat55, in favor of tomcat6/7 >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: Wed Oct 24 05:30:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jason Helfman >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r241358: Mon Oct 8 23:17:12 UTC 2012 peter@freefall.freebsd.org:/usr/src/sys/amd64/compile/FREEFALL amd64 >Description: www/tomcat55 is approaching eol. both applications tested and worked with axis - offer tomcat6/7 to our users to serve axis. - Move docs and examples to optionsNG and define portdocs and portexamples explictly >How-To-Repeat: >Fix: Index: axis/Makefile =================================================================== --- axis/Makefile (revision 306334) +++ axis/Makefile (working copy) @@ -1,12 +1,10 @@ -# New ports collection makefile for: AXIS -# Date created: 6 JUNE 2003 -# Whom: Kensaku MASUDA +# Created by: Kensaku MASUDA # # $FreeBSD$ PORTNAME= axis PORTVERSION= 1.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= ws/axis/${PORTVERSION:S,.,_,g} @@ -15,25 +13,24 @@ MAINTAINER= hq@FreeBSD.org COMMENT= Java SOAP implementation by Apache +OPTIONS_SINGLE= AS +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 +OPTIONS_DEFAULT= TOMCAT6 + .include -# -# Change webapp directory by TOMCAT version -# -.if exists(${LOCALBASE}/tomcat5.5/webapps) -WEBAPPDIR= ${PREFIX}/tomcat5.5/webapps -BUILD_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 -RUN_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 -.elif exists(${LOCALBASE}/apache-tomcat-6.0/webapps) +.if ${PORT_OPTIONS:MTOMCAT6} WEBAPPDIR= ${PREFIX}/apache-tomcat-6.0/webapps BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 -.else -WEBAPPDIR= ${PREFIX}/tomcat5.5/webapps -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:MTOMCAT7} +WEBAPPDIR= ${PREFIX}/apache-tomcat-7.0/webapps +BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +.endif + NO_BUILD= YES USE_JAVA= yes JAVA_VERSION= 1.5+ @@ -47,12 +44,9 @@ # SYSTEM_JARS= axis.jar jaxrpc.jar saaj.jar PLIST_SUB+= WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||} USER=${USER} GROUP=${GROUP} -.if !defined(NOPORTDOCS) + PORTDOCS= * -.endif -.if !defined(NOPORTEXAMPLES) PORTEXAMPLES= * -.endif do-install: .for i in ${SYSTEM_JARS} @@ -60,11 +54,11 @@ .endfor cd ${WRKSRC}/webapps && ${FIND} axis -type d -exec ${INSTALL} -d -g ${GROUP} -o ${USER} -m 755 ${WEBAPPDIR}/{} \; cd ${WRKSRC}/webapps && ${FIND} axis -type f -exec ${INSTALL} -g ${GROUP} -o ${USER} -m 444 {} ${WEBAPPDIR}/{} \; -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; cd ${WRKSRC}/docs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; .endif >Release-Note: >Audit-Trail: >Unformatted: