summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-10-18 13:43:37 +0000
committerjlam <jlam@pkgsrc.org>2002-10-18 13:43:37 +0000
commitbfc2aaa7fee6401ba0d8c2399a732673fe90b584 (patch)
treef2a3240e030fbb8ec20836f00e437d698ce93000 /audio
parent5db90508d598e6a9dc5c7bda02015c4a27354bed (diff)
downloadpkgsrc-bfc2aaa7fee6401ba0d8c2399a732673fe90b584.tar.gz
ossxmix also needs to be wrapped as it may also use ui_X.so.
Diffstat (limited to 'audio')
-rw-r--r--audio/oss/Makefile13
-rw-r--r--audio/oss/files/wrapper.sh (renamed from audio/oss/files/soundconf.sh)4
2 files changed, 11 insertions, 6 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 404ef3e2d97..fe55e6d8725 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/18 01:34:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/18 13:43:37 jlam Exp $
PKGNAME= oss-${OSS_VERSION}
CATEGORIES= audio sysutils
@@ -65,8 +65,11 @@ post-extract:
${CHMOD} +x ${WRKSRC}/install.sh
do-build:
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/soundconf.sh \
- > ${WRKDIR}/soundconf.sh
+ @for file in ossxmix soundconf; do \
+ ${SED} ${FILES_SUBST_SED} \
+ -e "s|@OSS_WRAPPEE@|${OSSLIBDIR}/$${file}|g" \
+ ${FILESDIR}/wrapper.sh > ${WRKDIR}/$${file}.sh; \
+ done
chroot:
${PAX} -rw `${CAT} ${FILESDIR}/chroot` ${WRKSRC}
@@ -81,13 +84,13 @@ do-install: chroot
${INSTALL_DATA} ${FILESDIR}/MAKEDEV.oss ${OSSLIBDIR}
${LN} -sf ../lib/oss/mixer ${PREFIX}/bin/ossmixer
${LN} -sf ../lib/oss/mplay ${PREFIX}/bin/ossmplay
- ${LN} -sf ../lib/oss/ossxmix ${PREFIX}/bin/ossxmix
+ ${INSTALL_SCRIPT} ${WRKDIR}/ossxmix.sh ${PREFIX}/bin/ossxmix
${LN} -sf ../lib/oss/play ${PREFIX}/bin/ossplay
${LN} -sf ../lib/oss/record ${PREFIX}/bin/ossrecord
${LN} -sf ../lib/oss/savemixer ${PREFIX}/bin/osssavemixer
+ ${INSTALL_SCRIPT} ${WRKDIR}/soundconf.sh ${PREFIX}/sbin/soundconf
${LN} -sf ../lib/oss/soundoff ${PREFIX}/sbin/soundoff
${LN} -sf ../lib/oss/soundon ${PREFIX}/sbin/soundon
- ${INSTALL_SCRIPT} ${WRKDIR}/soundconf.sh ${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/wrapper.sh
index 3056e52ea66..70a4765b946 100644
--- a/audio/oss/files/soundconf.sh
+++ b/audio/oss/files/wrapper.sh
@@ -1,4 +1,6 @@
#!/bin/sh
+#
+# $NetBSD: wrapper.sh,v 1.1 2002/10/18 13:43:38 jlam Exp $
# ui_X.so expects the GTK+-1.x libraries to be found in /usr/pkg/lib
if [ -z "${LD_LIBRARY_PATH}" ]; then
@@ -8,4 +10,4 @@ else
fi
export LD_LIBRARY_PATH
-exec @OSSLIBDIR@/soundconf "$@"
+exec @OSS_WRAPPEE@ "$@"