* Remove obsolete contao-liveupdate description from DESCR.

* Clean up Makefile utilizing common Makefile.
* Fix PLIST lacked some Swedish language files in editArea plugin.

Bump PKGREVISION.

5 files changed, 36 insertions, 53 deletions

diff --git a/www/contao29/DESCR b/www/contao29/DESCR
index 2b93cda55a0..71ceb84b642 100644
--- a/www/contao29/DESCR
+++ b/www/contao29/DESCR
@@ -4,6 +4,3 @@ information). It was formerly known as TYPOlight Open Source CMS. Its open
 architecture allows everybody to extend the system to fit his needs. Contao
 specializes in accessible websites and is accessbile itself (front end and
 back end), rendering valid XHTML pages.
-
-Note: Live update feature would work with contao-liveupdate PKG_OPTION
-enabled, but it might be conflict with regular pkgsrc maintainous.
diff --git a/www/contao29/INSTALL b/www/contao29/INSTALL
index bc3e48f04c3..8d37899b566 100644
--- a/www/contao29/INSTALL
+++ b/www/contao29/INSTALL
@@ -1,10 +1,12 @@
-# $NetBSD: INSTALL,v 1.3 2011/05/12 14:48:10 taca Exp $
+# $NetBSD: INSTALL,v 1.4 2011/08/12 12:50:36 taca Exp $
 
 CT_WEBDIR="@PREFIX@/@CT_WEBDIR@"
-CT_OWN="@WWWOWN@"
+WWWOWN="@WWWOWN@"
+WWWGRP="@WWWGRP@"
 
 case ${STAGE} in
 POST-INSTALL)
-	${CHOWN} -R ${CT_OWN} ${CT_WEBDIR}
+	${CHGRP} -R ${WWWGRP} ${CT_WEBDIR}
+	${CHOWN} -R ${WWWOWN} ${CT_WEBDIR}
 	;;
 esac
diff --git a/www/contao29/Makefile b/www/contao29/Makefile
index 1cd65f5004e..66f180e0c7e 100644
--- a/www/contao29/Makefile
+++ b/www/contao29/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2011/05/18 13:25:17 taca Exp $
+# $NetBSD: Makefile,v 1.14 2011/08/12 12:50:36 taca Exp $
 #
 
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=typolight/}
 
@@ -20,37 +21,41 @@ DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+CT_VERS=	29
 USE_TOOLS=	pax
 NO_BUILD=	yes
 
+EG_FILES=	config.php countries.php dcaconfig.php editArea.php \
+		fancyUpload.php initconfig.php langconfig.php languages.php \
+		tcpdf.php timezones.php tinyFlash.php tinyMCE.php tinyNews.php
 EG_DATA=	${WWW_EG_FILES} system/config tl_files
-EG_FILES=	system/config/config.php system/config/countries.php \
-		system/config/dcaconfig.php system/config/editArea.php \
-		system/config/fancyUpload.php system/config/initconfig.php \
-		system/config/langconfig.php system/config/languages.php \
-		system/config/tcpdf.php system/config/timezones.php \
-		system/config/tinyFlash.php system/config/tinyMCE.php \
-		system/config/tinyNews.php
-TMPL_FILES=	tl_files/tinymce.css tl_files/tiny_templates/index.html
+EG_TEMPLATES=	tinymce.css tiny_templates/index.html
 WWW_EG_FILES=	basic.css print.css robots.txt
+RESTRICT_DIRS=	system/html system/logs system/tmp templates tl_files
 
-CONF_FILES_PERMS+=	${CT_EGDIR}/system/config/localconfig.php \
-			${CT_WEBDIR}/system/config/localconfig.php \
-			${APACHE_USER} ${APACHE_GROUP} 0600
+CONF_FILES_PERMS+= \
+		${CT_EGDIR}/system/config/localconfig.php \
+		${CT_WEBDIR}/system/config/localconfig.php \
+		${APACHE_USER} ${APACHE_GROUP} 0600
 
