Attachment 119217 Details for Bug 161680 – file.diff

[patch] file.diff

file.diff (text/plain), 10.31 KB, created by Christoph Moench-Tegeder on 2011-10-15 13:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2011-10-15 13:20:06 UTC

Size: 10.31 KB

patch

obsolete

>diff -Nru print/gutenprint.orig/Makefile print/gutenprint/Makefile
>--- print/gutenprint.orig/Makefile	2010-07-26 16:40:43.000000000 +0200
>+++ print/gutenprint/Makefile	2011-10-15 13:12:11.000000000 +0200
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	gutenprint
>-PORTVERSION=	5.2.4
>-PORTREVISION=	2
>+PORTVERSION=	5.2.7
> CATEGORIES=	print
> MASTER_SITES=	# empty
> DISTFILES=	# empty
>diff -Nru print/gutenprint-base.orig/Makefile print/gutenprint-base/Makefile
>--- print/gutenprint-base.orig/Makefile	2011-09-26 21:09:30.000000000 +0200
>+++ print/gutenprint-base/Makefile	2011-10-15 12:49:40.000000000 +0200
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME?=	gutenprint
>-PORTVERSION=	5.2.4
>-PORTREVISION?=	2
>+PORTVERSION=	5.2.7
> CATEGORIES=	print
> MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
> PKGNAMESUFFIX?=	-base
>diff -Nru print/gutenprint-base.orig/distinfo print/gutenprint-base/distinfo
>--- print/gutenprint-base.orig/distinfo	2011-07-03 14:56:18.000000000 +0200
>+++ print/gutenprint-base/distinfo	2011-10-15 12:55:01.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (gutenprint-5.2.4.tar.bz2) = b610e86305efbb98696af20366696f06ea40a7b030b45f21a83a142892ab9626
>-SIZE (gutenprint-5.2.4.tar.bz2) = 5119559
>+SHA256 (gutenprint-5.2.7.tar.bz2) = 114c899227e3ebb0753c1db503e6a5c1afaa4b1f1235fdfe02fb6bbd533beed1
>+SIZE (gutenprint-5.2.7.tar.bz2) = 5498414
>diff -Nru print/gutenprint-base.orig/files/patch-src_cups_commandtocanon.c print/gutenprint-base/files/patch-src_cups_commandtocanon.c
>--- print/gutenprint-base.orig/files/patch-src_cups_commandtocanon.c	1970-01-01 01:00:00.000000000 +0100
>+++ print/gutenprint-base/files/patch-src_cups_commandtocanon.c	2011-10-15 13:28:49.000000000 +0200
>@@ -0,0 +1,10 @@
>+--- src/cups/commandtocanon.c.orig	2011-10-15 13:27:57.000000000 +0200
>++++ src/cups/commandtocanon.c	2011-10-15 13:28:22.000000000 +0200
>+@@ -13,6 +13,7 @@
>+ 
>+ #include <cups/cups.h>
>+ #include <ctype.h>
>++#include <stdio.h>
>+ #include <stdlib.h>
>+ 
>+ 
>diff -Nru print/gutenprint-base.orig/files/patch-src_cups_commandtoepson.c print/gutenprint-base/files/patch-src_cups_commandtoepson.c
>--- print/gutenprint-base.orig/files/patch-src_cups_commandtoepson.c	1970-01-01 01:00:00.000000000 +0100
>+++ print/gutenprint-base/files/patch-src_cups_commandtoepson.c	2011-10-15 13:22:15.000000000 +0200
>@@ -0,0 +1,10 @@
>+--- src/cups/commandtoepson.c.orig	2011-10-15 13:20:46.000000000 +0200
>++++ src/cups/commandtoepson.c	2011-10-15 13:20:57.000000000 +0200
>+@@ -30,6 +30,7 @@
>+ 
>+ #include <cups/cups.h>
>+ #include <ctype.h>
>++#include <stdio.h>
>+ #include <stdlib.h>
>+ #include <string.h>
>+ 
>diff -Nru print/gutenprint-base.orig/files/patch-src_gimp2_Makefile.in print/gutenprint-base/files/patch-src_gimp2_Makefile.in
>--- print/gutenprint-base.orig/files/patch-src_gimp2_Makefile.in	2008-02-29 19:26:11.000000000 +0100
>+++ print/gutenprint-base/files/patch-src_gimp2_Makefile.in	2011-10-15 12:54:31.000000000 +0200
>@@ -1,13 +1,13 @@
>---- src/gimp2/Makefile.in.orig	2008-02-29 09:47:54.000000000 -0500
>-+++ src/gimp2/Makefile.in	2008-02-29 09:48:44.000000000 -0500
>-@@ -291,8 +291,8 @@
>+--- src/gimp2/Makefile.in.orig	2011-10-15 12:53:29.000000000 +0200
>++++ src/gimp2/Makefile.in	2011-10-15 12:54:02.000000000 +0200
>+@@ -306,8 +306,8 @@
>  	print_gimp.h
>  
>  print_SOURCES = $(COMMON_PRINT_SOURCES) print-print.c
> -print_LDADD = $(GIMP2_LIBS) $(GUTENPRINTUI2_LIBS)
> -print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS)
> +print_LDADD = $(GIMP2_LIBS) %%GUTENPRINTUI2_LIBS%%
>-+print_DEPENDENCIES = 
>++print_DEPENDENCIES =
>  gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c
>  gutenprint_LDADD = $(print_LDADD)
>  gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)
>diff -Nru print/gutenprint-base.orig/pkg-plist print/gutenprint-base/pkg-plist
>--- print/gutenprint-base.orig/pkg-plist	2011-09-26 21:09:30.000000000 +0200
>+++ print/gutenprint-base/pkg-plist	2011-10-15 13:09:11.000000000 +0200
>@@ -58,6 +58,7 @@
> %%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome.xml
> %%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml
> %%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml
>+%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3v2.xml
> %%DATADIR%%/5.2/xml/escp2/inks/nx100.xml
> %%DATADIR%%/5.2/xml/escp2/inks/photo_gen0.xml
> %%DATADIR%%/5.2/xml/escp2/inks/photo_gen1.xml
>@@ -73,6 +74,9 @@
> %%DATADIR%%/5.2/xml/escp2/inks/pro_pigment.xml
> %%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome.xml
> %%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
>+%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml
>+%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
>+%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
> %%DATADIR%%/5.2/xml/escp2/inks/standard.xml
> %%DATADIR%%/5.2/xml/escp2/inks/standard_gen0.xml
> %%DATADIR%%/5.2/xml/escp2/inks/ultrachrome.xml
>@@ -81,10 +85,13 @@
> %%DATADIR%%/5.2/xml/escp2/inks/x80.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/artisan.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/b500.xml
>+%%DATADIR%%/5.2/xml/escp2/inputslots/cd.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/cd_roll_feed.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/default.xml
>+%%DATADIR%%/5.2/xml/escp2/inputslots/pro3880.xml
>+%%DATADIR%%/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/pro_roll_feed.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/r1800.xml
> %%DATADIR%%/5.2/xml/escp2/inputslots/r2400.xml
>@@ -121,11 +128,13 @@
> %%DATADIR%%/5.2/xml/escp2/media/photo_pigment.xml
> %%DATADIR%%/5.2/xml/escp2/media/picturemate_4.xml
> %%DATADIR%%/5.2/xml/escp2/media/picturemate_6.xml
>+%%DATADIR%%/5.2/xml/escp2/media/pro3880_ultrachrome_k3v.xml
> %%DATADIR%%/5.2/xml/escp2/media/pro_gen1.xml
> %%DATADIR%%/5.2/xml/escp2/media/pro_gen2.xml
> %%DATADIR%%/5.2/xml/escp2/media/pro_pigment.xml
> %%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome.xml
> %%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
>+%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
> %%DATADIR%%/5.2/xml/escp2/media/r800.xml
> %%DATADIR%%/5.2/xml/escp2/media/standard.xml
> %%DATADIR%%/5.2/xml/escp2/media/standard_gen0.xml
>@@ -136,7 +145,23 @@
> %%DATADIR%%/5.2/xml/escp2/model/model_0.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_1.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_10.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_100.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_101.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_102.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_103.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_104.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_105.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_106.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_107.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_108.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_109.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_11.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_110.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_111.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_112.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_113.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_114.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_115.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_12.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_13.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_14.xml
>@@ -232,6 +257,7 @@
> %%DATADIR%%/5.2/xml/escp2/model/model_96.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_97.xml
> %%DATADIR%%/5.2/xml/escp2/model/model_98.xml
>+%%DATADIR%%/5.2/xml/escp2/model/model_99.xml
> %%DATADIR%%/5.2/xml/escp2/qualitypresets/p1_5.xml
> %%DATADIR%%/5.2/xml/escp2/qualitypresets/picturemate.xml
> %%DATADIR%%/5.2/xml/escp2/qualitypresets/standard.xml
>@@ -282,6 +308,7 @@
> share/locale/el/LC_MESSAGES/gutenprint.mo
> share/locale/en_GB/LC_MESSAGES/gutenprint.mo
> share/locale/es/LC_MESSAGES/gutenprint.mo
>+share/locale/fi/LC_MESSAGES/gutenprint.mo
> share/locale/fr/LC_MESSAGES/gutenprint.mo
> share/locale/hu/LC_MESSAGES/gutenprint.mo
> share/locale/it/LC_MESSAGES/gutenprint.mo
>@@ -292,6 +319,7 @@
> share/locale/pt/LC_MESSAGES/gutenprint.mo
> share/locale/ru/LC_MESSAGES/gutenprint.mo
> share/locale/sk/LC_MESSAGES/gutenprint.mo
>+share/locale/sl/LC_MESSAGES/gutenprint.mo
> share/locale/sv/LC_MESSAGES/gutenprint.mo
> share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
> @dirrm %%DATADIR%%/samples
>diff -Nru print/gutenprint-cups.orig/Makefile print/gutenprint-cups/Makefile
>--- print/gutenprint-cups.orig/Makefile	2011-10-15 12:47:57.000000000 +0200
>+++ print/gutenprint-cups/Makefile	2011-10-15 13:09:40.000000000 +0200
>@@ -5,7 +5,6 @@
> # $FreeBSD: ports/print/gutenprint-cups/Makefile,v 1.13 2011/10/09 13:50:54 pav Exp $
> #    $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
> 
>-PORTREVISION=	2
> PORTEPOCH=	0
> PKGNAMESUFFIX=	-cups
> 
>@@ -17,6 +16,4 @@
> GUT_SLAVE=	cups
> PLIST=		${.CURDIR}/pkg-plist
> 
>-BROKEN=		does not compile
>-
> .include "${MASTERDIR}/Makefile"
>diff -Nru print/gutenprint-cups.orig/pkg-plist print/gutenprint-cups/pkg-plist
>--- print/gutenprint-cups.orig/pkg-plist	2009-12-27 12:17:10.000000000 +0100
>+++ print/gutenprint-cups/pkg-plist	2011-10-15 13:43:15.000000000 +0200
>@@ -1377,6 +1377,7 @@
> share/locale/el/gutenprint_el.po
> share/locale/en_GB/gutenprint_en_GB.po
> share/locale/es/gutenprint_es.po
>+share/locale/fi/gutenprint_fi.po
> share/locale/fr/gutenprint_fr.po
> share/locale/hu/gutenprint_hu.po
> share/locale/it/gutenprint_it.po
>@@ -1387,6 +1388,7 @@
> share/locale/pt/gutenprint_pt.po
> share/locale/ru/gutenprint_ru.po
> share/locale/sk/gutenprint_sk.po
>+share/locale/sl/gutenprint_sl.po
> share/locale/sv/gutenprint_sv.po
> share/locale/zh_TW/gutenprint_zh_TW.po
> @dirrm share/cups/model/gutenprint/5.2/Global
>diff -Nru print/gutenprint-foomatic.orig/Makefile print/gutenprint-foomatic/Makefile
>--- print/gutenprint-foomatic.orig/Makefile	2010-07-26 16:40:43.000000000 +0200
>+++ print/gutenprint-foomatic/Makefile	2011-10-15 13:10:54.000000000 +0200
>@@ -5,7 +5,6 @@
> # $FreeBSD: ports/print/gutenprint-foomatic/Makefile,v 1.9 2010/07/26 00:03:11 linimon Exp $
> #    $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
> 
>-PORTREVISION=	2
> PORTEPOCH=	0
> PKGNAMESUFFIX=	-foomatic
> 
>diff -Nru print/gutenprint-ijs.orig/Makefile print/gutenprint-ijs/Makefile
>--- print/gutenprint-ijs.orig/Makefile	2010-07-26 16:40:43.000000000 +0200
>+++ print/gutenprint-ijs/Makefile	2011-10-15 13:11:29.000000000 +0200
>@@ -5,7 +5,6 @@
> # $FreeBSD: ports/print/gutenprint-ijs/Makefile,v 1.9 2010/07/26 00:03:12 linimon Exp $
> #    $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
> 
>-PORTREVISION=	2
> PORTEPOCH=	0
> PKGNAMESUFFIX=	-ijs

Actions: View | Diff

Attachments on bug 161680: 119217