diff options
Diffstat (limited to 'games/nethack-x11')
| -rw-r--r-- | games/nethack-x11/Makefile | 26 | ||||
| -rw-r--r-- | games/nethack-x11/files/patch-sum | 6 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-aa | 18 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ab | 26 |
4 files changed, 31 insertions, 45 deletions
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 2679a51301f..b810648a445 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,20 +1,16 @@ -# $NetBSD: Makefile,v 1.7 2000/03/27 08:54:56 tron Exp $ +# $NetBSD: Makefile,v 1.8 2000/08/10 17:50:08 pooka Exp $ # -DISTNAME= nethack-3.3.0 -PKGNAME= nethack-x11-3.3.0 -CATEGORIES= games x11 -MASTER_SITES= ftp://ftp.win.tue.nl/pub/games/nethack.330/source/ +.include "../nethack-lib/Makefile.common" -MAINTAINER= root@garbled.net -HOMEPAGE= http://www.win.tue.nl/games/roguelike/nethack/ +PKGNAME= nethack-x11-${NETHACK_VERSION} -DEPENDS+= nethack-lib-3.3.0:../nethack-lib +CATEGORIES+= x11 + +DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib DEPENDS+= xpm-3.4k:../../graphics/xpm USE_X11= yes -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= nethack INSTALL_TARGET= binfiles MAKE_ENV+= GTYPE=-x11 @@ -22,14 +18,4 @@ MAKE_ENV+= GTYPE=-x11 PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-* ALLFILES= ${DISTFILES} # don't checksum shared patches -MD5_FILE= "${.CURDIR}/../nethack-lib/files/md5" - -post-extract: - @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh - -post-patch: - @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/foo - @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h - @${RM} -f ${WRKSRC}/foo - .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-x11/files/patch-sum b/games/nethack-x11/files/patch-sum index fe7de58b355..f853693b864 100644 --- a/games/nethack-x11/files/patch-sum +++ b/games/nethack-x11/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:06 pooka Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/10 17:50:09 pooka Exp $ -MD5 (patch-aa) = 540c8a6f9754f529e48bffc5d59e3432 -MD5 (patch-ab) = f02f85296c63fd87802f371b68000666 +MD5 (patch-aa) = a155b03ccd55374b567fbbbd38599d17 +MD5 (patch-ab) = 2a28cc997f121bf671aa252910d5c5d6 diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa index f8d4d93c018..82d62c8fa5d 100644 --- a/games/nethack-x11/patches/patch-aa +++ b/games/nethack-x11/patches/patch-aa @@ -1,19 +1,19 @@ -$NetBSD: patch-aa,v 1.2 1999/12/24 22:30:07 pooka Exp $ +$NetBSD: patch-aa,v 1.3 2000/08/10 17:50:09 pooka Exp $ ---- include/config.h.orig Sat Dec 11 07:20:49 1999 -+++ include/config.h Wed Dec 22 21:41:41 1999 +--- include/config.h.orig Sat Jul 22 04:13:51 2000 ++++ include/config.h Thu Aug 10 19:25:21 2000 @@ -42,8 +42,8 @@ * Define all of those you want supported in your binary. * Some combinations make no sense. See the installation document. */ -#define TTY_GRAPHICS /* good old tty based graphics */ --/* #define X11_GRAPHICS */ /* X11 interface */ +-/* #define X11_GRAPHICS */ /* X11 interface */ +/* #define TTY_GRAPHICS /* good old tty based graphics */ -+#define X11_GRAPHICS /* X11 interface */ ++#define X11_GRAPHICS */ /* X11 interface */ /* #define QT_GRAPHICS */ /* Qt interface */ + /* #define GNOME_GRAPHICS */ /* Gnome interface */ - /* -@@ -80,7 +80,7 @@ +@@ -98,7 +98,7 @@ #endif #ifndef DEFAULT_WINDOW_SYS @@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.2 1999/12/24 22:30:07 pooka Exp $ #endif #ifdef X11_GRAPHICS -@@ -92,7 +92,7 @@ +@@ -110,7 +110,7 @@ * would allow: * xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm */ -/* # define USE_XPM */ /* Disable if you do not have the XPM library */ -+# define USE_XPM /* Disable if you do not have the XPM library */ ++# define USE_XPM /* Disable if you do not have the XPM library */ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab index 7d207cf799a..bbd9ccb8a87 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,22 +1,22 @@ -$NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $ +$NetBSD: patch-ab,v 1.4 2000/08/10 17:50:09 pooka Exp $ ---- sys/unix/Makefile.src.orig Sat Dec 11 07:21:05 1999 -+++ sys/unix/Makefile.src Wed Dec 22 21:45:47 1999 -@@ -132,8 +132,8 @@ +--- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 ++++ sys/unix/Makefile.src Thu Aug 10 19:28:31 2000 +@@ -144,8 +144,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include --LFLAGS = +-LFLAGS = +CFLAGS = -O -I../include -I${X11BASE}/include +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib - # Only used for Qt interface (other interfaces are standard C) - CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include -@@ -165,8 +165,8 @@ + # The Qt and Be window systems are written in C++, while the rest of + # NetHack is standard C. If using Qt, uncomment the LD line here to get +@@ -203,8 +203,8 @@ # - # + # -WINSRC = $(WINTTYSRC) -WINOBJ = $(WINTTYOBJ) +WINSRC = $(WINX11SRC) @@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $ # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -186,7 +186,7 @@ +@@ -224,7 +224,7 @@ # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -33,9 +33,9 @@ $NetBSD: patch-ab,v 1.3 1999/12/24 22:30:07 pooka Exp $ # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 -@@ -199,7 +199,7 @@ - # - # +@@ -244,7 +244,7 @@ + # libraries for BeOS + WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINX11LIB) |