kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

/usr/X11R6 => ${X11BASE}, -lossaudio => ${LIBOSSAUDIO}

Browse source 
Add DragonFly support.
This commit is contained in:
joerg 2006-01-12 21:05:19 +00:00
parent b1bca662e1
commit 4f596f7205
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emulators/xm7/distinfo
View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.8 2005/02/23 18:49:22 agc Exp $
$NetBSD: distinfo,v 1.9 2006/01/12 21:05:19 joerg Exp $
SHA1 (xm71010s.lzh) = 1afad6f530e05545505582d47bb0aa92965e6f71
RMD160 (xm71010s.lzh) = df1d96fa997c39ab6bbd0c9d3953a90cfbfb9efa
Size (xm71010s.lzh) = 273065 bytes
SHA1 (patch-aa) = fbff0be72f42200299bd11dae215955860eceed5
SHA1 (patch-aa) = b49f4dac3dde6395fcf1d4ab0c987d577e5e9ce4
SHA1 (patch-ab) = 09529a433f5ae6ebf2dedee1d4c29bee27819f75
SHA1 (patch-ac) = e55f25cb7046455489ab052dbe268043983a9e5f
SHA1 (patch-ad) = dfeb6e5f824b99f5464c719e8a658a7c501ff8fc
SHA1 (patch-ad) = d92ce48806c57a8cf0447f3e647202709e9a63d3

20
emulators/xm7/patches/patch-aa
View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.5 2002/06/15 07:31:19 cjep Exp $
$NetBSD: patch-aa,v 1.6 2006/01/12 21:05:19 joerg Exp $
--- makefile.x11.orig Thu Mar 23 01:01:00 2000
+++ makefile.x11 Sat Aug 12 12:54:54 2000
--- makefile.x11.orig 2000-03-22 16:01:00.000000000 +0000
+++ makefile.x11
@@ -6,21 +6,29 @@
COMMONSRC = \
@ -34,19 +34,20 @@ $NetBSD: patch-aa,v 1.5 2002/06/15 07:31:19 cjep Exp $
LOCALOBJ = \
xw_disp.o xw_key.o xw_main.o xw_file.o xw_snd.o
@@ -29,22 +37,27 @@
@@ -29,22 +37,27 @@ LOCALOBJ = \
SRCS = ${COMMONSRC} ${LOCALSRC}
OBJS = ${COMMONOBJ} ${LOCALOBJ}
#LIBS = -L/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc
-LIBS = -L/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++
+LIBS = -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \
+ -lossaudio
+LIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \
+ ${LIBOSSAUDIO}
#CFLAGS = -D_XWIN -DNDEBUG -O3 -funroll-loops -I/usr/X11R6/include -I.
+.if defined(__i386__)
CFLAGS = -D_XWIN -DNDEBUG -DCPU_ASM -O3 -I/usr/X11R6/include -I.
-CFLAGS = -D_XWIN -DNDEBUG -DCPU_ASM -O3 -I/usr/X11R6/include -I.
+CFLAGS = -D_XWIN -DNDEBUG -DCPU_ASM -O3 -I${X11BASE}/include -I.
+.else
+CFLAGS = -D_XWIN -DNDEBUG -O3 -I/usr/X11R6/include -I.
+CFLAGS = -D_XWIN -DNDEBUG -O3 -I${X11BASE}/include -I.
+.endif
ASFLAGS = -f elf -d _XWIN
@ -66,7 +67,7 @@ $NetBSD: patch-aa,v 1.5 2002/06/15 07:31:19 cjep Exp $
.asm.o:
nasm ${ASFLAGS} $<
@@ -56,7 +69,7 @@
@@ -56,7 +69,7 @@ linkclean:
find . -type l -exec rm -f {} \;
convert:
@ -75,4 +76,5 @@ $NetBSD: patch-aa,v 1.5 2002/06/15 07:31:19 cjep Exp $
symlink:
- ./symlink.sh
\ No newline at end of file
+ sh ./symlink.sh

18
emulators/xm7/patches/patch-ad
View file

@ -1,12 +1,16 @@
$NetBSD: patch-ad,v 1.1.1.1 2000/12/13 17:12:19 kei Exp $
$NetBSD: patch-ad,v 1.2 2006/01/12 21:05:19 joerg Exp $
--- xw_snd.cpp.orig Sat Aug 12 12:33:21 2000
+++ xw_snd.cpp Sat Aug 12 12:36:19 2000
@@ -24,6 +24,8 @@
--- xw_snd.cpp.orig 2000-03-22 16:01:00.000000000 +0000
+++ xw_snd.cpp
@@ -22,8 +22,10 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#ifdef __FreeBSD__
#include <machine/soundcard.h>
+#elif defined(__NetBSD__)
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/soundcard.h>
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+#include <soundcard.h>
#else
#include <linux/soundcard.h>