Update apsfilter to 7.2.8, with some dependency clean up and packaging easier.

New in Apsfilter 7.2.8 (BUGFIX Release)
=======================================

3. New Features

	- make it possible to use the lineprinter scheduler as jukebox
	- network jukebox (untested)
	  should also work with a remote printer queue
	  So your remote server has a soundcard and your print clients
	  send audio files to the remote printer to play audio files
	  one after the other.
	  Hint:
	  For this purposes a new parameter from SETUP needed to be
	  saved into the apsfilterrc file (INTERFACES).
	  In every sound play routine in apsfilter
	  we test if this is a network printer.
	  Then we need to send the data stream (i.e. mp3) unprocessed.
	  On the print server with the soundcard the tanslation needs to
	  take place.

New in Apsfilter 7.2.7 (BUGFIX Release)
=======================================

7. BUG FIXES

	- make spaces possible in samba printer name
	  from Roman Kurakin <rik at FreeBSD dot org>

6 files changed, 28 insertions, 63 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 8ecb824b9ea..fafa2ec9842 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.31 2013/04/24 10:06:51 sbd Exp $
+# $NetBSD: Makefile,v 1.32 2014/02/10 11:13:03 obache Exp $
 #
 
-DISTNAME=	apsfilter-7.2.6
-PKGREVISION=	2
+DISTNAME=	apsfilter-7.2.8
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.apsfilter.org/
 COMMENT=	Flexible magic filter for printing under Unix environment
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	recode-[0-9]*:../../converters/recode
 #DEPENDS+=	html2ps-[0-9]*:../../print/html2ps
@@ -20,23 +20,22 @@ DEPENDS+=	psutils-[0-9]*:../../print/psutils
 
 WRKSRC=		${WRKDIR}/apsfilter
 HAS_CONFIGURE=	YES
-USE_BZIP2=	YES
-USE_TOOLS+=	awk gs:run
+USE_TOOLS+=	awk:run sh:run gs:run bzip2:run gzip:run file:run tar
 
-CONFIGURE_ARGS+=--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=--prefix=${PREFIX}
+CONFIGURE_ARGS+=--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=--with-shell=${SH:Q}
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=--with-awk=${TOOLS_AWK:Q}
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=--with-awk=${AWK:Q}
 
-PKG_SYSCONFSUBDIR?=	apsfilter
+PKG_SYSCONFSUBDIR=	apsfilter
 CONF_FILES=	${PREFIX}/share/apsfilter/template/apsfilterrc \
 		${PKG_SYSCONFDIR}/apsfilterrc
 
-post-patch:
-	for i in bin/apsfilter.in SETUP.in tools/prtmgmt; do		\
-		${SED} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/$$i	\
-			> ${WRKSRC}/$$i.done;				\
-		${MV} ${WRKSRC}/$$i.done ${WRKSRC}/$$i;			\
-	done
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	post-patch
+SUBST_FILES.prefix=	bin/apsfilter.in SETUP.in tools/prtmgmt
+SUBST_SED.prefix=	-e 's,/usr/local,${LOCALBASE},g'
+SUBST_SED.prefix+=	-e 's,/usr/X11R6,${X11BASE},g'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/apsfilter/PLIST b/print/apsfilter/PLIST
index 01023f7c361..b96c0e6476d 100644
--- a/print/apsfilter/PLIST
+++ b/print/apsfilter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 21:16:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/02/10 11:13:03 obache Exp $
 bin/aps2file
 bin/apsfilter-bug
 bin/apspreview
@@ -311,6 +311,7 @@ share/apsfilter/setup/printer-omni
 share/apsfilter/setup/printer-pcl3
 share/apsfilter/setup/printer-ppa
 share/apsfilter/setup/printer-stp
+share/apsfilter/setup/sound
 share/apsfilter/setup/test.ps
 share/apsfilter/template/README
 share/apsfilter/template/apsfilterrc
@@ -323,4 +324,3 @@ share/doc/apsfilter/README.TeX
 share/doc/apsfilter/apsfilter4.png
 share/doc/apsfilter/handbook.html
 share/doc/apsfilter/paper
-@unexec ${RMDIR} %D/etc/apsfilter 2>/dev/null || ${TRUE}
diff --git a/print/apsfilter/distinfo b/print/apsfilter/distinfo
index 5e517958871..4af672cd48b 100644
--- a/print/apsfilter/distinfo
+++ b/print/apsfilter/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/01/10 07:17:41 martti Exp $
+$NetBSD: distinfo,v 1.9 2014/02/10 11:13:03 obache Exp $
 
