summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-11-25 12:47:55 +0000
committerjperkin <jperkin@pkgsrc.org>2015-11-25 12:47:55 +0000
commit0103be5bc342327092ace1c5efde031e687be3d1 (patch)
tree2e373ef4de29643ccffbd186d302b5ffacd850cd
parentf846bf1141fe294eae944f234022576916cbf8e9 (diff)
downloadpkgsrc-0103be5bc342327092ace1c5efde031e687be3d1.tar.gz
Remove mk/find-prefix.mk usage from the audio category.
The find-prefix infrastructure was required in a pkgviews world where packages installed from pkgsrc could have different installation prefixes, and this was a way for a dependency prefix to be determined. Now that pkgviews has been removed there is no longer any need for the overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the dependency is coming from pkgsrc. Provides a reasonable performance win due to the reduction of `pkg_info -qp` calls, some of which were redundant anyway as they were duplicating the same information provided by BUILDLINK_PREFIX.pkg.
-rw-r--r--audio/gimmix/Makefile4
-rw-r--r--audio/libmp3splt/Makefile9
2 files changed, 5 insertions, 8 deletions
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index b6c5c0850e8..d212b9e1c37 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/04/25 14:20:20 tnn Exp $
+# $NetBSD: Makefile,v 1.38 2015/11/25 12:47:55 jperkin Exp $
#
DISTNAME= gimmix-0.5.7.1
@@ -20,7 +20,7 @@ USE_TOOLS+= intltool gmake msgfmt pkg-config
# fixes broken symbolic link to /usr/share/intltool/Makefile.in.in
post-extract:
rm -f ${WRKSRC}/po/Makefile.in.in
- ln -s ${TOOLS_PREFIX.intltool:Q}/share/intltool/Makefile.in.in \
+ ln -s ${LOCALBASE}/share/intltool/Makefile.in.in \
${WRKSRC}/po/Makefile.in.in
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 4cf76becaa1..a783da4649c 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/07/05 16:12:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2015/11/25 12:47:55 jperkin Exp $
#
DISTNAME= libmp3splt-0.8.2
@@ -16,11 +16,8 @@ USE_TOOLS+= pkg-config
LIBS.SunOS+= -lresolv
-FIND_PREFIX:= LTDLDIR=libltdl
-.include "../../mk/find-prefix.mk"
-
-CONFIGURE_ARGS+= --with-ltdl-include=${LTDLDIR}/include
-CONFIGURE_ARGS+= --with-ltdl-lib=${LTDLDIR}/lib
+CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
+CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"