summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorzuntum <zuntum@pkgsrc.org>2001-07-09 18:51:38 +0000
committerzuntum <zuntum@pkgsrc.org>2001-07-09 18:51:38 +0000
commit480c07a4a6a6bed5cf8a91621bc9166673d4285f (patch)
treef57230385a73934508b9751aa34852006f0a3989 /graphics
parentf9512af34d91c7c97a51f4e8e065896f5946ae7b (diff)
downloadpkgsrc-480c07a4a6a6bed5cf8a91621bc9166673d4285f.tar.gz
Converted to use buildlink.mk files
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libwmf/Makefile14
-rw-r--r--graphics/libwmf/distinfo4
-rw-r--r--graphics/libwmf/patches/patch-ac11
3 files changed, 8 insertions, 21 deletions
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index c704af9e23c..5a84a0d0ace 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/05/22 09:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/07/09 18:51:38 zuntum Exp $
#
DISTNAME= libwmf-0.1.21
@@ -9,17 +9,10 @@ MAINTAINER= kei@netbsd.org
HOMEPAGE= http://www.wvware.com/libwmf.html
COMMENT= library for reading and converting WMF (Windows Meta Files)
-DEPENDS+= freetype-lib>=1.3.1:../../graphics/freetype-lib
-DEPENDS+= png>=1.0.11:../../graphics/png
-
+USE_BUILDLINK_ONLY= YES
USE_X11= YES
-USE_XPM= YES
GNU_CONFIGURE= YES
-EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --includedir="${PREFIX}/include/libwmf"
-CONFIGURE_ARGS+= --with-png="${LOCALBASE}"
-CONFIGURE_ARGS+= --with-ttf="${LOCALBASE}"
-CONFIGURE_ARGS+= --with-xpm="${XPMDIR}"
INCLUDEDIR= ${PREFIX}/include/libwmf
HTMLDIR= ${PREFIX}/share/doc/html/libwmf
@@ -40,4 +33,7 @@ post-install:
cd ${WRKSRC}; ${INSTALL_DATA} doc/pics/weave.jpg \
${HTMLDIR}/pics
+.include "../../graphics/freetype-lib/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 86cd8bb20aa..5034c7472f7 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:19 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/09 18:51:38 zuntum Exp $
SHA1 (libwmf-0.1.21.tar.gz) = e6d6b3b4cbe3ff34027acd8862967aeced7379ba
Size (libwmf-0.1.21.tar.gz) = 744895 bytes
-SHA1 (patch-ac) = b5c91f373521a64e09550d169152f025f0fcd3db
+SHA1 (patch-ac) = 26c118cf0bbbe37b30a38f84aee43adac15f093a
SHA1 (patch-ad) = 156438ad8eac1710f574b49c46b07b6da4aecc4a
diff --git a/graphics/libwmf/patches/patch-ac b/graphics/libwmf/patches/patch-ac
index b2160d9b640..7b19d32d23f 100644
--- a/graphics/libwmf/patches/patch-ac
+++ b/graphics/libwmf/patches/patch-ac
@@ -1,16 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2001/03/04 15:45:43 kei Exp $
+$NetBSD: patch-ac,v 1.5 2001/07/09 18:51:39 zuntum Exp $
--- xgd-1.7.3/Makefile.in.orig Tue Nov 14 19:32:11 2000
+++ xgd-1.7.3/Makefile.in Sun Mar 4 15:50:03 2001
-@@ -29,7 +29,7 @@
-
- #If you don't have FreeType and/or Xpm installed, including the
- #header files, uncomment this (default).
--CFLAGS=@CPPFLAGS@ @CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
-+CFLAGS=@CPPFLAGS@ @CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ -I${LOCALBASE}/include
- #If you do have FreeType and/or Xpm fully installed, uncomment a
- #variation of this and comment out the line above. See also LIBS below.
- #CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF
@@ -45,7 +45,9 @@
#Typical install locations for freetype, zlib, xpm and libpng header files.