HEADS UP: I'll commit www/linuxpluginwarpper

조회수 0회
읽지 않은 첫 메시지로 건너뛰기

Norikatsu Shigemura

읽지 않음,
2003. 11. 19. 오전 11:27:1103. 11. 19.
받는사람
Hi epiphany/galeon/galeon2/mozilla-jlp maintainer!

I'll commit www/linuxpluginwrapper, and chase this
modification to these ports, tomorrow.


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" "$@"
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-port...@freebsd.org"

Joe Marcus Clarke

읽지 않음,
2003. 11. 19. 오전 11:47:1403. 11. 19.
받는사람
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@.

Joe

> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnom...@freebsd.org"
--
PGP Key : http://www.marcuscom.com/pgp.asc


signature.asc

Simon Barner

읽지 않음,
2003. 11. 19. 오후 12:08:2003. 11. 19.
받는사람
Hi,

> Hi epiphany/galeon/galeon2/mozilla-jlp maintainer!
>
> I'll commit www/linuxpluginwrapper, and chase this
> modification to these ports, tomorrow.

IIRC linuxpluginwrapper is based on libmap, which is not available in
-stable. I just had a look into CVSweb, and it seems there are no plans
to MFC it.

Perhaps I am just missing something...? Or will the modification be
backwards compatible with -stable?

Simon

signature.asc

Norikatsu Shigemura

읽지 않음,
2003. 11. 19. 오후 1:00:0303. 11. 19.
받는사람
On Wed, 19 Nov 2003 17:52:32 +0100
Simon Barner <bar...@in.tum.de> wrote:
> > Hi epiphany/galeon/galeon2/mozilla-jlp maintainer!
> > I'll commit www/linuxpluginwrapper, and chase this
> > modification to these ports, tomorrow.
> IIRC linuxpluginwrapper is based on libmap, which is not available in
> -stable. I just had a look into CVSweb, and it seems there are no plans
> to MFC it.

I requested. But..
http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/58133
If I can, I want to commit this....

> Perhaps I am just missing something...? Or will the modification be
> backwards compatible with -stable?

Oops. I'll say that "Please use libmap.conf patch". But it's
so bad. Okey, I'll keep www/flashpluginwrapper. And CONFLICT
between www/linuxpluginwrapper and www/flashpluginwrapper.
And I'll not remove LD_PRELOAD which I said on this HEADS UP.

Simon Barner

읽지 않음,
2003. 11. 19. 오후 1:17:3303. 11. 19.
받는사람
> > Perhaps I am just missing something...? Or will the modification be
> > backwards compatible with -stable?
>
> Oops. I'll say that "Please use libmap.conf patch". But it's
> so bad. Okey, I'll keep www/flashpluginwrapper. And CONFLICT
> between www/linuxpluginwrapper and www/flashpluginwrapper.
> And I'll not remove LD_PRELOAD which I said on this HEADS UP.

Or perhaps introduce some magic in order to have LD_PRELOAD line only on
-stable systems without the libmap patch. IIRC the preloaded library
would conflict with your libmap solution.

If you prepare patches to support -stable proberly, I'll be glad to test
them.

Simon

signature.asc

Norikatsu Shigemura

읽지 않음,
2003. 11. 19. 오후 9:20:0503. 11. 19.
받는사람
On Wed, 19 Nov 2003 19:02:39 +0100
Simon Barner <bar...@in.tum.de> wrote:
> > > Perhaps I am just missing something...? Or will the modification be
> > > backwards compatible with -stable?
> > Oops. I'll say that "Please use libmap.conf patch". But it's
> > so bad. Okey, I'll keep www/flashpluginwrapper. And CONFLICT
> > between www/linuxpluginwrapper and www/flashpluginwrapper.
> > And I'll not remove LD_PRELOAD which I said on this HEADS UP.
> Or perhaps introduce some magic in order to have LD_PRELOAD line only on
> -stable systems without the libmap patch. IIRC the preloaded library
> would conflict with your libmap solution.

I don't hope to support LD_PRELOAD and libmap solution:-(.
Because libmap solution is not support Flash5 and RealPlayer,
and LD_PRELOAD solution is not support Flash6 and Acroread.

> If you prepare patches to support -stable proberly, I'll be glad to test
> them.

http://people.FreeBSD.org/~nork/libmap_4stable.diff
And, please,
# cd /usr/src
# patch -p0 < libmap_4stable.diff
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-port...@freebsd.org"

Norikatsu Shigemura

읽지 않음,
2003. 11. 20. 오후 8:47:1103. 11. 20.
받는사람
On Thu, 20 Nov 2003 01:11:38 +0900 (JST)
Norikatsu Shigemura <no...@FreeBSD.org> wrote:
> I'll commit www/linuxpluginwrapper, and chase this
> modification to these ports, tomorrow.

Committed, please upgrade to linuxpluginwrapper! :-)
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
To unsubscribe, send any mail to "freebsd-gnom...@freebsd.org"

전체답장
작성자에게 답장
전달
새 메시지 0개