- Convert all gecko pkg-[de]install scripts into a generic

  pkg-[de]install script
- Always use pkg-install to create missing dir's [1]

Requested by:	marcus [1]

9 files changed, 9 insertions, 165 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 35a80ff3e8b8..3c98405eb468 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
@@ -83,11 +84,12 @@ pre-install:
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+	@${ECHO_CMD} '${PORTNAME_ICON:S|${PREFIX}/||}' >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
+		${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/pkg-deinstall.in b/mail/thunderbird-esr/pkg-deinstall.in
deleted file mode 100644
index c921e64d63d8..000000000000
--- a/mail/thunderbird-esr/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
-rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-#rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-
-exit 0
diff --git a/mail/thunderbird-esr/pkg-install.in b/mail/thunderbird-esr/pkg-install.in
deleted file mode 100644
index 39e08dad1695..000000000000
--- a/mail/thunderbird-esr/pkg-install.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 35a80ff3e8b8..3c98405eb468 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
@@ -83,11 +84,12 @@ pre-install:
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+	@${ECHO_CMD} '${PORTNAME_ICON:S|${PREFIX}/||}' >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
+		${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird/pkg-deinstall.in b/mail/thunderbird/pkg-deinstall.in
deleted file mode 100644
index c921e64d63d8..000000000000
--- a/mail/thunderbird/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
-rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-#rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-
-exit 0
diff --git a/mail/thunderbird/pkg-install.in b/mail/thunderbird/pkg-install.in
deleted file mode 100644
index 39e08dad1695..000000000000
--- a/mail/thunderbird/pkg-install.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 35a80ff3e8b8..3c98405eb468 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
@@ -83,11 +84,12 @@ pre-install:
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/ 2>/dev/null || ${TRUE}" >> ${PLIST}
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+	@${ECHO_CMD} '${PORTNAME_ICON:S|${PREFIX}/||}' >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
+		${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird3/pkg-deinstall.in b/mail/thunderbird3/pkg-deinstall.in
deleted file mode 100644
index c921e64d63d8..000000000000
--- a/mail/thunderbird3/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -rf ${MOZDIR}/chrome/icons/default/default.xpm
-rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-#rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-
-exit 0
diff --git a/mail/thunderbird3/pkg-install.in b/mail/thunderbird3/pkg-install.in
deleted file mode 100644
index 39e08dad1695..000000000000
--- a/mail/thunderbird3/pkg-install.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-THUNDERBIRD=${MOZDIR}/thunderbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
-
-exit 0