From rafan@svm.csie.ntu.edu.tw  Thu Apr  7 17:09:49 2005
Return-Path: <rafan@svm.csie.ntu.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C1C0316A4CE; Thu,  7 Apr 2005 17:09:49 +0000 (GMT)
Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 216E943D53; Thu,  7 Apr 2005 17:09:49 +0000 (GMT)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1])
	by svm.csie.ntu.edu.tw (8.13.3/8.13.1) with ESMTP id j37H9l3p081271;
	Fri, 8 Apr 2005 01:09:47 +0800 (CST)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: (from rafan@localhost)
	by svm.csie.ntu.edu.tw (8.13.3/8.13.1/Submit) id j37H9gGa081260;
	Fri, 8 Apr 2005 01:09:42 +0800 (CST)
	(envelope-from rafan)
Message-Id: <200504071709.j37H9gGa081260@svm.csie.ntu.edu.tw>
Date: Fri, 8 Apr 2005 01:09:42 +0800 (CST)
From: Rong-En Fan <rafan@infor.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: cjh@freebsd.org
Subject: [PATCH] print/magicfilter: update to 2.3.d
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         79637
>Category:       ports
>Synopsis:       [PATCH] print/magicfilter: update to 2.3.d
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cjh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 07 17:10:08 GMT 2005
>Closed-Date:    Tue May 02 02:04:52 GMT 2006
>Last-Modified:  Tue May 02 02:04:52 GMT 2006
>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@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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->cjh 
Responsible-Changed-By: hq 
Responsible-Changed-When: Fri Apr 8 02:40:43 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79637 
State-Changed-From-To: open->analyzed 
State-Changed-By: cjh 
State-Changed-When: Fri Jul 8 07:51:01 GMT 2005 
State-Changed-Why:  
FreeBSD-builtin libmagic problem can be solved by add '-lz' to LDFLAGS. 
Which libmagic will be good? (magicfilter builtin, FreeBSD builtin, 
sysutils/file) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79637 