-CONF_FILES+=		${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
+CONF_FILES+=	${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
 
-.for f in ${EG_FILES}
-CONF_FILES+=		${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
+.for f in ${EG_CONFIG}
+CONF_FILES+=	${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f}
 .endfor
 
-.for f in ${TMPL_FILES}
-REQD_FILES+=		${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
+MAKE_DIRS+=	${CT_WEBDIR}/tl_files/tiny_templates
+
+.for f in ${EG_TEMPLATES}
+REQD_FILES+=	${CT_EGDIR}/tl_files/${f} ${CT_WEBDIR}/tl_files/${f}
 .endfor
 
 .for f in ${WWW_EG_FILES}
-CONF_FILES_PERMS+=	${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} \
-			${APACHE_USER} ${APACHE_GROUP} 0644
+REQD_FILES+=	${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
+.endfor
+
+.for d in ${RESTRICT_DIRS}
+OWN_DIRS_PERMS+=	${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770
 .endfor
 
 SUBST_CLASSES+=		conf
@@ -68,27 +73,13 @@ WWW_SYSFILES=	config/.htaccess constants.php contao.css drivers \
 		tmp/.htaccess utf8_lookup.php
 
 INSTALLATION_DIRS+=	${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
-OWN_DIRS_PERMS+= \
-	${CT_WEBDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/plugins ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/plugins/tcpdf/cache \
-		${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/system ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/system/drivers ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/system/html ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
-	${CT_WEBDIR}/system/libraries ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/system/logs ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
-	${CT_WEBDIR}/system/modules ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/system/themes ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
-	${CT_WEBDIR}/system/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
-	${CT_WEBDIR}/templates ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
-	${CT_WEBDIR}/tl_files ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
-	${CT_WEBDIR}/tl_files/tiny_templates \
-		${REAL_ROOT_USER} ${APACHE_GROUP} 0770
 
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
 
+post-extract:
+	${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \;
+
 pre-configure:
 	${CP} ${FILESDIR}/contao.conf ${WRKDIR}
 
@@ -114,7 +105,6 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/README \
 		${DESTDIR}${PREFIX}/${CT_DOCDIR}
 
-.include "Makefile.version"
 .include "../../www/contao/Makefile.common"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/contao29/Makefile.version b/www/contao29/Makefile.version
deleted file mode 100644
index f802d04cbb5..00000000000
--- a/www/contao29/Makefile.version
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile.version,v 1.6 2011/05/18 13:25:17 taca Exp $
-#
-# used by www/contao29/Makefile
-# used by www/contao29-example/Makefile
-# used by www/contao29-translations/Makefile
-#
-
-CT_VERSION=		2.9.5
diff --git a/www/contao29/PLIST b/www/contao29/PLIST
index 57ba3f494ff..d8455f2c26e 100644
--- a/www/contao29/PLIST
+++ b/www/contao29/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/03/25 16:52:08 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/08/12 12:50:36 taca Exp $
 ${CT_WEBDIR}/CHANGELOG.txt
 ${CT_WEBDIR}/GPL.txt
 ${CT_WEBDIR}/INSTALL.txt
@@ -80,6 +80,7 @@ ${CT_WEBDIR}/plugins/editArea/langs/pl.js
 ${CT_WEBDIR}/plugins/editArea/langs/pt.js
 ${CT_WEBDIR}/plugins/editArea/langs/ru.js
 ${CT_WEBDIR}/plugins/editArea/langs/sk.js
+${CT_WEBDIR}/plugins/editArea/langs/sv.js
 ${CT_WEBDIR}/plugins/editArea/langs/zh.js
 ${CT_WEBDIR}/plugins/editArea/license_apache.txt
 ${CT_WEBDIR}/plugins/editArea/license_bsd.txt
@@ -106,6 +107,7 @@ ${CT_WEBDIR}/plugins/editArea/plugins/charmap/langs/pl.js
 ${CT_WEBDIR}/plugins/editArea/plugins/charmap/langs/pt.js
 ${CT_WEBDIR}/plugins/editArea/plugins/charmap/langs/ru.js
 ${CT_WEBDIR}/plugins/editArea/plugins/charmap/langs/sk.js
+${CT_WEBDIR}/plugins/editArea/plugins/charmap/langs/sv.js
 ${CT_WEBDIR}/plugins/editArea/plugins/charmap/langs/zh.js
 ${CT_WEBDIR}/plugins/editArea/plugins/charmap/popup.html
 ${CT_WEBDIR}/plugins/editArea/plugins/test/css/test.css
@@ -127,6 +129,7 @@ ${CT_WEBDIR}/plugins/editArea/plugins/test/langs/pl.js
 ${CT_WEBDIR}/plugins/editArea/plugins/test/langs/pt.js
 ${CT_WEBDIR}/plugins/editArea/plugins/test/langs/ru.js
 ${CT_WEBDIR}/plugins/editArea/plugins/test/langs/sk.js
+${CT_WEBDIR}/plugins/editArea/plugins/test/langs/sv.js
 ${CT_WEBDIR}/plugins/editArea/plugins/test/langs/zh.js
 ${CT_WEBDIR}/plugins/editArea/plugins/test/test.js
 ${CT_WEBDIR}/plugins/editArea/plugins/test/test2.js
@@ -2006,4 +2009,3 @@ ${CT_EGDIR}/system/config/tinyMCE.php
 ${CT_EGDIR}/system/config/tinyNews.php
 ${CT_EGDIR}/tl_files/tiny_templates/index.html
 ${CT_EGDIR}/tl_files/tinymce.css
-${CT_EGDIR}/contao.conf