- Update to 9.4.7 (English version only)

- Add LICENSE.
- Add CUPS support.
- Add acroread(1) manual page.

Security:	APSA11-04
Security:	APSB11-24
Security:	CVE-2011-2462
Security:	CVE-2011-1353
Security:	CVE-2011-2431
Security:	CVE-2011-2432
Security:	CVE-2011-2433
Security:	CVE-2011-2434
Security:	CVE-2011-2435
Security:	CVE-2011-2436
Security:	CVE-2011-2437
Security:	CVE-2011-2438
Security:	CVE-2011-2439
Security:	CVE-2011-2440
Security:	CVE-2011-2441
Security:	CVE-2011-2442

3 files changed, 22 insertions, 9 deletions

diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile
index 62ef65a00690..1bcff0df6593 100644
--- a/print/acroread9/Makefile
+++ b/print/acroread9/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	acroread9
-PORTVERSION=	9.4.2
+PORTVERSION?=	9.4.7
 CATEGORIES?=	print linux
 MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:L}/ \
 		ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:L}/
@@ -16,13 +16,18 @@ DIST_SUBDIR=	acroread
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Adobe Reader for view, print, and search PDF documents (${ADOBE_LANG})
 
+LICENSE=	Adobe_WWEULA_20080204_1313
+LICENSE_NAME=	Adobe EULA (Reader_Player_AIR_WWEULA-en_US-20080204_1313)
+LICENSE_TEXT=	${INSTALLDIR}/Adobe/Reader9/Reader/Legal/en_US/License.txt
+LICENSE_PERMS=	auto-accept
+
 RUN_DEPENDS=	acroreadwrapper>=0.0.20110529:${PORTSDIR}/print/acroreadwrapper
 
 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=	gdkpixbuf gtk2 libxml2 pango
+USE_LINUX_APPS=	cups-libs gdkpixbuf gtk2 libgcrypt libgpg-error libxml2 pango
 USE_LDCONFIG=	yes
 #USE_GNOME=	desktopfileutils
 NO_BUILD=	yes
@@ -46,6 +51,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:L}
 LOCALE_NAME=	${LANGCODE:M${L}\:*:C/.*\://}
+MANLANG=	${LOCALE_NAME:C/_.*//:C/en/""/}
 LANG_${L:U}=	""
 LANG_NON${L:U}=	"@comment "
 .endfor
@@ -66,7 +72,14 @@ INSTALLEXEC=	${SETENV} UNAME_s=Linux \
 			UNAME_r="Linux Compatibility on FreeBSD" \
 			${SH} ./INSTALL --install_path=${INSTALLDIR} > /dev/null
 
-pre-install:
+MAN1=		acroread.1
+MANCOMPRESSED=	yes
+post-man-install:
+	${LN} -s -f \
+		${INSTALLDIR}/Adobe/Reader9/Resource/Shell/acroread.1.gz \
+		${MANPREFIX}/man/${MANLANG}/man1/
+
+pre-su-install:
 	@${MKDIR} ${WRKDIR}/bin
 	@${INSTALL_SCRIPT} \
 		${WRKDIR}/ln ${WRKDIR}/rm ${WRKDIR}/mv \
@@ -78,7 +91,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/desktop-directories
 	@cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null
 
-post-install:
+post-install: post-man-install
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/acroread9/distinfo b/print/acroread9/distinfo
index 6ec13cb7d167..783202240d65 100644
--- a/print/acroread9/distinfo
+++ b/print/acroread9/distinfo
@@ -1,2 +1,2 @@
-SHA256 (acroread/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2) = 10ec272ae12a52a06ae88e1e7737423742160f172f789a22ed906a7af2b3a876
-SIZE (acroread/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2) = 60286782
+SHA256 (acroread/AdbeRdr9.4.7-1_i486linux_enu.tar.bz2) = 65b91a1d925d5690050515d233fadeb47f52c692103904a72c7125c6590efd2f
+SIZE (acroread/AdbeRdr9.4.7-1_i486linux_enu.tar.bz2) = 57112529
diff --git a/print/acroread9/pkg-plist b/print/acroread9/pkg-plist
index 182b99516bbc..d017eb3a8dad 100644
--- a/print/acroread9/pkg-plist
+++ b/print/acroread9/pkg-plist
@@ -86,12 +86,12 @@
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libWRServices.so.3.1
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libadobelinguistic.so.3.2.0
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libahclient.so
-%%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+%%LANG_NONENU%%%%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libcurl.so.3.0.0
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libeggtrayicon.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libextendscript.so
-%%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libflashsupport.so
+%%LANG_NONENU%%%%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libflashsupport.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libicucnv.so.36.0
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libicudata.so.36.0
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libicui18n.so.36.0
@@ -102,7 +102,7 @@
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libACE.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libadobelinguistic.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libAGM.so
-%%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so
+%%LANG_NONENU%%%%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libBIB.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libBIBUtils.so
 %%ACRODIR%%/Adobe/Reader9/Reader/intellinux/lib/libCoolType.so