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 (expand / 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 (expand / 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,17 +1,18 @@ @@ -1,17 +1,18 @@
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