Date: Fri, 14 Apr 2006 18:04:07 +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: PATCH for www/linuxpluginwrapper w.r.t ja-acroread Message-ID: <20060414090411.17751.qmail@pudding.bsp.bc.niigata-u.ac.jp>
next in thread | raw e-mail | index | archive | help
----Next_Part(Fri_Apr_14_18:04:07_2006_364)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hello, 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(Fri_Apr_14_18:04:07_2006_364)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="linuxpluginwrapper.diff" diff -ru linuxpluginwrapper.orig/Makefile linuxpluginwrapper/Makefile --- linuxpluginwrapper.orig/Makefile Sat Apr 8 02:21:05 2006 +++ linuxpluginwrapper/Makefile Fri Apr 14 07:50:51 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.orig/files/patch-misc::libmap.conf-FreeBSD4.x linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x --- linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD4.x Fri Apr 7 14:01:47 2006 +++ linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x Fri Apr 14 08:17:55 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 + + @@ -46,6 +46,8 @@ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so] libstdc++.so.5 libstdc++.so.3 diff -ru linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD5-current linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current --- linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD5-current Fri Apr 7 14:01:47 2006 +++ linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current Fri Apr 14 08:25:07 2006 @@ -18,3 +18,12 @@ ####################################################### +@@ -38,7 +40,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 + + diff -ru linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD5-stable linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable --- linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD5-stable Fri Apr 7 14:01:47 2006 +++ linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable Fri Apr 14 08:17:07 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 + + @@ -40,6 +40,8 @@ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so] libstdc++.so.5 libstdc++.so.4 diff -ru linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD6 linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 --- linuxpluginwrapper.orig/files/patch-misc::libmap.conf-FreeBSD6 Fri Apr 7 14:01:47 2006 +++ linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 Fri Apr 14 08:07:51 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.orig/pkg-plist linuxpluginwrapper/pkg-plist --- linuxpluginwrapper.orig/pkg-plist Mon Apr 10 08:52:09 2006 +++ linuxpluginwrapper/pkg-plist Fri Apr 14 07:47:47 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(Fri_Apr_14_18:04:07_2006_364)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060414090411.17751.qmail>