summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/jack/Makefile3
-rw-r--r--audio/portaudio-devel/Makefile4
-rw-r--r--chat/silc-client/Makefile4
-rw-r--r--databases/lbdb/Makefile4
-rw-r--r--databases/postgresql90/Makefile.common4
-rw-r--r--devel/ftnchek/Makefile4
-rw-r--r--devel/gdb6/Makefile4
-rw-r--r--devel/libev/Makefile4
-rw-r--r--devel/libnet11/Makefile4
-rw-r--r--devel/nspr/Makefile4
-rw-r--r--editors/ce/Makefile.common4
-rw-r--r--graphics/pstoedit/Makefile4
-rw-r--r--mail/nmh/Makefile4
-rw-r--r--misc/gkrellm-leds/Makefile4
-rw-r--r--net/etherape/Makefile4
-rw-r--r--net/powerdns/Makefile.common4
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba33/Makefile4
-rw-r--r--net/samba35/Makefile4
-rw-r--r--print/advi/Makefile4
-rw-r--r--security/clamav/Makefile7
-rw-r--r--security/nettle/Makefile3
-rw-r--r--textproc/catdoc/Makefile.common4
-rw-r--r--www/lighttpd/Makefile4
24 files changed, 48 insertions, 49 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index a1835817df0..96ac9660961 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/01/11 17:51:21 hans Exp $
+# $NetBSD: Makefile,v 1.20 2012/01/17 21:43:18 sbd Exp $
#
DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
@@ -27,7 +27,6 @@ PKGCONFIG_OVERRIDE+= jack.pc.in
PTHREAD_OPTS+= require native
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --disable-freebob
CONFIGURE_ARGS+= --disable-coreaudio
diff --git a/audio/portaudio-devel/Makefile b/audio/portaudio-devel/Makefile
index f5d1923386e..98bcc6199b9 100644
--- a/audio/portaudio-devel/Makefile
+++ b/audio/portaudio-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/12/28 23:45:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2012/01/17 21:43:18 sbd Exp $
DISTNAME= pa_snapshot_v19
PKGNAME= portaudio-devel-20060521
@@ -18,7 +18,7 @@ NOT_FOR_PLATFORM= Interix-*-*
USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/portaudio2
+GNU_CONFIGURE_LIBSUBDIR=portaudio2
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2
CONFIGURE_ARGS+= --without-alsa
LDFLAGS+= ${LIBOSSAUDIO}
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 82d9263b007..d36b6a83b98 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2011/08/14 07:38:55 obache Exp $
+# $NetBSD: Makefile,v 1.59 2012/01/17 21:43:18 sbd Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
@@ -31,7 +31,7 @@ MAKE_ENV+= examplesdir=${EGDIR}
CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE}
+GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/${PKGBASE}/help
CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE}
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index e242e393b60..0584ad5f247 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2010/01/29 17:13:36 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2012/01/17 21:43:18 sbd Exp $
DISTNAME= lbdb_0.35.1
PKGNAME= ${DISTNAME:S/_/-/}
@@ -16,7 +16,7 @@ DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
-CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/lbdb
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --enable-lbdb_dotlock
CONFIGURE_ARGS+= --without-getent
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 997b76d5cb0..7649799357b 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2011/12/07 16:00:41 adam Exp $
+# $NetBSD: Makefile.common,v 1.15 2012/01/17 21:43:19 sbd Exp $
#
# used by databases/postgresql90-adminpack/Makefile
# used by databases/postgresql90-client/Makefile
@@ -68,8 +68,8 @@ PG_LOCALE_DIR= ${PG_PREFIX}/${PKGLOCALEDIR}/locale
PG_ETC_DIR= ${PKG_SYSCONFDIR:S/^${PREFIX}\//${PG_PREFIX}\//}
GNU_CONFIGURE= yes
+GNU_CONFIGURE_LIBDIR= ${PG_PREFIX}/lib
CONFIGURE_ARGS+= --bindir=${PG_PREFIX}/bin
-CONFIGURE_ARGS+= --libdir=${PG_PREFIX}/lib
CONFIGURE_ARGS+= --includedir=${PG_PREFIX}/include
CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR}
CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR}
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index f8a4ac34d88..d7c835d37cb 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/12/17 21:27:32 abs Exp $
+# $NetBSD: Makefile,v 1.18 2012/01/17 21:43:19 sbd 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
-CONFIGURE_ARGS+=--libdir=${PREFIX}/libexec
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec
CONFIGURE_ARGS+=--disable-submodel
USE_TOOLS+= soelim
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 05b4c4a1f83..ab65deb36dc 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/04/22 13:43:18 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/01/17 21:43:19 sbd Exp $
#
DISTNAME= gdb-6.2.1
@@ -20,7 +20,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
REPLACE_LOCALEDIR_PATTERNS+= Make-in
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/gdb6
+GNU_CONFIGURE_LIBSUBDIR=gdb6
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gdb6
CONFIGURE_ARGS+= --enable-libada
INFO_FILES= yes
diff --git a/devel/libev/Makefile b/devel/libev/Makefile
index e3e94fd8d22..32bbc108516 100644
--- a/devel/libev/Makefile
+++ b/devel/libev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/03/06 16:09:42 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/01/17 21:43:19 sbd Exp $
DISTNAME= libev-4.04
CATEGORIES= devel
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
#TEST_TARGET= verify
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ev
+GNU_CONFIGURE_LIBSUBDIR=ev
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ev
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/libnet11/Makefile b/devel/libnet11/Makefile
index 1aa2f14cffd..8179f7307fa 100644
--- a/devel/libnet11/Makefile
+++ b/devel/libnet11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/12/09 07:39:30 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/01/17 21:43:19 sbd Exp $
DISTNAME= libnet-1.1.2.1
PKGNAME= ${DISTNAME:S/libnet/libnet11/}
@@ -18,7 +18,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/libnet
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/libnet11
+GNU_CONFIGURE_LIBSUBDIR=libnet11
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/libnet11
LNDOCS= DESIGN_NOTES MIGRATION PACKET_BUILDING RAWSOCKET_NON_SEQUITUR
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 6ffae9d63fb..4a227a2246f 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2011/11/21 21:33:13 seanb Exp $
+# $NetBSD: Makefile,v 1.45 2012/01/17 21:43:19 sbd Exp $
#
.include "../../devel/xulrunner/dist.mk"
@@ -17,6 +17,7 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure
GNU_CONFIGURE= yes
+GNU_CONFIGURE_LIBSUBDIR=nspr
CONFIGURE_DIRS= nsprpub
USE_TOOLS+= autoconf213 gmake perl
@@ -24,7 +25,6 @@ REPLACE_PERL+= nsprpub/pr/src/misc/compile-et.pl
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --with-pthreads
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/nspr
CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr
.include "../../mk/bsd.prefs.mk"
diff --git a/editors/ce/Makefile.common b/editors/ce/Makefile.common
index 8fb07cf60be..1db646db432 100644
--- a/editors/ce/Makefile.common
+++ b/editors/ce/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2009/06/30 00:07:14 joerg Exp $
+# $NetBSD: Makefile.common,v 1.10 2012/01/17 21:43:19 sbd Exp $
#
DISTNAME= ce-${VERSION}
@@ -14,7 +14,7 @@ COMMENT= Chet's Emacs: small, fast emacs-like editor
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/share/doc
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/share/doc
CONFIGURE_ARGS+= --without-ce-malloc
CONFIGURE_ARGS+= --with-curses
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 052310158b7..f45aede6c0a 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2011/11/30 21:07:20 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2012/01/17 21:43:19 sbd Exp $
DISTNAME= pstoedit-3.60
CATEGORIES= converters graphics print
@@ -28,7 +28,7 @@ CONFIGURE_ENV+= ac_cv_path_GS=${TOOLS_PATH.gs}
CONFIGURE_ARGS+=--without-emf
CONFIGURE_ARGS+=--datadir=${PREFIX}/share
-CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit # plugin dir -- unused for now
+GNU_CONFIGURE_LIBSUBDIR=pstoedit # plugin dir -- unused for now
BUILD_TARGET=
LIBS.SunOS+= -ldl
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 686d1d0f95d..c058ca18d00 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2011/12/17 10:16:00 sbd Exp $
+# $NetBSD: Makefile,v 1.74 2012/01/17 21:43:19 sbd Exp $
DISTNAME= nmh-1.3
PKGREVISION= 3
@@ -37,7 +37,7 @@ NMH_MTA?= smtp
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/nmh
+GNU_CONFIGURE_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/misc/gkrellm-leds/Makefile b/misc/gkrellm-leds/Makefile
index ef120217dd7..b060cd477c2 100644
--- a/misc/gkrellm-leds/Makefile
+++ b/misc/gkrellm-leds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/11/01 06:02:04 sbd Exp $
+# $NetBSD: Makefile,v 1.25 2012/01/17 21:43:20 sbd Exp $
#
DISTNAME= gkleds-0.8.2
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/gkrellm2/plugins
+GNU_CONFIGURE_LIBSUBDIR=gkrellm2/plugins
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
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}
diff --git a/print/advi/Makefile b/print/advi/Makefile
index cb2c4328edb..e2f68111de0 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2012/01/13 10:55:29 obache Exp $
+# $NetBSD: Makefile,v 1.41 2012/01/17 21:43:20 sbd Exp $
DISTNAME= advi-1.10.1
PKGREVISION= 3
@@ -20,7 +20,7 @@ DEPENDS+= texlive-tetex>=2010:../../print/texlive-tetex
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake gs:run
-CONFIGURE_ARGS+= --libdir=${PREFIX}/share/texmf-dist
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/share/texmf-dist
CONFIGURE_ARGS+= --with-gs=${PREFIX}/bin/gs
INSTALL_UNSTRIPPED= yes
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 56d7effea73..9fa815483bc 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/26 17:55:05 tez Exp $
+# $NetBSD: Makefile,v 1.6 2012/01/17 21:43:21 sbd Exp $
DISTNAME= clamav-0.97.3
CATEGORIES= security
@@ -25,8 +25,9 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
# pkgsrc enforces a "secure" version of zlib, so don't let this check
# bomb the build.
CONFIGURE_ARGS+= --disable-zlib-vcheck
-# avoid multiarch libdir on Darwin
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib
+# XXX: avoid multiarch libdir on Darwin
+# XXX: should this be set in mk/platforms/Darwin.mk?
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/lib
CHECK_PORTABILITY_SKIP= contrib/* unit_tests/*
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 8bc82674ab8..2a2937a3ef2 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/09/08 20:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/01/17 21:43:21 sbd Exp $
DISTNAME= nettle-2.4
CATEGORIES= devel security
@@ -17,7 +17,6 @@ USE_LIBTOOL= yes
USE_TOOLS+= gm4 gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-openssl
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib
INFO_FILES= yes
TEST_TARGET= check
diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index 0c59513978f..d9b652c6405 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2008/05/01 13:51:56 obache Exp $
+# $NetBSD: Makefile.common,v 1.15 2012/01/17 21:43:21 sbd Exp $
#
DISTNAME= catdoc-0.94.2
@@ -15,7 +15,7 @@ PATCHDIR= ${.CURDIR}/../../textproc/catdoc/patches
USE_FEATURES= glob
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/share
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/share
CONFIGURE_ARGS+= --with-install-root=${DESTDIR}
CPPFLAGS+= -Dunix -D__unix
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 4cb209d1d7f..baaf23a988d 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2011/11/30 11:13:59 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2012/01/17 21:43:21 sbd Exp $
DISTNAME= lighttpd-1.4.29
PKGREVISION= 2
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= # empty
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE}
+GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
CONFIGURE_ARGS+= --with-pcre
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 23:52:16 +0000