diff options
| author | avl <avl@FreeBSD.org> | 2009-07-20 23:53:34 +0800 |
|---|---|---|
| committer | avl <avl@FreeBSD.org> | 2009-07-20 23:53:34 +0800 |
| commit | 5868e4dd91d70254888499813d7bb33a5e84eb9c (patch) | |
| tree | 1fbfc698d2f351cc3bc386165271ba3f27176238 /graphics | |
| parent | 85b6bd87af21449a0bdf4b5a492bb05e5d5ccf57 (diff) | |
| download | freebsd-ports-gnome-5868e4dd91d70254888499813d7bb33a5e84eb9c.tar.gz freebsd-ports-gnome-5868e4dd91d70254888499813d7bb33a5e84eb9c.tar.zst freebsd-ports-gnome-5868e4dd91d70254888499813d7bb33a5e84eb9c.zip | |
- Fix build on i386 with libemf installed
- Disable wmf filter build for !i386
PR: ports/136815
Submitted by: O. Hartmann <ohartman AT zedat.fu-berlin.de>
Reviewed by: marcus, mezz (GNOME team)
Approved by: tabthorpe (mentor)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/dia/Makefile | 14 | ||||
| -rw-r--r-- | graphics/dia/pkg-plist | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 1b70b1c18a94..13ba818d1d11 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -8,7 +8,7 @@ PORTNAME= dia DISTVERSION= 0.97 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME @@ -46,6 +46,13 @@ PLIST_SUB+= PYTHON="@comment " .include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +LIB_DEPENDS+= EMF.1:${PORTSDIR}/graphics/libemf +PLIST_SUB+= WMF="" +.else +PLIST_SUB+= WMF="@comment " +.endif + .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui INSTALLS_OMF= yes @@ -72,10 +79,13 @@ post-patch: 's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \ s,\(^GTK_CFLAGS = \),\1 ${PTHREAD_CFLAGS} ,' .endif +.if ${ARCH} != "i386" + @${REINPLACE_CMD} -e 's|wmf||g' ${WRKSRC}/plug-ins/Makefile.in +.endif pre-configure: @${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \ - s|echo aout|echo elf|g' \ + s|echo aout|echo elf|g ; s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g' \ ${WRKSRC}/configure post-install: diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist index 698422d7d83e..22a3fff2b4d7 100644 --- a/graphics/dia/pkg-plist +++ b/graphics/dia/pkg-plist @@ -65,6 +65,8 @@ lib/dia/libvdx_filter.la lib/dia/libvdx_filter.so lib/dia/libwpg_filter.la lib/dia/libwpg_filter.so +%%WMF%%lib/dia/libwmf_filter.la +%%WMF%%lib/dia/libwmf_filter.so lib/dia/libxfig_filter.la lib/dia/libxfig_filter.so lib/dia/libxslt_filter.la |