From owner-freebsd-ports Mon Sep 18 8:28:57 2000 Delivered-To: freebsd-ports@freebsd.org Received: from sentinel.office1.bg (sentinel.office1.bg [195.24.48.182]) by hub.freebsd.org (Postfix) with SMTP id 48BED37B423 for ; Mon, 18 Sep 2000 08:28:47 -0700 (PDT) Received: (qmail 313 invoked by uid 1001); 18 Sep 2000 15:23:34 -0000 Date: Mon, 18 Sep 2000 18:23:34 +0300 From: Peter Pentchev To: Bill Fenner Cc: ports@freebsd.org Subject: games/nethack3 unbreaking (was: Re: ports/21096: unbreak games/nethack; assume maintainership?) Message-ID: <20000918182333.B142@ringwraith.office1.bg> References: <200009080223.TAA06224@windsor.research.att.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200009080223.TAA06224@windsor.research.att.com>; from fenner@research.att.com on Thu, Sep 07, 2000 at 07:23:53PM -0700 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org I have sent the attached patch to the port maintainer (dscheidt@enteract.com) a week ago, and received no response as yet. I guess I'll wait a week or something, and then file a PR :) G'luck, Peter -- If this sentence were in Chinese, it would say something else. On Thu, Sep 07, 2000 at 07:23:53PM -0700, Bill Fenner wrote: > > If you *really* want to assume maintainership, you could upgrade > to 3.3.1? =) (Then the GNU mirrors become irrelevant since they > haven't picked that version up yet, but...) diff -urN ports/games/nethack3/Makefile myports/games/nethack3/Makefile --- ports/games/nethack3/Makefile Wed Aug 9 18:05:31 2000 +++ myports/games/nethack3/Makefile Sat Sep 9 15:47:47 2000 @@ -6,13 +6,17 @@ # PORTNAME= nethack -PORTVERSION= 3.3.0 +PORTVERSION= 3.3.1 CATEGORIES= games -MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/src/ \ +MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ \ ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= nethack +DISTNAME= ${PORTNAME}-331 +EXTRACT_SUFX= .tgz MAINTAINER= dscheidt@enteract.com + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XPM= yes USE_GMAKE= yes diff -urN ports/games/nethack3/files/md5 myports/games/nethack3/files/md5 --- ports/games/nethack3/files/md5 Mon Jan 24 07:40:42 2000 +++ myports/games/nethack3/files/md5 Sat Sep 9 15:45:31 2000 @@ -1 +1 @@ -MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a +MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 diff -urN ports/games/nethack3/patches/patch-aa myports/games/nethack3/patches/patch-aa --- ports/games/nethack3/patches/patch-aa Wed Aug 9 18:05:31 2000 +++ myports/games/nethack3/patches/patch-aa Sat Sep 9 16:56:00 2000 @@ -1,15 +1,15 @@ ---- ./include/config.h.orig Sat Dec 11 00:20:49 1999 -+++ ./include/config.h Sun Dec 12 20:28:09 1999 +--- include/config.h.orig Sat Jul 22 04:13:51 2000 ++++ include/config.h Sat Sep 9 16:51:05 2000 @@ -43,7 +43,7 @@ * 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 X11_GRAPHICS */ /* X11 interface */ ++#define X11_GRAPHICS /* X11 interface */ /* #define QT_GRAPHICS */ /* Qt interface */ + /* #define GNOME_GRAPHICS */ /* Gnome interface */ - /* -@@ -92,7 +92,7 @@ +@@ -110,7 +110,7 @@ * would allow: * xpmtoppm x11tiles_big.xpm */ @@ -18,7 +18,7 @@ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif -@@ -133,11 +133,11 @@ +@@ -151,11 +151,11 @@ #ifdef UNIX /* path and file name extension for compression program */ @@ -34,7 +34,7 @@ #endif #ifndef COMPRESS -@@ -168,7 +168,7 @@ +@@ -186,7 +186,7 @@ * otherwise it will be the current directory. */ # ifndef HACKDIR diff -urN ports/games/nethack3/patches/patch-ab myports/games/nethack3/patches/patch-ab --- ports/games/nethack3/patches/patch-ab Mon Jan 24 07:40:43 2000 +++ myports/games/nethack3/patches/patch-ab Thu Jan 1 02:00:00 1970 @@ -1,20 +0,0 @@ ---- ./include/system.h.orig Sat Dec 11 00:20:51 1999 -+++ ./include/system.h Sun Dec 12 20:44:40 1999 -@@ -80,7 +80,7 @@ - # if !defined(SUNOS4) || defined(RANDOM) - E void FDECL(srandom, (unsigned int)); - # else --# ifndef bsdi -+# if !defined(bsdi) && !defined(__FreeBSD__) - E int FDECL(srandom, (unsigned int)); - # endif - # endif -@@ -516,7 +516,7 @@ - # 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 *)); -+E time_t FDECL(time, (time_t *)); - # endif /* ULTRIX */ - - #ifdef VMS diff -urN ports/games/nethack3/patches/patch-ac myports/games/nethack3/patches/patch-ac --- ports/games/nethack3/patches/patch-ac Wed Aug 9 18:05:31 2000 +++ myports/games/nethack3/patches/patch-ac Sat Sep 9 16:56:09 2000 @@ -1,15 +1,15 @@ ---- include/unixconf.h.orig Sat Dec 11 14:20:51 1999 -+++ include/unixconf.h Sat Jul 29 06:58:37 2000 -@@ -45,7 +45,7 @@ - /* #define AIX_31 */ /* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain +--- include/unixconf.h.orig Mon Jul 17 04:03:51 2000 ++++ include/unixconf.h Sat Sep 9 16:51:05 2000 +@@ -47,7 +47,7 @@ * job control (note that AIX is SYSV otherwise) * Also define this for AIX 3.2 */ + -#define TERMINFO /* uses terminfo rather than termcap */ +/* #define TERMINFO */ /* uses terminfo rather than termcap */ /* Should be defined for most SYSV, SVR4 (including * Solaris 2+), HPUX, and Linux systems. In * particular, it should NOT be defined for the UNIXPC -@@ -135,7 +135,7 @@ +@@ -143,7 +143,7 @@ * A stat system call is done on the mailbox every MAILCKFREQ moves. */ diff -urN ports/games/nethack3/patches/patch-ad myports/games/nethack3/patches/patch-ad --- ports/games/nethack3/patches/patch-ad Mon Jan 24 07:40:44 2000 +++ myports/games/nethack3/patches/patch-ad Sat Sep 9 16:56:25 2000 @@ -1,20 +1,20 @@ ---- ./sys/unix/Makefile.src.orig Sat Dec 11 00:21:05 1999 -+++ ./sys/unix/Makefile.src Sun Dec 12 20:27:50 1999 -@@ -132,8 +132,8 @@ +--- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 ++++ sys/unix/Makefile.src Sat Sep 9 16:51:05 2000 +@@ -144,8 +144,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include --LFLAGS = -+CFLAGS += -O -I../include -I${X11BASE}/include -+LFLAGS = -L${X11BASE}/lib - - # Only used for Qt interface (other interfaces are standard C) - CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include -@@ -165,8 +165,8 @@ +-LFLAGS = ++CFLAGS = -O -I../include -I${X11BASE}/include ++LFLAGS = -L${X11BASE}/lib + + # 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 = $(WINTTYSRC) $(WINX11SRC) @@ -22,7 +22,7 @@ # 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. @@ -31,16 +31,16 @@ # 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 = $(WINTTYLIB) $(WINX11LIB) # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) -@@ -223,7 +223,7 @@ +@@ -271,7 +271,7 @@ # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup # LIBS = -lsun # diff -urN ports/games/nethack3/patches/patch-ae myports/games/nethack3/patches/patch-ae --- ports/games/nethack3/patches/patch-ae Mon Jan 24 07:40:44 2000 +++ myports/games/nethack3/patches/patch-ae Sat Sep 9 16:56:39 2000 @@ -1,11 +1,12 @@ ---- ./sys/unix/Makefile.top.orig Sat Dec 11 05:21:05 1999 -+++ ./sys/unix/Makefile.top Mon Dec 13 11:51:27 1999 -@@ -14,17 +14,16 @@ +--- sys/unix/Makefile.top.orig Tue Jul 4 03:42:05 2000 ++++ sys/unix/Makefile.top Sat Sep 9 16:51:05 2000 +@@ -14,18 +14,17 @@ # MAKE = make # make NetHack -PREFIX = /usr GAME = nethack + # GAME = nethack.prg GAMEUID = games -GAMEGRP = bin +GAMEGRP = games @@ -21,27 +22,16 @@ +DIRPERM = 0775 # GAMEDIR also appears in config.h as "HACKDIR". - # -@@ -33,8 +32,8 @@ + # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR +@@ -35,9 +34,9 @@ # therefore there should not be anything in GAMEDIR that you want to keep # (if there is, you'll have to do the installation by hand or modify the # instructions) -GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir --SHELLDIR = $(PREFIX)/games +GAMEDIR = $(PREFIX)/share/$(GAME) + VARDIR = $(GAMEDIR) +-SHELLDIR = $(PREFIX)/games +SHELLDIR = $(PREFIX)/bin # per discussion in Install.X11 and Install.Qt VARDATND = -@@ -184,9 +183,9 @@ - - install: $(GAME) $(VARDAT) dungeon spec_levs - # set up the directories -- -mkdir $(SHELLDIR) -+ -mkdir -p $(SHELLDIR) - -rm -rf $(GAMEDIR) -- -mkdir $(GAMEDIR) $(GAMEDIR)/save -+ -mkdir -p $(GAMEDIR) $(GAMEDIR)/save - -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(GAMEDIR)/save - $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(GAMEDIR)/save - chmod $(DIRPERM) $(GAMEDIR) $(GAMEDIR)/save diff -urN ports/games/nethack3/patches/patch-af myports/games/nethack3/patches/patch-af --- ports/games/nethack3/patches/patch-af Mon Jan 24 07:40:44 2000 +++ myports/games/nethack3/patches/patch-af Sat Sep 9 16:56:57 2000 @@ -1,6 +1,6 @@ ---- ./sys/unix/Makefile.doc.orig Mon Dec 13 14:49:15 1999 -+++ ./sys/unix/Makefile.doc Mon Dec 13 14:44:53 1999 -@@ -31,7 +31,7 @@ +--- sys/unix/Makefile.doc.orig Fri Jan 14 22:49:48 2000 ++++ sys/unix/Makefile.doc Sat Sep 9 16:51:05 2000 +@@ -34,7 +34,7 @@ GAME = nethack @@ -9,7 +9,7 @@ MANEXT = 6 # manual installation for most BSD-style systems -@@ -48,11 +48,11 @@ +@@ -51,11 +51,11 @@ # DLBMANCREATE = nroff -man dlb.6 > manpages: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message