summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/aalib/Makefile.common3
-rw-r--r--graphics/autotrace/Makefile3
-rw-r--r--graphics/avi-xmms/Makefile4
-rw-r--r--graphics/blender/Makefile3
-rw-r--r--graphics/cairo/Makefile3
-rw-r--r--graphics/cal3d/Makefile.common3
-rw-r--r--graphics/dia/Makefile3
-rw-r--r--graphics/filmgimp/Makefile3
-rw-r--r--graphics/freetype2/Makefile5
-rw-r--r--graphics/gd/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile.common3
-rw-r--r--graphics/gimageview/Makefile4
-rw-r--r--graphics/gimp-base/Makefile4
-rw-r--r--graphics/giram/Makefile4
-rw-r--r--graphics/gle/Makefile4
-rw-r--r--graphics/gphoto2/Makefile3
-rw-r--r--graphics/graphviz/Makefile3
-rw-r--r--graphics/gtkam/Makefile3
-rw-r--r--graphics/gtkglext/Makefile3
-rw-r--r--graphics/hermes/Makefile4
-rw-r--r--graphics/imlib/Makefile3
-rw-r--r--graphics/imlib2/Makefile3
-rw-r--r--graphics/jasper/Makefile3
-rw-r--r--graphics/jpeg/Makefile4
-rw-r--r--graphics/lcms/Makefile3
-rw-r--r--graphics/libart2/Makefile4
-rw-r--r--graphics/libexif-gtk/Makefile3
-rw-r--r--graphics/libexif/Makefile3
-rw-r--r--graphics/libgdgeda/Makefile4
-rw-r--r--graphics/libgdiplus/Makefile3
-rw-r--r--graphics/libggi/Makefile4
-rw-r--r--graphics/libggigcp/Makefile3
-rw-r--r--graphics/libggiwmh/Makefile3
-rw-r--r--graphics/libgii/Makefile4
-rw-r--r--graphics/libgnomecanvas/Makefile5
-rw-r--r--graphics/libpixman/Makefile3
-rw-r--r--graphics/librsvg2/Makefile.common3
-rw-r--r--graphics/libvideogfx/Makefile3
-rw-r--r--graphics/libwmf/Makefile3
-rw-r--r--graphics/mng/Makefile3
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--graphics/pixieplus/Makefile4
-rw-r--r--graphics/plplot/Makefile3
-rw-r--r--graphics/sane-backends/Makefile.common3
-rw-r--r--graphics/smpeg-xmms/Makefile4
-rw-r--r--graphics/swfdec/Makefile.common3
-rw-r--r--graphics/transcode/Makefile4
48 files changed, 52 insertions, 111 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 82a4cfe3cf4..d9cd23921aa 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2004/02/13 23:43:19 abs Exp $
+# $NetBSD: Makefile,v 1.111 2004/02/14 17:21:40 jlam Exp $
.include "Makefile.common"
@@ -19,7 +19,6 @@ USE_X11= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_LANGUAGES= c c++
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common
index a61940b2ca6..80c6b8f2a21 100644
--- a/graphics/aalib/Makefile.common
+++ b/graphics/aalib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2004/02/11 08:44:23 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.17 2004/02/14 17:21:40 jlam Exp $
DISTNAME= aalib-${DIST_VERS}
CATEGORIES+= graphics
@@ -16,7 +16,6 @@ PATCHDIR= ${.CURDIR}/../../graphics/aalib/patches
WRKSRC= ${WRKDIR}/aalib-1.4.0
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-curses-driver=no
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 4eead22e002..a6d67311f23 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/26 12:43:21 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:40 jlam Exp $
#
DISTNAME= autotrace-0.31.1
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/autotrace.pc.in
diff --git a/graphics/avi-xmms/Makefile b/graphics/avi-xmms/Makefile
index ab1222ee35b..d4583432ce4 100644
--- a/graphics/avi-xmms/Makefile
+++ b/graphics/avi-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/26 15:16:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:40 jlam Exp $
#
DISTNAME= avi-xmms-1.2.2
@@ -15,9 +15,7 @@ COMMENT= Avifile and SDL based video plugin for XMMS
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../audio/xmms/buildlink2.mk"
.include "../../devel/SDL/buildlink2.mk"
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index c906bdc8ad4..c64ffd9b70b 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:40 jlam Exp $
#
DISTNAME= blender-2.31a
@@ -17,7 +17,6 @@ HAS_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LDFLAGS+= -lcrypto
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index a035c98fcbf..f0f722ef272 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/03 12:16:42 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:40 jlam Exp $
#
DISTNAME= cairo-0.1.17
@@ -13,7 +13,6 @@ USE_X11= yes
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/cairo.pc.in
GNU_CONFIGURE= yes
diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common
index c065cfb0461..f834d3a4b0d 100644
--- a/graphics/cal3d/Makefile.common
+++ b/graphics/cal3d/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/02/11 01:32:06 garbled Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:40 jlam Exp $
#
DISTNAME= cal3d-${CAL3D_VERSION}
@@ -17,7 +17,6 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
AUTOMAKE_REQD= 1.8
#AUTOMAKE_OVERRIDE= NO
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../mk/autoconf.mk"
.include "../../mk/automake.mk"
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 25b4812a01f..728fe9b63fc 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:41 jlam Exp $
DISTNAME= dia-0.92.2
PKGREVISION= 5
@@ -16,7 +16,6 @@ USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
diff --git a/graphics/filmgimp/Makefile b/graphics/filmgimp/Makefile
index 27342f5f607..3d89b384bfc 100644
--- a/graphics/filmgimp/Makefile
+++ b/graphics/filmgimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:41 jlam Exp $
DISTNAME= filmgimp-0.15
PKGREVISION= 3
@@ -12,7 +12,6 @@ COMMENT= Motion picture editing tool
USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../devel/zlib/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index dbe5115aa68..b9f2f6a7c7c 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/02/07 10:46:10 seb Exp $
+# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:41 jlam Exp $
#
DISTNAME= freetype-2.1.5
@@ -20,13 +20,12 @@ COMMENT= Font rendering engine and library API
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= YES
+USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_DIRS= ${WRKSRC}/builds/unix
CONFIGURE_ARGS+= --includedir=${PREFIX}/include
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/builds/unix/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/builds/unix/freetype2.in
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 93244d6be6d..45dcfac6dfd 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/02/04 15:50:37 adam Exp $
+# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:41 jlam Exp $
#
DISTNAME= gd-2.0.22
@@ -16,7 +16,6 @@ USE_LIBTOOL= YES
USE_X11= YES
GNU_CONFIGURE= YES
REPLACE_PERL= bdftogd
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LIBS+= -lpthread
BUILDLINK_DEPENDS.freetype2= freetype2>=2.1.4
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index d2f74049e44..a8f87798bb6 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/02/14 17:21:41 jlam Exp $
#
DISTNAME= gdk-pixbuf-${VER}.0
@@ -16,7 +16,6 @@ USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_X11BASE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 0477b0755e4..94baf01ac1a 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:41 jlam Exp $
DISTNAME= gimageview-0.2.24
PKGREVISION= 10
@@ -18,8 +18,6 @@ GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_X11= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --disable-xinetest
CONFIGURE_ARGS+= --with-gtk2
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index 9e02f47061b..de6e1915c90 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:41 jlam Exp $
#
DISTNAME= gimp-1.2.5
@@ -23,9 +23,7 @@ USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_GNU_TOOLS+= make
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 901f58f4522..375c5c7a3ce 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:41 jlam Exp $
#
DISTNAME= giram-0.3.5
@@ -25,7 +25,7 @@ PKG_SYSCONFSUBDIR= giram
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/0.3
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
OWN_DIRS+= ${PKG_SYSCONFDIR}/0.3
CONF_FILES+= ${PREFIX}/share/examples/giram/giramrc \
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index a85855056d1..92ffc47582d 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= gle-3.1.0
@@ -15,9 +15,7 @@ COMMENT= GL subroutines for drawing tubing and extrusions
USE_BUILDLINK3= YES
USE_X11= YES
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../graphics/Mesa/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 1231d12c605..cf2b762e179 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= gphoto2-2.1.2
@@ -15,7 +15,6 @@ CONFLICTS= gphoto-[0-9]*
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 149b84e7bee..1769423752a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/10/11 13:40:19 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= graphviz-1.10
@@ -16,7 +16,6 @@ GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
USE_X11= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
XAW_TYPE= standard
CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 22a53080e07..1ea9ae18939 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= gtkam-0.1.10
@@ -13,7 +13,6 @@ COMMENT= Digital camera access graphical client (GTK2)
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 2407d8020f8..1bec36960e1 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/10 20:58:04 garbled Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= gtkglext-0.7.1
@@ -18,7 +18,6 @@ USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkglext.pc.in
LIBS+= -lm
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index ee8ab9032b3..9931ec5fa5e 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:42 jlam Exp $
DISTNAME= Hermes-1.3.3
CATEGORIES= graphics
@@ -12,8 +12,6 @@ COMMENT= Library for conversion of pixel graphics
WRKSRC= ${WRKDIR}/Hermes-1.3.3
USE_BUILDLINK3= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 661004ba13a..1c84998a347 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.83 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= imlib-1.9.14
@@ -13,7 +13,6 @@ COMMENT= Image manipulation library for X11
USE_BUILDLINK3= yes
USE_X11BASE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib.pc.in
GNU_CONFIGURE= yes
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 69be2f6a17d..690f6618987 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/11 22:54:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= imlib2-1.1.0
@@ -15,7 +15,6 @@ USE_X11= YES
USE_LIBTOOL= YES
USE_BUILDLINK3= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib2.pc.in
LIBS.SunOS= -lm
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 7fed618e7ac..204afc4c8be 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/11 09:10:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= jasper-1.600.0
@@ -14,7 +14,6 @@ COMMENT= Software-based reference implementation of the JPEG-2000 codec
GNU_CONFIGURE= YES
USE_BUILDLINK3= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl
post-install:
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index cebeb28c7f1..9aa29c362e7 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= jpegsrc.v6b
@@ -19,8 +19,6 @@ USE_BUILDLINK3= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-static
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 5114ed5e308..8afe6812a00 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/02/09 12:03:27 seb Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:42 jlam Exp $
# FreeBSD: ports/graphics/lcms/Makefile,v 1.2 2000/12/19 15:36:26 sobomax Exp
DISTNAME= lcms-1.12
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
TEST_TARGET= check
CONFIGURE_ARGS+= --without-jpeg
diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile
index a8d0b864dfd..1760ea6b24f 100644
--- a/graphics/libart2/Makefile
+++ b/graphics/libart2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/11 01:25:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:42 jlam Exp $
DISTNAME= libart_lgpl-2.3.16
PKGNAME= ${DISTNAME:S/_lgpl/2/}
@@ -13,9 +13,7 @@ COMMENT= High-performance 2D graphics library
GNU_CONFIGURE= YES
USE_BUILDLINK3= YES
USE_X11= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= libart-2.0.pc.in
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index a41dbcdaf2d..c908a0446b7 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:42 jlam Exp $
DISTNAME= libexif-gtk-0.3.3
PKGREVISION= 7
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= libexif-gtk/libexif-gtk.pc.in
.include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 8c2edd0f93d..e9c46a6a270 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/11 04:58:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $
DISTNAME= libexif-0.5.12
PKGREVISION= 1
@@ -13,7 +13,6 @@ USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= libexif/libexif.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index 8ce1dc2c499..1c020f65bfa 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/14 04:43:48 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libgdgeda-2.0.15
@@ -18,7 +18,5 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_BUILDLINK3= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 4ce987efa14..b9c7f895f81 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/03 12:31:34 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libgdiplus-0.1
@@ -14,7 +14,6 @@ USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgdiplus.pc.in
GNU_CONFIGURE= yes
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 5fb06c09471..1cd66a7747b 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libggi-2.0.4.src
@@ -17,9 +17,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
USE_X11= yes
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-debug
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index 3797f7da6bb..7fe08a65643 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libggigcp-0.8.2.src
@@ -17,7 +17,6 @@ USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
PKG_SYSCONFSUBDIR= ggi
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index ed1f9be4e60..c582eaf62d0 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libggiwmh-0.1.0.src
@@ -17,7 +17,6 @@ USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
PKG_SYSCONFSUBDIR= ggi
diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index 71ec148c257..3cebc0ddb59 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libgii-0.8.4.src
@@ -17,9 +17,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
USE_X11= yes
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-mutexes=int
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 77a910d01f3..6054eb635ce 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/13 12:16:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libgnomecanvas-2.4.0
@@ -18,9 +18,8 @@ USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
USE_X11= yes
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+
PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomecanvas/libgnomecanvas-2.0.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/graphics/libpixman/Makefile b/graphics/libpixman/Makefile
index c590b87eae6..e4c3b1ccb0c 100644
--- a/graphics/libpixman/Makefile
+++ b/graphics/libpixman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/03 12:07:57 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:42 jlam Exp $
#
DISTNAME= libpixman-0.1.0
@@ -12,7 +12,6 @@ COMMENT= Pixel manipulation library
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libpixman.pc.in
GNU_CONFIGURE= yes
diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common
index e45315bc65f..1844930463d 100644
--- a/graphics/librsvg2/Makefile.common
+++ b/graphics/librsvg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/02/11 06:22:08 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:43 jlam Exp $
#
DISTNAME= librsvg-2.5.0
@@ -17,7 +17,6 @@ USE_BUILDLINK3= YES
USE_X11= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/librsvg-2.0.pc.in
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile
index b3db94852cd..96a6d86949c 100644
--- a/graphics/libvideogfx/Makefile
+++ b/graphics/libvideogfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:41:39 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $
#
DISTNAME= libvideogfx-1.0.3
@@ -13,7 +13,6 @@ COMMENT= C++ library for low-level video processing
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
USE_X11= yes
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 59369dd2d3d..61b3a28fbd3 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:43 jlam Exp $
#
DISTNAME= libwmf-0.2.8
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --disable-gd
CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/libwmf
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index dbb6fb634a7..707307f5908 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 00:59:26 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:43 jlam Exp $
DISTNAME= libmng-1.0.5
PKGNAME= ${DISTNAME:S/lib//}
@@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg}
CONFIGURE_ARGS+= --with-lcms=${BUILDLINK_PREFIX.lcms}
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 7cc5a5a7136..dafa8f8015d 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/09/18 17:51:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $
.include "../../graphics/ImageMagick/Makefile.common"
@@ -15,8 +15,6 @@ FILESDIR= ${.CURDIR}/../../graphics/ImageMagick/files
PATCHDIR= ${.CURDIR}/../../graphics/ImageMagick/patches
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
USE_BUILDLINK2= YES
USE_PERL5= run
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 7c995c37038..ff61e531583 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:43 jlam Exp $
#
DISTNAME= pixieplus-0.5.4
@@ -17,8 +17,6 @@ USE_LIBTOOL= YES
USE_X11= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../graphics/kdegraphics3/buildlink2.mk"
.include "../../graphics/ImageMagick/buildlink2.mk"
.include "../../graphics/libungif/buildlink2.mk"
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index 0853dc0bdb7..f5c664a0e9e 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/01/25 03:08:47 grant Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $
DISTNAME= plplot-5.2.1
CATEGORIES= graphics
@@ -15,7 +15,6 @@ USE_FORTRAN= # defined
USE_X11= # defined
USE_PERL5= build
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ENV+= GDINCDIR=${BUILDLINK_PREFIX.gd}/include
CONFIGURE_ENV+= GDLIBDIR=${BUILDLINK_PREFIX.gd}/lib
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 8ea334c01c4..6e48131d253 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/02/14 17:21:43 jlam Exp $
CATEGORIES?= graphics
MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \
@@ -24,7 +24,6 @@ GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ENV+= ac_cv_path_LATEX="no"
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index 9b3b54135eb..352fc8ba140 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:43 jlam Exp $
#
DISTNAME= smpeg-xmms-0.3.5
@@ -15,8 +15,6 @@ USE_BUILDLINK2= YES
USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../devel/smpeg/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
diff --git a/graphics/swfdec/Makefile.common b/graphics/swfdec/Makefile.common
index 8c7e2dd96c0..e662c691b81 100644
--- a/graphics/swfdec/Makefile.common
+++ b/graphics/swfdec/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/02/11 08:55:58 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:43 jlam Exp $
#
DISTNAME= swfdec-0.2.1
@@ -18,7 +18,6 @@ USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/swfdec.pc.in
pre-install:
diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile
index 4692185b338..007f00c7f21 100644
--- a/graphics/transcode/Makefile
+++ b/graphics/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/01/28 14:39:37 recht Exp $
+# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:43 jlam Exp $
DISTNAME= transcode-0.6.11
PKGREVISION= 2
@@ -15,7 +15,7 @@ USE_BUILDLINK2= yes
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
.include "../../mk/bsd.prefs.mk"