View | Details | Raw Unified | Return to bug 191209 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-10 / +14 lines)
Lines 3-9 Link Here
3
#    $MCom: ports/print/gutenprint-base/Makefile,v 1.8 2007/03/30 16:45:02 ahze Exp $
3
#    $MCom: ports/print/gutenprint-base/Makefile,v 1.8 2007/03/30 16:45:02 ahze Exp $
4
4
5
PORTNAME?=	gutenprint
5
PORTNAME?=	gutenprint
6
PORTVERSION=	5.2.8
6
PORTVERSION=	5.2.10
7
CATEGORIES=	print
7
CATEGORIES=	print
8
MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
8
MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
9
PKGNAMESUFFIX?=	-base
9
PKGNAMESUFFIX?=	-base
Lines 25-31 Link Here
25
CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
25
CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
26
LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
26
LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
27
27
28
NO_STAGE=	yes
29
.include <bsd.port.pre.mk>
28
.include <bsd.port.pre.mk>
30
29
31
.if ${SLAVE_PORT}=="yes"
30
.if ${SLAVE_PORT}=="yes"
Lines 37-44 Link Here
37
.endif
36
.endif
38
37
39
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
38
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
40
LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp-app \
39
LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
41
		gutenprint.3:${PORTSDIR}/print/gutenprint-base
40
		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
42
CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
41
CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
43
BUILD_WRKSRC=	${WRKSRC}/src/gimp2
42
BUILD_WRKSRC=	${WRKSRC}/src/gimp2
44
INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
43
INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
Lines 47-54 Link Here
47
.endif
46
.endif
48
47
49
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
48
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
50
LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client \
49
LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client \
51
		cupsimage.2:${PORTSDIR}/print/cups-image
50
		libcupsimage.so:${PORTSDIR}/print/cups-image
52
RUN_DEPENDS+=	espgs:${PORTSDIR}/print/cups-pstoraster
51
RUN_DEPENDS+=	espgs:${PORTSDIR}/print/cups-pstoraster
53
CONFIGURE_ARGS+=	--with-cups=${PREFIX} \
52
CONFIGURE_ARGS+=	--with-cups=${PREFIX} \
54
			--enable-cups-ppds \
53
			--enable-cups-ppds \
Lines 61-69 Link Here
61
.endif
60
.endif
62
61
63
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs"
62
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs"
64
LIB_DEPENDS+=	ijs.1:${PORTSDIR}/print/libijs
63
LIB_DEPENDS+=	libijs.so:${PORTSDIR}/print/libijs
65
CONFIGURE_ARGS+=--with-ijs=yes
64
CONFIGURE_ARGS+=--with-ijs=yes
66
MAN1+=		ijsgutenprint.1
67
BUILD_WRKSRC=	${WRKSRC}/src/ghost
65
BUILD_WRKSRC=	${WRKSRC}/src/ghost
68
INSTALL_WRKSRC=	${WRKSRC}/src/ghost
66
INSTALL_WRKSRC=	${WRKSRC}/src/ghost
69
.else
67
.else
Lines 73-79 Link Here
73
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="foomatic"
71
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="foomatic"
74
BUILD_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine
72
BUILD_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine
75
RUN_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine \
73
RUN_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine \
76
		foomatic-db>0:${PORTSDIR}/print/foomatic-db
74
		${LOCALBASE}/share/cups/model/foomatic-db-ppds:${PORTSDIR}/print/foomatic-db
77
CONFIGURE_ARGS+=--with-foomatic=yes --with-foomatic3=yes
75
CONFIGURE_ARGS+=--with-foomatic=yes --with-foomatic3=yes
78
BUILD_WRKSRC=	${WRKSRC}/src/foomatic
76
BUILD_WRKSRC=	${WRKSRC}/src/foomatic
79
INSTALL_WRKSRC=	${WRKSRC}/src/foomatic
77
INSTALL_WRKSRC=	${WRKSRC}/src/foomatic
Lines 106-114 Link Here
106
	@(cd ${WRKSRC}/src/xml && ${MAKE})
104
	@(cd ${WRKSRC}/src/xml && ${MAKE})
