Drupal 6.x branch:

Drupal is software that allows an individual or a community of users to easily
publish, manage and organize a great variety of content on a website. Tens of
thousands of people and organizations have used Drupal to set up scores of
different kinds of web sites, including

* community web portals and discussion sites
* corporate web sites/intranet portals
* personal web sites
* aficionado sites
* e-commerce applications
* resource directories

Drupal includes features to enable:

* content management systems
* blogs
* collaborative authoring environments
* forums
* newsletters
* picture galleries
* file uploads and download

7 files changed, 825 insertions, 0 deletions

diff --git a/www/drupal6/DESCR b/www/drupal6/DESCR
new file mode 100644
index 00000000000..ee5503c9d99
--- /dev/null
+++ b/www/drupal6/DESCR
@@ -0,0 +1,21 @@
+Drupal is software that allows an individual or a community of users to easily
+publish, manage and organize a great variety of content on a website. Tens of
+thousands of people and organizations have used Drupal to set up scores of
+different kinds of web sites, including
+
+* community web portals and discussion sites
+* corporate web sites/intranet portals
+* personal web sites
+* aficionado sites
+* e-commerce applications
+* resource directories
+
+Drupal includes features to enable:
+
+* content management systems
+* blogs
+* collaborative authoring environments
+* forums
+* newsletters
+* picture galleries
+* file uploads and download
diff --git a/www/drupal6/MESSAGE b/www/drupal6/MESSAGE
new file mode 100644
index 00000000000..e4fcd4ad501
--- /dev/null
+++ b/www/drupal6/MESSAGE
@@ -0,0 +1,16 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+
+To complete the setup you will need to read the INSTALL.txt in order
+to setup MySQL/PostgreSQL properly.
+
+You will need to make Drupal accessible through your HTTP server. If you
+are running Apache then you may add the following lines to httpd.conf:
+
+	Include ${PKG_SYSCONFDIR}/drupal.conf
+
+to make Drupal accessible through:
+
+	http://localhost/drupal/
+
+===========================================================================
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
new file mode 100644
index 00000000000..ac79751518c
--- /dev/null
+++ b/www/drupal6/Makefile
@@ -0,0 +1,107 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+
+DISTNAME=	drupal-6.1
+CATEGORIES=	www
+MASTER_SITES=	http://drupal.org/files/projects/
+
+MAINTAINER=	adrianp@NetBSD.org
+HOMEPAGE=	http://drupal.org/
+COMMENT=	Open source content management system
+
+CONFLICTS+=	drupal-5.*{,nb*}
+
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.5:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd
+
+NO_BUILD=	YES
+DRUPAL=		${PREFIX}/share/drupal
+PAX_DIRS=	includes misc modules scripts themes
+DOCS=		CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \
+		INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \
+		MAINTAINERS.txt UPGRADE.txt
+
+PKG_GROUPS_VARS+=	APACHE_GROUP
+PKG_USERS_VARS+=	APACHE_USER
+
+BUILD_DEFS+=		APACHE_USER APACHE_GROUP
+USE_TOOLS+=		perl:run
+REPLACE_PERL=		scripts/code-style.pl
+
+OWN_DIRS_PERMS+=	${DRUPAL}/sites/default \
+			${APACHE_USER} ${APACHE_GROUP} 0750
+OWN_DIRS_PERMS+=	${DRUPAL}/files \
+			${APACHE_USER} ${APACHE_GROUP} 0750
+
+CONF_FILES=	${PREFIX}/share/examples/drupal/drupal.conf \
+		${PKG_SYSCONFDIR}/drupal.conf
+CONF_FILES+=	${PREFIX}/share/examples/drupal/default.profile \
+		${DRUPAL}/profiles/default/default.profile
+
+CONF_FILES_PERMS+=	${PREFIX}/share/examples/drupal/default.settings.php \
+			${DRUPAL}/sites/default/default.settings.php \
+			${APACHE_USER} ${APACHE_GROUP} 0640
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-install
+SUBST_FILES.conf=	drupal.conf scripts/drupal.sh
+SUBST_SED.conf=		-e "s|@DRUPAL@|${DRUPAL}|g"
+SUBST_SED.conf+=	-e "s|/usr/bin/php|${PREFIX}/bin/php|g"
+SUBST_MESSAGE.conf=	Fixing configuration files.
+
+.include "../../mk/apachever.mk"
+.include "../../lang/php/phpversion.mk"
+
+.if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=	php>=4.3.5:../../www/php4
+.endif
+
+.if ${PKG_PHP_VERSION} == "5"
+DEPENDS+=	php>=5.2.0:../../lang/php5
+.endif
+
+.include "options.mk"
+
+OWN_DIRS=	share/drupal/sites/default
+OWN_DIRS+=	share/drupal/profiles
+OWN_DIRS+=	share/drupal/profiles/default
+
+post-extract:
+	${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
+
+do-install:
+	${INSTALL_DATA_DIR} ${DRUPAL}
+	${INSTALL_DATA_DIR} ${DRUPAL}/files
+#	${INSTALL_DATA_DIR} ${DRUPAL}/profiles
+#	${INSTALL_DATA_DIR} ${DRUPAL}/profiles/default
+	${INSTALL_DATA_DIR} ${DRUPAL}/sites
+	${INSTALL_DATA_DIR} ${DRUPAL}/sites/all
+#	${INSTALL_DATA_DIR} ${DRUPAL}/sites/default
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/drupal
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/drupal
+
+	${INSTALL_DATA} ${WRKSRC}/robots.txt ${DRUPAL}
+	${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt ${DRUPAL}/sites/all
+	${INSTALL_DATA} ${WRKSRC}/drupal.conf \
+		${PREFIX}/share/examples/drupal/drupal.conf
+	${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \
+		${PREFIX}/share/examples/drupal/default.settings.php
+	${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \
+		${PREFIX}/share/examples/drupal/default.profile
+	${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL}
+
+.	for i in ${PAX_DIRS}
+		cd ${WRKSRC}/${i} && ${PAX} -rw . ${DRUPAL}/${i}
+.	endfor
+
+.	for i in ${DOCS}
+		${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/drupal
+.	endfor
+
+	${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DRUPAL}/files
+	${CHMOD} 0770 ${DRUPAL}/files
+
+post-install:
+	${FIND} ${DRUPAL} -name \*.jpg | ${XARGS} ${CHMOD} 0644
+	${FIND} ${DRUPAL} -name \*.png | ${XARGS} ${CHMOD} 0644
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/drupal6/PLIST b/www/drupal6/PLIST
new file mode 100644
index 00000000000..1f15be917f6
--- /dev/null
+++ b/www/drupal6/PLIST
@@ -0,0 +1,522 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+share/doc/drupal/CHANGELOG.txt
+share/doc/drupal/COPYRIGHT.txt
+share/doc/drupal/INSTALL.mysql.txt
+share/doc/drupal/INSTALL.pgsql.txt
+share/doc/drupal/INSTALL.txt
+share/doc/drupal/LICENSE.txt
+share/doc/drupal/MAINTAINERS.txt
+share/doc/drupal/UPGRADE.txt
+share/drupal/cron.php
+share/drupal/includes/actions.inc
+share/drupal/includes/batch.inc
+share/drupal/includes/bootstrap.inc
+share/drupal/includes/cache-install.inc
+share/drupal/includes/cache.inc
+share/drupal/includes/common.inc
+share/drupal/includes/database.inc
+share/drupal/includes/database.mysql-common.inc
+share/drupal/includes/database.mysql.inc
+share/drupal/includes/database.mysqli.inc
+share/drupal/includes/database.pgsql.inc
+share/drupal/includes/file.inc
+share/drupal/includes/form.inc
+share/drupal/includes/image.gd.inc
+share/drupal/includes/image.inc
+share/drupal/includes/install.inc
+share/drupal/includes/install.mysql.inc
+share/drupal/includes/install.mysqli.inc
+share/drupal/includes/install.pgsql.inc
+share/drupal/includes/language.inc
+share/drupal/includes/locale.inc
+share/drupal/includes/mail.inc
+share/drupal/includes/menu.inc
+share/drupal/includes/module.inc
+share/drupal/includes/pager.inc
+share/drupal/includes/path.inc
+share/drupal/includes/session.inc
+share/drupal/includes/tablesort.inc
+share/drupal/includes/theme.inc
+share/drupal/includes/theme.maintenance.inc
+share/drupal/includes/unicode.inc
+share/drupal/includes/xmlrpc.inc
+share/drupal/includes/xmlrpcs.inc
+share/drupal/index.php
+share/drupal/install.php
+share/drupal/misc/ahah.js
+share/drupal/misc/arrow-asc.png
+share/drupal/misc/arrow-desc.png
+share/drupal/misc/autocomplete.js
+share/drupal/misc/batch.js
+share/drupal/misc/blog.png
+share/drupal/misc/collapse.js
+share/drupal/misc/draggable.png
+share/drupal/misc/drupal.js
+share/drupal/misc/druplicon.png
+share/drupal/misc/farbtastic/farbtastic.css
+share/drupal/misc/farbtastic/farbtastic.js
+share/drupal/misc/farbtastic/marker.png
+share/drupal/misc/farbtastic/mask.png
+share/drupal/misc/farbtastic/wheel.png
+share/drupal/misc/favicon.ico
+share/drupal/misc/feed.png
+share/drupal/misc/form.js
+share/drupal/misc/forum-closed.png
+share/drupal/misc/forum-default.png
+share/drupal/misc/forum-hot-new.png
+share/drupal/misc/forum-hot.png
+share/drupal/misc/forum-new.png
+share/drupal/misc/forum-sticky.png
+share/drupal/misc/grippie.png
+share/drupal/misc/jquery.form.js
+share/drupal/misc/jquery.js
+share/drupal/misc/menu-collapsed-rtl.png
+share/drupal/misc/menu-collapsed.png
+share/drupal/misc/menu-expanded.png
+share/drupal/misc/menu-leaf.png
+share/drupal/misc/powered-black-135x42.png
+share/drupal/misc/powered-black-80x15.png
+share/drupal/misc/powered-black-88x31.png
+share/drupal/misc/powered-blue-135x42.png
+share/drupal/misc/powered-blue-80x15.png
+share/drupal/misc/powered-blue-88x31.png
+share/drupal/misc/powered-gray-135x42.png
+share/drupal/misc/powered-gray-80x15.png
+share/drupal/misc/powered-gray-88x31.png
+share/drupal/misc/print-rtl.css
+share/drupal/misc/print.css
+share/drupal/misc/progress.gif
+share/drupal/misc/progress.js
+share/drupal/misc/tabledrag.js
+share/drupal/misc/tableheader.js
+share/drupal/misc/tableselect.js
+share/drupal/misc/teaser.js
+share/drupal/misc/textarea.js
+share/drupal/misc/throbber.gif
+share/drupal/misc/tree-bottom.png
+share/drupal/misc/tree.png
+share/drupal/misc/watchdog-error.png
+share/drupal/misc/watchdog-ok.png
+share/drupal/misc/watchdog-warning.png
+share/drupal/misc/xml.png
+share/drupal/modules/README.txt
+share/drupal/modules/aggregator/aggregator-feed-source.tpl.php
+share/drupal/modules/aggregator/aggregator-item.tpl.php
+share/drupal/modules/aggregator/aggregator-rtl.css
+share/drupal/modules/aggregator/aggregator-summary-item.tpl.php
+share/drupal/modules/aggregator/aggregator-summary-items.tpl.php
+share/drupal/modules/aggregator/aggregator-wrapper.tpl.php
+share/drupal/modules/aggregator/aggregator.admin.inc
+share/drupal/modules/aggregator/aggregator.css
+share/drupal/modules/aggregator/aggregator.info
+share/drupal/modules/aggregator/aggregator.install
+share/drupal/modules/aggregator/aggregator.module
+share/drupal/modules/aggregator/aggregator.pages.inc
+share/drupal/modules/block/block-admin-display-form.tpl.php
+share/drupal/modules/block/block.admin.inc
+share/drupal/modules/block/block.css
+share/drupal/modules/block/block.info
+share/drupal/modules/block/block.install
+share/drupal/modules/block/block.js
+share/drupal/modules/block/block.module
+share/drupal/modules/blog/blog.info
+share/drupal/modules/blog/blog.module
+share/drupal/modules/blog/blog.pages.inc
+share/drupal/modules/blogapi/blogapi.info
+share/drupal/modules/blogapi/blogapi.install
+share/drupal/modules/blogapi/blogapi.module
+share/drupal/modules/book/book-all-books-block.tpl.php
+share/drupal/modules/book/book-export-html.tpl.php
+share/drupal/modules/book/book-navigation.tpl.php
+share/drupal/modules/book/book-node-export-html.tpl.php
+share/drupal/modules/book/book-rtl.css
+share/drupal/modules/book/book.admin.inc
+share/drupal/modules/book/book.css
+share/drupal/modules/book/book.info
+share/drupal/modules/book/book.install
+share/drupal/modules/book/book.module
+share/drupal/modules/book/book.pages.inc
+share/drupal/modules/color/color-rtl.css
+share/drupal/modules/color/color.css
+share/drupal/modules/color/color.info
+share/drupal/modules/color/color.install
+share/drupal/modules/color/color.js
+share/drupal/modules/color/color.module
+share/drupal/modules/color/images/hook-rtl.png
+share/drupal/modules/color/images/hook.png
+share/drupal/modules/color/images/lock.png
+share/drupal/modules/comment/comment-folded.tpl.php
+share/drupal/modules/comment/comment-rtl.css
+share/drupal/modules/comment/comment-wrapper.tpl.php
+share/drupal/modules/comment/comment.admin.inc
+share/drupal/modules/comment/comment.css
+share/drupal/modules/comment/comment.info
+share/drupal/modules/comment/comment.install
+share/drupal/modules/comment/comment.js
+share/drupal/modules/comment/comment.module
+share/drupal/modules/comment/comment.pages.inc
+share/drupal/modules/comment/comment.tpl.php
+share/drupal/modules/contact/contact.admin.inc
+share/drupal/modules/contact/contact.info
+share/drupal/modules/contact/contact.install
+share/drupal/modules/contact/contact.module
+share/drupal/modules/contact/contact.pages.inc
+share/drupal/modules/dblog/dblog-rtl.css
+share/drupal/modules/dblog/dblog.admin.inc
+share/drupal/modules/dblog/dblog.css
+share/drupal/modules/dblog/dblog.info
+share/drupal/modules/dblog/dblog.install
+share/drupal/modules/dblog/dblog.module
+share/drupal/modules/filter/filter.admin.inc
+share/drupal/modules/filter/filter.info
+share/drupal/modules/filter/filter.install
+share/drupal/modules/filter/filter.module
+share/drupal/modules/filter/filter.pages.inc
+share/drupal/modules/forum/forum-icon.tpl.php
+share/drupal/modules/forum/forum-list.tpl.php
+share/drupal/modules/forum/forum-rtl.css
+share/drupal/modules/forum/forum-submitted.tpl.php
+share/drupal/modules/forum/forum-topic-list.tpl.php
+share/drupal/modules/forum/forum-topic-navigation.tpl.php
+share/drupal/modules/forum/forum.admin.inc
+share/drupal/modules/forum/forum.css
+share/drupal/modules/forum/forum.info
+share/drupal/modules/forum/forum.install
+share/drupal/modules/forum/forum.module
+share/drupal/modules/forum/forum.pages.inc
+share/drupal/modules/forum/forums.tpl.php
+share/drupal/modules/help/help-rtl.css
+share/drupal/modules/help/help.admin.inc
+share/drupal/modules/help/help.css
+share/drupal/modules/help/help.info
+share/drupal/modules/help/help.module
+share/drupal/modules/locale/locale.css
+share/drupal/modules/locale/locale.info
+share/drupal/modules/locale/locale.install
+share/drupal/modules/locale/locale.module
+share/drupal/modules/menu/menu.admin.inc
+share/drupal/modules/menu/menu.info
+share/drupal/modules/menu/menu.install
+share/drupal/modules/menu/menu.module
+share/drupal/modules/node/content_types.inc
+share/drupal/modules/node/node-rtl.css
+share/drupal/modules/node/node.admin.inc
+share/drupal/modules/node/node.css
+share/drupal/modules/node/node.info
+share/drupal/modules/node/node.install
+share/drupal/modules/node/node.module
+share/drupal/modules/node/node.pages.inc
+share/drupal/modules/node/node.tpl.php
+share/drupal/modules/openid/login-bg.png
+share/drupal/modules/openid/openid.css
+share/drupal/modules/openid/openid.inc
+share/drupal/modules/openid/openid.info
+share/drupal/modules/openid/openid.install
+share/drupal/modules/openid/openid.js
+share/drupal/modules/openid/openid.module
+share/drupal/modules/openid/openid.pages.inc
+share/drupal/modules/openid/xrds.inc
+share/drupal/modules/path/path.admin.inc
+share/drupal/modules/path/path.info
+share/drupal/modules/path/path.module
+share/drupal/modules/php/php.info
+share/drupal/modules/php/php.install
+share/drupal/modules/php/php.module
+share/drupal/modules/ping/ping.info
+share/drupal/modules/ping/ping.module
+share/drupal/modules/poll/poll-bar-block.tpl.php
+share/drupal/modules/poll/poll-bar.tpl.php
+share/drupal/modules/poll/poll-results-block.tpl.php
+share/drupal/modules/poll/poll-results.tpl.php
+share/drupal/modules/poll/poll-rtl.css
+share/drupal/modules/poll/poll-vote.tpl.php
+share/drupal/modules/poll/poll.css
+share/drupal/modules/poll/poll.info
+share/drupal/modules/poll/poll.install
+share/drupal/modules/poll/poll.module
+share/drupal/modules/poll/poll.pages.inc
+share/drupal/modules/profile/profile-block.tpl.php
+share/drupal/modules/profile/profile-listing.tpl.php
+share/drupal/modules/profile/profile-wrapper.tpl.php
+share/drupal/modules/profile/profile.admin.inc
+share/drupal/modules/profile/profile.css
+share/drupal/modules/profile/profile.info
+share/drupal/modules/profile/profile.install
+share/drupal/modules/profile/profile.js
+share/drupal/modules/profile/profile.module
+share/drupal/modules/profile/profile.pages.inc
+share/drupal/modules/search/search-block-form.tpl.php
+share/drupal/modules/search/search-result.tpl.php
+share/drupal/modules/search/search-results.tpl.php
+share/drupal/modules/search/search-rtl.css
+share/drupal/modules/search/search-theme-form.tpl.php
+share/drupal/modules/search/search.admin.inc
+share/drupal/modules/search/search.css
+share/drupal/modules/search/search.info
+share/drupal/modules/search/search.install
+share/drupal/modules/search/search.module
+share/drupal/modules/search/search.pages.inc
+share/drupal/modules/statistics/statistics.admin.inc
+share/drupal/modules/statistics/statistics.info
+share/drupal/modules/statistics/statistics.install
+share/drupal/modules/statistics/statistics.module
+share/drupal/modules/statistics/statistics.pages.inc
+share/drupal/modules/syslog/syslog.info
+share/drupal/modules/syslog/syslog.module
+share/drupal/modules/system/admin-rtl.css
+share/drupal/modules/system/admin.css
+share/drupal/modules/system/block.tpl.php
+share/drupal/modules/system/box.tpl.php
+share/drupal/modules/system/defaults-rtl.css
+share/drupal/modules/system/defaults.css
+share/drupal/modules/system/maintenance-page.tpl.php
+share/drupal/modules/system/maintenance.css
+share/drupal/modules/system/page.tpl.php
+share/drupal/modules/system/system-menus-rtl.css
+share/drupal/modules/system/system-menus.css
+share/drupal/modules/system/system-rtl.css
+share/drupal/modules/system/system.admin.inc
+share/drupal/modules/system/system.css
+share/drupal/modules/system/system.info
+share/drupal/modules/system/system.install
+share/drupal/modules/system/system.js
+share/drupal/modules/system/system.module
+share/drupal/modules/taxonomy/taxonomy.admin.inc
+share/drupal/modules/taxonomy/taxonomy.css
+share/drupal/modules/taxonomy/taxonomy.info
+share/drupal/modules/taxonomy/taxonomy.install
+share/drupal/modules/taxonomy/taxonomy.js
+share/drupal/modules/taxonomy/taxonomy.module
+share/drupal/modules/taxonomy/taxonomy.pages.inc
+share/drupal/modules/throttle/throttle.admin.inc
+share/drupal/modules/throttle/throttle.info
+share/drupal/modules/throttle/throttle.module
+share/drupal/modules/tracker/tracker.css
+share/drupal/modules/tracker/tracker.info
+share/drupal/modules/tracker/tracker.module
+share/drupal/modules/tracker/tracker.pages.inc
+share/drupal/modules/translation/translation.info
+share/drupal/modules/translation/translation.module
+share/drupal/modules/translation/translation.pages.inc
+share/drupal/modules/trigger/trigger.admin.inc
+share/drupal/modules/trigger/trigger.info
+share/drupal/modules/trigger/trigger.install
+share/drupal/modules/trigger/trigger.module
+share/drupal/modules/update/update-rtl.css
+share/drupal/modules/update/update.compare.inc
+share/drupal/modules/update/update.css
+share/drupal/modules/update/update.fetch.inc
+share/drupal/modules/update/update.info
+share/drupal/modules/update/update.install
+share/drupal/modules/update/update.module
+share/drupal/modules/update/update.report.inc
+share/drupal/modules/update/update.settings.inc
+share/drupal/modules/upload/upload.admin.inc
+share/drupal/modules/upload/upload.info
+share/drupal/modules/upload/upload.install
+share/drupal/modules/upload/upload.module
+share/drupal/modules/user/user-picture.tpl.php
+share/drupal/modules/user/user-profile-category.tpl.php
+share/drupal/modules/user/user-profile-item.tpl.php
+share/drupal/modules/user/user-profile.tpl.php
+share/drupal/modules/user/user-rtl.css
+share/drupal/modules/user/user.admin.inc
+share/drupal/modules/user/user.css
+share/drupal/modules/user/user.info
+share/drupal/modules/user/user.install
+share/drupal/modules/user/user.js
+share/drupal/modules/user/user.module
+share/drupal/modules/user/user.pages.inc
+share/drupal/robots.txt
+share/drupal/scripts/code-clean.sh
+share/drupal/scripts/code-style.pl
+share/drupal/scripts/cron-curl.sh
+share/drupal/scripts/cron-lynx.sh
+share/drupal/scripts/drupal.sh
+share/drupal/sites/all/README.txt
+share/drupal/themes/README.txt
+share/drupal/themes/bluemarine/block.tpl.php
+share/drupal/themes/bluemarine/bluemarine.info
+share/drupal/themes/bluemarine/box.tpl.php
+share/drupal/themes/bluemarine/comment.tpl.php
+share/drupal/themes/bluemarine/logo.png
+share/drupal/themes/bluemarine/node.tpl.php
+share/drupal/themes/bluemarine/page.tpl.php
+share/drupal/themes/bluemarine/screenshot.png
+share/drupal/themes/bluemarine/style-rtl.css
+share/drupal/themes/bluemarine/style.css
+share/drupal/themes/chameleon/background.png
+share/drupal/themes/chameleon/chameleon.info
+share/drupal/themes/chameleon/chameleon.theme
+share/drupal/themes/chameleon/common-rtl.css
+share/drupal/themes/chameleon/common.css
+share/drupal/themes/chameleon/logo.png
+share/drupal/themes/chameleon/marvin/bullet.png
+share/drupal/themes/chameleon/marvin/druplicon-watermark-rtl.png
+share/drupal/themes/chameleon/marvin/druplicon-watermark.png
+share/drupal/themes/chameleon/marvin/logo.png
+share/drupal/themes/chameleon/marvin/marvin.info
+share/drupal/themes/chameleon/marvin/screenshot.png
+share/drupal/themes/chameleon/marvin/style-rtl.css
+share/drupal/themes/chameleon/marvin/style.css
+share/drupal/themes/chameleon/screenshot.png
+share/drupal/themes/chameleon/style-rtl.css
+share/drupal/themes/chameleon/style.css
+share/drupal/themes/engines/phptemplate/phptemplate.engine
+share/drupal/themes/garland/block.tpl.php
+share/drupal/themes/garland/color/base.png
+share/drupal/themes/garland/color/color.inc
+share/drupal/themes/garland/color/preview.css
+share/drupal/themes/garland/color/preview.png
+share/drupal/themes/garland/comment.tpl.php
+share/drupal/themes/garland/fix-ie-rtl.css
+share/drupal/themes/garland/fix-ie.css
+share/drupal/themes/garland/garland.info
+share/drupal/themes/garland/images/bg-bar-white.png
+share/drupal/themes/garland/images/bg-bar.png
+share/drupal/themes/garland/images/bg-content-left.png
+share/drupal/themes/garland/images/bg-content-right.png
+share/drupal/themes/garland/images/bg-content.png
+share/drupal/themes/garland/images/bg-navigation-item-hover.png
+share/drupal/themes/garland/images/bg-navigation-item.png
+share/drupal/themes/garland/images/bg-navigation.png
+share/drupal/themes/garland/images/bg-tab.png
+share/drupal/themes/garland/images/body.png
+share/drupal/themes/garland/images/gradient-inner.png
+share/drupal/themes/garland/images/menu-collapsed-rtl.gif
+share/drupal/themes/garland/images/menu-collapsed.gif
+share/drupal/themes/garland/images/menu-expanded.gif
+share/drupal/themes/garland/images/menu-leaf.gif
+share/drupal/themes/garland/images/task-list.png
+share/drupal/themes/garland/logo.png
+share/drupal/themes/garland/maintenance-page.tpl.php
+share/drupal/themes/garland/minnelli/color/base.png
+share/drupal/themes/garland/minnelli/color/color.inc
+share/drupal/themes/garland/minnelli/color/preview.png
+share/drupal/themes/garland/minnelli/logo.png
+share/drupal/themes/garland/minnelli/minnelli.css
+share/drupal/themes/garland/minnelli/minnelli.info
+share/drupal/themes/garland/minnelli/screenshot.png
+share/drupal/themes/garland/node.tpl.php
+share/drupal/themes/garland/page.tpl.php
+share/drupal/themes/garland/print.css
+share/drupal/themes/garland/screenshot.png
+share/drupal/themes/garland/style-rtl.css
+share/drupal/themes/garland/style.css
+share/drupal/themes/garland/template.php
+share/drupal/themes/pushbutton/arrow-next-hover-rtl.png
+share/drupal/themes/pushbutton/arrow-next-hover.png
+share/drupal/themes/pushbutton/arrow-next-rtl.png
+share/drupal/themes/pushbutton/arrow-next-visited-rtl.png
+share/drupal/themes/pushbutton/arrow-next-visited.png
+share/drupal/themes/pushbutton/arrow-next.png
+share/drupal/themes/pushbutton/arrow-prev-hover-rtl.png
+share/drupal/themes/pushbutton/arrow-prev-hover.png
+share/drupal/themes/pushbutton/arrow-prev-rtl.png
+share/drupal/themes/pushbutton/arrow-prev-visited-rtl.png
+share/drupal/themes/pushbutton/arrow-prev-visited.png
+share/drupal/themes/pushbutton/arrow-prev.png
+share/drupal/themes/pushbutton/arrow-up-hover.png
+share/drupal/themes/pushbutton/arrow-up-visited.png
+share/drupal/themes/pushbutton/arrow-up.png
+share/drupal/themes/pushbutton/background.png
+share/drupal/themes/pushbutton/block.tpl.php
+share/drupal/themes/pushbutton/box.tpl.php
+share/drupal/themes/pushbutton/comment.tpl.php
+share/drupal/themes/pushbutton/forum-container-rtl.jpg
+share/drupal/themes/pushbutton/forum-container.jpg
+share/drupal/themes/pushbutton/forum-link-rtl.png
+share/drupal/themes/pushbutton/forum-link.png
+share/drupal/themes/pushbutton/header-a.jpg
+share/drupal/themes/pushbutton/header-b-rtl.jpg
+share/drupal/themes/pushbutton/header-b.jpg
+share/drupal/themes/pushbutton/header-c.png
+share/drupal/themes/pushbutton/icon-block-rtl.png
+share/drupal/themes/pushbutton/icon-block.png
+share/drupal/themes/pushbutton/icon-comment-rtl.png
+share/drupal/themes/pushbutton/icon-comment.png
+share/drupal/themes/pushbutton/logo-active-rtl.jpg
+share/drupal/themes/pushbutton/logo-active.jpg
+share/drupal/themes/pushbutton/logo-background-rtl.jpg
+share/drupal/themes/pushbutton/logo-background.jpg
+share/drupal/themes/pushbutton/logo-hover-rtl.jpg
+share/drupal/themes/pushbutton/logo-hover.jpg
+share/drupal/themes/pushbutton/logo.png
+share/drupal/themes/pushbutton/node.tpl.php
+share/drupal/themes/pushbutton/page.tpl.php
+share/drupal/themes/pushbutton/pushbutton.info
+share/drupal/themes/pushbutton/screenshot.png
+share/drupal/themes/pushbutton/style-rtl.css
+share/drupal/themes/pushbutton/style.css
+share/drupal/themes/pushbutton/tabs-off-rtl.png
+share/drupal/themes/pushbutton/tabs-off.png
+share/drupal/themes/pushbutton/tabs-on-rtl.png
+share/drupal/themes/pushbutton/tabs-on.png
+share/drupal/themes/pushbutton/tabs-option-hover-rtl.png
+share/drupal/themes/pushbutton/tabs-option-hover.png
+share/drupal/themes/pushbutton/tabs-option-off-rtl.png
+share/drupal/themes/pushbutton/tabs-option-off.png
+share/drupal/themes/pushbutton/tabs-option-on.png
+share/drupal/update.php
+share/drupal/xmlrpc.php
+share/examples/drupal/default.profile
+share/examples/drupal/default.settings.php
+share/examples/drupal/drupal.conf
+@dirrm share/examples/drupal
+@dirrm share/drupal/themes/pushbutton
+@dirrm share/drupal/themes/garland/minnelli/color
+@dirrm share/drupal/themes/garland/minnelli
+@dirrm share/drupal/themes/garland/images
+@dirrm share/drupal/themes/garland/color
+@dirrm share/drupal/themes/garland
+@dirrm share/drupal/themes/engines/phptemplate
+@dirrm share/drupal/themes/engines
+@dirrm share/drupal/themes/chameleon/marvin
+@dirrm share/drupal/themes/chameleon
+@dirrm share/drupal/themes/bluemarine
+@dirrm share/drupal/themes
+@dirrm share/drupal/sites/all
+@dirrm share/drupal/sites
+@dirrm share/drupal/scripts
+@dirrm share/drupal/modules/user
+@dirrm share/drupal/modules/upload
+@dirrm share/drupal/modules/update
+@dirrm share/drupal/modules/trigger
+@dirrm share/drupal/modules/translation
+@dirrm share/drupal/modules/tracker
+@dirrm share/drupal/modules/throttle
+@dirrm share/drupal/modules/taxonomy
+@dirrm share/drupal/modules/system
+@dirrm share/drupal/modules/syslog
+@dirrm share/drupal/modules/statistics
+@dirrm share/drupal/modules/search
+@dirrm share/drupal/modules/profile
+@dirrm share/drupal/modules/poll
+@dirrm share/drupal/modules/ping
+@dirrm share/drupal/modules/php
+@dirrm share/drupal/modules/path
+@dirrm share/drupal/modules/openid
+@dirrm share/drupal/modules/node
+@dirrm share/drupal/modules/menu
+@dirrm share/drupal/modules/locale
+@dirrm share/drupal/modules/help
+@dirrm share/drupal/modules/forum
+@dirrm share/drupal/modules/filter
+@dirrm share/drupal/modules/dblog
+@dirrm share/drupal/modules/contact
+@dirrm share/drupal/modules/comment
+@dirrm share/drupal/modules/color/images
+@dirrm share/drupal/modules/color
+@dirrm share/drupal/modules/book
+@dirrm share/drupal/modules/blogapi
+@dirrm share/drupal/modules/blog
+@dirrm share/drupal/modules/block
+@dirrm share/drupal/modules/aggregator
+@dirrm share/drupal/modules
+@dirrm share/drupal/misc/farbtastic
+@dirrm share/drupal/misc
+@dirrm share/drupal/includes
+@exec ${MKDIR} %D/share/drupal/files
+@unexec ${RMDIR} %D/share/drupal/files 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/drupal 2>/dev/null || ${TRUE}
+@dirrm share/doc/drupal
diff --git a/www/drupal6/distinfo b/www/drupal6/distinfo
new file mode 100644
index 00000000000..dd2c2c7edd3
--- /dev/null
+++ b/www/drupal6/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+
+SHA1 (drupal-6.1.tar.gz) = 81faeb3beecaa8cc4ee1f441d40a283268e150eb
+RMD160 (drupal-6.1.tar.gz) = cbc8a6f022c713b899d804abb55bbd37daee3c48
+Size (drupal-6.1.tar.gz) = 1057213 bytes
diff --git a/www/drupal6/files/drupal.conf b/www/drupal6/files/drupal.conf
new file mode 100644
index 00000000000..521fe231f3f
--- /dev/null
+++ b/www/drupal6/files/drupal.conf
@@ -0,0 +1,117 @@
+# $NetBSD: drupal.conf,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+#
+# Drupal configuration file fragment for Apache
+
+#
+# Apache/PHP/Drupal settings:
+#
+
+<IfModule mod_alias.c>
+	Alias /drupal/ "@DRUPAL@/"
+</IfModule>
+
+<Directory "@DRUPAL@">
+AllowOverride Limit Options FileInfo
+Order allow,deny
+Allow from all
+
+# Protect files and directories from prying eyes.
+<FilesMatch "\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template)$">
+  Order allow,deny
+</FilesMatch>
+
+# Don't show directory listings for URLs which map to a directory.
+Options -Indexes
+
+# Follow symbolic links in this directory.
+Options +FollowSymLinks
+
+# Customized error messages.
+ErrorDocument 404 /index.php
+
+# Set the default handler.
+DirectoryIndex index.php
+
+# Override PHP settings. More in sites/default/settings.php
+# but the following cannot be changed at runtime.
+php_value memory_limit 16M
+
+# PHP 4, Apache 1.
+<IfModule mod_php4.c>
+  php_value magic_quotes_gpc                0
+  php_value register_globals                0
+  php_value session.auto_start              0
+  php_value mbstring.http_input             pass
+  php_value mbstring.http_output            pass
+  php_value mbstring.encoding_translation   0
+</IfModule>
+
+# PHP 4, Apache 2.
+<IfModule sapi_apache2.c>
+  php_value magic_quotes_gpc                0
+  php_value register_globals                0
+  php_value session.auto_start              0
+  php_value mbstring.http_input             pass
+  php_value mbstring.http_output            pass
+  php_value mbstring.encoding_translation   0
+</IfModule>
+
+# PHP 5, Apache 1 and 2.
+<IfModule mod_php5.c>
+  php_value magic_quotes_gpc                0
+  php_value register_globals                0
+  php_value session.auto_start              0
+  php_value mbstring.http_input             pass
+  php_value mbstring.http_output            pass
+  php_value mbstring.encoding_translation   0
+</IfModule>
+
+# Requires mod_expires to be enabled.
+<IfModule mod_expires.c>
+  # Enable expirations.
+  ExpiresActive On
+
+  # Cache all files for 2 weeks after access (A).
+  ExpiresDefault A1209600
+
+  # Do not cache dynamically generated pages.
+  ExpiresByType text/html A1
+</IfModule>
+
+# Various rewrite rules.
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+
+  # If your site can be accessed both with and without the 'www.' prefix, you
+  # can use one of the following settings to redirect users to your preferred
+  # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option:
+  #
+  # To redirect all users to access the site WITH the 'www.' prefix,
+  # (http://example.com/... will be redirected to http://www.example.com/...)
+  # adapt and uncomment the following:
+  # RewriteCond %{HTTP_HOST} ^example\.com$ [NC]
+  # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301]
+  #
+  # To redirect all users to access the site WITHOUT the 'www.' prefix,
+  # (http://www.example.com/... will be redirected to http://example.com/...)
+  # uncomment and adapt the following:
+  # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC]
+  # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301]
+
+  # Modify the RewriteBase if you are using Drupal in a subdirectory or in a
+  # VirtualDocumentRoot and the rewrite rules are not working properly.
+  # For example if your site is at http://example.com/drupal uncomment and
+  # modify the following line:
+  # RewriteBase /drupal
+  #
+  # If your site is running in a VirtualDocumentRoot at http://example.com/,
+  # uncomment the following line:
+  # RewriteBase /
+
+  # Rewrite URLs of the form 'index.php?q=x'.
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
+</IfModule>
+
+</Directory>
diff --git a/www/drupal6/options.mk b/www/drupal6/options.mk
new file mode 100644
index 00000000000..b126e2f6ab5
--- /dev/null
+++ b/www/drupal6/options.mk
@@ -0,0 +1,37 @@
+# $NetBSD: options.mk,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
+
+PKG_OPTIONS_REQUIRED_GROUPS=	db
+PKG_OPTIONS_GROUP.db=		mysql pgsql
+
+PKG_SUPPORTED_OPTIONS=	drupal-xmlservices
+PKG_SUGGESTED_OPTIONS=	mysql drupal-xmlservices
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Use PostgreSQL for storing Drupal data
+###
+.if !empty(PKG_OPTIONS:Mpgsql)
+.	include "../../mk/pgsql.buildlink3.mk"
+DEPENDS+=	${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql
+.elif !empty(PKG_OPTIONS:Mmysql)
+###
+### Use MySQL for storing Drupal data
+###
+.	include "../../mk/mysql.buildlink3.mk"
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
+.endif
+
+###
+### Enable XML-based services such as the Blogger API, Jabber and RSS
+### syndication.
+###
+.if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
+.	if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=	${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml
+.	elif ${PKG_PHP_VERSION} == "5"
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
+.	endif
+.endif