From 90d0471c157d45ad665e9d5b1b229dbdbe399fe8 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 11 Sep 2002 11:19:56 +0000 Subject: Update to 0.2.6. Convert to buildlink2. Changes: Split libwmf in two, libwmflite (with the parser) and libwmf (utility functions, device layers, etc.). Should also better support ImageMagick. Other changes unknown. --- graphics/libwmf/Makefile | 19 ++++++++---------- graphics/libwmf/PLIST | 45 +++++++++++++++++++++++++++---------------- graphics/libwmf/buildlink.mk | 41 --------------------------------------- graphics/libwmf/buildlink2.mk | 6 ++++-- graphics/libwmf/distinfo | 6 +++--- 5 files changed, 43 insertions(+), 74 deletions(-) delete mode 100644 graphics/libwmf/buildlink.mk (limited to 'graphics/libwmf') diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index f5dc4177398..a25031eb5c2 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2002/09/10 16:06:42 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2002/09/11 11:19:56 wiz Exp $ # -DISTNAME= libwmf-0.2.2 -PKGREVISION= 2 +DISTNAME= libwmf-0.2.6 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} @@ -10,21 +9,19 @@ MAINTAINER= kei@netbsd.org HOMEPAGE= http://www.wvware.com/libwmf.html COMMENT= library for reading and converting WMF (Windows Meta Files), version 2 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-magick CONFIGURE_ARGS+= --includedir=${INCLUDEDIR} CONFIGURE_ARGS+= --with-docdir=${HTMLDIR} USE_X11= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool INCLUDEDIR= ${PREFIX}/include/libwmf HTMLDIR= ${PREFIX}/share/doc/html/libwmf -.include "../../graphics/freetype2/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../textproc/libxml2/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libwmf/PLIST b/graphics/libwmf/PLIST index 80dc047a35e..2b079bdc5d6 100644 --- a/graphics/libwmf/PLIST +++ b/graphics/libwmf/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2001/12/10 13:56:42 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/09/11 11:19:56 wiz Exp $ bin/libwmf-config bin/libwmf-fontmap bin/wmf2eps bin/wmf2fig bin/wmf2gd -bin/wmf2magick bin/wmf2svg bin/wmf2x include/libwmf/libwmf/api.h @@ -12,6 +11,7 @@ include/libwmf/libwmf/color.h include/libwmf/libwmf/defs.h include/libwmf/libwmf/eps.h include/libwmf/libwmf/fig.h +include/libwmf/libwmf/font.h include/libwmf/libwmf/foreign.h include/libwmf/libwmf/fund.h include/libwmf/libwmf/gd.h @@ -26,17 +26,21 @@ include/libwmf/libwmf/gd/gdfonts.h include/libwmf/libwmf/gd/gdfontt.h include/libwmf/libwmf/ipa.h include/libwmf/libwmf/macro.h -include/libwmf/libwmf/magick.h -include/libwmf/libwmf/plot.h include/libwmf/libwmf/svg.h include/libwmf/libwmf/types.h include/libwmf/libwmf/x.h lib/libwmf-0.2.so -lib/libwmf-0.2.so.2 -lib/libwmf-0.2.so.2.0 +lib/libwmf-0.2.so.6 +lib/libwmf-0.2.so.6.0 lib/libwmf.a lib/libwmf.la lib/libwmf.so +lib/libwmflite-0.2.so +lib/libwmflite-0.2.so.6 +lib/libwmflite-0.2.so.6.0 +lib/libwmflite.a +lib/libwmflite.la +lib/libwmflite.so share/doc/html/libwmf/caolan/2.html share/doc/html/libwmf/caolan/Arc.html share/doc/html/libwmf/caolan/BitBlt.html @@ -126,6 +130,7 @@ share/doc/html/libwmf/html/defaults_8h.html share/doc/html/libwmf/html/defs_8h.html share/doc/html/libwmf/html/doxygen.css share/doc/html/libwmf/html/doxygen.gif +share/doc/html/libwmf/html/doxygen.png share/doc/html/libwmf/html/eps_2bmp_8h.html share/doc/html/libwmf/html/eps_2device_8h.html share/doc/html/libwmf/html/eps_2draw_8h.html @@ -134,27 +139,22 @@ share/doc/html/libwmf/html/eps_8h.html share/doc/html/libwmf/html/fig_2bmp_8h.html share/doc/html/libwmf/html/fig_2device_8h.html share/doc/html/libwmf/html/fig_2draw_8h.html -share/doc/html/libwmf/html/fig_2font_8h.html share/doc/html/libwmf/html/fig_8c.html share/doc/html/libwmf/html/fig_8h.html share/doc/html/libwmf/html/files.html +share/doc/html/libwmf/html/font_8c.html share/doc/html/libwmf/html/foreign_8c.html share/doc/html/libwmf/html/foreign_8h.html share/doc/html/libwmf/html/functions.html share/doc/html/libwmf/html/fund_8h.html -share/doc/html/libwmf/html/gd_2bmp_8h.html -share/doc/html/libwmf/html/gd_2device_8h.html -share/doc/html/libwmf/html/gd_2draw_8h.html -share/doc/html/libwmf/html/gd_8c.html share/doc/html/libwmf/html/gd_8h.html share/doc/html/libwmf/html/globals.html share/doc/html/libwmf/html/include_2libwmf_2color_8h.html +share/doc/html/libwmf/html/include_2libwmf_2font_8h.html share/doc/html/libwmf/html/index.html share/doc/html/libwmf/html/ipa_2bmp_8h.html share/doc/html/libwmf/html/ipa_2eps_2region_8h.html share/doc/html/libwmf/html/ipa_2fig_2region_8h.html -share/doc/html/libwmf/html/ipa_2font_8h.html -share/doc/html/libwmf/html/ipa_2gd_2region_8h.html share/doc/html/libwmf/html/ipa_2magick_2region_8h.html share/doc/html/libwmf/html/ipa_2plot_2region_8h.html share/doc/html/libwmf/html/ipa_2svg_2region_8h.html @@ -178,14 +178,20 @@ share/doc/html/libwmf/html/plot_2draw_8h.html share/doc/html/libwmf/html/plot_8c.html share/doc/html/libwmf/html/plot_8h.html share/doc/html/libwmf/html/record_8h.html +share/doc/html/libwmf/html/src_2font_8h.html share/doc/html/libwmf/html/src_2ipa_2fig_2color_8h.html +share/doc/html/libwmf/html/src_2ipa_2fig_2font_8h.html share/doc/html/libwmf/html/src_2ipa_2ipa_2color_8h.html +share/doc/html/libwmf/html/src_2ipa_2ipa_2font_8h.html share/doc/html/libwmf/html/src_2ipa_2x_2color_8h.html +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/struct__gd__t.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 +share/doc/html/libwmf/html/struct__wmfAttributes.html share/doc/html/libwmf/html/struct__wmfBMP.html share/doc/html/libwmf/html/struct__wmfBMP__Draw__t.html share/doc/html/libwmf/html/struct__wmfBMP__Read__t.html @@ -205,23 +211,28 @@ share/doc/html/libwmf/html/struct__wmfFlood__t.html share/doc/html/libwmf/html/struct__wmfFont.html share/doc/html/libwmf/html/struct__wmfFontData.html share/doc/html/libwmf/html/struct__wmfFontMap.html +share/doc/html/libwmf/html/struct__wmfFontmapData.html share/doc/html/libwmf/html/struct__wmfFunctionReference.html share/doc/html/libwmf/html/struct__wmfGS__FontData.html share/doc/html/libwmf/html/struct__wmfGS__FontInfo.html share/doc/html/libwmf/html/struct__wmfHead.html +share/doc/html/libwmf/html/struct__wmfIPAFont.html share/doc/html/libwmf/html/struct__wmfImage.html share/doc/html/libwmf/html/struct__wmfMapping.html share/doc/html/libwmf/html/struct__wmfMetaHeader.html share/doc/html/libwmf/html/struct__wmfPen.html share/doc/html/libwmf/html/struct__wmfPlaceableMetaHeader.html share/doc/html/libwmf/html/struct__wmfPolyLine__t.html +share/doc/html/libwmf/html/struct__wmfPolyPoly__t.html share/doc/html/libwmf/html/struct__wmfPolyRectangle__t.html share/doc/html/libwmf/html/struct__wmfRGB.html share/doc/html/libwmf/html/struct__wmfROP__Draw__t.html share/doc/html/libwmf/html/struct__wmfStream.html share/doc/html/libwmf/html/struct__wmfUserData__t.html +share/doc/html/libwmf/html/struct__wmfWriteFileInfo.html share/doc/html/libwmf/html/struct__wmfXML__FontData.html share/doc/html/libwmf/html/struct__wmfXML__FontInfo.html +share/doc/html/libwmf/html/struct__wmfXML__InputData.html share/doc/html/libwmf/html/struct__wmf__eps__t.html share/doc/html/libwmf/html/struct__wmf__fig__t.html share/doc/html/libwmf/html/struct__wmf__fig__t_1_1__wmf__fig__image.html @@ -243,18 +254,18 @@ share/doc/html/libwmf/html/svg_8h.html share/doc/html/libwmf/html/template_8c.html share/doc/html/libwmf/html/template_8h.html share/doc/html/libwmf/html/types_8h.html +share/doc/html/libwmf/html/wmf_8c.html share/doc/html/libwmf/html/x_2bmp_8h.html share/doc/html/libwmf/html/x_2device_8h.html share/doc/html/libwmf/html/x_2draw_8h.html -share/doc/html/libwmf/html/x_2font_8h.html share/doc/html/libwmf/html/x_8c.html share/doc/html/libwmf/html/x_8h.html share/doc/html/libwmf/html/xgd_2bmp_8h.html share/doc/html/libwmf/html/xgd_2device_8h.html share/doc/html/libwmf/html/xgd_2draw_8h.html -share/doc/html/libwmf/html/xgd_2font_8h.html share/doc/html/libwmf/html/xgd_8c.html -share/doc/html/libwmf/html/xgd_8h.html +share/doc/html/libwmf/html/xml_8c.html +share/doc/html/libwmf/html/xml_8h.html share/doc/html/libwmf/index.html share/doc/html/libwmf/smlogo2.gif share/doc/html/libwmf/tutapi.html diff --git a/graphics/libwmf/buildlink.mk b/graphics/libwmf/buildlink.mk deleted file mode 100644 index 5254a1cba13..00000000000 --- a/graphics/libwmf/buildlink.mk +++ /dev/null @@ -1,41 +0,0 @@ -# $NetBSD: buildlink.mk,v 1.7 2002/09/10 16:06:42 wiz Exp $ -# -# This Makefile fragment is included by packages that use libwmf. -# -# To use this Makefile fragment, simply: -# -# (1) Optionally define BUILDLINK_DEPENDS.libwmf to the dependency pattern -# for the version of libwmf desired. -# (2) Include this Makefile fragment in the package Makefile, -# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header -# search path, and -# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search -# path. - -.if !defined(LIBWMF_BUILDLINK_MK) -LIBWMF_BUILDLINK_MK= # defined - -.include "../../mk/bsd.buildlink.mk" - -BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.2nb2 -BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.libwmf}:../../graphics/libwmf - -EVAL_PREFIX+= BUILDLINK_PREFIX.libwmf=libwmf -BUILDLINK_PREFIX.libwmf_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.libwmf= include/libwmf/libwmf/*.h -BUILDLINK_FILES.libwmf= include/libwmf/libwmf/gd/*.h -BUILDLINK_FILES.libwmf+= lib/libwmf-0.2.so* -BUILDLINK_FILES.libwmf+= lib/libwmf.* - -.include "../../graphics/freetype2/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../textproc/libxml2/buildlink.mk" - -BUILDLINK_TARGETS.libwmf= libwmf-buildlink -BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libwmf} - -pre-configure: ${BUILDLINK_TARGETS.libwmf} -libwmf-buildlink: _BUILDLINK_USE - -.endif # LIBWMF_BUILDLINK_MK diff --git a/graphics/libwmf/buildlink2.mk b/graphics/libwmf/buildlink2.mk index a0401a6faa9..40847f85ce0 100644 --- a/graphics/libwmf/buildlink2.mk +++ b/graphics/libwmf/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:42 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2002/09/11 11:19:56 wiz Exp $ .if !defined(LIBWMF_BUILDLINK2_MK) LIBWMF_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libwmf -BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.2nb2 +BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.6 BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf EVAL_PREFIX+= BUILDLINK_PREFIX.libwmf=libwmf @@ -13,6 +13,8 @@ BUILDLINK_FILES.libwmf= include/libwmf/libwmf/*.h BUILDLINK_FILES.libwmf+= include/libwmf/libwmf/gd/*.h BUILDLINK_FILES.libwmf+= lib/libwmf-0.2.so* BUILDLINK_FILES.libwmf+= lib/libwmf.* +BUILDLINK_FILES.libwmf+= lib/libwmflite-0.2.so* +BUILDLINK_FILES.libwmf+= lib/libwmflite.* .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo index 8e35b71ff87..15bd645cc60 100644 --- a/graphics/libwmf/distinfo +++ b/graphics/libwmf/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/12/10 13:56:42 taca Exp $ +$NetBSD: distinfo,v 1.6 2002/09/11 11:19:56 wiz Exp $ -SHA1 (libwmf-0.2.2.tar.gz) = 2fb3878a51fd6c60902caa56efc1746a85dabdd0 -Size (libwmf-0.2.2.tar.gz) = 1635344 bytes +SHA1 (libwmf-0.2.6.tar.gz) = 4a9957de35e479df626e91a95d2057f460df0de9 +Size (libwmf-0.2.6.tar.gz) = 1585645 bytes SHA1 (patch-ad) = 896663daf56535f112ac03e03cef59ac09c870e5 -- cgit v1.2.3