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

Collapse All | Expand All

(-)graphics/libwmf/Makefile (-7 / +3 lines)
Lines 17-22 Link Here
17
		libpng.so:${PORTSDIR}/graphics/png \
17
		libpng.so:${PORTSDIR}/graphics/png \
18
		libfreetype.so:${PORTSDIR}/print/freetype2
18
		libfreetype.so:${PORTSDIR}/print/freetype2
19
19
20
CONFLICTS?=	libwmf-nox11-[0-9]*
21
20
USE_AUTOTOOLS=	libtool
22
USE_AUTOTOOLS=	libtool
21
USE_GNOME=	libxml2
23
USE_GNOME=	libxml2
22
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
Lines 33-47 Link Here
33
35
34
X11_USE=	XORG=x11
36
X11_USE=	XORG=x11
35
X11_CONFIGURE_OFF=--with-x=no
37
X11_CONFIGURE_OFF=--with-x=no
38
36
.include <bsd.port.options.mk>
39
.include <bsd.port.options.mk>
37
40
38
.if ! ${PORT_OPTIONS:MX11}
39
PKGNAMESUFFIX=	-nox11
40
CONFLICTS+=	libwmf-[0-9]*
41
.else
42
CONFLICTS+=	libwmf-nox11-[0-9]*
43
.endif
44
45
post-patch:
41
post-patch:
46
	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
42
	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
47
		${WRKSRC}/Makefile.in
43
		${WRKSRC}/Makefile.in
(-)graphics/libwmf-nox11/Makefile (+3 lines)
Lines 7-10 Link Here
7
OPTIONS_EXCLUDE=	X11
7
OPTIONS_EXCLUDE=	X11
8
OPTIONS_FILE_UNSET=	X11
8
OPTIONS_FILE_UNSET=	X11
9
9
10
PKGNAMESUFFIX=	-nox11
11
CONFLICTS=	libwmf-[0-9]*
12
10
.include        "${MASTERDIR}/Makefile"
13
.include        "${MASTERDIR}/Makefile"

Return to bug 188785