[Midnightbsd-cvs] mports: print/acroreadwrapper: Update for adobe reader 8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 4 14:22:08 EST 2008


Log Message:
-----------
Update for adobe reader 8

Modified Files:
--------------
    mports/print/acroreadwrapper:
        Makefile (r1.3 -> r1.4)
        pkg-message (r1.1 -> r1.2)
    mports/print/acroreadwrapper/files:
        acroread.in (r1.1 -> r1.2)

Removed Files:
-------------
    mports/print/acroreadwrapper:
        pkg-plist

-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/print/acroreadwrapper/pkg-message,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/acroreadwrapper/pkg-message -L print/acroreadwrapper/pkg-message -u -r1.1 -r1.2
--- print/acroreadwrapper/pkg-message
+++ print/acroreadwrapper/pkg-message
@@ -1,7 +1,5 @@
-====
 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
-====
--- print/acroreadwrapper/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
- at comment $FreeBSD: ports/print/acroreadwrapper/pkg-plist,v 1.1 2006/02/21 18:41:38 hrs Exp $
-bin/acroread
- at exec mkdir -p %D/%%ACRODIR%%
- at dirrm %%ACRODIR%%
- at dirrm %%ADOBEDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/acroreadwrapper/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L print/acroreadwrapper/Makefile -L print/acroreadwrapper/Makefile -u -r1.3 -r1.4
--- print/acroreadwrapper/Makefile
+++ print/acroreadwrapper/Makefile
@@ -3,12 +3,11 @@
 # Whom:			hrs
 #
 # $MidnightBSD$
-# $FreeBSD: ports/print/acroreadwrapper/Makefile,v 1.3 2006/02/22 06:58:02 hrs Exp $
+# $FreeBSD: ports/print/acroreadwrapper/Makefile,v 1.9 2008/01/04 20:20:20 hrs Exp $
 #
 
 PORTNAME=	acroreadwrapper
-PORTVERSION=	0.0.20060221
-PORTREVISION=   1
+PORTVERSION=	0.0.20071020
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,19 +17,20 @@
 LICENSE=	bsd2
 
 ONLY_FOR_ARCHS=	amd64 i386
-USE_XLIB=	yes
 NO_BUILD=	yes
-PLIST_SUB=	ACRODIR=${ACRODIR} \
-		ADOBEDIR=${ADOBEDIR}
+PLIST_FILES=	bin/acroread7 bin/acroread8 bin/acroread
 SUB_FILES=	acroread
-SUB_LIST=	ACRODIR=${ACRODIR} \
+SUB_LIST=	ACROBASE7=${ACROBASE7} \
+		ACROBASE8=${ACROBASE8} \
 		ADOBE_LANG=${ADOBE_LANG:U} \
 		INSTALLDIR=${INSTALLDIR} \
 		LINUXBASE=${LINUXBASE} \
-		PLUGINDIR=${PLUGINDIR}
+		LINUXSH=${LINUXBASE}/bin/sh \
+		PLUGINDIR=${PLUGINDIR} \
 
-ADOBEDIR=	Adobe
-ACRODIR=	${ADOBEDIR}/Acrobat7.0
+ADOBEBASE=	Adobe
+ACROBASE7=	${ADOBEBASE}/Acrobat7.0
+ACROBASE8=	${ADOBEBASE}/Reader8
 PLUGINDIR=	lib/browser_linux_plugins
 
 do-fetch:
@@ -38,6 +38,7 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/acroread ${PREFIX}/bin/acroread
-	${MKDIR} ${PREFIX}/${ACRODIR}
+	cd ${PREFIX}/bin && ${LN} -s -f acroread acroread8
+	cd ${PREFIX}/bin && ${LN} -s -f acroread acroread7
 
 .include <bsd.port.mk>
Index: acroread.in
===================================================================
RCS file: /home/cvs/mports/print/acroreadwrapper/files/acroread.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/acroreadwrapper/files/acroread.in -L print/acroreadwrapper/files/acroread.in -u -r1.1 -r1.2
--- print/acroreadwrapper/files/acroread.in
+++ print/acroreadwrapper/files/acroread.in
@@ -1,5 +1,19 @@
 #!%%LINUXBASE%%/bin/sh
