[pkgsrc/trunk]: pkgsrc/www o DEINSTALL: remove .htacces under plugins/tcpdf/c...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/407c7cb80141
branches:  trunk
changeset: 567927:407c7cb80141
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Nov 29 06:46:21 2009 +0000

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

Bump PKGREVISION.

diffstat:

 www/typolight26/DEINSTALL |   4 +++-
 www/typolight26/Makefile  |   5 +++--
 www/typolight27/DEINSTALL |   4 +++-
 www/typolight27/Makefile  |  40 +++++++++++++++++++++-------------------
 4 files changed, 30 insertions(+), 23 deletions(-)

diffs (126 lines):

diff -r ad161b8489b8 -r 407c7cb80141 www/typolight26/DEINSTALL
--- a/www/typolight26/DEINSTALL Sun Nov 29 06:45:01 2009 +0000
+++ b/www/typolight26/DEINSTALL Sun Nov 29 06:46:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2009/04/26 03:52:30 taca Exp $
+# $NetBSD: DEINSTALL,v 1.2 2009/11/29 06:46:21 taca Exp $
 
 TL_WEBDIR="@PREFIX@/@TL_WEBDIR@"
 TL_DIRS="system/config system/drivers system/libraries system/logs \
@@ -9,6 +9,8 @@
        # 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 -r ad161b8489b8 -r 407c7cb80141 www/typolight26/Makefile
--- a/www/typolight26/Makefile  Sun Nov 29 06:45:01 2009 +0000
+++ b/www/typolight26/Makefile  Sun Nov 29 06:46:21 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/11/22 16:17:59 taca Exp $
+# $NetBSD: Makefile,v 1.4 2009/11/29 06:46:21 taca Exp $
 #
 
 DISTNAME=      typolight-${TL_VERSION}
 PKGNAME=       typolight${TL_VER}-${TL_PKGVER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=typolight/}
 
@@ -76,6 +76,7 @@
 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 -r ad161b8489b8 -r 407c7cb80141 www/typolight27/DEINSTALL
--- a/www/typolight27/DEINSTALL Sun Nov 29 06:45:01 2009 +0000
+++ b/www/typolight27/DEINSTALL Sun Nov 29 06:46:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2009/04/26 03:58:41 taca Exp $
+# $NetBSD: DEINSTALL,v 1.2 2009/11/29 06:46:37 taca Exp $
 
 TL_WEBDIR="@PREFIX@/@TL_WEBDIR@"
 TL_DIRS="system/config system/drivers system/libraries system/logs \
@@ -9,6 +9,8 @@
        # 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 -r ad161b8489b8 -r 407c7cb80141 www/typolight27/Makefile
--- a/www/typolight27/Makefile  Sun Nov 29 06:45:01 2009 +0000
+++ b/www/typolight27/Makefile  Sun Nov 29 06:46:21 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2009/11/22 16:17:59 taca Exp $
+# $NetBSD: Makefile,v 1.11 2009/11/29 06:46:37 taca Exp $
 #
 
 DISTNAME=      typolight-${TL_VERSION}
 PKGNAME=       typolight${TL_VER}-${TL_PKGVER}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=typolight/}
 
@@ -76,22 +77,23 @@
 
 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
@@ -101,10 +103,10 @@
 pre-configure:
        ${MV} ${WRKSRC}/templates/.htaccess ${WRKDIR}/templates-htaccess
        ${CP} ${FILESDIR}/typolight.conf ${WRKDIR}
+
+pre-install:
        cd ${WRKSRC}; ${RM} -rf music_academy.css \
                templates/example_website.sql tl_files/music_academy
-
-pre-install:
        ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
 
 do-install: