aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaichi GOTO <daichi@FreeBSD.org>2003-09-26 05:54:44 +0000
committerDaichi GOTO <daichi@FreeBSD.org>2003-09-26 05:54:44 +0000
commit60b86a2bc2f996aaa80f85a7685886799380d06c (patch)
treea762af919e39b594841fdfd0a05d12b86ee8e955
parent61a8c5e45408479370dd4f984eaec1eec46ba3c7 (diff)
downloadports-60b86a2bc2f996aaa80f85a7685886799380d06c.tar.gz
ports-60b86a2bc2f996aaa80f85a7685886799380d06c.zip
fix: www/jakarta-tomcat5
- fix pkg permission and master_sites problem PR: 57234 Submitted by: Kang Liu <liukang@bjpu.edu.cn> (maintainer) Pointed out by: Angelo Turetta
Notes
Notes: svn path=/head/; revision=89411
-rw-r--r--www/jakarta-tomcat5/Makefile6
-rw-r--r--www/jakarta-tomcat5/pkg-plist2
-rw-r--r--www/jakarta-tomcat55/Makefile6
-rw-r--r--www/jakarta-tomcat55/pkg-plist2
-rw-r--r--www/tomcat55/Makefile6
-rw-r--r--www/tomcat55/pkg-plist2
-rw-r--r--www/tomcat6/Makefile6
-rw-r--r--www/tomcat6/pkg-plist2
-rw-r--r--www/tomcat7/Makefile6
-rw-r--r--www/tomcat7/pkg-plist2
10 files changed, 25 insertions, 15 deletions
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 629e8662c3ab..2202a0a1846a 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -7,9 +7,10 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 5.0.12
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
- http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin \
+ http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
http://distfiles.coredump.cn/
MAINTAINER= liukang@bjpu.edu.cn
@@ -22,7 +23,6 @@ MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER:S/.//}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -49,7 +49,7 @@ REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
${WRKSRC}/conf/server.xml
JAR_FILE= bin/bootstrap.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
-
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
.include <bsd.port.pre.mk>
pre-patch:
diff --git a/www/jakarta-tomcat5/pkg-plist b/www/jakarta-tomcat5/pkg-plist
index 374608fa9a55..d2577b401c4c 100644
--- a/www/jakarta-tomcat5/pkg-plist
+++ b/www/jakarta-tomcat5/pkg-plist
@@ -1684,6 +1684,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
%%T%%/webapps/tomcat-docs/ssl-howto.html
%%T%%/webapps/tomcat-docs/status.html
@exec mkdir %D/%%T%%/work || true
+@exec mkdir %D/%%T%%/common/classes ||true
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
@dirrm %%T%%/work
@dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 629e8662c3ab..2202a0a1846a 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -7,9 +7,10 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 5.0.12
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
- http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin \
+ http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
http://distfiles.coredump.cn/
MAINTAINER= liukang@bjpu.edu.cn
@@ -22,7 +23,6 @@ MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER:S/.//}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -49,7 +49,7 @@ REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
${WRKSRC}/conf/server.xml
JAR_FILE= bin/bootstrap.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
-
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
.include <bsd.port.pre.mk>
pre-patch:
diff --git a/www/jakarta-tomcat55/pkg-plist b/www/jakarta-tomcat55/pkg-plist
index 374608fa9a55..d2577b401c4c 100644
--- a/www/jakarta-tomcat55/pkg-plist
+++ b/www/jakarta-tomcat55/pkg-plist
@@ -1684,6 +1684,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
%%T%%/webapps/tomcat-docs/ssl-howto.html
%%T%%/webapps/tomcat-docs/status.html
@exec mkdir %D/%%T%%/work || true
+@exec mkdir %D/%%T%%/common/classes ||true
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
@dirrm %%T%%/work
@dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 629e8662c3ab..2202a0a1846a 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -7,9 +7,10 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 5.0.12
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
- http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin \
+ http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
http://distfiles.coredump.cn/
MAINTAINER= liukang@bjpu.edu.cn
@@ -22,7 +23,6 @@ MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER:S/.//}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -49,7 +49,7 @@ REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
${WRKSRC}/conf/server.xml
JAR_FILE= bin/bootstrap.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
-
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
.include <bsd.port.pre.mk>
pre-patch:
diff --git a/www/tomcat55/pkg-plist b/www/tomcat55/pkg-plist
index 374608fa9a55..d2577b401c4c 100644
--- a/www/tomcat55/pkg-plist
+++ b/www/tomcat55/pkg-plist
@@ -1684,6 +1684,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
%%T%%/webapps/tomcat-docs/ssl-howto.html
%%T%%/webapps/tomcat-docs/status.html
@exec mkdir %D/%%T%%/work || true
+@exec mkdir %D/%%T%%/common/classes ||true
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
@dirrm %%T%%/work
@dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 629e8662c3ab..2202a0a1846a 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -7,9 +7,10 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 5.0.12
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
- http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin \
+ http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
http://distfiles.coredump.cn/
MAINTAINER= liukang@bjpu.edu.cn
@@ -22,7 +23,6 @@ MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER:S/.//}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -49,7 +49,7 @@ REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
${WRKSRC}/conf/server.xml
JAR_FILE= bin/bootstrap.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
-
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
.include <bsd.port.pre.mk>
pre-patch:
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 374608fa9a55..d2577b401c4c 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -1684,6 +1684,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
%%T%%/webapps/tomcat-docs/ssl-howto.html
%%T%%/webapps/tomcat-docs/status.html
@exec mkdir %D/%%T%%/work || true
+@exec mkdir %D/%%T%%/common/classes ||true
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
@dirrm %%T%%/work
@dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 629e8662c3ab..2202a0a1846a 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -7,9 +7,10 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 5.0.12
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
- http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin \
+ http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
http://distfiles.coredump.cn/
MAINTAINER= liukang@bjpu.edu.cn
@@ -22,7 +23,6 @@ MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER:S/.//}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -49,7 +49,7 @@ REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
${WRKSRC}/conf/server.xml
JAR_FILE= bin/bootstrap.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
-
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
.include <bsd.port.pre.mk>
pre-patch:
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 374608fa9a55..d2577b401c4c 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -1684,6 +1684,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
%%T%%/webapps/tomcat-docs/ssl-howto.html
%%T%%/webapps/tomcat-docs/status.html
@exec mkdir %D/%%T%%/work || true
+@exec mkdir %D/%%T%%/common/classes ||true
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
@dirrm %%T%%/work
@dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use