factor out the common bits of the various mozilla binary packages into

mozilla-bin/Makefile.common and mozilla-bin-nightly/Makefile.common.

the result is much less duplication and more consistent installations.
tested on NetBSD-current only (for now).

9 files changed, 26 insertions, 209 deletions

diff --git a/mail/thunderbird-bin-nightly/Makefile b/mail/thunderbird-bin-nightly/Makefile
index 4e814e085d1..8eb61816a11 100644
--- a/mail/thunderbird-bin-nightly/Makefile
+++ b/mail/thunderbird-bin-nightly/Makefile
@@ -1,86 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/04 05:25:42 grant Exp $
-#
+# $NetBSD: Makefile,v 1.2 2004/01/04 05:01:02 grant Exp $
 
-DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
-PKGNAME=		thunderbird-bin-${PKGVER}
-WRKSRC=			${WRKDIR}/thunderbird
-CATEGORIES=		mail
+MOZILLA=	thunderbird
+HOMEPAGE=	http://www.mozilla.org/projects/thunderbird/
 
-MAINTAINER=		grant@NetBSD.org
-HOMEPAGE=		http://www.mozilla.org/projects/thunderbird/
-COMMENT=		Redesign of the Mozilla mail client (nightly binary pkg)
+MOZ_GTK2=	YES
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 SunOS-5.[789]*-sparc
+ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86 SunOS-5.[789]*-sparc
 
-DIST_SUBDIR=		${PKGNAME}
-NO_CHECKSUM=		# defined
-NO_CONFIGURE=		# defined
-NO_SRC_ON_FTP=		# defined
-
-USE_PKGINSTALL=		YES
-
-.include "../../mk/bsd.prefs.mk"
-
-FILES_SUBST+=		PLATFORM=${PLATFORM}
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-PKGVER!=		${DATE} +%Y%m%d
-
-do-build:
-
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/thunderbird.sh > \
-		${WRKDIR}/thunderbird.sh
-
-do-install:
-	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
-	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/thunderbird.sh \
-		${PREFIX}/bin/thunderbird-${PLATFORM}
-
-post-install:
-# this build wants exactly 'libgtk-1.2.so.0', etc.
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-	@cd ${MOZILLA_LIB} && \
-	${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .;			\
-	${LN} -s ${X11PREFIX}/lib/libgdk-x11-2.0.*so* .;		\
-	${LN} -s ${PREFIX}/lib/libgdk_pixbuf-2.0.*so* .;		\
-	${LN} -s ${PREFIX}/lib/libglib-2.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libgmodule-2.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libgobject-2.0.*so* .;			\
-	${LN} -s ${X11PREFIX}/lib/libgtk-x11-2.0.*so* .;		\
-	${LN} -s ${PREFIX}/lib/libpango-1.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libpangox-1.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libpangoxft-1.0.*so* .;			\
-	\
-	${LN} -s libatk-1.0.so libatk-1.0.so.0;				\
-	${LN} -s libgdk-x11-2.0.so libgdk-x11-2.0.so.0;			\
-	${LN} -s libgdk_pixbuf-2.0.so libgdk_pixbuf-2.0.so.0;		\
-	${LN} -s libglib-2.0.so libglib-2.0.so.0;			\
-	${LN} -s libgmodule-2.0.so libgmodule-2.0.so.0;			\
-	${LN} -s libgobject-2.0.so libgobject-2.0.so.0;			\
-	${LN} -s libgtk-x11-2.0.so libgtk-x11-2.0.so.0;			\
-	${LN} -s libpango-1.0.so libpango-1.0.so.0;			\
-	${LN} -s libpangox-1.0.so libpangox-1.0.so.0;			\
-	${LN} -s libpangoxft-1.0.so libpangoxft-1.0.so.0
-.endif
-	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	@${ECHO} bin/thunderbird-${PLATFORM} >> ${PLIST_SRC}
-	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
-		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
-		>> ${PLIST_SRC}
-	@${FIND} ${MOZILLA_LIB} -type d -print				\
-		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
-		>> ${PLIST_SRC}
-
-.include "../../mk/bsd.prefs.mk"
-
-# everything specific to your OS/Arch goes into it's own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
-
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../www/mozilla-bin-nightly/Makefile.common"
diff --git a/mail/thunderbird-bin-nightly/Makefile.Linux.i386 b/mail/thunderbird-bin-nightly/Makefile.Linux.i386
index 5c321ae99ad..4e07b3991c9 100644
--- a/mail/thunderbird-bin-nightly/Makefile.Linux.i386
+++ b/mail/thunderbird-bin-nightly/Makefile.Linux.i386
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2003/12/13 09:30:43 grant Exp $
-#
+# $NetBSD: Makefile.Linux.i386,v 1.3 2004/01/04 05:01:02 grant Exp $
 
 DISTNAME=	thunderbird-i686-pc-linux-gnu
 EXTRACT_SUFX=	.tar.bz2
 MASTER_SITES=	http://ftp.mozilla.org/pub/thunderbird/nightly/2003-12-01-trunk/
 
-PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/thunderbird-${PLATFORM}
-
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
+MOZ_PLATFORM=	linux
diff --git a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc b/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
index c49a24f76c2..7a1fa057ee2 100644
--- a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
+++ b/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1.1.1 2003/12/04 05:25:42 grant Exp $
-#
+# $NetBSD: Makefile.SunOS.sparc,v 1.2 2004/01/04 05:01:02 grant Exp $
 
 DISTNAME=	thunderbird-sparc-sun-solaris2.7
 MASTER_SITES=	http://ftp.mozilla.org/pub/thunderbird/nightly/contrib/latest-trunk/
 
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
-
-PLATFORM=	solaris
-MOZILLA_LIB=	${PREFIX}/lib/thunderbird-${PLATFORM}
+MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin-nightly/files/thunderbird.sh b/mail/thunderbird-bin-nightly/files/thunderbird.sh
deleted file mode 100644
index 503b06802a4..00000000000
--- a/mail/thunderbird-bin-nightly/files/thunderbird.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!@SH@
-# $NetBSD: thunderbird.sh,v 1.1.1.1 2003/12/04 05:25:42 grant Exp $
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/thunderbird-@PLATFORM@:@PREFIX@/lib"
-export LD_LIBRARY_PATH
-
-exec @PREFIX@/lib/thunderbird-@PLATFORM@/thunderbird "$@"
diff --git a/mail/thunderbird-bin/Makefile b/mail/thunderbird-bin/Makefile
index 668bc5cf35f..e291225c08d 100644
--- a/mail/thunderbird-bin/Makefile
+++ b/mail/thunderbird-bin/Makefile
@@ -1,81 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/12/13 04:01:50 grant Exp $
-#
+# $NetBSD: Makefile,v 1.3 2004/01/04 05:01:02 grant Exp $
 
-DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
-PKGNAME=		thunderbird-bin-0.4
-WRKSRC=			${WRKDIR}/thunderbird
-CATEGORIES=		mail
+MOZILLA=	thunderbird
+MOZ_VER=	0.4
+HOMEPAGE=	http://www.mozilla.org/projects/thunderbird/
 
-MAINTAINER=		grant@NetBSD.org
-HOMEPAGE=		http://www.mozilla.org/projects/thunderbird/
-COMMENT=		Redesign of the Mozilla mail client (binary pkg)
+MOZ_GTK2=	YES
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 SunOS-5.[89]*-i386 SunOS-5.[89]*-sparc
+ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86 SunOS-5.[89]*-i386 SunOS-5.[89]*-sparc
 
-NO_CONFIGURE=		# defined
-
-USE_PKGINSTALL=		YES
-
-.include "../../mk/bsd.prefs.mk"
-
-FILES_SUBST+=		PLATFORM=${PLATFORM}
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-do-build:
-
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/thunderbird.sh > \
-		${WRKDIR}/thunderbird.sh
-
-do-install:
-	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
-	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/thunderbird.sh \
-		${PREFIX}/bin/thunderbird-${PLATFORM}
-
-post-install:
-# this build wants exactly 'libgtk-1.2.so.0', etc.
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-	@cd ${MOZILLA_LIB} && \
-	${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .;			\
-	${LN} -s ${X11PREFIX}/lib/libgdk-x11-2.0.*so* .;		\
-	${LN} -s ${PREFIX}/lib/libgdk_pixbuf-2.0.*so* .;		\
-	${LN} -s ${PREFIX}/lib/libglib-2.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libgmodule-2.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libgobject-2.0.*so* .;			\
-	${LN} -s ${X11PREFIX}/lib/libgtk-x11-2.0.*so* .;		\
-	${LN} -s ${PREFIX}/lib/libpango-1.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libpangox-1.0.*so* .;			\
-	${LN} -s ${PREFIX}/lib/libpangoxft-1.0.*so* .;			\
-	\
-	${LN} -s libatk-1.0.so libatk-1.0.so.0;				\
-	${LN} -s libgdk-x11-2.0.so libgdk-x11-2.0.so.0;			\
-	${LN} -s libgdk_pixbuf-2.0.so libgdk_pixbuf-2.0.so.0;		\
-	${LN} -s libglib-2.0.so libglib-2.0.so.0;			\
-	${LN} -s libgmodule-2.0.so libgmodule-2.0.so.0;			\
-	${LN} -s libgobject-2.0.so libgobject-2.0.so.0;			\
-	${LN} -s libgtk-x11-2.0.so libgtk-x11-2.0.so.0;			\
-	${LN} -s libpango-1.0.so libpango-1.0.so.0;			\
-	${LN} -s libpangox-1.0.so libpangox-1.0.so.0;			\
-	${LN} -s libpangoxft-1.0.so libpangoxft-1.0.so.0
-.endif
-	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	@${ECHO} bin/thunderbird-${PLATFORM} >> ${PLIST_SRC}
-	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
-		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
-		>> ${PLIST_SRC}
-	@${FIND} ${MOZILLA_LIB} -type d -print				\
-		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
-		>> ${PLIST_SRC}
-
-.include "../../mk/bsd.prefs.mk"
-
-# everything specific to your OS/Arch goes into it's own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
-
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../www/mozilla-bin/Makefile.common"
diff --git a/mail/thunderbird-bin/Makefile.Linux.i386 b/mail/thunderbird-bin/Makefile.Linux.i386
index 435c8d2e290..8157b52fcad 100644
--- a/mail/thunderbird-bin/Makefile.Linux.i386
+++ b/mail/thunderbird-bin/Makefile.Linux.i386
@@ -1,11 +1,6 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2003/12/13 04:01:50 grant Exp $
-#
+# $NetBSD: Makefile.Linux.i386,v 1.3 2004/01/04 05:01:02 grant Exp $
 
-DISTNAME=	thunderbird-0.4-i686-pc-linux-gtk2-gnu
+DISTNAME=	thunderbird-${MOZ_VER}-i686-pc-linux-gtk2-gnu
 EXTRACT_SUFX=	.tar.bz2
-MASTER_SITES=	http://ftp.mozilla.org/pub/thunderbird/releases/0.4/
 
-PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/thunderbird-${PLATFORM}
-
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
+MOZ_PLATFORM=	linux
diff --git a/mail/thunderbird-bin/Makefile.SunOS.i386 b/mail/thunderbird-bin/Makefile.SunOS.i386
index 61acc16fcf7..39798946e1f 100644
--- a/mail/thunderbird-bin/Makefile.SunOS.i386
+++ b/mail/thunderbird-bin/Makefile.SunOS.i386
@@ -1,10 +1,5 @@
-# $NetBSD: Makefile.SunOS.i386,v 1.2 2003/12/13 04:01:50 grant Exp $
-#
+# $NetBSD: Makefile.SunOS.i386,v 1.3 2004/01/04 05:01:02 grant Exp $
 
-DISTNAME=	thunderbird-0.4-i386-pc-solaris2.8
-MASTER_SITES=	http://ftp.mozilla.org/pub/thunderbird/releases/0.4/contrib/
+DISTNAME=	thunderbird-${MOZ_VER}-i386-pc-solaris2.8
 
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
-
-PLATFORM=	solaris
-MOZILLA_LIB=	${PREFIX}/lib/thunderbird-${PLATFORM}
+MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin/Makefile.SunOS.sparc b/mail/thunderbird-bin/Makefile.SunOS.sparc
index 4ded4cf66ae..e7058a949b6 100644
--- a/mail/thunderbird-bin/Makefile.SunOS.sparc
+++ b/mail/thunderbird-bin/Makefile.SunOS.sparc
@@ -1,10 +1,5 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/12/13 04:01:50 grant Exp $
-#
+# $NetBSD: Makefile.SunOS.sparc,v 1.2 2004/01/04 05:01:02 grant Exp $
 
-DISTNAME=	thunderbird-0.4-sparc-sun-solaris2.8
-MASTER_SITES=	http://ftp.mozilla.org/pub/thunderbird/releases/0.4/contrib/
+DISTNAME=	thunderbird-${MOZ_VER}-sparc-sun-solaris2.8
 
-DEPENDS+=	gtk2+>=2.2:../../x11/gtk2
-
-PLATFORM=	solaris
-MOZILLA_LIB=	${PREFIX}/lib/thunderbird-${PLATFORM}
+MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin/files/thunderbird.sh b/mail/thunderbird-bin/files/thunderbird.sh
deleted file mode 100644
index c231096fdfc..00000000000
--- a/mail/thunderbird-bin/files/thunderbird.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!@SH@
-# $NetBSD: thunderbird.sh,v 1.1.1.1 2003/12/04 05:24:42 grant Exp $
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/thunderbird-@PLATFORM@:@PREFIX@/lib"
-export LD_LIBRARY_PATH
-
-exec @PREFIX@/lib/thunderbird-@PLATFORM@/thunderbird "$@"