From owner-svn-ports-all@FreeBSD.ORG Tue Nov 20 19:07:56 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A7314D23; Tue, 20 Nov 2012 19:07:56 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 73A6D8FC12; Tue, 20 Nov 2012 19:07:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAKJ7uO2078063; Tue, 20 Nov 2012 19:07:56 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAKJ7ulW078062; Tue, 20 Nov 2012 19:07:56 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201211201907.qAKJ7ulW078062@svn.freebsd.org> From: Jason Helfman Date: Tue, 20 Nov 2012 19:07:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307596 - head/www/axis2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2012 19:07:56 -0000 Author: jgh Date: Tue Nov 20 19:07:56 2012 New Revision: 307596 URL: http://svnweb.freebsd.org/changeset/ports/307596 Log: - drop tomcat55 as an option, and pass maintainership to submitter - drop hard-coded install in favor of ${INSTALL} PR: 173035 Submitted by: nemysis@gmx.ch Feature safe: yes Modified: head/www/axis2/Makefile Modified: head/www/axis2/Makefile ============================================================================== --- head/www/axis2/Makefile Tue Nov 20 19:06:23 2012 (r307595) +++ head/www/axis2/Makefile Tue Nov 20 19:07:56 2012 (r307596) @@ -8,7 +8,7 @@ MASTER_SITES= APACHE MASTER_SITE_SUBDIR= axis/${PORTNAME}/java/core/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@gmx.ch COMMENT= Provides a Web Services,SOAP and WSDL engine from Apache LICENSE= AL2 @@ -18,17 +18,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERS NO_BUILD= yes OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT5 TOMCAT6 TOMCAT7 +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 OPTIONS_DEFAULT= TOMCAT6 .include -.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 -.endif - .if ${PORT_OPTIONS:MTOMCAT6} APPHOME= ${LOCALBASE}/apache-tomcat-6.0 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 @@ -57,7 +51,7 @@ do-install: ( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/axis2-web && cd ${WRKSRC}/webapp/axis2-web && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/axis2-web ) ( cd ${WRKSRC}/repository && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF ) @${CHOWN} ${SHAREGRP}:${SHAREOWN} ${APPHOME}/webapps/${PORTNAME} - @install -d -g ${SHAREGRP} -o ${SHAREOWN} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf + @${INSTALL} -d -g ${SHAREGRP} -o ${SHAREOWN} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf @(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \ | while read a; do \ ${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \