svn commit: r400044 - head/www/helma

Dmitry Marakasov amdmi3 at FreeBSD.org
Fri Oct 23 17:48:20 UTC 2015 

Author: amdmi3
Date: Fri Oct 23 17:48:18 2015
New Revision: 400044
URL: https://svnweb.freebsd.org/changeset/ports/400044

Log:
  - Handle permissions in pkg-plist instead of CHOWNing from the makefile which breaks packaging from non-root
  - Use options helpers
  - Add NO_ARCH
  
  PR:		203474
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (decke, 3 weeks)

Modified:
  head/www/helma/Makefile
  head/www/helma/pkg-plist

Modified: head/www/helma/Makefile
==============================================================================
--- head/www/helma/Makefile	Fri Oct 23 17:41:00 2015	(r400043)
+++ head/www/helma/Makefile	Fri Oct 23 17:48:18 2015	(r400044)
@@ -24,6 +24,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	clean jar
+NO_ARCH=	yes
 
 DBDIR?=		/var/db/${PORTNAME}
 LOGDIR?=	/var/log/${PORTNAME}
@@ -42,8 +43,6 @@ OPTIONS_DESC=	Install MySQL Connector fo
 
 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}|' \
 		${HELMA_CONFIG}
@@ -80,34 +79,29 @@ do-install:
 
 	${MKDIR} ${STAGEDIR}${WWWDIR} && \
 	(cd ${WRKBASE} && ${COPYTREE_SHARE} "apps modules" ${STAGEDIR}${WWWDIR} \
-		"! -name *.html ! -name helma-*.jar ! -name .jsdoc") && \
-	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${WWWDIR}
+		"! -name *.html ! -name helma-*.jar ! -name .jsdoc")
 
 	${MKDIR} ${STAGEDIR}${DATADIR} && \
 	(cd ${WRKBASE} && ${COPYTREE_SHARE} "lib launcher.jar" ${STAGEDIR}${DATADIR} \
 		"! -name *.html ! -name helma-*.jar ! -name .jsdoc")
 
-	${MKDIR} ${STAGEDIR}${LOGDIR} && \
-	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${LOGDIR}
+	${MKDIR} ${STAGEDIR}${LOGDIR}
 
