Index: Makefile =================================================================== RCS file: /home/ncvs/ports/print/acroreadwrapper/Makefile,v retrieving revision 1.7 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.7 Makefile --- Makefile 23 Jun 2007 14:18:06 -0000 1.7 +++ Makefile 2 Sep 2007 14:05:08 -0000 @@ -7,7 +7,7 @@ PORTNAME= acroreadwrapper PORTVERSION= 0.0.20060221 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= # empty DISTFILES= # empty @@ -24,7 +24,9 @@ ADOBE_LANG=${ADOBE_LANG:U} \ INSTALLDIR=${INSTALLDIR} \ LINUXBASE=${LINUXBASE} \ - PLUGINDIR=${PLUGINDIR} + LINUXSH=${LINUXBASE}/bin/sh \ + PLUGINDIR=${PLUGINDIR} \ + ADOBEBASE= Adobe ACROBASE= ${ADOBEBASE}/Acrobat7.0 Index: files/acroread.in =================================================================== RCS file: /home/ncvs/ports/print/acroreadwrapper/files/acroread.in,v retrieving revision 1.3 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.3 acroread.in --- files/acroread.in 9 Jun 2007 12:44:02 -0000 1.3 +++ files/acroread.in 2 Sep 2007 14:08:45 -0000 @@ -73,10 +73,13 @@ UNAME_s=Linux; export UNAME_s if [ -x %%PREFIX%%/%%ACROBASE%%/${ADOBE_LANG}/bin/acroread ]; then - exec %%PREFIX%%/%%ACROBASE%%/${ADOBE_LANG}/bin/acroread "$@" -elif [ -x %%PREFIX%%/%%ACROBASE%%/ENU/bin/acroread ]; then - exec %%PREFIX%%/%%ACROBASE%%/ENU/bin/acroread "$@" + exec %%LINUXSH%% %%PREFIX%%/%%ACROBASE%%/${ADOBE_LANG}/bin/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/bin/acroread ]; then + echo "Trying to invoke English version..." 1>&2 + exec %%LINUXSH%% %%PREFIX%%/%%ACROBASE%%/ENU/bin/acroread "$@" + fi fi +echo "!fatal: No acroread binary found. Check \$LANG or \$ADOBE_LANG, and installed acroread package." 1>&2 +exit 1