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

Collapse All | Expand All

(-)Makefile (-9 / +21 lines)
Lines 15-24 Link Here
15
15
16
CONFLICTS=	gimp-print-[0-9]*
16
CONFLICTS=	gimp-print-[0-9]*
17
17
18
.if !defined(GUT_SLAVE)
19
OPTIONS_DEFINE=	GTK2
20
OPTIONS_DEFAULT=GTK2
21
OPTIONS_SUB=	yes
22
.endif
23
24
GTK2_CONFIGURE_ENABLE=	libgutenprintui2
25
GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
26
27
.include <bsd.port.options.mk>
28
18
USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
29
USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
19
USE_GNOME=	gtk20
20
GNU_CONFIGURE=	yes
30
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
31
CONFIGURE_ARGS+=--without-gimp --without-gimp2
22
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
23
33
24
CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
34
CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
Lines 27-47 Link Here
27
.include <bsd.port.pre.mk>
37
.include <bsd.port.pre.mk>
28
38
29
.if ${SLAVE_PORT}=="yes"
39
.if ${SLAVE_PORT}=="yes"
30
LIB_DEPENDS+=	libgutenprintui2.so:${PORTSDIR}/print/gutenprint-base
40
LIB_DEPENDS+=	libgutenprint.so:${PORTSDIR}/print/gutenprint-base
31
PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
41
PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
32
GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
42
GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprint`
33
.else
43
.else
34
MAN1+=		escputil.1
44
MAN1+=		escputil.1
35
.endif
45
.endif
36
46
37
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
47
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
38
LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
48
LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
39
		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
49
CONFIGURE_ARGS+=--with-gimp2=yes # Override CONFIGURE_ARGS
40
CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
41
BUILD_WRKSRC=	${WRKSRC}/src/gimp2
50
BUILD_WRKSRC=	${WRKSRC}/src/gimp2
42
INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
51
INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
43
.else
44
CONFIGURE_ARGS+=--without-gimp2
45
.endif
52
.endif
46
53
47
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
54
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
Lines 97-102 Link Here
97
	@${REINPLACE_CMD} -e 's|= $$(pkglibdir)|= ${PREFIX}/libexec/cups|' \
104
	@${REINPLACE_CMD} -e 's|= $$(pkglibdir)|= ${PREFIX}/libexec/cups|' \
98
		${WRKSRC}/src/cups/Makefile.in
105
		${WRKSRC}/src/cups/Makefile.in
99
106
107
pre-configure:
108
.if defined(GUT_SLAVE) && (${GUT_SLAVE}=="gimp")
109
	@test -f ${LOCALBASE}/lib/libgutenprintui2.so || (printf "\nprint/gutenprint-base must be rebuilt with GTK2 support\n\n" && exit 1)
110
.endif
111
100
pre-build:
112
pre-build:
101
.if defined(GUT_SLAVE) && (${GUT_SLAVE}=="foomatic" || ${GUT_SLAVE}=="cups")
113
.if defined(GUT_SLAVE) && (${GUT_SLAVE}=="foomatic" || ${GUT_SLAVE}=="cups")
102
	@(cd ${WRKSRC}/src/xml && ${MAKE})
114
	@(cd ${WRKSRC}/src/xml && ${MAKE})
(-)pkg-plist (-9 / +9 lines)
Lines 23-42 Link Here
23
include/gutenprint/vars.h
23
include/gutenprint/vars.h
24
include/gutenprint/weave.h
24
include/gutenprint/weave.h
25
include/gutenprint/xml.h
25
include/gutenprint/xml.h
26
include/gutenprintui2/curve.h
26
%%GTK2%%include/gutenprintui2/curve.h
27
include/gutenprintui2/gammacurve.h
27
%%GTK2%%include/gutenprintui2/gammacurve.h
28
include/gutenprintui2/gutenprintui.h
28
%%GTK2%%include/gutenprintui2/gutenprintui.h
29
include/gutenprintui2/typebuiltins.h
29
%%GTK2%%include/gutenprintui2/typebuiltins.h
30
lib/libgutenprint.so.2
30
lib/libgutenprint.so.2
31
lib/libgutenprint.so.2.3.0
31
lib/libgutenprint.so.2.3.0
32
lib/libgutenprintui2.so.1.0.0
32
%%GTK2%%lib/libgutenprintui2.so.1.0.0
33
lib/libgutenprint.a
33
lib/libgutenprint.a
34
lib/libgutenprint.so
34
lib/libgutenprint.so
35
lib/libgutenprintui2.a
35
%%GTK2%%lib/libgutenprintui2.a
36
lib/libgutenprintui2.so
36
%%GTK2%%lib/libgutenprintui2.so
37
lib/libgutenprintui2.so.1
37
%%GTK2%%lib/libgutenprintui2.so.1
38
libdata/pkgconfig/gutenprint.pc
38
libdata/pkgconfig/gutenprint.pc
39
libdata/pkgconfig/gutenprintui2.pc
39
%%GTK2%%libdata/pkgconfig/gutenprintui2.pc
40
man/man1/escputil.1.gz
40
man/man1/escputil.1.gz
41
%%DATADIR%%/5.2/xml/dither-matrix-1x1.xml
41
%%DATADIR%%/5.2/xml/dither-matrix-1x1.xml
42
%%DATADIR%%/5.2/xml/dither-matrix-2x1.xml
42
%%DATADIR%%/5.2/xml/dither-matrix-2x1.xml

Return to bug 196321