Attachment 141878 Details for Bug 188785 – libwmf.diff

[patch] libwmf.diff

libwmf.diff (text/plain; charset=US-ASCII), 1.08 KB, created by Antoine Brodin on 2014-04-23 20:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2014-04-23 20:44:00 UTC

Size: 1.08 KB

patch

obsolete

>Index: graphics/libwmf/Makefile
>===================================================================
>--- graphics/libwmf/Makefile	(revision 351966)
>+++ graphics/libwmf/Makefile	(working copy)
>@@ -17,6 +17,8 @@
> 		libpng.so:${PORTSDIR}/graphics/png \
> 		libfreetype.so:${PORTSDIR}/print/freetype2
> 
>+CONFLICTS?=	libwmf-nox11-[0-9]*
>+
> USE_AUTOTOOLS=	libtool
> USE_GNOME=	libxml2
> GNU_CONFIGURE=	yes
>@@ -33,15 +35,9 @@
> 
> X11_USE=	XORG=x11
> X11_CONFIGURE_OFF=--with-x=no
>+
> .include <bsd.port.options.mk>
> 
>-.if ! ${PORT_OPTIONS:MX11}
>-PKGNAMESUFFIX=	-nox11
>-CONFLICTS+=	libwmf-[0-9]*
>-.else
>-CONFLICTS+=	libwmf-nox11-[0-9]*
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
> 		${WRKSRC}/Makefile.in
>Index: graphics/libwmf-nox11/Makefile
>===================================================================
>--- graphics/libwmf-nox11/Makefile	(revision 351966)
>+++ graphics/libwmf-nox11/Makefile	(working copy)
>@@ -7,4 +7,7 @@
> OPTIONS_EXCLUDE=	X11
> OPTIONS_FILE_UNSET=	X11
> 
>+PKGNAMESUFFIX=	-nox11
>+CONFLICTS=	libwmf-[0-9]*
>+
> .include        "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 188785: 141876 | 141877 | 141878