107
.endif
105
.endif
108
106
107
pre-install:
108
	@${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/gutenprint/5.2/modules
109
109
post-install:
110
post-install:
110
.if ${SLAVE_PORT}=="yes"
111
.if ${SLAVE_PORT}=="yes"
111
	@(cd ${WRKSRC}/man && ${GMAKE} ${INSTALL_TARGET})
112
	@(cd ${WRKSRC}/man && ${GMAKE} ${INSTALL_TARGET} DESTDIR=${STAGEDIR})
112
.endif
113
.endif
114
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
115
	@${LN} -s ${STAGEGIR}${LOCALBASE}/sbin/cups-genppd.5.2 ${STAGEDIR}${LOCALBASE}/sbin/cups-genppd
116
.endif
113
117
114
.include <bsd.port.post.mk>
118
.include <bsd.port.post.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gutenprint-5.2.8.tar.bz2) = 8cb9d2b4dda2d33b221f21c8e1453aead5e37966a194c5a473735d12cdc1c8e0
1
SHA256 (gutenprint-5.2.10.tar.bz2) = 431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59
2
SIZE (gutenprint-5.2.8.tar.bz2) = 5691472
2
SIZE (gutenprint-5.2.10.tar.bz2) = 6241585
(-)files/patch-src_gimp2_Makefile.in (-5 / +5 lines)
Lines 1-11 Link Here
1
--- src/gimp2/Makefile.in.orig	2011-10-15 12:53:29.000000000 +0200
1
--- src/gimp2/Makefile.in.orig	2014-06-19 22:45:15.000000000 +0200
2
+++ src/gimp2/Makefile.in	2011-10-15 12:54:02.000000000 +0200
2
+++ src/gimp2/Makefile.in	2014-06-19 22:45:48.000000000 +0200
3
@@ -306,8 +306,8 @@
3
@@ -409,8 +409,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) $(GUTENPRINT_LIBS) $(GUTENPRINTUI2_LIBS)
8
-print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS)
8
-print_DEPENDENCIES = $(GUTENPRINT_LIBS) $(GUTENPRINTUI2_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
(-)pkg-plist (-9 / +22 lines)
Lines 30-36 Link Here
30
lib/libgutenprint.a
30
lib/libgutenprint.a
31
lib/libgutenprint.la
31
lib/libgutenprint.la
32
lib/libgutenprint.so
32
lib/libgutenprint.so
33
lib/libgutenprint.so.3
33
lib/libgutenprint.so.5
34
lib/libgutenprintui2.a
34
lib/libgutenprintui2.a
35
lib/libgutenprintui2.la
35
lib/libgutenprintui2.la
36
lib/libgutenprintui2.so
36
lib/libgutenprintui2.so
Lines 37-42 Link Here
37
lib/libgutenprintui2.so.1
37
lib/libgutenprintui2.so.1
38
libdata/pkgconfig/gutenprint.pc
38
libdata/pkgconfig/gutenprint.pc
39
libdata/pkgconfig/gutenprintui2.pc
39
libdata/pkgconfig/gutenprintui2.pc
40
man/man1/escputil.1.gz
40
%%DATADIR%%/5.2/xml/dither-matrix-1x1.xml
41
%%DATADIR%%/5.2/xml/dither-matrix-1x1.xml
41
%%DATADIR%%/5.2/xml/dither-matrix-2x1.xml
42
%%DATADIR%%/5.2/xml/dither-matrix-2x1.xml
42
%%DATADIR%%/5.2/xml/dither-matrix-4x1.xml
43
%%DATADIR%%/5.2/xml/dither-matrix-4x1.xml
Lines 76-84 Link Here
76
%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
77
%%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_k34.xml
78
%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
79
%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
80
%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v10.xml
79
%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
81
%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
80
%%DATADIR%%/5.2/xml/escp2/inks/standard.xml
82
%%DATADIR%%/5.2/xml/escp2/inks/standard.xml
81
%%DATADIR%%/5.2/xml/escp2/inks/standard_gen0.xml
83
%%DATADIR%%/5.2/xml/escp2/inks/standard_gen0.xml
84
%%DATADIR%%/5.2/xml/escp2/inks/sx445.xml
82
%%DATADIR%%/5.2/xml/escp2/inks/ultrachrome.xml
85
%%DATADIR%%/5.2/xml/escp2/inks/ultrachrome.xml
83
%%DATADIR%%/5.2/xml/escp2/inks/wf40.xml
86
%%DATADIR%%/5.2/xml/escp2/inks/wf40.xml
84
%%DATADIR%%/5.2/xml/escp2/inks/wf500.xml
87
%%DATADIR%%/5.2/xml/escp2/inks/wf500.xml
Lines 90-95 Link Here
90
%%DATADIR%%/5.2/xml/escp2/inputslots/cd_roll_feed.xml
93
%%DATADIR%%/5.2/xml/escp2/inputslots/cd_roll_feed.xml
91
%%DATADIR%%/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
94
%%DATADIR%%/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
92
%%DATADIR%%/5.2/xml/escp2/inputslots/default.xml
95
%%DATADIR%%/5.2/xml/escp2/inputslots/default.xml
96
%%DATADIR%%/5.2/xml/escp2/inputslots/default-duplex.xml
93
%%DATADIR%%/5.2/xml/escp2/inputslots/pro3880.xml
97
%%DATADIR%%/5.2/xml/escp2/inputslots/pro3880.xml
94
%%DATADIR%%/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
98
%%DATADIR%%/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
95
%%DATADIR%%/5.2/xml/escp2/inputslots/pro_roll_feed.xml
99
%%DATADIR%%/5.2/xml/escp2/inputslots/pro_roll_feed.xml
Lines 100-105 Link Here
100
%%DATADIR%%/5.2/xml/escp2/inputslots/rx700.xml
104
%%DATADIR%%/5.2/xml/escp2/inputslots/rx700.xml
101
%%DATADIR%%/5.2/xml/escp2/inputslots/spro5000.xml
105
%%DATADIR%%/5.2/xml/escp2/inputslots/spro5000.xml
102
%%DATADIR%%/5.2/xml/escp2/inputslots/standard_roll_feed.xml
106
%%DATADIR%%/5.2/xml/escp2/inputslots/standard_roll_feed.xml
107
%%DATADIR%%/5.2/xml/escp2/inputslots/wf7000.xml
103
%%DATADIR%%/5.2/xml/escp2/media/artisan.xml
108
%%DATADIR%%/5.2/xml/escp2/media/artisan.xml
104
%%DATADIR%%/5.2/xml/escp2/media/b500.xml
109
%%DATADIR%%/5.2/xml/escp2/media/b500.xml
105
%%DATADIR%%/5.2/xml/escp2/media/c120.xml
110
%%DATADIR%%/5.2/xml/escp2/media/c120.xml
Lines 135-140 Link Here
135
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome.xml
140
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome.xml
136
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
141
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
137
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
142
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
143
%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v10.xml
138
%%DATADIR%%/5.2/xml/escp2/media/r800.xml
144
%%DATADIR%%/5.2/xml/escp2/media/r800.xml
139
%%DATADIR%%/5.2/xml/escp2/media/standard.xml
145
%%DATADIR%%/5.2/xml/escp2/media/standard.xml
140
%%DATADIR%%/5.2/xml/escp2/media/standard_gen0.xml
146
%%DATADIR%%/5.2/xml/escp2/media/standard_gen0.xml
Lines 164-170 Link Here
164
%%DATADIR%%/5.2/xml/escp2/model/model_115.xml
170
%%DATADIR%%/5.2/xml/escp2/model/model_115.xml
165
%%DATADIR%%/5.2/xml/escp2/model/model_116.xml
171
%%DATADIR%%/5.2/xml/escp2/model/model_116.xml
166
%%DATADIR%%/5.2/xml/escp2/model/model_117.xml
172
%%DATADIR%%/5.2/xml/escp2/model/model_117.xml
173
%%DATADIR%%/5.2/xml/escp2/model/model_118.xml
174
%%DATADIR%%/5.2/xml/escp2/model/model_119.xml
167
%%DATADIR%%/5.2/xml/escp2/model/model_12.xml
175
%%DATADIR%%/5.2/xml/escp2/model/model_12.xml
176
%%DATADIR%%/5.2/xml/escp2/model/model_120.xml
177
%%DATADIR%%/5.2/xml/escp2/model/model_121.xml
168
%%DATADIR%%/5.2/xml/escp2/model/model_13.xml
178
%%DATADIR%%/5.2/xml/escp2/model/model_13.xml
169
%%DATADIR%%/5.2/xml/escp2/model/model_14.xml
179
%%DATADIR%%/5.2/xml/escp2/model/model_14.xml
170
%%DATADIR%%/5.2/xml/escp2/model/model_15.xml
180
%%DATADIR%%/5.2/xml/escp2/model/model_15.xml
Lines 282-290 Link Here
282
%%DATADIR%%/doc/gutenprint-users-manual.pdf
292
%%DATADIR%%/doc/gutenprint-users-manual.pdf
283
%%DATADIR%%/doc/gutenprint.pdf
293
%%DATADIR%%/doc/gutenprint.pdf
284
%%DATADIR%%/doc/reference-html/book1.html
294
%%DATADIR%%/doc/reference-html/book1.html
285
%%DATADIR%%/doc/reference-html/c1717.html
295
%%DATADIR%%/doc/reference-html/c1715.html
286
%%DATADIR%%/doc/reference-html/c194.html
296
%%DATADIR%%/doc/reference-html/c194.html
287
%%DATADIR%%/doc/reference-html/c1968.html
297
%%DATADIR%%/doc/reference-html/c1966.html
288
%%DATADIR%%/doc/reference-html/c200.html
298
%%DATADIR%%/doc/reference-html/c200.html
289
%%DATADIR%%/doc/reference-html/c39.html
299
%%DATADIR%%/doc/reference-html/c39.html
290
%%DATADIR%%/doc/reference-html/c464.html
300
%%DATADIR%%/doc/reference-html/c464.html
Lines 294-310 Link Here
294
%%DATADIR%%/doc/reference-html/gpl-terms.html
304
%%DATADIR%%/doc/reference-html/gpl-terms.html
295
%%DATADIR%%/doc/reference-html/gpl.html
305
%%DATADIR%%/doc/reference-html/gpl.html
296
%%DATADIR%%/doc/reference-html/ln10.html
306
%%DATADIR%%/doc/reference-html/ln10.html
297
%%DATADIR%%/doc/reference-html/x1669.html
307
%%DATADIR%%/doc/reference-html/x1667.html
298
%%DATADIR%%/doc/reference-html/x1734.html
308
%%DATADIR%%/doc/reference-html/x1732.html
299
%%DATADIR%%/doc/reference-html/x271.html
309
%%DATADIR%%/doc/reference-html/x271.html
300
%%DATADIR%%/doc/reference-html/x67.html
310
%%DATADIR%%/doc/reference-html/x67.html
301
%%DATADIR%%/doc/reference-html/x79.html
311
%%DATADIR%%/doc/reference-html/x79.html
302
%%DATADIR%%/doc/reference-html/x955.html
312
%%DATADIR%%/doc/reference-html/x953.html
303
%%DATADIR%%/samples/colorbars4.png
313
%%DATADIR%%/samples/colorbars4.png
304
%%DATADIR%%/samples/colorsweep.png
314
%%DATADIR%%/samples/colorsweep.png
305
%%DATADIR%%/samples/extended.sample
315
%%DATADIR%%/samples/extended.sample
306
%%DATADIR%%/samples/profile.jpg
316
%%DATADIR%%/samples/profile.jpg
307
%%DATADIR%%/samples/testpattern.sample
317
%%DATADIR%%/samples/testpattern.sample
318
share/locale/ca/LC_MESSAGES/gutenprint.mo
308
share/locale/cs/LC_MESSAGES/gutenprint.mo
319
share/locale/cs/LC_MESSAGES/gutenprint.mo
309
share/locale/da/LC_MESSAGES/gutenprint.mo
320
share/locale/da/LC_MESSAGES/gutenprint.mo
310
share/locale/de/LC_MESSAGES/gutenprint.mo
321
share/locale/de/LC_MESSAGES/gutenprint.mo
Lines 325-331 Link Here
325
share/locale/sk/LC_MESSAGES/gutenprint.mo
336
share/locale/sk/LC_MESSAGES/gutenprint.mo
326
share/locale/sl/LC_MESSAGES/gutenprint.mo
337
share/locale/sl/LC_MESSAGES/gutenprint.mo
327
share/locale/sv/LC_MESSAGES/gutenprint.mo
338
share/locale/sv/LC_MESSAGES/gutenprint.mo
339
share/locale/tr/LC_MESSAGES/gutenprint.mo
328
share/locale/uk/LC_MESSAGES/gutenprint.mo
340
share/locale/uk/LC_MESSAGES/gutenprint.mo
341
share/locale/vi/LC_MESSAGES/gutenprint.mo
329
share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
342
share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
330
share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
343
share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
331
@dirrm %%DATADIR%%/samples
344
@dirrm %%DATADIR%%/samples
Lines 342-349 Link Here
342
@dirrm %%DATADIR%%/5.2/xml
355
@dirrm %%DATADIR%%/5.2/xml
343
@dirrm %%DATADIR%%/5.2
356
@dirrm %%DATADIR%%/5.2
344
@dirrm %%DATADIR%%
357
@dirrm %%DATADIR%%
345
@dirrm lib/gutenprint/5.2/modules
358
@dirrmtry lib/gutenprint/5.2/modules
346
@dirrm lib/gutenprint/5.2
359
@dirrmtry lib/gutenprint/5.2
347
@dirrm lib/gutenprint
360
@dirrmtry lib/gutenprint
348
@dirrm include/gutenprintui2
361
@dirrm include/gutenprintui2
349
@dirrm include/gutenprint
362
@dirrm include/gutenprint

Return to bug 191209