diff options
33 files changed, 46 insertions, 90 deletions
diff --git a/www/drupal6-advanced_help/Makefile b/www/drupal6-advanced_help/Makefile index b9095e506bcb..da5396ae5a22 100644 --- a/www/drupal6-advanced_help/Makefile +++ b/www/drupal6-advanced_help/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 diff --git a/www/drupal6-cck/Makefile b/www/drupal6-cck/Makefile index dc884aa1ce89..f58d571a08d0 100644 --- a/www/drupal6-cck/Makefile +++ b/www/drupal6-cck/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 \ diff --git a/www/drupal6-chaos/Makefile b/www/drupal6-chaos/Makefile index 624a7192b374..77f46e8a7865 100644 --- a/www/drupal6-chaos/Makefile +++ b/www/drupal6-chaos/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 \ diff --git a/www/drupal6-ckeditor/Makefile b/www/drupal6-ckeditor/Makefile index 060cbed74a20..db2d110ce7af 100644 --- a/www/drupal6-ckeditor/Makefile +++ b/www/drupal6-ckeditor/Makefile @@ -14,8 +14,7 @@ EXTRACT_ONLY= ckeditor-6.x-1.1.tar.gz 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 @@ DOC_FILES= ckeditor/LICENSE.html ckeditor/INSTALL.html \ TROUBLESHOOTING.txt README.txt \ LICENSE.txt CHANGELOG.txt -.include <bsd.port.pre.mk> - post-extract: @cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/ckeditor_3.3.tar.gz -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/drupal6-content_access/Makefile b/www/drupal6-content_access/Makefile index 7ba7cc7b8289..a72422991641 100644 --- a/www/drupal6-content_access/Makefile +++ b/www/drupal6-content_access/Makefile @@ -9,8 +9,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 diff --git a/www/drupal6-geshifilter/Makefile b/www/drupal6-geshifilter/Makefile index fbdda371099f..8aabc9d8b7a7 100644 --- a/www/drupal6-geshifilter/Makefile +++ b/www/drupal6-geshifilter/Makefile @@ -14,9 +14,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/php/geshi/geshi.php:${PORTSDIR}/devel/php5-geshi 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 \ diff --git a/www/drupal6-google_analytics/Makefile b/www/drupal6-google_analytics/Makefile index a3b25a524240..4b434ab03030 100644 --- a/www/drupal6-google_analytics/Makefile +++ b/www/drupal6-google_analytics/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 diff --git a/www/drupal6-image/Makefile b/www/drupal6-image/Makefile index b5954fe7af07..5f51a168692f 100644 --- a/www/drupal6-image/Makefile +++ b/www/drupal6-image/Makefile @@ -9,8 +9,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 \ diff --git a/www/drupal6-imce/Makefile b/www/drupal6-imce/Makefile index 8aa394082541..7c30dfea2a1f 100644 --- a/www/drupal6-imce/Makefile +++ b/www/drupal6-imce/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 diff --git a/www/drupal6-menu_block/Makefile b/www/drupal6-menu_block/Makefile index 20c5e5b736fa..df674ad622dc 100644 --- a/www/drupal6-menu_block/Makefile +++ b/www/drupal6-menu_block/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-mimedetect/Makefile b/www/drupal6-mimedetect/Makefile index 51e1ce8f27dc..6a903f134860 100644 --- a/www/drupal6-mimedetect/Makefile +++ b/www/drupal6-mimedetect/Makefile @@ -9,8 +9,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 diff --git a/www/drupal6-nice_menus/Makefile b/www/drupal6-nice_menus/Makefile index 669175f49419..0ebf54d46753 100644 --- a/www/drupal6-nice_menus/Makefile +++ b/www/drupal6-nice_menus/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-nodewords/Makefile b/www/drupal6-nodewords/Makefile index 72463d578895..77f2d477f1ff 100644 --- a/www/drupal6-nodewords/Makefile +++ b/www/drupal6-nodewords/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-page_title/Makefile b/www/drupal6-page_title/Makefile index 6d2ab338df59..49e49d466f3c 100644 --- a/www/drupal6-page_title/Makefile +++ b/www/drupal6-page_title/Makefile @@ -10,8 +10,7 @@ COMMENT= Drupal module to provide fine-grained control of page titles 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 \ diff --git a/www/drupal6-panels/Makefile b/www/drupal6-panels/Makefile index 482a0ad531b7..5be9e76e7d7f 100644 --- a/www/drupal6-panels/Makefile +++ b/www/drupal6-panels/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 \ diff --git a/www/drupal6-path_redirect/Makefile b/www/drupal6-path_redirect/Makefile index e894ad888296..e24ab963adcc 100644 --- a/www/drupal6-path_redirect/Makefile +++ b/www/drupal6-path_redirect/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-pathauto/Makefile b/www/drupal6-pathauto/Makefile index 75494bd66774..4f64d4b67e73 100644 --- a/www/drupal6-pathauto/Makefile +++ b/www/drupal6-pathauto/Makefile @@ -10,8 +10,7 @@ COMMENT= Automatically generates URLs for Drupal content 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 diff --git a/www/drupal6-print/Makefile b/www/drupal6-print/Makefile index fd0ffbef2112..ee3a2fee8acd 100644 --- a/www/drupal6-print/Makefile +++ b/www/drupal6-print/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 \ diff --git a/www/drupal6-seo_checklist/Makefile b/www/drupal6-seo_checklist/Makefile index 69f9c7747dd1..3368b18a88f2 100644 --- a/www/drupal6-seo_checklist/Makefile +++ b/www/drupal6-seo_checklist/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 diff --git a/www/drupal6-services/Makefile b/www/drupal6-services/Makefile index fa27b180efd0..b8d869c11a7f 100644 --- a/www/drupal6-services/Makefile +++ b/www/drupal6-services/Makefile @@ -8,8 +8,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-tagadelic/Makefile b/www/drupal6-tagadelic/Makefile index 8c8e06d4ec8c..881567ea103c 100644 --- a/www/drupal6-tagadelic/Makefile +++ b/www/drupal6-tagadelic/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/files/projects/ 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 \ diff --git a/www/drupal6-token/Makefile b/www/drupal6-token/Makefile index e955ef47b31b..61897e2b05e6 100644 --- a/www/drupal6-token/Makefile +++ b/www/drupal6-token/Makefile @@ -9,8 +9,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-views/Makefile b/www/drupal6-views/Makefile index f867225e4cda..7fc3161021ae 100644 --- a/www/drupal6-views/Makefile +++ b/www/drupal6-views/Makefile @@ -9,8 +9,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-webform/Makefile b/www/drupal6-webform/Makefile index 3480b93aa6b3..845556e1df3c 100644 --- a/www/drupal6-webform/Makefile +++ b/www/drupal6-webform/Makefile @@ -9,8 +9,7 @@ CATEGORIES= www 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 \ diff --git a/www/drupal6-wysiwyg/Makefile b/www/drupal6-wysiwyg/Makefile index 7aba626133e3..97006f6184bb 100644 --- a/www/drupal6-wysiwyg/Makefile +++ b/www/drupal6-wysiwyg/Makefile @@ -16,8 +16,7 @@ RUN_DEPENDS+= ${LOCALBASE}/${TINYMCEDIR}:${PORTSDIR}/www/tinymce3 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 \ diff --git a/www/drupal6-zeropoint/Makefile b/www/drupal6-zeropoint/Makefile index 3c82e61bf216..f6888d49711c 100644 --- a/www/drupal6-zeropoint/Makefile +++ b/www/drupal6-zeropoint/Makefile @@ -9,9 +9,8 @@ CATEGORIES= www 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 diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile index 3d7782b0e020..87d7a085f18b 100644 --- a/www/drupal6/Makefile +++ b/www/drupal6/Makefile @@ -11,8 +11,7 @@ DIST_SUBDIR= drupal 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 @@ do-install: ${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 @@ do-install: ${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 <bsd.port.mk> diff --git a/www/drupal6/pkg-plist b/www/drupal6/pkg-plist index 71453be29198..42145665772b 100644 --- a/www/drupal6/pkg-plist +++ b/www/drupal6/pkg-plist @@ -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 diff --git a/www/drupal7-jailadmin/Makefile b/www/drupal7-jailadmin/Makefile index ef2443ebd2be..5ee13b3c3e74 100644 --- a/www/drupal7-jailadmin/Makefile +++ b/www/drupal7-jailadmin/Makefile @@ -5,19 +5,15 @@ PORTNAME= jailadmin 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 -USE_DRUPAL= yes +USES= drupal:7,module -.include <bsd.port.options.mk> - -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= README \ jailadmin.admin.inc \ jailadmin.drush.inc \ diff --git a/www/drupal7-vulnscan/Makefile b/www/drupal7-vulnscan/Makefile index 2a8635d4591c..45c8a8c2e5f9 100644 --- a/www/drupal7-vulnscan/Makefile +++ b/www/drupal7-vulnscan/Makefile @@ -11,12 +11,8 @@ COMMENT= Drupal 7 module frontend for Skipfish LICENSE= BSD -USE_DRUPAL= yes +USES= drupal:7,module -.include <bsd.port.options.mk> - -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= vulnscan.info \ vulnscan.module \ scan.inc \ diff --git a/www/drupal7-wysiwyg/Makefile b/www/drupal7-wysiwyg/Makefile index 180db8d6730d..f41e3e7e0775 100644 --- a/www/drupal7-wysiwyg/Makefile +++ b/www/drupal7-wysiwyg/Makefile @@ -10,7 +10,7 @@ COMMENT= Allows implementation of WYSIWYG editors for editing Drupal content #LICENSE from bsd.drupal.mk -USE_DRUPAL= yes +USES= drupal:7,module OPTIONS_DEFINE= TINYMCE3 CKEDITOR YUI @@ -35,8 +35,6 @@ RUN_DEPENDS+= ${LOCALBASE}/www/yui:${PORTSDIR}/www/yahoo-ui 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 \ diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile index 121d7467c5e6..cf6c63d55c3d 100644 --- a/www/drupal7/Makefile +++ b/www/drupal7/Makefile @@ -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 @@ COMMENT= Database driven web content management system (CMS) 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,16 +64,12 @@ do-install: ${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} ${CP} ${WRKSRC}/xmlrpc.php ${STAGEDIR}${DRUPAL_DIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${DRUPAL_DIR} .include <bsd.port.mk> diff --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist index 5ef031a85654..3c58d1df95f8 100644 --- a/www/drupal7/pkg-plist +++ b/www/drupal7/pkg-plist @@ -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 |