Some fixes and improvement for typo3 package. (This is a leaf packge.)

* Enable DESTDIR support.
* Fix installing a none-existing file.
* Tweak default path for optional programs; GraphicMagick or ImageMagick.
* Remove files/directories at uninstall suitably.

Bump PKGREVISION.

5 files changed, 38 insertions, 14 deletions

diff --git a/www/typo3/DEINSTALL b/www/typo3/DEINSTALL
index b0bd0c4c95d..a49ecd15d36 100644
--- a/www/typo3/DEINSTALL
+++ b/www/typo3/DEINSTALL
@@ -1,7 +1,8 @@
-# $NetBSD: DEINSTALL,v 1.2 2008/09/22 15:42:56 taca Exp $
+# $NetBSD: DEINSTALL,v 1.3 2008/09/25 02:22:12 taca Exp $
 
-DIR="@PREFIX@/@TYPO3DIR@/@SITEDIR@"
-TYPO3DIRS="uploads/tf uploads/pics uploads/media uploads typo3temp \
+TYPO3_DIR="@PREFIX@/@TYPO3DIR@"
+TYPO3_SITEDIR="${TYPO3_DIR}/@SITEDIR@"
+TYPO3_SUBDIRS="uploads/tf uploads/pics uploads/media uploads typo3temp \
 	typo3conf/l10n typo3conf/ext typo3conf \
 	fileadmin/user_upload/_temp_ fileadmin/user_upload fileadmin/_temp_ \
 	fileadmin ${DIR}"
