summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-14 17:21:32 +0000
committerjlam <jlam@pkgsrc.org>2004-02-14 17:21:32 +0000
commitec993afa1a03c673838b24572cfaae5ebd9fb235 (patch)
treef363875d965b55b56e856a921189b2693e263e28 /editors
parent12db50c706ca0bcbc78542f31d7719bf81af8ece (diff)
downloadpkgsrc-ec993afa1a03c673838b24572cfaae5ebd9fb235.tar.gz
LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}. Remove redundant LIBTOOL_OVERRIDE settings that are automatically handled by the default setting in bsd.pkg.mk.
Diffstat (limited to 'editors')
-rw-r--r--editors/conglomerate/Makefile4
-rw-r--r--editors/gedit/Makefile3
-rw-r--r--editors/lpe/Makefile4
-rw-r--r--editors/lyx-qt/Makefile.common4
-rw-r--r--editors/nvi/Makefile4
5 files changed, 6 insertions, 13 deletions
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 462dff49143..68df1d9795f 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:39 jlam Exp $
#
DISTNAME= conglomerate-0.7.11
@@ -22,8 +22,6 @@ USE_GNU_TOOLS+= make
USE_PERL5= yes
USE_PKGLOCALEDIR= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --enable-printing
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 4868ac3fea5..5ea7a4f1117 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/11 05:15:40 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:39 jlam Exp $
#
DISTNAME= gedit-2.4.1
@@ -21,7 +21,6 @@ USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GCONF2_SCHEMAS= gedit.schemas
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index a0ffb6adadb..db9ee05aeb9 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/22 08:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:39 jlam Exp $
#
DISTNAME= lpe-1.2.6
@@ -20,7 +20,7 @@ USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
CONFIGURE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
MAKE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 2b19758d778..a782ea75df3 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/02/09 03:26:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/02/14 17:21:39 jlam Exp $
#
DISTNAME= lyx-1.3.3
@@ -30,8 +30,6 @@ USE_PKGLOCALEDIR= YES
USE_X11= YES
GCC_REQD+= 2.95
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \
--with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \
--with-pspell
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 9d82dc467e9..0b6ac0ee3fe 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:05 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:39 jlam Exp $
#
DISTNAME= nvi-1.81.5
@@ -24,8 +24,6 @@ CONFIGURE_SCRIPT= ../dist/configure
CONFIGURE_ARGS+= --with-db3=${BUILDLINK_PREFIX.db3}
CONFIGURE_ARGS+= --program-transform-name='s,^,n,'
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
USE_BUILDLINK2= YES
.include "../../databases/db3/buildlink2.mk"