1 files changed, 28 insertions, 20 deletions

diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 54e6e6fd8db7..2178e14d0dd0 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	drupal6
+# Ports collection makefile for:	drupal7
 # Date Created: 			12 Feb 2007
 # Whom:					Nick Hilliard <nick@foobar.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	drupal6
-PORTVERSION=	6.20
+PORTNAME=	drupal7
+PORTVERSION=	7.7
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
@@ -15,40 +15,46 @@ DIST_SUBDIR=	drupal
 MAINTAINER=	nick@foobar.org
 COMMENT=	A database driven web content management system (CMS)
 
-DRUPAL6_PORT=	yes
+DRUPAL_PORT=	yes
+DRUPAL_VERSION=	7
 
-USE_PHP=	gd pcre session xml mbstring
+USE_PHP=	dom filter gd hash json mbstring pcre pdo session simplexml xml
 IGNORE_WITH_PHP=4
 WANT_PHP_WEB=	yes
 
-OPTIONS+=	MYSQLI "MySQL Improved Extension database support" on \
-		MYSQL "MySQL database support" off \
+OPTIONS+=	MYSQL "MySQL database support" on \
+		SQLITE3 "SQLite 3.x database support" off \
 		PGSQL "PostgreSQL database support" off
 
 NO_BUILD=	yes
-DOCS=		CHANGELOG.txt INSTALL.txt LICENSE.txt MAINTAINERS.txt \
-		UPGRADE.txt INSTALL.mysql.txt INSTALL.pgsql.txt \
-		COPYRIGHT.txt
+DOCS=		CHANGELOG.txt INSTALL.mysql.txt INSTALL.sqlite.txt \
+		LICENSE.txt README.txt COPYRIGHT.txt INSTALL.pgsql.txt \
+		INSTALL.txt MAINTAINERS.txt UPGRADE.txt
+
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MYSQL)
-USE_PHP+=	mysql
+.if defined(WITH_SQLITE3)
+USE_PHP+=	pdo_sqlite
 .endif
-.if defined(WITH_MYSQLI)
-USE_PHP+=	mysqli
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323 40 41
+USE_PHP+=	pdo_mysql
 .endif
 .if defined(WITH_PGSQL)
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
-USE_PHP+=	pgsql
+USE_PGSQL=	yes
+IGNORE_WITH_PGSQL=	73 74 80 81 82
+USE_PHP+=	pdo_pgsql
 .endif
 
 do-install:
 	${MKDIR} ${DRUPAL_DIR}
 	${CP} ${WRKSRC}/.htaccess ${DRUPAL_DIR}
 	${CP} ${WRKSRC}/cron.php ${DRUPAL_DIR}
+	${CP} ${WRKSRC}/authorize.php ${DRUPAL_DIR}
 	${CP} -R ${WRKSRC}/includes ${DRUPAL_DIR}
 	${CP} ${WRKSRC}/index.php ${DRUPAL_DIR}
 	${CP} ${WRKSRC}/install.php ${DRUPAL_DIR}
@@ -58,17 +64,19 @@ do-install:
 	${CP} ${WRKSRC}/robots.txt ${DRUPAL_DIR}
 	${CP} -R ${WRKSRC}/scripts ${DRUPAL_DIR}
 	${MKDIR} ${DRUPAL_DIR}/sites/all
-	${CP} ${WRKSRC}/sites/all/README.txt ${DRUPAL_DIR}/sites/all/
+	${MKDIR} ${DRUPAL_DIR}/sites/all/libraries
+	${CP} ${WRKSRC}/sites/example.sites.php ${DRUPAL_DIR}/sites/
+	${CP} -R ${WRKSRC}/sites/all ${DRUPAL_DIR}/sites/
 	${MKDIR} ${DRUPAL_DIR}/sites/default
+	${MKDIR} ${DRUPAL_DIR}/sites/default/files
 	${CP} ${WRKSRC}/sites/default/default.settings.php ${DRUPAL_DIR}/sites/default/default.settings.php-dist
 	@if [ ! -f ${DRUPAL_DIR}/sites/default/default.settings.php ]; then \
 		${CP} -p ${DRUPAL_DIR}/sites/default/default.settings.php-dist ${DRUPAL_DIR}/sites/default/default.settings.php ; \
 	fi
 	${CP} -R ${WRKSRC}/themes ${DRUPAL_DIR}
 	${CP} ${WRKSRC}/update.php ${DRUPAL_DIR}
+	${CP} ${WRKSRC}/web.config ${DRUPAL_DIR}
 	${CP} ${WRKSRC}/xmlrpc.php ${DRUPAL_DIR}
-	${MKDIR} ${DRUPAL_DIR}/sites/all/modules ${DRUPAL_DIR}/sites/all/themes
-	${TOUCH} ${DRUPAL_DIR}/sites/all/modules/.keepme ${DRUPAL_DIR}/sites/all/themes/.keepme
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${CP} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
@@ -78,5 +86,5 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include "${PORTSDIR}/Mk/bsd.drupal.mk"
+.include  "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>