diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 21ecf41939b2..94bb2ab6a0eb 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -18,44 +18,19 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A set of add-ons for the Epiphany web browser -BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} - -MOZILLA= mozilla -HEADERS_SUFX= -MOZ_BUILD= mozilla - -.if !defined(WITH_MOZILLA) -MOZILLA= firefox -HEADERS_SUFX= -MOZ_BUILD= firefox -.else -.if ${WITH_MOZILLA}=="mozilla" -MOZILLA= mozilla -MOZ_BUILD= mozilla -.else -.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" -MOZILLA= mozilla-devel -HEADERS_SUFX= -devel -.else -MOZILLA= firefox -HEADERS_SUFX= -MOZ_BUILD= firefox -.endif -.endif -.endif +BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany +RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_BZIP2= yes USE_X_PREFIX= yes +USE_GECKO= firefox mozilla seamonkey USE_GNOME= gnomeprefix gnomehack intlhack gnometarget USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-extensions="all" \ - --with-mozilla=${MOZ_BUILD} + --with-mozilla=${GECKO} PLIST_SUB= VERSION="1.8" EPHY_VERSION="1.8" @@ -65,6 +40,7 @@ WITH_OPENSP= yes .endif .include +.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" .if exists(${LOCALBASE}/lib/libosp.so) WITH_OPENSP= yes @@ -76,30 +52,9 @@ CONFIGURE_ARGS+= --enable-opensp=yes CONFIGURE_ARGS+= --disable-opensp .endif -.if ${OSVERSION} < 500000 -.if ${MOZILLA}=="mozilla-devel" -USE_GCC= 3.4 -.endif -.endif - pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " By default epiphany-extensions builds with www/firefox support, but you can" - @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" - @${ECHO_MSG} - @${ECHO_MSG} " mozilla " - @${ECHO_MSG} " mozilla-devel " - @${ECHO_MSG} "" @${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):" @${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation" @${ECHO_MSG} "" -post-patch: - @${REINPLACE_CMD} -e \ - 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ - s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g; \ - s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g; \ - s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ - ${WRKSRC}/configure - .include diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index e7840ef23280..b92d787edde9 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -8,6 +8,7 @@ PORTNAME= epiphany PORTVERSION= 1.8.3 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8 @@ -16,45 +17,20 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An extremely lightweight and simple web browser for GNOME 2 -BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} \ - ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} \ - ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes - -MOZILLA= mozilla -HEADERS_SUFX= -MOZ_BUILD= mozilla - -.if !defined(WITH_MOZILLA) -MOZILLA= firefox -HEADERS_SUFX= -MOZ_BUILD= firefox -.else -.if ${WITH_MOZILLA}=="mozilla" -MOZILLA= mozilla -MOZ_BUILD= mozilla -.else -.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" -MOZILLA= mozilla-devel -HEADERS_SUFX= -devel -.else -MOZILLA= firefox -HEADERS_SUFX= -MOZ_BUILD= firefox -.endif -.endif -.endif +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes USE_BZIP2= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 +USE_GECKO= firefox mozilla seamonkey USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \ libgnomeprintui USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --with-mozilla=${MOZ_BUILD} \ +CONFIGURE_ARGS= --with-mozilla=${GECKO} \ --disable-python CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" @@ -67,6 +43,7 @@ PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" MAN1= epiphany.1 .include +.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" NO_WERROR= yes # allow build with more warnings enabled @@ -74,47 +51,15 @@ NO_WERROR= yes CONFIGURE_ARGS+= --enable-compile-warnings=no .endif -.if ${OSVERSION} < 500000 -.if ${MOZILLA}=="mozilla-devel" -USE_GCC= 3.4 -.endif -.endif - -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " By default epiphany uses www/firefox for html rendering, but you can" - @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" - @${ECHO_MSG} - @${ECHO_MSG} " mozilla " - @${ECHO_MSG} " mozilla-devel " - @${ECHO_MSG} "" - post-patch: -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel" - @${REINPLACE_CMD} -e 's|xmozilla|xmozilla${HEADERS_SUFX}|g; \ - s|mozilla)|mozilla${HEADERS_SUFX})|g; \ - s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ - s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g; \ - s|$$MOZILLA-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ - s|$$MOZILLA-xpcom|mozilla-xpcom${HEADERS_SUFX}|g' \ - ${WRKSRC}/configure -.endif @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ ${WRKSRC}/configure - -post-configure: - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; \ - s|%%MOZILLA%%|${MOZILLA}|g ; \ - s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' <${FILESDIR}/epiphany \ - > ${WRKDIR}/epiphany + @${REINPLCE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \ + ${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp post-install: - @${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin - ${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin @-update-desktop-database .include diff --git a/www/epiphany/files/epiphany b/www/epiphany/files/epiphany deleted file mode 100644 index 504fd02402ce..000000000000 --- a/www/epiphany/files/epiphany +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -dist_bin=`dirname $0` - -MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% - -if [ -z "$MOZ_PLUGIN_PATH" ]; then - MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins - export MOZ_PLUGIN_PATH -fi - -if [ -n "$LD_LIBRARY_PATH" ]; then - LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH -else - LD_LIBRARY_PATH=$MOZILLA_HOME -fi -export LD_LIBRARY_PATH - -MOZILLA_FIVE_HOME=$MOZILLA_HOME -export MOZILLA_FIVE_HOME - -if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then - LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1 - export LD_PRELOAD -fi - -exec "%%PREFIX%%/bin/epiphany-bin" "$@" diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index 3adc515fd8df..c3e401edd657 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -1,5 +1,4 @@ bin/epiphany -bin/epiphany-bin include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h