Date: Thu, 20 Apr 2006 23:30:30 +0900 (JST) From: Mamoru Iwaki <iwaki@bc.niigata-u.ac.jp> To: nork@FreeBSD.org Cc: ports@FreeBSD.org, iwaki@bc.niigata-u.ac.jp, ports-jp@jp.FreeBSD.org Subject: Re: PATCH for www/linuxpluginwrapper w.r.t ja-acroread Message-ID: <20060420143036.24212.qmail@pudding.bsp.bc.niigata-u.ac.jp> In-Reply-To: <20060414090412.17760.qmail@pudding.bsp.bc.niigata-u.ac.jp> References: <20060414090412.17760.qmail@pudding.bsp.bc.niigata-u.ac.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
----Next_Part(Thu_Apr_20_23:30:31_2006_356)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hello,
This is a new patch working good, because the previous patch had
some mistakes for files/*.
Sorry to bother you.
From: Mamoru Iwaki <iwaki@bc.niigata-u.ac.jp>
Subject: PATCH for www/linuxpluginwrapper w.r.t ja-acroread
Date: Fri, 14 Apr 2006 18:04:07 +0900 (JST)
> The attached patch for www/linuxpluginwrapper makes
> japanese/acroread possible to be used in linuxpluginwrapper.
> This is very useful for us, Japanese.
> And this patch also provides a hook for other languages.
>
> For example, in English environment,
>
> % make
>
> is enough as usual. In Japanese environment,
>
> % make LNG=JPN
>
> should be simply done.
>
> How about that?
> I'm happy this kind of patch should be merged, possibly before 6.1R.
>
> Thanks
---
-----
Mamoru IWAKI (iwaki@bc.niigata-u.ac.jp)
Graduate School of Science and Technology, Niigata University
----Next_Part(Thu_Apr_20_23:30:31_2006_356)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="linuxpluginwrapper.diff"
diff -ru linuxpluginwrapper/Makefile linuxpluginwrapper.new/Makefile
--- linuxpluginwrapper/Makefile Sat Apr 8 02:21:05 2006
+++ linuxpluginwrapper.new/Makefile Wed Apr 19 21:35:27 2006
@@ -19,6 +19,8 @@
OPTIONS= REALPLAYER "install linux-realplayer" off \
ACROREAD "install acroread7" off
+LNG?= ENU # LNG=JPN for Japanese
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700009
@@ -31,7 +33,11 @@
WITH_PLUGINS= 1
.endif
.if defined(WITH_ACROREAD)
-RUN_DEPENDS+= ${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
+.if ${LNG} == "ENU"
+RUN_DEPENDS+= ${X11BASE}/Adobe/Acrobat7.0/${LNG}/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
+.elif ${LNG} == "JPN"
+RUN_DEPENDS+= ${X11BASE}/Adobe/Acrobat7.0/${LNG}/Browser/intellinux/nppdf.so:${PORTSDIR}/japanese/acroread
+.endif
WITH_PLUGINS= 1
.endif
@@ -48,9 +54,7 @@
USE_XLIB= yes
PLIST_SUB= LINUXBASE=${LINUXBASE}
PKGMESSAGE= ${WRKDIR}/pkg-message
-.if !defined(WITH_PLUGINS) || ${OSVERSION} < 500000
PLIST= ${WRKDIR}/pkg-plist
-.endif
.if ${OSVERSION} >= 700001
LIBMAPCONF= ${EXAMPLESDIR}/libmap.conf-FreeBSD6
@@ -101,13 +105,15 @@
< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
.if !defined(WITH_PLUGINS)
@${SED} -e "/exec/d" ${.CURDIR}/pkg-plist > ${PLIST}
+.else
+ @${SED} -e 's,%%LNG%%,${LNG},' ${.CURDIR}/pkg-plist > ${PLIST}
.endif
.if defined(WITH_PLUGINS)
pre-install:
@${MKDIR} ${X11BASE}/lib/browser_linux_plugins
.if defined(WITH_ACROREAD)
- @${LN} -sf ${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so \
+ @${LN} -sf ${X11BASE}/Adobe/Acrobat7.0/${LNG}/Browser/intellinux/nppdf.so \
${X11BASE}/lib/browser_linux_plugins/
.endif
.if defined(WITH_REALPLAYER)
diff -ru linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD4.x
--- linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x Fri Apr 7 14:01:47 2006
+++ linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD4.x Wed Apr 19 21:57:28 2006
@@ -9,6 +9,15 @@
libc.so.6 pluginwrapper/acrobat.so
# Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+@@ -37,7 +37,7 @@
+ libc.so.6 pluginwrapper/acrobat.so
+
+ # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+-[/usr/local/Acrobat7/Browser/intellinux/nppdf.so]
++[/usr/X11R6/Adobe/Acrobat7.0/JPN/Browser/intellinux/nppdf.so]
+ libc.so.6 pluginwrapper/acrobat.so
+
+
@@ -46,6 +46,8 @@
[/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
libstdc++.so.5 libstdc++.so.3
diff -ru linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD5-current
--- linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current Fri Apr 7 14:01:47 2006
+++ linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD5-current Wed Apr 19 22:02:31 2006
@@ -9,6 +9,15 @@
libc.so.6 pluginwrapper/acrobat.so
# Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+@@ -27,7 +27,7 @@
+ libc.so.6 pluginwrapper/acrobat.so
+
+ # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+-[/usr/local/Acrobat7/Browser/intellinux/nppdf.so]
++[/usr/X11R6/Adobe/Acrobat7.0/JPN/Browser/intellinux/nppdf.so]
+ libc.so.6 pluginwrapper/acrobat.so
+
+
@@ -36,6 +36,8 @@
[/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
libstdc++.so.5 libstdc++.so.4
diff -ru linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD5-stable
--- linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable Fri Apr 7 14:01:47 2006
+++ linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD5-stable Wed Apr 19 21:58:10 2006
@@ -9,6 +9,15 @@
libc.so.6 pluginwrapper/acrobat.so
# Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+@@ -38,7 +38,7 @@
+ libc.so.6 pluginwrapper/acrobat.so
+
+ # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+-[/usr/local/Acrobat7/Browser/intellinux/nppdf.so]
++[/usr/X11R6/Adobe/Acrobat7.0/JPN/Browser/intellinux/nppdf.so]
+ libc.so.6 pluginwrapper/acrobat.so
+
+
@@ -40,6 +40,8 @@
[/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
libstdc++.so.5 libstdc++.so.4
diff -ru linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD6
--- linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 Fri Apr 7 14:01:47 2006
+++ linuxpluginwrapper.new/files/patch-misc::libmap.conf-FreeBSD6 Wed Apr 19 22:04:40 2006
@@ -9,6 +9,15 @@
libc.so.6 pluginwrapper/acrobat.so
# Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+@@ -38,7 +38,7 @@
+ libc.so.6 pluginwrapper/acrobat.so
+
+ # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+-[/usr/X11R6/Acrobat7/Browser/intellinux/nppdf.so]
++[/usr/X11R6/Adobe/Acrobat7.0/JPN/Browser/intellinux/nppdf.so]
+ libc.so.6 pluginwrapper/acrobat.so
+
+
@@ -47,6 +47,8 @@
[/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
libstdc++.so.5 libstdc++.so.5
diff -ru linuxpluginwrapper/pkg-plist linuxpluginwrapper.new/pkg-plist
--- linuxpluginwrapper/pkg-plist Sat Apr 8 03:53:00 2006
+++ linuxpluginwrapper.new/pkg-plist Wed Apr 19 21:35:27 2006
@@ -17,7 +17,7 @@
@unexec /bin/rm -f %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt
@unexec /bin/rmdir %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
@exec /bin/mkdir -p %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
-@exec /bin/ln -sf %%X11BASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so %%X11BASE%%/lib/browser_linux_plugins/
+@exec /bin/ln -sf %%X11BASE%%/Adobe/Acrobat7.0/%%LNG%%/Browser/intellinux/nppdf.so %%X11BASE%%/lib/browser_linux_plugins/
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so %%X11BASE%%/lib/browser_linux_plugins/
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt %%X11BASE%%/lib/browser_linux_plugins/
@dirrm lib/pluginwrapper
----Next_Part(Thu_Apr_20_23:30:31_2006_356)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060420143036.24212.qmail>