2 files changed, 27 insertions, 41 deletions

diff --git a/www/helma/Makefile b/www/helma/Makefile
index 7097224341b7..da18c5a05ad0 100644
--- a/www/helma/Makefile
+++ b/www/helma/Makefile
@@ -33,17 +33,13 @@ PLIST_SUB=	DBDIR="${DBDIR}" \
 		HELMA_GROUP="${HELMA_GROUP}"
 
 OPTIONS_DEFINE=	MYSQL
+OPTIONS_SUB=	yes
 OPTIONS_DESC=	"Install MySQL Connector for Java"
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
+MYSQL_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
+
+.include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|JAVA_HOME=/usr/lib/j2sdk1.5-sun|JAVA_HOME=${JAVA_HOME}|' \
@@ -77,41 +73,38 @@ post-patch:
 		${WRKBASE}/server.properties
 
 do-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/helma.sh.in ${PREFIX}/bin/helma
+	${INSTALL_SCRIPT} ${FILESDIR}/helma.sh.in ${STAGEDIR}${PREFIX}/bin/helma
 
-	${MKDIR} ${WWWDIR} && \
-	(cd ${WRKBASE} && ${COPYTREE_SHARE} "apps modules" ${WWWDIR} \
+	${MKDIR} ${STAGEDIR}${WWWDIR} && \
+	(cd ${WRKBASE} && ${COPYTREE_SHARE} "apps modules" ${STAGEDIR}${WWWDIR} \
 		"! -name *.html ! -name helma-*.jar ! -name .jsdoc") && \
-	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${WWWDIR}
+	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${WWWDIR}
 
-	${MKDIR} ${DATADIR} && \
-	(cd ${WRKBASE} && ${COPYTREE_SHARE} "lib launcher.jar" ${DATADIR} \
+	${MKDIR} ${STAGEDIR}${DATADIR} && \
+	(cd ${WRKBASE} && ${COPYTREE_SHARE} "lib launcher.jar" ${STAGEDIR}${DATADIR} \
 		"! -name *.html ! -name helma-*.jar ! -name .jsdoc")
 
-	${MKDIR} ${LOGDIR} && \
-	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${LOGDIR}
+	${MKDIR} ${STAGEDIR}${LOGDIR} && \
+	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${LOGDIR}
 
-	${MKDIR} ${DBDIR} && \
-	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${DBDIR}
+	${MKDIR} ${STAGEDIR}${DBDIR} && \
+	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${DBDIR}
 
-	${MKDIR} ${ETCDIR}; \
+	${MKDIR} ${STAGEDIR}${ETCDIR}; \
 	for f in apps.properties db.properties server.properties scripts/helma.conf; do \
-		${INSTALL_DATA} ${WRKBASE}/$$f ${ETCDIR}/$${f##*/}.sample; \
-		if [ ! -f ${ETCDIR}/$${f##*/} ]; then \
-		${CP} -p ${ETCDIR}/$${f##*/}.sample ${ETCDIR}/$${f##*/}; \
-		fi; \
+		${INSTALL_DATA} ${WRKBASE}/$$f ${STAGEDIR}${ETCDIR}/$${f##*/}.sample; \
 	done
 
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} && \
-	(cd ${WRKBASE} && ${COPYTREE_SHARE} "licenses license.txt README.txt" ${DOCSDIR})
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+	(cd ${WRKBASE} && ${COPYTREE_SHARE} "licenses license.txt README.txt" ${STAGEDIR}${DOCSDIR})
 
-	${MKDIR} ${DOCSDIR}/docs/api/jala && \
-	(cd ${WRKBASE}/modules/jala/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/docs/api/jala)
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/api/jala && \
+	(cd ${WRKBASE}/modules/jala/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/docs/api/jala)
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-	${LN} -sf ${JAVALIBDIR}/mysql-connector-java.jar ${DATADIR}/lib/ext/mysql-connector-java.jar
+	${LN} -sf ${JAVALIBDIR}/mysql-connector-java.jar ${STAGEDIR}${DATADIR}/lib/ext/mysql-connector-java.jar
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/helma/pkg-plist b/www/helma/pkg-plist
index a2e9f55c2b51..11608f976098 100644
--- a/www/helma/pkg-plist
+++ b/www/helma/pkg-plist
@@ -1,15 +1,8 @@
-@unexec if cmp -s %D/%%ETCDIR%%/apps.properties.sample %D/%%ETCDIR%%/apps.properties; then rm -f %D/%%ETCDIR%%/apps.properties; fi
-%%ETCDIR%%/apps.properties.sample
-@exec if [ ! -f %D/%%ETCDIR%%/apps.properties ] ; then cp -p %D/%%ETCDIR%%/apps.properties.sample %D/%%ETCDIR%%/apps.properties; fi
-@unexec if cmp -s %D/%%ETCDIR%%/db.properties.sample %D/%%ETCDIR%%/db.properties; then rm -f %D/%%ETCDIR%%/db.properties; fi
-%%ETCDIR%%/db.properties.sample
-@exec if [ ! -f %D/%%ETCDIR%%/db.properties ] ; then cp -p %D/%%ETCDIR%%/db.properties.sample %D/%%ETCDIR%%/db.properties; fi
-@unexec if cmp -s %D/%%ETCDIR%%/helma.conf.sample %D/%%ETCDIR%%/helma.conf; then rm -f %D/%%ETCDIR%%/helma.conf; fi
-%%ETCDIR%%/helma.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/helma.conf ] ; then cp -p %D/%%ETCDIR%%/helma.conf.sample %D/%%ETCDIR%%/helma.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/server.properties.sample %D/%%ETCDIR%%/server.properties; then rm -f %D/%%ETCDIR%%/server.properties; fi
-%%ETCDIR%%/server.properties.sample
-@exec if [ ! -f %D/%%ETCDIR%%/server.properties ] ; then cp -p %D/%%ETCDIR%%/server.properties.sample %D/%%ETCDIR%%/server.properties; fi
+@comment $FreeBSD: ports/www/helma/pkg-plist,v 1.2 2008/12/22 21:13:15 miwi Exp $
+@sample %%ETCDIR%%/apps.properties.sample
+@sample %%ETCDIR%%/db.properties.sample
+@sample %%ETCDIR%%/helma.conf.sample
+@sample %%ETCDIR%%/server.properties.sample
 @unexec rm -rf "%%LOGDIR%%" 2> /dev/null || true
 @exec mkdir -p "%%LOGDIR%%" || true
 @exec chown -R %%HELMA_USER%%:%%HELMA_GROUP%% "%%LOGDIR%%"