Mon Dec 15 03:05:11 2008 UTC ()
Fix DEINSTALL script not to display such useless messages.

rmdir: /usr/pkg/share/httpd/typolight/system/config: Directory not empty
rmdir: /usr/pkg/share/httpd/typolight/system: Directory not empty

Bump PKGREVISION.


(taca)
diff -r1.1 -r1.2 pkgsrc/www/typolight/DEINSTALL
diff -r1.8 -r1.9 pkgsrc/www/typolight/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/www/typolight/Attic/DEINSTALL (switch to unified diff)

--- pkgsrc/www/typolight/Attic/DEINSTALL 2008/11/06 11:23:14 1.1
+++ pkgsrc/www/typolight/Attic/DEINSTALL 2008/12/15 03:05:11 1.2
@@ -1,20 +1,17 @@ @@ -1,20 +1,17 @@
1# $NetBSD: DEINSTALL,v 1.1 2008/11/06 11:23:14 taca Exp $ 1# $NetBSD: DEINSTALL,v 1.2 2008/12/15 03:05:11 taca Exp $
2 2
3TL_WEBDIR="@PREFIX@/@TL_WEBDIR@" 3TL_WEBDIR="@PREFIX@/@TL_WEBDIR@"
 4TL_DIRS="templates system/drivers system/libraries system/logs \
 5 system/modules system/themes system/config system"
4 6
5case ${STAGE} in 7case ${STAGE} in
6DEINSTALL) 8DEINSTALL)
7 ${FIND} ${TL_WEBDIR}/system/html -type f ! -name index.html \ 9 ${FIND} ${TL_WEBDIR}/system/html -type f ! -name index.html \
8 -exec ${RM} -f {} \; 10 -exec ${RM} -f {} \;
9 ;; 11 ;;
10POST-DEINSTALL) 12POST-DEINSTALL)
11 ${RMDIR} ${TL_WEBDIR}/templates 2>/dev/null 13 for d in ${TL_DIRS} ${TL_WEBDIR}; do
12 ${RMDIR} ${TL_WEBDIR}/system/drivers 2>/dev/null 14 ${RMDIR} $d >/dev/null 2>&1
13 ${RMDIR} ${TL_WEBDIR}/system/libraries 15 done
14 ${RMDIR} ${TL_WEBDIR}/system/logs 
15 ${RMDIR} ${TL_WEBDIR}/system/modules 
16 ${RMDIR} ${TL_WEBDIR}/system/themes 2>/dev/null 
17 ${RMDIR} ${TL_WEBDIR}/system/config 
18 ${RMDIR} -p ${TL_WEBDIR}/system 
19 ;; 16 ;;
20esac 17esac
cvs diff -r1.8 -r1.9 pkgsrc/www/typolight/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/typolight/Attic/Makefile 2008/12/14 00:22:46 1.8
+++ pkgsrc/www/typolight/Attic/Makefile 2008/12/15 03:05:11 1.9
@@ -1,115 +1,116 @@ @@ -1,115 +1,116 @@
1# $NetBSD: Makefile,v 1.8 2008/12/14 00:22:46 taca Exp $ 1# $NetBSD: Makefile,v 1.9 2008/12/15 03:05:11 taca Exp $
2# 2#
3 3
4DISTNAME= typolight-${TL_VERSION} 4DISTNAME= typolight-${TL_VERSION}
 5PKGREVISION= 1
