summaryrefslogtreecommitdiff
path: root/audio/jack
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-07-04 16:18:28 +0000
committerjoerg <joerg@pkgsrc.org>2015-07-04 16:18:28 +0000
commit40359543350f97f6f4ce738f77467358da339880 (patch)
treed8a48c8d2848b617581f63aeec6454f4736400cd /audio/jack
parent87993e055fdcca0d2b61250e291a62eff0eb64ff (diff)
downloadpkgsrc-40359543350f97f6f4ce738f77467358da339880.tar.gz
Remove USE_X11BASE and X11PREFIX.
Diffstat (limited to 'audio/jack')
-rw-r--r--audio/jack/Makefile4
-rw-r--r--audio/jack/distinfo4
-rw-r--r--audio/jack/patches/patch-ak4
3 files changed, 6 insertions, 6 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 9dd820e6c72..2f139f57511 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/01/27 04:37:53 dbj Exp $
+# $NetBSD: Makefile,v 1.31 2015/07/04 16:18:28 joerg Exp $
#
DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
@@ -99,7 +99,7 @@ SUBST_CLASSES+= jacksrc
SUBST_FILES.jacksrc= libjack/unlock.c
SUBST_MESSAGE.jacksrc= Peforming substitutions in JACK sources.
SUBST_STAGE.jacksrc= pre-build
-SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH
+SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH X11BASE
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
PKG_OPTIONS_VAR= PKG_OPTIONS.jack
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index f65fb1a82c7..c416b6c590c 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/01/27 04:37:53 dbj Exp $
+$NetBSD: distinfo,v 1.16 2015/07/04 16:18:28 joerg Exp $
SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e
RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705
@@ -9,7 +9,7 @@ SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488
SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07
-SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
+SHA1 (patch-ak) = 90006096f7c4035edea75ebebeff58c18f04e39e
SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f
SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859
diff --git a/audio/jack/patches/patch-ak b/audio/jack/patches/patch-ak
index 80e2aa6dfb2..fb29a2cdf93 100644
--- a/audio/jack/patches/patch-ak
+++ b/audio/jack/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: patch-ak,v 1.3 2015/07/04 16:18:28 joerg Exp $
Yuck. At least let's attempt to make this somewhat sane.
When I have the time and figure out the Right Thing(tm)
@@ -11,7 +11,7 @@ to do, perhaps I'll rewrite some of the shm code.
"/lib",
"/usr/lib",
+ "@PREFIX@", /* pkgsrc prefix */
-+ "@X11PREFIX@/lib",
++ "@X11BASE@/lib",
"/usr/local/lib",
- "/usr/X11R6/lib",
"/opt/lib", /* solaris-y */