summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/epiphany-extensions/Makefile67
-rw-r--r--www/epiphany/Makefile77
-rw-r--r--www/epiphany/files/epiphany27
-rw-r--r--www/epiphany/pkg-plist1
4 files changed, 13 insertions, 159 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index b40795d53..73224a48b 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.56 2005/11/11 08:21:10 ahze Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.57 2005/11/12 21:48:45 ahze Exp $
#
PORTNAME= epiphany
@@ -18,49 +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"
-#MOZILLA= mozilla-devel
-#HEADERS_SUFX= -devel
-.else
-.if ${WITH_MOZILLA}=="seamonkey"
-MOZILLA= seamonkey
-HEADERS_SUFX=
-MOZ_BUILD= seamonkey
-.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.9" EPHY_VERSION="1.10"
@@ -71,40 +41,15 @@ WITH_OPENSP= yes
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libosp.so)
-WITH_OPENSP= yes
-.endif
-
-.if defined(WITH_OPENSP)
+.if defined(WITH_OPENSP) || exists(${LOCALBASE}/lib/libosp.so)
CONFIGURE_ARGS+= --enable-opensp=yes
.else
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} " seamonkey "
- @${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 <bsd.port.post.mk>
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index e6b4b420b..1265904c7 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.87 2005/11/12 21:24:37 ahze Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.88 2005/11/16 22:43:12 marcus Exp $
#
PORTNAME= epiphany
@@ -16,58 +16,27 @@ 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
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= dbus-1.1:${PORTSDIR}/devel/dbus
-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"
-#MOZILLA= mozilla-devel
-#HEADERS_SUFX= -devel
-.else
-.if ${WITH_MOZILLA}=="seamonkey"
-MOZILLA= seamonkey
-HEADERS_SUFX=
-MOZ_BUILD= seamonkey
-.else
-MOZILLA= firefox
-HEADERS_SUFX=
-MOZ_BUILD= firefox
-.endif
-.endif
-.endif
+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}"
GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas
-FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}"
MAN1= epiphany.1
@@ -80,47 +49,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} " seamonkey "
- @${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
+ @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins|/lib/browser_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 <bsd.port.post.mk>
diff --git a/www/epiphany/files/epiphany b/www/epiphany/files/epiphany
deleted file mode 100644
index 504fd0240..000000000
--- 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 3c60af29d..c8bbc9a94 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