pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Unify all the mozilla projects into using a single Mak...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d30b7e1c94a3
branches: trunk
changeset: 556219:d30b7e1c94a3
user: abs <abs%pkgsrc.org@localhost>
date: Wed Mar 18 00:08:39 2009 +0000
description:
Unify all the mozilla projects into using a single Makefile.common and
INSTALL, and put it in seamonkey.
Ensure all build with USE_DESTDIR.
Bump PKGREVISIONs
diffstat:
mail/thunderbird-gtk1/Makefile | 4 +-
mail/thunderbird/Makefile | 4 +-
mail/thunderbird/Makefile-thunderbird.common | 17 +-
time/sunbird/Makefile | 3 +-
time/sunbird/Makefile-sunbird.common | 14 +-
www/firefox-gtk1/Makefile | 3 +-
www/firefox/INSTALL | 15 -
www/firefox/Makefile | 3 +-
www/firefox/Makefile-firefox.common | 27 +--
www/firefox/Makefile.common | 232 ---------------------------
www/firefox3/Makefile | 5 +-
www/seamonkey-gtk1/Makefile | 3 +-
www/seamonkey-gtk1/buildlink3.mk | 10 +-
www/seamonkey/Makefile | 4 +-
www/seamonkey/Makefile-seamonkey.common | 15 +-
www/seamonkey/Makefile.common | 59 ++---
www/seamonkey/PLIST | 6 +-
www/seamonkey/files/moz-install | 3 +-
18 files changed, 75 insertions(+), 352 deletions(-)
diffs (truncated from 744 to 300 lines):
diff -r 4843f8d7cadd -r d30b7e1c94a3 mail/thunderbird-gtk1/Makefile
--- a/mail/thunderbird-gtk1/Makefile Tue Mar 17 23:54:54 2009 +0000
+++ b/mail/thunderbird-gtk1/Makefile Wed Mar 18 00:08:39 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/01/07 14:23:03 ghen Exp $
+# $NetBSD: Makefile,v 1.21 2009/03/18 00:08:39 abs Exp $
MOZILLA= thunderbird-gtk1
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Mozilla mail client using the older GTK1 toolkit
diff -r 4843f8d7cadd -r d30b7e1c94a3 mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Tue Mar 17 23:54:54 2009 +0000
+++ b/mail/thunderbird/Makefile Wed Mar 18 00:08:39 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2009/01/07 14:23:03 ghen Exp $
+# $NetBSD: Makefile,v 1.34 2009/03/18 00:08:39 abs Exp $
MOZILLA= thunderbird
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Mozilla mail client
MOZILLA_USE_GTK2= # yes
diff -r 4843f8d7cadd -r d30b7e1c94a3 mail/thunderbird/Makefile-thunderbird.common
--- a/mail/thunderbird/Makefile-thunderbird.common Tue Mar 17 23:54:54 2009 +0000
+++ b/mail/thunderbird/Makefile-thunderbird.common Wed Mar 18 00:08:39 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.42 2009/01/07 14:23:03 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.43 2009/03/18 00:08:39 abs Exp $
# used by mail/thunderbird/Makefile
# used by mail/thunderbird-gtk1/Makefile
@@ -19,18 +19,16 @@
CONFIGURE_ARGS+= --enable-application=mail
CONFIGURE_ARGS+= --enable-debug=-g
-CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
-INSTALL_TEMPLATES+= ${.CURDIR}/../../mail/thunderbird/INSTALL
-
USE_DIRS+= xdg-1.4
-post-install:
- ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \;
+.PHONY: install-desktop
+post-install: install-desktop
+install-desktop:
${SED} \
-e 's|@MOZILLA@|${MOZILLA}|g' \
-e 's|@MOZILLA_NAME@|Thunderbird|g' \
@@ -42,10 +40,7 @@
${LN} -sf ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/chrome/icons/default/default.xpm \
${DESTDIR:Q}${PREFIX:Q}/share/pixmaps/${MOZILLA}.xpm
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0
-.endif
+INSTALLATION_DIRS+= share/applications share/pixmaps
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../www/seamonkey/Makefile.common"
diff -r 4843f8d7cadd -r d30b7e1c94a3 time/sunbird/Makefile
--- a/time/sunbird/Makefile Tue Mar 17 23:54:54 2009 +0000
+++ b/time/sunbird/Makefile Wed Mar 18 00:08:39 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/03/02 09:34:17 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2009/03/18 00:08:39 abs Exp $
MOZILLA= sunbird
+PKGREVISION= 1
COMMENT= Mozilla stand-alone calendar application
diff -r 4843f8d7cadd -r d30b7e1c94a3 time/sunbird/Makefile-sunbird.common
--- a/time/sunbird/Makefile-sunbird.common Tue Mar 17 23:54:54 2009 +0000
+++ b/time/sunbird/Makefile-sunbird.common Wed Mar 18 00:08:39 2009 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile-sunbird.common,v 1.12 2007/12/22 07:22:10 obache Exp $
+# $NetBSD: Makefile-sunbird.common,v 1.13 2009/03/18 00:08:39 abs Exp $
+# used by time/sunbird/Makefile
MOZILLA_BIN= sunbird-bin
MOZ_VER= 0.3.1
@@ -16,20 +17,11 @@
PATCHDIR= ${.CURDIR}/../../time/sunbird/patches
CONFIGURE_ARGS+= --enable-application=calendar
-CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
-.include "../../mk/bsd.prefs.mk"
-
-CONFIG_GUESS_OVERRIDE+= */*/*/*/config.guess
-CONFIG_SUB_OVERRIDE+= */*/*/*/config.sub
-
-post-install:
- cd ${PREFIX}/lib/${MOZILLA} && \
- ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \
- ./${MOZILLA_BIN} -register
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../www/seamonkey/Makefile.common"
diff -r 4843f8d7cadd -r d30b7e1c94a3 www/firefox-gtk1/Makefile
--- a/www/firefox-gtk1/Makefile Tue Mar 17 23:54:54 2009 +0000
+++ b/www/firefox-gtk1/Makefile Wed Mar 18 00:08:39 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2008/09/24 14:34:36 ghen Exp $
+# $NetBSD: Makefile,v 1.22 2009/03/18 00:08:40 abs Exp $
MOZILLA= firefox-gtk1
+PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox/Makefile-firefox.common"
diff -r 4843f8d7cadd -r d30b7e1c94a3 www/firefox/INSTALL
--- a/www/firefox/INSTALL Tue Mar 17 23:54:54 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2007/02/04 00:15:49 dmcmahill Exp $
-
-MOZILLA="@MOZILLA@"
-MOZILLA_BIN="@MOZILLA_BIN@"
-MOZILLA_FIVE_HOME="${PKG_PREFIX}/lib/${MOZILLA}"
-export MOZILLA_FIVE_HOME
-
-case ${STAGE} in
-POST-INSTALL)
- ${MKDIR} -p "./tmpdir-${PKGNAME}"
- LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}:${PKG_PREFIX}/lib" HOME="./tmpdir-${PKGNAME}" \
- ${MOZILLA_FIVE_HOME}/${MOZILLA_BIN} -register
- ${RM} -fr "./tmpdir-${PKGNAME}"
- ;;
-esac
diff -r 4843f8d7cadd -r d30b7e1c94a3 www/firefox/Makefile
--- a/www/firefox/Makefile Tue Mar 17 23:54:54 2009 +0000
+++ b/www/firefox/Makefile Wed Mar 18 00:08:39 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2008/09/24 14:34:36 ghen Exp $
+# $NetBSD: Makefile,v 1.49 2009/03/18 00:08:39 abs Exp $
MOZILLA= firefox
+PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser
MOZILLA_USE_GTK2= # yes
diff -r 4843f8d7cadd -r d30b7e1c94a3 www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common Tue Mar 17 23:54:54 2009 +0000
+++ b/www/firefox/Makefile-firefox.common Wed Mar 18 00:08:39 2009 +0000
@@ -1,40 +1,31 @@
-# $NetBSD: Makefile-firefox.common,v 1.62 2008/12/17 17:05:52 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.63 2009/03/18 00:08:39 abs Exp $
# used by www/firefox/Makefile
+# used by www/firefox-gtk1/Makefile
MOZILLA_BIN= firefox-bin
MOZ_VER= 2.0.0.19
EXTRACT_SUFX= .tar.bz2
-
DISTNAME= firefox-${MOZ_VER}-source
-
+CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/}
+MAINTAINER= taya%NetBSD.org@localhost
HOMEPAGE= http://www.mozilla.com/en-US/firefox/
-PKG_DESTDIR_SUPPORT= user-destdir
-
DISTINFO_FILE= ${.CURDIR}/../../www/firefox/distinfo
PATCHDIR= ${.CURDIR}/../../www/firefox/patches
CONFIGURE_ARGS+= --enable-application=browser
CONFIGURE_ARGS+= --without-gssapi
-
CONFIGURE_ARGS+= --enable-canvas
-MOZILLA_EXTENSIONS= default
-CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS:Q}
-CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0
-.endif
-
USE_LANGUAGES+= c++
BUILD_SVG= # yes
BUILD_MATHML= # yes
-.include "../../www/firefox/Makefile.common"
+MOZILLA_EXTENSIONS= default
+CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS:Q}
-INSTALL_TEMPLATES+= ${.CURDIR}/../../www/firefox/INSTALL
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../www/seamonkey/Makefile.common"
diff -r 4843f8d7cadd -r d30b7e1c94a3 www/firefox/Makefile.common
--- a/www/firefox/Makefile.common Tue Mar 17 23:54:54 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-# $NetBSD: Makefile.common,v 1.26 2009/02/18 10:51:40 abs Exp $
-# used by www/firefox/Makefile-firefox.common
-
-MOZ_DIST_VER?= ${MOZ_VER}
-DISTNAME?= mozilla-${MOZ_DIST_VER}-source
-PKGNAME= ${MOZILLA}-${MOZ_VER}
-MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/}
-CATEGORIES= www
-
-MAINTAINER= taya%NetBSD.org@localhost
-HOMEPAGE?= http://www.mozilla.org/
-
-FILESDIR= ${.CURDIR}/../../www/seamonkey/files
-
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
-
-WRKSRC= ${WRKDIR}/mozilla
-USE_LANGUAGES= c c++
-USE_TOOLS+= autoconf213 gmake perl pkg-config
-GNU_CONFIGURE= yes
-
-# Mozilla applications require the frame-pointer
-BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer
-
-INSTALL_TEMPLATES+= ${.CURDIR}/../../www/seamonkey/INSTALL
-
-CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+= directory/c-sdk/config/autoconf/config.guess
-CONFIG_SUB_OVERRIDE= build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+= nsprpub/build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+= directory/c-sdk/config/autoconf/config.sub
-CONFIG_STATUS_OVERRIDE= build/config.status
-CONFIG_STATUS_OVERRIDE+= nsprpub/config.status
-CONFIG_STATUS_OVERRIDE+= directory/c-sdk/config.status
-
-# Some .pc files are filled in by the build process, so we can't fix the
-# rpaths until this has happened.
-PKGCONFIG_OVERRIDE_STAGE= post-build
-PKGCONFIG_OVERRIDE= build/unix/*.pc
-
-CONFIGURE_ARGS+= --disable-tests
-CONFIGURE_ARGS+= --disable-pedantic
-CONFIGURE_ARGS+= --with-system-jpeg=${BUILDLINK_PREFIX.jpeg:Q}
-CONFIGURE_ARGS+= --with-system-png=${BUILDLINK_PREFIX.png:Q}
-CONFIGURE_ARGS+= --enable-crypto
-
-SHAREMODE?= 644
-BUILD_TARGET= # empty
-
-UNLIMIT_RESOURCES= datasize memorysize stacksize
-
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.if defined(MOZILLA_USE_GTK2)
-.include "../../net/libIDL/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs
-.else
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../net/ORBit/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-default-toolkit=gtk
-.endif
-
-# NetBSD-*-m68k builds, but "regchrome" dumps core.
-NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k
-
-MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q}
-
-MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA}
-MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q}
-CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q}
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
-
-.if defined(BUILD_SVG)
-CONFIGURE_ARGS+= --enable-svg
-CONFIGURE_ARGS+= --enable-svg-renderer=cairo
Home |
Main Index |
Thread Index |
Old Index