10 files changed, 13 insertions, 23 deletions

diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index f5dcbcd1068e..3a56d8f32dab 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -16,7 +16,6 @@ PKGNAMEPREFIX=		linux_base-
 DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
 DIST_SUBDIR=		rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 EXTRACT_ONLY=		${BIN_DISTFILES}
-
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (for i386/amd64)
 
@@ -211,7 +210,7 @@ do-install:
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #
-# Let some linux applications (e.g. print/acroread7) print with default settings
+# Let some linux applications (e.g. print/acroread8) print with default settings
 #
 	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index f5dcbcd1068e..3a56d8f32dab 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -16,7 +16,6 @@ PKGNAMEPREFIX=		linux_base-
 DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
 DIST_SUBDIR=		rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 EXTRACT_ONLY=		${BIN_DISTFILES}
-
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (for i386/amd64)
 
@@ -211,7 +210,7 @@ do-install:
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #
-# Let some linux applications (e.g. print/acroread7) print with default settings
+# Let some linux applications (e.g. print/acroread8) print with default settings
 #
 	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index f5dcbcd1068e..3a56d8f32dab 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -16,7 +16,6 @@ PKGNAMEPREFIX=		linux_base-
 DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
 DIST_SUBDIR=		rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 EXTRACT_ONLY=		${BIN_DISTFILES}
-
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (for i386/amd64)
 
@@ -211,7 +210,7 @@ do-install:
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #
-# Let some linux applications (e.g. print/acroread7) print with default settings
+# Let some linux applications (e.g. print/acroread8) print with default settings
 #
 	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index f5dcbcd1068e..3a56d8f32dab 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -16,7 +16,6 @@ PKGNAMEPREFIX=		linux_base-
 DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
 DIST_SUBDIR=		rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 EXTRACT_ONLY=		${BIN_DISTFILES}
-
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (for i386/amd64)
 
@@ -211,7 +210,7 @@ do-install:
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #
-# Let some linux applications (e.g. print/acroread7) print with default settings
+# Let some linux applications (e.g. print/acroread8) print with default settings
 #
 	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile
index f5dcbcd1068e..3a56d8f32dab 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -16,7 +16,6 @@ PKGNAMEPREFIX=		linux_base-
 DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
 DIST_SUBDIR=		rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 EXTRACT_ONLY=		${BIN_DISTFILES}
-
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (for i386/amd64)
 
@@ -211,7 +210,7 @@ do-install:
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #
-# Let some linux applications (e.g. print/acroread7) print with default settings
+# Let some linux applications (e.g. print/acroread8) print with default settings
 #
 	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile
index 7dc0ee2fa586..a0d0f51acf70 100644
--- a/emulators/linux_base-fc4/Makefile
+++ b/emulators/linux_base-fc4/Makefile
@@ -194,7 +194,7 @@ do-install:
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #
-# Let some linux applications (e.g. print/acroread7) print with default settings
+# Let some linux applications (e.g. print/acroread8) print with default settings
 #
 	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 #
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index e1b402ee45a2..e1f0238ce0fa 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -82,9 +82,8 @@ RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-${PAPERSIZE}
 .if !defined(WITHOUT_X11)
 # "xxx to ps" filter utilities that require X
-RUN_DEPENDS+=	${LOCALBASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
-RUN_DEPENDS+=	dvips:${PORTSDIR}/print/teTeX
+RUN_DEPENDS+=	dvips:${PORTSDIR}/print/dvipsk-tetex
 RUN_DEPENDS+=	wmf2eps:${PORTSDIR}/graphics/libwmf
 RUN_DEPENDS+=	sk2ps:${PORTSDIR}/graphics/skencil
 RUN_DEPENDS+=	tgif:${PORTSDIR}/graphics/tgif
diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure
index 037f293b065a..6cf3906f69ed 100644
--- a/print/apsfilter/scripts/configure
+++ b/print/apsfilter/scripts/configure
@@ -19,7 +19,6 @@ GS_NO_X11	"Postscript for non-PS printer, no X11"		OFF	\
 GS_PDF_CRYPT	"print encrypted PDF files using gs"		ON	\
 PSUTILS		"for pseudo duplex printing + paper handling"	ON	\
 A2PS		"ASCII files in different styles/orientation"	ON	\
-ACROREAD7	"PDF files, needs Linux emulation"		ON	\
 CONVERT		"support for lots of graphic file formats"	ON	\
 DVIPS		"TeX DVI files"					OFF	\
 FIG2DEV		"XFIG drawings"					OFF	\
@@ -112,14 +111,11 @@ while [ "$1" ]; do
 			;;
 		esac
 		;;
-	\"ACROREAD7\")
-		echo RUN_DEPENDS+=${LOCALBASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7
-		;;
 	\"CONVERT\")
 		echo RUN_DEPENDS+=convert:${PORTSDIR}/graphics/ImageMagick
 		;;
 	\"DVIPS\")
-		echo RUN_DEPENDS+=dvips:${PORTSDIR}/print/teTeX
+		echo RUN_DEPENDS+=dvips:${PORTSDIR}/print/dvipsk-tetex
 		;;
 	\"FIG2DEV\")
 		echo RUN_DEPENDS+=fig2dev:${PORTSDIR}/print/transfig
diff --git a/www/plugger-plugins-hubbe/Makefile b/www/plugger-plugins-hubbe/Makefile
index 879b9cf32c09..8175e315439e 100644
--- a/www/plugger-plugins-hubbe/Makefile
+++ b/www/plugger-plugins-hubbe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plugger-plugins-hubbe
 PORTVERSION=	5.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	www multimedia audio graphics print editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meta package installing all author-recommended Plugger plugins
 
 RUN_DEPENDS=	sidplay:${PORTSDIR}/audio/sidplay \
-		acroread8>0:${PORTSDIR}/print/acroread8 \
+		acroread8:${PORTSDIR}/print/acroread8 \
 		mpg123:${PORTSDIR}/audio/mpg123 \
 		mikmod:${PORTSDIR}/audio/mikmod \
 		ogg123:${PORTSDIR}/audio/vorbis-tools \
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index acad102d29b9..793a4f9e469d 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plugger
 PORTVERSION=	5.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www audio graphics multimedia
 MASTER_SITES=	http://fredrik.hubbe.net/plugger/
 
@@ -25,7 +25,7 @@ PKGDEINSTALL=	${PKGINSTALL}
 post-patch:
 	@${REINPLACE_CMD} -e \
 	's|/usr/X11R6/lib/xscreensaver|${LOCALBASE}/bin/xscreensaver-hacks|g ; \
-	s|acroread|acroread7|g ; s|+useFrontEndProgram||g' \
+	s|+useFrontEndProgram||g' \
 		${WRKSRC}/pluggerrc
 
 pre-install: