10 files changed, 112 insertions, 187 deletions

diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 682c59b0f8bd..a66d10a5a3cb 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:	magicfilter
 # Date created:		24 Mar 1999
-# Whom:			CHOI Junho <cjh@kr.freebsd.org>
+# Whom:			CHOI Junho <cjh@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	magicfilter
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	2.3.b
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/printing
+MASTER_SITES=	http://www.pell.portland.or.us/~orc/Code/magicfilter/
 
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Customizable, extensible automatic printer filter
@@ -18,7 +16,10 @@ COMMENT=	Customizable, extensible automatic printer filter
 USE_GHOSTSCRIPT=	yes
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+CONFIGURE_SCRIPT= configure.sh
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+= --confdir=${PREFIX}/etc --filterdir=${PREFIX}/libexec/magicfilter --use-fifo
+MAN5=		magicfilter.5
 MAN8=		magicfilter.8
 
 .include <bsd.port.pre.mk>
@@ -31,27 +32,4 @@ pre-everything::
 	@${ECHO} ""
 .endif
 
-# install filters and examples
-post-install:
-	${MKDIR} ${PREFIX}/libexec/magicfilter
-.for FILTER in 	bj10e-filter bj200-filter cps300-filter cps400-filter \
-		cps600-filter cpsonly300-filter cpsonly400-filter \
-		cpsonly600-filter deskjet-filter dj500-filter \
-		dj500c-filter dj550c-filter epson9-filter epson9c-filter \
-		epsonlq-filter epsonlqc-filter ibmpro-filter jetp3852-filter \
-		la50-filter la75-filter laserjet-filter laserjetlo-filter \
-		lbp8-filter lj250-filter ljet2p-filter ljet2plo-filter \
-		ljet3-filter ljet4-filter ljet4l-filter ljet4m-filter \
-		ljet4ml-filter ljetplus-filter ljetpluslo-filter ln03-filter \
-		m8510-filter necp6-filter oki182-filter pj-filter pjxl-filter \
-		pjxl300-filter ps300-filter ps400-filter ps600-filter \
-		psonly300-filter psonly400-filter psonly600-filter \
-		r4081-filter tek4693-filter tek4696-filter
-	${INSTALL_SCRIPT} ${WRKSRC}/filters/${FILTER} \
-			   ${PREFIX}/libexec/magicfilter/
-	${MKDIR} ${PREFIX}/share/examples/magicfilter
-	${INSTALL_DATA} ${FILESDIR}/printcap.sample \
-			${PREFIX}/share/examples/magicfilter/
-.endfor
-
 .include <bsd.port.post.mk>
