Pullup ticket #2952 - requested by taca

typolight26: security update
typolight26-example: security update
typolight27: security update
typolight27-example: security update

Revisions pulled up:
- www/typolight/Makefile.common			1.14
- www/typolight26-example/Makefile		1.2
- www/typolight26-translations/Makefile		1.3
- www/typolight26/DEINSTALL			1.2
- www/typolight26/Makefile			1.3-1.5
- www/typolight26/distinfo			1.3
- www/typolight26/patches/patch-ad		1.1
- www/typolight26/patches/patch-ae		1.1
- www/typolight27-example/Makefile		1.2
- www/typolight27-translations/Makefile		1.33
- www/typolight27/DEINSTALL			1.2
- www/typolight27/Makefile			1.10-1.12
- www/typolight27/Makefile.version		1.8
- www/typolight27/distinfo			1.9
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Nov 22 16:18:00 UTC 2009

Modified Files:
	pkgsrc/www/typolight: Makefile.common
	pkgsrc/www/typolight26: Makefile
	pkgsrc/www/typolight26-example: Makefile
	pkgsrc/www/typolight26-translations: Makefile
	pkgsrc/www/typolight27: Makefile
	pkgsrc/www/typolight27-example: Makefile
	pkgsrc/www/typolight27-translations: Makefile

Log Message:
Move LICENSE from typolight/Makefile.common to each Makefiles for
license change of forthcoming TYPOlihght 2.8(.RC1).
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Nov 29 06:46:21 UTC 2009

Modified Files:
	pkgsrc/www/typolight26: DEINSTALL Makefile

Log Message:
o DEINSTALL: remove .htacces under plugins/tcpdf/cache.
o make plugins/tcpdf/cache writable to web server.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Nov 29 06:46:37 UTC 2009

Modified Files:
	pkgsrc/www/typolight27: DEINSTALL Makefile

Log Message:
o DEINSTALL: remove .htacces under plugins/tcpdf/cache.
o make plugins/tcpdf/cache writable to web server.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Dec 20 04:21:05 UTC 2009

Modified Files:
	pkgsrc/www/typolight26: Makefile distinfo
Added Files:
	pkgsrc/www/typolight26/patches: patch-ad patch-ae

Log Message:
Add security fix patches, refering http://www.typolight.org/news/items/major-security-hole-in-the-typolight-install-tool.html.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Dec 20 04:22:04 UTC 2009

Modified Files:
	pkgsrc/www/typolight27: Makefile Makefile.version distinfo

Log Message:
Update to TYPOlight 2.7.6.

Only security updates: http://www.typolight.org/news/items/major-security-hole-in-the-typolight-install-tool.html.

14 files changed, 155 insertions, 37 deletions

diff --git a/www/typolight/Makefile.common b/www/typolight/Makefile.common
index 776852332b6..f50f056439d 100644
--- a/www/typolight/Makefile.common
+++ b/www/typolight/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2009/06/14 22:58:10 joerg Exp $
+# $NetBSD: Makefile.common,v 1.13.4.1 2009/12/20 09:41:38 tron Exp $
 #
 # used by www/typolight26/Makefile
 # used by www/typolight27/Makefile
