[Midnightbsd-cvs] mports: print/acroreadwrapper: Update the wrapper to hack around
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 25 11:06:03 EDT 2008
Log Message:
-----------
Update the wrapper to hack around GTK_IM_MODULE and XMODIFIERS.
Modified Files:
--------------
mports/print/acroreadwrapper:
Makefile (r1.4 -> r1.5)
mports/print/acroreadwrapper/files:
acroread.in (r1.2 -> r1.3)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/acroreadwrapper/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L print/acroreadwrapper/Makefile -L print/acroreadwrapper/Makefile -u -r1.4 -r1.5
--- print/acroreadwrapper/Makefile
+++ print/acroreadwrapper/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= acroreadwrapper
-PORTVERSION= 0.0.20071020
+PORTVERSION= 0.0.20080110
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -31,7 +31,7 @@
ADOBEBASE= Adobe
ACROBASE7= ${ADOBEBASE}/Acrobat7.0
ACROBASE8= ${ADOBEBASE}/Reader8
-PLUGINDIR= lib/browser_linux_plugins
+PLUGINDIR= lib/npapi/linux-acroread
do-fetch:
@${DO_NADA}
Index: acroread.in
===================================================================
RCS file: /home/cvs/mports/print/acroreadwrapper/files/acroread.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/acroreadwrapper/files/acroread.in -L print/acroreadwrapper/files/acroread.in -u -r1.2 -r1.3
--- print/acroreadwrapper/files/acroread.in
+++ print/acroreadwrapper/files/acroread.in
@@ -1,6 +1,6 @@
-#!%%LINUXBASE%%/bin/sh
+#!/bin/sh
# $MidnightBSD$
-# $FreeBSD: ports/print/acroreadwrapper/files/acroread.in,v 1.5 2008/01/04 20:20:20 hrs Exp $
+# $FreeBSD: ports/print/acroreadwrapper/files/acroread.in,v 1.6 2008/04/13 18:27:25 hrs Exp $
# environment variables:
#
@@ -14,6 +14,14 @@
# When this script is invoked as "acroread7" and "acroread8",
# ADOBE_VER is automatically set.
#
+# ADOBE_DISABLEIMMODULEHACK:
+# This script sets GTK_IM_MODULE as "xim" by default because
+# immodules other than xim require the corresponding module files
+# in Linux binary, not MidnightBSD native versions (if a MidnightBSD
+# native immodule library exists and the corresponding Linux
+# library does not, Adobe Reader attempts to load the MidnightBSD
+# binary and it will fail). If $ADOBE_DISABLEIMMODULEHACK is
+# defined as "YES", this behavior is disabled.
ADOBE_LANG=`echo "${ADOBE_LANG}" | tr a-z A-Z`
@@ -64,7 +72,6 @@
case ${ADOBE_LANG} in
CHS) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
CHT) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
-JPN) : ${GTK_IM_MODULE:=xim}; export GTK_IM_MODULE ;;
KOR) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
esac
@@ -95,19 +102,41 @@
;;
esac
+case ${ADOBE_DISABLEIMMODULEHACK} in
+[Yy][Ee][Ss]) ;; # do nothing
+*)
+ case ${ADOBE_VER}:${GTK_IM_MODULE} in
+ *:""|*:xim)
+ GTK_IM_MODULE=xim; export GTK_IM_MODULE
+ ;;
+ 7:scim)
+ GTK_IM_MODULE=xim; export GTK_IM_MODULE
+ XMODIFIERS="@im=SCIM"; export XMODIFIERS
+ ;;
+ 8:scim)
+ GTK_IM_MODULE=scim; export GTK_IM_MODULE
+ XMODIFIERS="@im=SCIM"; export XMODIFIERS
+ ;;
+ *)
+ XMODIFIERS="@im=${GTK_IM_MODULE}"; export XMODIFIERS
+ ;;
+ esac
+;;
+esac
+
case $1 in
--install-plugin)
echo "installing PDF plugin..."
echo "%%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so -> %%PREFIX%%/%%PLUGINDIR%%/nppdf.so"
- mkdir -p /../%%PREFIX%%/%%PLUGINDIR%%
- ln -s -f %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so \
- /../%%PREFIX%%/%%PLUGINDIR%%/nppdf.so
+ mkdir -p %%PREFIX%%/%%PLUGINDIR%%
+ ln -s -f %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/../Browser/intellinux/nppdf.so \
+ %%PREFIX%%/%%PLUGINDIR%%/nppdf.so
exit 0
;;
--deinstall-plugin)
echo "deinstalling PDF plugin..."
- rm -f /../%%PREFIX%%/%%PLUGINDIR%%/nppdf.so
- rmdir /../%%PREFIX%%/%%PLUGINDIR%% 2> /dev/null || true
+ rm -f %%PREFIX%%/%%PLUGINDIR%%/nppdf.so
+ rmdir %%PREFIX%%/%%PLUGINDIR%% > /dev/null 2>&1 || true
exit 0
;;
esac
More information about the Midnightbsd-cvs
mailing list