Update TYPOlight package to 2.6.1.

pkgsrc change

* Add README and sample additional apatch's configuration fratment.
* Fix dependency line for php-gd.


==========================
TYPOlight webCMS CHANGELOG
==========================

Version 2.6.1 (2008-09-20)
--------------------------
- Added content element "article alias"
- Added interface "uploadable" for file upload widgets
- Added optgroups to the TinyMCE "typolinks" file drop-down menu
- Added forum/helpdesk hook to template "member_grouped"
- Added month names to calendar templates (#27)
- Added workaround for PCRE unicode word boundary limitation (#65)
- Added callbacks "executePreActions" and "executePostActions" (#16)
- Added option to send personalized mails to the newsletter module (#108)
- Added a variable timeout between each newsletter sending cycle (#56)
- Added a "check all" box to all checkbox widgets (#32)
- Replaced back end multi-filter with a more efficient implementation
- Replaced all Template objects with FrontendTemplate or BackendTemplate (#64)
- Improved preview pane to show only members with a username
- Improved search algorithm to check for duplicate content URLs (#98)
- Fixed issue with external PHP templates breaking insert tags (#12)
- Fixed issue with domains containing "www" in multi-domain mode (#73)
- Fixed issue with wrong newsletter URLs when page alias usage is disabled (#26)
- Fixed issue with ambiguous image names in HTML newsletters (#84)
- Fixed issue with wrong color in dpSyntaxHighlighter (#30)
- Fixed issue with backlinks not working on cached pages (#15)
- Fixed issue with MySQL convertig aliases starting with a digit (#82)
- Fixed issue with incorrect download URLs (#24)
- Fixed a few spelling issues (#110)
- Fixed a few minor bugs

8 files changed, 112 insertions, 40 deletions

diff --git a/www/typolight/MESSAGE b/www/typolight/MESSAGE
new file mode 100644
index 00000000000..f7571551777
--- /dev/null
+++ b/www/typolight/MESSAGE
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2008/10/06 14:02:05 taca Exp $
+
+To complete the setup, please read:
+
+	${PREFIX}/share/doc/typolight/README
+
+
+Note: currently, PostgreSQL isn't tested well.
+
+===========================================================================
diff --git a/www/typolight/Makefile b/www/typolight/Makefile
index ab2d2aaedf7..af14fe1f791 100644
--- a/www/typolight/Makefile
+++ b/www/typolight/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/15 09:57:48 taca Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/06 14:02:05 taca Exp $
 #
 
 DISTNAME=	typolight-${TL_VERSION}
@@ -9,9 +9,10 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.typolight.org/
 COMMENT=	Powerful web content management system (CMS)
 
-DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../converters/php-iconv
-DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=5.1.0:../../graphics/php-gd
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/gd
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../misc/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.1.0:../../security/php-mcrypt
+DEPENDS+=	${PHP_PKG_PREFIX}-{mysql,pgsql}>=5.1.0:../../databases/php-mysql
 
 PHP_VERSIONS_ACCEPTED=	5
 
@@ -35,6 +36,9 @@ CONF_FILES_PERMS+=	${TL_EGDIR}/system/config/localconfig.php \
 			${TL_WEBDIR}/system/config/localconfig.php \
 			${APACHE_USER} ${APACHE_GROUP} 0600
 
+CONF_FILES+=		${TL_EGDIR}/typolight.conf \
+			${PKG_SYSCONFDIR}/typolight.conf
+
 .for f in ${EG_FILES}
 CONF_FILES+=		${TL_EGDIR}/${f} ${TL_WEBDIR}/${f}
 .endfor
@@ -47,6 +51,12 @@ REQD_FILES+=		${TL_EGDIR}/${f} ${TL_WEBDIR}/${f}
 CONF_FILES_PERMS+=	${TL_EGDIR}/${f} ${TL_WEBDIR}/${f} www www 0644
 .endfor
 
+SUBST_CLASSES+=		conf
+SUBST_FILES.conf+=	${WRKDIR}/typolight.conf
+SUBST_SED.conf+=        -e 's|@PREFIX@|${PREFIX:Q}|g'
+SUBST_SED.conf+=        -e 's|@TL_WEBDIR@|${TL_WEBDIR:Q}|g'
+SUBST_STAGE.conf=	post-configure
+
 WWW_FILES=	._htaccess CHANGELOG.txt INSTALL.txt LICENSE.txt \
 		cron.php flash.php index.php \
 		plugins robots.txt templates typolight
@@ -55,7 +65,7 @@ WWW_SYSFILES=	config/.htaccess constants.php drivers functions.php \
 		logs/.htaccess mbstring.php modules themes tmp/.htaccess \
 		typolight.css
 
-INSTALLATION_DIRS+=	${TL_EGDIR} ${TL_WEBDIR}/system/config
+INSTALLATION_DIRS+=	${TL_DOCDIR} ${TL_EGDIR} ${TL_WEBDIR}/system/config
 OWN_DIRS_PERMS+= \
 		${TL_WEBDIR} root ${APACHE_GROUP} 0775 \
 		${TL_WEBDIR}/system/html ${BINOWN} ${APACHE_GROUP} 0770 \
@@ -71,6 +81,7 @@ PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
 
 pre-configure:
+	${CP} ${FILESDIR}/typolight.conf ${WRKDIR}
 	cd ${WRKSRC}; ${RM} -rf music_academy.css \
 		templates/example_website.sql tl_files/music_academy; \
 		${CP} /dev/null news.xml
@@ -84,6 +95,9 @@ do-install:
 			${DESTDIR}${PREFIX}/${TL_WEBDIR}/system/config
 	cd ${WRKSRC}; pax -rw -pm ${EG_DATA} ${DESTDIR}${PREFIX}/${TL_EGDIR}
 	rm -f ${DESTDIR}${PREFIX}/${TL_EGDIR}/system/config/.htaccess
+	${INSTALL_DATA} ${WRKDIR}/typolight.conf ${DESTDIR}${PREFIX}/${TL_EGDIR}
+	${INSTALL_DATA} ${FILESDIR}/README \
+		${DESTDIR}${PREFIX}/${TL_DOCDIR}
 
 .include "Makefile.common"
 .include "../../lang/php/phpversion.mk"
diff --git a/www/typolight/Makefile.common b/www/typolight/Makefile.common
index 5fce89e3e96..91a31adac3f 100644
--- a/www/typolight/Makefile.common
+++ b/www/typolight/Makefile.common
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.common,v 1.2 2008/09/15 10:09:22 taca Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/10/06 14:02:05 taca Exp $
 #
 # used by www/typolight-example/Makefile
 # used by www/typolight-translations/Makefile
 
-TL_VERSION=	2.6.0
+TL_VERSION=	2.6.1
 
 FILES_SUBST+=	PAX=${PAX} TL_EGDIR=${TL_EGDIR:Q} TL_WEBDIR=${TL_WEBDIR:Q} \
 		WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
-PLIST_SUBST+=	TL_EGDIR=${TL_EGDIR:Q} TL_WEBDIR=${TL_WEBDIR:Q}
+PLIST_SUBST+=	TL_DOCDIR=${TL_DOCDIR:Q} TL_EGDIR=${TL_EGDIR:Q} \
+		TL_WEBDIR=${TL_WEBDIR:Q}
 
 PRINT_PLIST_AWK+=	/@dirrm ${TL_WEBDIR:S|/|\\/|g}\/templates$$/ \
 			{ next; }
@@ -26,7 +27,10 @@ PRINT_PLIST_AWK+=	/^(@dirrm )?${TL_EGDIR:S|/|\\/|g}/ \
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_SYSCONFSUBDIR?=	typolight
+
+TL_DOCDIR?=	share/doc/typolight
 TL_EGDIR?=	share/examples/typolight
 TL_WEBDIR?=	share/httpd/typolight
 
-BUILD_DEFS+=	APACHE_GROUP APACHE_USER TL_EGDIR TL_WEBDIR
+BUILD_DEFS+=	APACHE_GROUP APACHE_USER TL_DOCDIR TL_EGDIR TL_WEBDIR
diff --git a/www/typolight/PLIST b/www/typolight/PLIST
index 5f4700329e5..08eaa45b794 100644
--- a/www/typolight/PLIST
+++ b/www/typolight/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/15 09:57:48 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/06 14:02:05 taca Exp $
+${TL_DOCDIR}/README
 ${TL_EGDIR}/basic.css
 ${TL_EGDIR}/news.xml
 ${TL_EGDIR}/print.css
@@ -17,6 +18,7 @@ ${TL_EGDIR}/tl_files/xBrowser_style_sheets/xBasic.css
 ${TL_EGDIR}/tl_files/xBrowser_style_sheets/xElements.css
 ${TL_EGDIR}/tl_files/xBrowser_style_sheets/xForm.css
 ${TL_EGDIR}/tl_files/xBrowser_style_sheets/xNavigation.css
+${TL_EGDIR}/typolight.conf
 ${TL_WEBDIR}/._htaccess
 ${TL_WEBDIR}/CHANGELOG.txt
 ${TL_WEBDIR}/INSTALL.txt
@@ -553,6 +555,12 @@ ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/de.js
 ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/de_dlg.js
 ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/en.js
 ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/en_dlg.js
+${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/fr.js
+${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/fr_dlg.js
+${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/it.js
+${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/it_dlg.js
+${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/pl.js
+${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/pl_dlg.js
 ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/readme.txt
 ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/typoimages.php
 ${TL_WEBDIR}/plugins/tinyMCE/plugins/typolinks/typolib.php
@@ -1071,6 +1079,7 @@ ${TL_WEBDIR}/system/modules/faq/templates/mod_faqlist.tpl
 ${TL_WEBDIR}/system/modules/faq/templates/mod_faqreader.tpl
 ${TL_WEBDIR}/system/modules/frontend/ContentAccordion.php
 ${TL_WEBDIR}/system/modules/frontend/ContentAlias.php
+${TL_WEBDIR}/system/modules/frontend/ContentArticle.php
 ${TL_WEBDIR}/system/modules/frontend/ContentCode.php
 ${TL_WEBDIR}/system/modules/frontend/ContentDownload.php
 ${TL_WEBDIR}/system/modules/frontend/ContentDownloads.php
@@ -1180,6 +1189,7 @@ ${TL_WEBDIR}/system/modules/frontend/templates/member_default.tpl
 ${TL_WEBDIR}/system/modules/frontend/templates/member_grouped.tpl
 ${TL_WEBDIR}/system/modules/frontend/templates/mod_article.tpl
 ${TL_WEBDIR}/system/modules/frontend/templates/mod_article_list.tpl
+${TL_WEBDIR}/system/modules/frontend/templates/mod_article_plain.tpl
 ${TL_WEBDIR}/system/modules/frontend/templates/mod_article_teaser.tpl
 ${TL_WEBDIR}/system/modules/frontend/templates/mod_breadcrumb.tpl
 ${TL_WEBDIR}/system/modules/frontend/templates/mod_flash.tpl
@@ -1666,7 +1676,7 @@ ${TL_WEBDIR}/typolight/typolight_src.js
 @dirrm ${TL_WEBDIR}/system/modules/backend/dca
 @dirrm ${TL_WEBDIR}/system/modules/backend/config
 @dirrm ${TL_WEBDIR}/system/modules/backend
-@dirrm ${TL_WEBDIR}/system/modules
+@unexec ${RMDIR} %D/${TL_WEBDIR}/system/modules 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/${TL_WEBDIR}/system/logs 2>/dev/null || ${TRUE}
 @dirrm ${TL_WEBDIR}/system/libraries
 @unexec ${RM} -fr %D/${TL_WEBDIR}/system/html
@@ -1779,3 +1789,4 @@ ${TL_WEBDIR}/typolight/typolight_src.js
 @dirrm ${TL_EGDIR}/system/config
 @dirrm ${TL_EGDIR}/system
 @dirrm ${TL_EGDIR}
+@dirrm ${TL_DOCDIR}
diff --git a/www/typolight/distinfo b/www/typolight/distinfo
index a88edd43cb3..ab0f12bd607 100644
--- a/www/typolight/distinfo
+++ b/www/typolight/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/15 09:57:48 taca Exp $
+$NetBSD: distinfo,v 1.2 2008/10/06 14:02:05 taca Exp $
 
-SHA1 (typolight-2.6.0.tar.gz) = 74750399cfbc38d952d1ae34fd537b570cd5ae76
-RMD160 (typolight-2.6.0.tar.gz) = 88cfef656590cfdc46043f32060e60db430cd2b0
-Size (typolight-2.6.0.tar.gz) = 2806082 bytes
-SHA1 (patch-aa) = b0cf9ac0ce9fa5e7089e31ee9ca9daf438178ba9
+SHA1 (typolight-2.6.1.tar.gz) = d50a07351754e9d3401a7eaabcd25333dc52e784
+RMD160 (typolight-2.6.1.tar.gz) = bae4486e13098698532f36d55ab1057dd27c0133
+Size (typolight-2.6.1.tar.gz) = 2812585 bytes
diff --git a/www/typolight/files/README b/www/typolight/files/README
new file mode 100644
index 00000000000..d2e941e49e6
--- /dev/null
+++ b/www/typolight/files/README
@@ -0,0 +1,41 @@
+$NetBSD: README,v 1.1 2008/10/06 14:02:05 taca Exp $
+
+Note: currently, PostgreSQL isn't tested well.
+
+1. First, create a database for TYPOlight CMS.
+
+   * MySQL
+
+	# mysqladmin -p -u <administrator> create <dbname>.
+
+   * PostgreSQL
+
+	# su pgsql
+	% createdb -E utf-8 <dbname>
+
+2. Next, create a user for accessing that database.
+
+   * MySQL
+
+	# mysql -p -u <administrator> <dbname>
+	mysql> grant select, insert, update, delete, create, drop,
+	       index, alter, create temporary tables, lock tables on
+	       <dbname>.* to '<dbuser>'@'localhost'
+	       identified by '<dbpass>' ;
+
+   * PostgreSQL
+
+	% createuser -D -A -R -P -E <dbuser>
+	Enter password for new role: <dbpass>
+	Enter it again: <dbpass>
+
+3. Edit ${PKG_SYSCONFDIR}/typolight.conf and include from httpd.conf.
+
+	Include ${PKG_SYSCONFDIR}/typolight.conf
+
+   Then reload or restart apache.
+
+4. Start setup from TYPOlight installer.  If your setup TYPOlight's
+   URL as http://www.example.org/, the installer's URL will be
+   http://www.example.org/typolight/install.php.
+
diff --git a/www/typolight/files/typolight.conf b/www/typolight/files/typolight.conf
new file mode 100644
index 00000000000..47b92e11419
--- /dev/null
+++ b/www/typolight/files/typolight.conf
@@ -0,0 +1,17 @@
+# $NetBSD: typolight.conf,v 1.1 2008/10/06 14:02:05 taca Exp $
+
+#
+# If you set DocumentRoot to "@PREFIX@/@TL_WEBDIR@",
+# Set DocuemntRoot of Apache to it.
+# If you want to access typolight via sub directory, uncomment
+# below line.  (http://www.example.org/typolight/)
+# 
+#Alias	/typolight	"@PREFIX@/@TL_WEBDIR@"
+
+<Directory "@PREFIX@/@TL_WEBDIR@">
+	DirectoryIndex index.php index.html
+        Options Indexes SymLinksIfOwnerMatch FollowSymLinks
+        AllowOverride All
+        Order allow,deny
+        Allow from all
+</Directory>
diff --git a/www/typolight/patches/patch-aa b/www/typolight/patches/patch-aa
deleted file mode 100644
index 5d7d0cdd69d..00000000000
--- a/www/typolight/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/15 09:57:48 taca Exp $
-
-Ad hoc cope with assuming gnu libc / GNU iconv.
-
---- system/mbstring.php.orig	2007-12-13 21:53:56.000000000 +0900
-+++ system/mbstring.php
-@@ -114,8 +114,16 @@ function utf8_convert_encoding($str, $to
- 	if ($from == 'ISO-8859-1' && $to == 'UTF-8')
- 		return utf8_encode($str);
- 
--	if (function_exists('iconv'))
--		return @iconv($from, $to . '//IGNORE', $str);
-+	if (function_exists('iconv')) {
-+        if (strlen($str) > 0) {
-+            $s = @iconv($from, $to . '//IGNORE', $str);
-+            if (strlen($s) == 0) {
-+                $s = @iconv($from, $to, $str);
-+            }
-+            return $s;
-+        }
-+        return $str;
-+    }
- 
- 	if (!USE_MBSTRING)
- 		return $str;