summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2002-10-18 01:32:01 +0000
committerjlam <jlam>2002-10-18 01:32:01 +0000
commit01ba0fbb6afbb51f72a3a7ad13b5efad36e2a298 (patch)
tree9c58748508b009d3dc50cb3513671a1d000199b3
parentc184f0e129a056c5522ff9ace813e685976e79b5 (diff)
downloadpkgsrc-01ba0fbb6afbb51f72a3a7ad13b5efad36e2a298.tar.gz
ui_X.so expects the GTK+-1.x libraries to be in /usr/pkg, so explicitly
set the LD_LIBRARY_PATH in case ${LOCALBASE} != "/usr/pkg".
-rw-r--r--audio/oss/Makefile9
-rw-r--r--audio/oss/files/soundconf.sh11
2 files changed, 17 insertions, 3 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 6f8f1227be7..d92c8100079 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/10/16 23:12:02 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/18 01:32:01 jlam Exp $
PKGNAME= oss-${OSS_VERSION}
CATEGORIES= audio sysutils
@@ -30,7 +30,6 @@ NO_BIN_ON_FTP= ${RESTRICTED}
USE_BUILDLINK2= # defined
NO_CONFIGURE= # defined
-NO_BUILD= # defined
.if ${OPSYS} == "NetBSD"
MODSTAT= /usr/bin/modstat
@@ -65,6 +64,10 @@ post-extract:
) > ${WRKSRC}/install.sh
${CHMOD} +x ${WRKSRC}/install.sh
+do-build:
+ ${SED} ${FILES_SUBST_SED} ${FILESDIR}/soundconf.sh \
+ ${WRKDIR}/soundconf.sh
+
chroot:
${PAX} -rw `${CAT} ${FILESDIR}/chroot` ${WRKSRC}
${CHROOT} -u ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC} ./install.sh
@@ -82,9 +85,9 @@ do-install: chroot
${LN} -sf ../lib/oss/play ${PREFIX}/bin/ossplay
${LN} -sf ../lib/oss/record ${PREFIX}/bin/ossrecord
${LN} -sf ../lib/oss/savemixer ${PREFIX}/bin/osssavemixer
- ${LN} -sf ../lib/oss/soundconf ${PREFIX}/sbin/soundconf
${LN} -sf ../lib/oss/soundoff ${PREFIX}/sbin/soundoff
${LN} -sf ../lib/oss/soundon ${PREFIX}/sbin/soundon
+ ${INSTALL_SCRIPT} ${WRKDIR}/soundconf ${PREFIX}/sbin/soundconf
${RM} -rf ${WRKSRC}/bin ${WRKSRC}/sbin ${WRKSRC}/usr
${RM} -f ${WRKSRC}/dev/mixer0 ${WRKSRC}/dev/null
diff --git a/audio/oss/files/soundconf.sh b/audio/oss/files/soundconf.sh
new file mode 100644
index 00000000000..3056e52ea66
--- /dev/null
+++ b/audio/oss/files/soundconf.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# ui_X.so expects the GTK+-1.x libraries to be found in /usr/pkg/lib
+if [ -z "${LD_LIBRARY_PATH}" ]; then
+ LD_LIBRARY_PATH=@PREFIX@/lib
+else
+ LD_LIBRARY_PATH=@PREFIX@/lib:${LD_LIBRARY_PATH}
+fi
+export LD_LIBRARY_PATH
+
+exec @OSSLIBDIR@/soundconf "$@"