3 files changed, 12 insertions, 25 deletions

diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile
index 30e185fda302..62ef65a00690 100644
--- a/print/acroread9/Makefile
+++ b/print/acroread9/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	acroread9
-PORTVERSION=	9.4.1
-PORTREVISION?=	1
+PORTVERSION=	9.4.2
 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}/
@@ -17,7 +16,7 @@ DIST_SUBDIR=	acroread
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Adobe Reader for view, print, and search PDF documents (${ADOBE_LANG})
 
-RUN_DEPENDS=	acroreadwrapper>=0.0.20100806:${PORTSDIR}/print/acroreadwrapper
+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
@@ -67,13 +66,6 @@ INSTALLEXEC=	${SETENV} UNAME_s=Linux \
 			UNAME_r="Linux Compatibility on FreeBSD" \
 			${SH} ./INSTALL --install_path=${INSTALLDIR} > /dev/null
 
-pre-everything::
-	@${ECHO_CMD} "======================================================="
-	@${ECHO_CMD} "Try print/acroread8 instead if you need Adobe Reader."
-	@${ECHO_CMD} "Currently acroread9 port does not work with X Window "
-	@${ECHO_CMD} "System because of issues in FreeBSD's Linux emulation."
-	@${ECHO_CMD} "======================================================="
-
 pre-install:
 	@${MKDIR} ${WRKDIR}/bin
 	@${INSTALL_SCRIPT} \
@@ -86,9 +78,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/desktop-directories
 	@cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null
 
-.if ${ADOBE_LANG:U} != ENU
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>
diff --git a/print/acroread9/distinfo b/print/acroread9/distinfo
index 46b5b9325e2e..6ec13cb7d167 100644
--- a/print/acroread9/distinfo
+++ b/print/acroread9/distinfo
@@ -1,2 +1,2 @@
-SHA256 (acroread/AdbeRdr9.4.1-1_i486linux_enu.tar.bz2) = 6bf9bf427462a7a9ba7e7115cffe659bccb70758428ab32571e6ed78333b0b95
-SIZE (acroread/AdbeRdr9.4.1-1_i486linux_enu.tar.bz2) = 60172257
+SHA256 (acroread/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2) = 10ec272ae12a52a06ae88e1e7737423742160f172f789a22ed906a7af2b3a876
+SIZE (acroread/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2) = 60286782
diff --git a/print/acroread9/files/pkg-message.in b/print/acroread9/files/pkg-message.in
index 6618c46e931c..3fea7e7889d2 100644
--- a/print/acroread9/files/pkg-message.in
+++ b/print/acroread9/files/pkg-message.in
@@ -1,16 +1,13 @@
 === WARNING ===
 
-Adobe Reader 9 is currently not compatible with the latest version of
-Linux emulation on FreeBSD. Specifically, you may see the following
-error message:
+Before using Adobe Reader 9, linux_adobe.ko kernel module has to be loaded.
+It is automatically loaded by %%PREFIX%%/etc/rc.d/linux_adobe script on
+boot time.  You can manually load it by
 
- terminate called after throwing an instance of 'RSException'
+ # %%PREFIX%%/etc/rc.d/linux_adobe start
 
-If this happens, please try print/acroread8 instead.  Developments for
-improving the compatibility are in progress.  If you have any questions
-on this port, contact hrs@FreeBSD.org.
+without rebooting.
 
-==
-To run this, set ADOBE_LANG=%%ADOBE_LANG%% and use %%PREFIX%%/bin/acroread.
-(when LANG is set, ADOBE_LANG will be set automatically based on it)
-==
+To run this version of Adobe Reader, set ADOBE_LANG=%%ADOBE_LANG%% and use
+%%PREFIX%%/bin/acroread.  Note that when $LANG is set, $ADOBE_LANG will be set
+automatically based on it.