svn commit: r404122 - head/www/ojs2
Mathieu Arnold
mat at FreeBSD.org
Mon Dec 21 16:02:26 UTC 2015
Author: mat
Date: Mon Dec 21 16:02:24 2015
New Revision: 404122
URL: https://svnweb.freebsd.org/changeset/ports/404122
Log:
Fix build as a user.
While there, use options helpers, don't dupplicate what COPYTREE_SHARE does.
Sponsored by: Absolight
Modified:
head/www/ojs2/Makefile
head/www/ojs2/pkg-plist
Modified: head/www/ojs2/Makefile
==============================================================================
--- head/www/ojs2/Makefile Mon Dec 21 15:49:39 2015 (r404121)
+++ head/www/ojs2/Makefile Mon Dec 21 16:02:24 2015 (r404122)
@@ -39,57 +39,30 @@ pre-install::
@${ECHO_MSG} "Hit Control-C now"
@${ECHO_MSG} "======================================================================"
-.include <bsd.port.options.mk>
-
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+= mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+= pgsql
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+= ldap
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-USE_PHP+= curl
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHE}
-USE_PHP+= memcache
-.endif
+MYSQL_USE= php=mysql
+PGSQL_USE= php=pgsql
+LDAP_USE= php=ldap
+CURL_USE= php=curl
+MEMCACHE_USE= php=memcache
NONDOCS= cache/fc-locale-list.php classes config.inc.php \
dbscripts help includes index.php js lib locale pages \
plugins public registry rt styles templates tools
-.if ${PORT_OPTIONS:MDOCS}
DOCS= docs
-.endif
PLIST_SUB+= ECHO_MSG=${ECHO_MSG}
SUB_FILES= pkg-deinstall
do-install:
- @cd ${WRKSRC} && ${COPYTREE_SHARE} "${NONDOCS}" ${STAGEDIR}${WWWDIR}
- @cd ${WRKSRC} && ${CP} config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample
- ${RM} ${STAGEDIR}${WWWDIR}/config.inc.php
- @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/_db
- @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_cache
- @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_compile
- @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_config
- @${INSTALL} -d ${STAGEDIR}${WWWDIR}/locale/en_US/images
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
- @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
- ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
- @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
- @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
- ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
- @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
- @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
- ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
+ cd ${WRKSRC} && ${COPYTREE_SHARE} "${NONDOCS}" ${STAGEDIR}${WWWDIR}
+ ${MV} ${STAGEDIR}${WWWDIR}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample
+ ${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/_db
+ ${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_cache
+ ${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_compile
+ ${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_config
+ ${INSTALL} -d ${STAGEDIR}${WWWDIR}/locale/en_US/images
+
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC}/${DOCS} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
Modified: head/www/ojs2/pkg-plist
==============================================================================
--- head/www/ojs2/pkg-plist Mon Dec 21 15:49:39 2015 (r404121)
+++ head/www/ojs2/pkg-plist Mon Dec 21 16:02:24 2015 (r404122)
@@ -1,7 +1,39 @@
- at dir %%WWWDIR%%/cache/_db
- at dir %%WWWDIR%%/cache/t_cache
- at dir %%WWWDIR%%/cache/t_compile
- at dir %%WWWDIR%%/cache/t_config
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING_pt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/FAQ_pt
+%%PORTDOCS%%%%DOCSDIR%%/IMPORTEXPORT
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL_pt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE_pt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-CVS
+%%PORTDOCS%%%%DOCSDIR%%/README-CVS_pt
+%%PORTDOCS%%%%DOCSDIR%%/README-DEV
+%%PORTDOCS%%%%DOCSDIR%%/README_jp
+%%PORTDOCS%%%%DOCSDIR%%/README_pt
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/REPORTING-BUGS
+%%PORTDOCS%%%%DOCSDIR%%/REPORTING-BUGS_pt
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE_pt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.0.1
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.0.2
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.1
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.1.1
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.2
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.2.1
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.0.1
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.0.2
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.1.0
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.1.1
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.2.0
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.2.1
+ at owner www
+ at group www
+%%WWWDIR%%/cache/fc-locale-list.php
%%WWWDIR%%/classes/admin/form/ImportOJS1Form.inc.php
%%WWWDIR%%/classes/admin/form/JournalSiteSettingsForm.inc.php
%%WWWDIR%%/classes/admin/form/SiteSettingsForm.inc.php
@@ -335,39 +367,6 @@
%%WWWDIR%%/dbscripts/xml/upgrade/2.2.1_update.xml
%%WWWDIR%%/dbscripts/xml/upgrade/public_issue_ids.xml
%%WWWDIR%%/dbscripts/xml/version.xml
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING_pt
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FAQ_pt
-%%PORTDOCS%%%%DOCSDIR%%/IMPORTEXPORT
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_pt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_pt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README-CVS
-%%PORTDOCS%%%%DOCSDIR%%/README-CVS_pt
-%%PORTDOCS%%%%DOCSDIR%%/README-DEV
-%%PORTDOCS%%%%DOCSDIR%%/README_jp
-%%PORTDOCS%%%%DOCSDIR%%/README_pt
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE
-%%PORTDOCS%%%%DOCSDIR%%/REPORTING-BUGS
-%%PORTDOCS%%%%DOCSDIR%%/REPORTING-BUGS_pt
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE_pt
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.0.1
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.0.2
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.1
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.1.1
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.2
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/ChangeLog-2.2.1
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.0.1
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.0.2
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.1.0
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.1.1
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.2.0
-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-2.2.1
%%WWWDIR%%/help/el_GR/editorial/toc/000000.xml
%%WWWDIR%%/help/el_GR/editorial/toc/000001.xml
%%WWWDIR%%/help/el_GR/editorial/toc/000002.xml
@@ -3202,9 +3201,14 @@
%%WWWDIR%%/tools/rebuildSearchIndex.php
%%WWWDIR%%/tools/runScheduledTasks.php
%%WWWDIR%%/tools/upgrade.php
-%%WWWDIR%%/cache/fc-locale-list.php
+ at dir %%WWWDIR%%/cache/_db
+ at dir %%WWWDIR%%/cache/t_cache
+ at dir %%WWWDIR%%/cache/t_compile
+ at dir %%WWWDIR%%/cache/t_config
@dir %%WWWDIR%%/locale/en_US/images
- at unexec /bin/rm -rf %D/%%WWWDIR%%/cache/t_config 2>/dev/null || true
- at unexec /bin/rm -rf %D/%%WWWDIR%%/cache/t_compile 2>/dev/null || true
- at unexec /bin/rm -rf %D/%%WWWDIR%%/cache/t_cache 2>/dev/null || true
- at unexec /bin/rm -rf %D/%%WWWDIR%%/cache/_db 2>/dev/null || true
+ at group
+ at owner
+ at postunexec /bin/rm -rf %D/%%WWWDIR%%/cache/t_config 2>/dev/null || true
+ at postunexec /bin/rm -rf %D/%%WWWDIR%%/cache/t_compile 2>/dev/null || true
+ at postunexec /bin/rm -rf %D/%%WWWDIR%%/cache/t_cache 2>/dev/null || true
+ at postunexec /bin/rm -rf %D/%%WWWDIR%%/cache/_db 2>/dev/null || true
More information about the svn-ports-head
mailing list