Convert packages with add --libdir=* to CONFIGURE_ARGS to use

GNU_CONFIGURE_LIBDIR or GNU_CONFIGURE_LIBSUBDIR.

5 files changed, 10 insertions, 10 deletions

diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 425c5aa67d5..29bff4b8219 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2012/01/13 10:55:26 obache Exp $
+# $NetBSD: Makefile,v 1.63 2012/01/17 21:43:20 sbd Exp $
 
 DISTNAME=	etherape-0.9.12
 PKGREVISION=	3
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 PKG_SYSCONFSUBDIR=	etherape
 
 # XXX: $localedir defaults to $libdir/locale
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/${PKGLOCALEDIR}
+GNU_CONFIGURE_LIBDIR=${PREFIX}/${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=		${PREFIX}/share/examples/etherape
diff --git a/net/powerdns/Makefile.common b/net/powerdns/Makefile.common
index 3e0fe201053..c3357cfc7b4 100644
--- a/net/powerdns/Makefile.common
+++ b/net/powerdns/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/01/13 12:12:48 ghen Exp $
+# $NetBSD: Makefile.common,v 1.7 2012/01/17 21:43:20 sbd Exp $
 
 PDNS_VERSION=		2.9.22.5
 DISTNAME=		pdns-${PDNS_VERSION}
@@ -13,7 +13,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/pdns
+GNU_CONFIGURE_LIBSUBDIR=pdns
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 6c5f25938a7..913211f69b9 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2011/12/19 14:47:27 asau Exp $
+# $NetBSD: Makefile,v 1.208 2012/01/17 21:43:20 sbd Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -53,10 +53,10 @@ REPLACE_PERL=		script/findsmb.in
 BROKEN_GETTEXT_DETECTION=yes
 USE_GNU_READLINE=	yes
 GNU_CONFIGURE=		yes
+GNU_CONFIGURE_LIBDIR=	${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
 CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR}
 CONFIGURE_ARGS+=	--with-modulesdir=${SAMBA_MODULESDIR}
diff --git a/net/samba33/Makefile b/net/samba33/Makefile
index ba56089d052..026771fd5b0 100644
--- a/net/samba33/Makefile
+++ b/net/samba33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/07/27 00:53:37 taca Exp $
+# $NetBSD: Makefile,v 1.16 2012/01/17 21:43:20 sbd Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -49,8 +49,8 @@ FILES_SUBST+=		SAMBA_STATEDIR=${SAMBA_STATEDIR:Q}
 FILES_SUBST+=		SAMBA_VARDIR=${SAMBA_VARDIR:Q}
 FILES_SUBST+=		WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q}
 
+GNU_CONFIGURE_LIBDIR=	${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR:Q}
-CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR:Q}
 CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR:Q}
 CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR:Q}
 CONFIGURE_ARGS+=	--with-modulesdir=${SAMBA_MODULESDIR:Q}
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index c3f14468475..0e216b67ff5 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/01/09 05:18:46 manu Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/17 21:43:20 sbd Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -55,10 +55,10 @@ REPLACE_PERL=		script/findsmb.in
 BROKEN_GETTEXT_DETECTION=yes
 USE_GNU_READLINE=	yes
 GNU_CONFIGURE=		yes
+GNU_CONFIGURE_LIBDIR=	${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
 CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR}
 CONFIGURE_ARGS+=	--with-modulesdir=${SAMBA_MODULESDIR}