Attachment #119217 for bug #161680

View | Details | Raw Unified | Return to bug 161680
Collapse All | Expand All

Lines 7-14 Link Here

(-)print/gutenprint/Makefile (-2 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= gutenprint	9	PORTNAME= gutenprint
10	PORTVERSION= 5.2.4	10	PORTVERSION= 5.2.7
11	PORTREVISION= 2
12	CATEGORIES= print	11	CATEGORIES= print
13	MASTER_SITES= # empty	12	MASTER_SITES= # empty
14	DISTFILES= # empty	13	DISTFILES= # empty

Lines 7-14 Link Here

(-)print/gutenprint-base/Makefile (-2 / +1 lines)
7	#	7	#
8		8
9	PORTNAME?= gutenprint	9	PORTNAME?= gutenprint
10	PORTVERSION= 5.2.4	10	PORTVERSION= 5.2.7
11	PORTREVISION?= 2
12	CATEGORIES= print	11	CATEGORIES= print
13	MASTER_SITES= SF/gimp-print/gutenprint-5.2/${PORTVERSION}	12	MASTER_SITES= SF/gimp-print/gutenprint-5.2/${PORTVERSION}
14	PKGNAMESUFFIX?= -base	13	PKGNAMESUFFIX?= -base

Lines 1-2 Link Here

(-)print/gutenprint-base/distinfo (-2 / +2 lines)
1	SHA256 (gutenprint-5.2.4.tar.bz2) = b610e86305efbb98696af20366696f06ea40a7b030b45f21a83a142892ab9626	1	SHA256 (gutenprint-5.2.7.tar.bz2) = 114c899227e3ebb0753c1db503e6a5c1afaa4b1f1235fdfe02fb6bbd533beed1
2	SIZE (gutenprint-5.2.4.tar.bz2) = 5119559	2	SIZE (gutenprint-5.2.7.tar.bz2) = 5498414

Line 0 Link Here

(-)print/gutenprint-base/files/patch-src_cups_commandtocanon.c (+10 lines)
	1	--- src/cups/commandtocanon.c.orig 2011-10-15 13:27:57.000000000 +0200
	2	+++ src/cups/commandtocanon.c 2011-10-15 13:28:22.000000000 +0200
	3	@@ -13,6 +13,7 @@
	4
	5	#include <cups/cups.h>
	6	#include <ctype.h>
	7	+#include <stdio.h>
	8	#include <stdlib.h>
	9
	10

Line 0 Link Here

(-)print/gutenprint-base/files/patch-src_cups_commandtoepson.c (+10 lines)
	1	--- src/cups/commandtoepson.c.orig 2011-10-15 13:20:46.000000000 +0200
	2	+++ src/cups/commandtoepson.c 2011-10-15 13:20:57.000000000 +0200
	3	@@ -30,6 +30,7 @@
	4
	5	#include <cups/cups.h>
	6	#include <ctype.h>
	7	+#include <stdio.h>
	8	#include <stdlib.h>
	9	#include <string.h>
	10




--- 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 =
 gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c
 gutenprint_LDADD = $(print_LDADD)
 gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)

Lines 5-11 Link Here

(-)print/gutenprint-cups/Makefile (-3 lines)
5	# $FreeBSD: ports/print/gutenprint-cups/Makefile,v 1.13 2011/10/09 13:50:54 pav Exp $	5	# $FreeBSD: ports/print/gutenprint-cups/Makefile,v 1.13 2011/10/09 13:50:54 pav Exp $
6	# $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $	6	# $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
7		7
8	PORTREVISION= 2
9	PORTEPOCH= 0	8	PORTEPOCH= 0
10	PKGNAMESUFFIX= -cups	9	PKGNAMESUFFIX= -cups
11		10
Lines 17-22 Link Here
17	GUT_SLAVE= cups	16	GUT_SLAVE= cups
18	PLIST= ${.CURDIR}/pkg-plist	17	PLIST= ${.CURDIR}/pkg-plist
19		18
20	BROKEN= does not compile
21
22	.include "${MASTERDIR}/Makefile"	19	.include "${MASTERDIR}/Makefile"

