From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 4 05:10:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0D1D16A47B for ; Mon, 4 Dec 2006 05:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFF0343CA5 for ; Mon, 4 Dec 2006 05:09:43 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB45AEjr099647 for ; Mon, 4 Dec 2006 05:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB45AE8P099646; Mon, 4 Dec 2006 05:10:14 GMT (envelope-from gnats) Resent-Date: Mon, 4 Dec 2006 05:10:14 GMT Resent-Message-Id: <200612040510.kB45AE8P099646@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Frank Mayhar" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1DF0A16A415 for ; Mon, 4 Dec 2006 05:00:23 +0000 (UTC) (envelope-from frank@exit.com) Received: from tinker.exit.com (tinker.exit.com [206.223.0.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0D5443CA5 for ; Mon, 4 Dec 2006 04:59:52 +0000 (GMT) (envelope-from frank@exit.com) Received: from jill.exit.com (jill.exit.com [206.223.0.4]) by tinker.exit.com (8.13.8/8.13.8) with ESMTP id kB450NB0024641 for ; Sun, 3 Dec 2006 21:00:23 -0800 (PST) (envelope-from frank@exit.com) Message-Id: <1165208423.80745@jill.exit.com> Date: Sun, 3 Dec 2006 21:00:23 -0800 From: "Frank Mayhar" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/106293: Update print/cup-magicolor to latest version. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 05:10:15 -0000 >Number: 106293 >Category: ports >Synopsis: Update print/cup-magicolor to latest version. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Dec 04 05:10:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Frank Mayhar >Release: FreeBSD 6.1-STABLE amd64 >Organization: Exit Consulting >Environment: System: FreeBSD 6.1-STABLE #1: Wed Jul 12 10:17:42 PDT 2006 root@jill.exit.com:/usr/obj/usr/src/sys/JILL >Description: Bring cups-magicolor up-to-date with the latest version of the filter, 1.5. >How-To-Repeat: >Fix: --- cups-magicolor.diff begins here --- Index: cups-magicolor/Makefile =================================================================== RCS file: /cvs/repos/ports/print/cups-magicolor/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- cups-magicolor/Makefile 13 May 2006 01:03:10 -0000 1.3 +++ cups-magicolor/Makefile 2 Dec 2006 04:49:25 -0000 @@ -6,24 +6,23 @@ # PORTNAME= cups-magicolor -PORTVERSION= 1.1.0 +PORTVERSION= 1.5.0 CATEGORIES= print -MASTER_SITES= ftp://ftp.minolta-qms.com/pub/crc/out_going/other/ +MASTER_SITES= http://printer.konicaminolta.net/drivers/linux/ +DISTNAME= 2430DL_sc_linux MAINTAINER= frank@exit.com COMMENT= CUPS support for the Konica-Minolta Magicolor 2430DL -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/print/cups-base:configure +#BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/print/cups-base:configure LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base \ jbig.1:${PORTSDIR}/graphics/jbigkit \ lcms.1:${PORTSDIR}/graphics/lcms RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster -DISTNAME= magicolor2430DL-1.1.0 +WRKSRC= ${WRKDIR}/magicolor2430DL-${PORTVERSION} USE_GMAKE= yes - -do-configure: - ${CP} ${WRKSRC}/../../../cups-base/work/cups-*/config.h ${WRKSRC} +GNU_CONFIGURE= yes .include Index: cups-magicolor/distinfo =================================================================== RCS file: /cvs/repos/ports/print/cups-magicolor/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- cups-magicolor/distinfo 24 Jan 2006 01:00:41 -0000 1.2 +++ cups-magicolor/distinfo 30 Jul 2006 16:26:13 -0000 @@ -1,3 +1,3 @@ -MD5 (magicolor2430DL-1.1.0.tar.gz) = d58ad3835e1a19c9de88d45a8ada1215 -SHA256 (magicolor2430DL-1.1.0.tar.gz) = 6339ccae0640102e9bcb336b1a29e25ac5757aec71790ed7bc026dad64512256 -SIZE (magicolor2430DL-1.1.0.tar.gz) = 989276 +MD5 (2430DL_sc_linux.tar.gz) = 63777c64ca8e50823dce1a6f3ec49ab4 +SHA256 (2430DL_sc_linux.tar.gz) = 6117a12390896ec346665b5b91d88edad7a158eeb60c589d92c4d25558870922 +SIZE (2430DL_sc_linux.tar.gz) = 1041864 Index: cups-magicolor/files/patch-Makefile =================================================================== RCS file: /cvs/repos/ports/print/cups-magicolor/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- cups-magicolor/files/patch-Makefile 8 Oct 2005 19:26:51 -0000 1.1 +++ cups-magicolor/files/patch-Makefile 2 Dec 2006 04:34:49 -0000 @@ -1,33 +0,0 @@ ---- ./Makefile Fri Sep 17 17:33:59 2004 -+++ ../magicolor2430DL-1.1.0-new/./Makefile Thu Jul 28 19:51:27 2005 -@@ -1,11 +1,11 @@ - CC = gcc --CFLAGS = $(RC_CFLAGS) -I. -I../include -+CFLAGS = $(RC_CFLAGS) -I. -I../include -I/usr/local/include - OPTIM = -Wall -fPIC -O2 - #OPTIM = -g --LDLIBS = -lcups -lcupsimage --LDADD = /usr/lib/liblcms.a /usr/local/lib/libjbig.a -+LDLIBS = -L/usr/local/lib -lcups -lcupsimage -+LDADD = /usr/local/lib/liblcms.a /usr/local/lib/libjbig.a - --MYPRINTER = /usr/local/KONICA_MINOLTA/mc2430DL -+MYPRINTER = /usr/local/share/KONICA_MINOLTA/mc2430DL - - .SILENT: - .SUFFIXES: .a .c .cxx .h .o .0 .1 .1m -@@ -28,10 +28,10 @@ - - #install the driver - install: all -- install -m 755 -d $(DESTDIR)/usr/lib/cups/filter -- install -m 755 rastertokmlf $(DESTDIR)/usr/lib/cups/filter/rastertokm2430dl -- install -m 755 -d $(DESTDIR)/usr/share/cups/model/KONICA_MINOLTA -- install -m 644 km_en.ppd.gz $(DESTDIR)/usr/share/cups/model/KONICA_MINOLTA/km2430dl.ppd.gz -+ install -m 755 -d $(DESTDIR)/usr/local/libexec/cups/filter -+ install -m 755 rastertokmlf $(DESTDIR)/usr/local/libexec/cups/filter/rastertokm2430dl -+ install -m 755 -d $(DESTDIR)/usr/local/share/cups/model/KONICA_MINOLTA -+ install -m 644 km_en.ppd.gz $(DESTDIR)/usr/local/share/cups/model/KONICA_MINOLTA/km2430dl.ppd.gz - install -m 755 -d $(DESTDIR)$(MYPRINTER)/Profiles - install -m 644 km_0.icm $(DESTDIR)$(MYPRINTER)/Profiles/km_0.icm - install -m 644 km_1.icm $(DESTDIR)$(MYPRINTER)/Profiles/km_1.icm Index: cups-magicolor/files/patch-kmlf.h =================================================================== RCS file: /cvs/repos/ports/print/cups-magicolor/files/patch-kmlf.h,v retrieving revision 1.1 diff -u -r1.1 patch-kmlf.h --- cups-magicolor/files/patch-kmlf.h 8 Oct 2005 19:26:51 -0000 1.1 +++ cups-magicolor/files/patch-kmlf.h 2 Dec 2006 04:34:52 -0000 @@ -1,11 +0,0 @@ ---- ./kmlf.h Thu Sep 2 11:18:38 2004 -+++ ../magicolor2430DL-1.1.0-new/./kmlf.h Thu Jul 28 18:56:32 2005 -@@ -38,6 +38,8 @@ - - #ifdef __linux - #define KM_FOLDER "/usr/local/KONICA_MINOLTA" -+#elif defined(__FreeBSD__) -+#define KM_FOLDER "/usr/local/share/KONICA_MINOLTA" - #else - #define KM_FOLDER "/Library/Printers/KONICA_MINOLTA" - #endif Index: cups-magicolor/files/patch-rastertokmlf.c =================================================================== RCS file: /cvs/repos/ports/print/cups-magicolor/files/patch-rastertokmlf.c,v retrieving revision 1.1 diff -u -r1.1 patch-rastertokmlf.c --- cups-magicolor/files/patch-rastertokmlf.c 8 Oct 2005 19:26:51 -0000 1.1 +++ cups-magicolor/files/patch-rastertokmlf.c 2 Dec 2006 04:34:55 -0000 @@ -1,25 +0,0 @@ ---- rastertokmlf.c.orig Thu Sep 2 20:18:38 2004 -+++ rastertokmlf.c Sat Oct 8 21:21:41 2005 -@@ -1339,6 +1339,7 @@ - DWORD x, y, iShift;//, dwWidthInByte; - unsigned char bTmpCyan, bTmpMagenta, bTmpYellow, bTmpBlack, bit; - //int err = 0; -+ PHTHEADER pCHThdr, pMHThdr, pYHThdr, pKHThdr; - - /* - * Make sure status messages are not buffered... -@@ -1572,10 +1573,10 @@ - dwVert = header.cupsHeight; - //dwWidthInByte = (dwHori + 7)/8; - -- PHTHEADER pCHThdr = (PHTHEADER)pImage->pHT[0]; -- PHTHEADER pMHThdr = (PHTHEADER)pImage->pHT[1]; -- PHTHEADER pYHThdr = (PHTHEADER)pImage->pHT[2]; -- PHTHEADER pKHThdr = (PHTHEADER)pImage->pHT[3]; -+ pCHThdr = (PHTHEADER)pImage->pHT[0]; -+ pMHThdr = (PHTHEADER)pImage->pHT[1]; -+ pYHThdr = (PHTHEADER)pImage->pHT[2]; -+ pKHThdr = (PHTHEADER)pImage->pHT[3]; - - //pbSrc = pSrcBitmap; - #ifdef CUPS_FLIP --- cups-magicolor.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: