summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2012-01-26 06:34:18 +0000
committersbd <sbd@pkgsrc.org>2012-01-26 06:34:18 +0000
commitf53b9cdd600e51ea749d9bc9d6dce0704480c2bf (patch)
treed9f60629d485b12a4b71d0ed6d4d60839b0e2e95
parent7c53d3fc671b4ba059e3e77a370819186e6655a9 (diff)
downloadpkgsrc-f53b9cdd600e51ea749d9bc9d6dce0704480c2bf.tar.gz
Use SET_LIBDIR with packages that want to use to lib64
-rw-r--r--audio/akode/Makefile.common3
-rw-r--r--audio/jack/Makefile3
-rw-r--r--meta-pkgs/kde3/Makefile.kde33
-rw-r--r--security/clamav/Makefile6
4 files changed, 8 insertions, 7 deletions
diff --git a/audio/akode/Makefile.common b/audio/akode/Makefile.common
index 0c98ffe82de..c6d314f5bce 100644
--- a/audio/akode/Makefile.common
+++ b/audio/akode/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2011/02/28 14:52:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2012/01/26 06:34:18 sbd Exp $
#
# used by audio/akode/Makefile
# used by audio/akode-plugins-alsa/Makefile
@@ -24,6 +24,7 @@ HOMEPAGE= http://carewolf.com/akode/
WRKSRC= ${WRKDIR}/akode-${AKODE_VERSION}
GNU_CONFIGURE= yes
+SET_LIBDIR= yes
USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 96ac9660961..a55158bfbd8 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/01/17 21:43:18 sbd Exp $
+# $NetBSD: Makefile,v 1.21 2012/01/26 06:34:19 sbd Exp $
#
DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
@@ -20,6 +20,7 @@ BUILD_DEFS+= JACKD_DEFAULT_TMPDIR
BUILD_DEFS+= JACKD_PROCFS_PATH
GNU_CONFIGURE= yes
+SET_LIBDIR= yes
USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3
index d7584fd83f4..d7c609c8a4f 100644
--- a/meta-pkgs/kde3/Makefile.kde3
+++ b/meta-pkgs/kde3/Makefile.kde3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kde3,v 1.43 2008/08/27 11:59:13 markd Exp $
+# $NetBSD: Makefile.kde3,v 1.44 2012/01/26 06:34:19 sbd Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# KDE3-distributed packages (they all share common configure and build
@@ -16,5 +16,6 @@ HOMEPAGE?= http://www.kde.org/
USE_TOOLS+= gmake imake perl
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
+SET_LIBDIR= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= # empty
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 9fa815483bc..fa306edbda6 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/01/17 21:43:21 sbd Exp $
+# $NetBSD: Makefile,v 1.7 2012/01/26 06:34:19 sbd Exp $
DISTNAME= clamav-0.97.3
CATEGORIES= security
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+SET_LIBDIR= yes
CONFIGURE_ARGS+= --disable-clamav
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
@@ -25,9 +26,6 @@ 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
-# 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/*