diff options
Diffstat (limited to 'games/nethack-qt/patches/patch-ac')
-rw-r--r-- | games/nethack-qt/patches/patch-ac | 87 |
1 files changed, 46 insertions, 41 deletions
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac index 4d8ec04648c..26b8a13e1ac 100644 --- a/games/nethack-qt/patches/patch-ac +++ b/games/nethack-qt/patches/patch-ac @@ -1,44 +1,49 @@ -$NetBSD: patch-ac,v 1.9 2001/08/29 22:41:13 jlam Exp $ +$NetBSD: patch-ac,v 1.10 2002/03/22 17:26:26 pooka Exp $ ---- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 -+++ sys/unix/Makefile.src Thu Aug 10 20:03:19 2000 -@@ -144,8 +144,8 @@ - # flags for debugging: - # CFLAGS = -g -I../include +--- include/system.h.orig Thu Jan 6 21:20:08 2000 ++++ include/system.h Thu Aug 10 18:16:03 2000 +@@ -77,10 +77,10 @@ + # if !defined(__SC__) && !defined(LINUX) + E long NDECL(random); + # endif +-# if !defined(SUNOS4) || defined(RANDOM) ++# if !defined(SUNOS4) && !defined(__NetBSD__) || defined(RANDOM) + E void FDECL(srandom, (unsigned int)); + # else +-# if !defined(bsdi) && !defined(__FreeBSD__) ++# if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) + E int FDECL(srandom, (unsigned int)); + # endif + # endif +@@ -130,7 +130,7 @@ + E void FDECL(qsort, (genericptr_t,size_t,size_t, + int(*)(const genericptr,const genericptr))); + #else +-# if defined(BSD) || defined(ULTRIX) ++# if defined(BSD) || defined(ULTRIX) && !defined(__NetBSD__) + E int qsort(); + # else + # if !defined(LATTICE) && !defined(AZTEC_50) +@@ -413,7 +413,7 @@ + # ifdef HPUX + E unsigned int FDECL(strlen, (char *)); + # else +-# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) ++# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) + E int FDECL(strlen, (const char *)); + # endif + # endif /* HPUX */ +@@ -513,11 +513,13 @@ + # endif + # endif --CFLAGS = -O -I../include --LFLAGS = -+CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include -+LFLAGS = ${LDFLAGS} ++#ifndef __NetBSD__ + # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) + E time_t FDECL(time, (time_t *)); + # else + E long FDECL(time, (time_t *)); + # endif /* ULTRIX */ ++#endif - # 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 = $(WINQTSRC) -+WINOBJ = $(WINQTOBJ) - - # on some systems the termcap library is in -ltermcap or -lcurses - # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -230,7 +230,7 @@ - # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 - # - # libraries for Qt --WINQTLIB = -L$(QTDIR)/lib -lqt -+WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext - # - # libraries for KDE (with Qt) - WINKDELIB = -lkdecore -lkdeui -lXext -@@ -244,7 +244,7 @@ - # libraries for BeOS - WINBELIB = -lbe - --WINLIB = $(WINTTYLIB) -+WINLIB = $(WINQTLIB) - - # any other strange libraries your system needs (for Sysunix only -- the more - # specialized targets should already be right) + #ifdef VMS + /* used in makedefs.c, but missing from gcc-vms's <time.h> */ |