Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Mar 1997 01:58:04 -0500 (EST)
From:      Matthew Hunt <mph@pobox.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/3003: Upgrade of Angband port from 2.8.0 to 2.8.1.
Message-ID:  <199703160658.BAA03913@wopr.ml.org>
Resent-Message-ID: <199703160710.XAA12508@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         3003
>Category:       ports
>Synopsis:       Upgrade of Angband port from 2.8.0 to 2.8.1.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 15 23:10:01 PST 1997
>Last-Modified:
>Originator:     Matthew Hunt
>Organization:
none
>Release:        FreeBSD 2.2-GAMMA i386
>Environment:

FreeBSD 2.2-GAMMA

>Description:

Angband is a roguelike game.  The maintainer, Ben Harrison, has
released version 2.8.1.  This fix upgrades the port from 2.8.0 to
2.8.1.

>How-To-Repeat:

Compare the version fetched by the port with the latest version on the
official FTP site.

>Fix:
	
Either apply the following patch, or use the file
angband-2.8.1-port.tar.gz on ftp.freebsd.org's incoming directory.

diff -Pcr angband.orig/Makefile angband/Makefile
*** angband.orig/Makefile	Tue Mar  4 04:35:20 1997
--- angband/Makefile	Sun Mar 16 01:03:27 1997
***************
*** 1,19 ****
  # New ports collection makefile for:   angband
! # Version required:    2.8.0
  # Date created:        21 Feb 1997
  # Whom:                Matthew Hunt <mph@pobox.com>
  #
! # $Id: Makefile,v 1.1.1.1 1997/03/04 09:35:20 tg Exp $
  #
  
! DISTNAME=	angband-2.8.0
! CATEGORIES=	games
  MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/
! DISTFILES=	angband-280.tar.gz
  
  MAINTAINER=	mph@pobox.com
! 
! WRKSRC=		${WRKDIR}/angband-280
  USE_X11=	yes
  PATCH_STRIP=	-p1
  
--- 1,18 ----
  # New ports collection makefile for:   angband
! # Version required:    2.8.1
  # Date created:        21 Feb 1997
  # Whom:                Matthew Hunt <mph@pobox.com>
  #
! # $Id$
  #
  
! DISTNAME=	angband-2.8.1
! CATEGORIES+=	games
  MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/
! DISTFILES=	angband-281.tar.gz
  
  MAINTAINER=	mph@pobox.com
! WRKSRC=		${WRKDIR}/angband-281
  USE_X11=	yes
  PATCH_STRIP=	-p1
  
