Add support for the new Mozilla ports. By default, Galeon will build
against www/mozilla. However, you can change this by specifying a WITH_MOZILLA parameter, and setting it to one of the following values: mozilla-devel mozilla-embedded[-devel|-vendor] mozilla-vendor Note, this version of Galon should also use the new universal plugins directory.
This commit is contained in:
Joe Marcus Clarke
parent
ceab29fa67
commit
7ed5b24a01
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68563
4 changed files with 58 additions and 56 deletions
|
|
@ -18,21 +18,25 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
|
|||
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
|
||||
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
|
||||
|
||||
WITH_FULL_MOZILLA= "Problems with SSL, general performance, and usability"
|
||||
MOZ_CONFIGURE_ARGS=
|
||||
|
||||
.if defined(WITH_MOZILLA_DEVEL)
|
||||
HEADERS_SUFX= -devel
|
||||
.if !defined(WITH_FULL_MOZILLA)
|
||||
MOZILLA= mozilla-embedded-devel
|
||||
.else
|
||||
MOZILLA= mozilla-devel
|
||||
.endif
|
||||
.else
|
||||
.if !defined(WITH_MOZILLA)
|
||||
MOZILLA= mozilla
|
||||
HEADERS_SUFX=
|
||||
.if !defined(WITH_FULL_MOZILLA)
|
||||
MOZILLA= mozilla-embedded
|
||||
.else
|
||||
.if ${WITH_MOZILLA}=="mozilla-vendor" || ${WITH_MOZILLA}=="mozilla-embedded-vendor"
|
||||
MOZILLA= ${WITH_MOZILLA}
|
||||
HEADERS_SUFX= -vendor
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.0"
|
||||
.else
|
||||
.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
|
||||
MOZILLA= ${WITH_MOZILLA}
|
||||
HEADERS_SUFX= -devel
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk"
|
||||
.else
|
||||
MOZILLA= mozilla
|
||||
HEADERS_SUFX=
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
|
|
@ -43,15 +47,12 @@ USE_LIBTOOL= yes
|
|||
USE_REINPLACE= yes
|
||||
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
|
||||
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
|
||||
--enable-nautilus-view
|
||||
--enable-nautilus-view \
|
||||
${MOZ_CONFIGURE_ARGS}
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
|
||||
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
|
||||
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
|
||||
|
||||
.if !defined(WITH_MOZILLA_DEVEL)
|
||||
CONFIGURE_ARGS+= --with-mozilla-snapshot="1.0"
|
||||
.endif
|
||||
|
||||
MAN1= galeon.1
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
|
@ -63,13 +64,14 @@ CONFIGURE_ARGS+= --disable-werror
|
|||
.endif
|
||||
|
||||
post-extract:
|
||||
.if !defined(WITH_FULL_MOZILLA)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are"
|
||||
@${ECHO_MSG} " planning to use both Mozilla and Galeon you can instruct it to use mozilla by"
|
||||
@${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"."
|
||||
@${ECHO_MSG} " By default the port uses www/mozilla for html rendering, but you can change"
|
||||
@${ECHO_MSG} " this by defining WITH_MOZILLA to one of the following values:"
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} " mozilla-devel "
|
||||
@${ECHO_MSG} " mozilla-embedded[-devel|-vendor] "
|
||||
@${ECHO_MSG} " mozilla-vendor "
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- src/galeon.in.orig Thu Dec 27 23:49:08 2001
|
||||
+++ src/galeon.in Fri Dec 28 10:58:16 2001
|
||||
--- src/galeon.in.orig Thu Dec 27 19:13:42 2001
|
||||
+++ src/galeon.in Mon Oct 21 23:28:37 2002
|
||||
@@ -4,18 +4,14 @@
|
||||
|
||||
if test -n "$MOZILLA_FIVE_HOME"; then
|
||||
|
|
@ -29,7 +26,7 @@ $FreeBSD$
|
|||
else
|
||||
echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
|
||||
exit
|
||||
@@ -27,16 +23,9 @@
|
||||
@@ -27,16 +23,12 @@
|
||||
MOZILLA_FIVE_HOME=$MOZILLA_HOME
|
||||
export MOZILLA_FIVE_HOME
|
||||
|
||||
|
|
@ -39,7 +36,9 @@ $FreeBSD$
|
|||
- export LD_ASSUME_KERNEL=2.2.5
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
|
||||
+export MOZ_PLUGIN_PATH
|
||||
|
||||
if [ -f ./galeon-bin ]; then
|
||||
exec ./galeon-bin "$@"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -18,21 +18,25 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
|
|||
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
|
||||
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
|
||||
|
||||
WITH_FULL_MOZILLA= "Problems with SSL, general performance, and usability"
|
||||
MOZ_CONFIGURE_ARGS=
|
||||
|
||||
.if defined(WITH_MOZILLA_DEVEL)
|
||||
HEADERS_SUFX= -devel
|
||||
.if !defined(WITH_FULL_MOZILLA)
|
||||
MOZILLA= mozilla-embedded-devel
|
||||
.else
|
||||
MOZILLA= mozilla-devel
|
||||
.endif
|
||||
.else
|
||||
.if !defined(WITH_MOZILLA)
|
||||
MOZILLA= mozilla
|
||||
HEADERS_SUFX=
|
||||
.if !defined(WITH_FULL_MOZILLA)
|
||||
MOZILLA= mozilla-embedded
|
||||
.else
|
||||
.if ${WITH_MOZILLA}=="mozilla-vendor" || ${WITH_MOZILLA}=="mozilla-embedded-vendor"
|
||||
MOZILLA= ${WITH_MOZILLA}
|
||||
HEADERS_SUFX= -vendor
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.0"
|
||||
.else
|
||||
.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
|
||||
MOZILLA= ${WITH_MOZILLA}
|
||||
HEADERS_SUFX= -devel
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk"
|
||||
.else
|
||||
MOZILLA= mozilla
|
||||
HEADERS_SUFX=
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
|
|
@ -43,15 +47,12 @@ USE_LIBTOOL= yes
|
|||
USE_REINPLACE= yes
|
||||
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
|
||||
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
|
||||
--enable-nautilus-view
|
||||
--enable-nautilus-view \
|
||||
${MOZ_CONFIGURE_ARGS}
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
|
||||
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
|
||||
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
|
||||
|
||||
.if !defined(WITH_MOZILLA_DEVEL)
|
||||
CONFIGURE_ARGS+= --with-mozilla-snapshot="1.0"
|
||||
.endif
|
||||
|
||||
MAN1= galeon.1
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
|
@ -63,13 +64,14 @@ CONFIGURE_ARGS+= --disable-werror
|
|||
.endif
|
||||
|
||||
post-extract:
|
||||
.if !defined(WITH_FULL_MOZILLA)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are"
|
||||
@${ECHO_MSG} " planning to use both Mozilla and Galeon you can instruct it to use mozilla by"
|
||||
@${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"."
|
||||
@${ECHO_MSG} " By default the port uses www/mozilla for html rendering, but you can change"
|
||||
@${ECHO_MSG} " this by defining WITH_MOZILLA to one of the following values:"
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} " mozilla-devel "
|
||||
@${ECHO_MSG} " mozilla-embedded[-devel|-vendor] "
|
||||
@${ECHO_MSG} " mozilla-vendor "
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- src/galeon.in.orig Thu Dec 27 23:49:08 2001
|
||||
+++ src/galeon.in Fri Dec 28 10:58:16 2001
|
||||
--- src/galeon.in.orig Thu Dec 27 19:13:42 2001
|
||||
+++ src/galeon.in Mon Oct 21 23:28:37 2002
|
||||
@@ -4,18 +4,14 @@
|
||||
|
||||
if test -n "$MOZILLA_FIVE_HOME"; then
|
||||
|
|
@ -29,7 +26,7 @@ $FreeBSD$
|
|||
else
|
||||
echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
|
||||
exit
|
||||
@@ -27,16 +23,9 @@
|
||||
@@ -27,16 +23,12 @@
|
||||
MOZILLA_FIVE_HOME=$MOZILLA_HOME
|
||||
export MOZILLA_FIVE_HOME
|
||||
|
||||
|
|
@ -39,7 +36,9 @@ $FreeBSD$
|
|||
- export LD_ASSUME_KERNEL=2.2.5
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
|
||||
+export MOZ_PLUGIN_PATH
|
||||
|
||||
if [ -f ./galeon-bin ]; then
|
||||
exec ./galeon-bin "$@"
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue