update to new apsfilter version 6.1.0

all from -current has been merged after a long testing period.
See the ANNOUNCE file for the long list of bugfixes, security,
feature and code enhancements.

I hope, this time apsfilter port will fit on CD 1, so
people can install apsfilter during initial FreeBSD
installation.

5 files changed, 22 insertions, 24 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index f4441f95fe0..3ca7973ba13 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	apsfilter
-PORTVERSION=	6.0.0
-PORTREVISION=	7
+PORTVERSION=	6.1.0
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
-PATCH_SITES=	http://www.apsfilter.org/download/
-PATCHFILES=	diff-6.0.0-17.03.2001.gz
 
 MAINTAINER=	andreas@FreeBSD.org
 
diff --git a/print/apsfilter/distinfo b/print/apsfilter/distinfo
index 76656332c4e..a32031c5f1a 100644
--- a/print/apsfilter/distinfo
+++ b/print/apsfilter/distinfo
@@ -1,2 +1 @@
-MD5 (apsfilter-6.0.0.tar.bz2) = ab8fcb96d836e0bd0297f6a48c5be302
-MD5 (diff-6.0.0-17.03.2001.gz) = 4376ed0f30e078b05cc8adf63e5f80d9
+MD5 (apsfilter-6.1.0.tar.bz2) = 00ab53b799c6b4ee098c1e7608c9d8f1
diff --git a/print/apsfilter/pkg-descr b/print/apsfilter/pkg-descr
index 9e09e9856a5..1b08a5b97bd 100644
--- a/print/apsfilter/pkg-descr
+++ b/print/apsfilter/pkg-descr
@@ -1,21 +1,23 @@
-This is the new Apsfilter-STABLE release V 6.0.0
-
-This version has been in use since several months without trouble.
-So this version completely replaces the old -STABLE version 5.4.2.
-
-As usual report trouble / suggestions / comments to:
-
-	apsfilter-stable@apsfilter.org
-
 Apsfilter is a magic printfilter, that allows you to print different document
 types "automagically" without having to convert them manually into something
-which is understood by your lineprinter. Apsfilter supports lots of file and
-compression types: gzip, bzip, compress, freeze, pack, ASCII, BMP,
-Data (data,PCL,...), English, TeX DVI, FIG, GIF, Group 3 Fax, HTML, JPEG,
-Mail/News, PBM/PNM/PPM, PC Bitmap Data, PDF, Postscript(tm), raw, script
-(shell,..), Text, sunraster, tiff, roff (nroff, groff, troff) and lots
-more in V 6.0.0. Docu concerning that is in the pipeline ...
+which is understood by your lineprinter. Apsfilter development started in 1994,
+so apsfilter is now a mature and powerful printing solution for any flavour of
+Unix running lpd or LPRng as line printer scheduler.
+
+Apsfilter supports lots of file and compression types. Its even possible to
+print compressed documents. Apsfilter supports printing on local as well as
+on Appletalk-, Unix- and Windows remote printers.
+
+General and "per printer-queue" based config files allow you to configure
+the printer for your needs. Additionally lpr commandline options, -C for
+lpd and -Z for LPRng, allow you to change printing parameters like print
+quality, orientation, duplex mode, etc... "on the fly" without having to
+reconfigure any config file.
 
-Example: lpr -C duplex:high:presentation:glossy ascii.Z test.gif pic.tiff ...
+A SETUP script helps you to test various supported ghostscript drivers prior
+installation. SETUP finally makes the necessary entries in /etc/printcap,
+creates spool directories and apsfilter default config files as needed.
+A handbook in HTML is now available. Support only via apsfilter mailinglists,
+see homepage !
 
 WWW:	http://www.apsfilter.org/
diff --git a/print/apsfilter/pkg-plist b/print/apsfilter/pkg-plist
index 77d2ea03b4b..be6cf4d4966 100644
--- a/print/apsfilter/pkg-plist
+++ b/print/apsfilter/pkg-plist
@@ -22,8 +22,8 @@ share/doc/apsfilter/ANNOUNCE
 share/doc/apsfilter/FAQ
 share/doc/apsfilter/HOWTO-BUGREPORTS
 share/doc/apsfilter/LICENSE
+share/doc/apsfilter/README.BSD
 share/doc/apsfilter/README.TeX
-share/doc/apsfilter/TROUBLESHOOTING
 share/doc/apsfilter/handbook.html
 share/doc/apsfilter/paper
 @dirrm share/apsfilter/bin
diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure
index b9aed1ac6bf..ebe666ff232 100644
--- a/print/apsfilter/scripts/configure
+++ b/print/apsfilter/scripts/configure
@@ -169,6 +169,6 @@ fi
  echo "	@\${ECHO} \"--------------------------------------------------------\""
  echo "	@\${ECHO} \"*** In any case of trouble please read             ***  \""
  echo "	@\${ECHO} \"   the apsfilter handbook: handbook.html                \""
- echo "	@\${ECHO} \"   and FAQ, HOWTO-BUGREPORTS, TROUBLESHOOTING           \""
+ echo "	@\${ECHO} \"   and FAQ, HOWTO-BUGREPORTS                            \""
  echo "	@\${ECHO} \"   under ${PREFIX}/share/doc/apsfilter/                 \""
  echo "	@\${ECHO} \"   or visit http://www.apsfilter.org/support.html       \""