3 files changed, 53 insertions, 42 deletions

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index c277a42ae62d..cd113b43402d 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	drupal
-PORTVERSION=	4.3.2
+PORTVERSION=	4.4.0
 CATEGORIES=	www
-MASTER_SITES=	http://drupal.org/drupal/${PORTVERSION}/drupal/
+MASTER_SITES=	http://drupal.org/drupal/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	esn@x123.info
 COMMENT=	CMS that supports pgsql and mysql
 
-RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-
-BROKEN=		"Checksum mismatch"
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
 NO_BUILD=	yes
 DRUPDIR=	www/data/drupal
-DOCS=		CHANGELOG INSTALL LICENSE MAINTAINERS
+DOCS=		CHANGELOG.txt INSTALL.txt LICENSE.txt MAINTAINERS.txt
 
 do-install:
 
@@ -28,7 +27,6 @@ do-install:
 	${CP} ${WRKSRC}/.htaccess ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/cron.php ${PREFIX}/${DRUPDIR}
 	${CP} -R ${WRKSRC}/database ${PREFIX}/${DRUPDIR}
-	${CP} ${WRKSRC}/error.php ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/favicon.ico ${PREFIX}/${DRUPDIR}
 	${CP} -R ${WRKSRC}/includes ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/index.php ${PREFIX}/${DRUPDIR}
@@ -45,7 +43,7 @@ do-install:
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DRUPDIR}
 
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " You now need to create the database"
+	@${ECHO_MSG} " You now need to create the DB"
 	@${ECHO_MSG} " where Drupal is going to live"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " PostgreSQL::"
diff --git a/www/drupal/distinfo b/www/drupal/distinfo
index 9b6676515700..b78ee9033cf9 100644
--- a/www/drupal/distinfo
+++ b/www/drupal/distinfo
@@ -1 +1,2 @@
-MD5 (drupal-4.3.2.tar.gz) = 14837a171d0d92c623f87f7678f2f0ff
+MD5 (drupal-4.4.0.tgz) = 2cbcd37a1cb94f50ff73a229407453da
+SIZE (drupal-4.4.0.tgz) = 439895
diff --git a/www/drupal/pkg-plist b/www/drupal/pkg-plist
index ef23a64d090a..658530278d2a 100644
--- a/www/drupal/pkg-plist
+++ b/www/drupal/pkg-plist
@@ -1,22 +1,24 @@
 www/data/drupal/.htaccess
 www/data/drupal/cron.php
-www/data/drupal/database/database.mssql
 www/data/drupal/database/database.mysql
 www/data/drupal/database/database.pgsql
-www/data/drupal/doc/CHANGELOG
-www/data/drupal/doc/INSTALL
-www/data/drupal/doc/LICENSE
-www/data/drupal/doc/MAINTAINERS
-www/data/drupal/error.php
+www/data/drupal/database/updates.inc
+www/data/drupal/doc/CHANGELOG.txt
+www/data/drupal/doc/INSTALL.txt
+www/data/drupal/doc/LICENSE.txt
+www/data/drupal/doc/MAINTAINERS.txt
 www/data/drupal/favicon.ico
+www/data/drupal/includes/bootstrap.inc
 www/data/drupal/includes/common.inc
 www/data/drupal/includes/conf.php
 www/data/drupal/includes/database.inc
 www/data/drupal/includes/database.mysql.inc
 www/data/drupal/includes/database.pear.inc
+www/data/drupal/includes/file.inc
 www/data/drupal/includes/menu.inc
 www/data/drupal/includes/module.inc
 www/data/drupal/includes/pager.inc
+www/data/drupal/includes/session.inc
 www/data/drupal/includes/tablesort.inc
 www/data/drupal/includes/theme.inc
 www/data/drupal/includes/xmlrpc.inc
@@ -35,7 +37,6 @@ www/data/drupal/misc/forum-default.gif
 www/data/drupal/misc/forum-hot-new.gif
 www/data/drupal/misc/forum-hot.gif
 www/data/drupal/misc/forum-new.gif
-www/data/drupal/misc/linux-font-test.html
 www/data/drupal/misc/menu-collapsed.gif
 www/data/drupal/misc/menu-expanded.gif
 www/data/drupal/misc/menu-leaf.gif
@@ -45,18 +46,17 @@ www/data/drupal/misc/powered-by-drupal.png
 www/data/drupal/misc/print.css
 www/data/drupal/misc/xml.gif
 www/data/drupal/modules/admin.module
+www/data/drupal/modules/aggregator.module
 www/data/drupal/modules/archive.module
 www/data/drupal/modules/block.module
 www/data/drupal/modules/blog.module
-www/data/drupal/modules/bloggerapi.module
+www/data/drupal/modules/blogapi.module
 www/data/drupal/modules/book.module
-www/data/drupal/modules/cloud.module
 www/data/drupal/modules/comment.module
 www/data/drupal/modules/drupal.module
+www/data/drupal/modules/filter.module
 www/data/drupal/modules/forum.module
 www/data/drupal/modules/help.module
-www/data/drupal/modules/import.module
-www/data/drupal/modules/jabber.module
 www/data/drupal/modules/locale.module
 www/data/drupal/modules/node.module
 www/data/drupal/modules/page.module
@@ -76,37 +76,49 @@ www/data/drupal/modules/tracker.module
 www/data/drupal/modules/user.module
 www/data/drupal/modules/watchdog.module
 www/data/drupal/scripts/code-clean.sh
-www/data/drupal/scripts/code-size.sh
 www/data/drupal/scripts/code-style.pl
 www/data/drupal/scripts/cron-lynx.sh
-www/data/drupal/scripts/cvs-build.sh
-www/data/drupal/scripts/cvs-pass.pl
-www/data/drupal/scripts/mail-to-sql.php
+www/data/drupal/themes/chameleon/chameleon.theme
+www/data/drupal/themes/chameleon/common.css
+www/data/drupal/themes/chameleon/marvin/bullet.png
+www/data/drupal/themes/chameleon/marvin/chameleon.css
+www/data/drupal/themes/chameleon/marvin/druplicon-watermark.png
+www/data/drupal/themes/chameleon/pure/background.gif
+www/data/drupal/themes/chameleon/pure/chameleon.css
 www/data/drupal/themes/example/example.theme
-www/data/drupal/themes/marvin/images/drop.gif
-www/data/drupal/themes/marvin/images/logo.png
-www/data/drupal/themes/marvin/images/pixel.gif
-www/data/drupal/themes/marvin/marvin.css
-www/data/drupal/themes/marvin/marvin.theme
-www/data/drupal/themes/unconed/images/icon.gif
-www/data/drupal/themes/unconed/images/logo.png
-www/data/drupal/themes/unconed/images/null.gif
-www/data/drupal/themes/unconed/unconed.css
-www/data/drupal/themes/unconed/unconed.theme
-www/data/drupal/themes/xtemplate/images/druplicon.gif
-www/data/drupal/themes/xtemplate/xtemplate.css
+www/data/drupal/themes/xtemplate/default/logo.gif
+www/data/drupal/themes/xtemplate/default/xtemplate.css
+www/data/drupal/themes/xtemplate/default/xtemplate.xtmpl
+www/data/drupal/themes/xtemplate/pushbutton/arrow-next-hover.gif
+www/data/drupal/themes/xtemplate/pushbutton/arrow-next.gif
+www/data/drupal/themes/xtemplate/pushbutton/arrow-prev-hover.gif
+www/data/drupal/themes/xtemplate/pushbutton/arrow-prev.gif
+www/data/drupal/themes/xtemplate/pushbutton/arrow-up-hover.gif
+www/data/drupal/themes/xtemplate/pushbutton/arrow-up.gif
+www/data/drupal/themes/xtemplate/pushbutton/background.gif
+www/data/drupal/themes/xtemplate/pushbutton/forum-container.jpg
+www/data/drupal/themes/xtemplate/pushbutton/forum-link.gif
+www/data/drupal/themes/xtemplate/pushbutton/header-a.jpg
+www/data/drupal/themes/xtemplate/pushbutton/header-b.jpg
+www/data/drupal/themes/xtemplate/pushbutton/icon-block.gif
+www/data/drupal/themes/xtemplate/pushbutton/icon-comment.gif
+www/data/drupal/themes/xtemplate/pushbutton/logo-active.jpg
+www/data/drupal/themes/xtemplate/pushbutton/logo-background.jpg
+www/data/drupal/themes/xtemplate/pushbutton/logo-hover.jpg
+www/data/drupal/themes/xtemplate/pushbutton/logo.gif
+www/data/drupal/themes/xtemplate/pushbutton/xtemplate.css
+www/data/drupal/themes/xtemplate/pushbutton/xtemplate.xtmpl
 www/data/drupal/themes/xtemplate/xtemplate.inc
 www/data/drupal/themes/xtemplate/xtemplate.theme
-www/data/drupal/themes/xtemplate/xtemplate.xtmpl
 www/data/drupal/update.php
 www/data/drupal/xmlrpc.php
-@dirrm www/data/drupal/themes/xtemplate/images
+@dirrm www/data/drupal/themes/xtemplate/pushbutton
+@dirrm www/data/drupal/themes/xtemplate/default
 @dirrm www/data/drupal/themes/xtemplate
-@dirrm www/data/drupal/themes/unconed/images
-@dirrm www/data/drupal/themes/unconed
-@dirrm www/data/drupal/themes/marvin/images
-@dirrm www/data/drupal/themes/marvin
 @dirrm www/data/drupal/themes/example
+@dirrm www/data/drupal/themes/chameleon/pure
+@dirrm www/data/drupal/themes/chameleon/marvin
+@dirrm www/data/drupal/themes/chameleon
 @dirrm www/data/drupal/themes
 @dirrm www/data/drupal/scripts
 @dirrm www/data/drupal/modules