diff options
-rw-r--r-- | www/mozilla-gtk2/Makefile | 8 | ||||
-rw-r--r-- | www/mozilla-gtk2/buildlink3.mk | 6 | ||||
-rw-r--r-- | www/mozilla/Makefile | 8 | ||||
-rw-r--r-- | www/mozilla/Makefile.common | 18 | ||||
-rw-r--r-- | www/mozilla/buildlink3.mk | 4 | ||||
-rw-r--r-- | www/mozilla/distinfo | 11 |
6 files changed, 31 insertions, 24 deletions
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile index 50f48d25c11..ae3262a22e2 100644 --- a/www/mozilla-gtk2/Makefile +++ b/www/mozilla-gtk2/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.16.2.3 2005/04/22 07:22:34 snj Exp $ +# $NetBSD: Makefile,v 1.16.2.4 2005/05/17 10:29:42 salo Exp $ MOZILLA= mozilla-gtk2 MOZILLA_BIN= mozilla-bin -MOZ_VER= 1.7.7 +MOZ_VER= 1.7.8 EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 -SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL} +#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 +#SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL} DISTINFO_FILE= ${.CURDIR}/../../www/mozilla/distinfo PATCHDIR= ${.CURDIR}/../../www/mozilla/patches FILESDIR= ${.CURDIR}/../../www/mozilla/files diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk index b09ebe7b623..4337d8aaa2a 100644 --- a/www/mozilla-gtk2/buildlink3.mk +++ b/www/mozilla-gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5.2.2 2005/04/22 07:22:34 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.5.2.3 2005/05/17 10:29:42 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla-gtk2} BUILDLINK_PACKAGES+= mozilla-gtk2 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.6 -BUILDLINK_RECOMMENDED.mozilla-gtk2+= mozilla-gtk2>=1.7.7 +BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.5 +BUILDLINK_RECOMMENDED.mozilla-gtk2+= mozilla-gtk2>=1.7.8 BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2 .endif # MOZILLA_GTK2_BUILDLINK3_MK diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 06e97da6764..a29a9bc5f8c 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.141.2.3 2005/04/22 07:22:33 snj Exp $ +# $NetBSD: Makefile,v 1.141.2.4 2005/05/17 10:29:42 salo Exp $ MOZILLA= mozilla MOZILLA_BIN= mozilla-bin -MOZ_VER= 1.7.7 +MOZ_VER= 1.7.8 EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 -SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL} +#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 +#SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL} COMMENT= Full featured gecko-based browser diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 2d50f2a6076..3822d2e69cc 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.49 2004/12/25 15:39:42 taya Exp $ +# $NetBSD: Makefile.common,v 1.49.2.1 2005/05/17 10:29:42 salo Exp $ MOZ_DIST_VER?= ${MOZ_VER} -DISTNAME?= mozilla-source-${MOZ_DIST_VER} +DISTNAME?= mozilla-${MOZ_DIST_VER}-source PKGNAME= ${MOZILLA}-${MOZ_VER} MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/} CATEGORIES= www @@ -21,6 +21,16 @@ USE_GNU_TOOLS+= make USE_X11= yes GNU_CONFIGURE= yes +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 + PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc @@ -52,7 +62,7 @@ UNLIMIT_RESOURCES= datasize memorysize stacksize .include "../../devel/pkgconfig/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 +CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs .else .include "../../graphics/gdk-pixbuf/buildlink3.mk" .include "../../net/ORBit/buildlink3.mk" @@ -191,6 +201,6 @@ SUBST_FILES.pc= build/unix/*.pc.in SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \ -e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g" SUBST_MESSAGE.pc= "Fixing pkgconfig files." - + .include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk index 4b39e924475..f75297100cf 100644 --- a/www/mozilla/buildlink3.mk +++ b/www/mozilla/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7.2.2 2005/04/22 07:22:33 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.7.2.3 2005/05/17 10:29:42 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= mozilla .if !empty(MOZILLA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla+= mozilla>=1.7.5 -BUILDLINK_RECOMMENDED.mozilla+= mozilla>=1.7.7 +BUILDLINK_RECOMMENDED.mozilla+= mozilla>=1.7.8 BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla .endif # MOZILLA_BUILDLINK3_MK diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 65571f4820b..a73fa18e8ec 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.72.2.3 2005/04/22 07:22:33 snj Exp $ +$NetBSD: distinfo,v 1.72.2.4 2005/05/17 10:29:42 salo Exp $ -SHA1 (mozilla-source-1.7.7.tar.bz2) = c660db518add97ed54e30a901c1e4e60dbafab3a -RMD160 (mozilla-source-1.7.7.tar.bz2) = 410017e874ba058bf1dbc7f265db95a2311545a0 -Size (mozilla-source-1.7.7.tar.bz2) = 29776225 bytes -SHA1 (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = cb8f05dc11eb6fd954a15f6c04e2904c8d4d3f94 -RMD160 (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = 4371536b745882de8dbd736ed03f3b661067251b -Size (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = 102926 bytes +SHA1 (mozilla-1.7.8-source.tar.bz2) = ca682415a9ba99a3c4bd55636e1f9fda53a2545f +RMD160 (mozilla-1.7.8-source.tar.bz2) = 3e91b559c2ab76ba6dc1f99fca57b921660ab673 +Size (mozilla-1.7.8-source.tar.bz2) = 30449749 bytes SHA1 (patch-aa) = be62070f062e8ae13f06bd7b3f4f0d4a9ee67bef SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642 |