Index: www/drupal6-advanced_help/Makefile =================================================================== --- www/drupal6-advanced_help/Makefile (révision 358026) +++ www/drupal6-advanced_help/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= rea@FreeBSD.org COMMENT= Allows to store module help pages outside the module system -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= help \ help_example/help help_example/translations help_example \ translations/help/de translations/help translations Index: www/drupal6-cck/Makefile =================================================================== --- www/drupal6-cck/Makefile (révision 358026) +++ www/drupal6-cck/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= rea@FreeBSD.org COMMENT= Drupal 6 Content Construction Kit module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= translations/help/de translations/help translations \ theme tests \ modules/userreference/translations modules/userreference/panels/relationships \ Index: www/drupal6-chaos/Makefile =================================================================== --- www/drupal6-chaos/Makefile (révision 358026) +++ www/drupal6-chaos/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drupal 6.x Chaos tool suite module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= views_content/translations views_content/plugins/views/translations \ views_content/plugins/views views_content/plugins/content_types/translations \ Index: www/drupal6-ckeditor/Makefile =================================================================== --- www/drupal6-ckeditor/Makefile (révision 358026) +++ www/drupal6-ckeditor/Makefile (copie de travail) @@ -14,8 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drupal 6.x Ckeditor WYSIWYG HTML editor -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= translations plugins/mediaembed/images \ plugins/mediaembed plugins/linktonode/jscripts \ @@ -314,9 +313,7 @@ TROUBLESHOOTING.txt README.txt \ LICENSE.txt CHANGELOG.txt -.include - post-extract: @cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/ckeditor_3.3.tar.gz -.include +.include Index: www/drupal6-content_access/Makefile =================================================================== --- www/drupal6-content_access/Makefile (révision 358026) +++ www/drupal6-content_access/Makefile (copie de travail) @@ -9,8 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drupal 6.x Content Access module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= translations tests Index: www/drupal6-geshifilter/Makefile =================================================================== --- www/drupal6-geshifilter/Makefile (révision 358026) +++ www/drupal6-geshifilter/Makefile (copie de travail) @@ -14,9 +14,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message +USES= drupal:6,module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes MODULE_DIRS= geshi-extra tests translations MODULE_FILES= geshi-extra/drupal5.php geshi-extra/drupal6.php \ geshifilter.admin.inc geshifilter.conflicts.inc \ Index: www/drupal6-google_analytics/Makefile =================================================================== --- www/drupal6-google_analytics/Makefile (révision 358026) +++ www/drupal6-google_analytics/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Adds the Google Analytics web stats tracking system to your website -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= googleanalytics.admin.inc googleanalytics.install googleanalytics.module \ googleanalytics.info googleanalytics.js googleanalytics.test Index: www/drupal6-image/Makefile =================================================================== --- www/drupal6-image/Makefile (révision 358026) +++ www/drupal6-image/Makefile (copie de travail) @@ -9,8 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drupal 6.x image upload module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6:module MODULE_DIRS= views/theme views translations tests \ contrib/image_import/translations \ Index: www/drupal6-imce/Makefile =================================================================== --- www/drupal6-imce/Makefile (révision 358026) +++ www/drupal6-imce/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drupal 6.x image/file uploader module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= translations tpl js inc css Index: www/drupal6-menu_block/Makefile =================================================================== --- www/drupal6-menu_block/Makefile (révision 358026) +++ www/drupal6-menu_block/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Drupal module to provide configurable menu tree blocks -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= menu-block-wrapper.tpl.php menu_block.admin.inc menu_block.book.inc menu_block.info \ menu_block.module menu_block.sort.inc menu-block-admin.css menu-block.js menu_block.api.php \ menu_block.follow.inc menu_block.install menu_block.pages.inc \ Index: www/drupal6-mimedetect/Makefile =================================================================== --- www/drupal6-mimedetect/Makefile (révision 358026) +++ www/drupal6-mimedetect/Makefile (copie de travail) @@ -9,8 +9,7 @@ MAINTAINER= wenheping@gmail.com COMMENT= An API for Consistent Server Side Mime Detection -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= magic magic.mgc magic.mime \ mimedetect.info mimedetect.install mimedetect.module Index: www/drupal6-nice_menus/Makefile =================================================================== --- www/drupal6-nice_menus/Makefile (révision 358026) +++ www/drupal6-nice_menus/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= CSS / JavaScript pull-down menus for Drupal -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= superfish/js superfish translations MODULE_FILES= arrow-right.png nice_menus.install nice_menus_default-rtl.css \ Index: www/drupal6-nodewords/Makefile =================================================================== --- www/drupal6-nodewords/Makefile (révision 358026) +++ www/drupal6-nodewords/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= A drupal module which allows the end-user to set meta tags for nodes -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= nodewords_basic nodewords_extra includes nodewords_og MODULE_FILES= includes/forum.inc includes/image.inc includes/node.inc \ includes/taxonomy.inc includes/taxonomy_menu.inc includes/uc_catalog.inc \ Index: www/drupal6-page_title/Makefile =================================================================== --- www/drupal6-page_title/Makefile (révision 358026) +++ www/drupal6-page_title/Makefile (copie de travail) @@ -10,8 +10,7 @@ RUN_DEPENDS= drupal6-token>=0:${PORTSDIR}/www/drupal6-token -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= page_title-admin-settings-form.tpl.php page_title.install page_title.views.inc \ views_handler_field_node_page_title.inc page_title.admin.css page_title.js \ page_title.views_default.inc page_title.admin.inc page_title.legacy.inc \ Index: www/drupal6-panels/Makefile =================================================================== --- www/drupal6-panels/Makefile (révision 358026) +++ www/drupal6-panels/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drupal 6.x panels module -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= translations templates plugins/task_handlers \ plugins/styles/corners plugins/styles \ Index: www/drupal6-path_redirect/Makefile =================================================================== --- www/drupal6-path_redirect/Makefile (révision 358026) +++ www/drupal6-path_redirect/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Drupal module to allow redirects -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= generate/path_redirect_generate.drush.inc \ generate/path_redirect_generate.info \ Index: www/drupal6-pathauto/Makefile =================================================================== --- www/drupal6-pathauto/Makefile (révision 358026) +++ www/drupal6-pathauto/Makefile (copie de travail) @@ -10,8 +10,7 @@ RUN_DEPENDS= drupal6-token>=0:${PORTSDIR}/www/drupal6-token -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= pathauto.admin.inc pathauto.inc pathauto.install pathauto.module \ pathauto.test pathauto.api.php pathauto.info pathauto.js \ pathauto.pathauto.inc pathauto.tokens.inc Index: www/drupal6-print/Makefile =================================================================== --- www/drupal6-print/Makefile (révision 358026) +++ www/drupal6-print/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= rea@FreeBSD.org COMMENT= Drupal 6 module that add printer-friendly pages -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= icons translations MODULE_FILES= icons/mail_icon.gif icons/pdf_icon.gif icons/print_icon.gif \ print-rtl.css print.admin.inc print.css print.info \ Index: www/drupal6-seo_checklist/Makefile =================================================================== --- www/drupal6-seo_checklist/Makefile (révision 358026) +++ www/drupal6-seo_checklist/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Drupal module to provide checklist of actions for SEO -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= seochecklist.info seochecklist.install seochecklist.module DOC_FILES= LICENSE.txt README.txt Index: www/drupal6-services/Makefile =================================================================== --- www/drupal6-services/Makefile (révision 358026) +++ www/drupal6-services/Makefile (copie de travail) @@ -8,8 +8,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Provide an API for creating drupal web services. -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= auth/services_keyauth auth servers/xmlrpc_server servers \ services/comment_service services/file_service \ services/menu_service services/node_service \ Index: www/drupal6-tagadelic/Makefile =================================================================== --- www/drupal6-tagadelic/Makefile (révision 358026) +++ www/drupal6-tagadelic/Makefile (copie de travail) @@ -10,8 +10,7 @@ MAINTAINER= rea@FreeBSD.org COMMENT= Tagadelic module for Drupal 6 -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= translations MODULE_FILES= tagadelic.css tagadelic.info tagadelic.install \ tagadelic.module \ Index: www/drupal6-token/Makefile =================================================================== --- www/drupal6-token/Makefile (révision 358026) +++ www/drupal6-token/Makefile (copie de travail) @@ -9,8 +9,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Token module for Drupal -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= translations/token.pot translations/da.po translations/de.po \ translations/es.po translations/hu.po translations/ja.po \ translations/pl.po translations/sk.po translations/uk-ua.po \ Index: www/drupal6-views/Makefile =================================================================== --- www/drupal6-views/Makefile (révision 358026) +++ www/drupal6-views/Makefile (copie de travail) @@ -9,8 +9,7 @@ MAINTAINER= rea@FreeBSD.org COMMENT= Controls how content lists are generated -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_DIRS= css \ docs \ handlers \ Index: www/drupal6-webform/Makefile =================================================================== --- www/drupal6-webform/Makefile (révision 358026) +++ www/drupal6-webform/Makefile (copie de travail) @@ -9,8 +9,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Drupal module to allow easy creation of forms -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= components/date.inc \ components/email.inc \ Index: www/drupal6-wysiwyg/Makefile =================================================================== --- www/drupal6-wysiwyg/Makefile (révision 358026) +++ www/drupal6-wysiwyg/Makefile (copie de travail) @@ -16,8 +16,7 @@ PLIST_FILES+= ${DRUPAL_MODDIR}/tinymce -USE_DRUPAL= yes -DRUPAL6_MODULE= yes +USES= drupal:6,module MODULE_FILES= editors/css/openwysiwyg.css \ editors/css/tinymce-2.css \ editors/css/tinymce-3.css \ Index: www/drupal6-zeropoint/Makefile =================================================================== --- www/drupal6-zeropoint/Makefile (révision 358026) +++ www/drupal6-zeropoint/Makefile (copie de travail) @@ -9,9 +9,8 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= The zeropoint drupal theme +USES= drupal:6,theme USE_PHP= ctype -USE_DRUPAL= yes -DRUPAL6_THEME= yes MODULE_DIRS= _custom/headerimg _custom css images/all images/ink \ images/icons/blocks images/icons images/ivy images/lime \ images/nature images/sangue images/sky images js Index: www/drupal6/Makefile =================================================================== --- www/drupal6/Makefile (révision 358026) +++ www/drupal6/Makefile (copie de travail) @@ -11,8 +11,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= A database driven web content management system (CMS) -USE_DRUPAL= yes -DRUPAL6_PORT= yes +USES= drupal:6 USE_PHP= gd pcre session xml mbstring WANT_PHP_WEB= yes @@ -57,10 +56,7 @@ ${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/all ${CP} ${WRKSRC}/sites/all/README.txt ${STAGEDIR}${DRUPAL_DIR}/sites/all/ ${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default - ${CP} ${WRKSRC}/sites/default/default.settings.php ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php-dist - @if [ ! -f ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php ]; then \ - ${CP} -p ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php-dist ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php ; \ - fi + ${CP} ${WRKSRC}/sites/default/default.settings.php ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php.sample ${CP} -R ${WRKSRC}/themes ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/update.php ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/xmlrpc.php ${STAGEDIR}${DRUPAL_DIR} @@ -68,6 +64,5 @@ ${TOUCH} ${STAGEDIR}${DRUPAL_DIR}/sites/all/modules/.keepme ${STAGEDIR}${DRUPAL_DIR}/sites/all/themes/.keepme ${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${DRUPAL_DIR} .include Index: www/drupal6/pkg-plist =================================================================== --- www/drupal6/pkg-plist (révision 358026) +++ www/drupal6/pkg-plist (copie de travail) @@ -1,3 +1,5 @@ +@owner www +@group www %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt %%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS.txt %%PORTDOCS%%%%DOCSDIR%%/INSTALL.mysql.txt @@ -341,8 +343,7 @@ %%DRUPAL_BASE%%/sites/all/README.txt %%DRUPAL_BASE%%/sites/all/modules/.keepme %%DRUPAL_BASE%%/sites/all/themes/.keepme -%%DRUPAL_BASE%%/sites/default/default.settings.php -%%DRUPAL_BASE%%/sites/default/default.settings.php-dist +@sample %%DRUPAL_BASE%%/sites/default/default.settings.php.sample %%DRUPAL_BASE%%/themes/README.txt %%DRUPAL_BASE%%/themes/bluemarine/block.tpl.php %%DRUPAL_BASE%%/themes/bluemarine/bluemarine.info @@ -529,4 +530,5 @@ @dirrmtry %%DRUPAL_BASE%%/modules %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry %%DRUPAL_BASE%% -@unexec (test -d %D/%%DRUPAL_BASE%% && (echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%DRUPAL_BASE%% and its contents manually.")) || true +@owner root +@group wheel Index: www/drupal7-jailadmin/Makefile =================================================================== --- www/drupal7-jailadmin/Makefile (révision 358026) +++ www/drupal7-jailadmin/Makefile (copie de travail) @@ -5,19 +5,15 @@ DISTVERSION= 7.x-0.6.2 CATEGORIES= www MASTER_SITES= http://0xfeedface.org/~shawn/projects/jailadmin/ \ - http://mirrors.rit.edu/zi/ + http://mirrors.rit.edu/zi/ MAINTAINER= lattera@gmail.com COMMENT= Drupal 7 module for administering FreeBSD vnet jails -LICENSE= BSD +#LICENSE= BSD -USE_DRUPAL= yes +USES= drupal:7,module -.include - -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= README \ jailadmin.admin.inc \ jailadmin.drush.inc \ Index: www/drupal7-vulnscan/Makefile =================================================================== --- www/drupal7-vulnscan/Makefile (révision 358026) +++ www/drupal7-vulnscan/Makefile (copie de travail) @@ -9,14 +9,10 @@ MAINTAINER= bsdports@wayfair.com COMMENT= Drupal 7 module frontend for Skipfish -LICENSE= BSD +#LICENSE= BSD -USE_DRUPAL= yes +USES= drupal:7,module -.include - -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= vulnscan.info \ vulnscan.module \ scan.inc \ Index: www/drupal7-wysiwyg/Makefile =================================================================== --- www/drupal7-wysiwyg/Makefile (révision 358026) +++ www/drupal7-wysiwyg/Makefile (copie de travail) @@ -10,7 +10,7 @@ #LICENSE from bsd.drupal.mk -USE_DRUPAL= yes +USES= drupal:7,module OPTIONS_DEFINE= TINYMCE3 CKEDITOR YUI @@ -35,8 +35,6 @@ PLIST_FILES+= ${DRUPAL_MODLIB}/yui .endif -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= editors/css/openwysiwyg.css \ editors/css/tinymce-2.css \ editors/css/tinymce-3.css \ Index: www/drupal7/Makefile =================================================================== --- www/drupal7/Makefile (révision 358026) +++ www/drupal7/Makefile (copie de travail) @@ -3,6 +3,7 @@ PORTNAME= drupal7 PORTVERSION= 7.28 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} @@ -14,9 +15,7 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -USE_DRUPAL= yes -DRUPAL_PORT= yes -DRUPAL_VERSION= 7 +USES= drupal:7 USE_PHP= dom filter gd hash json mbstring pcre pdo session simplexml xml WANT_PHP_WEB= yes @@ -65,10 +64,7 @@ ${CP} -R ${WRKSRC}/sites/all ${STAGEDIR}${DRUPAL_DIR}/sites/ ${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default ${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default/files - ${CP} ${WRKSRC}/sites/default/default.settings.php ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php-dist - @if [ ! -f ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php ]; then \ - ${CP} -p ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php-dist ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php ; \ - fi + ${CP} ${WRKSRC}/sites/default/default.settings.php ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php.sample ${CP} -R ${WRKSRC}/themes ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/update.php ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/web.config ${STAGEDIR}${DRUPAL_DIR} @@ -75,6 +71,5 @@ ${CP} ${WRKSRC}/xmlrpc.php ${STAGEDIR}${DRUPAL_DIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${DRUPAL_DIR} .include Index: www/drupal7/pkg-plist =================================================================== --- www/drupal7/pkg-plist (révision 358026) +++ www/drupal7/pkg-plist (copie de travail) @@ -1,3 +1,5 @@ +@owner www +@group www %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt %%PORTDOCS%%%%DOCSDIR%%/INSTALL.mysql.txt @@ -959,8 +961,7 @@ %%DRUPAL_BASE%%/scripts/test.script %%DRUPAL_BASE%%/sites/all/modules/README.txt %%DRUPAL_BASE%%/sites/all/themes/README.txt -%%DRUPAL_BASE%%/sites/default/default.settings.php -%%DRUPAL_BASE%%/sites/default/default.settings.php-dist +@sample %%DRUPAL_BASE%%/sites/default/default.settings.php.sample %%DRUPAL_BASE%%/sites/example.sites.php %%DRUPAL_BASE%%/themes/README.txt %%DRUPAL_BASE%%/themes/bartik/bartik.info @@ -1210,4 +1211,5 @@ @dirrm %%DRUPAL_BASE%%/includes @dirrmtry %%DRUPAL_BASE%%/ %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec (test -d %D/%%DRUPAL_BASE%% && (echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%DRUPAL_BASE%% and its contents manually.")) || true +@owner root +@group wheel Index: Mk/Uses/drupal.mk =================================================================== --- Mk/Uses/drupal.mk (révision 358237) +++ Mk/Uses/drupal.mk (copie de travail) @@ -1,69 +1,57 @@ # $FreeBSD$ # -# bsd.drupal.mk - Support for Drupal ports and modules. +# Support for Drupal ports and modules. # -# For FreeBSD committers: -# Please send all suggested changes to the maintainer instead of committing -# them to SVN yourself. +# Feature: drupal +# Usage: USES=drupal or USES=drupal:ARGS +# Valid ARGS: module theme +# +# module The port is a drupal module +# +# MAINTAINER: miwi@FreeBSD.org -bsd_drupal_mk_MAINTAINER= miwi@FreeBSD.org +.if !defined(_INCLUDE_USES_DRUPAL_Mk) +_INCLUDE_USES_DRUPAL_Mk= yes -# Make sure we cannot define any combination of DRUPAL{5,6} -.if (defined(DRUPAL5_MODULE) && defined(DRUPAL6_MODULE)) -BROKEN= cannot define a combination of DRUPAL5_MODULE and DRUPAL6_MODULE -.endif +_drupal_ARGS= ${drupal_ARGS:S/,/ /g} -.if (defined(DRUPAL5_THEME) && defined(DRUPAL6_THEME)) -BROKEN= cannot define a combination of DRUPAL5_THEME and DRUPAL6_THEME +.if ${_drupal_ARGS:M[67]} +_DRUPAL_VERSION= ${_drupal_ARGS:M[67]} .endif -.if defined(DRUPAL6_MODULE) || defined(DRUPAL6_PORT) || defined(DRUPAL6_THEME) -DRUPAL_VERSION?= 6 -.endif +VALID_VERSIONS= 6 7 -.if !defined(DRUPAL_VERSION) -BROKEN= must define DRUPAL_VERSION +.if ${_drupal_ARGS:N[67]:Ntheme:Nmodule} +IGNORE= Unknown argument for USES=drupal: ${_drupal_ARGS:N[67]:Ntheme:Nmodule} .endif -# Make sure DRUPAL_MODULE is defined where necessary -.if defined(DRUPAL5_MODULE) || defined(DRUPAL6_MODULE) -DRUPAL_MODULE?= yes -.endif +_DRUPAL_COMP= ${_drupal_ARGS:N[67]} -.if defined(DRUPAL_MODULE) -DRUPAL_MODTYPE= modules +.if !defined(_DRUPAL_VERSION) || ! ${VALID_VERSIONS:M${_DRUPAL_VERSION}} +IGNORE= Missing or invalid argument for USES=drupal, a version must be provided: ${VALID_VERSIONS} .endif -# Make sure DRUPAL_PORT is defined where necessary -.if defined(DRUPAL5_PORT) || defined(DRUPAL6_PORT) -DRUPAL_PORT?= yes +.if ${_drupal_ARGS:Mmodule} && ${_drupal_ARGS:Mtheme} +IGNORE= theme and module arguments are mutually exclusive for USES=drupal .endif -# Make sure DRUPAL_THEME is defined where necessary -.if defined(DRUPAL5_THEME) || defined(DRUPAL6_THEME) -DRUPAL_THEME?= yes -DRUPAL_MODTYPE= themes -.endif +DRUPAL_BASE?= www/drupal${_DRUPAL_VERSION} -.if ${DRUPAL_VERSION} == "7" -DRUPAL_BASE?= www/drupal7 -.elif ${DRUPAL_VERSION} == "6" -DRUPAL_BASE?= www/drupal6 -.else -BROKEN= Unknown DRUPAL_VERSION (${DRUPAL_VERSION}) -.endif - DRUPAL_DIR= ${PREFIX}/${DRUPAL_BASE} DRUPAL_DOCSDIR?= ${PREFIX}/${DRUPAL_BASE}/doc PLIST_SUB+= DRUPAL_BASE=${DRUPAL_BASE} SUB_LIST+= DRUPAL_BASE=${DRUPAL_BASE} DRUPAL_DIR=${DRUPAL_DIR} -.if defined(DRUPAL_PORT) +.if ! ${_DRUPAL_COMP} DOCSDIR?= ${DRUPAL_DOCSDIR} .endif -.if defined(DRUPAL_MODULE) || defined (DRUPAL_THEME) -PKGNAMEPREFIX= drupal${DRUPAL_VERSION}- +.if ${_DRUPAL_COMP} +_USES_POST= drupal +PKGNAMEPREFIX= drupal${_DRUPAL_VERSION}- +.if defined(DOC_FILES) +OPTIONS_DEFINE= DOCS +.endif # drupal contributions must be licensed under the GPLv2 or GPLv3. This is # documented at: http://drupal.org/licensing/faq/ @@ -73,9 +61,9 @@ .endif .if defined(DRUPAL_MODSUBDIR) -DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR} +DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${_DRUPAL_COMP}s/${DRUPAL_MODSUBDIR} .else -DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${PORTNAME} +DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${_DRUPAL_COMP}s .endif DRUPAL_MODLIB?= ${DRUPAL_BASE}/sites/all/libraries @@ -82,16 +70,10 @@ DOCSDIR?= ${DRUPAL_DOCSDIR}/${PORTNAME} -.if defined(DRUPAL_MOD_SNAPSHOT) MASTER_SITE_DRUPAL+= \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_DRUPAL_SUBDIR= pav/drupal -.else -MASTER_SITE_DRUPAL+= \ http://ftp.drupal.org/files/projects/ \ http://ftp.osuosl.org/pub/drupal/files/projects/ MASTER_SITE_DRUPAL_SUBDIR= -.endif MASTER_SITES?= ${MASTER_SITE_DRUPAL} MASTER_SITE_SUBDIR?= ${MASTER_SITE_DRUPAL_SUBDIR} @@ -103,26 +85,22 @@ WRKSRC?= ${WRKDIR}/${PORTNAME} RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE} -.if defined(MODULE_CONF_FILES) -SUB_FILES= pkg-install -SUB_LIST+= CONF_FILES="${MODULE_CONF_FILES:C|^|${DRUPAL_MODDIR}/|}" \ - CONF_DIRS="${MODULE_CONF_DIRS:C|^|${DRUPAL_MODDIR}/|}" -# XXX: where? -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${PKGINSTALL} -.endif - PLIST_SUB+= DRUPAL_MODDIR=${DRUPAL_MODDIR} -PLIST_FILES+= ${MODULE_FILES:C|^|%%DRUPAL_MODDIR%%/|} -PLIST_FILES+= ${MODULE_CONF_FILES:C|^|%%DRUPAL_MODDIR%%/|:C|$|-dist|} +PLIST_FILES+= "@owner www" \ + "@group www" \ + ${MODULE_FILES:C|^|%%DRUPAL_MODDIR%%/|} \ + "@owner root" \ + "@owner wheel" PLIST_DIRS+= ${MODULE_DIRS:C|^|%%DRUPAL_MODDIR%%/|} -.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME) -PLIST_DIRS+= ${DRUPAL_MODDIR} +PLIST_DIRS+= ${DRUPAL_MODDIR} ${DRUPAL_BASE} .endif -.if defined(DRUPAL_MODSUBDIR) -PLIST_DIRS+= ${DRUPAL_MODDIR} .endif -.if !defined(NOPORTDOCS) + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_DRUPAL_POST_MK) +_INCLUDE_USES_DRUPAL_POST_MK= yes + +.if ${_DRUPAL_COMP} +.if ${PORT_OPTIONS:MDOCS} PLIST_FILES+= ${DOC_FILES:C|^|%%DOCSDIR%%/|} PLIST_DIRS+= ${DOC_DIRS:C|^|%%DOCSDIR%%/|} PLIST_DIRS+= %%DOCSDIR%% @@ -129,33 +107,17 @@ .endif do-install: -.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME) @${MKDIR} ${DRUPAL_MODDIR:C|^|${STAGEDIR}${PREFIX}/|} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${STAGEDIR}${PREFIX}/|} -.endif -.if defined(MODULE_CONF_DIRS) - @${MKDIR} ${MODULE_CONF_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_CONF_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} -.endif .if defined(MODULE_DIRS) @${MKDIR} ${MODULE_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_DIRS:C|^|${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/|} .endif .for f in ${MODULE_FILES} @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f} .endfor -.for f in ${MODULE_CONF_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f}-dist - @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}/${f}-dist -.endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} ${DOC_DIRS:C|^|${STAGEDIR}${DOCSDIR}/|} .for f in ${DOC_FILES} @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f} .endfor -.if defined(MODULE_CONF_FILES) -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .endif