Date: Wed, 12 Dec 2001 11:19:59 +0100 (CET) From: stijn@win.tue.nl To: FreeBSD-gnats-submit@freebsd.org Subject: ports/32742: [MAINTAINER UPDATE]: emulators/xmess Message-ID: <200112121019.fBCAJxL26388@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 32742
>Category: ports
>Synopsis: [MAINTAINER UPDATE]: emulators/xmess
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 12 02:30:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD 4.4-STABLE #0: Thu Nov 15 09:17:23 CET 2001
>Description:
- Fix build of xmess (broken due to differences in patches w/ xmame master
port)
- Adds 2 xmess specific patches (files/patch-ac files/patch-ad)
>How-To-Repeat:
N/A
>Fix:
diff -urN --exclude=CVS /usr/ports/emulators/xmess/Makefile xmess/Makefile
--- /usr/ports/emulators/xmess/Makefile Sat Sep 1 21:18:06 2001
+++ xmess/Makefile Wed Dec 12 11:05:07 2001
@@ -11,6 +11,7 @@
MAINTAINER= stijn@win.tue.nl
MASTERDIR= ${.CURDIR}/../xmame
+PATCHDIR= $(.CURDIR)/files
COMMENT= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-ac xmess/files/patch-ac
--- /usr/ports/emulators/xmess/files/patch-ac Thu Jan 1 01:00:00 1970
+++ xmess/files/patch-ac Wed Dec 12 11:03:51 2001
@@ -0,0 +1,47 @@
+--- src/unix/unix.mak.orig Fri Aug 10 07:36:22 2001
++++ src/unix/unix.mak Wed Dec 12 11:02:58 2001
+@@ -44,20 +44,20 @@
+
+ # svga and ggi also use $(X11LIB) since that's where zlib often is
+ LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext
+-LIBS.svgalib = $(X11LIB) -lvga -lvgagl
++LIBS.svgalib = -L$(LOCALBASE)/lib -lvga -lvgagl
+ LIBS.ggi = $(X11LIB) -lggi
+-LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
++LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L$(LOCALBASE)/lib -ljpeg
+ LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
+ LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
+ LIBS.openstep = -framework AppKit
+-LIBS.SDL = -ldl -lSDL -lpthread -D_REENTRANT
++LIBS.SDL = `$(SDL_CONFIG) --libs`
+ LIBS.photon2 = -L/usr/lib -lph -lphrender
+
+ CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS)
+-CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS)
++CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include $(PTHREAD_CFLAGS)
+ CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
+ CFLAGS.svgafx = -I/usr/include/glide
+-CFLAGS.SDL = -D_REENTRANT
++CFLAGS.SDL = `$(SDL_CONFIG) --cflags`
+ CFLAGS.photon2 =
+
+ INST.x11 = doinstall
+@@ -332,7 +332,7 @@
+
+ doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
+- grep -v loadconfig > doc/x$(TARGET)rc.dist
++ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist
+ cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
+
+ doc/gamelist.$(TARGET): all
+@@ -341,7 +341,8 @@
+
+ doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
+ cat src/unix/xmame.6-1 > doc/x$(TARGET).6
+- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
++ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \
++ tr "\033" \# >> doc/x$(TARGET).6
+ cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
+
+ install: $(INST.$(DISPLAY_METHOD)) install-man
diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-ad xmess/files/patch-ad
--- /usr/ports/emulators/xmess/files/patch-ad Thu Jan 1 01:00:00 1970
+++ xmess/files/patch-ad Wed Dec 12 09:33:11 2001
@@ -0,0 +1,13 @@
+--- src/unix/video-drivers/svgainput.c.orig Tue Oct 16 11:06:30 2001
++++ src/unix/video-drivers/svgainput.c Tue Oct 16 11:05:37 2001
+@@ -12,6 +12,10 @@
+ #include "devices.h"
+ #include "keyboard.h"
+
++#ifdef __FreeBSD__
++#define SIGUNUSED SIGUSR2
++#endif
++
+ static int console_fd = -1;
+ static int mouse_fd = -1;
+ static int leds = 0;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112121019.fBCAJxL26388>