diff options
| author | mycroft <mycroft@pkgsrc.org> | 1998-08-31 08:12:19 +0000 |
|---|---|---|
| committer | mycroft <mycroft@pkgsrc.org> | 1998-08-31 08:12:19 +0000 |
| commit | a492d4b8866b2c6ddf3676e5b119cd597a982556 (patch) | |
| tree | 0fd603211b566079303e7b1b94b02ddd6534518e /emulators/xmess | |
| parent | 1e6049e63fe1592c12418cc0d5bc0a51c225481c (diff) | |
| download | pkgsrc-a492d4b8866b2c6ddf3676e5b119cd597a982556.tar.gz | |
Allow the display type to be overridden from the pkg Makefile.
Diffstat (limited to 'emulators/xmess')
| -rw-r--r-- | emulators/xmess/Makefile | 8 | ||||
| -rw-r--r-- | emulators/xmess/patches/patch-aa | 23 |
2 files changed, 21 insertions, 10 deletions
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index 2e1031a06cd..807ecb4fa6f 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/08/29 04:24:28 mycroft Exp $ +# $NetBSD: Makefile,v 1.4 1998/08/31 08:12:20 mycroft Exp $ # DISTNAME= unix02b4 @@ -20,9 +20,11 @@ USE_GMAKE= yes MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \ INSTALL_MAN="${INSTALL_MAN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" + NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \ + DISPLAY_METHOD="${DISPLAY_METHOD}" MAKEFILE= makefile.unix -ALL_TARGET= xmess.x11 +DISPLAY_METHOD= x11 +ALL_TARGET= xmess.${DISPLAY_METHOD} WRKSRC= ${WRKDIR}/xmess-0.2b4.1 diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa index d7e63e66cd0..9dc57c28993 100644 --- a/emulators/xmess/patches/patch-aa +++ b/emulators/xmess/patches/patch-aa @@ -1,7 +1,5 @@ -$NetBSD: patch-aa,v 1.7 1998/08/29 21:32:05 mycroft Exp $ - --- makefile.unix.orig Wed Aug 26 18:40:21 1998 -+++ makefile.unix Fri Aug 28 23:23:33 1998 ++++ makefile.unix Mon Aug 31 04:06:42 1998 @@ -39,7 +39,7 @@ # GNU MAKE is MANDATORY !!! # so please give me the path... @@ -68,12 +66,23 @@ $NetBSD: patch-aa,v 1.7 1998/08/29 21:32:05 mycroft Exp $ # *** When using timer, you should provide the frequency to generate audio sample # frames in your system. See readme.unix notes about these item -@@ -215,14 +219,14 @@ +@@ -192,7 +196,7 @@ + # note: x11 is the only one supported on all platforms + + ### normal X11 +-DISPLAY_METHOD = x11 ++#DISPLAY_METHOD = x11 + ### XFree86's DGA extension, only tested under linux + #DISPLAY_METHOD = xf86_dga + ### svgalib, only supported under linux +@@ -215,14 +219,16 @@ # *** If you haven't the MIT-Shared Memory X Extensions, comment the following: # ( Test if available by mean of xdpyinfo command ) # Comment it if not compiling for normal x11 -# MSHM = -DUSE_MITSHM ++ifeq (${DISPLAY_METHOD},x11) +MSHM = -DUSE_MITSHM ++endif # standard location for X11 # X11INC = -I/usr/include/X11 @@ -86,7 +95,7 @@ $NetBSD: patch-aa,v 1.7 1998/08/29 21:32:05 mycroft Exp $ # for Sun systems # X11INC = -I/usr/openwin/include # X11LIB = -L/usr/openwin/lib -@@ -243,11 +247,12 @@ +@@ -243,11 +249,12 @@ ######## Alpha/Linux # ARCH = linux_alpha ######## ix86/Linux @@ -101,7 +110,7 @@ $NetBSD: patch-aa,v 1.7 1998/08/29 21:32:05 mycroft Exp $ ######## Sparc/SunOS ( no sound ) # ARCH = sunos ######## ix86/Solaris -@@ -282,7 +287,11 @@ +@@ -282,7 +289,11 @@ DEFS.linux_alpha = -Dlinux -DLSB_FIRST -DAXP_ASM -DACORN DEFS.linux_i386 = -Dlinux -DLSB_FIRST -DX86_ASM DEFS.FREEBSD = -DLSB_FIRST -DX86_ASM -Dlinux -DFREEBSD_SOUND_WORKAROUND @@ -114,7 +123,7 @@ $NetBSD: patch-aa,v 1.7 1998/08/29 21:32:05 mycroft Exp $ DEFS.sunos = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN DEFS.solaris = -Dsun -DACORN DEFS.solaris_i386 = -DLSB_FIRST -Dsun -Dsolaris -@@ -300,12 +309,14 @@ +@@ -300,12 +311,14 @@ LIBS.solaris_i386 = -lm -lnsl -lsocket LIBS.irix = -lm -laudio LIBS.aix = -lm -lUMSobj |