diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-06-25 19:52:12 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-06-25 19:52:12 +0000 |
| commit | 2b3aabdf90662ca4daf181f9df2e6eae38ae49ee (patch) | |
| tree | 2df9a5d6a9d95c73d07bde669670af902076d188 | |
| parent | 63885039725e0cc8334c632be98879352dfdae24 (diff) | |
Notes
| -rw-r--r-- | audio/oss/Makefile | 3 | ||||
| -rw-r--r-- | audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c | 11 | ||||
| -rw-r--r-- | audio/oss/files/patch-setup-FreeBSD-sbin-soundon | 22 | ||||
| -rw-r--r-- | audio/oss/pkg-plist | 1 |
4 files changed, 23 insertions, 14 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile index 9d3e17612968..99275af60bc9 100644 --- a/audio/oss/Makefile +++ b/audio/oss/Makefile @@ -7,6 +7,7 @@ PORTNAME= oss DISTVERSION= 4.0-build1003 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://developer.opensound.com/sources/stable/ DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-gpl @@ -35,7 +36,7 @@ IGNORE= requires kernel source to be installed do-configure: ${MKDIR} ${WRKSRC} cd ${WRKSRC} && ${WRKDIR}/${DISTNAME}/configure - ${FIND} ${WRKDIR}/${DISTNAME} -type f -name '*.[hc]' | ${XARGS} ${REINPLACE_CMD} \ + ${FIND} ${WRKDIR}/${DISTNAME} -type f -name '*.[hc]' -or -name '*.man' | ${XARGS} ${REINPLACE_CMD} \ -e 's|"/usr/include/stdarg.h"|<stdarg.h>|g' \ -e 's|/usr/|${PREFIX}/|g' \ -e 's|/etc/oss|${PREFIX}/etc/oss|g' diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c deleted file mode 100644 index 099afcad7bab..000000000000 --- a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c +++ /dev/null @@ -1,11 +0,0 @@ ---- setup/FreeBSD/oss/build/osscore.c.orig Fri Jun 15 22:37:18 2007 -+++ setup/FreeBSD/oss/build/osscore.c Fri Jun 15 22:37:28 2007 -@@ -7,7 +7,7 @@ - * In this way the same OSS binary package can be used with several FreeBSD - * versions. - */ --#include "/usr/include/stdarg.h" -+#include <stdarg.h> - #include <sys/param.h> /* defines used in kernel.h */ - #include <sys/module.h> - #include <sys/systm.h> diff --git a/audio/oss/files/patch-setup-FreeBSD-sbin-soundon b/audio/oss/files/patch-setup-FreeBSD-sbin-soundon index c7041f2ad13f..eccd421ccb6c 100644 --- a/audio/oss/files/patch-setup-FreeBSD-sbin-soundon +++ b/audio/oss/files/patch-setup-FreeBSD-sbin-soundon @@ -1,5 +1,5 @@ ---- setup/FreeBSD/sbin/soundon.orig Fri Jun 22 15:26:04 2007 -+++ setup/FreeBSD/sbin/soundon Fri Jun 22 15:29:46 2007 +--- setup/FreeBSD/sbin/soundon.orig Tue Feb 20 23:36:33 2007 ++++ setup/FreeBSD/sbin/soundon Mon Jun 25 14:21:10 2007 @@ -1,13 +1,13 @@ #!/bin/sh @@ -27,6 +27,24 @@ fi if ! /sbin/kldload $OSSLIBDIR/modules/osscore.ko +@@ -50,7 +50,7 @@ + done + + echo "+++ ossinfo -v3 +++" >> $LOG +-ossinfo -v3 >> $LOG 2>&1 ++%%PREFIX%%/bin/ossinfo -v3 >> $LOG 2>&1 + echo "+++ /dev/sndstat +++" >> $LOG + cat /dev/sndstat >> $LOG 2>&1 + echo "+++ dmesg +++" >> $LOG +@@ -65,7 +65,7 @@ + sh $OSSLIBDIR/etc/legacy_devices >> $LOG 2>&1 + fi + +-/usr/sbin/ossdevlinks -v >> $LOG 2>&1 ++%%PREFIX%%/sbin/ossdevlinks -v >> $LOG 2>&1 + + if test ! -f /dev/dsp + then @@ -74,7 +74,7 @@ ls -l /dev/dsp* /dev/sndstat /dev/mixer* /dev/oss/*/* >> $LOG 2>&1 diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist index e9caf0973dfb..78e5438b4e27 100644 --- a/audio/oss/pkg-plist +++ b/audio/oss/pkg-plist @@ -52,6 +52,7 @@ lib/oss/modules/ymf7xx.ko @dirrm lib/oss/modules lib/oss/etc/devices.list @unexec rm -f %D/lib/oss/etc/installed_drivers +@unexec rm -f %D/lib/oss/etc/legacy_devices @dirrm lib/oss/etc lib/oss/version.dat lib/oss/sysfiles.list |