diff options
| author | hrs <hrs@FreeBSD.org> | 2007-09-24 02:28:46 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2007-09-24 02:28:46 +0800 |
| commit | 4c0cc5afdc4bad0f57bb83ce47c15550dcc24259 (patch) | |
| tree | f2594fcc6627e9df105f8a07de5cab42f02ab599 /print | |
| parent | ae0aa535383c011b176270df3aa2ad519870680e (diff) | |
| download | freebsd-ports-graphics-4c0cc5afdc4bad0f57bb83ce47c15550dcc24259.tar.gz freebsd-ports-graphics-4c0cc5afdc4bad0f57bb83ce47c15550dcc24259.tar.zst freebsd-ports-graphics-4c0cc5afdc4bad0f57bb83ce47c15550dcc24259.zip | |
- Use ${LINUXBASE}/bin/sh instead of /bin/sh to prevent issues due to
difference of pathname lookup[*].
- Refine messages when localized acroread not found.
- Some cleanups.
PR: ports/113468 [*]
Diffstat (limited to 'print')
| -rw-r--r-- | print/acroreadwrapper/Makefile | 6 | ||||
| -rw-r--r-- | print/acroreadwrapper/files/acroread.in | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile index d73eaf86172..1781758f839 100644 --- a/print/acroreadwrapper/Makefile +++ b/print/acroreadwrapper/Makefile @@ -7,7 +7,7 @@ PORTNAME= acroreadwrapper PORTVERSION= 0.0.20060221 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= # empty DISTFILES= # empty @@ -16,7 +16,6 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= Wrapper script for Adobe Reader ONLY_FOR_ARCHS= amd64 i386 -USE_X_PREFIX= yes NO_BUILD= yes PLIST_FILES= bin/acroread SUB_FILES= acroread @@ -24,7 +23,8 @@ SUB_LIST= ACROBASE=${ACROBASE} \ ADOBE_LANG=${ADOBE_LANG:U} \ INSTALLDIR=${INSTALLDIR} \ LINUXBASE=${LINUXBASE} \ - PLUGINDIR=${PLUGINDIR} + LINUXSH=${LINUXBASE}/bin/sh \ + PLUGINDIR=${PLUGINDIR} \ ADOBEBASE= Adobe ACROBASE= ${ADOBEBASE}/Acrobat7.0 diff --git a/print/acroreadwrapper/files/acroread.in b/print/acroreadwrapper/files/acroread.in index e49259c6671..9fe631ca242 100644 --- a/print/acroreadwrapper/files/acroread.in +++ b/print/acroreadwrapper/files/acroread.in @@ -73,10 +73,13 @@ esac 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 packages." 1>&2 +exit 1 |