[pkgsrc/trunk]: pkgsrc/graphics/libwmf Package cleaned-up, shorter include di...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a8e9a5a5760
branches:  trunk
changeset: 461715:5a8e9a5a5760
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Sep 19 17:19:21 2003 +0000

description:
Package cleaned-up, shorter include dir, added support for JPEG

diffstat:

 graphics/libwmf/Makefile |  27 ++++++++++++---------------
 graphics/libwmf/PLIST    |  34 +++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diffs (97 lines):

diff -r 59b518d6bb2b -r 5a8e9a5a5760 graphics/libwmf/Makefile
--- a/graphics/libwmf/Makefile  Fri Sep 19 16:34:47 2003 +0000
+++ b/graphics/libwmf/Makefile  Fri Sep 19 17:19:21 2003 +0000
@@ -1,29 +1,26 @@
-# $NetBSD: Makefile,v 1.40 2003/09/09 16:23:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2003/09/19 17:19:21 adam Exp $
 #
 
-DISTNAME=              libwmf-0.2.8
-PKGREVISION=           2
-CATEGORIES=            graphics devel
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=wvware/}
+DISTNAME=      libwmf-0.2.8
+PKGREVISION=   3
+CATEGORIES=    graphics devel
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=wvware/}
 
-MAINTAINER=            kei%NetBSD.org@localhost
-HOMEPAGE=              http://www.wvware.com/libwmf.html
-COMMENT=               Library for reading and converting WMF (Windows Meta Files), version 2
+MAINTAINER=    kei%NetBSD.org@localhost
+HOMEPAGE=      http://wvware.sourceforge.net/libwmf.html
+COMMENT=       Library for reading and converting WMF (Windows Meta Files)
 
 USE_BUILDLINK2=                YES
 GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --disable-gd
-CONFIGURE_ARGS+=       --includedir=${INCLUDEDIR}
-CONFIGURE_ARGS+=       --with-docdir=${HTMLDIR}
-CONFIGURE_ARGS+=       --without-sys-gd
 USE_X11=               YES
 USE_LIBTOOL=           YES
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
+CONFIGURE_ARGS+=       --disable-gd
+CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/html/libwmf
 
-INCLUDEDIR=            ${PREFIX}/include/libwmf
-HTMLDIR=               ${PREFIX}/share/doc/html/libwmf
-
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff -r 59b518d6bb2b -r 5a8e9a5a5760 graphics/libwmf/PLIST
--- a/graphics/libwmf/PLIST     Fri Sep 19 16:34:47 2003 +0000
+++ b/graphics/libwmf/PLIST     Fri Sep 19 17:19:21 2003 +0000
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST,v 1.6 2003/09/16 12:03:41 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/09/19 17:19:24 adam Exp $
 bin/libwmf-config
 bin/libwmf-fontmap
 bin/wmf2eps
 bin/wmf2fig
 bin/wmf2svg
 bin/wmf2x
-include/libwmf/libwmf/api.h
-include/libwmf/libwmf/canvas.h
-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
-include/libwmf/libwmf/ipa.h
-include/libwmf/libwmf/macro.h
-include/libwmf/libwmf/svg.h
-include/libwmf/libwmf/types.h
-include/libwmf/libwmf/x.h
+include/libwmf/api.h
+include/libwmf/canvas.h
+include/libwmf/color.h
+include/libwmf/defs.h
+include/libwmf/eps.h
+include/libwmf/fig.h
+include/libwmf/font.h
+include/libwmf/foreign.h
+include/libwmf/fund.h
+include/libwmf/gd.h
+include/libwmf/ipa.h
+include/libwmf/macro.h
+include/libwmf/svg.h
+include/libwmf/types.h
+include/libwmf/x.h
 lib/libwmf-0.2.so
 lib/libwmf-0.2.so.8
 lib/libwmf-0.2.so.8.0
@@ -306,5 +306,5 @@
 @dirrm share/doc/html/libwmf/caolan/pics
 @dirrm share/doc/html/libwmf/caolan
 @dirrm share/doc/html/libwmf
-@dirrm include/libwmf/libwmf
+@dirrm include/libwmf/gd
 @dirrm include/libwmf