-# $FreeBSD: ports/print/acroreadwrapper/files/acroread.in,v 1.2 2006/02/22 06:58:02 hrs Exp $
+# $MidnightBSD$
+# $FreeBSD: ports/print/acroreadwrapper/files/acroread.in,v 1.5 2008/01/04 20:20:20 hrs Exp $
+
+# environment variables:
+#
+# ADOBE_LANG:
+#     Set this if you want to invoke a specific localized version.
+#     If $LANG is set, this will be set automatically based on it.
+#
+# ADOBE_VER:
+#     Set this if you want to invoke a specific version of
+#     Adobe Reader by "acroread".  Currently "7" and "8" are valid.
+#     When this script is invoked as "acroread7" and "acroread8",
+#     ADOBE_VER is automatically set.
+#
 
 ADOBE_LANG=`echo "${ADOBE_LANG}" | tr a-z A-Z`
 
@@ -54,12 +68,39 @@
 KOR) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
 esac
 
+case ${ADOBE_VER} in
+"")
+	BN=${0##*/}
+	VN=${BN#????????}
+	case ${VN} in
+	[78])	ADOBE_VER=${VN} ;;
+	*)
+		if [ -d %%PREFIX%%/%%ACROBASE7%% ]; then ADOBE_VER=7; fi
+		if [ -d %%PREFIX%%/%%ACROBASE8%% ]; then ADOBE_VER=8; fi
+	;;
+	esac
+;;
+esac
+
+case ${ADOBE_VER} in
+7)
+	ACROBASE=%%ACROBASE7%%
+	BINPREFIX=bin
+;;
+8)
+	ACROBASE=%%ACROBASE8%%
+	BINPREFIX=Adobe/Reader8/bin
+	MOZILLA_COMP_PATH=/../%%PREFIX%%/lib/linux-nvu
+	export MOZILLA_COMP_PATH
+;;
+esac
+
 case $1 in
 --install-plugin)
 	echo "installing PDF plugin..."
-	echo "%%PREFIX%%/%%ACRODIR%%/${ADOBE_LANG}/Browser/intellinux/nppdf.so -> %%PREFIX%%/%%PLUGINDIR%%/nppdf.so"
+	echo "%%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so -> %%PREFIX%%/%%PLUGINDIR%%/nppdf.so"
 	mkdir -p /../%%PREFIX%%/%%PLUGINDIR%%
-	ln -s -f %%PREFIX%%/%%ACRODIR%%/${ADOBE_LANG}/Browser/intellinux/nppdf.so \
+	ln -s -f %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so \
 	/../%%PREFIX%%/%%PLUGINDIR%%/nppdf.so
 	exit 0
 ;;
@@ -72,11 +113,15 @@
 esac
 
 UNAME_s=Linux; export UNAME_s
-if [ -x %%PREFIX%%/%%ACRODIR%%/${ADOBE_LANG}/bin/acroread ]; then
-	exec %%PREFIX%%/%%ACRODIR%%/${ADOBE_LANG}/bin/acroread "$@"
-elif [ -x %%PREFIX%%/%%ACRODIR%%/ENU/bin/acroread ]; then
-	exec %%PREFIX%%/%%ACRODIR%%/ENU/bin/acroread "$@"
+
+if [ -x %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/acroread ]; then
+	exec %%LINUXSH%% %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/acroread "$@"
 else
-	echo "!fatal: acroread binary not found."
-	exit 1
+	echo "?warning: localized acroread (${ADOBE_LANG}) not found." 1>&2
+	if [ -x %%PREFIX%%/${ACROBASE}/ENU/${BINPREFIX}/acroread ]; then
+		echo "Trying to invoke English version..." 1>&2
+		exec %%LINUXSH%% %%PREFIX%%/${ACROBASE}/ENU/${BINPREFIX}/acroread "$@"
+	fi
 fi
+echo "!fatal: No acroread binary found.  Check \$LANG or \$ADOBE_LANG, and installed acroread packages." 1>&2
+exit 1


More information about the Midnightbsd-cvs mailing list