From f24b743fdedbcdbb5094c95d10731235df7a42c3 Mon Sep 17 00:00:00 2001 From: kurt Date: Tue, 11 Jan 2005 04:26:45 +0000 Subject: [PATCH] - add gtk2 flavor - fix system png include path - change !gtk2 IDL lib to BUILD_DEPEND - bump package name - always use own nspr with help and ok from wilfried@ --- www/mozilla/Makefile | 31 ++++++++++++++++++++------ www/mozilla/patches/patch-configure_in | 24 +++++++++++++++++--- www/mozilla/pkg/PFRAG.gtk2 | 5 +++++ www/mozilla/pkg/PFRAG.gtk2-devel | 17 ++++++++++++++ www/mozilla/pkg/PFRAG.no-gtk2 | 3 +++ www/mozilla/pkg/PFRAG.no-gtk2-devel | 6 +++++ www/mozilla/pkg/PFRAG.shared | 4 +--- www/mozilla/pkg/PFRAG.shared-devel | 4 +--- www/mozilla/pkg/PLIST | 4 +++- www/mozilla/pkg/PLIST-devel | 12 +++------- 10 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 www/mozilla/pkg/PFRAG.gtk2 create mode 100644 www/mozilla/pkg/PFRAG.gtk2-devel create mode 100644 www/mozilla/pkg/PFRAG.no-gtk2 create mode 100644 www/mozilla/pkg/PFRAG.no-gtk2-devel diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index a5c2af86fdd..44609c0e65c 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.78 2005/01/04 21:27:28 wilfried Exp $ +# $OpenBSD: Makefile,v 1.79 2005/01/11 04:26:45 kurt Exp $ ONLY_FOR_ARCHS= alpha i386 sparc sparc64 amd64 powerpc @@ -7,7 +7,7 @@ COMMENT-devel= "devel files for Gecko" VER= 1.6 DISTNAME= mozilla -PKGNAME= mozilla-${VER} +PKGNAME= mozilla-${VER}p0 DISTFILES= mozilla-source-${VER}.tar.bz2 CATEGORIES= www @@ -19,8 +19,8 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xft Xi Xp Xrender Xt c fontconfig freetype \ - glib gmodule iconv intl m pthread stdc++ z +WANTLIB= X11 Xext Xft Xp Xrender Xt c fontconfig freetype \ + iconv intl m pthread stdc++ z MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${VER}/src/ \ http://ftp.mozilla.org/pub/mozilla/releases/mozilla${VER}/src/ @@ -35,6 +35,9 @@ PKGNAME$i= mozilla${i}-${VER} SUBPACKAGE?= +FLAVORS= gtk2 +FLAVOR?= + .if ${SUBPACKAGE} == "-devel" RUN_DEPENDS= ::www/mozilla .else @@ -43,11 +46,20 @@ MODGCC3_ARCHES= alpha MODGCC3_LANGS= C++ BUILD_DEPENDS= :zip->=2.3:archivers/zip \ :pkgconfig-*:devel/pkgconfig -LIB_DEPENDS= gtk.1,gdk.1::x11/gtk+ \ - IDL.4::devel/ORBit \ - jpeg.62::graphics/jpeg \ +LIB_DEPENDS= jpeg.62::graphics/jpeg \ png.3::graphics/png \ esd.2::audio/esound + +. if ${FLAVOR:L:Mgtk2} +BUILD_DEPENDS+= :libIDL-*:devel/libIDL +LIB_DEPENDS+= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 +WANTLIB+= Xcursor Xinerama atk-1.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \ + gobject-2.0.0.0 pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 +. else +BUILD_DEPENDS+= :ORBit-*:devel/ORBit +LIB_DEPENDS+= gtk.1,gdk.1::x11/gtk+ +WANTLIB+= Xi glib gmodule +. endif .endif USE_X11= Yes @@ -67,6 +79,7 @@ CONFIGURE_ARGS= \ --with-system-png=${LOCALBASE} \ --with-system-zlib=/usr/lib \ --with-pthreads \ + --without-system-nspr \ --enable-xft \ --enable-optimize=-Os \ --enable-crypto \ @@ -76,6 +89,10 @@ CONFIGURE_ARGS= \ --disable-tests \ --disable-ldap +.if ${FLAVOR:L:Mgtk2} +CONFIGURE_ARGS+=--enable-default-toolkit=gtk2 +.endif + CONFIGURE_ENV= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/dist/bin" diff --git a/www/mozilla/patches/patch-configure_in b/www/mozilla/patches/patch-configure_in index 5c04a208deb..c710968777c 100644 --- a/www/mozilla/patches/patch-configure_in +++ b/www/mozilla/patches/patch-configure_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_in,v 1.8 2004/02/15 19:44:01 wilfried Exp $ ---- configure.in.orig 2003-12-03 00:19:34.000000000 +0100 -+++ configure.in 2003-12-12 15:43:28.000000000 +0100 +$OpenBSD: patch-configure_in,v 1.9 2005/01/11 04:26:45 kurt Exp $ +--- configure.in.orig Thu Dec 11 18:30:36 2003 ++++ configure.in Thu Jan 6 11:08:01 2005 @@ -1286,12 +1286,11 @@ case "$target" in DLL_SUFFIX=".so.1.0" DSO_CFLAGS='' @@ -31,3 +31,21 @@ $OpenBSD: patch-configure_in,v 1.8 2004/02/15 19:44:01 wilfried Exp $ fi ;; +@@ -3038,7 +3036,7 @@ _SAVE_LIBS=$LIBS + CFLAGS="$ZLIB_CFLAGS $CFLAGS" + LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS" + if test -n "${PNG_DIR}"; then +- CFLAGS="-I${PNG_DIR}/include $CFLAGS" ++ CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS" + LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS" + fi + if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then +@@ -3068,7 +3066,7 @@ LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then +- PNG_CFLAGS="-I${PNG_DIR}/include" ++ PNG_CFLAGS="-I${PNG_DIR}/include/libpng" + PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" + fi + diff --git a/www/mozilla/pkg/PFRAG.gtk2 b/www/mozilla/pkg/PFRAG.gtk2 new file mode 100644 index 00000000000..a696900f4ca --- /dev/null +++ b/www/mozilla/pkg/PFRAG.gtk2 @@ -0,0 +1,5 @@ +@comment $OpenBSD: PFRAG.gtk2,v 1.1 2005/01/11 04:26:45 kurt Exp $ +mozilla/chrome/icons/default/default.xpm +mozilla/components/accessibility-atk.xpt +@lib mozilla/components/libsystem-pref.so.1.0 +@lib mozilla/components/libwidget_gtk2.so.1.0 diff --git a/www/mozilla/pkg/PFRAG.gtk2-devel b/www/mozilla/pkg/PFRAG.gtk2-devel new file mode 100644 index 00000000000..62e91ef015a --- /dev/null +++ b/www/mozilla/pkg/PFRAG.gtk2-devel @@ -0,0 +1,17 @@ +@comment $OpenBSD: PFRAG.gtk2-devel,v 1.1 2005/01/11 04:26:45 kurt Exp $ +mozilla/include/accessibility/nsAccessibleText.h +mozilla/include/accessibility/nsIAccessibleAction.h +mozilla/include/accessibility/nsIAccessibleEditableText.h +mozilla/include/accessibility/nsIAccessibleHyperLink.h +mozilla/include/accessibility/nsIAccessibleHyperText.h +mozilla/include/accessibility/nsIAccessibleTable.h +mozilla/include/accessibility/nsIAccessibleText.h +mozilla/include/accessibility/nsIAccessibleValue.h +mozilla/include/system-pref/ +mozilla/include/system-pref/nsSystemPrefLog.h +mozilla/include/system-pref/nsSystemPrefService.h +mozilla/include/widget/mozcontainer.h +mozilla/include/widget/mozdrawingarea.h +@comment @lib mozilla/lib/components/libsystem-pref.so.1.0 +@comment @lib mozilla/lib/components/libwidget_gtk2.so.1.0 +mozilla/lib/libsystem-pref_s.a diff --git a/www/mozilla/pkg/PFRAG.no-gtk2 b/www/mozilla/pkg/PFRAG.no-gtk2 new file mode 100644 index 00000000000..f8f046560a8 --- /dev/null +++ b/www/mozilla/pkg/PFRAG.no-gtk2 @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.no-gtk2,v 1.1 2005/01/11 04:26:45 kurt Exp $ +@lib mozilla/components/libwidget_gtk.so.1.0 +@lib mozilla/libgtksuperwin.so.1.0 diff --git a/www/mozilla/pkg/PFRAG.no-gtk2-devel b/www/mozilla/pkg/PFRAG.no-gtk2-devel new file mode 100644 index 00000000000..6f9fd80d31b --- /dev/null +++ b/www/mozilla/pkg/PFRAG.no-gtk2-devel @@ -0,0 +1,6 @@ +@comment $OpenBSD: PFRAG.no-gtk2-devel,v 1.1 2005/01/11 04:26:45 kurt Exp $ +mozilla/include/widget/gdksuperwin.h +mozilla/include/widget/gtkmozarea.h +mozilla/include/widget/gtkmozbox.h +@comment @lib mozilla/lib/components/libwidget_gtk.so.1.0 +@lib mozilla/lib/libgtksuperwin.so.1.0 diff --git a/www/mozilla/pkg/PFRAG.shared b/www/mozilla/pkg/PFRAG.shared index 7c02e9fac6b..c7b6694f2fa 100644 --- a/www/mozilla/pkg/PFRAG.shared +++ b/www/mozilla/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2004/10/17 22:25:52 espie Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.6 2005/01/11 04:26:45 kurt Exp $ @lib mozilla/components/libaccessibility.so.1.0 @lib mozilla/components/libaddrbook.so.1.0 @lib mozilla/components/libappcomps.so.1.0 @@ -66,7 +66,6 @@ @lib mozilla/components/libwalletviewers.so.1.0 @lib mozilla/components/libwebbrwsr.so.1.0 @lib mozilla/components/libwebsrvcs.so.1.0 -@lib mozilla/components/libwidget_gtk.so.1.0 @lib mozilla/components/libxmlextras.so.1.0 @lib mozilla/components/libxpcom_compat_c.so.1.0 @lib mozilla/components/libxpconnect.so.1.0 @@ -75,7 +74,6 @@ @lib mozilla/components/libxremoteservice.so.1.0 @lib mozilla/libgkgfx.so.1.0 @lib mozilla/libgtkembedmoz.so.1.0 -@lib mozilla/libgtksuperwin.so.1.0 @lib mozilla/libgtkxtbin.so.1.0 @lib mozilla/libjsj.so.1.0 @lib mozilla/libmozjs.so.1.0 diff --git a/www/mozilla/pkg/PFRAG.shared-devel b/www/mozilla/pkg/PFRAG.shared-devel index 58f115f2655..05ae1b8e6b2 100644 --- a/www/mozilla/pkg/PFRAG.shared-devel +++ b/www/mozilla/pkg/PFRAG.shared-devel @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared-devel,v 1.4 2004/10/17 22:25:52 espie Exp $ +@comment $OpenBSD: PFRAG.shared-devel,v 1.5 2005/01/11 04:26:45 kurt Exp $ @comment @lib mozilla/lib/components/libaccessibility.so.1.0 @comment @lib mozilla/lib/components/libaddrbook.so.1.0 @comment @lib mozilla/lib/components/libappcomps.so.1.0 @@ -66,7 +66,6 @@ @comment @lib mozilla/lib/components/libwalletviewers.so.1.0 @comment @lib mozilla/lib/components/libwebbrwsr.so.1.0 @comment @lib mozilla/lib/components/libwebsrvcs.so.1.0 -@comment @lib mozilla/lib/components/libwidget_gtk.so.1.0 @comment @lib mozilla/lib/components/libxmlextras.so.1.0 @comment @lib mozilla/lib/components/libxpcom_compat_c.so.1.0 @comment @lib mozilla/lib/components/libxpconnect.so.1.0 @@ -76,7 +75,6 @@ @lib mozilla/lib/libfort.so.1.0 @lib mozilla/lib/libgkgfx.so.1.0 @lib mozilla/lib/libgtkembedmoz.so.1.0 -@lib mozilla/lib/libgtksuperwin.so.1.0 @lib mozilla/lib/libgtkxtbin.so.1.0 @lib mozilla/lib/libjsj.so.1.0 @lib mozilla/lib/libmozjs.so.1.0 diff --git a/www/mozilla/pkg/PLIST b/www/mozilla/pkg/PLIST index 4df45066246..7fa076085d9 100644 --- a/www/mozilla/pkg/PLIST +++ b/www/mozilla/pkg/PLIST @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.27 2004/10/17 22:25:52 espie Exp $ +@comment $OpenBSD: PLIST,v 1.28 2005/01/11 04:26:45 kurt Exp $ %%SHARED%% +%%gtk2%% +!%%gtk2%% bin/mozilla mozilla/ mozilla/LICENSE diff --git a/www/mozilla/pkg/PLIST-devel b/www/mozilla/pkg/PLIST-devel index 931c710d405..6872fdafd6f 100644 --- a/www/mozilla/pkg/PLIST-devel +++ b/www/mozilla/pkg/PLIST-devel @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST-devel,v 1.8 2004/10/17 22:25:52 espie Exp $ +@comment $OpenBSD: PLIST-devel,v 1.9 2005/01/11 04:26:45 kurt Exp $ %%SHARED%% +%%gtk2%% +!%%gtk2%% lib/pkgconfig/ lib/pkgconfig/mozilla-gtkmozembed.pc lib/pkgconfig/mozilla-js.pc @@ -1735,10 +1737,6 @@ mozilla/include/plugin/nsPluginsCID.h mozilla/include/plugin/nsplugin.h mozilla/include/plugin/nsplugindefs.h mozilla/include/plugin/nspluginroot.h -mozilla/include/png/ -mozilla/include/png/mozpngconf.h -mozilla/include/png/png.h -mozilla/include/png/pngconf.h mozilla/include/pref/ mozilla/include/pref/nsIPref.h mozilla/include/pref/nsIPrefBranch.h @@ -1998,9 +1996,6 @@ mozilla/include/websrvcs/nsIWSPInterfaceInfoService.h mozilla/include/websrvcs/nsIWebScriptsAccessService.h mozilla/include/websrvcs/nsIWebServiceProxy.h mozilla/include/widget/ -mozilla/include/widget/gdksuperwin.h -mozilla/include/widget/gtkmozarea.h -mozilla/include/widget/gtkmozbox.h mozilla/include/widget/nsEvent.h mozilla/include/widget/nsGUIEvent.h mozilla/include/widget/nsIAppShell.h @@ -2395,7 +2390,6 @@ mozilla/lib/libmime_s.a mozilla/lib/libmimecthglue_s.a mozilla/lib/libmozbrwsr_s.a mozilla/lib/libmozdbm_s.a -mozilla/lib/libmozpng.a mozilla/lib/libmozreg_s.a mozilla/lib/libmozregsa_s.a mozilla/lib/libmozutil_s.a