diff --git a/french/acroread9/Makefile b/french/acroread9/Makefile index 5c1573f60779..95009d90d240 100644 --- a/french/acroread9/Makefile +++ b/french/acroread9/Makefile @@ -10,5 +10,4 @@ DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= FRA -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/german/acroread9/Makefile b/german/acroread9/Makefile index 88c66af2e09b..41c87be9e4e0 100644 --- a/german/acroread9/Makefile +++ b/german/acroread9/Makefile @@ -10,5 +10,4 @@ DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= DEU -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/japanese/acroread9/Makefile b/japanese/acroread9/Makefile index 96aacd805902..9c476e641a29 100644 --- a/japanese/acroread9/Makefile +++ b/japanese/acroread9/Makefile @@ -10,5 +10,4 @@ DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= JPN -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile index a8977b6bc23f..b051cd3704ba 100644 --- a/print/acroread9/Makefile +++ b/print/acroread9/Makefile @@ -20,9 +20,9 @@ LICENSE_PERMS= auto-accept RUN_DEPENDS= acroreadwrapper>=0.0.20110529:${PORTSDIR}/print/acroreadwrapper +USES= tar:bzip2 RESTRICTED= Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html ONLY_FOR_ARCHS= amd64 i386 -USE_BZIP2= yes USE_LINUX= yes USE_LINUX_APPS= cups-libs gdkpixbuf gtk2 libgcrypt libgpg-error libxml2 pango USE_LDCONFIG= yes @@ -49,7 +49,7 @@ LANGCODE= chs:zh_CN cht:zh_TW dan:da_DK deu:de_DE enu:en_US \ ADOBE_LANG?= ENU .for L in ${ADOBE_LANG:tl} LOCALE_NAME= ${LANGCODE:M${L}\:*:C/.*\://} -MANLANG= ${LOCALE_NAME:C/_.*//:C/en/""/} +MANLANG= ${LOCALE_NAME:C/_.*//:C/en//} LANG_${L:tu}= "" LANG_NON${L:tu}= "@comment " .endfor @@ -68,31 +68,27 @@ INSTALLDIR= ${PREFIX}/${ACRODIR} INSTALLEXEC= ${SETENV} UNAME_s=Linux \ InstallDir=${INSTALLDIR} \ UNAME_r="Linux Compatibility on FreeBSD" \ - ${SH} ./INSTALL --install_path=${INSTALLDIR} > /dev/null - -MAN1= acroread.1 -MANCOMPRESSED= yes + ${SH} ./INSTALL --install_path=${STAGEDIR}${INSTALLDIR} > /dev/null +.if !empty(MANLANG) MANINSTALLDIR= man/${MANLANG} -NO_STAGE= yes -post-man-install: - ${MKDIR} ${MANPREFIX}/${MANINSTALLDIR}/man1 - ${LN} -s -f \ - ${INSTALLDIR}/Adobe/Reader9/Resource/Shell/acroread.1.gz \ - ${MANPREFIX}/${MANINSTALLDIR}/man1/ +.else +MANINSTALLDIR= man +.endif -pre-su-install: +pre-install: @${MKDIR} ${WRKDIR}/bin @${INSTALL_SCRIPT} \ ${WRKDIR}/ln ${WRKDIR}/rm ${WRKDIR}/mv \ ${WRKDIR}/bin do-install: - @${ECHO_CMD} Installing... - @${MKDIR} ${INSTALLDIR} - @${MKDIR} ${PREFIX}/share/desktop-directories + @${MKDIR} ${STAGEDIR}${INSTALLDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null - -post-install: post-man-install - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${MANPREFIX}/${MANINSTALLDIR}/man1 + ${LN} -s -f \ + ${INSTALLDIR}/Adobe/Reader9/Resource/Shell/acroread.1.gz \ + ${STAGEDIR}${MANPREFIX}/${MANINSTALLDIR}/man1/ + ${SED} -i "" -e "s,${STAGEDIR},," ${STAGEDIR}${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/.config .include diff --git a/print/acroread9/pkg-plist b/print/acroread9/pkg-plist index b255e57b2e74..34f0ca21a7c9 100644 --- a/print/acroread9/pkg-plist +++ b/print/acroread9/pkg-plist @@ -433,6 +433,7 @@ %%ACRODIR%%/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/win/CP950.TXT %%ACRODIR%%/Adobe/Reader9/bin/UNINSTALL %%ACRODIR%%/Adobe/Reader9/bin/acroread +%%MANINSTALLDIR%%/man1/acroread.1.gz @dirrm %%ACRODIR%%/Adobe/Reader9/bin @dirrm %%ACRODIR%%/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/win @dirrm %%ACRODIR%%/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/mac