HEADS UP: I'll commit www/linuxpluginwarpper
Joe Marcus Clarke
marcus at marcuscom.com
Wed Nov 19 08:30:52 PST 2003
On Wed, 2003-11-19 at 11:11, Norikatsu Shigemura wrote:
> Hi epiphany/galeon/galeon2/mozilla-jlp maintainer!
>
> I'll commit www/linuxpluginwrapper, and chase this
> modification to these ports, tomorrow.
Approved from gnome at .
Joe
>
>
> Index: japanese/mozilla-jlp/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/japanese/mozilla-jlp/Makefile,v
> retrieving revision 1.50
> diff -u -r1.50 Makefile
> --- japanese/mozilla-jlp/Makefile 9 Nov 2003 02:25:10 -0000 1.50
> +++ japanese/mozilla-jlp/Makefile 19 Nov 2003 15:47:16 -0000
> @@ -7,6 +7,7 @@
>
> PORTNAME= mozilla
> PORTVERSION= 1.5
> +PORTREVISION= 1
> PORTEPOCH= 1
> CATEGORIES= japanese www
> MASTER_SITES= http://www33.ocn.ne.jp/~snip/mozilla/jlp/
> Index: japanese/mozilla-jlp/files/mozilla.sh
> ===================================================================
> RCS file: /home/ncvs/ports/japanese/mozilla-jlp/files/mozilla.sh,v
> retrieving revision 1.2
> diff -u -r1.2 mozilla.sh
> --- japanese/mozilla-jlp/files/mozilla.sh 6 Apr 2003 12:33:24 -0000 1.2
> +++ japanese/mozilla-jlp/files/mozilla.sh 19 Nov 2003 15:46:57 -0000
> @@ -3,7 +3,6 @@
> LANG=%%LOCALENAME%%; export LANG
> %%LIBXPG4%%
> #XMODIFIERS=@im=kinput2; export XMODIFIERS
> -#LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
>
> MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%"
> MOZILLA_EXEC="mozilla"
> Index: japanese/mozilla-jlp-devel/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/japanese/mozilla-jlp-devel/Makefile,v
> retrieving revision 1.48
> diff -u -r1.48 Makefile
> --- japanese/mozilla-jlp-devel/Makefile 9 Nov 2003 02:23:58 -0000 1.48
> +++ japanese/mozilla-jlp-devel/Makefile 19 Nov 2003 15:47:50 -0000
> @@ -7,6 +7,7 @@
>
> PORTNAME= mozilla
> PORTVERSION= 1.6.a
> +PORTREVISION= 1
> CATEGORIES= japanese www
> MASTER_SITES= http://www33.ocn.ne.jp/~snip/mozilla/jlp/
> PKGNAMESUFFIX= -jlp
> Index: japanese/mozilla-jlp-devel/files/mozilla.sh
> ===================================================================
> RCS file: /home/ncvs/ports/japanese/mozilla-jlp-devel/files/mozilla.sh,v
> retrieving revision 1.4
> diff -u -r1.4 mozilla.sh
> --- japanese/mozilla-jlp-devel/files/mozilla.sh 23 May 2003 01:44:04 -0000 1.4
> +++ japanese/mozilla-jlp-devel/files/mozilla.sh 19 Nov 2003 15:48:16 -0000
> @@ -3,7 +3,6 @@
> LANG=%%LOCALENAME%%; export LANG
> %%LIBXPG4%%
> #XMODIFIERS=@im=kinput2; export XMODIFIERS
> -#LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
>
> MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%"
> MOZILLA_EXEC="mozilla"
> Index: www/epiphany/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/www/epiphany/Makefile,v
> retrieving revision 1.31
> diff -u -r1.31 Makefile
> --- www/epiphany/Makefile 10 Nov 2003 18:43:34 -0000 1.31
> +++ www/epiphany/Makefile 19 Nov 2003 15:58:55 -0000
> @@ -7,6 +7,7 @@
>
> PORTNAME= epiphany
> PORTVERSION= 1.0.6
> +PORTREVISION= 1
> CATEGORIES= www gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
> @@ -51,7 +52,6 @@
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
> LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
>
> -FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
> XXX_FILES= EphyAutomation-common.c EphyAutomation-stubs.c \
> EphyAutomation-skels.c EphyAutomation.h
>
> @@ -98,8 +98,7 @@
> @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
> s|%%LOCALBASE%%|${LOCALBASE}|g ; \
> s|%%X11BASE%%|${X11BASE}|g ; \
> - s|%%MOZILLA%%|${MOZILLA}|g ; \
> - s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/epiphany
> + s|%%MOZILLA%%|${MOZILLA}|g ; ${WRKSRC}/src/epiphany
>
> pre-install:
> @-${X11BASE}/bin/gconftool-2 --shutdown
> Index: www/epiphany/files/patch-src_epiphany.in
> ===================================================================
> RCS file: /home/ncvs/ports/www/epiphany/files/patch-src_epiphany.in,v
> retrieving revision 1.1
> diff -u -r1.1 patch-src_epiphany.in
> --- www/epiphany/files/patch-src_epiphany.in 4 May 2003 02:12:52 -0000 1.1
> +++ www/epiphany/files/patch-src_epiphany.in 19 Nov 2003 15:53:06 -0000
> @@ -1,5 +1,5 @@
> ---- src/epiphany.in.orig Sat May 3 21:56:42 2003
> -+++ src/epiphany.in Sat May 3 21:59:12 2003
> +--- src/epiphany.in.orig Wed Sep 17 01:43:44 2003
> ++++ src/epiphany.in Thu Nov 20 00:52:26 2003
> @@ -4,7 +4,7 @@
>
> if test -n "$MOZILLA_FIVE_HOME"; then
> @@ -9,17 +9,12 @@
> MOZILLA_HOME=@MOZILLA_HOME@
> else
> echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
> -@@ -17,4 +17,12 @@
> +@@ -22,4 +22,7 @@
> MOZILLA_FIVE_HOME=$MOZILLA_HOME
> export MOZILLA_FIVE_HOME
>
> -exec "$dist_bin/epiphany-bin" "$@"
> +MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins
> +export MOZ_PLUGIN_PATH
> -+
> -+if [ -f %%FLASHPLAYER%% ]; then
> -+ LD_PRELOAD=%%FLASHPLAYER%%
> -+ export LD_PRELOAD
> -+fi
> +
> +exec "%%PREFIX%%/bin/epiphany-bin" "$@"
> Index: www/galeon/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/www/galeon/Makefile,v
> retrieving revision 1.115
> diff -u -r1.115 Makefile
> --- www/galeon/Makefile 1 Nov 2003 21:51:06 -0000 1.115
> +++ www/galeon/Makefile 19 Nov 2003 16:00:42 -0000
> @@ -7,7 +7,7 @@
>
> PORTNAME= galeon
> PORTVERSION= 1.2.12
> -PORTREVISION= 2
> +PORTREVISION= 3
> CATEGORIES= www gnome
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR= ${PORTNAME}
> @@ -49,8 +49,6 @@
>
> MAN1= galeon.1
>
> -FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
> -
> CONFLICTS= galeon2-*
>
> .include <bsd.port.pre.mk>
> @@ -85,7 +83,6 @@
> @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
> s|%%LOCALBASE%%|${LOCALBASE}|g ; \
> s|%%X11BASE%%|${X11BASE}|g ; \
> - s|%%FLASHPLAYER%%|${FLASHPLAYER}|g ; \
> s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon \
> ${WRKSRC}/src/nautstub.c
>
> Index: www/galeon/files/patch-ab
> ===================================================================
> RCS file: /home/ncvs/ports/www/galeon/files/patch-ab,v
> retrieving revision 1.16
> diff -u -r1.16 patch-ab
> --- www/galeon/files/patch-ab 20 Apr 2003 04:08:54 -0000 1.16
> +++ www/galeon/files/patch-ab 19 Nov 2003 16:00:22 -0000
> @@ -1,5 +1,5 @@
> ---- src/galeon.in.orig Thu Apr 3 15:14:49 2003
> -+++ src/galeon.in Sat Apr 19 23:38:10 2003
> +--- src/galeon.in.orig Fri Apr 4 05:14:49 2003
> ++++ src/galeon.in Thu Nov 20 00:59:50 2003
> @@ -4,18 +4,14 @@
>
> if test -n "$MOZILLA_FIVE_HOME"; then
> @@ -26,7 +26,7 @@
> else
> echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
> exit
> -@@ -27,11 +23,12 @@
> +@@ -27,11 +23,7 @@
> MOZILLA_FIVE_HOME=$MOZILLA_HOME
> export MOZILLA_FIVE_HOME
>
> @@ -35,13 +35,9 @@
> - if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)" ]; then
> - export LD_ASSUME_KERNEL=2.2.5
> - fi
> +-fi
> +MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
> +export MOZ_PLUGIN_PATH
> -+
> -+if [ -f %%FLASHPLAYER%% ]; then
> -+ LD_PRELOAD=%%FLASHPLAYER%%
> -+ export LD_PRELOAD
> - fi
>
> -exec "$dist_bin/galeon-bin" "$@"
> +exec %%PREFIX%%/bin/galeon-bin "$@"
> Index: www/galeon2/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/www/galeon2/Makefile,v
> retrieving revision 1.124
> diff -u -r1.124 Makefile
> --- www/galeon2/Makefile 13 Nov 2003 12:54:54 -0000 1.124
> +++ www/galeon2/Makefile 19 Nov 2003 15:58:31 -0000
> @@ -7,7 +7,7 @@
>
> PORTNAME= galeon2
> PORTVERSION= 1.3.10
> -PORTREVISION= 1
> +PORTREVISION= 2
> CATEGORIES= www gnome
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
> @@ -54,8 +54,6 @@
>
> MAN1= galeon.1
>
> -FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
> -
> CONFLICTS= galeon-*
>
> .include <bsd.port.pre.mk>
> @@ -92,8 +90,7 @@
> @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
> s|%%LOCALBASE%%|${LOCALBASE}|g ; \
> s|%%X11BASE%%|${X11BASE}|g ; \
> - s|%%MOZILLA%%|${MOZILLA}|g ; \
> - s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/galeon
> + s|%%MOZILLA%%|${MOZILLA}|g ; ${WRKSRC}/src/galeon
>
> pre-install:
> @-${X11BASE}/bin/gconftool-2 --shutdown
> Index: www/galeon2/files/patch-ab
> ===================================================================
> RCS file: /home/ncvs/ports/www/galeon2/files/patch-ab,v
> retrieving revision 1.19
> diff -u -r1.19 patch-ab
> --- www/galeon2/files/patch-ab 20 Apr 2003 03:34:37 -0000 1.19
> +++ www/galeon2/files/patch-ab 19 Nov 2003 15:57:45 -0000
> @@ -1,5 +1,5 @@
> ---- src/galeon.in.orig Thu Apr 3 15:08:00 2003
> -+++ src/galeon.in Sat Apr 19 23:10:10 2003
> +--- src/galeon.in.orig Thu Sep 11 00:53:21 2003
> ++++ src/galeon.in Thu Nov 20 00:57:15 2003
> @@ -4,18 +4,14 @@
>
> if test -n "$MOZILLA_FIVE_HOME"; then
> @@ -25,8 +25,8 @@
> + MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%%
> else
> echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
> - exit
> -@@ -27,11 +23,12 @@
> + exit 1
> +@@ -27,11 +23,7 @@
> MOZILLA_FIVE_HOME=$MOZILLA_HOME
> export MOZILLA_FIVE_HOME
>
> @@ -35,13 +35,9 @@
> - if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)" ]; then
> - export LD_ASSUME_KERNEL=2.2.5
> - fi
> +-fi
> +MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
> +export MOZ_PLUGIN_PATH
> -+
> -+if [ -f %%FLASHPLAYER%% ]; then
> -+ LD_PRELOAD=%%FLASHPLAYER%%
> -+ export LD_PRELOAD
> - fi
>
> -exec "$dist_bin/galeon-bin" "$@"
> +exec "%%PREFIX%%/bin/galeon-bin" "$@"
> _______________________________________________
> freebsd-gnome at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe at freebsd.org"
--
PGP Key : http://www.marcuscom.com/pgp.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20031119/5647e5d6/attachment.bin
More information about the freebsd-ports
mailing list