ports/176701: [patch] update games/angband from 3.3.2 to 3.4.1
Vitaly Magerya
vmagerya at gmail.com
Wed Mar 6 20:50:06 UTC 2013
>Number: 176701
>Category: ports
>Synopsis: [patch] update games/angband from 3.3.2 to 3.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 06 20:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Vitaly Magerya
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
>Description:
Update games/angband to 3.4.1, switch to new header style,
introduce OPTIONS.
Note that I added xorg-fonts-miscbitmaps as a dependency
if the port is built with X11 backend; without that angband
fails on startup with a message about missing fonts.
Also note that I had to patch out angband's ncurses detection
(as it does not work with ncurses in base), and add ncurses
via LDFLAGS instead.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN angband.orig/Makefile angband/Makefile
--- angband.orig/Makefile 2013-03-06 22:31:11.000000000 +0200
+++ angband/Makefile 2013-03-06 21:49:28.000000000 +0200
@@ -1,14 +1,10 @@
-# New ports collection makefile for: angband
-# Date created: 21 Feb 1997
-# Whom: Matthew Hunt <mph at pobox.com>
-#
+# Created by: Matthew Hunt <mph at pobox.com>
# $FreeBSD: ports/games/angband/Makefile,v 1.45 2012/11/17 05:57:31 svnexp Exp $
-#
PORTNAME= angband
-PORTVERSION= 3.3.2
+PORTVERSION= 3.4.1
CATEGORIES= games
-MASTER_SITES= http://rephial.org/downloads/3.3/
+MASTER_SITES= http://rephial.org/downloads/3.4/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= pav at FreeBSD.org
@@ -17,21 +13,21 @@
USE_GMAKE= yes
ALL_TARGET= #
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-setgid=games --disable-sdl --disable-sdl-mixer --with-varpath=/var/games/angband
-.if !defined(WITHOUT_X11)
-USE_XORG= sm x11
-CONFIGURE_ARGS+= --with-x
-.else
-CONFIGURE_ARGS+= --with-x=no
-.endif
-CONFIGURE_ENV= ac_cv_path_mkdir=mkdir
-CPP= cc -E
+CONFIGURE_ARGS= --with-setgid=games --localstatedir=/var
+LDFLAGS+= -lncursesw
+
+OPTIONS_DEFINE= X11
+X11_DESC= Enable X11 (graphical) backend
-pre-fetch:
-.if !defined(WITHOUT_X11)
- @${ECHO_MSG} "You could define WITHOUT_X11, if you don't want X support"
+OPTIONS_DEFAULT=X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+USE_XORG= sm x11
+RUN_DEPENDS= xorg-fonts-miscbitmaps>=0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
.else
- @${ECHO_MSG} "Building without X support"
+CONFIGURE_ARGS+=--disable-x11
.endif
post-patch:
diff -ruN angband.orig/distinfo angband/distinfo
--- angband.orig/distinfo 2013-03-06 22:31:11.000000000 +0200
+++ angband/distinfo 2013-03-06 18:38:06.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (angband-v3.3.2.tar.gz) = 6b5127b760c988e9ef4968556ea030ac1f24611da5fdc0db90cff2bd3bced4f7
-SIZE (angband-v3.3.2.tar.gz) = 3401345
+SHA256 (angband-v3.4.1.tar.gz) = 461e36d22c15df330b4d4eaa850e4f2c2da6731d23e99fa13a056249343fd945
+SIZE (angband-v3.4.1.tar.gz) = 17880537
diff -ruN angband.orig/files/patch-configure angband/files/patch-configure
--- angband.orig/files/patch-configure 1970-01-01 03:00:00.000000000 +0300
+++ angband/files/patch-configure 2013-03-06 19:12:46.000000000 +0200
@@ -0,0 +1,10 @@
+--- configure.orig 2013-03-06 18:58:16.000000000 +0200
++++ configure 2013-03-06 19:08:48.000000000 +0200
+@@ -4989,6 +4989,7 @@
+
+
+ rm -f conf.ncursestest
++ with_curses=yes
+
+ if test "$with_curses" = "yes"; then
+
diff -ruN angband.orig/pkg-plist angband/pkg-plist
--- angband.orig/pkg-plist 2013-03-06 22:31:11.000000000 +0200
+++ angband/pkg-plist 2013-03-06 19:23:38.000000000 +0200
@@ -22,30 +22,32 @@
etc/angband/pref/flvr-dvg.prf
etc/angband/pref/flvr-new.prf
etc/angband/pref/flvr-nmd.prf
+etc/angband/pref/flvr-shb.prf
etc/angband/pref/flvr-xxx.prf
-etc/angband/pref/font.prf
etc/angband/pref/font-gcu.prf
etc/angband/pref/font-mac.prf
etc/angband/pref/font-sdl.prf
etc/angband/pref/font-win.prf
-etc/angband/pref/font-xxx.prf
etc/angband/pref/font-x11.prf
-etc/angband/pref/graf.prf
+etc/angband/pref/font-xxx.prf
+etc/angband/pref/font.prf
etc/angband/pref/graf-dvg.prf
etc/angband/pref/graf-new.prf
etc/angband/pref/graf-nmd.prf
+etc/angband/pref/graf-shb.prf
etc/angband/pref/graf-xxx.prf
+etc/angband/pref/graf.prf
etc/angband/pref/message.prf
etc/angband/pref/pref.prf
etc/angband/pref/user.prf
etc/angband/pref/xtra-dvg.prf
etc/angband/pref/xtra-new.prf
etc/angband/pref/xtra-nmd.prf
+etc/angband/pref/xtra-shb.prf
etc/angband/pref/xtra-xxx.prf
share/angband/file/crown.txt
share/angband/file/dead.txt
share/angband/file/news.txt
-share/angband/help/330.txt
share/angband/help/attack.txt
share/angband/help/birth.txt
share/angband/help/command.txt
@@ -55,9 +57,17 @@
share/angband/help/help.hlp
share/angband/help/option.txt
share/angband/help/playing.txt
+share/angband/help/readme.txt
share/angband/help/version.txt
share/angband/info/readme.txt
share/angband/xtra/angband.glade
+share/angband/xtra/font/10x14x.fon
+share/angband/xtra/font/10x14xb.fon
+share/angband/xtra/font/10x20x.fon
+share/angband/xtra/font/12x18x.fon
+share/angband/xtra/font/12x24x.fon
+share/angband/xtra/font/16x16x.fon
+share/angband/xtra/font/16x24x.fon
share/angband/xtra/font/5x8x.fon
share/angband/xtra/font/6x10x.fon
share/angband/xtra/font/6x12x.fon
@@ -65,26 +75,21 @@
share/angband/xtra/font/6x13xb.fon
share/angband/xtra/font/7x13x.fon
share/angband/xtra/font/7x13xb.fon
-share/angband/xtra/font/8x8x.fon
-share/angband/xtra/font/8x8xb.fon
share/angband/xtra/font/8x12x.fon
share/angband/xtra/font/8x12xb.fon
share/angband/xtra/font/8x13x.fon
share/angband/xtra/font/8x16x.fon
+share/angband/xtra/font/8x8x.fon
+share/angband/xtra/font/8x8xb.fon
share/angband/xtra/font/9x15x.fon
share/angband/xtra/font/9x15xb.fon
-share/angband/xtra/font/10x14x.fon
-share/angband/xtra/font/10x14xb.fon
-share/angband/xtra/font/10x20x.fon
-share/angband/xtra/font/12x18x.fon
-share/angband/xtra/font/12x24x.fon
-share/angband/xtra/font/16x16x.fon
-share/angband/xtra/font/16x24x.fon
share/angband/xtra/graf/16x16.png
share/angband/xtra/graf/32x32.png
+share/angband/xtra/graf/64x64.png
share/angband/xtra/graf/8x16.png
share/angband/xtra/graf/8x8.png
-share/angband/xtra/icon/angband-gtk.desktop
+share/angband/xtra/graf/graphics.txt
+share/angband/xtra/graf/mr_att.png
share/angband/xtra/icon/angband-sdl.desktop
share/angband/xtra/icon/angband-x11.desktop
share/angband/xtra/icon/att-128.png
@@ -100,13 +105,13 @@
share/angband/xtra/sound/eat.wav
share/angband/xtra/sound/flee.wav
share/angband/xtra/sound/hallu.wav
-share/angband/xtra/sound/hit1.wav
share/angband/xtra/sound/hit.wav
-share/angband/xtra/sound/kill1.wav
+share/angband/xtra/sound/hit1.wav
share/angband/xtra/sound/kill.wav
+share/angband/xtra/sound/kill1.wav
share/angband/xtra/sound/level.wav
-share/angband/xtra/sound/miss1.wav
share/angband/xtra/sound/miss.wav
+share/angband/xtra/sound/miss1.wav
share/angband/xtra/sound/money.wav
share/angband/xtra/sound/opendoor.wav
share/angband/xtra/sound/shutdoor.wav
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list