From dc4a17fad17010daec3c637f167005fcc50ee643 Mon Sep 17 00:00:00 2001 From: landry Date: Tue, 26 Oct 2010 10:01:33 +0000 Subject: [PATCH] Convert to use www/mozilla MODULE, removes shitload of lines. Less kittens cry. Went in a bunch of bulks without fallout.. --- devel/xulrunner/1.9/Makefile | 88 +++++++-------------------- devel/xulrunner/1.9/pkg/PLIST-main | 8 +-- devel/xulrunner/Makefile.inc | 96 ++++++------------------------ 3 files changed, 45 insertions(+), 147 deletions(-) diff --git a/devel/xulrunner/1.9/Makefile b/devel/xulrunner/1.9/Makefile index 927ef123fb1..ba6dfd9b17e 100644 --- a/devel/xulrunner/1.9/Makefile +++ b/devel/xulrunner/1.9/Makefile @@ -1,23 +1,20 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/22 19:25:19 landry Exp $ +# $OpenBSD: Makefile,v 1.27 2010/10/26 10:01:33 landry Exp $ -ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 - -VERSION= 1.9.2.11 +MOZILLA_VERSION = 1.9.2.11 FFX_VERSION= 3.6.11 -DIRECTORY= xulrunner1.9 -# needed for mozilla.port.mk -MOZILLA_PROJECT= xulrunner1.9 -DISTNAME= mozilla-1.9.2 -DISTFILES= firefox-${FFX_VERSION}.source.tar.bz2 +MOZILLA_BRANCH = 1.9.2 +MOZILLA_PROJECT = xulrunner1.9 +REVISION-main = 0 +REVISION-devel = 0 +DISTNAME = firefox-${FFX_VERSION}.source + MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/ SO_VERSION= 3.1 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. -.for _lib in imgicon mozjs xpcom xul sqlite3 nullplugin unixprintplugin -SHARED_LIBS+= ${_lib} ${SO_VERSION} -.endfor +MOZILLA_LIBS = imgicon mozjs xpcom xul sqlite3 nullplugin unixprintplugin .if ${MACHINE_ARCH} == "i386" PKG_ARGS+= -Djit=1 -Damd64=0 @@ -27,80 +24,41 @@ PKG_ARGS+= -Djit=1 -Damd64=1 PKG_ARGS+= -Djit=0 -Damd64=0 .endif -LIB_DEPENDS+= :nspr->=4.8.6:devel/nspr - # use files and patches from www/mozilla-firefox PATCHDIR= ${PORTSDIR}/www/mozilla-firefox/patches FILESDIR= ${PORTSDIR}/www/mozilla-firefox/files -MODULES+= lang/python -MODPY_RUNDEP= No - -CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 \ - --disable-system-sqlite \ - --disable-crashreporter \ - --disable-ipc \ - --disable-libnotify \ - --disable-necko-wifi -WANTLIB-devel+= gthread-2.0 gobject-2.0 -WANTLIB-main+= sndio - -MOB= ${WRKSRC}/dist/bin -MOZ= ${PREFIX}/${DIRECTORY} -SUBST_VARS+= DIRECTORY MOZILLA_PROJECT - -DATADIRS= chrome components defaults dictionaries greprefs \ +MOZILLA_DATADIRS = chrome components defaults dictionaries greprefs \ icons modules plugins res +MOZILLA_AUTOCONF_DIRS += js/src +MOZILLA_SUBST_FILES += config/autoconf.mk.in \ + xulrunner/setup/nsXULAppInstall.js DISTDIRS= idl include -TOOLS= mozilla-xremote-client nsinstall regxpcom xpcshell \ - xpidl xpt_dump xpt_link xulrunner-bin xulrunner-stub +TOOLS= nsinstall xpcshell xpidl xpt_dump xpt_link xulrunner-bin xulrunner-stub PCFILES= libxul.pc libxul-embedding.pc mozilla-js.pc \ mozilla-plugin.pc mozilla-gtkmozembed.pc \ mozilla-gtkmozembed-embedding.pc -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \ - ${WRKSRC}/js/src/build/autoconf -post-extract: - cp -f ${FILESDIR}/sydney_audio_sndio.c \ - ${WRKSRC}/media/libsydneyaudio/src/ - @cp -f ${FILESDIR}/nsSound.cpp ${WRKSRC}/widget/src/gtk2/ - -pre-configure: - cd ${WRKSRC}/js/src && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} - ${SUBST_CMD} ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ - ${WRKSRC}/config/autoconf.mk.in \ - ${WRKSRC}/build/unix/mozilla.in \ - ${WRKSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp \ - ${WRKSRC}/js/src/xpconnect/shell/Makefile.in \ - ${WRKSRC}/toolkit/xre/nsXREDirProvider.cpp \ - ${WRKSRC}/xulrunner/setup/nsXULAppInstall.js - post-build: cd ${WRKSRC}/xulrunner/installer && env -i ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${PCFILES} -do-install: +pre-install: + cd ${MOB} && ln -sf xulrunner ${MOZILLA_PROJECT} + cd ${MOB} && ln -sf xulrunner-bin ${MOZILLA_PROJECT}-bin + +post-install: cd ${WRKSRC}/dist && \ find ${DISTDIRS} -type d \ -exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \ find ${DISTDIRS} ! -type d \ -exec ${INSTALL_DATA} {} ${MOZ}/{} \; - cd ${MOZ} && ln -s xulrunner-bin xulrunner1.9-bin - cd ${MOB} && \ - find ${DATADIRS} -type d \ - -exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \ - find ${DATADIRS} ! -type d \ - -exec ${INSTALL_DATA} {} ${MOZ}/{} \; && \ - ${INSTALL_PROGRAM} ${TOOLS} ${MOZ} - ${INSTALL_DATA} ${MOB}/LICENSE ${MOB}/platform.ini \ - ${MOB}/*.so.${SO_VERSION} \ - ${WRKSRC}/dist/lib/libxpcomglue.a \ + ${INSTALL_DATA} ${WRKSRC}/dist/lib/libxpcomglue.a \ ${WRKSRC}/dist/lib/libxpcomglue_s.a ${MOZ} # needed to please libtool - libs are built with fPIC - cd ${MOZ} && ln -s libxpcomglue_s.a libxpcomglue_s_pic.a - cd ${MOZ} && ln -s libxpcomglue.a libxpcomglue_pic.a - ${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ} - ${INSTALL_SCRIPT} ${MOB}/xulrunner ${PREFIX}/bin/xulrunner1.9 + cd ${MOZ} && ln -sf libxpcomglue_s.a libxpcomglue_s_pic.a + cd ${MOZ} && ln -sf libxpcomglue.a libxpcomglue_pic.a + cd ${MOB} && ${INSTALL_PROGRAM} ${TOOLS} ${MOZ} ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig .for pcfile in ${PCFILES} ${INSTALL_DATA} ${WRKBUILD}/xulrunner/installer/${pcfile} \ diff --git a/devel/xulrunner/1.9/pkg/PLIST-main b/devel/xulrunner/1.9/pkg/PLIST-main index d4637ef6d0d..8f5b8eb0bbc 100644 --- a/devel/xulrunner/1.9/pkg/PLIST-main +++ b/devel/xulrunner/1.9/pkg/PLIST-main @@ -1,10 +1,10 @@ -@comment $OpenBSD: PLIST-main,v 1.7 2010/09/26 07:42:03 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.8 2010/10/26 10:01:33 landry Exp $ @option no-default-conflict @conflict xulrunner->=1.9 @unexec xulrunner1.9 --unregister-global -bin/${MOZILLA_PROJECT} +@bin bin/${MOZILLA_PROJECT} ${MOZILLA_PROJECT}/ -${MOZILLA_PROJECT}/LICENSE +${MOZILLA_PROJECT}/README.OpenBSD ${MOZILLA_PROJECT}/chrome/ ${MOZILLA_PROJECT}/chrome/classic.jar ${MOZILLA_PROJECT}/chrome/classic.manifest @@ -307,7 +307,7 @@ ${MOZILLA_PROJECT}/res/viewsource.css ${MOZILLA_PROJECT}/run-mozilla.sh @bin ${MOZILLA_PROJECT}/xulrunner-bin @bin ${MOZILLA_PROJECT}/xulrunner-stub -${MOZILLA_PROJECT}/${MOZILLA_PROJECT}-bin +@bin ${MOZILLA_PROJECT}/${MOZILLA_PROJECT}-bin @sample ${SYSCONFDIR}/gre.d/ @exec xulrunner1.9 --register-global @exec TEMP=`mktemp -d` && cd %D/xulrunner1.9 && env HOME=$TEMP LD_LIBRARY_PATH=%D/xulrunner1.9 ./regxpcom && rm -fr $TEMP diff --git a/devel/xulrunner/Makefile.inc b/devel/xulrunner/Makefile.inc index 2230a73316a..1399d246cad 100644 --- a/devel/xulrunner/Makefile.inc +++ b/devel/xulrunner/Makefile.inc @@ -1,21 +1,12 @@ -# $OpenBSD: Makefile.inc,v 1.14 2010/10/24 21:11:03 ajacoutot Exp $ - -# -# For legacy reasons (smooth updates), directory is xulrunner. -# New versions of xulrunner will actually use xulrunnerX.Y. -# -DIRECTORY?= xulrunner - -ONLY_FOR_ARCHS+= alpha amd64 arm i386 powerpc sparc sparc64 +# $OpenBSD: Makefile.inc,v 1.15 2010/10/26 10:01:33 landry Exp $ COMMENT-main= standalone XUL/XPCOM runtime environment COMMENT-devel= devel files for Gecko +PKGNAME = xulrunner-${MOZILLA_VERSION} +PKGNAME-main = xulrunner-${MOZILLA_VERSION} +PKGNAME-devel = xulrunner-devel-${MOZILLA_VERSION} -DISTNAME?= mozilla -PKGNAME= xulrunner-${VERSION} -PKGNAME-main= xulrunner-${VERSION} -PKGNAME-devel= xulrunner-devel-${VERSION} - +MOZILLA_CODENAME = xulrunner CATEGORIES+= devel HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner @@ -28,72 +19,21 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES+= http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${VERSION}/source \ - http://openbsddistfiles.com/martynas/mozilla/xulrunner/ -DISTFILES?= xulrunner-${VERSION}-source.tar.bz2 +# lots of logic in mozilla.port.mk +MODULES = www/mozilla devel/gettext lang/python -MODULES+= devel/gettext -BUILD_DEPENDS+= :zip->=2.3:archivers/zip -LIB_DEPENDS+= ::x11/gtk+2 \ - :nspr->=4.7:devel/nspr \ - :nss->=3.12:security/nss -WANTLIB+= c glib-2.0 m pthread stdc++ \ - nspr4.>=20 plc4.>=20 plds4.>=20 +LIB_DEPENDS-main = ${LIB_DEPENDS} +WANTLIB-main = ${WANTLIB} -WANTLIB-main+= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ - Xext Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 \ - cairo expat fontconfig freetype gmodule-2.0 \ - gobject-2.0 gthread-2.0 jpeg pango-1.0 pangocairo-1.0 \ - pangoft2-1.0 pixman-1 png pthread-stubs xcb z gio-2.0 \ - xcb-render GL Xxf86vm drm xcb-shm \ - gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \ - nss3.>=22 smime3.>=22 softokn3.>=22 ssl3.>=22 +LIB_DEPENDS-devel += ${MODGETTEXT_LIB_DEPENDS} \ + ::devel/libIDL \ + :${PKGNAME-main}:devel/xulrunner/${MOZILLA_VERSION:R:R},-main +WANTLIB-devel += c glib-2.0 gobject-2.0 gthread-2.0 m pthread stdc++ IDL-2 nspr4 plc4 plds4 \ + ${MOZILLA_PROJECT}/mozjs ${MOZILLA_PROJECT}/xpcom ${MOZILLA_PROJECT}/xul -LIB_DEPENDS-devel+= ${MODGETTEXT_LIB_DEPENDS} ::devel/libIDL \ - :${PKGNAME-main}:devel/xulrunner/${VERSION:R:R},-main -WANTLIB-devel+= ${WANTLIB} IDL-2 nspr4 plc4 plds4 ${DIRECTORY}/mozjs ${DIRECTORY}/xpcom ${DIRECTORY}/xul +MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/build/autoconf -VMEM_WARNING= Yes - -USE_GMAKE= Yes -NO_REGRESS= Yes - -MODGNU_CONFIG_GUESS_DIRS+= ${WRKSRC}/build/autoconf - -AUTOCONF_VERSION= 2.13 -CONFIGURE_STYLE= autoconf no-autoheader -CONFIGURE_ARGS+= --with-system-jpeg=${LOCALBASE} \ - --with-system-zlib=/usr/lib \ - --with-system-nspr \ - --with-system-nss \ - --with-pthreads \ - --enable-xft \ - --disable-optimize \ - --disable-debug \ - --disable-freetypetest \ - --disable-mochitest \ - --disable-libIDLtest \ - --disable-glibtest \ - --disable-tests \ - --disable-pedantic \ - --disable-installer \ - --disable-updater \ - --disable-gnomeui \ - --disable-gnomevfs \ - --disable-dbus \ - --disable-javaxpcom \ - --enable-xinerama \ - --enable-svg \ - --enable-svg-renderer=cairo \ - --enable-canvas \ - --enable-application=xulrunner \ +CONFIGURE_STYLE = autoconf no-autoheader +CONFIGURE_ARGS = --disable-javaxpcom \ + --disable-system-sqlite \ --enable-extensions=default,cookie,permissions - -MAKE_ENV+= MOZ_CO_PROJECT=xulrunner \ - LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \ - BUILD_OFFICIAL=1 \ - MOZILLA_OFFICIAL=1 \ - SO_VERSION="${SO_VERSION}" \ - mozappdir="${LOCALBASE}/${DIRECTORY}" -CONFIGURE_ENV+= ${MAKE_ENV} \ - topsrcdir=${WRKSRC}