Attachment 66713 Details for Bug 98511 – foo2zjs-20060603.patch

[patch] foo2zjs-20060603.patch

foo2zjs-20060603.patch (text/plain), 6.22 KB, created by Jose Alonso Cardenas Marquez on 2006-06-04 23:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose Alonso Cardenas Marquez

Created: 2006-06-04 23:30:16 UTC

Size: 6.22 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/print/foo2zjs/Makefile /usr/ports/print/foo2zjs-new/Makefile
>--- /usr/ports/print/foo2zjs/Makefile	Sun May  7 06:38:51 2006
>+++ /usr/ports/print/foo2zjs-new/Makefile	Sun Jun  4 16:29:32 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	foo2zjs
>-PORTVERSION=	20060504
>+PORTVERSION=	20060603
> CATEGORIES=	print
> MASTER_SITES=	http://foo2zjs.rkkda.com/
> DISTNAME=	${PORTNAME}
>@@ -23,13 +23,15 @@
> SUB_FILES=	pkg-message
> 
> MAN1=	foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1
>+EXTRAFILES=	msexpand getweb
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|^CFLAGS|CFLAGS?|g' -e 's|^PREFIX|PREFIX?|g' ${WRKSRC}/icc2ps/Makefile
> 
> post-install:
> 	@cd ${WRKSRC} && \
>-		${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/
>+		${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/ && \
>+			${INSTALL_SCRIPT} ${EXTRAFILES} ${PREFIX}/bin/
> 
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>diff -ruN --exclude=CVS /usr/ports/print/foo2zjs/distinfo /usr/ports/print/foo2zjs-new/distinfo
>--- /usr/ports/print/foo2zjs/distinfo	Sun May  7 06:38:51 2006
>+++ /usr/ports/print/foo2zjs-new/distinfo	Sun Jun  4 16:29:32 2006
>@@ -1,3 +1,3 @@
>-MD5 (foo2zjs.tar.gz) = c44f2de01457308cca690b2e5e9dfbc7
>-SHA256 (foo2zjs.tar.gz) = f517886d5b1062ac360feff856fd6eac9fa52b2a2278e92f235056541a156a74
>-SIZE (foo2zjs.tar.gz) = 2127249
>+MD5 (foo2zjs.tar.gz) = 33e0e16b7a15d6caf14d025b23c31865
>+SHA256 (foo2zjs.tar.gz) = 1e92ba3a1867caaa6231cf354b11c9917c76117623c75eddf60b9d4aacb4c18f
>+SIZE (foo2zjs.tar.gz) = 917840
>diff -ruN --exclude=CVS /usr/ports/print/foo2zjs/files/patch-getweb.in /usr/ports/print/foo2zjs-new/files/patch-getweb.in
>--- /usr/ports/print/foo2zjs/files/patch-getweb.in	Wed Dec 31 19:00:00 1969
>+++ /usr/ports/print/foo2zjs-new/files/patch-getweb.in	Sun Jun  4 16:29:32 2006
>@@ -0,0 +1,29 @@
>+--- getweb.in	Thu May 11 17:02:59 2006
>++++ getweb.in	Sun Jun  4 15:41:29 2006
>+@@ -48,7 +48,7 @@
>+     exefile="$2"
>+     what="$3"
>+     
>+-    wget $WGETOPTS -O $exefile "$url/$exefile" ||
>++    fetch -m -o $exefile "$url/$exefile" ||
>+ 	error "Couldn't download $url/$exefile"
>+     unzip -o $exefile "$what"
>+     rm $exefile
>+@@ -62,7 +62,7 @@
>+     file="$2"
>+     what="$3"
>+     
>+-    wget $WGETOPTS -O $file "$url/$file" ||
>++    fetch -m -o $file "$url/$file" ||
>+ 	error "Couldn't download $url/$file"
>+     gunzip <$file | tar xvf - $what
>+     rm $file
>+@@ -130,7 +130,7 @@
>+ 	do
>+ 	    base=`basename $i .IC_`
>+ 	    mv $base.IC_ $base.ic_
>+-	    ./msexpand $base.ic_
>++	    msexpand $base.ic_
>+ 	    rm -f $base.ic_
>+ 	done
>+ 	;;
>diff -ruN --exclude=CVS /usr/ports/print/foo2zjs/files/patch-icc2ps_lcms.h /usr/ports/print/foo2zjs-new/files/patch-icc2ps_lcms.h
>--- /usr/ports/print/foo2zjs/files/patch-icc2ps_lcms.h	Wed Dec 31 19:00:00 1969
>+++ /usr/ports/print/foo2zjs-new/files/patch-icc2ps_lcms.h	Sun Jun  4 16:29:32 2006
>@@ -0,0 +1,14 @@
>+--- icc2ps/lcms.h	Sun Jun  4 14:21:49 2006
>++++ icc2ps/lcms.h	Sun Jun  4 14:22:05 2006
>+@@ -133,9 +133,8 @@
>+ 
>+ #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
>+ #  include <sys/types.h>
>+-#  define USE_INT64           1
>+-#  define LCMSSLONGLONG       int_64_t
>+-#  define LCMSULONGLONG       u_int64_t
>++#  define LCMSSLONGLONG       int64_t
>++#  define LCMSULONGLONG       uint64_t
>+ #endif
>+ 
>+ #ifdef USE_INT64
>diff -ruN --exclude=CVS /usr/ports/print/foo2zjs/files/pkg-message.in /usr/ports/print/foo2zjs-new/files/pkg-message.in
>--- /usr/ports/print/foo2zjs/files/pkg-message.in	Sun May  7 06:38:51 2006
>+++ /usr/ports/print/foo2zjs-new/files/pkg-message.in	Sun Jun  4 16:41:15 2006
>@@ -4,4 +4,17 @@
> 
>    * %%DOCSDIR%%/INSTALL
> 
>+2) Go to tmp directory and run getweb script.
>+
>+   # cd /tmp && getweb all
>+
>+3) Copy icm and img files.
>+
>+   # cp DL*.icm CP*.icm km2430*.icm %%DATADIR%%/icm && \
>+     cp sihp*.img %%DATADIR%%/firmware && \
>+     cp hpclj26*.icm km2430*.icm %%PREFIX%%/share/foo2hp/icm && \
>+     rm *.icm *.img
>+
>+4) Enjoy it ;)
>+
> ###############################################################################################
>diff -ruN --exclude=CVS /usr/ports/print/foo2zjs/pkg-plist /usr/ports/print/foo2zjs-new/pkg-plist
>--- /usr/ports/print/foo2zjs/pkg-plist	Sun May  7 06:38:51 2006
>+++ /usr/ports/print/foo2zjs-new/pkg-plist	Sun Jun  4 16:56:54 2006
>@@ -5,6 +5,8 @@
> bin/foo2zjs
> bin/foo2zjs-icc2ps
> bin/foo2zjs-wrapper
>+bin/getweb
>+bin/msexpand
> bin/okidecode
> bin/zjsdecode
> share/cups/model/Generic-OAKT_Printer.ppd.gz
>@@ -16,6 +18,7 @@
> share/cups/model/HP-LaserJet_1005.ppd.gz
> share/cups/model/HP-LaserJet_1018.ppd.gz
> share/cups/model/HP-LaserJet_1020.ppd.gz
>+share/cups/model/HP-LaserJet_1022.ppd.gz
> share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz
> share/cups/model/Minolta-magicolor_2200_DL.ppd.gz
> share/cups/model/Minolta-magicolor_2300_DL.ppd.gz
>@@ -23,10 +26,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
>-share/foo2hp/icm/hpclj2600n.icm
>-share/foo2hp/icm/km2430_0.icm
>-share/foo2hp/icm/km2430_1.icm
>-share/foo2hp/icm/km2430_2.icm
> %%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
> %%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd
> %%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd
>@@ -36,21 +35,14 @@
> %%DATADIR%%/crd/prolog.ps
> %%DATADIR%%/crd/screen1200.ps
> %%DATADIR%%/crd/screen2400.ps
>-%%DATADIR%%/firmware/sihp1000.dl
>-%%DATADIR%%/firmware/sihp1005.dl
>-%%DATADIR%%/firmware/sihp1018.dl
>-%%DATADIR%%/firmware/sihp1020.dl
> %%DATADIR%%/gamma-lookup.ps
> %%DATADIR%%/gamma.ps
>-%%DATADIR%%/icm/km2430_0.icm
>-%%DATADIR%%/icm/km2430_1.icm
>-%%DATADIR%%/icm/km2430_2.icm
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm %%DATADIR%%/icm
>-@dirrm %%DATADIR%%/firmware
>-@dirrm %%DATADIR%%/crd
>-@dirrm %%DATADIR%%
>-@dirrm share/foo2oak/icm
>-@dirrm share/foo2oak
>-@dirrm share/foo2hp/icm
>-@dirrm share/foo2hp
>+@dirrmtry %%DATADIR%%/icm
>+@dirrmtry %%DATADIR%%/firmware
>+@dirrmtry %%DATADIR%%/crd
>+@unexec rmdir %D/%%DATADIR%% 2>/dev/null || echo "Note: %D/%%DATADIR%%: icm and firmware directories not empty, remove it manually"
>+@dirrmtry share/foo2oak/icm
>+@unexec rmdir %D/share/foo2oak 2>/dev/null || echo "Note: %D/share/foo2oak: icm directory not empty, remove it manually"
>+@dirrmtry share/foo2hp/icm
>+@unexec rmdir %D/share/foo2hp 2>/dev/null || echo "Note: %D/share/foo2hp: icm directory not empty, remove it manually"

Actions: View | Diff

Attachments on bug 98511: 66713