@@ -9,8 +9,6 @@
 TL_VER?=	${TL_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 TL_PKGVER=	${TL_VERSION:S/.RC/rc/}
 
-LICENSE=	gnu-lgpl-v2.1
-
 FILES_SUBST+=	PAX=${PAX} TL_EGDIR=${TL_EGDIR:Q} TL_WEBDIR=${TL_WEBDIR:Q} \
 		WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
 MESSAGE_SUBST+=	TL_VER=${TL_VER}
diff --git a/www/typolight26-example/Makefile b/www/typolight26-example/Makefile
index 0cc2c75bfea..810fd15a0d7 100644
--- a/www/typolight26-example/Makefile
+++ b/www/typolight26-example/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/26 03:53:53 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2009/12/20 09:41:39 tron Exp $
 #
 
+LICENSE=	gnu-lgpl-v2.1
+
 .include "../../www/typolight26/Makefile.version"
 .include "../../www/typolight/Makefile.example"
 .include "../../www/typolight/Makefile.common"
diff --git a/www/typolight26-translations/Makefile b/www/typolight26-translations/Makefile
index bbea7b426f0..ae885811588 100644
--- a/www/typolight26-translations/Makefile
+++ b/www/typolight26-translations/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/09/24 03:04:04 taca Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2009/12/20 09:41:39 tron Exp $
 #
 
 DISTNAME=	typolight${TL_VER}-translations-${VERS}
@@ -10,6 +10,7 @@ EXTRACT_DIR=	${WRKSRC}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.typolight.org/download-translations.html
 COMMENT=	Language files for TYPOlight CMS
+LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	typolight${TL_VER}>=2.6.0:../../www/typolight26
 
diff --git a/www/typolight26/DEINSTALL b/www/typolight26/DEINSTALL
index 94c2db2612c..4eb05378814 100644
--- a/www/typolight26/DEINSTALL
+++ b/www/typolight26/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2009/04/26 03:52:30 taca Exp $
+# $NetBSD: DEINSTALL,v 1.1.1.1.4.1 2009/12/20 09:41:38 tron Exp $
 
 TL_WEBDIR="@PREFIX@/@TL_WEBDIR@"
 TL_DIRS="system/config system/drivers system/libraries system/logs \
@@ -9,6 +9,8 @@ DEINSTALL)
 	# remove cache files.
 	${FIND} ${TL_WEBDIR}/system/html -type f ! -name index.html \
 		-exec ${RM} -f {} \;
+	${FIND} ${TL_WEBDIR}/plugins/tcpdf/cache -type f ! -name .htaccess \
+		-exec ${RM} -f {} \;
 	;;
 POST-DEINSTALL)
 	(cd ${TL_WEBDIR}
diff --git a/www/typolight26/Makefile b/www/typolight26/Makefile
index 4ed99dc435b..de2b1bb926d 100644
--- a/www/typolight26/Makefile
+++ b/www/typolight26/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2009/04/30 13:12:40 taca Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2009/12/20 09:41:38 tron Exp $
 #
 
 DISTNAME=	typolight-${TL_VERSION}
 PKGNAME=	typolight${TL_VER}-${TL_PKGVER}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=typolight/}
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.typolight.org/
 COMMENT=	Powerful web content management system (CMS)
+LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../misc/php-mbstring
@@ -75,6 +76,7 @@ INSTALLATION_DIRS+=	${TL_DOCDIR} ${TL_EGDIR} ${TL_WEBDIR}/system/config
 OWN_DIRS_PERMS+= \
 		${TL_WEBDIR} ${BINOWN} ${APACHE_GROUP} 0775 \
 		${TL_WEBDIR}/plugins ${BINOWN} ${APACHE_GROUP} 0775 \
+		${TL_WEBDIR}/plugins/tcpdf/cache ${BINOWN} ${APACHE_GROUP} 0775 \
 		${TL_WEBDIR}/system ${BINOWN} ${APACHE_GROUP} 0775 \
 		${TL_WEBDIR}/system/drivers ${BINOWN} ${APACHE_GROUP} 0775 \
 		${TL_WEBDIR}/system/html ${BINOWN} ${APACHE_GROUP} 0770 \
diff --git a/www/typolight26/distinfo b/www/typolight26/distinfo
index 2fe27650a88..31703ccb74e 100644
--- a/www/typolight26/distinfo
+++ b/www/typolight26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/04/30 13:12:40 taca Exp $
+$NetBSD: distinfo,v 1.2.4.1 2009/12/20 09:41:38 tron Exp $
 
 SHA1 (typolight-2.6.7.tar.gz) = d360d5a974c3663488576f856302710c0529b500
 RMD160 (typolight-2.6.7.tar.gz) = b15e3c1c910f3fc9bf3797ffd0dfd6dfc3dd7d5a
@@ -6,3 +6,5 @@ Size (typolight-2.6.7.tar.gz) = 2906128 bytes
 SHA1 (patch-aa) = 254a1fef4e0baff7c5f10c25ceb9d1501f315684
 SHA1 (patch-ab) = a005f8650564eb031def1f94156dcdc72799a758
 SHA1 (patch-ac) = 035f7703721774b1cc9eaf99ffdbc6aa60489076
