diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/firefox-gtk1/Makefile | 3 | ||||
-rw-r--r-- | www/firefox/INSTALL | 15 | ||||
-rw-r--r-- | www/firefox/Makefile | 3 | ||||
-rw-r--r-- | www/firefox/Makefile-firefox.common | 27 | ||||
-rw-r--r-- | www/firefox/Makefile.common | 232 | ||||
-rw-r--r-- | www/firefox3/Makefile | 5 | ||||
-rw-r--r-- | www/seamonkey-gtk1/Makefile | 3 | ||||
-rw-r--r-- | www/seamonkey-gtk1/buildlink3.mk | 10 | ||||
-rw-r--r-- | www/seamonkey/Makefile | 4 | ||||
-rw-r--r-- | www/seamonkey/Makefile-seamonkey.common | 15 | ||||
-rw-r--r-- | www/seamonkey/Makefile.common | 59 | ||||
-rw-r--r-- | www/seamonkey/PLIST | 6 | ||||
-rwxr-xr-x | www/seamonkey/files/moz-install | 3 |
13 files changed, 60 insertions, 325 deletions
diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile index 67b1b9e25d1..741fbc06799 100644 --- a/www/firefox-gtk1/Makefile +++ b/www/firefox-gtk1/Makefile @@ -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 --git a/www/firefox/INSTALL b/www/firefox/INSTALL deleted file mode 100644 index ffabf7c9412..00000000000 --- a/www/firefox/INSTALL +++ /dev/null @@ -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 --git a/www/firefox/Makefile b/www/firefox/Makefile index 4b1dfa92e63..0938e6365dd 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -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 --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index bc7ec227382..61b0a3779e6 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -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 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} + +PKG_DESTDIR_SUPPORT= user-destdir -INSTALL_TEMPLATES+= ${.CURDIR}/../../www/firefox/INSTALL +.include "../../www/seamonkey/Makefile.common" diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common deleted file mode 100644 index cdb28852d96..00000000000 --- a/www/firefox/Makefile.common +++ /dev/null @@ -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 -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 -.include "../../graphics/cairo/buildlink3.mk" -CONFIGURE_ARGS+= --enable-system-cairo -.endif - -.if defined(BUILD_CALENDAR) -CONFIGURE_ARGS+= --enable-calendar -.endif - -.if defined(BUILD_MATHML) -CONFIGURE_ARGS+= --enable-mathml -.endif - -.if (exists(${X11BASE}/include/X11/extensions/Xinerama.h) && \ - exists(${X11BASE}/lib/libXinerama.so)) || ${X11_TYPE} != "native" -CONFIGURE_ARGS+= --enable-xinerama -.endif - -# avoid creating a .mozilla directory in the users home -# directory -SCRIPTS_ENV+= HOME=${WRKDIR:Q} - -PLIST_SUBST+= MOZILLA=${MOZILLA:Q} -PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} -FILES_SUBST+= MOZILLA=${MOZILLA:Q} -FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} -.if ${OBJECT_FMT} == "ELF" -SO_SUFFIX= so -SCRIPTS_ENV+= MOZ_INSTALL_LIB=${INSTALL_PROGRAM:Q} -.elif ${OBJECT_FMT} == "Mach-O" -SO_SUFFIX= dylib -SCRIPTS_ENV+= MOZ_INSTALL_LIB=${INSTALL_LIB:Q} -.else -SO_SUFFIX= so.1.0 -SCRIPTS_ENV+= MOZ_INSTALL_LIB=${INSTALL_PROGRAM:Q} -.endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} - -.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc) -MAKEFLAGS+= NS_USE_GCC=YES -.endif - -SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} -SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} -SCRIPTS_ENV+= SED=${SED:Q} -SCRIPTS_ENV+= RM=${RM:Q} -SCRIPTS_ENV+= EGREP=${EGREP:Q} -SCRIPTS_ENV+= CHOWN=${CHOWN:Q} -SCRIPTS_ENV+= CHGRP=${CHGRP:Q} -SCRIPTS_ENV+= CHMOD=${CHMOD:Q} -SCRIPTS_ENV+= BINOWN=${BINOWN:Q} -SCRIPTS_ENV+= BINGRP=${BINGRP:Q} -SCRIPTS_ENV+= BINMODE=${BINMODE:Q} -SCRIPTS_ENV+= SETENV=${SETENV:Q} -SCRIPTS_ENV+= MOZILLA=${MOZILLA:Q} -SCRIPTS_ENV+= MOZILLA_BIN=${MOZILLA_BIN:Q} -SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX:Q} - -PTHREAD_OPTS+= native optional - -.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64") -GCC_REQD+= 3.4 -.endif - -.include "../../mk/compiler.mk" -.if !empty(CC_VERSION:Mgcc*) -COPTS?= -O2 -.endif -CONFIGURE_ARGS+= --enable-optimize=${COPTS:Q} - -XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s -XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp - -.if ${OPSYS} == "Darwin" -BUILDLINK_PASSTHRU_DIRS+=/Developer -.endif - -post-extract: - cd ${FILESDIR:Q} \ - && ${CP} ${XPTCFILES} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/ - -pre-configure: - cd ${WRKSRC:Q} && autoconf - cd ${WRKSRC:Q}/nsprpub && autoconf - cd ${WRKSRC:Q}/directory/c-sdk && autoconf - -post-build: - ${ECHO} skin,install,select,classic/1.0 >> \ - ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt - ${ECHO} locale,install,select,en-US >> \ - ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt - -# The exact set of libfreebl* libs built and installed depends on the -# operating system and platform. For example, on solaris/sparc you might -# get -# libfreebl_32fpu_3.so -# libfreebl_32int_3.so -# libfreebl_32int64_3.so -# and on others -# libfreebl3.so -# Since this has been a continual problem in many mozilla packages, just -# do that part dynamically rather than trying to always keep our conditionals -# up to date. Note that the exact set of libfreebl libs has had a history -# of changing even on minor releases. -PLIST_SRC= ${WRKDIR}/PLIST -pre-install: - cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \ - ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl - cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.chk | ${SORT} | \ - ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl.chk - ${AWK} '/@comment libfreebl$$/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC} - ${CAT} ${WRKSRC}/PLIST.libfreebl >> ${PLIST_SRC} - ${AWK} '/@comment libfreebl.chk/ {exit} ok == 1 {print} /@comment libfreebl$$/ {ok=1}' \ - ${.CURDIR}/PLIST >> ${PLIST_SRC} - ${CAT} ${WRKSRC}/PLIST.libfreebl.chk >> ${PLIST_SRC} - ${AWK} 'ok == 1 {print} /@comment libfreebl.chk/ {ok=1}' \ - ${.CURDIR}/PLIST >> ${PLIST_SRC} - -do-install: - ${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install - -post-install: - ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \; - -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CONFIGURE_ARGS+= --without-pthreads -.else -CONFIGURE_ARGS+= --with-pthreads -.endif - -.if ${MOZILLA_USE_XFT} == "YES" -CONFIGURE_ARGS+= --enable-xft -# pkgconfig defaults to a "build" dependency, which is what we want. -.include "../../x11/libXft/buildlink3.mk" -.endif - -# Fix for firefox* packages. -SUBST_CLASSES+= pc -SUBST_STAGE.pc= post-extract -SUBST_FILES.pc= build/unix/*.pc.in -SUBST_SED.pc= -e 's|%includedir%|${PREFIX}/include/${MOZILLA}|g' -SUBST_SED.pc+= -e 's|%libdir%|${PREFIX}/lib/${MOZILLA}|g' -SUBST_MESSAGE.pc= Fixing pkgconfig files. - -.include "../../www/seamonkey/options.mk" diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile index 71a678612f8..e420020adc6 100644 --- a/www/firefox3/Makefile +++ b/www/firefox3/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2009/03/05 15:44:02 tron Exp $ +# $NetBSD: Makefile,v 1.25 2009/03/18 00:08:40 abs Exp $ MOZILLA= firefox3 # allow coexisting with firefox2 +PKGREVISION= 1 COMMENT= Lightweight gecko-based web browser -PKG_DESTDIR_SUPPORT= user-destdir - MOZILLA_USE_GTK2= # yes MOZILLA_USE_XFT= YES diff --git a/www/seamonkey-gtk1/Makefile b/www/seamonkey-gtk1/Makefile index 53fcb12397f..7d4cd416383 100644 --- a/www/seamonkey-gtk1/Makefile +++ b/www/seamonkey-gtk1/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2007/10/22 08:04:08 ghen Exp $ +# $NetBSD: Makefile,v 1.18 2009/03/18 00:08:40 abs Exp $ MOZILLA= seamonkey-gtk1 +PKGREVISION= 1 COMMENT= Full featured gecko-based browser built with GTK1 diff --git a/www/seamonkey-gtk1/buildlink3.mk b/www/seamonkey-gtk1/buildlink3.mk index b6f36f89812..2021aec1e34 100644 --- a/www/seamonkey-gtk1/buildlink3.mk +++ b/www/seamonkey-gtk1/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/18 00:08:40 abs Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SEAMONKEY_GTK1_BUILDLINK3_MK:= ${SEAMONKEY_GTK1_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= seamonkey-gtk1 +BUILDLINK_DEPENDS+= seamonkey-gtk1 .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey-gtk1} -BUILDLINK_PACKAGES+= seamonkey-gtk1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey-gtk1 +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey-gtk1} +BUILDLINK_PACKAGES+= seamonkey-gtk1 +BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey-gtk1 .if !empty(SEAMONKEY_GTK1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.seamonkey-gtk1+= seamonkey-gtk1>=1.0 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 2464095eeda..0615f2dd396 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2007/10/22 08:04:07 ghen Exp $ +# $NetBSD: Makefile,v 1.25 2009/03/18 00:08:40 abs Exp $ MOZILLA= seamonkey - +PKGREVISION= 1 COMMENT= Full featured gecko-based browser MOZILLA_USE_GTK2= # yes diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common index b278881b359..43831672835 100644 --- a/www/seamonkey/Makefile-seamonkey.common +++ b/www/seamonkey/Makefile-seamonkey.common @@ -1,29 +1,26 @@ -# $NetBSD: Makefile-seamonkey.common,v 1.22 2009/01/05 19:41:06 ghen Exp $ +# $NetBSD: Makefile-seamonkey.common,v 1.23 2009/03/18 00:08:40 abs Exp $ +# used by www/seamonkey/Makefile +# used by www/seamonkey-gtk1/Makefile MOZILLA_BIN= seamonkey-bin MOZ_VER= 1.1.14 EXTRACT_SUFX= .tar.bz2 DISTNAME= seamonkey-${MOZ_DIST_VER}.source - -MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} CATEGORIES= www +MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} MAINTAINER= ghen@NetBSD.org HOMEPAGE= http://www.mozilla.org/projects/seamonkey/ - DISTINFO_FILE= ${.CURDIR}/../../www/seamonkey/distinfo PATCHDIR= ${.CURDIR}/../../www/seamonkey/patches CONFIGURE_ARGS+= --enable-application=suite +USE_LANGUAGES+= c++ BUILD_SVG= # yes BUILD_MATHML= # yes -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" -CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0 -.endif +PKG_DESTDIR_SUPPORT= user-destdir .include "../../www/seamonkey/Makefile.common" diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common index 8dcd1d2f857..38b7fae69d8 100644 --- a/www/seamonkey/Makefile.common +++ b/www/seamonkey/Makefile.common @@ -1,4 +1,5 @@ -# $NetBSD: Makefile.common,v 1.32 2009/02/18 10:51:40 abs Exp $ +# $NetBSD: Makefile.common,v 1.33 2009/03/18 00:08:40 abs Exp $ +# used by www/firefox/Makefile-firefox.common # used by mail/thunderbird/Makefile-thunderbird.common # used by www/seamonkey/Makefile-seamonkey.common # used by time/sunbird/Makefile-sunbird.common @@ -6,8 +7,8 @@ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= seamonkey-${MOZ_DIST_VER}.source PKGNAME= ${MOZILLA}-${MOZ_VER} -MASTER_SITES?= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} CATEGORIES?= www +MASTER_SITES?= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} FILESDIR= ${.CURDIR}/../../www/seamonkey/files @@ -18,34 +19,28 @@ 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_GUESS_OVERRIDE+= */*/*/config.guess */*/*/*/config.guess +CONFIG_SUB_OVERRIDE+= */*/*/config.sub */*/*/*/config.sub CONFIG_STATUS_OVERRIDE= build/config.status CONFIG_STATUS_OVERRIDE+= nsprpub/config.status CONFIG_STATUS_OVERRIDE+= directory/c-sdk/config.status -PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-gtkmozembed.pc -PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-js.pc -PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-nspr.pc -PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-nss.pc -PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-plugin.pc -PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-xpcom.pc # 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_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no 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 -CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no SHAREMODE?= 644 BUILD_TARGET= # empty @@ -53,29 +48,28 @@ BUILD_TARGET= # empty UNLIMIT_RESOURCES= datasize memorysize stacksize .include "../../x11/libXt/buildlink3.mk" -.include "../../graphics/freetype2/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/xextproto/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs .else -.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" .include "../../net/ORBit/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" -.include "../../x11/libXrender/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 -# Mozilla applications require the frame-pointer -BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer - MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q} MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} @@ -84,10 +78,7 @@ CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR} .if defined(BUILD_SVG) -MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 -CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 CONFIGURE_ARGS+= --enable-svg -CONFIGURE_ARGS+= --enable-svg-renderer-libart CONFIGURE_ARGS+= --enable-svg-renderer=cairo .include "../../graphics/cairo/buildlink3.mk" CONFIGURE_ARGS+= --enable-system-cairo @@ -163,14 +154,17 @@ CONFIGURE_ARGS+= --enable-optimize=${COPTS:Q} XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" +CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0 +.endif + .if ${OPSYS} == "Darwin" BUILDLINK_PASSTHRU_DIRS+=/Developer .endif post-extract: -.for f in ${XPTCFILES} - ${CP} ${FILESDIR:Q}/${f:Q} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/${f:Q} -.endfor + cd ${FILESDIR:Q} \ + && ${CP} ${XPTCFILES} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/ pre-configure: cd ${WRKSRC:Q} && autoconf @@ -195,7 +189,7 @@ post-build: # do that part dynamically rather than trying to always keep our conditionals # up to date. Note that the exact set of libfreebl libs has had a history # of changing even on minor releases. -PLIST_SRC= ${WRKDIR}/PLIST +PLIST_SRC= ${WRKDIR}/PLIST pre-install: cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \ ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl @@ -210,13 +204,10 @@ pre-install: ${.CURDIR}/PLIST >> ${PLIST_SRC} do-install: - ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR:Q}/moz-install + ${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install -.if !target(do-install) post-install: - ${FIND} ${PREFIX}/lib/${MOZILLA}/defaults -type f -print | \ - ${XARGS} ${CHMOD} u+w -.endif + ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \; .include "../../mk/pthread.buildlink3.mk" diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST index af4894fa98d..523bb89c1f6 100644 --- a/www/seamonkey/PLIST +++ b/www/seamonkey/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2008/07/05 12:04:38 ghen Exp $ +@comment $NetBSD: PLIST,v 1.16 2009/03/18 00:08:40 abs Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -3043,8 +3043,8 @@ include/${MOZILLA}/nss/sslproto.h include/${MOZILLA}/nss/sslt.h include/${MOZILLA}/nss/watcomfx.h @comment end INCLUDE-PUBLIC -@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom -@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome +@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom +@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlays.rdf @unexec ${RM} %D/lib/${MOZILLA}/chrome/stylesheets.rdf diff --git a/www/seamonkey/files/moz-install b/www/seamonkey/files/moz-install index 648f87a7931..257ed91f6d2 100755 --- a/www/seamonkey/files/moz-install +++ b/www/seamonkey/files/moz-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.7 2008/12/17 19:37:40 tnn Exp $ +# $NetBSD: moz-install,v 1.8 2009/03/18 00:08:40 abs Exp $ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA} @@ -40,6 +40,7 @@ for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIS done # install PKGCONFIG +${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`; ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i |