From: Rong-En Fan <rafan@infor.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: CHOI Junho <cjh@FreeBSD.org>
Subject: Re: ports/79637: [PATCH] print/magicfilter: update to 2.3.d
Date: Thu, 29 Dec 2005 16:00:56 +0800

 According to magicfilter's site, the author suggests
 that users should use system's file(1) instead of its
 ship-in file(1). Thus, I came up with the following
 patch. The new patch unconditionally use FreeBSD built-in
 file(1) [1].
 
 This change affects users that use --traditional
 for configure, which is not the case for FreeBSD
 port. Since it's not default, I dont think entry
 for UPDATING is needed.
 
 [1] I have tested on 4.11, 5.4 both ok.
 
 
 Regards,
 Rong-En Fan
 
 ===> Generating patch
 ===> Viewing diff with less
 diff -ruN --exclude=CVS /usr/ports/print/magicfilter/Makefile /home/rafan/tmp/ports/magicfilter/Makefile
 --- /usr/ports/print/magicfilter/Makefile	Sun Dec  5 01:06:28 2004
 +++ /home/rafan/tmp/ports/magicfilter/Makefile	Thu Dec 29 15:36:23 2005
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	magicfilter
 -PORTVERSION=	2.3.b
 +PORTVERSION=	2.3.d
  CATEGORIES=	print
  MASTER_SITES=	http://www.pell.portland.or.us/~orc/Code/magicfilter/
  
 @@ -16,7 +16,7 @@
  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
  MAN5=		magicfilter.5
 diff -ruN --exclude=CVS /usr/ports/print/magicfilter/distinfo /home/rafan/tmp/ports/magicfilter/distinfo
 --- /usr/ports/print/magicfilter/distinfo	Sun Dec  5 01:06:28 2004
 +++ /home/rafan/tmp/ports/magicfilter/distinfo	Thu Dec 29 15:36:23 2005
 @@ -1,2 +1,3 @@
 -MD5 (magicfilter-2.3.b.tar.gz) = a0f8ca2f0bb13f36e845eaad02561f65
 -SIZE (magicfilter-2.3.b.tar.gz) = 162156
 +MD5 (magicfilter-2.3.d.tar.gz) = 2c85d1fd6820e29ddff63fc6d9e0401b
 +SHA256 (magicfilter-2.3.d.tar.gz) = ba1005b5c60bec49c08ebbb33cf6c7b9a674e5001e5bafa187285e7f3362681b
 +SIZE (magicfilter-2.3.d.tar.gz) = 162165
 diff -ruN --exclude=CVS /usr/ports/print/magicfilter/files/patch-Makefile.in /home/rafan/tmp/ports/magicfilter/files/patch-Makefile.in
 --- /usr/ports/print/magicfilter/files/patch-Makefile.in	Thu Jan  1 08:00:00 1970
 +++ /home/rafan/tmp/ports/magicfilter/files/patch-Makefile.in	Thu Dec 29 15:36:23 2005
 @@ -0,0 +1,20 @@
 +--- Makefile.in.orig	Sat May 10 02:27:15 2003
 ++++ Makefile.in	Thu Dec 29 15:36:09 2005
 +@@ -5,7 +5,7 @@
 + CC      = @CC@
 + LDFLAGS = @MAGIC_LIB@ -L. @LDFLAGS@
 + CFLAGS  = -I. -I@srcdir@ @MAGIC_HEADER@ @CFLAGS@
 +-LIBES   = -lmf -lmagic @LIBS@
 ++LIBES   = -lmf -lmagic -lz @LIBS@
 + RANLIB  = @RANLIB@
 + PROGS=traditional magicfilter mpp textonly
 + VPATH   = @srcdir@
 +@@ -43,7 +43,7 @@
 + 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
 diff -ruN --exclude=CVS /usr/ports/print/magicfilter/files/patch-configure.sh /home/rafan/tmp/ports/magicfilter/files/patch-configure.sh
 --- /usr/ports/print/magicfilter/files/patch-configure.sh	Thu Jan  1 08:00:00 1970
 +++ /home/rafan/tmp/ports/magicfilter/files/patch-configure.sh	Thu Dec 29 15:36:23 2005
 @@ -0,0 +1,10 @@
 +--- configure.sh.orig	Thu Dec 29 15:26:42 2005
 ++++ configure.sh	Thu Dec 29 15:28:39 2005
 +@@ -1049,7 +1049,6 @@
 +     AC_SUB GSOUT '-'
 + fi
 + 
 +-BUILD_MAGIC=T
 + if [ "$USE_LOCAL_MAGIC" ]; then
 +     LOG "Using private magic file $AC_CONFDIR/mf.magic"
 + else
 diff -ruN --exclude=CVS /usr/ports/print/magicfilter/p5-Encode-2.12.diff /home/rafan/tmp/ports/magicfilter/p5-Encode-2.12.diff
 --- /usr/ports/print/magicfilter/p5-Encode-2.12.diff	Thu Jan  1 08:00:00 1970
 +++ /home/rafan/tmp/ports/magicfilter/p5-Encode-2.12.diff	Thu Dec 29 15:41:24 2005
 @@ -0,0 +1 @@
 +===> Generating patch
 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 01:06:28 2004
 +++ /home/rafan/tmp/ports/magicfilter/pkg-plist	Thu Dec 29 15:37:01 2005
 @@ -1,5 +1,4 @@
  bin/magicfilter
 -etc/mf.magic
  libexec/magicfilter/bj10e
  libexec/magicfilter/bj200
  libexec/magicfilter/bj600
 ===> Done
State-Changed-From-To: analyzed->closed 
State-Changed-By: cjh 
State-Changed-When: Tue May 2 02:04:24 UTC 2006 
State-Changed-Why:  
Updated to new version and use sysutils/file. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79637 
>Unformatted:
