14 files changed, 23 insertions, 22 deletions

diff --git a/textproc/cdsware/Makefile b/textproc/cdsware/Makefile
index 806e7b685fcf..4828ab99f74c 100644
--- a/textproc/cdsware/Makefile
+++ b/textproc/cdsware/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cdsware
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	textproc www
 MASTER_SITES=	http://cdsware.cern.ch/download/
 
@@ -26,7 +27,7 @@ BROKEN=		"Conflicting dependencies: apache 1.x and apache 2.x"
 RUN_DEPENDS+=	${X11BASE}/bin/pdftotext:${PORTSDIR}/graphics/xpdf
 . endif
 . if !defined(WITHOUT_ACROREAD)
-RUN_DEPENDS+=	${LOCALBASE}/bin/acroread:${PORTSDIR}/print/acroread
+RUN_DEPENDS+=	${X11BASE}/bin/acroread5:${PORTSDIR}/print/acroread
 . endif
 . if !defined(WITHOUT_WV)
 RUN_DEPENDS+=	${LOCALBASE}/bin/wvHtml:${PORTSDIR}/textproc/wv
diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile
index f67f424cf82b..c9bff8771b4c 100644
--- a/textproc/linux-aspell/Makefile
+++ b/textproc/linux-aspell/Makefile
@@ -27,10 +27,9 @@ BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm \
 NO_BUILD=		yes
 USE_REINPLACE=		yes
 ONLY_FOR_ARCHS=		i386
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
-USE_LINUX?=		yes
 USE_GMAKE=		yes
-NO_FILTER_SHLIBS=	yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
 
 DBPATH=		/var/lib/rpm
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index d75922d2d94b..d0998ecab7cc 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	expat
 PORTVERSION=	1.95.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-RUN_DEPENDS=	${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=
 
+USE_LINUX=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
diff --git a/textproc/linux-f10-aspell/Makefile b/textproc/linux-f10-aspell/Makefile
index f67f424cf82b..c9bff8771b4c 100644
--- a/textproc/linux-f10-aspell/Makefile
+++ b/textproc/linux-f10-aspell/Makefile
@@ -27,10 +27,9 @@ BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm \
 NO_BUILD=		yes
 USE_REINPLACE=		yes
 ONLY_FOR_ARCHS=		i386
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
-USE_LINUX?=		yes
 USE_GMAKE=		yes
-NO_FILTER_SHLIBS=	yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
 
 DBPATH=		/var/lib/rpm
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index d75922d2d94b..d0998ecab7cc 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	expat
 PORTVERSION=	1.95.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-RUN_DEPENDS=	${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=
 
+USE_LINUX=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile
index c9590a2f6ffe..5e8c6f71a020 100644
--- a/textproc/linux-f10-libxml/Makefile
+++ b/textproc/linux-f10-libxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
index c9590a2f6ffe..5e8c6f71a020 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
diff --git a/textproc/linux-f8-aspell/Makefile b/textproc/linux-f8-aspell/Makefile
index f67f424cf82b..c9bff8771b4c 100644
--- a/textproc/linux-f8-aspell/Makefile
+++ b/textproc/linux-f8-aspell/Makefile
@@ -27,10 +27,9 @@ BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm \
 NO_BUILD=		yes
 USE_REINPLACE=		yes
 ONLY_FOR_ARCHS=		i386
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
-USE_LINUX?=		yes
 USE_GMAKE=		yes
-NO_FILTER_SHLIBS=	yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
 
 DBPATH=		/var/lib/rpm
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index d75922d2d94b..d0998ecab7cc 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	expat
 PORTVERSION=	1.95.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-RUN_DEPENDS=	${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=
 
+USE_LINUX=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index c9590a2f6ffe..5e8c6f71a020 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index c9590a2f6ffe..5e8c6f71a020 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index c9590a2f6ffe..5e8c6f71a020 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index c9590a2f6ffe..5e8c6f71a020 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
diff --git a/textproc/pocketreader/Makefile b/textproc/pocketreader/Makefile
index df639a333b80..b72fb2e0c22f 100644
--- a/textproc/pocketreader/Makefile
+++ b/textproc/pocketreader/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pocketreader
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc linux
 MASTER_SITES=	http://www.pocketreader.com/download/software/
 DISTNAME=	linux-bin
@@ -16,14 +16,14 @@ EXTRACT_SUFX=	_tar.gz
 MAINTAINER=	simond@irrelevant.org
 COMMENT=	Siemens PocketReader
 
-USE_LINUX?=	YES
+USE_LINUX=	YES
 NO_BUILD=	YES
 PLIST_FILES=	bin/pocketreader
 
 WRKSRC=		${WRKDIR}/linux
 
 do-install:
-	brandelf -t Linux ${WRKSRC}/installfiles/pocketreader_static
+	${BRANDELF} -t Linux ${WRKSRC}/installfiles/pocketreader_static
 	${CP} ${WRKSRC}/installfiles/pocketreader_static ${PREFIX}/bin/pocketreader
 
 .include <bsd.port.mk>