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

Collapse All | Expand All

(-)Makefile (-5 / +11 lines)
Lines 15-24 Link Here
15
15
16
CONFLICTS=	gimp-print-[0-9]*
16
CONFLICTS=	gimp-print-[0-9]*
17
17
18
OPTIONS_DEFINE=	GTK2
19
OPTIONS_DEFAULT=
20
OPTIONS_SUB=	yes
21
22
GTK2_CONFIGURE_ENABLE=	libgutenprintui2
23
GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
24
18
USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
25
USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
19
USE_GNOME=	gtk20
20
GNU_CONFIGURE=	yes
26
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
27
CONFIGURE_ARGS+=--with-gimp=no --with-gimp2=no
22
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
23
29
24
CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
30
CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
Lines 27-35 Link Here
27
.include <bsd.port.pre.mk>
33
.include <bsd.port.pre.mk>
28
34
29
.if ${SLAVE_PORT}=="yes"
35
.if ${SLAVE_PORT}=="yes"
30
LIB_DEPENDS+=	libgutenprintui2.so:${PORTSDIR}/print/gutenprint-base
36
LIB_DEPENDS+=	libgutenprint.so:${PORTSDIR}/print/gutenprint-base
31
PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
37
PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
32
GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
38
GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprint`
33
.else
39
.else
34
MAN1+=		escputil.1
40
MAN1+=		escputil.1
35
.endif
41
.endif
Lines 37-43 Link Here
37
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
43
.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
38
LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
44
LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
39
		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
45
		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
40
CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
46
CONFIGURE_ARGS+=--with-gimp2=yes # Override CONFIGURE_ARGS
41
BUILD_WRKSRC=	${WRKSRC}/src/gimp2
47
BUILD_WRKSRC=	${WRKSRC}/src/gimp2
42
INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
48
INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
43
.else
49
.else
(-)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