Lines 5-11 Link Here

(-)print/gutenprint-foomatic/Makefile (-1 lines)
5	# $FreeBSD: ports/print/gutenprint-foomatic/Makefile,v 1.9 2010/07/26 00:03:11 linimon Exp $	5	# $FreeBSD: ports/print/gutenprint-foomatic/Makefile,v 1.9 2010/07/26 00:03:11 linimon Exp $
6	# $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $	6	# $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
7		7
8	PORTREVISION= 2
9	PORTEPOCH= 0	8	PORTEPOCH= 0
10	PKGNAMESUFFIX= -foomatic	9	PKGNAMESUFFIX= -foomatic
11		10

Lines 5-11 Link Here

(-)print/gutenprint-ijs/Makefile (-1 lines)
5	# $FreeBSD: ports/print/gutenprint-ijs/Makefile,v 1.9 2010/07/26 00:03:12 linimon Exp $	5	# $FreeBSD: ports/print/gutenprint-ijs/Makefile,v 1.9 2010/07/26 00:03:12 linimon Exp $
6	# $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $	6	# $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
7		7
8	PORTREVISION= 2
9	PORTEPOCH= 0	8	PORTEPOCH= 0
10	PKGNAMESUFFIX= -ijs	9	PKGNAMESUFFIX= -ijs

Return to bug 161680

Lines 1-13 Link Here

(-)print/gutenprint-base/files/patch-src_gimp2_Makefile.in (-4 / +4 lines)
1	--- src/gimp2/Makefile.in.orig 2008-02-29 09:47:54.000000000 -0500	1	--- src/gimp2/Makefile.in.orig 2011-10-15 12:53:29.000000000 +0200
2	+++ src/gimp2/Makefile.in 2008-02-29 09:48:44.000000000 -0500	2	+++ src/gimp2/Makefile.in 2011-10-15 12:54:02.000000000 +0200
3	@@ -291,8 +291,8 @@	3	@@ -306,8 +306,8 @@
4	print_gimp.h	4	print_gimp.h
5		5
6	print_SOURCES = $(COMMON_PRINT_SOURCES) print-print.c	6	print_SOURCES = $(COMMON_PRINT_SOURCES) print-print.c
7	-print_LDADD = $(GIMP2_LIBS) $(GUTENPRINTUI2_LIBS)	7	-print_LDADD = $(GIMP2_LIBS) $(GUTENPRINTUI2_LIBS)
8	-print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS)	8	-print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS)
9	+print_LDADD = $(GIMP2_LIBS) %%GUTENPRINTUI2_LIBS%%	9	+print_LDADD = $(GIMP2_LIBS) %%GUTENPRINTUI2_LIBS%%
10	+print_DEPENDENCIES =	10	+print_DEPENDENCIES =
11	gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c	11	gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c
12	gutenprint_LDADD = $(print_LDADD)	12	gutenprint_LDADD = $(print_LDADD)
13	gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)	13	gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)

Lines 58-63 Link Here

(-)print/gutenprint-base/pkg-plist (+28 lines)
58	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome.xml	58	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome.xml
59	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml	59	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml
60	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml	60	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml
		61	%%DATADIR%%/5.2/xml/escp2/inks/f360_ultrachrome_k3v2.xml
61	%%DATADIR%%/5.2/xml/escp2/inks/nx100.xml	62	%%DATADIR%%/5.2/xml/escp2/inks/nx100.xml
62	%%DATADIR%%/5.2/xml/escp2/inks/photo_gen0.xml	63	%%DATADIR%%/5.2/xml/escp2/inks/photo_gen0.xml
63	%%DATADIR%%/5.2/xml/escp2/inks/photo_gen1.xml	64	%%DATADIR%%/5.2/xml/escp2/inks/photo_gen1.xml
Lines 73-78 Link Here
73	%%DATADIR%%/5.2/xml/escp2/inks/pro_pigment.xml	74	%%DATADIR%%/5.2/xml/escp2/inks/pro_pigment.xml
74	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome.xml	75	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome.xml
75	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml	76	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
		77	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml
		78	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
		79	%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
