diff options
author | jlam <jlam> | 2002-09-21 23:53:13 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-09-21 23:53:13 +0000 |
commit | f3a295749fa00ff791621d1f5d1abad3b9b79dc8 (patch) | |
tree | 958c67b9ccc780154722f396d860152968a46798 /graphics/autotrace | |
parent | b5190f1787500fdb20ebf3264a4abdfec8b82b78 (diff) | |
download | pkgsrc-f3a295749fa00ff791621d1f5d1abad3b9b79dc8.tar.gz |
buildlink1 -> buildlink2
Diffstat (limited to 'graphics/autotrace')
-rw-r--r-- | graphics/autotrace/Makefile | 8 | ||||
-rw-r--r-- | graphics/autotrace/patches/patch-ab | 29 |
2 files changed, 4 insertions, 33 deletions
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 95ddabfffb3..ed17f5b8880 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:03 fredb Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/22 00:08:19 jlam Exp $ # DISTNAME= autotrace-0.29 @@ -10,9 +10,9 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://autotrace.sourceforge.net/ COMMENT= convert bitmap to vector graphics -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES -.include "../../graphics/ImageMagick/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/ImageMagick/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/autotrace/patches/patch-ab b/graphics/autotrace/patches/patch-ab deleted file mode 100644 index fbf647bb822..00000000000 --- a/graphics/autotrace/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/01/03 14:03:02 wiz Exp $ - ---- configure.orig Mon Dec 24 11:57:35 2001 -+++ configure -@@ -1152,9 +1152,9 @@ - echo "$ac_t""no" 1>&6 - fi - -- if test "x$MAGICK_CONFIG" = "xMagick-config" ; then -+ if test "x$MAGICK_CONFIG" != "x" ; then - CPPFLAGS_BACKUP="$CPPFLAGS" -- CPPFLAGS=`Magick-config --cppflags` -+ CPPFLAGS=`$MAGICK_CONFIG --cppflags` - ac_safe=`echo "magick/api.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for magick/api.h""... $ac_c" 1>&6 - echo "configure:1161: checking for magick/api.h" >&5 -@@ -1192,10 +1192,10 @@ - MAGICK_CFLAGS=${CPPFLAGS} - CPPFLAGS=${CPPFLAGS_BACKUP} - if test "x${magick_header_found}" = xyes ; then -- MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`" -+ MAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags` `$MAGICK_CONFIG --libs`" - echo $ac_n "checking ImageMagick - version >= 5.2.1""... $ac_c" 1>&6 - echo "configure:1198: checking ImageMagick - version >= 5.2.1" >&5 -- MAGICK_VERSION=`Magick-config --version` -+ MAGICK_VERSION=`$MAGICK_CONFIG --version` - MAGICK_MAJOR_VERSION=`echo $MAGICK_VERSION \ - | sed -e "s/^\([0-9]*\).[0-9]*.[0-9]*$/\1/"` - MAGICK_MINOR_VERSION=`echo $MAGICK_VERSION \ |