@@ -9,12 +10,15 @@ TYPO3DIRS="uploads/tf uploads/pics uploads/media uploads typo3temp \
 case ${STAGE} in
 DEINSTALL)
 	(
-	cd ${DIR}
+	cd ${TYPO3_SITEDIR}
+	${RM} -f typo3conf/ENABLE_INSTALL_TOOL
 	${RM} -f typo3conf/temp*.php
-	${RM} -rf typo3temp/*
-	for d in ${TYPO3DIRS}; do
-		${RMDIR} $d 2>/dev/null
+	${RM} -fr typo3temp/*
+	for d in ${TYPO3_SUBDIRS}; do
+		test -d $d && ${RMDIR} $d 2>/dev/null
 	done
 	)
+	${RMDIR} ${TYPO3_SITEDIR} 2>/dev/null
+	${RMDIR} ${TYPO3_DIR} 2>/dev/null
 	;;
 esac
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index dbcdb215b8c..40aed92e926 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/09/22 15:42:56 taca Exp $
+# $NetBSD: Makefile,v 1.5 2008/09/25 02:22:12 taca Exp $
 #
 
 DISTNAME=	${TYPO3NAME}
 PKGNAME=	typo3-${VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=typo3/}
 DISTFILES=	${TYPO3NAME}${EXTRACT_SUFX} ${SITESRC}${EXTRACT_SUFX}
@@ -16,7 +16,7 @@ DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2.0:../../www/ap-php
 DEPENDS+=	${PHP_PKG_PREFIX}-{mysql,pgsql}>=5.1.0:../../databases/php-mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib/
 
-#PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_DESTDIR_SUPPORT=	destdir
 
 VER=		4.2.1
 NO_BUILD=	yes
@@ -60,6 +60,7 @@ CHECK_PERMS_SKIP+= ${TYPO3DIR}/${SITEDIR}/${d}
 
 SUBST_CLASSES+=		conf
 SUBST_FILES.conf+=	${WRKDIR}/README
+SUBST_FILES.conf+=	${WRKSRC}/t3lib/config_default.php
 SUBST_SED.conf+=        -e 's|@PREFIX@|${PREFIX:Q}|g'
 SUBST_SED.conf+=        -e 's|@TYPO3DIR@|${TYPO3DIR:Q}|g'
 SUBST_SED.conf+=        -e 's|@SITEDIR@|${SITEDIR:Q}|g'
@@ -73,11 +74,15 @@ TYPO3DIR?=	share/typo3
 post-extract:
 	${CP} ${FILESDIR}/README ${WRKDIR}
 
+pre-install:
+	${FIND} ${WRKSRC:Q} -name "*.orig*" -exec ${RM} -f {} \;
+
 do-install:
 	cd ${WRKSRC}; pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME}
 	cd ${WRKDIR}/${SITESRC}; \
 		pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}
-	${INSTALL_DATA} ${WRKDIR}/localconf.php ${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/${SITESRC}/typo3conf/localconf.php \
+		${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
diff --git a/www/typo3/PLIST b/www/typo3/PLIST
index ad39714f2ed..19b0cdcf9d9 100644
--- a/www/typo3/PLIST
+++ b/www/typo3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/09/22 15:42:56 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/09/25 02:22:12 taca Exp $
 ${EGDIR}/localconf.php
 ${TYPO3DIR}/${TYPO3NAME}/ChangeLog
 ${TYPO3DIR}/${TYPO3NAME}/GPL.txt
@@ -4274,5 +4274,4 @@ ${TYPO3DIR}/${SITEDIR}/uploads/index.html
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/misc/phpcheck
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/misc
 @dirrm ${TYPO3DIR}/${TYPO3NAME}
-@unexec ${RMDIR} %D/${TYPO3DIR} >/dev/null 2>&1
 @dirrm ${EGDIR}
diff --git a/www/typo3/distinfo b/www/typo3/distinfo
index da89a93a67e..7568557bc1a 100644
--- a/www/typo3/distinfo
+++ b/www/typo3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/15 18:13:38 taca Exp $
+$NetBSD: distinfo,v 1.2 2008/09/25 02:22:12 taca Exp $
 
 SHA1 (dummy-4.2.1.tar.gz) = 5ab30a8b1c8ee514a52f6995ee33740550b94c5b
 RMD160 (dummy-4.2.1.tar.gz) = 6e1469dd5d10047f192c8b18a6c77ddf237a014c
@@ -6,3 +6,4 @@ Size (dummy-4.2.1.tar.gz) = 9436 bytes
 SHA1 (typo3_src-4.2.1.tar.gz) = a8410f2a1f0495500caf4ac48b5778b5a7437d09
 RMD160 (typo3_src-4.2.1.tar.gz) = 43d827b2ee6b8015fbac77f44ac8afc1df79f0a2
 Size (typo3_src-4.2.1.tar.gz) = 8351003 bytes
+SHA1 (patch-aa) = 12dc31e5d1b03f38c4957a08a5451da667d58214
diff --git a/www/typo3/patches/patch-aa b/www/typo3/patches/patch-aa
new file mode 100644
index 00000000000..25495bc4edc
--- /dev/null
+++ b/www/typo3/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2008/09/25 02:22:13 taca Exp $
+
+--- t3lib/config_default.php.orig	2008-06-11 17:14:58.000000000 +0900
++++ t3lib/config_default.php
+@@ -36,8 +36,8 @@ $TYPO3_CONF_VARS = Array(
+ 		'gdlib_2' => 0,							// String/Boolean. Set this if you are using the new GDlib 2.0.1+. If you don't set this flag and still use GDlib2, you might encounter strange behaviours like black images etc. This feature might take effect only if ImageMagick is installed and working as well! You can also use the value "no_imagecopyresized_fix" - in that case it will NOT try to fix a known issue where "imagecopyresized" does not work correctly.
+ 
+ 		'im' => 1,								// Boolean. Enables the use of IM.
+-		'im_path' => '/usr/X11R6/bin/',			// Path to the IM tools 'convert', 'combine', 'identify'. Version 4.2.9 of ImageMagick is highly recommended due to features and speed!
+-		'im_path_lzw' => '/usr/bin/',			// Path to the IM tool 'convert' with LZW enabled! See 'gif_compress'. If your version 4.2.9 of ImageMagick is compiled with LZW you may leave this field blank AND disable the flag 'gif_compress'! Tip: You can call LZW 'convert' with a prefix like 'myver_convert' by setting this path with it, eg. '/usr/bin/myver_' instead of just '/usr/bin/'.
++		'im_path' => '@PREFIX@/bin/',			// Path to the IM tools 'convert', 'combine', 'identify'. Version 4.2.9 of ImageMagick is highly recommended due to features and speed!
++		'im_path_lzw' => '@PREFIX@/bin/',			// Path to the IM tool 'convert' with LZW enabled! See 'gif_compress'. If your version 4.2.9 of ImageMagick is compiled with LZW you may leave this field blank AND disable the flag 'gif_compress'! Tip: You can call LZW 'convert' with a prefix like 'myver_convert' by setting this path with it, eg. '/usr/bin/myver_' instead of just '/usr/bin/'.
+ 
+ 		'im_version_5' => '',					// String. Set this if you're using ImageMagick/GraphicsMagick but not IM 4.x. Setting this value will automatically configure some settings for use with the specified program version. Allowed values are: "im4", "im5", "im6" and "gm" (uses GraphicsMagick instead of ImageMagick).
+ 		'im_negate_mask' => 0,					// Boolean. Indicates if the mask images should be inverted first. This depends of the ImageMagick version. Below ver. 5.1 this should be false. Above ImageMagick version 5.2+ it should be true. Just set the flag if the masks works opposite the intension!