summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-06-12 12:35:35 +0000
committerwiz <wiz@pkgsrc.org>2013-06-12 12:35:35 +0000
commitd9db5e429ed00da91f9a6964e5be844a7151b336 (patch)
tree8c53925fd6406c89e3551271baa24ee01e4f3d83
parent6dd48483fe2ac213cab418de8058ced84b431602 (diff)
downloadpkgsrc-d9db5e429ed00da91f9a6964e5be844a7151b336.tar.gz
Remove GNU_CONFIGURE_LIBDIR.
Rationale: undocumented, easily replaced with "CONFIGURE_ARGS+=--libdir=" and only used by 10 packages.
Diffstat
-rw-r--r--databases/lbdb/Makefile4
-rw-r--r--devel/ftnchek/Makefile4
-rw-r--r--editors/ce/Makefile.common5
-rw-r--r--mail/nmh/Makefile4
-rw-r--r--mk/configure/gnu-configure.mk11
-rw-r--r--net/etherape/Makefile4
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba35/Makefile4
-rw-r--r--print/advi/Makefile4
-rw-r--r--textproc/catdoc/Makefile.common4
10 files changed, 22 insertions, 26 deletions
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index e6476ed82fa..d19ebe1fcd7 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/05/31 12:39:47 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/12 12:35:35 wiz Exp $
DISTNAME= lbdb_0.35.1
PKGNAME= ${DISTNAME:S/_/-/}
@@ -15,7 +15,7 @@ DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/lbdb
+CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --enable-lbdb_dotlock
CONFIGURE_ARGS+= --without-getent
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index 2ff0fc4d364..832bd69ba02 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/31 11:16:58 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/12 12:35:35 wiz Exp $
DISTNAME= ftnchek-3.2.2
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.dsm.fordham.edu/~ftnchek/
COMMENT= Static analyzer for Fortran programs
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec
+CONFIGURE_ARGS+=--libdir=${PREFIX}/libexec
CONFIGURE_ARGS+=--disable-submodel
USE_TOOLS+= soelim
diff --git a/editors/ce/Makefile.common b/editors/ce/Makefile.common
index 1db646db432..07e4aa855b0 100644
--- a/editors/ce/Makefile.common
+++ b/editors/ce/Makefile.common
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2012/01/17 21:43:19 sbd Exp $
-#
+# $NetBSD: Makefile.common,v 1.11 2013/06/12 12:35:35 wiz Exp $
DISTNAME= ce-${VERSION}
VERSION= 4.6
@@ -14,7 +13,7 @@ COMMENT= Chet's Emacs: small, fast emacs-like editor
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/share/doc
+CONFIGURE_ARGS+= --libdir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --without-ce-malloc
CONFIGURE_ARGS+= --with-curses
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index cc46a50ac54..366c8a9e964 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2013/02/06 23:22:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.81 2013/06/12 12:35:35 wiz Exp $
DISTNAME= nmh-1.5
PKGREVISION= 3
@@ -36,7 +36,7 @@ NMH_MTA?= smtp
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/nmh
+CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/nmh
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --enable-nmh-pop
CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q}
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk
index 0dcc9da6d09..14074ab7466 100644
--- a/mk/configure/gnu-configure.mk
+++ b/mk/configure/gnu-configure.mk
@@ -1,9 +1,9 @@
-# $NetBSD: gnu-configure.mk,v 1.13 2012/01/26 06:33:43 sbd Exp $
+# $NetBSD: gnu-configure.mk,v 1.14 2013/06/12 12:35:35 wiz Exp $
_VARGROUPS+= gnu-configure
_USER_VARS.gnu-configure= # none
_PKG_VARS.gnu-configure= GNU_CONFIGURE GNU_CONFIGURE_PREFIX \
- SET_LIBDIR GNU_CONFIGURE_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
+ SET_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
OVERRIDE_DIRDEPTH.configure \
@@ -30,12 +30,9 @@ GNU_CONFIGURE_PREFIX?= ${PREFIX}
CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q}
.if defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR)
-GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
+CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
.elif defined(SET_LIBDIR) && !empty(SET_LIBDIR)
-GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib
-.endif
-.if defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR)
-CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_LIBDIR:Q}
+CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_PREFIX}/lib
.endif
USE_GNU_CONFIGURE_HOST?= yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 646dc592788..1cfca633d2c 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2013/06/06 12:54:54 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2013/06/12 12:35:35 wiz Exp $
DISTNAME= etherape-0.9.12
PKGREVISION= 18
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
PKG_SYSCONFSUBDIR= etherape
# XXX: $localedir defaults to $libdir/locale
-GNU_CONFIGURE_LIBDIR=${PREFIX}/${PKGLOCALEDIR}
+CONFIGURE_ARGS+= --libdir=${PREFIX}/${PKGLOCALEDIR}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
EGDIR= ${PREFIX}/share/examples/etherape
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 53c75b11848..2e102bc3206 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.233 2013/05/31 12:41:43 wiz Exp $
+# $NetBSD: Makefile,v 1.234 2013/06/12 12:35:35 wiz Exp $
DISTNAME= samba-${VERSION}
PKGREVISION= 1
@@ -50,7 +50,7 @@ REPLACE_PERL= script/findsmb.in
BROKEN_GETTEXT_DETECTION=yes
USE_GNU_READLINE= yes
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${SAMBA_LIBDIR}
+CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR}
CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 09dab66e817..8404b31a025 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/05/31 12:41:43 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2013/06/12 12:35:35 wiz Exp $
.include "../../net/samba/Makefile.mirrors"
@@ -53,7 +53,7 @@ REPLACE_PERL= script/findsmb.in
BROKEN_GETTEXT_DETECTION=yes
USE_GNU_READLINE= yes
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${SAMBA_LIBDIR}
+CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR}
CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 7c807667dd1..6630408b34a 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2013/06/06 12:54:59 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2013/06/12 12:35:35 wiz Exp $
DISTNAME= advi-1.10.1
PKGREVISION= 25
@@ -18,7 +18,7 @@ DEPENDS+= texlive-tetex>=2010:../../print/texlive-tetex
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake gs:run
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/share/texmf-dist
+CONFIGURE_ARGS+= --libdir=${PREFIX}/share/texmf-dist
CONFIGURE_ARGS+= --with-gs=${PREFIX}/bin/gs
INSTALL_UNSTRIPPED= yes
diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index d9b652c6405..8fa91c1eef7 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2012/01/17 21:43:21 sbd Exp $
+# $NetBSD: Makefile.common,v 1.16 2013/06/12 12:35:36 wiz Exp $
#
DISTNAME= catdoc-0.94.2
@@ -15,7 +15,7 @@ PATCHDIR= ${.CURDIR}/../../textproc/catdoc/patches
USE_FEATURES= glob
GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/share
+CONFIGURE_ARGS+= --libdir=${PREFIX}/share
CONFIGURE_ARGS+= --with-install-root=${DESTDIR}
CPPFLAGS+= -Dunix -D__unix
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-02 13:00:47 +0000