Date: Wed, 24 Oct 2012 22:20:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/173016: [PATCH] www/jetspeed: Tomcat 6.0, OptionsNG, take maintainership Message-ID: <201210242220.q9OMK1vm075794@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/173016; it has been noted by GNATS. From: nemysis <nemysis@gmx.ch> To: bug-followup@FreeBSD.org, jgh@FreeBSD.org Cc: Subject: Re: ports/173016: [PATCH] www/jetspeed: Tomcat 6.0, OptionsNG, take maintainership Date: Thu, 25 Oct 2012 00:12:09 +0200 --MP_/M0KKqVbLNKujolx0gqke9uB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Added support for Tomcat6 and Tomcat7 removed pkg-plist --MP_/M0KKqVbLNKujolx0gqke9uB Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=jetspeed.diff ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/www/jetspeed/Makefile ./Makefile --- /usr/ports/www/jetspeed/Makefile 2011-08-22 10:05:12.000000000 +0200 +++ ./Makefile 2012-10-25 00:11:04.000000000 +0200 @@ -7,34 +7,64 @@ PORTNAME= jetspeed PORTVERSION= 1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www java -MASTER_SITES= http://www.apache.org/dist/portals/jetspeed-1/ -#MASTER_SITE_SUBDIR=jetspeed/binaries +MASTER_SITES= APACHE/portals/jetspeed-1/ DISTNAME= ${PORTNAME}-${PORTVERSION}-war +DIST_SUBDIR= java -MAINTAINER= ports@FreeBSD.org -COMMENT= Jetspeed is an Open Source Portal, written in Java and XML +MAINTAINER= nemysis@gmx.ch +COMMENT= Open Source Portal, written in Java and XML -RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant \ - ${JAKARTA_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +LICENSE= AL2 + +RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant WRKSRC= ${WRKDIR}/${DISTNAME:C/-war//} +DATADIR= ${WEBAPPDIR}/${PORTNAME} + USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.5+ - NO_BUILD= yes -JAKARTA_HOME= ${LOCALBASE}/tomcat5.5 +PORTDATA= * +PORTDOCS= Activation-License.txt FIXES.html INSTALL NOTES README WARNING project.xml + +OPTIONS_SINGLE= AS +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 +OPTIONS_DEFAULT= TOMCAT6 + +.include <bsd.port.options.mk> + +.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 +.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 + +post-extract: + ${MKDIR} ${WRKDIR}/${PORTNAME} + ${TAR} xf ${WRKSRC}/${PORTNAME}.war -C ${WRKDIR}/${PORTNAME} do-install: - @${INSTALL_DATA} ${WRKSRC}/jetspeed.war ${JAKARTA_HOME}/webapps -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/* ${DOCSDIR} + ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${WEBAPPDIR}/${PORTNAME} + @(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTNAME}) + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif + post-install: + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/www/jetspeed/distinfo ./distinfo --- /usr/ports/www/jetspeed/distinfo 2011-03-19 13:34:23.000000000 +0100 +++ ./distinfo 2012-10-23 21:24:58.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (jetspeed-1.6-war.zip) = 1875bfdadf3f09820dbcf516de72d81c4121fe10fc653fb26989b15fbbb9ef05 -SIZE (jetspeed-1.6-war.zip) = 13191543 +SHA256 (java/jetspeed-1.6-war.zip) = 1875bfdadf3f09820dbcf516de72d81c4121fe10fc653fb26989b15fbbb9ef05 +SIZE (java/jetspeed-1.6-war.zip) = 13191543 diff -ruN --exclude=CVS /usr/ports/www/jetspeed/pkg-message ./pkg-message --- /usr/ports/www/jetspeed/pkg-message 2008-03-11 11:54:30.000000000 +0100 +++ ./pkg-message 2012-10-23 21:16:22.000000000 +0200 @@ -1,6 +1,5 @@ -Once everything is finally installed set the JAVA_HOME -variable to ${LOCALBASE}/jdk and run the Tomcat -server. The JetSpeed portal war file is copied to -${LOCALBASE}/apache-tomcat4.1/webapps, where tomcat resides. +Once everything is finally installed set the JAVA_HOME variable to +${LOCALBASE}/jdk and run the Tomcat server. The JetSpeed portal files +are copied to ${PREFIX}apache-tomcat-6.0/webapps, where Tomcat resides. For more information on how it works look at JetSpeed homepage. diff -ruN --exclude=CVS /usr/ports/www/jetspeed/pkg-plist ./pkg-plist --- /usr/ports/www/jetspeed/pkg-plist 2011-08-22 10:05:12.000000000 +0200 +++ ./pkg-plist 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -tomcat5.5/webapps/jetspeed.war -%%PORTDOCS%%%%DOCSDIR%%/Activation-License.txt -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/NOTES -%%PORTDOCS%%%%DOCSDIR%%/project.xml -%%PORTDOCS%%%%DOCSDIR%%/FIXES.html -%%PORTDOCS%%%%DOCSDIR%%/jetspeed.war -%%PORTDOCS%%%%DOCSDIR%%/WARNING -%%PORTDOCS%%@dirrm %%DOCSDIR%% ===> Done --MP_/M0KKqVbLNKujolx0gqke9uB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210242220.q9OMK1vm075794>