76	%%DATADIR%%/5.2/xml/escp2/inks/standard.xml	80	%%DATADIR%%/5.2/xml/escp2/inks/standard.xml
77	%%DATADIR%%/5.2/xml/escp2/inks/standard_gen0.xml	81	%%DATADIR%%/5.2/xml/escp2/inks/standard_gen0.xml
78	%%DATADIR%%/5.2/xml/escp2/inks/ultrachrome.xml	82	%%DATADIR%%/5.2/xml/escp2/inks/ultrachrome.xml
Lines 81-90 Link Here
81	%%DATADIR%%/5.2/xml/escp2/inks/x80.xml	85	%%DATADIR%%/5.2/xml/escp2/inks/x80.xml
82	%%DATADIR%%/5.2/xml/escp2/inputslots/artisan.xml	86	%%DATADIR%%/5.2/xml/escp2/inputslots/artisan.xml
83	%%DATADIR%%/5.2/xml/escp2/inputslots/b500.xml	87	%%DATADIR%%/5.2/xml/escp2/inputslots/b500.xml
		88	%%DATADIR%%/5.2/xml/escp2/inputslots/cd.xml
84	%%DATADIR%%/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml	89	%%DATADIR%%/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
85	%%DATADIR%%/5.2/xml/escp2/inputslots/cd_roll_feed.xml	90	%%DATADIR%%/5.2/xml/escp2/inputslots/cd_roll_feed.xml
86	%%DATADIR%%/5.2/xml/escp2/inputslots/cutter_roll_feed.xml	91	%%DATADIR%%/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
87	%%DATADIR%%/5.2/xml/escp2/inputslots/default.xml	92	%%DATADIR%%/5.2/xml/escp2/inputslots/default.xml
		93	%%DATADIR%%/5.2/xml/escp2/inputslots/pro3880.xml
		94	%%DATADIR%%/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
88	%%DATADIR%%/5.2/xml/escp2/inputslots/pro_roll_feed.xml	95	%%DATADIR%%/5.2/xml/escp2/inputslots/pro_roll_feed.xml
89	%%DATADIR%%/5.2/xml/escp2/inputslots/r1800.xml	96	%%DATADIR%%/5.2/xml/escp2/inputslots/r1800.xml
90	%%DATADIR%%/5.2/xml/escp2/inputslots/r2400.xml	97	%%DATADIR%%/5.2/xml/escp2/inputslots/r2400.xml
Lines 121-131 Link Here
121	%%DATADIR%%/5.2/xml/escp2/media/photo_pigment.xml	128	%%DATADIR%%/5.2/xml/escp2/media/photo_pigment.xml
122	%%DATADIR%%/5.2/xml/escp2/media/picturemate_4.xml	129	%%DATADIR%%/5.2/xml/escp2/media/picturemate_4.xml
123	%%DATADIR%%/5.2/xml/escp2/media/picturemate_6.xml	130	%%DATADIR%%/5.2/xml/escp2/media/picturemate_6.xml
		131	%%DATADIR%%/5.2/xml/escp2/media/pro3880_ultrachrome_k3v.xml
124	%%DATADIR%%/5.2/xml/escp2/media/pro_gen1.xml	132	%%DATADIR%%/5.2/xml/escp2/media/pro_gen1.xml
125	%%DATADIR%%/5.2/xml/escp2/media/pro_gen2.xml	133	%%DATADIR%%/5.2/xml/escp2/media/pro_gen2.xml
126	%%DATADIR%%/5.2/xml/escp2/media/pro_pigment.xml	134	%%DATADIR%%/5.2/xml/escp2/media/pro_pigment.xml
127	%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome.xml	135	%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome.xml
128	%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3.xml	136	%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
		137	%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
