From dd1335caf2ca2097ec056713349f5c46de8fcee6 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 18 Jan 2006 22:04:58 +0000 Subject: Changes 0.2.8.4: * 3 patches from Caolan at RedHat: remove unnecessary extra linked libs; remove some warnings; rh154813 which (same redhat issuzilla bug id) I theorize fixes some upsidedown wmfs. --- graphics/libwmf/Makefile | 16 +++++++--------- graphics/libwmf/PLIST | 4 ++-- graphics/libwmf/buildlink3.mk | 4 ++-- graphics/libwmf/distinfo | 10 +++++----- graphics/libwmf/patches/patch-ad | 8 ++++---- 5 files changed, 20 insertions(+), 22 deletions(-) (limited to 'graphics/libwmf') diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index a6dca29f5c0..42e38910ccf 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.55 2005/06/01 18:02:57 jlam Exp $ -# +# $NetBSD: Makefile,v 1.56 2006/01/18 22:04:58 adam Exp $ -DISTNAME= libwmf-0.2.8.3 -PKGREVISION= 3 +DISTNAME= libwmf-0.2.8.4 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} @@ -12,20 +10,20 @@ COMMENT= Library for reading and converting WMF (Windows Meta Files) PKG_INSTALLATION_TYPES= overwrite pkgviews -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gd CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/libwmf post-install: ${RMDIR} ${PREFIX}/include/libwmf/gd -.include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -#.include "../../fonts/fontconfig/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" + .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libwmf/PLIST b/graphics/libwmf/PLIST index 3c58d2afef4..e2622ee64ac 100644 --- a/graphics/libwmf/PLIST +++ b/graphics/libwmf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/09/22 08:09:36 jlam Exp $ +@comment $NetBSD: PLIST,v 1.11 2006/01/18 22:04:58 adam Exp $ bin/libwmf-config bin/libwmf-fontmap bin/wmf2eps @@ -174,6 +174,7 @@ share/doc/html/libwmf/html/src_2ipa_2x_2font_8h.html share/doc/html/libwmf/html/src_2ipa_2xgd_2font_8h.html share/doc/html/libwmf/html/src_2player_2color_8h.html share/doc/html/libwmf/html/stream_8c.html +share/doc/html/libwmf/html/structWmfContext.html share/doc/html/libwmf/html/struct__wmfAPI.html share/doc/html/libwmf/html/struct__wmfAPI__Options.html share/doc/html/libwmf/html/struct__wmfAttributeStore.html @@ -237,7 +238,6 @@ share/doc/html/libwmf/html/struct__wmf__svg__t.html share/doc/html/libwmf/html/struct__wmf__svg__t_1_1__wmf__svg__image.html share/doc/html/libwmf/html/struct__wmf__template__t.html share/doc/html/libwmf/html/struct__wmf__x__t.html -share/doc/html/libwmf/html/structWmfContext.html share/doc/html/libwmf/html/svg_2bmp_8h.html share/doc/html/libwmf/html/svg_2device_8h.html share/doc/html/libwmf/html/svg_2draw_8h.html diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk index 1ddb88ee8f2..37adf5817c9 100644 --- a/graphics/libwmf/buildlink3.mk +++ b/graphics/libwmf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2005/02/05 01:19:38 jklos Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/01/18 22:04:58 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+ @@ -22,4 +22,4 @@ BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo index 9fa0b667a36..4cec03d233f 100644 --- a/graphics/libwmf/distinfo +++ b/graphics/libwmf/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2005/02/24 08:45:09 agc Exp $ +$NetBSD: distinfo,v 1.13 2006/01/18 22:04:58 adam Exp $ -SHA1 (libwmf-0.2.8.3.tar.gz) = 7408b83ba9f8aebada94b7ffdb0a8baab3b19c96 -RMD160 (libwmf-0.2.8.3.tar.gz) = 7d53ade95ff9123dfb12b00033eb1451cabcdee5 -Size (libwmf-0.2.8.3.tar.gz) = 1750358 bytes -SHA1 (patch-ad) = fb3308e3ab12272af841f6b4a564894248085d9b +SHA1 (libwmf-0.2.8.4.tar.gz) = 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 +RMD160 (libwmf-0.2.8.4.tar.gz) = 98cd631adb5bb332d9224d04bc8a265c105435f2 +Size (libwmf-0.2.8.4.tar.gz) = 2169375 bytes +SHA1 (patch-ad) = b74be16c5da490394b86403009f5f35d80ba4bfa diff --git a/graphics/libwmf/patches/patch-ad b/graphics/libwmf/patches/patch-ad index eff70a83579..28b1348c016 100644 --- a/graphics/libwmf/patches/patch-ad +++ b/graphics/libwmf/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2003/01/21 12:13:54 wiz Exp $ +$NetBSD: patch-ad,v 1.5 2006/01/18 22:04:58 adam Exp $ ---- configure.orig Wed Dec 11 16:23:36 2002 +--- configure.orig 2005-07-27 23:47:12.000000000 +0200 +++ configure -@@ -9362,7 +9362,7 @@ else +@@ -21916,7 +21916,7 @@ else # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2003/01/21 12:13:54 wiz Exp $ # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in -@@ -12664,7 +12664,7 @@ echo "${ECHO_T}$GDK_PIXBUF_LIBS" >&6 +@@ -26007,7 +26007,7 @@ echo "${ECHO_T}$GDK_PIXBUF_LIBS" >&6 GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" -- cgit v1.2.3