ports/79637: [PATCH] print/magicfilter: update to 2.3.d

[Rong-En Fan]

>Number:         79637
>Category:       ports
>Synopsis:       [PATCH] print/magicfilter: update to 2.3.d
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 07 17:10:08 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 5.4-RC1 i386
>Organization:
NTU CSIE
>Environment:
System: FreeBSD svm.csie.ntu.edu.tw 5.4-RC1 FreeBSD 5.4-RC1 #0: Tue Apr  5 14:26:20 CST
>Description:
- Update to 2.3.d
  Note that, from http://www.tsfr.org/~orc/Code/magicfilter/
  this version change the behavior of determining PJL jobs.
  I think an entry in UPDATING is needed?
- A new option LIBMAGIC is introduced which does following:
  when enable, teach magicfilter to use sysutils/file's libmagic[1]
  instead of the ship-in libmagic.
  Also, files/extra-libmagic is introduced to make this happen.

[1] system's libmagic.so.1 seems have trouble (try cc -lmagic, you'll see)

Added file(s):
- files/extra-libmagic

Port maintainer (cjh at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- magicfilter-2.3.d.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/print/magicfilter/Makefile /home/rafan/tmp/ports/magicfilter/Makefile
--- /usr/ports/print/magicfilter/Makefile	Sun Dec  5 03:18:30 2004
+++ /home/rafan/tmp/ports/magicfilter/Makefile	Fri Apr  8 01:00:16 2005
@@ -6,23 +6,35 @@
 #
 
 PORTNAME=	magicfilter
-PORTVERSION=	2.3.b
+PORTVERSION=	2.3.d
 CATEGORIES=	print
 MASTER_SITES=	http://www.pell.portland.or.us/~orc/Code/magicfilter/
 
 MAINTAINER=	cjh at FreeBSD.org
 COMMENT=	Customizable, extensible automatic printer filter
 
+LIB_DEPENDS=	magic.1:${PORTSDIR}/sysutils/file
+
 USE_GHOSTSCRIPT=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_SCRIPT= configure.sh
+CONFIGURE_SCRIPT=	configure.sh
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+= --confdir=${PREFIX}/etc --filterdir=${PREFIX}/libexec/magicfilter --use-fifo
+CONFIGURE_ARGS+=	--confdir=${PREFIX}/etc --filterdir=${PREFIX}/libexec/magicfilter --use-fifo
 MAN5=		magicfilter.5
 MAN8=		magicfilter.8
 
+OPTIONS=	LIBMAGIC "Use libmagic from sysutils/file instead" off
+
 .include <bsd.port.pre.mk>
+
+.if defined(WITH_LIBMAGIC)
+EXTRA_PATCHES+=	${FILESDIR}/extra-libmagic
+CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
+PLIST_SUB+=	WITH_LIBMAGIC="@comment "
+.else
+PLIST_SUB+=	WITH_LIBMAGIC=""
+.endif
 
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
diff -ruN --exclude=CVS /usr/ports/print/magicfilter/distinfo /home/rafan/tmp/ports/magicfilter/distinfo
--- /usr/ports/print/magicfilter/distinfo	Sun Dec  5 03:18:30 2004
+++ /home/rafan/tmp/ports/magicfilter/distinfo	Thu Apr  7 23:53:37 2005
@@ -1,2 +1,2 @@
-MD5 (magicfilter-2.3.b.tar.gz) = a0f8ca2f0bb13f36e845eaad02561f65
-SIZE (magicfilter-2.3.b.tar.gz) = 162156
+MD5 (magicfilter-2.3.d.tar.gz) = 2c85d1fd6820e29ddff63fc6d9e0401b
+SIZE (magicfilter-2.3.d.tar.gz) = 162165
diff -ruN --exclude=CVS /usr/ports/print/magicfilter/files/extra-libmagic /home/rafan/tmp/ports/magicfilter/files/extra-libmagic
--- /usr/ports/print/magicfilter/files/extra-libmagic	Thu Jan  1 08:00:00 1970
+++ /home/rafan/tmp/ports/magicfilter/files/extra-libmagic	Fri Apr  8 00:59:27 2005
@@ -0,0 +1,35 @@
+--- Makefile.in.orig	Sat May 10 02:27:15 2003
++++ Makefile.in	Fri Apr  8 00:57:53 2005
+@@ -40,10 +40,7 @@
+ magic.c: magic.m4 mkmagic config.h
+ 	@srcdir@/mkmagic magic.m4
+ 
+-cfmagic: file/magic
+-	@MAKE_MAGIC@ magic
+-
+-commoninstall: textonly cfmagic
++commoninstall: textonly
+ 	@INSTALL_DIR@ $(prefix)/@exedir@
+ 	@INSTALL_DIR@ $(prefix)/@mandir@/man8
+ 	@INSTALL_DIR@ $(prefix)/@mandir@/man5
+--- configure.sh.orig	Fri Apr  8 00:58:18 2005
++++ configure.sh	Fri Apr  8 00:58:52 2005
+@@ -1057,6 +1057,7 @@
+ 	LOG "Your system has a modern libmagic.  We'll use it."
+ 	unset BUILD_MAGIC
+     fi
++    unset BUILD_MAGIC
+ 
+     if [ "$BUILD_MAGIC" ]; then
+ 	case $ac_os in
+@@ -1101,8 +1102,8 @@
+     AC_SUB MAKE_MAGIC	"cd file \&\& make"
+ else
+     AC_SUB LIBMAGIC ""
+-    AC_SUB MAGIC_HEADER ""
+-    AC_SUB MAGIC_LIB ""
++    AC_SUB MAGIC_HEADER "-I${LOCALBASE}/include"
++    AC_SUB MAGIC_LIB "-L${LOCALBASE}/lib"
+     AC_SUB MAKE_MAGIC ":"
+ fi
+ 
diff -ruN --exclude=CVS /usr/ports/print/magicfilter/pkg-plist /home/rafan/tmp/ports/magicfilter/pkg-plist
--- /usr/ports/print/magicfilter/pkg-plist	Sun Dec  5 03:18:30 2004
+++ /home/rafan/tmp/ports/magicfilter/pkg-plist	Fri Apr  8 00:51:27 2005
@@ -1,5 +1,5 @@
 bin/magicfilter
-etc/mf.magic
+%%WITH_LIBMAGIC%%etc/mf.magic
 libexec/magicfilter/bj10e
 libexec/magicfilter/bj200
 libexec/magicfilter/bj600
--- magicfilter-2.3.d.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: