diff options
Diffstat (limited to 'print')
| -rw-r--r-- | print/acroread7/Makefile | 8 | ||||
| -rw-r--r-- | print/acroread7/pkg-plist.7.0.9 | 2 | ||||
| -rw-r--r-- | print/acroreadwrapper/Makefile | 8 | ||||
| -rw-r--r-- | print/acroreadwrapper/pkg-plist | 6 |
4 files changed, 15 insertions, 9 deletions
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile index 5cb29e6b371a..325099d9cedd 100644 --- a/print/acroread7/Makefile +++ b/print/acroread7/Makefile @@ -7,7 +7,7 @@ PORTNAME= acroread7 PORTVERSION?= 7.0.9 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES?= print linux MASTER_SITES?= http://ardownload.adobe.com/pub/adobe/reader/unix/7x/${VERSIONDIR}/${ADOBE_LANG:L}/ \ @@ -30,6 +30,8 @@ USE_X_PREFIX= yes NO_BUILD= yes PLIST= ${PKGDIR}/pkg-plist.${PORTVERSION} PLIST_SUB= ACRODIR=${ACRODIR} \ + ACROBASE=${ACROBASE} \ + ADOBEBASE=${ADOBEBASE} \ PLUGINDIR=${PLUGINDIR} \ ADOBE_LANG=${ADOBE_LANG:U} \ LOCALE_NAME=${LOCALE_NAME} @@ -59,7 +61,9 @@ LANG_NONENU?= "@comment " .endif PLIST_SUB+= LANG_NONENU=${LANG_NONENU} -ACRODIR= Adobe/Acrobat7.0/${ADOBE_LANG:U} +ADOBEBASE= Adobe +ACROBASE= ${ADOBEBASE}/Acrobat7.0 +ACRODIR= ${ACROBASE}/${ADOBE_LANG:U} PLUGINDIR= lib/browser_linux_plugins INSTALLDIR= ${PREFIX}/${ACRODIR} INSTALLEXEC= ${SETENV} UNAME_s=Linux \ diff --git a/print/acroread7/pkg-plist.7.0.9 b/print/acroread7/pkg-plist.7.0.9 index 188f34c78adb..08fed9319634 100644 --- a/print/acroread7/pkg-plist.7.0.9 +++ b/print/acroread7/pkg-plist.7.0.9 @@ -718,3 +718,5 @@ @dirrm %%ACRODIR%%/Browser/HowTo @dirrm %%ACRODIR%%/Browser @dirrm %%ACRODIR%% +@dirrmtry %%ACROBASE%% +@dirrmtry %%ADOBEBASE%% diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile index a34df0e046f6..db813c7c448c 100644 --- a/print/acroreadwrapper/Makefile +++ b/print/acroreadwrapper/Makefile @@ -18,8 +18,8 @@ COMMENT= Wrapper script for Adobe Reader ONLY_FOR_ARCHS= amd64 i386 USE_X_PREFIX= yes NO_BUILD= yes -PLIST_SUB= ACRODIR=${ACRODIR} \ - ADOBEDIR=${ADOBEDIR} +PLIST_SUB= ACROBASE=${ACROBASE} \ + ADOBEBASE=${ADOBEBASE} SUB_FILES= acroread SUB_LIST= ACRODIR=${ACRODIR} \ ADOBE_LANG=${ADOBE_LANG:U} \ @@ -27,8 +27,8 @@ SUB_LIST= ACRODIR=${ACRODIR} \ LINUXBASE=${LINUXBASE} \ PLUGINDIR=${PLUGINDIR} -ADOBEDIR= Adobe -ACRODIR= ${ADOBEDIR}/Acrobat7.0 +ADOBEBASE= Adobe +ACROBASE= ${ADOBEDIR}/Acrobat7.0 PLUGINDIR= lib/browser_linux_plugins do-fetch: diff --git a/print/acroreadwrapper/pkg-plist b/print/acroreadwrapper/pkg-plist index bc4f89becb33..a4e67178ebea 100644 --- a/print/acroreadwrapper/pkg-plist +++ b/print/acroreadwrapper/pkg-plist @@ -1,5 +1,5 @@ @comment $FreeBSD$ bin/acroread -@exec mkdir -p %D/%%ACRODIR%% -@dirrm %%ACRODIR%% -@dirrm %%ADOBEDIR%% +@exec mkdir -p %D/%%ACROBASE%% +@dirrmtry %%ACROBASE%% +@dirrmtry %%ADOBEBASE%% |