129	%%DATADIR%%/5.2/xml/escp2/media/r800.xml	138	%%DATADIR%%/5.2/xml/escp2/media/r800.xml
130	%%DATADIR%%/5.2/xml/escp2/media/standard.xml	139	%%DATADIR%%/5.2/xml/escp2/media/standard.xml
131	%%DATADIR%%/5.2/xml/escp2/media/standard_gen0.xml	140	%%DATADIR%%/5.2/xml/escp2/media/standard_gen0.xml
Lines 136-142 Link Here
136	%%DATADIR%%/5.2/xml/escp2/model/model_0.xml	145	%%DATADIR%%/5.2/xml/escp2/model/model_0.xml
137	%%DATADIR%%/5.2/xml/escp2/model/model_1.xml	146	%%DATADIR%%/5.2/xml/escp2/model/model_1.xml
138	%%DATADIR%%/5.2/xml/escp2/model/model_10.xml	147	%%DATADIR%%/5.2/xml/escp2/model/model_10.xml
		148	%%DATADIR%%/5.2/xml/escp2/model/model_100.xml
		149	%%DATADIR%%/5.2/xml/escp2/model/model_101.xml
		150	%%DATADIR%%/5.2/xml/escp2/model/model_102.xml
		151	%%DATADIR%%/5.2/xml/escp2/model/model_103.xml
		152	%%DATADIR%%/5.2/xml/escp2/model/model_104.xml
		153	%%DATADIR%%/5.2/xml/escp2/model/model_105.xml
		154	%%DATADIR%%/5.2/xml/escp2/model/model_106.xml
		155	%%DATADIR%%/5.2/xml/escp2/model/model_107.xml
		156	%%DATADIR%%/5.2/xml/escp2/model/model_108.xml
		157	%%DATADIR%%/5.2/xml/escp2/model/model_109.xml
139	%%DATADIR%%/5.2/xml/escp2/model/model_11.xml	158	%%DATADIR%%/5.2/xml/escp2/model/model_11.xml
		159	%%DATADIR%%/5.2/xml/escp2/model/model_110.xml
		160	%%DATADIR%%/5.2/xml/escp2/model/model_111.xml
		161	%%DATADIR%%/5.2/xml/escp2/model/model_112.xml
		162	%%DATADIR%%/5.2/xml/escp2/model/model_113.xml
		163	%%DATADIR%%/5.2/xml/escp2/model/model_114.xml
		164	%%DATADIR%%/5.2/xml/escp2/model/model_115.xml
140	%%DATADIR%%/5.2/xml/escp2/model/model_12.xml	165	%%DATADIR%%/5.2/xml/escp2/model/model_12.xml
141	%%DATADIR%%/5.2/xml/escp2/model/model_13.xml	166	%%DATADIR%%/5.2/xml/escp2/model/model_13.xml
142	%%DATADIR%%/5.2/xml/escp2/model/model_14.xml	167	%%DATADIR%%/5.2/xml/escp2/model/model_14.xml
Lines 232-237 Link Here
232	%%DATADIR%%/5.2/xml/escp2/model/model_96.xml	257	%%DATADIR%%/5.2/xml/escp2/model/model_96.xml
233	%%DATADIR%%/5.2/xml/escp2/model/model_97.xml	258	%%DATADIR%%/5.2/xml/escp2/model/model_97.xml
234	%%DATADIR%%/5.2/xml/escp2/model/model_98.xml	259	%%DATADIR%%/5.2/xml/escp2/model/model_98.xml
		260	%%DATADIR%%/5.2/xml/escp2/model/model_99.xml
