summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/audacity/Makefile3
-rw-r--r--audio/wsoundserver/Makefile3
-rw-r--r--benchmarks/benchfft/Makefile4
-rw-r--r--cad/geda/Makefile4
-rw-r--r--cad/gnetlist/Makefile3
-rw-r--r--cad/gsymcheck/Makefile3
-rw-r--r--chat/gale/Makefile3
-rw-r--r--chat/icqlib/Makefile3
-rw-r--r--converters/recode/Makefile3
-rw-r--r--databases/tcl-gdbm/Makefile3
-rw-r--r--devel/eel/Makefile3
-rw-r--r--devel/glib/Makefile3
-rw-r--r--devel/libdockapp/Makefile3
-rw-r--r--devel/libproplist/Makefile3
-rw-r--r--devel/libsmi/Makefile3
-rw-r--r--devel/libstroke/Makefile4
-rw-r--r--editors/cooledit/Makefile4
-rw-r--r--games/xpuyopuyo/Makefile3
-rw-r--r--graphics/GUIlib/Makefile3
-rw-r--r--graphics/aqsis/Makefile3
-rw-r--r--graphics/fnlib/Makefile4
-rw-r--r--graphics/freetype-lib/Makefile.common3
-rw-r--r--graphics/gphoto/Makefile3
-rw-r--r--graphics/librsvg/Makefile4
-rw-r--r--graphics/py-gimp/Makefile3
-rw-r--r--graphics/scigraphica/Makefile4
-rw-r--r--lang/gb/Makefile3
-rw-r--r--lang/japhar/Makefile3
-rw-r--r--lang/vslisp/Makefile3
-rw-r--r--mk/configure/libtool-override.mk40
-rw-r--r--pkgtools/pkglint/files/deprecated.map3
-rw-r--r--print/LPRng-core/Makefile3
-rw-r--r--print/ja-vflib-lib/Makefile.common3
-rw-r--r--print/ja-vfxdvik/Makefile3
-rw-r--r--security/mirrordir/Makefile3
-rw-r--r--sysutils/amanda-common/Makefile.common3
-rw-r--r--sysutils/medusa/Makefile4
-rw-r--r--textproc/chasen-base/Makefile4
-rw-r--r--textproc/jade/Makefile3
-rw-r--r--textproc/libunicode/Makefile4
-rw-r--r--textproc/namazu2/Makefile3
-rw-r--r--wm/bbconf/Makefile3
-rw-r--r--www/glibwww/Makefile3
-rw-r--r--x11/gtk+extra/Makefile4
44 files changed, 49 insertions, 131 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 002b2bb28b7..3de9dda0d72 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/06/11 12:22:47 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2006/07/19 19:14:37 jlam Exp $
DISTNAME= audacity-src-1.2.4b
PKGNAME= audacity-1.2.4b
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-libmad=system
CONFIGURE_ARGS+= --with-libsndfile=system
CONFIGURE_ARGS+= --with-portaudio=system
CONFIGURE_ARGS+= --with-vorbis=system
-LTCONFIG_OVERRIDE+= ${WRKSRC}/ltconfig
CONFIG_GUESS_OVERRIDE= \
config.guess */config.guess */*/config.guess */*/*/config.guess
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 5c721edf5a8..79e3b25597f 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/07/19 19:14:37 jlam Exp $
#
DISTNAME= WSoundServer-0.4.0
@@ -14,7 +14,6 @@ COMMENT= Sound server for windowmaker
USE_X11BASE= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE+= ${WRKSRC:Q}/ltconfig
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # not really needed
PKG_SYSCONFSUBDIR= WindowMaker
diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index 8210551a142..9207e519788 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:19 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/19 19:14:37 jlam Exp $
DISTNAME= benchfft-2.0
PKGREVISION= 2
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake
USE_LANGUAGES= fortran
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKDIR}/fftw-2.0.1/ltconfig
+LIBTOOL_OVERRIDE= libtool ../fftw-*/libtool
CONFIG_GUESS_OVERRIDE= config.guess ../fftw-*/config.guess
CONFIG_SUB_OVERRIDE= config.sub ../fftw-*/config.sub
CONFIG_STATUS_OVERRIDE= config.status ../fftw-*/config.status
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 0effaed9195..6a726c5d7aa 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/07/19 19:14:37 jlam Exp $
#
DISTNAME= geda-${PKGVERSION}
@@ -24,8 +24,6 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= pkg-config
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
.include "../../cad/libgeda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 453a01b723e..7211f2e2fe7 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/07/19 19:14:37 jlam Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -21,7 +21,6 @@ USE_LIBTOOL= YES
# needs GNU m4 for the PCBboard and gsch2pcb netlisters
USE_TOOLS+= gmake m4:run pkg-config
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
EVAL_PREFIX+= PCBDIR=pcb
CONFIGURE_ARGS+= --with-pcbm4dir=${PCBDIR}/share/pcb/m4
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 7e285a0d4ad..2313ad8684e 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/07/19 19:14:37 jlam Exp $
#
DISTNAME= geda-gsymcheck-${PKGVERSION}
@@ -18,7 +18,6 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_TOOLS+= pkg-config
.include "../../cad/libgeda/buildlink3.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 6b69f2bbc6d..448eb231190 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/04 21:29:03 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/07/19 19:14:37 jlam Exp $
DISTNAME= gale-0.99fruit
PKGNAME= gale-0.99f
@@ -13,7 +13,6 @@ COMMENT= Secure instant messaging system
USE_GNU_READLINE= yes # needs rl_named_function()
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= PROG_GLIB_CONFIG=${GLIB_CONFIG:Q}
diff --git a/chat/icqlib/Makefile b/chat/icqlib/Makefile
index e4acb7b2706..c79603b0631 100644
--- a/chat/icqlib/Makefile
+++ b/chat/icqlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/06 14:38:31 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/19 19:14:37 jlam Exp $
DISTNAME= icqlib-1.0.0
PKGREVISION= 3
@@ -13,6 +13,5 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index c635b222b88..1462f977f4d 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/19 19:14:37 jlam Exp $
#
DISTNAME= recode-3.6
@@ -13,7 +13,6 @@ COMMENT= Convert files between character sets and usages
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
BROKEN_GETTEXT_DETECTION= yes
INFO_FILES= # PLIST
diff --git a/databases/tcl-gdbm/Makefile b/databases/tcl-gdbm/Makefile
index 00a53c561b1..e94bb72804b 100644
--- a/databases/tcl-gdbm/Makefile
+++ b/databases/tcl-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/19 19:14:37 jlam Exp $
#
DISTNAME= tclgdbm-0.10
@@ -12,7 +12,6 @@ COMMENT= Tcl interface to gdbm - GNU database manager
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CFLAGS+= -I${LOCALBASE}/include # gdbm.h
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 17c28b9b63a..1fdf2214416 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:20 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/07/19 19:14:38 jlam Exp $
DISTNAME= eel-1.0.2
PKGREVISION= 3
@@ -17,7 +17,6 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index be989c1f248..ae952bd2f03 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/06/08 21:13:38 tron Exp $
+# $NetBSD: Makefile,v 1.82 2006/07/19 19:14:38 jlam Exp $
DISTNAME= glib-1.2.10
PKGREVISION= 10
@@ -17,7 +17,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
PKGCONFIG_OVERRIDE= glib.pc.in
PKGCONFIG_OVERRIDE+= gmodule.pc.in
PKGCONFIG_OVERRIDE+= gthread.pc.in
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 898f9eca2c7..8b10f7501e5 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= libdockapp-0.4.0
@@ -13,7 +13,6 @@ COMMENT= Simple library to create dockapps for WindowMaker
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
diff --git a/devel/libproplist/Makefile b/devel/libproplist/Makefile
index 0fb7b49441e..1b093297fc3 100644
--- a/devel/libproplist/Makefile
+++ b/devel/libproplist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/08 15:26:43 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/19 19:14:38 jlam Exp $
DISTNAME= libPropList-0.10.1
PKGNAME= libproplist-0.10.1
@@ -12,7 +12,6 @@ COMMENT= GNUstep/OPENSTEP property lists compatibility library
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= lex
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libproplist
diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index 114e853b96a..682f8b05fef 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:06 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= libsmi-0.1.6
@@ -13,7 +13,6 @@ COMMENT= Library to access SMI MIB information
MIBDIR= ${PREFIX}/share/libsmi/mibs
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--with-mibdir=${MIBDIR:Q}
# this might make it easier to use scotty's and ucd-snmp's mibs,
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 43478b9a462..bd51d177ae5 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= libstroke-0.5.1
@@ -16,8 +16,6 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_TOOLS+= gmake
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
CONFIGURE_ENV+= ac_cv_path_GTK_CONFIG=no
.include "../../lang/tcl/buildlink3.mk"
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index d3738f6f031..3ebeccc9642 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/13 18:23:32 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/19 19:14:38 jlam Exp $
DISTNAME= cooledit-3.17.17
PKGREVISION= 2
@@ -13,8 +13,6 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt
GNU_CONFIGURE= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
PTHREAD_AUTO_VARS= yes
post-configure:
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 6608e55621b..936b76b0e13 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:29:44 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/07/19 19:14:38 jlam Exp $
DISTNAME= xpuyopuyo-0.9.1
PKGREVISION= 6
@@ -14,7 +14,6 @@ USE_DIRS+= gnome1-1.5
USE_TOOLS+= automake14 gmake
USE_X11BASE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-gnome # install desktop and pixmap files
diff --git a/graphics/GUIlib/Makefile b/graphics/GUIlib/Makefile
index 237605e6951..8052390eda1 100644
--- a/graphics/GUIlib/Makefile
+++ b/graphics/GUIlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= GUIlib-1.1.0
@@ -14,7 +14,6 @@ GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../devel/SDL/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 047fc0b9956..9a8d26fa7ae 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/05/18 20:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= aqsis-0.6.4
@@ -14,7 +14,6 @@ BROKEN_IN= pkgsrc-2005Q4 pkgsrc-2006Q1
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_TOOLS+= gmake
GCC_REQD+= 2.95.3
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index db90988198e..17bf4cb9b86 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= fnlib-0.5
@@ -17,8 +17,6 @@ DIST_SUBDIR= fnlib
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
EGDIR= ${PREFIX}/share/examples/fnlib
CONF_FILES= ${EGDIR}/fnrc ${PKG_SYSCONFDIR}/fnrc
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index bbe837010b2..7fe59b56cda 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2006/06/17 19:41:32 minskim Exp $
+# $NetBSD: Makefile.common,v 1.35 2006/07/19 19:14:38 jlam Exp $
DISTNAME= freetype1_1.4pre.20030402.orig
FT_VERS= 1.5
@@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/.orig//:S/_/-/}
USE_TOOLS+= msgfmt
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index c10d8a0f9b1..d470d0a4c02 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/04/18 20:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/19 19:14:38 jlam Exp $
DISTNAME= gphoto-0.4.3
PKGREVISION= 9
@@ -12,7 +12,6 @@ COMMENT= Download and view files from various digital cameras
USE_DIRS+= gnome1-1.0
USE_X11BASE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
.include "../../graphics/imlib/buildlink3.mk"
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index a32404eafe7..18f913256d1 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/07/19 19:14:38 jlam Exp $
DISTNAME= librsvg-1.0.3
PKGREVISION= 2
@@ -13,8 +13,6 @@ COMMENT= Raph's SVG library
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../textproc/libxml/buildlink3.mk"
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index a9a794215bb..63619a951d0 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= pygimp-1.2
@@ -13,7 +13,6 @@ COMMENT= Python interface to the GIMP
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
PYTHON_PATCH_SCRIPTS= plug-ins/clothify.py plug-ins/foggify.py
PYTHON_PATCH_SCRIPTS+= plug-ins/gimpcons.py plug-ins/gtkcons.py
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 2c1781ff33b..aa8fdebfd99 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/07/02 10:21:14 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= scigraphica-2.1.0
@@ -22,8 +22,6 @@ CONFIGURE_ARGS+= --with-termcap-path=${BUILDLINK_PREFIX.readline}/lib
CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
PTHREAD_AUTO_VARS= yes
.include "../../lang/python/application.mk"
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index a5ba67cc168..10ce176464e 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= gb-0.0.20
@@ -15,7 +15,6 @@ USE_TOOLS+= msgfmt
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../print/gnome-print/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index bb9647ed937..ca13a1e540f 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/06/06 15:40:15 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/19 19:14:38 jlam Exp $
#
DISTNAME= japhar-0.08
@@ -14,7 +14,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
INFO_FILES= # PLIST
diff --git a/lang/vslisp/Makefile b/lang/vslisp/Makefile
index 024bbb935ed..62e0e56fcbb 100644
--- a/lang/vslisp/Makefile
+++ b/lang/vslisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:57 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/07/19 19:14:39 jlam Exp $
DISTNAME= vslisp-4.0-1
PKGNAME= vslisp-4.0.1
@@ -13,7 +13,6 @@ COMMENT= Embeddable Lisp library and standalone interpreter
WRKSRC= ${WRKDIR}/vslisp-4.0
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vslisp
diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk
index f10b8b56e85..04d7eac8af7 100644
--- a/mk/configure/libtool-override.mk
+++ b/mk/configure/libtool-override.mk
@@ -1,51 +1,19 @@
-# $NetBSD: libtool-override.mk,v 1.4 2006/07/07 15:25:05 jlam Exp $
+# $NetBSD: libtool-override.mk,v 1.5 2006/07/19 19:14:39 jlam Exp $
######################################################################
-### {ltconfig,libtool,shlibtool}-override (PRIVATE)
+### {libtool,shlibtool}-override (PRIVATE)
######################################################################
-### {ltconfig,libtool,shlibtool}-override replace any existing ltconfig
-### and libtool under ${WRKSRC} with the versions installed by pkgsrc.
+### {libtool,shlibtool}-override replace any existing libtool under
+### ${WRKSRC} with the version installed by pkgsrc.
###
-.if defined(LTCONFIG_OVERRIDE)
-do-configure-pre-hook: ltconfig-override
-.endif
do-configure-post-hook: libtool-override
.if defined(SHLIBTOOL_OVERRIDE)
do-configure-post-hook: shlibtool-override
.endif
-OVERRIDE_DIRDEPTH.ltconfig?= ${OVERRIDE_DIRDEPTH}
OVERRIDE_DIRDEPTH.libtool?= ${OVERRIDE_DIRDEPTH}
OVERRIDE_DIRDEPTH.shlibtool?= ${OVERRIDE_DIRDEPTH}
-_SCRIPT.ltconfig-override= \
- ${RM} -f $$file; \
- ${ECHO} "${RM} -f libtool; ${LN} -s ${_LIBTOOL} libtool" > $$file; \
- ${CHMOD} +x $$file
-
-.PHONY: ltconfig-override
-ltconfig-override:
- @${STEP_MSG} "Modifying ltconfig scripts to use pkgsrc libtool"
-.if defined(LTCONFIG_OVERRIDE) && !empty(LTCONFIG_OVERRIDE)
- ${_PKG_SILENT}${_PKG_DEBUG}set -e; \
- cd ${WRKSRC}; \
- for file in ${LTCONFIG_OVERRIDE}; do \
- ${TEST} -f "$$file" || continue; \
- ${_SCRIPT.${.TARGET}}; \
- done
-.else
- ${_PKG_SILENT}${_PKG_DEBUG}set -e; \
- cd ${WRKSRC}; \
- depth=0; pattern=ltconfig; \
- while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.ltconfig}; do \
- for file in $$pattern; do \
- ${TEST} -f "$$file" || continue; \
- ${_SCRIPT.${.TARGET}}; \
- done; \
- depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \
- done
-.endif
-
_OVERRIDE_PATH.libtool= ${_LIBTOOL}
_OVERRIDE_PATH.shlibtool= ${_SHLIBTOOL}
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 130e3e9efa2..f9fd0c86205 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.42 2006/07/18 23:08:30 jlam Exp $
+# $NetBSD: deprecated.map,v 1.43 2006/07/19 19:14:39 jlam Exp $
#
# This file contains names of Makefile variables and a short explanation
@@ -115,3 +115,4 @@ DEINSTALL_FILE It may only be used internally by pkgsrc.
# July 2006
USE_DIGEST You can just remove it.
+LTCONFIG_OVERRIDE You can just remove it.
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index e90a6c5d92d..f319f00bf57 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/06/21 13:50:46 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/19 19:14:39 jlam Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -19,7 +19,6 @@ CONFLICTS+= cups-[0-9]*
USE_TOOLS+= chgrp chown gmake
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE+= ${WRKSRC:Q}/ltconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-lpd_perms_path=${LPD_PERMS_PATH:Q}
diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common
index 95f1a7ebc50..56c09cbfa68 100644
--- a/print/ja-vflib-lib/Makefile.common
+++ b/print/ja-vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/07/19 19:14:39 jlam Exp $
DISTNAME= VFlib2-${VFLIB_VERSION}
CATEGORIES+= japanese print
@@ -15,7 +15,6 @@ PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION:Q}
PLIST_SUBST+= VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
FT_LIB= ttf -lintl
FT_INCLUDEDIR= ${BUILDLINK_PREFIX.freetype}/include/freetype
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 1bcba528606..1a39ccdfd2c 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/06/24 10:54:39 hira Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/19 19:14:39 jlam Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -25,7 +25,6 @@ BUILD_DIRS= ${WRKDIR}/${DISTNAME}/texk/xdvik
USE_TOOLS+= gmake
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/config/config
LIBTOOL_OVERRIDE= klibtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--enable-local-texmf=${PKG_LOCALTEXMFPREFIX} \
diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile
index b205fb48fd8..b9501bd9f59 100644
--- a/security/mirrordir/Makefile
+++ b/security/mirrordir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:35 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= mirrordir-0.10.49
@@ -14,7 +14,6 @@ CONFLICTS= qmail>=1.03nb7 netqmail>=1.05
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
EGDIR= ${PREFIX}/share/examples/mirrordir
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 459a900ade4..9234193c331 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2006/05/26 13:19:38 joerg Exp $
+# $NetBSD: Makefile.common,v 1.22 2006/07/19 19:14:39 jlam Exp $
#
# common make file fragment shared by all amanda-* pkgs.
#
@@ -26,7 +26,6 @@ BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB
BUILD_DEFS+= AMANDA_TMP AMANDA_VAR
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
USE_TOOLS+= gzip:run gtar:run
CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index 30fdbe142c2..6b7e28a64a1 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/05/18 19:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= medusa-0.5.1
@@ -14,9 +14,7 @@ COMMENT= File system indexing engine
DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile
index b2f5958e830..bdf296dab44 100644
--- a/textproc/chasen-base/Makefile
+++ b/textproc/chasen-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/25 16:53:16 schwarz Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= chasen-${CHASEN_VERSION}
@@ -20,8 +20,6 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
OWN_DIRS= ${CHASEN_DICDIR}
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
.include "../../textproc/chasen/Makefile.common"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/darts/buildlink3.mk"
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 56f1c8da03d..32c5f63c34a 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/03/21 06:00:50 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/07/19 19:14:39 jlam Exp $
DISTNAME= jade-1.2.1
PKGREVISION= 11
@@ -21,7 +21,6 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
SGML_CATALOGS= ${PREFIX}/share/sgml/jade/catalog
diff --git a/textproc/libunicode/Makefile b/textproc/libunicode/Makefile
index b7dc544cc04..91564f28d35 100644
--- a/textproc/libunicode/Makefile
+++ b/textproc/libunicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/26 13:51:16 schwarz Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= libunicode-0.4
@@ -14,6 +14,4 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 14659dc52ea..96c6a37a517 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/18 22:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/07/19 19:14:39 jlam Exp $
DISTNAME= namazu-2.0.16
CATEGORIES= japanese textproc www
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c
USE_LIBTOOL= yes
TEST_TARGET= check
-LTCONFIG_OVERRIDE+= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --localstatedir=${DATADIR:Q} \
--libexecdir=${PREFIX}/libexec/cgi-bin \
diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile
index ebd0261861c..37e67febc74 100644
--- a/wm/bbconf/Makefile
+++ b/wm/bbconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/19 08:26:22 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= bbconf-1.4
@@ -13,7 +13,6 @@ COMMENT= Configuration tool for the blackbox window manager
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig
.include "../../converters/libiconv/buildlink3.mk"
.include "../../x11/qt2-libs/buildlink3.mk"
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 91799512d39..f7c3a913467 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= glibwww-0.2
@@ -12,7 +12,6 @@ COMMENT= Event register functions that use the glib event loop
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../www/libwww/buildlink3.mk"
.include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 81d7f3b7a9b..414afdd978c 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/19 19:14:39 jlam Exp $
#
DISTNAME= gtk+extra-0.99.17
@@ -13,9 +13,7 @@ COMMENT= Useful set of GTK+ widgets for creating GUIs
USE_X11BASE= YES
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"