View | Details | Raw Unified | Return to bug 43565
Collapse All | Expand All

(-)Makefile (-1 / +14 lines)
Lines 50-55 Link Here
50
JAR_FILE=	bin/bootstrap.jar
50
JAR_FILE=	bin/bootstrap.jar
51
WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
51
WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
52
52
53
CONF_EXT= pkg-dist
54
53
.include <bsd.port.pre.mk>
55
.include <bsd.port.pre.mk>
54
56
55
pre-patch:
57
pre-patch:
Lines 114-121 Link Here
114
	@${ECHO_CMD} " [ DONE ]"
116
	@${ECHO_CMD} " [ DONE ]"
115
117
116
	@${ECHO_CMD} -n ">> Copying files to destination directory..."
118
	@${ECHO_CMD} -n ">> Copying files to destination directory..."
119
	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
120
	# Do _not_ overwrite local config files.  That is just evil.
121
	@(cd ${WRKSRC};${FIND} conf -type f) \
122
		| while read a; do \
123
			mv ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
124
			if [ ! -e "${APP_HOME}/$$a" ]; then \
125
				echo "    Installing local configuration file: ${APP_HOME}/$$a"; \
126
				cp ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
127
			else \
128
				echo "    Preserving local configuration file: ${APP_HOME}/$$a"; \
129
			fi; \
130
		done
117
	@${CP} -R ${WRKSRC}/* ${APP_HOME}
131
	@${CP} -R ${WRKSRC}/* ${APP_HOME}
118
	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
119
	@${ECHO_CMD} " [ DONE ]"
132
	@${ECHO_CMD} " [ DONE ]"
120
133
121
	@${ECHO_CMD} -n ">> Compiling and installing control program..."
134
	@${ECHO_CMD} -n ">> Compiling and installing control program..."
(-)pkg-plist (-6 / +6 lines)
Lines 1413-1424 Link Here
1413
%%T%%/server/lib/tomcat-jk2.jar
1413
%%T%%/server/lib/tomcat-jk2.jar
1414
%%T%%/server/lib/jakarta-regexp-1.2.jar
1414
%%T%%/server/lib/jakarta-regexp-1.2.jar
1415
%%T%%/server/lib/mx4j-jmx.jar
1415
%%T%%/server/lib/mx4j-jmx.jar
1416
%%T%%/conf/web.xml
1416
%%T%%/conf/web.xml.pkg-dist
1417
%%T%%/conf/jk2.properties
1417
%%T%%/conf/jk2.properties.pkg-dist
1418
%%T%%/conf/server.xml
1418
%%T%%/conf/server.xml.pkg-dist
1419
%%T%%/conf/catalina.policy
1419
%%T%%/conf/catalina.policy.pkg-dist
1420
%%T%%/conf/tomcat-users.xml
1420
%%T%%/conf/tomcat-users.xml.pkg-dist
1421
%%T%%/conf/server-noexamples.xml.config
1421
%%T%%/conf/server-noexamples.xml.config.pkg-dist
1422
%%T%%/bin/bootstrap.jar
1422
%%T%%/bin/bootstrap.jar
1423
%%T%%/bin/tool-wrapper.sh
1423
%%T%%/bin/tool-wrapper.sh
1424
%%T%%/bin/catalina.sh
1424
%%T%%/bin/catalina.sh

Return to bug 43565