[pkgsrc/trunk]: pkgsrc/emulators/xbeeb Fix the mk/oss.buildlink3.mk usage by:

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/452dca21a268
branches:  trunk
changeset: 518897:452dca21a268
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Fri Sep 22 13:21:37 2006 +0000

description:
Fix the mk/oss.buildlink3.mk usage by:

1. Using ${LIBOSSAUDIO} instead of assuming -lossaudio
2. Disabling sound entirely if ${OSS_TYPE} == none

This should fix the build for every platform but NetBSD (tested on Solaris),
and no change for NetBSD builds.

diffstat:

 emulators/xbeeb/Makefile         |  31 ++++++++++++++++++++++++++-----
 emulators/xbeeb/distinfo         |   3 +--
 emulators/xbeeb/patches/patch-aa |  13 -------------
 3 files changed, 27 insertions(+), 20 deletions(-)

diffs (90 lines):

diff -r b01fe03591f6 -r 452dca21a268 emulators/xbeeb/Makefile
--- a/emulators/xbeeb/Makefile  Fri Sep 22 12:03:06 2006 +0000
+++ b/emulators/xbeeb/Makefile  Fri Sep 22 13:21:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/17 06:37:55 dsainty Exp $
+# $NetBSD: Makefile,v 1.20 2006/09/22 13:21:37 dsainty Exp $
 #
 
 DISTNAME=      xbeeb-0.4.1
@@ -40,17 +40,39 @@
 SUBST_SED.nomitshm=    -e "s|\#define  *MITSHM|\#undef MITSHM|"
 .endif
 
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+
 SUBST_CLASSES+=                dsp
 SUBST_STAGE.dsp=       post-patch
-SUBST_MESSAGE.dsp=     Adjusting sound device path.
+SUBST_MESSAGE.dsp=     Adjusting sound device path
 SUBST_FILES.dsp=       src/SoundOSS.c
 SUBST_SED.dsp=         -e "s|\"/dev/dsp\"|\"${DEVOSSAUDIO}\"|"
 
+SUBST_CLASSES+=                osslib
+SUBST_STAGE.osslib=    post-patch
+SUBST_MESSAGE.osslib=  Linking OSS library
+SUBST_FILES.osslib=    src/Imakefile
+SUBST_SED.osslib=      -e "s|\\(SYS_LIBRARIES[  ]*=.*\\)|\\1 ${LIBOSSAUDIO}|"
+
+.else
+
+SUBST_CLASSES+=                nooss
+SUBST_STAGE.nooss=     post-patch
+SUBST_MESSAGE.nooss=   Disabling sound support: No OSS on this platform
+SUBST_FILES.nooss=     src/Config.h
+SUBST_SED.nooss=       -e "s|^\#define\\([      ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
+
+.endif # OSS_TYPE
+
+
 SUBST_CLASSES+=                beebroot
 SUBST_STAGE.beebroot=  post-patch
-SUBST_MESSAGE.beebroot=        Adjusting XBEEBROOT path.
+SUBST_MESSAGE.beebroot=        Adjusting XBEEBROOT path
 SUBST_FILES.beebroot=  src/Config.h
-SUBST_SED.beebroot=    -e "s|^\(\#define[       ]*XBEEBROOT[    ]*\)[^  ].*$$|\1\"${PREFIX}/${XBEEBROOT}/\"|"
+SUBST_SED.beebroot=    -e "s|^\\(\#define[      ]*XBEEBROOT[    ]*\\)[^         ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|"
 
 # xbeeb build starts in the source directory
 do-configure:
@@ -83,6 +105,5 @@
        ${CP} ${WRKSRC}/fonts/*.pcf ${PREFIX}/lib/X11/fonts/xbeeb
        mkfontdir ${PREFIX}/lib/X11/fonts/xbeeb
 
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b01fe03591f6 -r 452dca21a268 emulators/xbeeb/distinfo
--- a/emulators/xbeeb/distinfo  Fri Sep 22 12:03:06 2006 +0000
+++ b/emulators/xbeeb/distinfo  Fri Sep 22 13:21:37 2006 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/09/21 21:47:32 dsainty Exp $
+$NetBSD: distinfo,v 1.7 2006/09/22 13:21:37 dsainty Exp $
 
 SHA1 (xbeeb-0.4.1.tgz) = 5e2fccfabd0aa5a656758b2ea0536570a790dabe
 RMD160 (xbeeb-0.4.1.tgz) = 67dba3262f7e5886a86e5656288d807fea540d9b
 Size (xbeeb-0.4.1.tgz) = 351715 bytes
-SHA1 (patch-aa) = 68b91908397147aecf1e1644f597802d6380aa96
 SHA1 (patch-ab) = 704fca768a80b17e3aed1ebb8c6525c52f30e3f0
 SHA1 (patch-ac) = 72622acf9671ac0f72bd9b8271fc17f25d3655f1
 SHA1 (patch-ad) = 733916029e94e65ee7702778ce344468ab3cf658
diff -r b01fe03591f6 -r 452dca21a268 emulators/xbeeb/patches/patch-aa
--- a/emulators/xbeeb/patches/patch-aa  Fri Sep 22 12:03:06 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/22 22:13:12 skrll Exp $
-
---- src/Imakefile      Tue Oct  8 13:04:30 1996
-+++ src/Imakefile      Sat Apr 29 16:46:01 2000
-@@ -76,7 +76,7 @@
- #
- # SYS_LIBRARIES may need to include -lsocket and -lnsl...
- #
--SYS_LIBRARIES = -lm
-+SYS_LIBRARIES = -lm -lossaudio
- 
- #
- # LOCAL_LIBRARIES are the X libraries to link...