update to apsfilter 7.2.8, now supports mp3/ogg queueing

- teach SETUP about ghostscript 8
- fix psnup call
This commit is contained in:
sturm 2007-04-08 15:19:31 +00:00
parent ce25e73ce9
commit 614acb6b61
6 changed files with 77 additions and 15 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2004/11/28 13:18:45 alek Exp $
# $OpenBSD: Makefile,v 1.6 2007/04/08 15:19:31 sturm Exp $
COMMENT= "filter to print a wide range of file formats"
DISTNAME= apsfilter-7.2.5
PKGNAME= ${DISTNAME}p1
DISTNAME= apsfilter-7.2.8
CATEGORIES= print
HOMEPAGE= http://www.apsfilter.org/
@ -19,9 +18,11 @@ MASTER_SITES= http://www.apsfilter.org/download/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-shell=/bin/sh
RUN_DEPENDS= :psutils-*:print/psutils \
:a2ps-*:print/a2ps
RUN_DEPENDS= ::print/a2ps \
::print/psutils
WRKDIST= ${WRKDIR}/apsfilter/
NO_REGRESS= Yes
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (apsfilter-7.2.5.tar.gz) = OU3Wpvw/kL5bGDw/nVYzhw==
RMD160 (apsfilter-7.2.5.tar.gz) = SjqYSbKjrU5d7CWjx8oR7VylwoU=
SHA1 (apsfilter-7.2.5.tar.gz) = C3R1EQUkcd6LTuwrdzMEYovvlZ0=
SHA256 (apsfilter-7.2.5.tar.gz) = kU1Wtkt1htzihhvjJMQxoIUZn6Rzv/pwpLAj9Fl6TQQ=
SIZE (apsfilter-7.2.5.tar.gz) = 362675
MD5 (apsfilter-7.2.8.tar.gz) = Sca239ltBS1aclNetLWSHw==
RMD160 (apsfilter-7.2.8.tar.gz) = afbPJqL0diOuPNeHRqvFq5J42pw=
SHA1 (apsfilter-7.2.8.tar.gz) = JEHHwwK5ld/BpFf4/2leTDLT2PE=
SHA256 (apsfilter-7.2.8.tar.gz) = 7MVChMiHbudgYmBq+FDlbactQlIoCgxUEj46LQXFtog=
SIZE (apsfilter-7.2.8.tar.gz) = 364413

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1 2006/07/17 19:27:54 espie Exp $
--- Makefile.in.orig Sun Oct 27 23:05:19 2002
+++ Makefile.in Sat Jul 15 10:09:40 2006
$OpenBSD: patch-Makefile_in,v 1.2 2007/04/08 15:19:31 sturm Exp $
--- Makefile.in.orig Sun Jul 9 17:54:22 2006
+++ Makefile.in Sat Apr 7 15:59:47 2007
@@ -11,6 +11,7 @@ mandir=${DESTDIR}@mandir@
docdir=${DESTDIR}@docdir@
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2006/07/17 19:27:54 espie Exp $
APSDOC=${docdir}/apsfilter
APSCONF=${sysconfdir}/apsfilter
@@ -80,7 +81,7 @@ update:
@@ -81,7 +82,7 @@ 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 -)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-SETUP_in,v 1.1 2007/04/08 15:19:31 sturm Exp $
--- SETUP.in.orig Sat Apr 7 16:18:36 2007
+++ SETUP.in Sat Apr 7 16:20:28 2007
@@ -243,6 +243,8 @@ do_check_gs_version()
{
GS_VERSION=`gs --version`
case $GS_VERSION in
+ 8*)
+ GS_BASE=7.00 ;;
7*)
GS_BASE=7.00 ;;
6.[5-9]*)

View File

@ -0,0 +1,48 @@
$OpenBSD: patch-bin_apsfilter_in,v 1.1 2007/04/08 15:19:31 sturm Exp $
--- bin/apsfilter.in.orig Sun Jul 9 17:54:24 2006
+++ bin/apsfilter.in Sat Apr 7 18:25:03 2007
@@ -277,12 +277,14 @@ play_mp3()
if [ "$INTERFACE" = "network" ]; then
cat -
else
+ cat > "$APS_TMPDIR/mp3"
if find_filter mpg123; then
- mpg123 -q -
+ mpg123 -q "$APS_TMPDIR/mp3"
else
find_filter mpg321 || fatal_filter mpg321
- mpg321 -q -
+ mpg321 -q "$APS_TMPDIR/mp3"
fi
+ rm -f "$APS_TMPDIR/mp3"
fi
}
@@ -1339,7 +1341,7 @@ ps_postprocessing()
cat
else
eval ${PS_BOOK:+psbook -q |} \
- ${PS_NUP:+psnup -q -$PS_NUP ${LANDSCAPE:+$PSNUP_ROTATE} |} \
+ ${PS_NUP:+psnup -q -p$PAPERSIZE -$PS_NUP ${LANDSCAPE:+$PSNUP_ROTATE} |} \
ps_set_duplex ${PS_UTILS:+| $PS_UTILS}
fi
}
@@ -1907,15 +1909,9 @@ export PATH
# our private temporary directory has mode 711 so that the user can see our
# fifo "$APS_TMPDIR/duplex-key" (in case it's needed)
: ${TMPDIR:=/tmp}
-APS_TMPDIR="$TMPDIR/apsfilter$$"
-rm -rf "$APS_TMPDIR"
-mkdir -m 711 "$APS_TMPDIR"
-if [ $? -ne 0 ]; then
- # maybe someone tried a denial-of-service attack
- find_filter mktemp || fatal_tmpdir
- APS_TMPDIR=`mktemp -q -d "$TMPDIR/apsfilter.XXXXXX"` || fatal_tmpdir
- chmod 711 "$APS_TMPDIR"
-fi
+find_filter mktemp || fatal_tmpdir
+APS_TMPDIR=`mktemp -q -d "$TMPDIR/apsfilter.XXXXXX"` || fatal_tmpdir
+chmod 711 "$APS_TMPDIR"
echo 0 >"$APS_TMPDIR/rc"
# gs doesn't always remove its temp files; let it use our private

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2004/11/27 18:33:31 alek Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/04/08 15:19:31 sturm Exp $
bin/aps2file
bin/apsfilter-bug
bin/apspreview
@ -324,6 +324,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/
share/apsfilter/template/README