-	${MKDIR} ${STAGEDIR}${DBDIR} && \
-	${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${DBDIR}
+	${MKDIR} ${STAGEDIR}${DBDIR}
 
 	${MKDIR} ${STAGEDIR}${ETCDIR}; \
 	for f in apps.properties db.properties server.properties scripts/helma.conf; do \
 		${INSTALL_DATA} ${WRKBASE}/$$f ${STAGEDIR}${ETCDIR}/$${f##*/}.sample; \
 	done
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	(cd ${WRKBASE} && ${COPYTREE_SHARE} "licenses license.txt README.txt" ${STAGEDIR}${DOCSDIR})
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/api/jala && \
 	(cd ${WRKBASE}/modules/jala/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/docs/api/jala)
-.endif
 
-.if ${PORT_OPTIONS:MMYSQL}
+do-install-MYSQL-on:
 	${LN} -sf ${JAVALIBDIR}/mysql-connector-java.jar ${STAGEDIR}${DATADIR}/lib/ext/mysql-connector-java.jar
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/helma/pkg-plist
==============================================================================
--- head/www/helma/pkg-plist	Fri Oct 23 17:41:00 2015	(r400043)
+++ head/www/helma/pkg-plist	Fri Oct 23 17:48:18 2015	(r400044)
@@ -2,14 +2,6 @@
 @sample %%ETCDIR%%/db.properties.sample
 @sample %%ETCDIR%%/helma.conf.sample
 @sample %%ETCDIR%%/server.properties.sample
- at unexec rm -rf "%%LOGDIR%%" 2> /dev/null || true
- at exec mkdir -p "%%LOGDIR%%" || true
- at exec chown -R %%HELMA_USER%%:%%HELMA_GROUP%% "%%LOGDIR%%"
- at unexec rm -rf "%%DBDIR%%" 2> /dev/null || true
- at exec mkdir -p "%%DBDIR%%" || true
- at exec chown -R %%HELMA_USER%%:%%HELMA_GROUP%% "%%DBDIR%%"
- at exec mkdir -p "%D/%%DATADIR%%/lib/ext" || true
-%%MYSQL%%@exec ln -sf %D/%%JAVAJARDIR%%/mysql-connector-java.jar %D/%%DATADIR%%/lib/ext/mysql-connector-java.jar
 %%MYSQL%%%%DATADIR%%/lib/ext/mysql-connector-java.jar
 bin/helma
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
@@ -147,6 +139,8 @@ bin/helma
 %%DATADIR%%/lib/servlet.jar
 %%DATADIR%%/lib/tagsoup.jar
 %%DATADIR%%/lib/xmlrpc.jar
+ at owner %%HELMA_USER%%
+ at group %%HELMA_USER%%
 %%WWWDIR%%/apps/manage/app.properties
 %%WWWDIR%%/apps/manage/class.properties
 %%WWWDIR%%/apps/manage/manage.zip
@@ -364,58 +358,54 @@ bin/helma
 %%WWWDIR%%/modules/test/tests/Skin.js
 %%WWWDIR%%/modules/test/tests/helma.Http.js
 %%WWWDIR%%/modules/test/tests/helma.Search.js
- at dirrm %%WWWDIR%%/modules/test/tests
- at dirrm %%WWWDIR%%/modules/test/code/SomeMountpoint
- at dirrm %%WWWDIR%%/modules/test/code/Root
- at dirrm %%WWWDIR%%/modules/test/code/Person
- at dirrm %%WWWDIR%%/modules/test/code/Organisation
- at dirrm %%WWWDIR%%/modules/test/code/Global
- at dirrm %%WWWDIR%%/modules/test/code/Country
- at dirrm %%WWWDIR%%/modules/test/code
- at dirrm %%WWWDIR%%/modules/test
- at dirrm %%WWWDIR%%/modules/jala/util/XmlRpcClient/Root
- at dirrm %%WWWDIR%%/modules/jala/util/XmlRpcClient/Global
- at dirrm %%WWWDIR%%/modules/jala/util/XmlRpcClient
- at dirrm %%WWWDIR%%/modules/jala/util/Test/tests
- at dirrm %%WWWDIR%%/modules/jala/util/Test/docs
- at dirrm %%WWWDIR%%/modules/jala/util/Test/code/Global
- at dirrm %%WWWDIR%%/modules/jala/util/Test/code
- at dirrm %%WWWDIR%%/modules/jala/util/Test
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/scripts
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/lib
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/templates
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/JavaScript/Syntax
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/JavaScript
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/JSDoc
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit/JSDoc
- at dirrm %%WWWDIR%%/modules/jala/util/HopKit
- at dirrm %%WWWDIR%%/modules/jala/util
- at dirrm %%WWWDIR%%/modules/jala/tests
- at dirrm %%WWWDIR%%/modules/jala/licenses
- at dirrmtry %%WWWDIR%%/modules/jala/lib
- at dirrm %%WWWDIR%%/modules/jala/docs
- at dirrm %%WWWDIR%%/modules/jala/code
- at dirrmtry %%WWWDIR%%/modules/jala
- at dirrm %%WWWDIR%%/modules/helma
- at dirrm %%WWWDIR%%/modules/core
- at dirrmtry %%WWWDIR%%/modules
- at dirrm %%WWWDIR%%/apps/welcome/static/guide
- at dirrm %%WWWDIR%%/apps/welcome/static
- at dirrm %%WWWDIR%%/apps/welcome/code/Root
- at dirrm %%WWWDIR%%/apps/welcome/code/HopObject
- at dirrm %%WWWDIR%%/apps/welcome/code/Guide
- at dirrm %%WWWDIR%%/apps/welcome/code/Global
- at dirrm %%WWWDIR%%/apps/welcome/code
- at dirrm %%WWWDIR%%/apps/welcome
- at dirrm %%WWWDIR%%/apps/manage
- at dirrmtry %%WWWDIR%%/apps
- at dirrmtry %%WWWDIR%%
- at dirrmtry %%DATADIR%%/lib/ext
- at dirrmtry %%DATADIR%%/lib
- at dirrmtry %%DATADIR%%
- at dirrmtry %%ETCDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/jala
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dir %%WWWDIR%%/modules/test/tests
+ at dir %%WWWDIR%%/modules/test/code/SomeMountpoint
+ at dir %%WWWDIR%%/modules/test/code/Root
+ at dir %%WWWDIR%%/modules/test/code/Person
+ at dir %%WWWDIR%%/modules/test/code/Organisation
+ at dir %%WWWDIR%%/modules/test/code/Global
+ at dir %%WWWDIR%%/modules/test/code/Country
+ at dir %%WWWDIR%%/modules/test/code
+ at dir %%WWWDIR%%/modules/test
+ at dir %%WWWDIR%%/modules/jala/util/XmlRpcClient/Root
+ at dir %%WWWDIR%%/modules/jala/util/XmlRpcClient/Global
+ at dir %%WWWDIR%%/modules/jala/util/XmlRpcClient
+ at dir %%WWWDIR%%/modules/jala/util/Test/tests
+ at dir %%WWWDIR%%/modules/jala/util/Test/docs
+ at dir %%WWWDIR%%/modules/jala/util/Test/code/Global
+ at dir %%WWWDIR%%/modules/jala/util/Test/code
+ at dir %%WWWDIR%%/modules/jala/util/Test
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/scripts
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/lib
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/templates
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/JavaScript/Syntax
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/JavaScript
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/JSDoc/JSDoc
+ at dir %%WWWDIR%%/modules/jala/util/HopKit/JSDoc
+ at dir %%WWWDIR%%/modules/jala/util/HopKit
+ at dir %%WWWDIR%%/modules/jala/util
+ at dir %%WWWDIR%%/modules/jala/tests
+ at dir %%WWWDIR%%/modules/jala/licenses
+ at dir %%WWWDIR%%/modules/jala/lib
+ at dir %%WWWDIR%%/modules/jala/docs
+ at dir %%WWWDIR%%/modules/jala/code
+ at dir %%WWWDIR%%/modules/jala
+ at dir %%WWWDIR%%/modules/helma
+ at dir %%WWWDIR%%/modules/core
+ at dir %%WWWDIR%%/modules
+ at dir %%WWWDIR%%/apps/welcome/static/guide
+ at dir %%WWWDIR%%/apps/welcome/static
+ at dir %%WWWDIR%%/apps/welcome/code/Root
+ at dir %%WWWDIR%%/apps/welcome/code/HopObject
+ at dir %%WWWDIR%%/apps/welcome/code/Guide
+ at dir %%WWWDIR%%/apps/welcome/code/Global
+ at dir %%WWWDIR%%/apps/welcome/code
+ at dir %%WWWDIR%%/apps/welcome
+ at dir %%WWWDIR%%/apps/manage
+ at dir %%WWWDIR%%/apps
+ at dir %%WWWDIR%%
+ at dir %%LOGDIR%%
+ at dir %%DBDIR%%
+ at owner
+ at group
+ at dir %%DATADIR%%/lib/ext

More information about the svn-ports-all mailing list