-SHA1 (apsfilter-7.2.6.tar.gz) = c188642d878d10ee694667c916c594714a84cb4f
-RMD160 (apsfilter-7.2.6.tar.gz) = 82c60e16f836fe963b84516c0f5e19139112460b
-Size (apsfilter-7.2.6.tar.gz) = 363051 bytes
-SHA1 (patch-aa) = e79f596952e30bb70121168a8d1dfba819716e62
-SHA1 (patch-ac) = a8ace4d2f9fcdf049981bb8f2c3f48b28e4f4cf9
-SHA1 (patch-ad) = 27df89568fa6c0e194fcd8af7ed884c45588a53b
+SHA1 (apsfilter-7.2.8.tar.gz) = 2441c7c302b995dfc1a457f8ff695e4c32d3d8f1
+RMD160 (apsfilter-7.2.8.tar.gz) = 69f6cf26a2f47623ae3cd78746abc5ab9278da9c
+Size (apsfilter-7.2.8.tar.gz) = 364413 bytes
+SHA1 (patch-aa) = f347ec24c662509791b9b0662bef60ce2afed46c
diff --git a/print/apsfilter/patches/patch-aa b/print/apsfilter/patches/patch-aa
index 7b84aaab60e..fc53ae40a0b 100644
--- a/print/apsfilter/patches/patch-aa
+++ b/print/apsfilter/patches/patch-aa
@@ -1,17 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2003/04/15 09:25:05 martti Exp $
+$NetBSD: patch-aa,v 1.5 2014/02/10 11:13:03 obache Exp $
 
---- Makefile.in.orig	2002-10-28 00:05:19.000000000 +0200
-+++ Makefile.in	2003-04-15 08:56:15.000000000 +0300
-@@ -12,7 +12,7 @@
- 
- APSSHARE=${datadir}/apsfilter
- APSDOC=${docdir}/apsfilter
--APSCONF=${sysconfdir}/apsfilter
-+APSCONF=${sysconfdir}
- 
- MKDIR=mkdir -p
- RM=rm -f
-@@ -33,7 +33,6 @@
+* will be handled by package system.
+
+--- Makefile.in.orig	2006-07-09 15:54:22.000000000 +0000
++++ Makefile.in
+@@ -33,7 +33,6 @@ update:
  	${MKDIR} ${mandir}/man1
  	${MKDIR} ${mandir}/man5
  	${MKDIR} ${APSDOC}
@@ -19,7 +12,7 @@ $NetBSD: patch-aa,v 1.4 2003/04/15 09:25:05 martti Exp $
  	${MKDIR} ${APSSHARE}
  	${MKDIR} ${APSSHARE}/bin
  	${MKDIR} ${APSSHARE}/setup
-@@ -80,7 +79,6 @@
+@@ -81,7 +80,6 @@ update:
  	${INSTALL_DATA}   man/apsfilter-bug.1	${mandir}/man1/apsfilter-bug.1
  	${INSTALL_DATA}   man/apsfilterrc.5	${mandir}/man5/apsfilterrc.5
  	tar cf - driver | ( cd ${APSSHARE} && tar xf -)
diff --git a/print/apsfilter/patches/patch-ac b/print/apsfilter/patches/patch-ac
deleted file mode 100644
index ba00901aec0..00000000000
--- a/print/apsfilter/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/11/26 11:26:35 jmmv Exp $
-
---- configure.orig	Thu Jan 10 21:44:48 2002
-+++ configure
-@@ -237,7 +237,6 @@ Using following values as defaults:
-     datadir		$datadir
- 			(will become $datadir/apsfilter)
-     sysconfdir		$sysconfdir
--			(will become $sysconfdir/apsfilter)
-     mandir		$mandir
-     docdir		$docdir
- 			(will become $docdir/apsfilter)
diff --git a/print/apsfilter/patches/patch-ad b/print/apsfilter/patches/patch-ad
deleted file mode 100644
index 9b5e62ca967..00000000000
--- a/print/apsfilter/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/04/15 09:25:05 martti Exp $
-
---- SETUP.in.orig	2002-11-22 20:32:54.000000000 +0200
-+++ SETUP.in	2003-04-15 08:57:18.000000000 +0300
-@@ -1832,7 +1832,7 @@
- 
- export APS_BASEDIR="@datadir@/apsfilter"
- cd "$APS_BASEDIR"
--CONF_DIR="@sysconfdir@/apsfilter"
-+CONF_DIR="@sysconfdir@"
- SPOOL="@spooldir@"
- 
- # check read/write permissions