Attachment 25484 Details for Bug 43565 – www_jakarta-tomcat41_Makefile.diff

[patch] www_jakarta-tomcat41_Makefile.diff

www_jakarta-tomcat41_Makefile.diff (text/plain; charset=us-ascii), 2.04 KB, created by Brent Verner on 2003-04-05 20:16:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Verner

Created: 2003-04-05 20:16:06 UTC

Size: 2.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/jakarta-tomcat41/Makefile,v
>retrieving revision 1.47
>diff -u -r1.47 Makefile
>--- Makefile	27 Mar 2003 07:35:34 -0000	1.47
>+++ Makefile	5 Apr 2003 19:02:58 -0000
>@@ -50,6 +50,8 @@
> JAR_FILE=	bin/bootstrap.jar
> WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
> 
>+CONF_EXT= pkg-dist
>+
> .include <bsd.port.pre.mk>
> 
> pre-patch:
>@@ -114,8 +116,19 @@
> 	@${ECHO_CMD} " [ DONE ]"
> 
> 	@${ECHO_CMD} -n ">> Copying files to destination directory..."
>+	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
>+	# Do _not_ overwrite local config files.  That is just evil.
>+	@(cd ${WRKSRC};${FIND} conf -type f) \
>+		| while read a; do \
>+			mv ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
>+			if [ ! -e "${APP_HOME}/$$a" ]; then \
>+				echo "    Installing local configuration file: ${APP_HOME}/$$a"; \
>+				cp ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
>+			else \
>+				echo "    Preserving local configuration file: ${APP_HOME}/$$a"; \
>+			fi; \
>+		done
> 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
>-	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
> 	@${ECHO_CMD} " [ DONE ]"
> 
> 	@${ECHO_CMD} -n ">> Compiling and installing control program..."
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/www/jakarta-tomcat41/pkg-plist,v
>retrieving revision 1.20
>diff -u -r1.20 pkg-plist
>--- pkg-plist	27 Mar 2003 07:35:34 -0000	1.20
>+++ pkg-plist	5 Apr 2003 18:51:40 -0000
>@@ -1413,12 +1413,12 @@
> %%T%%/server/lib/tomcat-jk2.jar
> %%T%%/server/lib/jakarta-regexp-1.2.jar
> %%T%%/server/lib/mx4j-jmx.jar
>-%%T%%/conf/web.xml
>-%%T%%/conf/jk2.properties
>-%%T%%/conf/server.xml
>-%%T%%/conf/catalina.policy
>-%%T%%/conf/tomcat-users.xml
>-%%T%%/conf/server-noexamples.xml.config
>+%%T%%/conf/web.xml.pkg-dist
>+%%T%%/conf/jk2.properties.pkg-dist
>+%%T%%/conf/server.xml.pkg-dist
>+%%T%%/conf/catalina.policy.pkg-dist
>+%%T%%/conf/tomcat-users.xml.pkg-dist
>+%%T%%/conf/server-noexamples.xml.config.pkg-dist
> %%T%%/bin/bootstrap.jar
> %%T%%/bin/tool-wrapper.sh
> %%T%%/bin/catalina.sh

Actions: View | Diff

Attachments on bug 43565: 25484