diff -Pcr angband.orig/files/md5 angband/files/md5
*** angband.orig/files/md5	Tue Mar  4 04:35:21 1997
--- angband/files/md5	Sun Mar 16 01:03:53 1997
***************
*** 1 ****
! MD5 (angband-280.tar.gz) = c488458e21659d7b14d660f7baacba47
--- 1 ----
! MD5 (angband-281.tar.gz) = 925e7244445a84968a436e33d3346411
diff -Pcr angband.orig/patches/patch-aa angband/patches/patch-aa
*** angband.orig/patches/patch-aa	Tue Mar  4 04:35:20 1997
--- angband/patches/patch-aa	Sun Mar 16 01:21:19 1997
***************
*** 1,54 ****
! diff -r -P -u ../../angband-280/Makefile angband-280/Makefile
! --- ../../angband-280/Makefile	Wed Dec 31 19:00:00 1969
! +++ angband-280/Makefile	Thu Feb 20 19:54:23 1997
! @@ -0,0 +1,17 @@
! +# My makefile for Angband
! +# Matthew Hunt <mph@pobox.com>
! +
! +all:	angband
! +
! +angband:
! +	cd src && make
! +
! +install: angband
! +	install -c -o games -g bin -m 4755 angband ${PREFIX}/bin
! +	mkdir -p ${PREFIX}/lib/X11/angband
! +	(cd lib && tar cf - * ) | (cd ${PREFIX}/lib/X11/angband && tar xf - )
! +#	install -c lib/* ${PREFIX}/lib/X11/angband
! +	/usr/sbin/chown -R games.bin ${PREFIX}/lib/X11/angband
! +	(cd ${PREFIX}/lib/X11/angband && \
! +		/bin/chmod 755 apex bone data edit file help info xtra && \
! +		/bin/chmod 1777 save user )
! diff -r -P -u ../../angband-280/src/Makefile angband-280/src/Makefile
! --- ../../angband-280/src/Makefile	Sun Oct 13 20:06:49 1996
! +++ angband-280/src/Makefile	Thu Feb 20 19:56:09 1997
! @@ -136,8 +136,8 @@
!  ##
!  ## Variation -- Use "main-xaw.c" instead of "main-x11.c"
!  ##
! -#CFLAGS = -Wall -O1 -pipe -g -D"USE_XAW" -D"USE_GCU"
! -#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
! +CFLAGS = -Wall -O1 -pipe -I/usr/X11R6/include -DDEFAULT_PATH=\"${PREFIX}/lib/X11/angband/\" -D"USE_XAW" -D"USE_GCU"
! +LIBS = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
!  
!  
!  ##
! diff -r -P -u ../../angband-280/src/config.h angband-280/src/config.h
! --- ../../angband-280/src/config.h	Sun Oct 13 19:13:01 1996
! +++ angband-280/src/config.h	Thu Feb 20 19:56:09 1997
! @@ -48,13 +48,13 @@
!   * OPTION: define "SPECIAL_BSD" for using certain versions of UNIX
!   * that use the 4.4BSD Lite version of Curses in "main-gcu.c"
!   */
! -/* #define SPECIAL_BSD */
! +#define SPECIAL_BSD
!  
!  
!  /*
!   * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
!   */
! -/* #define USE_TPOSIX */
! +#define USE_TPOSIX
!  
!  /*
!   * OPTION: Use the "termio" methods in "main-gcu.c"
--- 1,22 ----
! *** angband-281/Makefile.orig	Sun Mar 16 01:09:44 1997
! --- angband-281/Makefile	Sun Mar 16 01:20:38 1997
! ***************
! *** 0 ****
! --- 1,17 ----
! + # My makefile for Angband
! + # Matthew Hunt <mph@pobox.com>
! + 
! + all:	angband
! + 
! + angband:
! + 	cd src && make
! + 
! + install: angband
! + 	install -c -o games -g bin -m 4755 testing ${PREFIX}/bin/angband
! + 	mkdir -p ${PREFIX}/lib/angband
! + 	(cd lib && tar cf - * ) | (cd ${PREFIX}/lib/angband && tar xf - )
! + #	install -c lib/* ${PREFIX}/lib/angband
! + 	/usr/sbin/chown -R games.bin ${PREFIX}/lib/angband
! + 	(cd ${PREFIX}/lib/angband && \
! + 		/bin/chmod 755 apex bone data edit file help info xtra && \
! + 		/bin/chmod 1777 save user )
diff -Pcr angband.orig/patches/patch-ab angband/patches/patch-ab
*** angband.orig/patches/patch-ab	Wed Dec 31 19:00:00 1969
--- angband/patches/patch-ab	Sun Mar 16 01:08:06 1997
***************
*** 0 ****
--- 1,22 ----
+ *** angband-281/src/main.c.orig	Sun Mar 16 01:04:52 1997
+ --- angband-281/src/main.c	Sun Mar 16 01:07:24 1997
+ ***************
+ *** 1,8 ****
+   /* File: main.c */
+   
+ ! int dlopen() {}
+   int dlsym() {}
+ ! int dlclose() {}
+   
+   /* Purpose: initialization, main() function and main loop */
+   
+ --- 1,9 ----
+   /* File: main.c */
+   
+ ! /* I have no idea what these lines are here for. -mph */
+ ! /*int dlopen() {}
+   int dlsym() {}
+ ! int dlclose() {}*/
+   
+   /* Purpose: initialization, main() function and main loop */
+   
diff -Pcr angband.orig/patches/patch-ac angband/patches/patch-ac
*** angband.orig/patches/patch-ac	Wed Dec 31 19:00:00 1969
--- angband/patches/patch-ac	Sun Mar 16 01:21:38 1997
***************
*** 0 ****
--- 1,31 ----
+ *** angband-281/src/config.h.orig	Mon Mar  3 22:19:58 1997
+ --- angband-281/src/config.h	Sun Mar 16 01:09:44 1997
+ ***************
+ *** 48,60 ****
+    * OPTION: define "SPECIAL_BSD" for using certain versions of UNIX
+    * that use the 4.4BSD Lite version of Curses in "main-gcu.c"
+    */
+ ! /* #define SPECIAL_BSD */
+   
+   
+   /*
+    * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
+    */
+ ! /* #define USE_TPOSIX */
+   
+   /*
+    * OPTION: Use the "termio" methods in "main-gcu.c"
+ --- 48,60 ----
+    * OPTION: define "SPECIAL_BSD" for using certain versions of UNIX
+    * that use the 4.4BSD Lite version of Curses in "main-gcu.c"
+    */
+ ! #define SPECIAL_BSD
+   
+   
+   /*
+    * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
+    */
+ ! #define USE_TPOSIX
+   
+   /*
+    * OPTION: Use the "termio" methods in "main-gcu.c"
diff -Pcr angband.orig/patches/patch-ad angband/patches/patch-ad
*** angband.orig/patches/patch-ad	Wed Dec 31 19:00:00 1969
--- angband/patches/patch-ad	Sun Mar 16 01:29:03 1997
***************
*** 0 ****
--- 1,21 ----
+ *** angband-281/src/Makefile.orig	Sun Mar 16 01:27:30 1997
+ --- angband-281/src/Makefile	Sun Mar 16 01:28:34 1997
+ ***************
+ *** 136,143 ****
+   ##
+   ## Variation -- Use "main-xaw.c" instead of "main-x11.c"
+   ##
+ ! #CFLAGS = -Wall -O1 -pipe -g -D"USE_XAW" -D"USE_GCU"
+ ! #LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
+   
+   
+   ##
+ --- 136,143 ----
+   ##
+   ## Variation -- Use "main-xaw.c" instead of "main-x11.c"
+   ##
+ ! CFLAGS = -Wall -O1 -pipe -I/usr/X11R6/include -DDEFAULT_PATH=\"${PREFIX}/lib/angband/\" -D"USE_XAW" -D"USE_GCU"
+ ! LIBS = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
+   
+   
+   ##
diff -Pcr angband.orig/pkg/PLIST angband/pkg/PLIST
*** angband.orig/pkg/PLIST	Tue Mar  4 04:35:21 1997
--- angband/pkg/PLIST	Sun Mar 16 01:43:12 1997
***************
*** 1,43 ****
  bin/angband
! lib/X11/angband/apex/scores.raw
! lib/X11/angband/help/attack.txt
! lib/X11/angband/help/birth.txt
! lib/X11/angband/help/command.txt
! lib/X11/angband/help/dungeon.txt
! lib/X11/angband/help/general.txt
! lib/X11/angband/help/help.hlp
! lib/X11/angband/help/option.txt
! lib/X11/angband/help/version.txt
! lib/X11/angband/edit/a_info.txt
! lib/X11/angband/edit/e_info.txt
! lib/X11/angband/edit/f_info.txt
! lib/X11/angband/edit/k_info.txt
! lib/X11/angband/edit/r_info.txt
! lib/X11/angband/edit/v_info.txt
! lib/X11/angband/user/font-ami.prf
! lib/X11/angband/user/font-ibm.prf
! lib/X11/angband/user/font-win.prf
! lib/X11/angband/user/graf-ami.prf
! lib/X11/angband/user/graf-win.prf
! lib/X11/angband/user/pref-acn.prf
! lib/X11/angband/user/pref-emx.prf
! lib/X11/angband/user/pref-ibm.prf
! lib/X11/angband/user/pref-lsl.prf
! lib/X11/angband/user/pref-mac.prf
! lib/X11/angband/user/pref-win.prf
! lib/X11/angband/user/pref-x11.prf
! lib/X11/angband/user/pref-xaw.prf
! lib/X11/angband/user/pref.prf
! lib/X11/angband/file/dead.txt
! lib/X11/angband/file/news.txt
! @exec mkdir -p %D/lib/X11/angband/bone
! @exec mkdir -p %D/lib/X11/angband/data
! @exec mkdir -p %D/lib/X11/angband/info
! @exec mkdir -p %D/lib/X11/angband/save
! @exec mkdir -p %D/lib/X11/angband/xtra
! @dirrm lib/X11/angband/bone
! @dirrm lib/X11/angband/data
! @dirrm lib/X11/angband/info
! @dirrm lib/X11/angband/save
! @dirrm lib/X11/angband/xtra
  
--- 1,42 ----
  bin/angband
! lib/angband/help/attack.txt
! lib/angband/help/birth.txt
! lib/angband/help/command.txt
! lib/angband/help/dungeon.txt
! lib/angband/help/general.txt
! lib/angband/help/help.hlp
! lib/angband/help/option.txt
! lib/angband/help/version.txt
! lib/angband/edit/a_info.txt
! lib/angband/edit/e_info.txt
! lib/angband/edit/f_info.txt
! lib/angband/edit/k_info.txt
! lib/angband/edit/r_info.txt
! lib/angband/edit/v_info.txt
! lib/angband/user/font-ami.prf
! lib/angband/user/font-ibm.prf
! lib/angband/user/font-win.prf
! lib/angband/user/graf-ami.prf
! lib/angband/user/graf-win.prf
! lib/angband/user/pref-acn.prf
! lib/angband/user/pref-emx.prf
! lib/angband/user/pref-ibm.prf
! lib/angband/user/pref-lsl.prf
! lib/angband/user/pref-mac.prf
! lib/angband/user/pref-win.prf
! lib/angband/user/pref-x11.prf
! lib/angband/user/pref-xaw.prf
! lib/angband/user/pref.prf
! lib/angband/file/dead.txt
! lib/angband/file/news.txt
! @exec mkdir -p %D/lib/angband/bone
! @exec mkdir -p %D/lib/angband/data
! @exec mkdir -p %D/lib/angband/info
! @exec mkdir -p %D/lib/angband/save
! @exec mkdir -p %D/lib/angband/xtra
! @dirrm lib/angband/bone
! @dirrm lib/angband/data
! @dirrm lib/angband/info
! @dirrm lib/angband/save
! @dirrm lib/angband/xtra
  
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703160658.BAA03913>