235	%%DATADIR%%/5.2/xml/escp2/qualitypresets/p1_5.xml	261	%%DATADIR%%/5.2/xml/escp2/qualitypresets/p1_5.xml
236	%%DATADIR%%/5.2/xml/escp2/qualitypresets/picturemate.xml	262	%%DATADIR%%/5.2/xml/escp2/qualitypresets/picturemate.xml
237	%%DATADIR%%/5.2/xml/escp2/qualitypresets/standard.xml	263	%%DATADIR%%/5.2/xml/escp2/qualitypresets/standard.xml
Lines 282-287 Link Here
282	share/locale/el/LC_MESSAGES/gutenprint.mo	308	share/locale/el/LC_MESSAGES/gutenprint.mo
283	share/locale/en_GB/LC_MESSAGES/gutenprint.mo	309	share/locale/en_GB/LC_MESSAGES/gutenprint.mo
284	share/locale/es/LC_MESSAGES/gutenprint.mo	310	share/locale/es/LC_MESSAGES/gutenprint.mo
		311	share/locale/fi/LC_MESSAGES/gutenprint.mo
285	share/locale/fr/LC_MESSAGES/gutenprint.mo	312	share/locale/fr/LC_MESSAGES/gutenprint.mo
286	share/locale/hu/LC_MESSAGES/gutenprint.mo	313	share/locale/hu/LC_MESSAGES/gutenprint.mo
287	share/locale/it/LC_MESSAGES/gutenprint.mo	314	share/locale/it/LC_MESSAGES/gutenprint.mo
Lines 292-297 Link Here
292	share/locale/pt/LC_MESSAGES/gutenprint.mo	319	share/locale/pt/LC_MESSAGES/gutenprint.mo
293	share/locale/ru/LC_MESSAGES/gutenprint.mo	320	share/locale/ru/LC_MESSAGES/gutenprint.mo
294	share/locale/sk/LC_MESSAGES/gutenprint.mo	321	share/locale/sk/LC_MESSAGES/gutenprint.mo
		322	share/locale/sl/LC_MESSAGES/gutenprint.mo
295	share/locale/sv/LC_MESSAGES/gutenprint.mo	323	share/locale/sv/LC_MESSAGES/gutenprint.mo
296	share/locale/zh_TW/LC_MESSAGES/gutenprint.mo	324	share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
297	@dirrm %%DATADIR%%/samples	325	@dirrm %%DATADIR%%/samples

Lines 1377-1382 Link Here

(-)print/gutenprint-cups/pkg-plist (+2 lines)
1377	share/locale/el/gutenprint_el.po	1377	share/locale/el/gutenprint_el.po
1378	share/locale/en_GB/gutenprint_en_GB.po	1378	share/locale/en_GB/gutenprint_en_GB.po
1379	share/locale/es/gutenprint_es.po	1379	share/locale/es/gutenprint_es.po
		1380	share/locale/fi/gutenprint_fi.po
1380	share/locale/fr/gutenprint_fr.po	1381	share/locale/fr/gutenprint_fr.po
1381	share/locale/hu/gutenprint_hu.po	1382	share/locale/hu/gutenprint_hu.po
1382	share/locale/it/gutenprint_it.po	1383	share/locale/it/gutenprint_it.po
Lines 1387-1392 Link Here
1387	share/locale/pt/gutenprint_pt.po	1388	share/locale/pt/gutenprint_pt.po
1388	share/locale/ru/gutenprint_ru.po	1389	share/locale/ru/gutenprint_ru.po
1389	share/locale/sk/gutenprint_sk.po	1390	share/locale/sk/gutenprint_sk.po
		1391	share/locale/sl/gutenprint_sl.po
1390	share/locale/sv/gutenprint_sv.po	1392	share/locale/sv/gutenprint_sv.po
1391	share/locale/zh_TW/gutenprint_zh_TW.po	1393	share/locale/zh_TW/gutenprint_zh_TW.po
1392	@dirrm share/cups/model/gutenprint/5.2/Global	1394	@dirrm share/cups/model/gutenprint/5.2/Global