3 files changed, 19 insertions, 29 deletions

diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile
index 33175de7a7ff..857de257b7b6 100644
--- a/print/acroreadwrapper/Makefile
+++ b/print/acroreadwrapper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	acroreadwrapper
-PORTVERSION=	0.0.20080906
+PORTVERSION=	0.0.20090328
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,9 +16,10 @@ COMMENT=	Wrapper script for Adobe Reader
 
 ONLY_FOR_ARCHS=	amd64 i386
 NO_BUILD=	yes
-PLIST_FILES=	bin/acroread8 bin/acroread
+PLIST_FILES=	bin/acroread8 bin/acroread9 bin/acroread
 SUB_FILES=	acroread
 SUB_LIST=	ACROBASE8=${ACROBASE8} \
+		ACROBASE9=${ACROBASE9} \
 		ADOBE_LANG=${ADOBE_LANG:U} \
 		INSTALLDIR=${INSTALLDIR} \
 		LINUXBASE=${LINUXBASE} \
@@ -27,6 +28,7 @@ SUB_LIST=	ACROBASE8=${ACROBASE8} \
 
 ADOBEBASE=	Adobe
 ACROBASE8=	${ADOBEBASE}/Reader8
+ACROBASE9=	${ADOBEBASE}/Reader9
 PLUGINDIR=	lib/npapi/linux-acroread
 
 do-fetch:
@@ -35,6 +37,7 @@ do-fetch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/acroread ${PREFIX}/bin/acroread
 	cd ${PREFIX}/bin && ${LN} -s -f acroread acroread8
+	cd ${PREFIX}/bin && ${LN} -s -f acroread acroread9
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/acroreadwrapper/files/acroread.in b/print/acroreadwrapper/files/acroread.in
index b7e9e50d51de..79932066fc10 100644
--- a/print/acroreadwrapper/files/acroread.in
+++ b/print/acroreadwrapper/files/acroread.in
@@ -9,8 +9,8 @@
 #
 # ADOBE_VER:
 #     Set this if you want to invoke a specific version of
-#     Adobe Reader by "acroread".  Currently only "8" is valid.
-#     When this script is invoked as "acroread8",
+#     Adobe Reader by "acroread".  Currently only "8" or "9" is valid.
+#     When this script is invoked as "acroread8" or "acroread9",
 #     ADOBE_VER is automatically set.
 #
 # ADOBE_DISABLEIMMODULEHACK:
@@ -79,9 +79,10 @@ case ${ADOBE_VER} in
 	BN=${0##*/}
 	VN=${BN#????????}
 	case ${VN} in
-	8)	ADOBE_VER=${VN} ;;
+	8|9)	ADOBE_VER=${VN} ;;
 	*)
 		if [ -d %%PREFIX%%/%%ACROBASE8%% ]; then ADOBE_VER=8; fi
+		if [ -d %%PREFIX%%/%%ACROBASE9%% ]; then ADOBE_VER=9; fi
 	;;
 	esac
 ;;
@@ -94,6 +95,12 @@ case ${ADOBE_VER} in
 	MOZILLA_COMP_PATH=/../%%PREFIX%%/lib/linux-nvu
 	export MOZILLA_COMP_PATH
 ;;
+9)
+	ACROBASE=%%ACROBASE9%%
+	BINPREFIX=Adobe/Reader9/bin
+	MOZILLA_COMP_PATH=/../%%PREFIX%%/lib/linux-nvu
+	export MOZILLA_COMP_PATH
+;;
 esac
 
 case ${ADOBE_DISABLEIMMODULEHACK} in
@@ -106,6 +113,10 @@ case ${ADOBE_DISABLEIMMODULEHACK} in
 	8:scim)
 		GTK_IM_MODULE=scim; export GTK_IM_MODULE
 		XMODIFIERS="@im=SCIM"; export XMODIFIERS
+	;;
+	9:scim)
+		GTK_IM_MODULE=scim; export GTK_IM_MODULE
+		XMODIFIERS="@im=SCIM"; export XMODIFIERS
 	;; 
 	*)
 		XMODIFIERS="@im=${GTK_IM_MODULE}"; export XMODIFIERS
@@ -114,23 +125,6 @@ case ${ADOBE_DISABLEIMMODULEHACK} in
 ;;
 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}/${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%% > /dev/null 2>&1 || true
-	exit 0
-;;
-esac
-
 UNAME_s=Linux; export UNAME_s
 
 if [ -x %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/acroread ]; then
diff --git a/print/acroreadwrapper/pkg-message b/print/acroreadwrapper/pkg-message
deleted file mode 100644
index c4cb439c52ab..000000000000
--- a/print/acroreadwrapper/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-====
-This wrapper script supports the following options not to be passed
-to the acroread actually:
-
---install-plugin:    install PDF plugin
---deinstall-plugin:  deinstall PDF plugin
-====