Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Nov 2003 11:30:48 -0500
From:      Joe Marcus Clarke <marcus@marcuscom.com>
To:        Norikatsu Shigemura <nork@freebsd.org>
Cc:        kde@freebsd.org
Subject:   Re: HEADS UP: I'll commit www/linuxpluginwarpper
Message-ID:  <1069259448.697.53.camel@gyros>
In-Reply-To: <200311191611.hAJGBcaa078764@sakura.ninth-nine.com>
References:  <200311191611.hAJGBcaa078764@sakura.ninth-nine.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--=-Bd4QSyS1yAf2PxW+p7s2
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Wed, 2003-11-19 at 11:11, Norikatsu Shigemura wrote:
> Hi epiphany/galeon/galeon2/mozilla-jlp maintainer!
>=20
> 	I'll commit www/linuxpluginwrapper, and chase this
> 	modification to these ports, tomorrow.

Approved from gnome@.

Joe

>=20
>=20
> Index: japanese/mozilla-jlp/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
> =20
>  PORTNAME=3D	mozilla
>  PORTVERSION=3D	1.5
> +PORTREVISION=3D	1
>  PORTEPOCH=3D	1
>  CATEGORIES=3D	japanese www
>  MASTER_SITES=3D	http://www33.ocn.ne.jp/~snip/mozilla/jlp/
> Index: japanese/mozilla-jlp/files/mozilla.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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=3D%%LOCALENAME%%; export LANG
>  %%LIBXPG4%%
>  #XMODIFIERS=3D@im=3Dkinput2; export XMODIFIERS
> -#LD_PRELOAD=3D%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
> =20
>  MOZILLA_DIR=3D"%%PREFIX%%/lib/%%MOZILLA%%"
>  MOZILLA_EXEC=3D"mozilla"
> Index: japanese/mozilla-jlp-devel/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
> =20
>  PORTNAME=3D	mozilla
>  PORTVERSION=3D	1.6.a
> +PORTREVISION=3D	1
>  CATEGORIES=3D	japanese www
>  MASTER_SITES=3D	http://www33.ocn.ne.jp/~snip/mozilla/jlp/
>  PKGNAMESUFFIX=3D	-jlp
> Index: japanese/mozilla-jlp-devel/files/mozilla.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 -000=
0	1.4
> +++ japanese/mozilla-jlp-devel/files/mozilla.sh	19 Nov 2003 15:48:16 -000=
0
> @@ -3,7 +3,6 @@
>  LANG=3D%%LOCALENAME%%; export LANG
>  %%LIBXPG4%%
>  #XMODIFIERS=3D@im=3Dkinput2; export XMODIFIERS
> -#LD_PRELOAD=3D%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
> =20
>  MOZILLA_DIR=3D"%%PREFIX%%/lib/%%MOZILLA%%"
>  MOZILLA_EXEC=3D"mozilla"
> Index: www/epiphany/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
> =20
>  PORTNAME=3D	epiphany
>  PORTVERSION=3D	1.0.6
> +PORTREVISION=3D	1
>  CATEGORIES=3D	www gnome
>  MASTER_SITES=3D	${MASTER_SITE_GNOME}
>  MASTER_SITE_SUBDIR=3D	sources/${PORTNAME}/1.0
> @@ -51,7 +52,6 @@
>  CONFIGURE_ENV=3D	CPPFLAGS=3D"-I${LOCALBASE}/include -I${X11BASE}/include=
 ${PTHREAD_CFLAGS}" \
>  		LIBS=3D"-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
> =20
> -FLASHPLAYER=3D	${LOCALBASE}/lib/libflashplayer.so.1
>  XXX_FILES=3D	EphyAutomation-common.c EphyAutomation-stubs.c \
>  	   	EphyAutomation-skels.c EphyAutomation.h
> =20
> @@ -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
> =20
>  pre-install:
>  	@-${X11BASE}/bin/gconftool-2 --shutdown
> Index: www/epiphany/files/patch-src_epiphany.in
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
>  =20
>   if test -n "$MOZILLA_FIVE_HOME"; then
> @@ -9,17 +9,12 @@
>   	MOZILLA_HOME=3D@MOZILLA_HOME@
>   else
>   	echo "Cannot find mozilla installation directory. Please set MOZILLA_F=
IVE_HOME to your mozilla directory"
> -@@ -17,4 +17,12 @@
> +@@ -22,4 +22,7 @@
>   MOZILLA_FIVE_HOME=3D$MOZILLA_HOME
>   export MOZILLA_FIVE_HOME
>  =20
>  -exec "$dist_bin/epiphany-bin" "$@"
>  +MOZ_PLUGIN_PATH=3D%%X11BASE%%/lib/browser_plugins
>  +export MOZ_PLUGIN_PATH
> -+
> -+if [ -f %%FLASHPLAYER%% ]; then
> -+    LD_PRELOAD=3D%%FLASHPLAYER%%
> -+    export LD_PRELOAD
> -+fi
>  +
>  +exec "%%PREFIX%%/bin/epiphany-bin" "$@"
> Index: www/galeon/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
> =20
>  PORTNAME=3D	galeon
>  PORTVERSION=3D	1.2.12
> -PORTREVISION=3D	2
> +PORTREVISION=3D	3
>  CATEGORIES=3D	www gnome
>  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
>  MASTER_SITE_SUBDIR=3D	${PORTNAME}
> @@ -49,8 +49,6 @@
> =20
>  MAN1=3D		galeon.1
> =20
> -FLASHPLAYER=3D	${LOCALBASE}/lib/libflashplayer.so.1
> -
>  CONFLICTS=3D	galeon2-*
> =20
>  .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
> =20
> Index: www/galeon/files/patch-ab
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
>  =20
>   if test -n "$MOZILLA_FIVE_HOME"; then
> @@ -26,7 +26,7 @@
>   else
>   	echo "Cannot find mozilla installation directory. Please set MOZILLA_F=
IVE_HOME to your mozilla directory"
>   	exit
> -@@ -27,11 +23,12 @@
> +@@ -27,11 +23,7 @@
>   MOZILLA_FIVE_HOME=3D$MOZILLA_HOME
>   export MOZILLA_FIVE_HOME
>  =20
> @@ -35,13 +35,9 @@
>  -	if [ "`cat /etc/redhat-release`" =3D "Red Hat Linux release 7.1 (Seawo=
lf)"  ]; then
>  -   	 export LD_ASSUME_KERNEL=3D2.2.5
>  -	fi
> +-fi
>  +MOZ_PLUGIN_PATH=3D%%PREFIX%%/lib/browser_plugins
>  +export MOZ_PLUGIN_PATH
> -+
> -+if [ -f %%FLASHPLAYER%% ]; then
> -+    LD_PRELOAD=3D%%FLASHPLAYER%%
> -+    export LD_PRELOAD
> - fi
>  =20
>  -exec "$dist_bin/galeon-bin" "$@"
>  +exec %%PREFIX%%/bin/galeon-bin "$@"
> Index: www/galeon2/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
> =20
>  PORTNAME=3D	galeon2
>  PORTVERSION=3D	1.3.10
> -PORTREVISION=3D	1
> +PORTREVISION=3D	2
>  CATEGORIES=3D	www gnome
>  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
>  MASTER_SITE_SUBDIR=3D	${PORTNAME:S/2$//}
> @@ -54,8 +54,6 @@
> =20
>  MAN1=3D		galeon.1
> =20
> -FLASHPLAYER=3D	${LOCALBASE}/lib/libflashplayer.so.1
> -
>  CONFLICTS=3D	galeon-*
> =20
>  .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
> =20
>  pre-install:
>  	@-${X11BASE}/bin/gconftool-2 --shutdown
> Index: www/galeon2/files/patch-ab
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
>  =20
>   if test -n "$MOZILLA_FIVE_HOME"; then
> @@ -25,8 +25,8 @@
>  +    	MOZILLA_HOME=3D%%PREFIX%%/lib/%%MOZILLA%%
>   else
>   	echo "Cannot find mozilla installation directory. Please set MOZILLA_F=
IVE_HOME to your mozilla directory"
> - 	exit
> -@@ -27,11 +23,12 @@
> + 	exit 1
> +@@ -27,11 +23,7 @@
>   MOZILLA_FIVE_HOME=3D$MOZILLA_HOME
>   export MOZILLA_FIVE_HOME
>  =20
> @@ -35,13 +35,9 @@
>  -	if [ "`cat /etc/redhat-release`" =3D "Red Hat Linux release 7.1 (Seawo=
lf)"  ]; then
>  -   	 export LD_ASSUME_KERNEL=3D2.2.5
>  -	fi
> +-fi
>  +MOZ_PLUGIN_PATH=3D%%PREFIX%%/lib/browser_plugins
>  +export MOZ_PLUGIN_PATH
> -+
> -+if [ -f %%FLASHPLAYER%% ]; then
> -+    LD_PRELOAD=3D%%FLASHPLAYER%%
> -+    export LD_PRELOAD
> - fi
>  =20
>  -exec "$dist_bin/galeon-bin" "$@"
>  +exec "%%PREFIX%%/bin/galeon-bin" "$@"
> _______________________________________________
> freebsd-gnome@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org"
--=20
PGP Key : http://www.marcuscom.com/pgp.asc



--=-Bd4QSyS1yAf2PxW+p7s2
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQA/u5q4b2iPiv4Uz4cRApxOAKCZ+C6VhjI7UVncww05gf9l+Ga/0gCfbWPD
moQROr/DoM7BkoKOGnRRlTg=
=qV8P
-----END PGP SIGNATURE-----

--=-Bd4QSyS1yAf2PxW+p7s2--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1069259448.697.53.camel>