diff options
43 files changed, 302 insertions, 892 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 "$@" diff --git a/www/MozillaFirebird-bin-nightly/Makefile b/www/MozillaFirebird-bin-nightly/Makefile index 8c7d23a4eb4..f0f41ca7ae3 100644 --- a/www/MozillaFirebird-bin-nightly/Makefile +++ b/www/MozillaFirebird-bin-nightly/Makefile @@ -1,93 +1,14 @@ -# $NetBSD: Makefile,v 1.7 2003/12/26 22:46:56 wiz Exp $ -# +# $NetBSD: Makefile,v 1.8 2004/01/04 05:01:03 grant Exp $ -DISTNAME= # see Makefile.${OPSYS}.${ARCH} -PKGNAME= MozillaFirebird-bin-${PKGVER} -WRKSRC= ${WRKDIR}/MozillaFirebird -CATEGORIES= www +MOZILLA= MozillaFirebird +HOMEPAGE= http://www.mozilla.org/projects/firebird/ -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.mozilla.org/projects/firebird/ -COMMENT= Lightweight gecko-based web browser (nightly binary pkg) +# this package was formerly named "phoenix-linux", and "phoenix-bin". +CONFLICTS+= phoenix-linux-[0-9]* +CONFLICTS+= phoenix-bin-[0-9]* -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc +# see Makefile.NetBSD.i386. +ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM+= SunOS-5.[789]*-sparc -# this package was formerly named "phoenix-linux", and -# "phoenix-bin". -CONFLICTS+= phoenix-linux-[0-9]* -CONFLICTS+= phoenix-bin-[0-9]* - -DIST_SUBDIR= ${PKGNAME} -NO_CHECKSUM= # defined -NO_CONFIGURE= # defined -NO_SRC_ON_FTP= # defined - -USE_PKGINSTALL= YES - -PLATFORM= dummy - -.include "../../mk/bsd.prefs.mk" - -PKGVER!= ${DATE} +%Y%m%d - -FILES_SUBST+= PLATFORM=${PLATFORM} -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -# 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 - -.if ${PLATFORM} == "linux" && ${OPSYS} == "NetBSD" -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.compat_linux -.endif - -do-build: - -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/MozillaFirebird.sh > \ - ${WRKDIR}/MozillaFirebird.sh - -do-install: - ${INSTALL_DATA_DIR} ${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} - ${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh \ - ${PREFIX}/bin/MozillaFirebird-${PLATFORM} - @${FIND} ${MOZILLA_LIB} -type f -print \ - | ${XARGS} ${CHMOD} a+r - @${FIND} ${MOZILLA_LIB} \( -type f -o -perm -u+x \) -print \ - | ${XARGS} ${CHMOD} a+rx - @${FIND} ${MOZILLA_LIB} -type d -print \ - | ${XARGS} ${CHMOD} a+rx - @${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so - -post-install: -# this build wants exactly 'libgtk-1.2.so.0', etc. -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" - @cd ${MOZILLA_LIB} && \ - ${LN} -s ${PREFIX}/lib/libglib.*so* .; \ - ${LN} -s ${PREFIX}/lib/libgmodule.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .; \ - ${LN} -s libgtk.so libgtk-1.2.so.0; \ - ${LN} -s libgdk.so libgdk-1.2.so.0; \ - ${LN} -s libglib.so libglib-1.2.so.0; \ - ${LN} -s libgmodule.so libgmodule-1.2.so.0 -.endif -.if defined(_COMPAT16_LIBSTDCXX) - @cd ${MOZILLA_LIB} && \ - ${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* . -.endif - @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} - @${ECHO} bin/MozillaFirebird-${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.pkg.mk" +.include "../../www/mozilla-bin-nightly/Makefile.common" diff --git a/www/MozillaFirebird-bin-nightly/Makefile.Linux.i386 b/www/MozillaFirebird-bin-nightly/Makefile.Linux.i386 index bfd4207b59c..6fc034ded08 100644 --- a/www/MozillaFirebird-bin-nightly/Makefile.Linux.i386 +++ b/www/MozillaFirebird-bin-nightly/Makefile.Linux.i386 @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.Linux.i386,v 1.2 2003/10/19 08:35:09 grant Exp $ -# +# $NetBSD: Makefile.Linux.i386,v 1.3 2004/01/04 05:01:03 grant Exp $ DISTNAME= MozillaFirebird-i686-pc-linux-gnu -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/nightly/latest-trunk/ -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} +MOZ_PLATFORM= linux diff --git a/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386 b/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386 index d52aa9b17ec..f2c2d07b5f3 100644 --- a/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386 +++ b/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386 @@ -1,31 +1,12 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.5 2003/12/17 21:43:29 grant Exp $ -# +# $NetBSD: Makefile.NetBSD.i386,v 1.6 2004/01/04 05:01:03 grant Exp $ .if defined(MOZILLA_USE_LINUX) DISTNAME= MozillaFirebird-i686-pc-linux-gnu -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/nightly/latest-trunk/ - -PLATFORM= linux - -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk -. include "../../emulators/suse_linux/Makefile.application" +MOZ_PLATFORM= linux +ONLY_FOR_PLATFORM+= NetBSD-*-i386 .else DISTNAME= MozillaFirebird-i386-unknown-netbsdelf1.6 -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/nightly/contrib/latest-trunk/ EXTRACT_SUFX= .tar.bz2 - +MOZ_PLATFORM= netbsd ONLY_FOR_PLATFORM+= NetBSD-1.6*-i386 NetBSD-2*-i386 - -PLATFORM= netbsd - -DEPENDS+= gtk+>=1.2.10nb5:../../x11/gtk - -. if !exists(/usr/lib/libstdc++.so.4) -DEPENDS+= compat16>=1.6.0:../../emulators/compat16 -_COMPAT16_LIBSTDCXX= YES -. endif .endif - -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} diff --git a/www/MozillaFirebird-bin-nightly/Makefile.SunOS.sparc b/www/MozillaFirebird-bin-nightly/Makefile.SunOS.sparc index 3f30f3b7d42..9989a85c5b7 100644 --- a/www/MozillaFirebird-bin-nightly/Makefile.SunOS.sparc +++ b/www/MozillaFirebird-bin-nightly/Makefile.SunOS.sparc @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/09/27 14:13:08 grant Exp $ -# +# $NetBSD: Makefile.SunOS.sparc,v 1.2 2004/01/04 05:01:03 grant Exp $ DISTNAME= MozillaFirebird-sparc-sun-solaris2.7-static -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/nightly/contrib/latest-trunk/ -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= ${LOWER_OPSYS} -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} +MOZ_PLATFORRM= solaris diff --git a/www/MozillaFirebird-bin-nightly/files/MozillaFirebird.sh b/www/MozillaFirebird-bin-nightly/files/MozillaFirebird.sh deleted file mode 100644 index 28fc5d1b27f..00000000000 --- a/www/MozillaFirebird-bin-nightly/files/MozillaFirebird.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!@SH@ -# $NetBSD: MozillaFirebird.sh,v 1.1 2003/09/27 14:13:08 grant Exp $ - -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib" -export LD_LIBRARY_PATH - -exec @PREFIX@/lib/MozillaFirebird-@PLATFORM@/MozillaFirebird "$@" diff --git a/www/MozillaFirebird-bin/MESSAGE.NetBSD b/www/MozillaFirebird-bin/MESSAGE.NetBSD deleted file mode 100644 index dfa45cca4c6..00000000000 --- a/www/MozillaFirebird-bin/MESSAGE.NetBSD +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.NetBSD,v 1.1 2003/09/27 14:13:08 grant Exp $ - - Mozilla Firebird requires your kernel to include 'COMPAT_LINUX' - (plus in NetBSD systems before 1.5 'EXEC_ELF32'). - - Please note that if you have INET6 enabled in your kernel, you - will need to set net.inet6.ip6.v6only=0, using sysctl(8). - -=========================================================================== diff --git a/www/MozillaFirebird-bin/Makefile b/www/MozillaFirebird-bin/Makefile index 49bf343e990..e1c0e5eb3db 100644 --- a/www/MozillaFirebird-bin/Makefile +++ b/www/MozillaFirebird-bin/Makefile @@ -1,77 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2003/12/30 16:53:35 cjep Exp $ -# +# $NetBSD: Makefile,v 1.6 2004/01/04 05:01:03 grant Exp $ -DISTNAME= # see Makefile.${OPSYS}.${ARCH} -PKGNAME= MozillaFirebird-bin-${PKGVER} -WRKSRC= ${WRKDIR}/MozillaFirebird -CATEGORIES= www -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/releases/${PKGVER}/ \ - ftp://ftp.mozilla.org/pub/firebird/releases/${PKGVER}/ \ - http://public.planetmirror.com.au/pub/firebird/releases/${PKGVER}/ \ - ftp://public.planetmirror.com.au/pub/firebird/releases/${PKGVER}/ +MOZILLA= MozillaFirebird -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.mozilla.org/projects/firebird/ -COMMENT= Lightweight gecko-based web browser (binary pkg) - -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc SunOS-5.[89]*-i386 +HOMEPAGE= http://www.mozilla.org/projects/firebird/ # this package was formerly named "phoenix-linux", and "phoenix-bin". -CONFLICTS+= phoenix-linux-[0-9]* -CONFLICTS+= phoenix-bin-[0-9]* - -NO_CONFIGURE= YES -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}/MozillaFirebird.sh > \ - ${WRKDIR}/MozillaFirebird.sh - -do-install: - ${INSTALL_DATA_DIR} ${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} - ${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh \ - ${PREFIX}/bin/MozillaFirebird-${PLATFORM} - @${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so - -post-install: -# this build wants exactly 'libgtk-1.2.so.0', etc. -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" - @cd ${MOZILLA_LIB} && \ - ${LN} -s ${PREFIX}/lib/libglib.*so* .; \ - ${LN} -s ${PREFIX}/lib/libgmodule.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .; \ - ${LN} -s libgtk.so libgtk-1.2.so.0; \ - ${LN} -s libgdk.so libgdk-1.2.so.0; \ - ${LN} -s libglib.so libglib-1.2.so.0; \ - ${LN} -s libgmodule.so libgmodule-1.2.so.0 - -.endif - @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} - @${ECHO} bin/MozillaFirebird-${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} +CONFLICTS+= phoenix-linux-[0-9]* +CONFLICTS+= phoenix-bin-[0-9]* -.if exists(Makefile.${OPSYS}.${ARCH}) -. include "Makefile.${OPSYS}.${ARCH}" -.endif +ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 NetBSD-*-i386 +ONLY_FOR_PLATFORM+= SunOS-5.[789]*-sparc SunOS-5.[89]*-i386 -.include "../../mk/bsd.pkg.mk" +.include "../../www/mozilla-bin/Makefile.common" diff --git a/www/MozillaFirebird-bin/Makefile.Linux.i386 b/www/MozillaFirebird-bin/Makefile.Linux.i386 index 2095a1e1021..c0e9d955405 100644 --- a/www/MozillaFirebird-bin/Makefile.Linux.i386 +++ b/www/MozillaFirebird-bin/Makefile.Linux.i386 @@ -1,10 +1,6 @@ -# $NetBSD: Makefile.Linux.i386,v 1.4 2003/12/20 11:24:51 grant Exp $ -# +# $NetBSD: Makefile.Linux.i386,v 1.5 2004/01/04 05:01:03 grant Exp $ -PKGVER= 0.7 -DISTNAME= MozillaFirebird-${PKGVER}-i686-pc-linux-gnu +MOZ_VER= 0.7 +DISTNAME= MozillaFirebird-${MOZ_VER}-i686-pc-linux-gnu -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} +MOZ_PLATFORM= linux diff --git a/www/MozillaFirebird-bin/Makefile.NetBSD.i386 b/www/MozillaFirebird-bin/Makefile.NetBSD.i386 index 6c7accde311..04cbcef468a 100644 --- a/www/MozillaFirebird-bin/Makefile.NetBSD.i386 +++ b/www/MozillaFirebird-bin/Makefile.NetBSD.i386 @@ -1,16 +1,6 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.4 2003/12/20 11:24:51 grant Exp $ -# +# $NetBSD: Makefile.NetBSD.i386,v 1.5 2004/01/04 05:01:03 grant Exp $ -PKGVER= 0.7 -DISTNAME= MozillaFirebird-${PKGVER}-i686-pc-linux-gnu +MOZ_VER= 0.7 +DISTNAME= MozillaFirebird-${MOZ_VER}-i686-pc-linux-gnu -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} - -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk - -CONFLICTS+= suse_libc5-[0-9]* - -.include "../../emulators/suse_linux/Makefile.application" +MOZ_PLATFORM= linux diff --git a/www/MozillaFirebird-bin/Makefile.SunOS.i386 b/www/MozillaFirebird-bin/Makefile.SunOS.i386 index a611641e6d9..8fdf5984241 100644 --- a/www/MozillaFirebird-bin/Makefile.SunOS.i386 +++ b/www/MozillaFirebird-bin/Makefile.SunOS.i386 @@ -1,11 +1,6 @@ -# $NetBSD: Makefile.SunOS.i386,v 1.2 2003/12/20 11:24:51 grant Exp $ -# +# $NetBSD: Makefile.SunOS.i386,v 1.3 2004/01/04 05:01:03 grant Exp $ -PKGVER= 0.7 -DISTNAME= MozillaFirebird-${PKGVER}-i386-pc-solaris2.8 -MASTER_SITES:= ${MASTER_SITES:S|$|contrib/|} +MOZ_VER= 0.7 +DISTNAME= MozillaFirebird-${MOZ_VER}-i386-pc-solaris2.8 -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= ${LOWER_OPSYS} -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} +MOZ_PLATFORM= solaris diff --git a/www/MozillaFirebird-bin/Makefile.SunOS.sparc b/www/MozillaFirebird-bin/Makefile.SunOS.sparc index ba7ed28e356..04adc2a88cd 100644 --- a/www/MozillaFirebird-bin/Makefile.SunOS.sparc +++ b/www/MozillaFirebird-bin/Makefile.SunOS.sparc @@ -1,11 +1,6 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.3 2003/12/20 11:24:51 grant Exp $ -# +# $NetBSD: Makefile.SunOS.sparc,v 1.4 2004/01/04 05:01:03 grant Exp $ -PKGVER= 0.6.1 -DISTNAME= MozillaFirebird-${PKGVER}-sparc-sun-solaris2.7 -MASTER_SITES:= ${MASTER_SITES:S|$|contrib/|} +MOZ_VER= 0.6.1 +DISTNAME= MozillaFirebird-${MOZ_VER}-sparc-sun-solaris2.7 -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= ${LOWER_OPSYS} -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-${PLATFORM} +MOZ_PLATFORM= solaris diff --git a/www/MozillaFirebird-bin/files/MozillaFirebird.sh b/www/MozillaFirebird-bin/files/MozillaFirebird.sh deleted file mode 100644 index 28fc5d1b27f..00000000000 --- a/www/MozillaFirebird-bin/files/MozillaFirebird.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!@SH@ -# $NetBSD: MozillaFirebird.sh,v 1.1 2003/09/27 14:13:08 grant Exp $ - -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib" -export LD_LIBRARY_PATH - -exec @PREFIX@/lib/MozillaFirebird-@PLATFORM@/MozillaFirebird "$@" diff --git a/www/MozillaFirebird-gtk2-bin-nightly/Makefile b/www/MozillaFirebird-gtk2-bin-nightly/Makefile index 85b0b4ea480..6f6d755fad2 100644 --- a/www/MozillaFirebird-gtk2-bin-nightly/Makefile +++ b/www/MozillaFirebird-gtk2-bin-nightly/Makefile @@ -1,86 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/31 04:12:11 grant Exp $ +# $NetBSD: Makefile,v 1.2 2004/01/04 05:01:03 grant Exp $ # -DISTNAME= # see Makefile.${OPSYS}.${ARCH} -PKGNAME= MozillaFirebird-gtk2-bin-${PKGVER} -WRKSRC= ${WRKDIR}/MozillaFirebird -CATEGORIES= www +MOZILLA= MozillaFirebird +HOMEPAGE= http://www.mozilla.org/projects/firebird/ -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.mozilla.org/projects/firebird/ -COMMENT= Lightweight gecko-based web browser (nightly binary pkg) +MOZ_GTK2= YES -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 -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}/MozillaFirebird.sh > \ - ${WRKDIR}/MozillaFirebird.sh - -do-install: - ${INSTALL_DATA_DIR} ${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} - ${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh \ - ${PREFIX}/bin/MozillaFirebird-gtk2-${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/MozillaFirebird-gtk2-${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/www/MozillaFirebird-gtk2-bin-nightly/Makefile.Linux.i386 b/www/MozillaFirebird-gtk2-bin-nightly/Makefile.Linux.i386 index 9ed3c947e19..6a1388e235f 100644 --- a/www/MozillaFirebird-gtk2-bin-nightly/Makefile.Linux.i386 +++ b/www/MozillaFirebird-gtk2-bin-nightly/Makefile.Linux.i386 @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2003/12/31 04:12:11 grant Exp $ -# +# $NetBSD: Makefile.Linux.i386,v 1.2 2004/01/04 05:01:03 grant Exp $ DISTNAME= MozillaFirebird-i686-linux-gtk2+xft -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/nightly/latest-trunk/ -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-gtk2-${PLATFORM} - -DEPENDS+= gtk2+>=2.2:../../x11/gtk2 +MOZ_PLATFORM= linux diff --git a/www/MozillaFirebird-gtk2-bin-nightly/files/MozillaFirebird.sh b/www/MozillaFirebird-gtk2-bin-nightly/files/MozillaFirebird.sh deleted file mode 100644 index 18454d506eb..00000000000 --- a/www/MozillaFirebird-gtk2-bin-nightly/files/MozillaFirebird.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!@SH@ -# $NetBSD: MozillaFirebird.sh,v 1.1.1.1 2003/12/31 04:12:11 grant Exp $ - -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-gtk2-@PLATFORM@:@PREFIX@/lib" -export LD_LIBRARY_PATH - -exec @PREFIX@/lib/MozillaFirebird-gtk2-@PLATFORM@/MozillaFirebird "$@" diff --git a/www/MozillaFirebird-gtk2-bin/Makefile b/www/MozillaFirebird-gtk2-bin/Makefile index 1b2d13cd71e..0e78f2543a4 100644 --- a/www/MozillaFirebird-gtk2-bin/Makefile +++ b/www/MozillaFirebird-gtk2-bin/Makefile @@ -1,81 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2003/12/30 22:59:40 grant Exp $ -# +# $NetBSD: Makefile,v 1.3 2004/01/04 05:01:03 grant Exp $ -DISTNAME= # see Makefile.${OPSYS}.${ARCH} -PKGNAME= MozillaFirebird-gtk2-bin-0.7 -WRKSRC= ${WRKDIR}/MozillaFirebird -CATEGORIES= www +MOZILLA= MozillaFirebird +MOZ_VER= 0.7 +HOMEPAGE= http://www.mozilla.org/projects/firebird/ -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.mozilla.org/projects/firebird/ -COMMENT= Lightweight gecko-based web browser (binary pkg) +MOZ_GTK2= YES -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 -NO_CONFIGURE= YES -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}/MozillaFirebird.sh > \ - ${WRKDIR}/MozillaFirebird.sh - -do-install: - ${INSTALL_DATA_DIR} ${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} - ${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh \ - ${PREFIX}/bin/MozillaFirebird-gtk2-${PLATFORM} - @${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so - -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/MozillaFirebird-gtk2-${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/www/MozillaFirebird-gtk2-bin/Makefile.Linux.i386 b/www/MozillaFirebird-gtk2-bin/Makefile.Linux.i386 index 154235e827d..bbf04bd6094 100644 --- a/www/MozillaFirebird-gtk2-bin/Makefile.Linux.i386 +++ b/www/MozillaFirebird-gtk2-bin/Makefile.Linux.i386 @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2003/12/30 22:48:32 grant Exp $ -# +# $NetBSD: Makefile.Linux.i386,v 1.2 2004/01/04 05:01:03 grant Exp $ -DISTNAME= MozillaFirebird-0.7-i686-linux-gtk2+xft -MASTER_SITES= http://ftp.mozilla.org/pub/firebird/releases/0.7/ +DISTNAME= MozillaFirebird-${MOZ_VER}-i686-linux-gtk2+xft -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/MozillaFirebird-gtk2-${PLATFORM} - -DEPENDS+= gtk2+>=2.2:../../x11/gtk2 +MOZ_PLATFORM= linux diff --git a/www/MozillaFirebird-gtk2-bin/files/MozillaFirebird.sh b/www/MozillaFirebird-gtk2-bin/files/MozillaFirebird.sh deleted file mode 100644 index c98fcde1518..00000000000 --- a/www/MozillaFirebird-gtk2-bin/files/MozillaFirebird.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!@SH@ -# $NetBSD: MozillaFirebird.sh,v 1.1.1.1 2003/12/30 22:48:32 grant Exp $ - -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-gtk2-@PLATFORM@:@PREFIX@/lib" -export LD_LIBRARY_PATH - -exec @PREFIX@/lib/MozillaFirebird-gtk2-@PLATFORM@/MozillaFirebird "$@" diff --git a/www/mozilla-bin-nightly/MESSAGE.NetBSD b/www/mozilla-bin-nightly/MESSAGE.NetBSD deleted file mode 100644 index 4db2c15c19d..00000000000 --- a/www/mozilla-bin-nightly/MESSAGE.NetBSD +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2003/05/20 14:25:14 grant Exp $ - - Mozilla requires your kernel to include 'COMPAT_LINUX' (plus in - NetBSD systems before 1.5 'EXEC_ELF32'). - - Please note that if you have INET6 enabled in your kernel, you - will need to set net.inet6.ip6.v6only = 0, using sysctl(8). - -=========================================================================== diff --git a/www/mozilla-bin-nightly/Makefile b/www/mozilla-bin-nightly/Makefile index 6c605725b67..5d1326ed4be 100644 --- a/www/mozilla-bin-nightly/Makefile +++ b/www/mozilla-bin-nightly/Makefile @@ -1,76 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2003/12/23 03:50:51 grant Exp $ -# +# $NetBSD: Makefile,v 1.10 2004/01/04 05:01:03 grant Exp $ -DISTNAME= # see Makefile.${OPSYS}.${ARCH} -PKGNAME= mozilla-bin-${PKGVER} -WRKSRC= ${WRKDIR}/mozilla -CATEGORIES= www -MASTER_SITES= http://ftp.mozilla.org/pub/mozilla/nightly/latest/ +MOZILLA= mozilla -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.mozilla.org/ -COMMENT= Full featured gecko-based browser (nightly binary pkg) +ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 NetBSD-*-i386 +ONLY_FOR_PLATFORM+= SunOS-5.[789]*-sparc SunOS-5.[89]*-i386 -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 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" - -PKGVER!= ${DATE} +%Y%m%d - -FILES_SUBST+= PLATFORM=${PLATFORM} -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC - -do-build: - -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla.sh - -do-install: - ${INSTALL_DATA_DIR} ${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} - ${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-${PLATFORM} - @${FIND} ${MOZILLA_LIB} -type f -print \ - | ${XARGS} ${CHMOD} a+r - @${FIND} ${MOZILLA_LIB} \( -type f -o -perm -u+x \) -print \ - | ${XARGS} ${CHMOD} a+rx - @${FIND} ${MOZILLA_LIB} -type d -print \ - | ${XARGS} ${CHMOD} a+rx - -post-install: -# this build wants exactly 'libgtk-1.2.so.0', etc. -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" - @cd ${MOZILLA_LIB} && \ - ${LN} -s ${PREFIX}/lib/libglib.*so* .; \ - ${LN} -s ${PREFIX}/lib/libgmodule.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .; \ - ${LN} -s libgtk.so libgtk-1.2.so.0; \ - ${LN} -s libgdk.so libgdk-1.2.so.0; \ - ${LN} -s libglib.so libglib-1.2.so.0; \ - ${LN} -s libgmodule.so libgmodule-1.2.so.0 -.endif - @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} - @${ECHO} bin/mozilla-${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} - -# 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/www/mozilla-bin-nightly/Makefile.Linux.i386 b/www/mozilla-bin-nightly/Makefile.Linux.i386 index 35258afbe5b..852e0529dc4 100644 --- a/www/mozilla-bin-nightly/Makefile.Linux.i386 +++ b/www/mozilla-bin-nightly/Makefile.Linux.i386 @@ -1,9 +1,5 @@ -# $NetBSD: Makefile.Linux.i386,v 1.3 2003/10/19 08:47:42 grant Exp $ -# +# $NetBSD: Makefile.Linux.i386,v 1.4 2004/01/04 05:01:03 grant Exp $ DISTNAME= mozilla-i686-pc-linux-gnu -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} +MOZ_PLATFORM= linux diff --git a/www/mozilla-bin-nightly/Makefile.NetBSD.i386 b/www/mozilla-bin-nightly/Makefile.NetBSD.i386 index da84a875438..ef0f338ee9c 100644 --- a/www/mozilla-bin-nightly/Makefile.NetBSD.i386 +++ b/www/mozilla-bin-nightly/Makefile.NetBSD.i386 @@ -1,13 +1,5 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/10/19 08:47:42 grant Exp $ -# +# $NetBSD: Makefile.NetBSD.i386,v 1.3 2004/01/04 05:01:03 grant Exp $ DISTNAME= mozilla-i686-pc-linux-gnu -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} - -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk - -.include "../../emulators/suse_linux/Makefile.application" +MOZ_PLATFORM= linux diff --git a/www/mozilla-bin-nightly/Makefile.SunOS.sparc b/www/mozilla-bin-nightly/Makefile.SunOS.sparc index 7bc7138eccf..853a0234f33 100644 --- a/www/mozilla-bin-nightly/Makefile.SunOS.sparc +++ b/www/mozilla-bin-nightly/Makefile.SunOS.sparc @@ -1,9 +1,5 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/06/11 17:43:15 grant Exp $ -# +# $NetBSD: Makefile.SunOS.sparc,v 1.2 2004/01/04 05:01:03 grant Exp $ DISTNAME= mozilla-sparc-sun-solaris2.7 -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= ${LOWER_OPSYS} -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} +MOZ_PLATFORM= solaris diff --git a/www/mozilla-bin-nightly/Makefile.common b/www/mozilla-bin-nightly/Makefile.common new file mode 100644 index 00000000000..75247dc5b41 --- /dev/null +++ b/www/mozilla-bin-nightly/Makefile.common @@ -0,0 +1,14 @@ +# $NetBSD: Makefile.common,v 1.1 2004/01/04 05:01:03 grant Exp $ + +MASTER_SITES= http://ftp.mozilla.org/pub/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \ + ftp://ftp.mozilla.org/pub/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ + +DIST_SUBDIR= ${PKGNAME} +NO_CHECKSUM= # defined +NO_SRC_ON_FTP= # defined + +.include "../../mk/bsd.prefs.mk" + +MOZ_VER!= ${DATE} +%Y%m%d + +.include "../../www/mozilla-bin/Makefile.common" diff --git a/www/mozilla-bin-nightly/files/mozilla.sh b/www/mozilla-bin-nightly/files/mozilla.sh deleted file mode 100644 index 42c1cf7f5ee..00000000000 --- a/www/mozilla-bin-nightly/files/mozilla.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!@SH@ -# $NetBSD: mozilla.sh,v 1.3 2003/07/18 07:31:17 grant Exp $ - -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/mozilla-@PLATFORM@:@PREFIX@/lib" -export LD_LIBRARY_PATH - -exec @PREFIX@/lib/mozilla-@PLATFORM@/mozilla "$@" diff --git a/www/mozilla-bin/MESSAGE.NetBSD b/www/mozilla-bin/MESSAGE.NetBSD deleted file mode 100644 index f7382f472b9..00000000000 --- a/www/mozilla-bin/MESSAGE.NetBSD +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.NetBSD,v 1.1 2003/04/14 20:28:22 grant Exp $ - - Mozilla requires your kernel to include 'COMPAT_LINUX' (plus in - NetBSD systems before 1.5 'EXEC_ELF32'). - - Please note that if you have INET6 enabled in your kernel, you - will need to set net.inet6.ip6.v6only = 0, using sysctl(8). - -=========================================================================== diff --git a/www/MozillaFirebird-bin-nightly/MESSAGE.compat_linux b/www/mozilla-bin/MESSAGE.compat_linux index cc6a2400c7c..f6e934bd8ca 100644 --- a/www/MozillaFirebird-bin-nightly/MESSAGE.compat_linux +++ b/www/mozilla-bin/MESSAGE.compat_linux @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE.compat_linux,v 1.1 2003/12/17 03:10:42 grant Exp $ +$NetBSD: MESSAGE.compat_linux,v 1.1 2004/01/04 05:01:02 grant Exp $ Mozilla Firebird requires your kernel to include 'COMPAT_LINUX' (plus in NetBSD systems before 1.5 'EXEC_ELF32'). diff --git a/www/mozilla-bin/Makefile b/www/mozilla-bin/Makefile index ee3b79a4c2f..e849c877659 100644 --- a/www/mozilla-bin/Makefile +++ b/www/mozilla-bin/Makefile @@ -1,74 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2003/12/23 03:50:51 grant Exp $ -# +# $NetBSD: Makefile,v 1.13 2004/01/04 05:01:02 grant Exp $ -DISTNAME= # see Makefile.${OPSYS}.${ARCH} -PKGNAME= mozilla-bin-1.5 -WRKSRC= ${WRKDIR}/mozilla -CATEGORIES= www +MOZILLA= mozilla +MOZ_VER= 1.5 -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.mozilla.org/ -COMMENT= Full featured gecko-based browser (binary pkg) +ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 NetBSD-*-i386 +ONLY_FOR_PLATFORM+= SunOS-5.[789]*-sparc SunOS-5.[89]*-i386 -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[89]*-sparc - -CONFLICTS+= mozilla-linux-[0-9]* - -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}/mozilla.sh > \ - ${WRKDIR}/mozilla.sh - -do-install: - ${INSTALL_DATA_DIR} ${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} - @${FIND} ${MOZILLA_LIB} -type f -print \ - | ${XARGS} ${CHMOD} a+r - @${FIND} ${MOZILLA_LIB} \( -type f -o -perm -u+x \) -print \ - | ${XARGS} ${CHMOD} a+rx - @${FIND} ${MOZILLA_LIB} -type d -print \ - | ${XARGS} ${CHMOD} a+rx - ${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-${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/libglib.*so* .; \ - ${LN} -s ${PREFIX}/lib/libgmodule.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .; \ - ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .; \ - ${LN} -s libgtk.so libgtk-1.2.so.0; \ - ${LN} -s libgdk.so libgdk-1.2.so.0; \ - ${LN} -s libglib.so libglib-1.2.so.0; \ - ${LN} -s libgmodule.so libgmodule-1.2.so.0 -.endif - @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} - @${ECHO} bin/mozilla-${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/www/mozilla-bin/Makefile.Linux.i386 b/www/mozilla-bin/Makefile.Linux.i386 index d4775510a13..efc750fc081 100644 --- a/www/mozilla-bin/Makefile.Linux.i386 +++ b/www/mozilla-bin/Makefile.Linux.i386 @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.Linux.i386,v 1.4 2003/11/27 16:07:46 grant Exp $ -# +# $NetBSD: Makefile.Linux.i386,v 1.5 2004/01/04 05:01:02 grant Exp $ -DISTNAME= mozilla-i686-pc-linux-gnu-1.5 -MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla1.5/} +DISTNAME= mozilla-i686-pc-linux-gnu-${MOZ_VER} -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} +MOZ_PLATFORM= linux diff --git a/www/mozilla-bin/Makefile.NetBSD.i386 b/www/mozilla-bin/Makefile.NetBSD.i386 index 402a00a59e4..c8c2b604b33 100644 --- a/www/mozilla-bin/Makefile.NetBSD.i386 +++ b/www/mozilla-bin/Makefile.NetBSD.i386 @@ -1,16 +1,5 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.5 2003/11/27 16:07:46 grant Exp $ -# +# $NetBSD: Makefile.NetBSD.i386,v 1.6 2004/01/04 05:01:02 grant Exp $ -DISTNAME= mozilla-i686-pc-linux-gnu-1.5 -MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla1.5/} +DISTNAME= mozilla-i686-pc-linux-gnu-${MOZ_VER} -PLATFORM= linux -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} - -DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk - -CONFLICTS+= suse_libc5-[0-9]* - -.include "../../emulators/suse_linux/Makefile.application" +MOZ_PLATFORM= linux diff --git a/www/mozilla-bin/Makefile.SunOS.i386 b/www/mozilla-bin/Makefile.SunOS.i386 index b60fcc6e5a7..399774e2f15 100644 --- a/www/mozilla-bin/Makefile.SunOS.i386 +++ b/www/mozilla-bin/Makefile.SunOS.i386 @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.SunOS.i386,v 1.1 2003/11/27 16:07:46 grant Exp $ -# +# $NetBSD: Makefile.SunOS.i386,v 1.2 2004/01/04 05:01:02 grant Exp $ -DISTNAME= mozilla-i386-pc-solaris2.8-1.5 -MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla1.5/contrib/} +DISTNAME= mozilla-i386-pc-solaris2.8-${MOZ_VER} -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= ${LOWER_OPSYS} -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} +MOZ_PLATFORM= solaris diff --git a/www/mozilla-bin/Makefile.SunOS.sparc b/www/mozilla-bin/Makefile.SunOS.sparc index 4ec31cd70d1..b7a643c648a 100644 --- a/www/mozilla-bin/Makefile.SunOS.sparc +++ b/www/mozilla-bin/Makefile.SunOS.sparc @@ -1,10 +1,5 @@ -# $NetBSD: Makefile.SunOS.sparc,v 1.3 2003/11/27 16:07:46 grant Exp $ -# +# $NetBSD: Makefile.SunOS.sparc,v 1.4 2004/01/04 05:01:02 grant Exp $ -DISTNAME= mozilla-sparc-sun-solaris2.8_1.5 -MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla1.5/} +DISTNAME= mozilla-sparc-sun-solaris2.8_${MOZ_VER} -DEPENDS+= gtk+>=1.2:../../x11/gtk - -PLATFORM= ${LOWER_OPSYS} -MOZILLA_LIB= ${PREFIX}/lib/mozilla-${PLATFORM} +MOZ_PLATFORM= solaris diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common new file mode 100644 index 00000000000..907915ad006 --- /dev/null +++ b/www/mozilla-bin/Makefile.common @@ -0,0 +1,169 @@ +# $NetBSD: Makefile.common,v 1.1 2004/01/04 05:01:02 grant Exp $ +# + +DISTNAME= # see Makefile.${OPSYS}.${ARCH} +PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} +WRKSRC= ${WRKDIR}/${MOZILLA} +CATEGORIES= www + +.if ${MOZILLA} == "MozillaFirebird" +MOZILLA_SHORT= firebird +.else +MOZILLA_SHORT= ${MOZILLA} +.endif + +MASTER_SITES?= http://ftp.mozilla.org/pub/${MOZILLA_SHORT}/releases/${MOZ_VER}/${MOZ_CONTRIB} \ + ftp://ftp.mozilla.org/pub/${MOZILLA_SHORT}/releases/${MOZ_VER}/${MOZ_CONTRIB} \ + http://public.planetmirror.com.au/pub/${MOZILLA_SHORT}/releases/${MOZ_VER}/${MOZ_CONTRIB} \ + ftp://public.planetmirror.com.au/pub/${MOZILLA_SHORT}/releases/${MOZ_VER}/${MOZ_CONTRIB} + +MAINTAINER= grant@NetBSD.org +HOMEPAGE?= http://www.mozilla.org/ + +NO_CONFIGURE= # defined + +FILESDIR= ${.CURDIR}/../../www/mozilla-bin/files + +USE_PKGINSTALL= YES + +.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(${.CURDIR}/Makefile.${OPSYS}.${ARCH}) +. include "${.CURDIR}/Makefile.${OPSYS}.${ARCH}" +.endif + +# suffix gtk2 builds with -gtk2 +MOZ_EXTRA= # empty +.if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES" +MOZ_EXTRA= -gtk2 +.endif + +MOZILLA_LIB= ${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} + +FILES_SUBST+= MOZILLA=${MOZILLA} +FILES_SUBST+= MOZ_EXTRA=${MOZ_EXTRA} +FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM} +PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC + +# protect against MOZ_PLATFORM being undefined so we don't bomb, but +# instead use the result of ONLY_FOR_PLATFORM. +.if defined(MOZ_PLATFORM) + +. if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux" +MESSAGE_SRC+= ${.CURDIR}/../../www/mozilla-bin/MESSAGE.compat_linux +. endif + +# non-linux builds are "unofficial" and in contrib/ +MOZ_CONTRIB= # empty +. if defined(MOZ_PLATFORM) && ${MOZ_PLATFORM} != "linux" +MOZ_CONTRIB= contrib/ +. endif + +# Linux builds on NetBSD +. if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux" +. include "../../emulators/suse_linux/Makefile.application" +DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 +DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk +CONFLICTS+= suse_libc5-[0-9]* + +# NetBSD native builds are built with gtk-1.2.10nb5. +. elif ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd" +DEPENDS+= gtk+>=1.2.10nb5:../../x11/gtk + +# we need libstdc++.so.4 on -current. +. if !exists(/usr/lib/libstdc++.so.4) +DEPENDS+= compat16>=1.6.0:../../emulators/compat16 +_COMPAT16_LIBSTDCXX= YES +. endif +. else + +# gtk2 builds. +. if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES" +DEPENDS+= gtk+>=2.2:../../x11/gtk2 +. else + +# default to at least gtk-1.2. +DEPENDS+= gtk+>=1.2:../../x11/gtk +. endif +. endif + +.endif # defined(MOZ_PLATFORM) + +# we don't want libnullplugin. +post-extract: + @${RM} -f ${WRKSRC}/plugins/libnullplugin.so + +do-build: + +post-build: + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mozilla.sh > ${WRKDIR}/${MOZILLA}.sh + +do-install: + ${INSTALL_DATA_DIR} ${MOZILLA_LIB} + cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB} + ${INSTALL_SCRIPT} ${WRKDIR}/${MOZILLA}.sh ${PREFIX}/bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} + @${FIND} ${MOZILLA_LIB} -type f -print \ + | ${XARGS} ${CHMOD} a+r + @${FIND} ${MOZILLA_LIB} \( -type f -o -perm -u+x \) -print \ + | ${XARGS} ${CHMOD} a+rx + @${FIND} ${MOZILLA_LIB} -type d -print \ + | ${XARGS} ${CHMOD} a+rx + +# builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them +# into the mozilla directory. +post-install: +.if ${OPSYS} != "NetBSD" +. if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES" + @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 +. else + @cd ${MOZILLA_LIB} && \ + ${LN} -s ${PREFIX}/lib/libglib.*so* .; \ + ${LN} -s ${PREFIX}/lib/libgmodule.*so* .; \ + ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .; \ + ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .; \ + ${LN} -s libgtk.so libgtk-1.2.so.0; \ + ${LN} -s libgdk.so libgdk-1.2.so.0; \ + ${LN} -s libglib.so libglib-1.2.so.0; \ + ${LN} -s libgmodule.so libgmodule-1.2.so.0 +. endif +.endif +.if defined(_COMPAT16_LIBSTDCXX) && ${_COMPAT16_LIBSTDCXX} == "YES" + @cd ${MOZILLA_LIB} && \ + ${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* . +.endif + @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} + @${ECHO} bin/${MOZILLA}-${MOZ_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.pkg.mk" diff --git a/www/mozilla-bin/files/mozilla.sh b/www/mozilla-bin/files/mozilla.sh index 5c108800dd3..5b69d4f5e37 100644 --- a/www/mozilla-bin/files/mozilla.sh +++ b/www/mozilla-bin/files/mozilla.sh @@ -1,7 +1,7 @@ #!@SH@ -# $NetBSD: mozilla.sh,v 1.3 2003/07/18 07:31:16 grant Exp $ +# $NetBSD: mozilla.sh,v 1.4 2004/01/04 05:01:03 grant Exp $ -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/mozilla-@PLATFORM@:@PREFIX@/lib" +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/@MOZILLA@@MOZ_EXTRA@-@MOZ_PLATFORM@:@PREFIX@/lib" export LD_LIBRARY_PATH -exec @PREFIX@/lib/mozilla-@PLATFORM@/mozilla "$@" +exec @PREFIX@/lib/@MOZILLA@@MOZ_EXTRA@-@MOZ_PLATFORM@/@MOZILLA@ "$@" |