diff --git a/print/magicfilter/distinfo b/print/magicfilter/distinfo
index 0da104b8fdf8..00db49de5bba 100644
--- a/print/magicfilter/distinfo
+++ b/print/magicfilter/distinfo
@@ -1,2 +1,2 @@
-MD5 (magicfilter-1.2.tar.gz) = dcece221e363ca5dbc79bdd84713c04e
-SIZE (magicfilter-1.2.tar.gz) = 53176
+MD5 (magicfilter-2.3.b.tar.gz) = a0f8ca2f0bb13f36e845eaad02561f65
+SIZE (magicfilter-2.3.b.tar.gz) = 162156
diff --git a/print/magicfilter/files/patch-aa b/print/magicfilter/files/patch-aa
deleted file mode 100644
index c4cec73d57e8..000000000000
--- a/print/magicfilter/files/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.in.orig	Wed Mar 24 11:51:13 1999
-+++ Makefile.in	Wed Mar 24 11:51:37 1999
-@@ -54,21 +54,21 @@
- all: magicfilter magicfilter.man filters
- 
- filters:
--	cd filters; make
-+	cd filters; ${MAKE}
- 
- install: magicfilter magicfilter.man
- 	${INSTALL_EXEC} magicfilter ${bindir}/magicfilter
- 	${INSTALL_DATA} magicfilter.man ${mandir}/magicfilter.${mansec}
- 
- install_filters:
--	cd filters; make install
-+	cd filters; ${MAKE} install
- 
- clean:
--	-cd filters; make clean
-+	-cd filters; ${MAKE} clean
- 	-${RM} magicfilter magicfilter.man *.o
- 
- distclean: clean
--	-cd filters; make distclean
-+	-cd filters; ${MAKE} distclean
- 	-${RM} *~ Makefile config.cache config.log config.status config.h
- 
- magicfilter: ${OBJS}
diff --git a/print/magicfilter/files/patch-file::file.c b/print/magicfilter/files/patch-file::file.c
new file mode 100644
index 000000000000..4a377f9ed4c8
--- /dev/null
+++ b/print/magicfilter/files/patch-file::file.c
@@ -0,0 +1,12 @@
+diff -ur file/file.c file/file.c
+--- file/file.c	Sun Dec  5 01:32:50 2004
++++ file/file.c	Sun Dec  5 01:34:31 2004
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/param.h>	/* for MAXPATHLEN */
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ extern int getopt();
+ extern int optind;
diff --git a/print/magicfilter/files/patch-getaline.c b/print/magicfilter/files/patch-getaline.c
new file mode 100644
index 000000000000..175cf13fc37c
--- /dev/null
+++ b/print/magicfilter/files/patch-getaline.c
@@ -0,0 +1,12 @@
+diff -ur getaline.c getaline.c
+--- getaline.c	Sun Dec  5 01:32:50 2004
++++ getaline.c	Sun Dec  5 01:33:24 2004
+@@ -27,7 +27,7 @@
+  *  THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #include "magicfilter.h"
+ 
diff --git a/print/magicfilter/files/patch-getline.c b/print/magicfilter/files/patch-getline.c
new file mode 100644
index 000000000000..6cb77eeffc6a
--- /dev/null
+++ b/print/magicfilter/files/patch-getline.c
@@ -0,0 +1,12 @@
+diff -ur/getline.c getline.c
+--- getline.c	Sun Dec  5 01:32:50 2004
++++ getline.c	Sun Dec  5 01:33:11 2004
+@@ -34,7 +34,7 @@
+  *	/pattern/	action[/hint/]	[arg {arg ...}]
+  */
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include "rule.h"
diff --git a/print/magicfilter/files/patch-magicfilter.c b/print/magicfilter/files/patch-magicfilter.c
deleted file mode 100644
index 1482cec2510e..000000000000
--- a/print/magicfilter/files/patch-magicfilter.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- magicfilter.c.orig	Sat Oct 25 09:35:12 2003
-+++ magicfilter.c	Sat Oct 25 09:36:48 2003
-@@ -59,10 +59,10 @@
- /* Header of mail message */
- #ifndef NOMAIL
- const char *mailheader =	/* Header of complaint message */
--"To: %s\n\
--Subject: Rejected print job\n\
--
--Your print job was automatically rejected as an invalid data type.\n\n";
-+"To: %s\n"
-+"Subject: Rejected print job\n"
-+"\n"
-+"Your print job was automatically rejected as an invalid data type.\n\n";
- #endif
- 
- /* ------------------------------------------------------------------------- *
diff --git a/print/magicfilter/files/printcap.sample b/print/magicfilter/files/printcap.sample
deleted file mode 100644
index 45df63c57561..000000000000
--- a/print/magicfilter/files/printcap.sample
+++ /dev/null
@@ -1,55 +0,0 @@
-#	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $FreeBSD$
-
-#
-# This enables a simple local "raw" printer, hooked up to the first
-# parallel port.  No kind of filtering is done, so everything you
-# pass to the "lpr" command will be printed unmodified.
-#
-# Remember, for further print queues you're going to add, you have to
-# chose different spool directories (the "sd" capability below),
-# otherwise you will greatly confuse lpd.
-#
-# For some advanced printing, have a look at the "apsfilter" package.
-# It plugs into the lpd system, allowing you to print a variety of
-# different file types by converting everything to PostScript(tm)
-# format.  If you don't have a PostScript(tm) printer, don't panic,
-# but do also install the "ghostscript" package.
-#
-# Do also refer to section 7 (Printing) of the handbook.  A local copy
-# can be found under /usr/share/doc/handbook/handbook.{html,latin1}.
-#
-# Banner pages are now suppressed by default.  Remove the :sh:
-# capability to turn them back on.
-#
-# ############### For magic filter users: #################
-#   Inserting magicfilter into /etc/printcap is very easy. First,
-#   select apropriate filter for your printer, and insert that filter
-#   into 'if' filter capability.
-#   For detail, refer to section 7.6.1(Printing/Filters) of the handbook.
-# The following sample is for HP Laserjet 4/5/6 printers.
-#
-# 1999/3/24 CHOI Junho <cjh@kr.freebsd.org>
-# #########################################################
-#
-lp|local line printer:\
-	:sh:\
-	:lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:\
-	:if=/usr/local/libexec/magicfilter/ljet4-filter:
-#
-# Sample remote printer.  The physical printer is on machine "lphost".
-# NB: you cannot perform any kind of local filtering directly.  If
-# you need local filters (e.g. LF -> CR-LF conversion for HP printers),
-# create a filter script that recursively calls lpd with another -P
-# argument after filtering.
-#
-#remote|sample remote printer:\
-#	:sh:\
-#	:rm=lphost:sd=/var/spool/output/lphost:lf=/var/log/lpd-errs:
-#
-# Simple Russian printer with hardware CP866 character set, output filter
-# used for KOI8-R -> CP866 conversion
-#
-#lp|Russian local line printer:\
-#	:sh:of=/usr/libexec/lpr/ru/koi2alt:\
-#	:lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
diff --git a/print/magicfilter/pkg-descr b/print/magicfilter/pkg-descr
index 9be81ab08b3b..afe70f622b06 100644
--- a/print/magicfilter/pkg-descr
+++ b/print/magicfilter/pkg-descr
@@ -1,10 +1,15 @@
-                          MAGICFILTER v 1.2
+MagicFilter
 
-                      H. Peter Anvin <hpa@zytor.com>
+magicfilter is an extensible and customizable automatic printer filter. 
+It selects an appropriate conversion technique for the input data by 
+seeking for magic numbers, and then utilizing the appropriate conversion 
+utility.
 
-MAGICFILTER is a customizable, extensible automatic printer filter.
-Although written for Linux, it should work on any UNIX system which
-has an ANSI C compiler.
+magicfilter is primarily intended for use as the `input filter' by the 
+lpd print spooler. The options accepted by magicfilter are exactly the 
+ones passed to the input filter by lpd (unless you build it on a LPRng 
+system -- in that case, magicfilter accepts no options.) 
 
 --
 CHOI Junho <cjh@FreeBSD.org>
+WWW: http://www.pell.portland.or.us/~orc/Code/magicfilter/
diff --git a/print/magicfilter/pkg-plist b/print/magicfilter/pkg-plist
index 99484c168fb1..5904301d614f 100644
--- a/print/magicfilter/pkg-plist
+++ b/print/magicfilter/pkg-plist
@@ -1,53 +1,59 @@
 bin/magicfilter
-libexec/magicfilter/bj10e-filter
-libexec/magicfilter/bj200-filter
-libexec/magicfilter/cps300-filter
-libexec/magicfilter/cps400-filter
-libexec/magicfilter/cps600-filter
-libexec/magicfilter/cpsonly300-filter
-libexec/magicfilter/cpsonly400-filter
-libexec/magicfilter/cpsonly600-filter
-libexec/magicfilter/deskjet-filter
-libexec/magicfilter/dj500-filter
-libexec/magicfilter/dj500c-filter
-libexec/magicfilter/dj550c-filter
-libexec/magicfilter/epson9-filter
-libexec/magicfilter/epson9c-filter
-libexec/magicfilter/epsonlq-filter
-libexec/magicfilter/epsonlqc-filter
-libexec/magicfilter/ibmpro-filter
-libexec/magicfilter/jetp3852-filter
-libexec/magicfilter/la50-filter
-libexec/magicfilter/la75-filter
-libexec/magicfilter/laserjet-filter
-libexec/magicfilter/laserjetlo-filter
-libexec/magicfilter/lbp8-filter
-libexec/magicfilter/lj250-filter
-libexec/magicfilter/ljet2p-filter
-libexec/magicfilter/ljet2plo-filter
-libexec/magicfilter/ljet3-filter
-libexec/magicfilter/ljet4-filter
-libexec/magicfilter/ljet4l-filter
-libexec/magicfilter/ljet4m-filter
-libexec/magicfilter/ljet4ml-filter
-libexec/magicfilter/ljetplus-filter
-libexec/magicfilter/ljetpluslo-filter
-libexec/magicfilter/ln03-filter
-libexec/magicfilter/m8510-filter
-libexec/magicfilter/necp6-filter
-libexec/magicfilter/oki182-filter
-libexec/magicfilter/pj-filter
-libexec/magicfilter/pjxl-filter
-libexec/magicfilter/pjxl300-filter
-libexec/magicfilter/ps300-filter
-libexec/magicfilter/ps400-filter
-libexec/magicfilter/ps600-filter
-libexec/magicfilter/psonly300-filter
-libexec/magicfilter/psonly400-filter
-libexec/magicfilter/psonly600-filter
-libexec/magicfilter/r4081-filter
-libexec/magicfilter/tek4693-filter
-libexec/magicfilter/tek4696-filter
+etc/mf.magic
+libexec/magicfilter/bj10e
+libexec/magicfilter/bj200
+libexec/magicfilter/bj600
+libexec/magicfilter/bj600_draft
+libexec/magicfilter/bj610
+libexec/magicfilter/bj800
+libexec/magicfilter/bj800_draft
+libexec/magicfilter/cps300
+libexec/magicfilter/cps400
+libexec/magicfilter/cps600
+libexec/magicfilter/cpsonly300
+libexec/magicfilter/cpsonly400
+libexec/magicfilter/cpsonly600
+libexec/magicfilter/deskjet
+libexec/magicfilter/dj500
+libexec/magicfilter/dj500c
+libexec/magicfilter/dj550c
+libexec/magicfilter/epson9
+libexec/magicfilter/epson9c
+libexec/magicfilter/epsonlq
+libexec/magicfilter/epsonlqc
+libexec/magicfilter/ibmpro
+libexec/magicfilter/jetp3852
+libexec/magicfilter/la50
+libexec/magicfilter/la75
+libexec/magicfilter/laserjet
+libexec/magicfilter/laserjetlo
+libexec/magicfilter/lbp8
+libexec/magicfilter/lj250
+libexec/magicfilter/ljet2p
+libexec/magicfilter/ljet2plo
+libexec/magicfilter/ljet3
+libexec/magicfilter/ljet4
+libexec/magicfilter/ljet4l
+libexec/magicfilter/ljet4m
+libexec/magicfilter/ljet4ml
+libexec/magicfilter/ljetplus
+libexec/magicfilter/ljetpluslo
+libexec/magicfilter/ln03
+libexec/magicfilter/m8510
+libexec/magicfilter/necp6
+libexec/magicfilter/oki182
+libexec/magicfilter/pj
+libexec/magicfilter/pjxl
+libexec/magicfilter/pjxl300
+libexec/magicfilter/r4081
+libexec/magicfilter/stc1520
+libexec/magicfilter/stc500
+libexec/magicfilter/stc600
+libexec/magicfilter/stc800
+libexec/magicfilter/stylus800
+libexec/magicfilter/stylus_color_360dpi
+libexec/magicfilter/stylus_color_720dpi
+libexec/magicfilter/tek4693
+libexec/magicfilter/tek4696
+libexec/magicfilter/textonly
 @dirrm libexec/magicfilter
-share/examples/magicfilter/printcap.sample
-@dirrm share/examples/magicfilter