From owner-svn-ports-all@FreeBSD.ORG Wed Jun 18 12:17:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32EE7141; Wed, 18 Jun 2014 12:17:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 138A32A74; Wed, 18 Jun 2014 12:17:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5ICHYiJ023764; Wed, 18 Jun 2014 12:17:34 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5ICHRkF023723; Wed, 18 Jun 2014 12:17:27 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406181217.s5ICHRkF023723@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 18 Jun 2014 12:17:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358250 - in head/www: drupal6 drupal6-advanced_help drupal6-cck drupal6-chaos drupal6-ckeditor drupal6-content_access drupal6-geshifilter drupal6-google_analytics drupal6-image drupal6... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2014 12:17:34 -0000 Author: bapt Date: Wed Jun 18 12:17:26 2014 New Revision: 358250 URL: http://svnweb.freebsd.org/changeset/ports/358250 QAT: https://qat.redports.org/buildarchive/r358250/ Log: Migrate all drupal ports to USES=drupal Modified: head/www/drupal6-advanced_help/Makefile head/www/drupal6-cck/Makefile head/www/drupal6-chaos/Makefile head/www/drupal6-ckeditor/Makefile head/www/drupal6-content_access/Makefile head/www/drupal6-geshifilter/Makefile head/www/drupal6-google_analytics/Makefile head/www/drupal6-image/Makefile head/www/drupal6-imce/Makefile head/www/drupal6-menu_block/Makefile head/www/drupal6-mimedetect/Makefile head/www/drupal6-nice_menus/Makefile head/www/drupal6-nodewords/Makefile head/www/drupal6-page_title/Makefile head/www/drupal6-panels/Makefile head/www/drupal6-path_redirect/Makefile head/www/drupal6-pathauto/Makefile head/www/drupal6-print/Makefile head/www/drupal6-seo_checklist/Makefile head/www/drupal6-services/Makefile head/www/drupal6-tagadelic/Makefile head/www/drupal6-token/Makefile head/www/drupal6-views/Makefile head/www/drupal6-webform/Makefile head/www/drupal6-wysiwyg/Makefile head/www/drupal6-zeropoint/Makefile head/www/drupal6/Makefile head/www/drupal6/pkg-plist head/www/drupal7-jailadmin/Makefile head/www/drupal7-vulnscan/Makefile head/www/drupal7-wysiwyg/Makefile head/www/drupal7/Makefile head/www/drupal7/pkg-plist Modified: head/www/drupal6-advanced_help/Makefile ============================================================================== --- head/www/drupal6-advanced_help/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-advanced_help/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 Modified: head/www/drupal6-cck/Makefile ============================================================================== --- head/www/drupal6-cck/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-cck/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 \ Modified: head/www/drupal6-chaos/Makefile ============================================================================== --- head/www/drupal6-chaos/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-chaos/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 \ Modified: head/www/drupal6-ckeditor/Makefile ============================================================================== --- head/www/drupal6-ckeditor/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-ckeditor/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 ckedito 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 Modified: head/www/drupal6-content_access/Makefile ============================================================================== --- head/www/drupal6-content_access/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-content_access/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -9,8 +9,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 Modified: head/www/drupal6-geshifilter/Makefile ============================================================================== --- head/www/drupal6-geshifilter/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-geshifilter/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -14,9 +14,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/php/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 \ Modified: head/www/drupal6-google_analytics/Makefile ============================================================================== --- head/www/drupal6-google_analytics/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-google_analytics/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 Modified: head/www/drupal6-image/Makefile ============================================================================== --- head/www/drupal6-image/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-image/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -9,8 +9,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 \ Modified: head/www/drupal6-imce/Makefile ============================================================================== --- head/www/drupal6-imce/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-imce/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 Modified: head/www/drupal6-menu_block/Makefile ============================================================================== --- head/www/drupal6-menu_block/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-menu_block/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-mimedetect/Makefile ============================================================================== --- head/www/drupal6-mimedetect/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-mimedetect/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -9,8 +9,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 Modified: head/www/drupal6-nice_menus/Makefile ============================================================================== --- head/www/drupal6-nice_menus/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-nice_menus/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-nodewords/Makefile ============================================================================== --- head/www/drupal6-nodewords/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-nodewords/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-page_title/Makefile ============================================================================== --- head/www/drupal6-page_title/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-page_title/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ COMMENT= Drupal module to provide fine-g 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 \ Modified: head/www/drupal6-panels/Makefile ============================================================================== --- head/www/drupal6-panels/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-panels/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 \ Modified: head/www/drupal6-path_redirect/Makefile ============================================================================== --- head/www/drupal6-path_redirect/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-path_redirect/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-pathauto/Makefile ============================================================================== --- head/www/drupal6-pathauto/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-pathauto/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ COMMENT= Automatically generates URLs fo 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 Modified: head/www/drupal6-print/Makefile ============================================================================== --- head/www/drupal6-print/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-print/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 \ Modified: head/www/drupal6-seo_checklist/Makefile ============================================================================== --- head/www/drupal6-seo_checklist/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-seo_checklist/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 Modified: head/www/drupal6-services/Makefile ============================================================================== --- head/www/drupal6-services/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-services/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-tagadelic/Makefile ============================================================================== --- head/www/drupal6-tagadelic/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-tagadelic/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,8 +10,7 @@ MASTER_SITES= http://ftp.drupal.org/file 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 \ Modified: head/www/drupal6-token/Makefile ============================================================================== --- head/www/drupal6-token/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-token/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-views/Makefile ============================================================================== --- head/www/drupal6-views/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-views/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-webform/Makefile ============================================================================== --- head/www/drupal6-webform/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-webform/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 \ Modified: head/www/drupal6-wysiwyg/Makefile ============================================================================== --- head/www/drupal6-wysiwyg/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-wysiwyg/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -16,8 +16,7 @@ RUN_DEPENDS+= ${LOCALBASE}/${TINYMCEDIR} 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 \ Modified: head/www/drupal6-zeropoint/Makefile ============================================================================== --- head/www/drupal6-zeropoint/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6-zeropoint/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 Modified: head/www/drupal6/Makefile ============================================================================== --- head/www/drupal6/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 Modified: head/www/drupal6/pkg-plist ============================================================================== --- head/www/drupal6/pkg-plist Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal6/pkg-plist Wed Jun 18 12:17:26 2014 (r358250) @@ -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 Modified: head/www/drupal7-jailadmin/Makefile ============================================================================== --- head/www/drupal7-jailadmin/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal7-jailadmin/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 - -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= README \ jailadmin.admin.inc \ jailadmin.drush.inc \ Modified: head/www/drupal7-vulnscan/Makefile ============================================================================== --- head/www/drupal7-vulnscan/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal7-vulnscan/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -11,12 +11,8 @@ COMMENT= Drupal 7 module frontend for Sk LICENSE= BSD -USE_DRUPAL= yes +USES= drupal:7,module -.include - -DRUPAL_MODULE= yes -DRUPAL_VERSION= 7 MODULE_FILES= vulnscan.info \ vulnscan.module \ scan.inc \ Modified: head/www/drupal7-wysiwyg/Makefile ============================================================================== --- head/www/drupal7-wysiwyg/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal7-wysiwyg/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -10,7 +10,7 @@ COMMENT= Allows implementation of WYSIWY #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:${POR 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 \ Modified: head/www/drupal7/Makefile ============================================================================== --- head/www/drupal7/Makefile Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal7/Makefile Wed Jun 18 12:17:26 2014 (r358250) @@ -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 man 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 Modified: head/www/drupal7/pkg-plist ============================================================================== --- head/www/drupal7/pkg-plist Wed Jun 18 12:16:43 2014 (r358249) +++ head/www/drupal7/pkg-plist Wed Jun 18 12:17:26 2014 (r358250) @@ -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