Date: Fri, 13 Oct 2000 11:46:39 +1100 (EST) From: gnb@itga.com.au To: FreeBSD-gnats-submit@freebsd.org Cc: dscheidt@enteract.com Subject: ports/21942: [Patch] port update: nethack3 3.3.0 -> 3.3.1 Message-ID: <200010130046.e9D0kdl53938@hellcat.itga.com.au>
next in thread | raw e-mail | index | archive | help
>Number: 21942 >Category: ports >Synopsis: Update nethack3 port to 3.3.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 12 17:50:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Gregory Bond >Release: FreeBSD 4.1-STABLE i386 >Organization: ITG Australia Limited >Environment: Any FreeBSD version; nethack3 port >Description: Nethack3 port is currently 3.3.0 which has a number of bugs. Latest version is 3.3.1. >How-To-Repeat: Run nethack & use V command! >Fix: Following diffs to the port files (made after the port restructure was done!) The file "files/patch-ab" is no longer neded and should be "cvs delete"d (dunno how to represent this with patch!) (This is my first attempt at port hacking so I may be way off base here - tips and feedback appreciated) And don't c-diffs of c-diff files look wierd! Index: Makefile =================================================================== RCS file: /usr/ncvs/ports/games/nethack3/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 2000/08/03 09:23:49 1.26 +++ Makefile 2000/10/13 00:40:39 @@ -6,10 +6,15 @@ # PORTNAME= nethack -PORTVERSION= 3.3.0 +PORTVERSION= 3.3.1 +PORTVERSION2= 331 CATEGORIES= games -MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/src/ \ +MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION2}/src/ \ ${MASTER_SITE_GNU} +EXTRACT_SUFX= .tgz +DISTNAME= ${PORTNAME}-${PORTVERSION2} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com Index: distinfo =================================================================== RCS file: /usr/ncvs/ports/games/nethack3/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 2000/01/24 05:40:42 1.6 +++ distinfo 2000/10/12 07:02:46 @@ -1 +1 @@ -MD5 (nethack-3.3.0.tar.gz) = cf9f4039408321f39c3ef733455cb73a +MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 Index: files/patch-aa =================================================================== RCS file: /usr/ncvs/ports/games/nethack3/files/patch-aa,v retrieving revision 1.2 diff -u -r1.2 patch-aa --- files/patch-aa 2000/08/02 16:38:07 1.2 +++ files/patch-aa 2000/10/12 22:57:58 @@ -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 11:13:51 2000 ++++ ./include/config.h Fri Oct 13 09:31:24 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.xpm | pnmscale 1.25 | ppmquant 90 >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 Index: files/patch-ac =================================================================== RCS file: /usr/ncvs/ports/games/nethack3/files/patch-ac,v retrieving revision 1.3 diff -u -r1.3 patch-ac --- files/patch-ac 2000/08/02 16:38:07 1.3 +++ files/patch-ac 2000/10/12 23:07:43 @@ -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 11:03:51 2000 ++++ ./include/unixconf.h Fri Oct 13 10:06:57 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. */ Index: files/patch-ad =================================================================== RCS file: /usr/ncvs/ports/games/nethack3/files/patch-ad,v retrieving revision 1.3 diff -u -r1.3 patch-ad --- files/patch-ad 2000/01/24 05:40:44 1.3 +++ files/patch-ad 2000/10/12 23:11:07 @@ -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 20:52:57 2000 ++++ ./sys/unix/Makefile.src Fri Oct 13 10:10:21 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 = -L${X11BASE}/lib ++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 @@ + # 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 # Index: files/patch-ae =================================================================== RCS file: /usr/ncvs/ports/games/nethack3/files/patch-ae,v retrieving revision 1.2 diff -u -r1.2 patch-ae --- files/patch-ae 2000/01/24 05:40:44 1.2 +++ files/patch-ae 2000/10/12 23:50:54 @@ -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 10:42:05 2000 ++++ ./sys/unix/Makefile.top Fri Oct 13 10:13:50 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 >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?200010130046.e9D0kdl53938>