+SHA1 (patch-ad) = 1302dfb77f76f3d407f123b3e1f1d9f8dfe6e740
+SHA1 (patch-ae) = 7498d750dc902294163efd32cae3ac20feb08c08
diff --git a/www/typolight26/patches/patch-ad b/www/typolight26/patches/patch-ad
new file mode 100644
index 00000000000..c9552de9887
--- /dev/null
+++ b/www/typolight26/patches/patch-ad
@@ -0,0 +1,52 @@
+$NetBSD: patch-ad,v 1.1.2.2 2009/12/20 09:41:38 tron Exp $
+
+* Security fix:
+	http://www.typolight.org/news/items/major-security-hole-in-the-typolight-install-tool.html
+
+--- typolight/ftp.php.orig	2008-12-13 15:27:05.000000000 +0000
++++ typolight/ftp.php
+@@ -88,6 +88,9 @@ class FtpCheck extends Controller
+ 		 */
+ 		if ($this->Input->post('FORM_SUBMIT') == 'tl_login')
+ 		{
++			$_SESSION['TL_INSTALL_AUTH'] = '';
++			$_SESSION['TL_INSTALL_EXPIRE'] = 0;
++
+ 			$password =  sha1($this->Input->post('password', true));
+ 
+ 			if (strlen($password) && $password != 'da39a3ee5e6b4b0d3255bfef95601890afd80709')
+@@ -95,7 +98,10 @@ class FtpCheck extends Controller
+ 				// Set cookie
+ 				if ($password == $GLOBALS['TL_CONFIG']['installPassword'])
+ 				{
+-					$this->setCookie('TL_INSTALL_AUTH', md5($this->Environment->ip.session_id()), (time()+300), $GLOBALS['TL_CONFIG']['websitePath']);
++					$_SESSION['TL_INSTALL_EXPIRE'] = (time() + 300);
++					$_SESSION['TL_INSTALL_AUTH'] = md5(uniqid('', true) . $this->Environment->ip . session_id());
++
++					$this->setCookie('TL_INSTALL_AUTH', $_SESSION['TL_INSTALL_AUTH'], $_SESSION['TL_INSTALL_EXPIRE'], $GLOBALS['TL_CONFIG']['websitePath']);
+ 					$this->Config->update("\$GLOBALS['TL_CONFIG']['installCount']", 0);
+ 
+ 					$this->reload();
+@@ -109,14 +115,20 @@ class FtpCheck extends Controller
+ 		}
+ 
+ 		// Check cookie
+-		if (!$this->Input->cookie('TL_INSTALL_AUTH'))
++		if (!$this->Input->cookie('TL_INSTALL_AUTH') || $_SESSION['TL_INSTALL_AUTH'] == '' || $this->Input->cookie('TL_INSTALL_AUTH') != $_SESSION['TL_INSTALL_AUTH'] || $_SESSION['TL_INSTALL_EXPIRE'] < time())
+ 		{
+ 			$this->Template->login = true;
+ 			$this->outputAndExit();
+ 		}
+ 
+ 		// Renew cookie
+-		$this->setCookie('TL_INSTALL_AUTH', md5($this->Environment->ip.session_id()), (time()+300), $GLOBALS['TL_CONFIG']['websitePath']);
++		else
++		{
++			$_SESSION['TL_INSTALL_EXPIRE'] = (time() + 300);
++			$_SESSION['TL_INSTALL_AUTH'] = md5(uniqid('', true) . $this->Environment->ip . session_id());
++
++			$this->setCookie('TL_INSTALL_AUTH', $_SESSION['TL_INSTALL_AUTH'], $_SESSION['TL_INSTALL_EXPIRE'], $GLOBALS['TL_CONFIG']['websitePath']);
++		}
+ 
+ 
+ 		/**
diff --git a/www/typolight26/patches/patch-ae b/www/typolight26/patches/patch-ae
new file mode 100644
index 00000000000..54918dfaffd
--- /dev/null
+++ b/www/typolight26/patches/patch-ae
@@ -0,0 +1,52 @@
+$NetBSD: patch-ae,v 1.1.2.2 2009/12/20 09:41:38 tron Exp $
+
+* Security fix:
+	http://www.typolight.org/news/items/major-security-hole-in-the-typolight-install-tool.html
+
+--- typolight/install.php.orig	2008-12-13 15:27:05.000000000 +0000
++++ typolight/install.php
+@@ -113,6 +113,9 @@ class InstallTool extends Controller
+ 		 */
+ 		if ($this->Input->post('FORM_SUBMIT') == 'tl_login')
+ 		{
++			$_SESSION['TL_INSTALL_AUTH'] = '';
++			$_SESSION['TL_INSTALL_EXPIRE'] = 0;
++
+ 			$password =  sha1($this->Input->post('password', true));
+ 
+ 			if (strlen($password) && $password != 'da39a3ee5e6b4b0d3255bfef95601890afd80709')
+@@ -120,7 +123,10 @@ class InstallTool extends Controller
+ 				// Set cookie
+ 				if ($password == $GLOBALS['TL_CONFIG']['installPassword'])
+ 				{
+-					$this->setCookie('TL_INSTALL_AUTH', md5($this->Environment->ip.session_id()), (time()+300), $GLOBALS['TL_CONFIG']['websitePath']);
++					$_SESSION['TL_INSTALL_EXPIRE'] = (time() + 300);
++					$_SESSION['TL_INSTALL_AUTH'] = md5(uniqid('', true) . $this->Environment->ip . session_id());
++
++					$this->setCookie('TL_INSTALL_AUTH', $_SESSION['TL_INSTALL_AUTH'], $_SESSION['TL_INSTALL_EXPIRE'], $GLOBALS['TL_CONFIG']['websitePath']);
+ 					$this->Config->update("\$GLOBALS['TL_CONFIG']['installCount']", 0);
+ 
+ 					$this->reload();
+@@ -134,14 +140,20 @@ class InstallTool extends Controller
+ 		}
+ 
+ 		// Check cookie
+-		if (!$this->Input->cookie('TL_INSTALL_AUTH'))
++		if (!$this->Input->cookie('TL_INSTALL_AUTH') || $_SESSION['TL_INSTALL_AUTH'] == '' || $this->Input->cookie('TL_INSTALL_AUTH') != $_SESSION['TL_INSTALL_AUTH'] || $_SESSION['TL_INSTALL_EXPIRE'] < time())
+ 		{
+ 			$this->Template->login = true;
+ 			$this->outputAndExit();
+ 		}
+ 
+ 		// Renew cookie
+-		$this->setCookie('TL_INSTALL_AUTH', md5($this->Environment->ip.session_id()), (time()+300), $GLOBALS['TL_CONFIG']['websitePath']);
++		else
++		{
++			$_SESSION['TL_INSTALL_EXPIRE'] = (time() + 300);
++			$_SESSION['TL_INSTALL_AUTH'] = md5(uniqid('', true) . $this->Environment->ip . session_id());
++
++			$this->setCookie('TL_INSTALL_AUTH', $_SESSION['TL_INSTALL_AUTH'], $_SESSION['TL_INSTALL_EXPIRE'], $GLOBALS['TL_CONFIG']['websitePath']);
++		}
+ 
+ 
+ 		/**
diff --git a/www/typolight27-example/Makefile b/www/typolight27-example/Makefile
index c9894f79638..3480932d584 100644
--- a/www/typolight27-example/Makefile
+++ b/www/typolight27-example/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/26 04:00:12 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2009/12/20 09:41:39 tron Exp $
 #
 
+LICENSE=	gnu-lgpl-v2.1
+
 .include "../../www/typolight27/Makefile.version"
 .include "../../www/typolight/Makefile.example"
 .include "../../www/typolight/Makefile.common"
diff --git a/www/typolight27-translations/Makefile b/www/typolight27-translations/Makefile
index 499692cc2fb..3bdfcdf568d 100644
--- a/www/typolight27-translations/Makefile
+++ b/www/typolight27-translations/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/10/10 02:17:59 taca Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2009/12/20 09:41:39 tron Exp $
 #
 
 DISTNAME=	typolight${TL_VER}-translations-${VERS}
@@ -10,6 +10,7 @@ EXTRACT_DIR=	${WRKSRC}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.typolight.org/download.html
 COMMENT=	Language files for TYPOlight CMS
+LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	typolight${TL_VER}>=${TL_PKGVER}:../../www/typolight${TL_VER}
 
diff --git a/www/typolight27/DEINSTALL b/www/typolight27/DEINSTALL
index 88610c2a267..c5ca218c448 100644
--- a/www/typolight27/DEINSTALL
+++ b/www/typolight27/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2009/04/26 03:58:41 taca Exp $
+# $NetBSD: DEINSTALL,v 1.1.1.1.4.1 2009/12/20 09:41:39 tron Exp $
 
 TL_WEBDIR="@PREFIX@/@TL_WEBDIR@"
 TL_DIRS="system/config system/drivers system/libraries system/logs \
@@ -9,6 +9,8 @@ DEINSTALL)
 	# remove cache files.
 	${FIND} ${TL_WEBDIR}/system/html -type f ! -name index.html \
 		-exec ${RM} -f {} \;
+	${FIND} ${TL_WEBDIR}/plugins/tcpdf/cache -type f ! -name .htaccess \
+		-exec ${RM} -f {} \;
 	;;
 POST-DEINSTALL)
 	(cd ${TL_WEBDIR}
diff --git a/www/typolight27/Makefile b/www/typolight27/Makefile
index 1a7a58141fb..04411de7de2 100644
--- a/www/typolight27/Makefile
+++ b/www/typolight27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/10/02 14:32:52 taca Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2009/12/20 09:41:39 tron Exp $
 #
 
 DISTNAME=	typolight-${TL_VERSION}
@@ -9,6 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=typolight/}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.typolight.org/
 COMMENT=	Powerful web content management system (CMS)
+LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../misc/php-mbstring
@@ -75,22 +76,23 @@ WWW_SYSFILES=	config/.htaccess constants.php drivers functions.php \
 
 INSTALLATION_DIRS+=	${TL_DOCDIR} ${TL_EGDIR} ${TL_WEBDIR}/system/config
 OWN_DIRS_PERMS+= \
-		${TL_WEBDIR} ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/plugins ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/system ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/system/drivers ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/system/html ${BINOWN} ${APACHE_GROUP} 0770 \
-		${TL_WEBDIR}/system/libraries ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/system/logs ${BINOWN} ${APACHE_GROUP} 0770 \
-		${TL_WEBDIR}/system/modules ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/system/themes ${BINOWN} ${APACHE_GROUP} 0775 \
-		${TL_WEBDIR}/system/tmp ${BINOWN} ${APACHE_GROUP} 0770 \
-		${TL_WEBDIR}/templates ${BINOWN} ${APACHE_GROUP} 0770 \
-		${TL_WEBDIR}/tl_files ${BINOWN} ${APACHE_GROUP} 0770 \
-		${TL_WEBDIR}/tl_files/tiny_templates \
-		${BINOWN} ${APACHE_GROUP} 0770 \
-		${TL_WEBDIR}/tl_files/xBrowser_style_sheets \
-		${BINOWN} ${APACHE_GROUP} 0770
+	${TL_WEBDIR} ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/plugins ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/plugins/tcpdf/cache ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/system ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/system/drivers ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/system/html ${BINOWN} ${APACHE_GROUP} 0770 \
+	${TL_WEBDIR}/system/libraries ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/system/logs ${BINOWN} ${APACHE_GROUP} 0770 \
+	${TL_WEBDIR}/system/modules ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/system/themes ${BINOWN} ${APACHE_GROUP} 0775 \
+	${TL_WEBDIR}/system/tmp ${BINOWN} ${APACHE_GROUP} 0770 \
+	${TL_WEBDIR}/templates ${BINOWN} ${APACHE_GROUP} 0770 \
+	${TL_WEBDIR}/tl_files ${BINOWN} ${APACHE_GROUP} 0770 \
+	${TL_WEBDIR}/tl_files/tiny_templates \
+	${BINOWN} ${APACHE_GROUP} 0770 \
+	${TL_WEBDIR}/tl_files/xBrowser_style_sheets \
+	${BINOWN} ${APACHE_GROUP} 0770
 
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
@@ -100,10 +102,10 @@ PKG_USERS_VARS+=	APACHE_USER
 pre-configure:
 	${MV} ${WRKSRC}/templates/.htaccess ${WRKDIR}/templates-htaccess
 	${CP} ${FILESDIR}/typolight.conf ${WRKDIR}
-	cd ${WRKSRC}; ${RM} -rf music_academy.css \
-		templates/example_website.sql tl_files/music_academy
 
 pre-install:
+	cd ${WRKSRC}; ${RM} -rf music_academy.css \
+		templates/example_website.sql tl_files/music_academy
 	${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
 
 do-install:
diff --git a/www/typolight27/Makefile.version b/www/typolight27/Makefile.version
index 1ce10dc999f..d8f94d5d83b 100644
--- a/www/typolight27/Makefile.version
+++ b/www/typolight27/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.7 2009/10/06 00:59:21 taca Exp $
+# $NetBSD: Makefile.version,v 1.7.2.1 2009/12/20 09:41:39 tron Exp $
 #
-TL_VERSION=		2.7.5
+TL_VERSION=		2.7.6
diff --git a/www/typolight27/distinfo b/www/typolight27/distinfo
index c576315628d..7f10e39ca79 100644
--- a/www/typolight27/distinfo
+++ b/www/typolight27/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2009/10/06 00:59:21 taca Exp $
+$NetBSD: distinfo,v 1.8.2.1 2009/12/20 09:41:39 tron Exp $
 
-SHA1 (typolight-2.7.5.tar.gz) = 7a3708ae35b548c6401f0347e51a985349aa888f
-RMD160 (typolight-2.7.5.tar.gz) = f741538e5c274994286695589b4643b78a9ee27c
-Size (typolight-2.7.5.tar.gz) = 4285890 bytes
+SHA1 (typolight-2.7.6.tar.gz) = e8d3c57f411497a035ddd4bce0f213a38d30d8f0
+RMD160 (typolight-2.7.6.tar.gz) = 3f9f6aa2c1d8a6cdfe59a72c4147f1fb2f9e09b6
+Size (typolight-2.7.6.tar.gz) = 4284993 bytes