5CATEGORIES= www 6CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typolight/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typolight/}
7 8
8MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
9HOMEPAGE= http://www.typolight.org/ 10HOMEPAGE= http://www.typolight.org/
10COMMENT= Powerful web content management system (CMS) 11COMMENT= Powerful web content management system (CMS)
11 12
12DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd 13DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.1.0:../../graphics/php-gd
13DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../misc/php-mbstring 14DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.1.0:../../misc/php-mbstring
14DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.1.0:../../databases/php-mysql 15DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.1.0:../../databases/php-mysql
15DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.1.0:../../security/php-mcrypt 16DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.1.0:../../security/php-mcrypt
16DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.1.0:../../net/php5-soap 17DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.1.0:../../net/php5-soap
17 18
18PHP_VERSIONS_ACCEPTED= 5 19PHP_VERSIONS_ACCEPTED= 5
19 20
20USE_TOOLS= pax 21USE_TOOLS= pax
21NO_BUILD= yes 22NO_BUILD= yes
22 23
23EG_DATA= basic.css news.xml print.css system/config tl_files 24EG_DATA= basic.css news.xml print.css system/config tl_files
24EG_FILES= system/config/config.php system/config/countries.php \ 25EG_FILES= system/config/config.php system/config/countries.php \
25 system/config/dcaconfig.php system/config/languages.php \ 26 system/config/dcaconfig.php system/config/languages.php \
26 system/config/tcpdf.php system/config/timezones.php \ 27 system/config/tcpdf.php system/config/timezones.php \
27 system/config/tinyFlash.php system/config/tinyMCE.php \ 28 system/config/tinyFlash.php system/config/tinyMCE.php \
28 system/config/tinyNews.php 29 system/config/tinyNews.php
29TMPL_FILES= tl_files/tiny_templates/index.html \ 30TMPL_FILES= tl_files/tiny_templates/index.html \
30 tl_files/xBrowser_style_sheets/xBasic.css \ 31 tl_files/xBrowser_style_sheets/xBasic.css \
31 tl_files/xBrowser_style_sheets/xElements.css \ 32 tl_files/xBrowser_style_sheets/xElements.css \
32 tl_files/xBrowser_style_sheets/xForm.css \ 33 tl_files/xBrowser_style_sheets/xForm.css \
33 tl_files/xBrowser_style_sheets/xNavigation.css 34 tl_files/xBrowser_style_sheets/xNavigation.css
34WWW_EG_FILES= basic.css news.xml print.css 35WWW_EG_FILES= basic.css news.xml print.css
35 36
36CONF_FILES_PERMS+= ${TL_EGDIR}/system/config/localconfig.php \ 37CONF_FILES_PERMS+= ${TL_EGDIR}/system/config/localconfig.php \
37 ${TL_WEBDIR}/system/config/localconfig.php \ 38 ${TL_WEBDIR}/system/config/localconfig.php \
38 ${APACHE_USER} ${APACHE_GROUP} 0600 39 ${APACHE_USER} ${APACHE_GROUP} 0600
39 40
40CONF_FILES+= ${TL_EGDIR}/typolight.conf \ 41CONF_FILES+= ${TL_EGDIR}/typolight.conf \
41 ${PKG_SYSCONFDIR}/typolight.conf 42 ${PKG_SYSCONFDIR}/typolight.conf
42 43
43.for f in ${EG_FILES} 44.for f in ${EG_FILES}
44CONF_FILES+= ${TL_EGDIR}/${f} ${TL_WEBDIR}/${f} 45CONF_FILES+= ${TL_EGDIR}/${f} ${TL_WEBDIR}/${f}
45.endfor 46.endfor
46 47
47.for f in ${TMPL_FILES} 48.for f in ${TMPL_FILES}
48REQD_FILES+= ${TL_EGDIR}/${f} ${TL_WEBDIR}/${f} 49REQD_FILES+= ${TL_EGDIR}/${f} ${TL_WEBDIR}/${f}
49.endfor 50.endfor
50 51
51.for f in ${WWW_EG_FILES} 52.for f in ${WWW_EG_FILES}
52CONF_FILES_PERMS+= ${TL_EGDIR}/${f} ${TL_WEBDIR}/${f} \ 53CONF_FILES_PERMS+= ${TL_EGDIR}/${f} ${TL_WEBDIR}/${f} \
53 ${APACHE_USER} ${APACHE_GROUP} 0644 54 ${APACHE_USER} ${APACHE_GROUP} 0644
54.endfor 55.endfor
55 56
56SUBST_CLASSES+= conf 57SUBST_CLASSES+= conf
57SUBST_FILES.conf+= ${WRKDIR}/typolight.conf 58SUBST_FILES.conf+= ${WRKDIR}/typolight.conf
58SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 59SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g'
59SUBST_SED.conf+= -e 's|@TL_WEBDIR@|${TL_WEBDIR:Q}|g' 60SUBST_SED.conf+= -e 's|@TL_WEBDIR@|${TL_WEBDIR:Q}|g'
60SUBST_STAGE.conf= post-configure 61SUBST_STAGE.conf= post-configure
61 62
62WWW_FILES= ._htaccess CHANGELOG.txt INSTALL.txt LICENSE.txt \ 63WWW_FILES= ._htaccess CHANGELOG.txt INSTALL.txt LICENSE.txt \
63 cron.php flash.php index.php \ 64 cron.php flash.php index.php \
64 plugins robots.txt templates typolight 65 plugins robots.txt templates typolight
65WWW_SYSFILES= config/.htaccess constants.php drivers functions.php \ 66WWW_SYSFILES= config/.htaccess constants.php drivers functions.php \
66 html iefixes.css initialize.php interface.php libraries \ 67 html iefixes.css initialize.php interface.php libraries \
67 logs/.htaccess mbstring.php modules themes tmp/.htaccess \ 68 logs/.htaccess mbstring.php modules themes tmp/.htaccess \
68 typolight.css 69 typolight.css
69 70
70INSTALLATION_DIRS+= ${TL_DOCDIR} ${TL_EGDIR} ${TL_WEBDIR}/system/config 71INSTALLATION_DIRS+= ${TL_DOCDIR} ${TL_EGDIR} ${TL_WEBDIR}/system/config
71OWN_DIRS_PERMS+= \ 72OWN_DIRS_PERMS+= \
72 ${TL_WEBDIR} ${BINOWN} ${APACHE_GROUP} 0775 \ 73 ${TL_WEBDIR} ${BINOWN} ${APACHE_GROUP} 0775 \
73 ${TL_WEBDIR}/plugins ${BINOWN} ${APACHE_GROUP} 0775 \ 74 ${TL_WEBDIR}/plugins ${BINOWN} ${APACHE_GROUP} 0775 \
74 ${TL_WEBDIR}/system ${BINOWN} ${APACHE_GROUP} 0775 \ 75 ${TL_WEBDIR}/system ${BINOWN} ${APACHE_GROUP} 0775 \
75 ${TL_WEBDIR}/system/drivers ${BINOWN} ${APACHE_GROUP} 0775 \ 76 ${TL_WEBDIR}/system/drivers ${BINOWN} ${APACHE_GROUP} 0775 \
76 ${TL_WEBDIR}/system/html ${BINOWN} ${APACHE_GROUP} 0770 \ 77 ${TL_WEBDIR}/system/html ${BINOWN} ${APACHE_GROUP} 0770 \
77 ${TL_WEBDIR}/system/libraries ${BINOWN} ${APACHE_GROUP} 0775 \ 78 ${TL_WEBDIR}/system/libraries ${BINOWN} ${APACHE_GROUP} 0775 \
78 ${TL_WEBDIR}/system/logs ${BINOWN} ${APACHE_GROUP} 0770 \ 79 ${TL_WEBDIR}/system/logs ${BINOWN} ${APACHE_GROUP} 0770 \
79 ${TL_WEBDIR}/system/modules ${BINOWN} ${APACHE_GROUP} 0775 \ 80 ${TL_WEBDIR}/system/modules ${BINOWN} ${APACHE_GROUP} 0775 \
80 ${TL_WEBDIR}/system/themes ${BINOWN} ${APACHE_GROUP} 0775 \ 81 ${TL_WEBDIR}/system/themes ${BINOWN} ${APACHE_GROUP} 0775 \
81 ${TL_WEBDIR}/system/tmp ${BINOWN} ${APACHE_GROUP} 0770 \ 82 ${TL_WEBDIR}/system/tmp ${BINOWN} ${APACHE_GROUP} 0770 \
82 ${TL_WEBDIR}/templates ${BINOWN} ${APACHE_GROUP} 0770 \ 83 ${TL_WEBDIR}/templates ${BINOWN} ${APACHE_GROUP} 0770 \
83 ${TL_WEBDIR}/tl_files ${BINOWN} ${APACHE_GROUP} 0770 \ 84 ${TL_WEBDIR}/tl_files ${BINOWN} ${APACHE_GROUP} 0770 \
84 ${TL_WEBDIR}/tl_files/tiny_templates \ 85 ${TL_WEBDIR}/tl_files/tiny_templates \
85 ${BINOWN} ${APACHE_GROUP} 0770 \ 86 ${BINOWN} ${APACHE_GROUP} 0770 \
86 ${TL_WEBDIR}/tl_files/xBrowser_style_sheets \ 87 ${TL_WEBDIR}/tl_files/xBrowser_style_sheets \
87 ${BINOWN} ${APACHE_GROUP} 0770 88 ${BINOWN} ${APACHE_GROUP} 0770
88 89
89PKG_GROUPS_VARS+= APACHE_GROUP 90PKG_GROUPS_VARS+= APACHE_GROUP
90PKG_USERS_VARS+= APACHE_USER 91PKG_USERS_VARS+= APACHE_USER
91 92
92.include "options.mk" 93.include "options.mk"
93 94
94pre-configure: 95pre-configure:
95 ${CP} ${FILESDIR}/typolight.conf ${WRKDIR} 96 ${CP} ${FILESDIR}/typolight.conf ${WRKDIR}
96 cd ${WRKSRC}; ${RM} -rf music_academy.css \ 97 cd ${WRKSRC}; ${RM} -rf music_academy.css \
97 templates/example_website.sql tl_files/music_academy; \ 98 templates/example_website.sql tl_files/music_academy; \
98 ${CP} /dev/null news.xml 99 ${CP} /dev/null news.xml
99 100
100do-install: 101do-install:
101 cd ${WRKSRC}; pax -rw -pm ${WWW_FILES} ${DESTDIR}${PREFIX}/${TL_WEBDIR} 102 cd ${WRKSRC}; pax -rw -pm ${WWW_FILES} ${DESTDIR}${PREFIX}/${TL_WEBDIR}
102 cd ${WRKSRC}/system; \ 103 cd ${WRKSRC}/system; \
103 pax -rw -pm ${WWW_SYSFILES} \ 104 pax -rw -pm ${WWW_SYSFILES} \
104 ${DESTDIR}${PREFIX}/${TL_WEBDIR}/system; \ 105 ${DESTDIR}${PREFIX}/${TL_WEBDIR}/system; \
105 ${INSTALL_DATA} config/.htaccess \ 106 ${INSTALL_DATA} config/.htaccess \
106 ${DESTDIR}${PREFIX}/${TL_WEBDIR}/system/config 107 ${DESTDIR}${PREFIX}/${TL_WEBDIR}/system/config
107 cd ${WRKSRC}; pax -rw -pm ${EG_DATA} ${DESTDIR}${PREFIX}/${TL_EGDIR} 108 cd ${WRKSRC}; pax -rw -pm ${EG_DATA} ${DESTDIR}${PREFIX}/${TL_EGDIR}
108 rm -f ${DESTDIR}${PREFIX}/${TL_EGDIR}/system/config/.htaccess 109 rm -f ${DESTDIR}${PREFIX}/${TL_EGDIR}/system/config/.htaccess
109 ${INSTALL_DATA} ${WRKDIR}/typolight.conf ${DESTDIR}${PREFIX}/${TL_EGDIR} 110 ${INSTALL_DATA} ${WRKDIR}/typolight.conf ${DESTDIR}${PREFIX}/${TL_EGDIR}
110 ${INSTALL_DATA} ${FILESDIR}/README \ 111 ${INSTALL_DATA} ${FILESDIR}/README \
111 ${DESTDIR}${PREFIX}/${TL_DOCDIR} 112 ${DESTDIR}${PREFIX}/${TL_DOCDIR}
112 113
113.include "Makefile.common" 114.include "Makefile.common"
114.include "../../lang/php/phpversion.mk" 115.include "../../lang/php/phpversion.mk"
115.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"