5 files changed, 166 insertions, 105 deletions

diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index 9944e0a8284b..5cf0d1269c3c 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -1,38 +1,73 @@
 # New ports collection makefile for:   mangband
-# Date created:        30 Dec 1998
-# Whom: Adam Kranzel (adam@alameda.edu)
+# Date created:         Thu Jun 11 11:40:54 UTC 2009
+# Whom:                 driedfruit
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mangband
-PORTVERSION=	0.7.0
-PORTREVISION=	5
+PORTVERSION=	1.1.2
 CATEGORIES=	games
-MASTER_SITES=	http://mangband.org/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+MASTER_SITES=	http://www.mangband.org/ http://www.mangband.org/download/
 
-MAINTAINER=	adam-ports@blacktabby.org
-COMMENT=	Multiplayer rogue-like game with color, X11 support
+MAINTAINER=	flambard@mangband.org
+COMMENT=	Free online multiplayer real-time roguelike game
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
-USE_XORG=	x11
-ALL_TARGET=	install
+ALL_TARGET=	mangclient mangband
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
-MALIB=		${PREFIX}/lib/mangband
+MAKE_ARGS=	"DATADIR=${DATADIR}"
+
+OPTIONS=	GCU "Display module GCU" On \
+		X11 "Display module X11" Off \
+		SDL "Display module SDL" Off \
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GCU)
+#LIB_DEPENDS+=	ncurses:${PORTSDIR}/devel/ncurses
+CONFIGURE_ARGS+=	--with-gcu
+.else
+CONFIGURE_ARGS+=	--without-gcu
+.endif
+
+.if defined(WITH_X11)
+LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/libX11
+CONFIGURE_ARGS+=	--with-x11
+.else
+CONFIGURE_ARGS+=	--without-x11
+.endif
+
+.if defined(WITH_SDL)
+LIB_DEPENDS+=	SDL-1.2:${PORTSDIR}/devel/sdl12
+CONFIGURE_ARGS+=	--with-sdl
+.else
+CONFIGURE_ARGS+=	--without-sdl
+.endif
 
 do-install:
-	${INSTALL_PROGRAM} -o root -g games -m 2550 \
+	@${INSTALL_PROGRAM} -o root -g games -m 2550 \
 		${WRKSRC}/mangband ${PREFIX}/bin
-	${INSTALL_PROGRAM} -o root -g games -m 550 \
-		${WRKSRC}/mangconsole ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mangclient ${PREFIX}/bin
-	@${MKDIR} ${MALIB}/file
-	@${TOUCH} ${MALIB}/file/wizards.txt
-	cd ${WRKSRC}/../lib && ${PAX} -rw * ${MALIB}
-	${CHMOD} 750 ${MALIB}/*
-	${CHMOD} 755 ${MALIB}/user
-	${CHOWN} -R root:games ${MALIB}/*
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${MALIB}
-
-.include <bsd.port.mk>
+	@${INSTALL_PROGRAM} ${WRKSRC}/mangclient ${PREFIX}/bin
+	@${CP} ${WRKDIR}/${DISTNAME}/mangband.cfg ${PREFIX}/etc
+
+	@echo "# FreeBSD Hacks" >> ${PREFIX}/etc/mangband.cfg
+	@echo "EDIT_DIR = \"${DATADIR}/edit\"" >> ${PREFIX}/etc/mangband.cfg
+	@echo "SAVE_DIR = \"${DATADIR}/save\"" >> ${PREFIX}/etc/mangband.cfg
+	@echo "DATA_DIR = \"${DATADIR}/data\"" >> ${PREFIX}/etc/mangband.cfg
+
+	@${MKDIR} ${EXAMPLESDIR}
+	@echo "[MAngband]" >> ${EXAMPLESDIR}/mangrc
+	@echo "LibDir ${DATADIR}" >> ${EXAMPLESDIR}/mangrc
+
+	@${MKDIR} ${DATADIR}
+	@cd ${WRKSRC}/../lib && ${PAX} -rw * ${DATADIR}
+	@${CHMOD} 750 ${DATADIR}/*
+	@${CHMOD} 755 ${DATADIR}/user
+	@${CHMOD} 755 ${DATADIR}/xtra
+	@${CHOWN} -R root:games ${DATADIR}/*
+	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+
+.include <bsd.port.post.mk>
diff --git a/games/mangband/distinfo b/games/mangband/distinfo
index cb2eabf90218..ad49f68a18ab 100644
--- a/games/mangband/distinfo
+++ b/games/mangband/distinfo
@@ -1,3 +1,3 @@
-MD5 (mangband-070.tar.gz) = 392e7d30122131cc3d431d4ad5b905a1
-SHA256 (mangband-070.tar.gz) = c120e3518c36dd1ec85560c00c9b0936f655e97b9984ccea77444f2fb5ac5729
-SIZE (mangband-070.tar.gz) = 1049096
+MD5 (mangband-1.1.2.tar.gz) = f6bf8d8fb0533c94e2f520d53b0815b0
+SHA256 (mangband-1.1.2.tar.gz) = 648d079417edda959302b2d77f169977b5c3a00ad58c2268dd6f9c1f6fbc2b49
+SIZE (mangband-1.1.2.tar.gz) = 1485354
diff --git a/games/mangband/files/patch-ab b/games/mangband/files/patch-ab
deleted file mode 100644
index cda4eb16a658..000000000000
--- a/games/mangband/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	Fri Feb  2 04:56:06 2007
-+++ Makefile	Fri Feb  2 04:56:06 2007
-@@ -134,7 +134,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+#CC = gcc
- 
- 
- #
-@@ -155,8 +155,8 @@
- # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
- # attempt to "guess" at many of these flags based on your system.
- #
--CFLAGS = -Wall -g -pipe -D"USE_X11" -D"USE_GCU" -I/usr/include/ncurses
--LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-+CFLAGS += -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH="\"${PREFIX}/lib/mangband\"" -I${LOCALBASE}/include
-+LIBS = -L${LOCALBASE}/lib -lX11 -lncurses
- 
- 
- ##
diff --git a/games/mangband/pkg-descr b/games/mangband/pkg-descr
index 07a7015e587e..6710a9dc054c 100644
--- a/games/mangband/pkg-descr
+++ b/games/mangband/pkg-descr
@@ -1,8 +1,4 @@
-MAngband is a multiplayer version of the roguelike game Angband.
-If you have no idea what Angband is, I suggest that you visit
-Official Angband Page http://www.phial.com/angband/
+MAngband is a free online multiplayer real-time roguelike game,
+derived from the single player game Angband.
 
 WWW: http://mangband.org/
-
- -Adam
- adam-ports@blacktabby.org
diff --git a/games/mangband/pkg-plist b/games/mangband/pkg-plist
index 2e4b718d9f47..65dbc0ef8bbd 100644
--- a/games/mangband/pkg-plist
+++ b/games/mangband/pkg-plist
@@ -1,50 +1,102 @@
-bin/mangband
 bin/mangclient
-bin/mangconsole
-@exec install -d -o games -g games -m 750 %D/lib/mangband/data
-@exec install -d -o games -g games -m 750 %D/lib/mangband/file
-@exec install -d -o games -g games -m 750 %D/lib/mangband/game
-@exec install -d -o games -g games -m 750 %D/lib/mangband/text
-@exec install -d -o games -g games -m 750 %D/lib/mangband/save
-@exec install -d -o games -g games -m 755 %D/lib/mangband/user
-lib/mangband/file/wizards.txt
-lib/mangband/game/a_info.txt
-lib/mangband/game/e_info.txt
-lib/mangband/game/f_info.txt
-lib/mangband/game/k_info.txt
-lib/mangband/game/r_info.txt
-lib/mangband/game/v_info.txt
-lib/mangband/text/attack.txt
-lib/mangband/text/birth.txt
-lib/mangband/text/command.txt
-lib/mangband/text/dead.txt
-lib/mangband/text/dungeon.txt
-lib/mangband/text/general.txt
-lib/mangband/text/help.hlp
-lib/mangband/text/mangband.hlp
-lib/mangband/text/news.txt
-lib/mangband/text/option.txt
-lib/mangband/text/version.txt
-lib/mangband/user/font-ami.prf
-lib/mangband/user/font-ibm.prf
-lib/mangband/user/font-win.prf
-lib/mangband/user/graf-ami.prf
-lib/mangband/user/graf-win.prf
-lib/mangband/user/options.prf
-lib/mangband/user/pref-acn.prf
-lib/mangband/user/pref-emx.prf
-lib/mangband/user/pref-ibm.prf
-lib/mangband/user/pref-lsl.prf
-lib/mangband/user/pref-mac.prf
-lib/mangband/user/pref-win.prf
-lib/mangband/user/pref-x11.prf
-lib/mangband/user/pref-xaw.prf
-lib/mangband/user/pref.prf
-lib/mangband/user/window.prf
-@dirrm lib/mangband/user
-@dirrm lib/mangband/save
-@dirrm lib/mangband/text
-@dirrm lib/mangband/game
-@dirrm lib/mangband/file
-@dirrm lib/mangband/data
-@dirrm lib/mangband
+bin/mangband
+etc/mangband.cfg
+%%EXAMPLESDIR%%/mangrc
+%%DATADIR%%/data/scores.raw
+%%DATADIR%%/edit/artifact.txt
+%%DATADIR%%/edit/ego_item.txt
+%%DATADIR%%/edit/flavor.txt
+%%DATADIR%%/edit/limits.txt
+%%DATADIR%%/edit/monster.txt
+%%DATADIR%%/edit/object.txt
+%%DATADIR%%/edit/p_class.txt
+%%DATADIR%%/edit/p_hist.txt
+%%DATADIR%%/edit/p_race.txt
+%%DATADIR%%/edit/terrain.txt
+%%DATADIR%%/edit/vault.txt
+%%DATADIR%%/file/delete.me
+%%DATADIR%%/help/delete.me
+%%DATADIR%%/save/server-level-100
+%%DATADIR%%/save/server-level-120
+%%DATADIR%%/save/server-level-20
+%%DATADIR%%/save/server-level-40
+%%DATADIR%%/save/server-level-60
+%%DATADIR%%/save/server-level-80
+%%DATADIR%%/text/attack.txt
+%%DATADIR%%/text/birth.txt
+%%DATADIR%%/text/command.txt
+%%DATADIR%%/text/dead.txt
+%%DATADIR%%/text/dungeon.txt
+%%DATADIR%%/text/general.txt
+%%DATADIR%%/text/help.hlp
+%%DATADIR%%/text/mangband.hlp
+%%DATADIR%%/text/news.txt
+%%DATADIR%%/text/option.txt
+%%DATADIR%%/text/version.txt
+%%DATADIR%%/user/font-ami.prf
+%%DATADIR%%/user/font-ibm.prf
+%%DATADIR%%/user/font-sdl.prf
+%%DATADIR%%/user/font-win.prf
+%%DATADIR%%/user/font-x11.prf
+%%DATADIR%%/user/graf-ami.prf
+%%DATADIR%%/user/graf-win.prf
+%%DATADIR%%/user/grey.prf
+%%DATADIR%%/user/options.prf
+%%DATADIR%%/user/pref-acn.prf
+%%DATADIR%%/user/pref-emx.prf
+%%DATADIR%%/user/pref-ibm.prf
+%%DATADIR%%/user/pref-lsl.prf
+%%DATADIR%%/user/pref-mac.prf
+%%DATADIR%%/user/pref-sdl.prf
+%%DATADIR%%/user/pref-win.prf
+%%DATADIR%%/user/pref-x11.prf
+%%DATADIR%%/user/pref-xaw.prf
+%%DATADIR%%/user/pref.prf
+%%DATADIR%%/user/putty.prf
+%%DATADIR%%/user/user-gcu.prf
+%%DATADIR%%/user/user-x11.prf
+%%DATADIR%%/user/window.prf
+%%DATADIR%%/xtra/Sound/1UNCH.WAV
+%%DATADIR%%/xtra/Sound/BREATH.WAV
+%%DATADIR%%/xtra/Sound/DEATH.WAV
+%%DATADIR%%/xtra/Sound/DESTROY.WAV
+%%DATADIR%%/xtra/Sound/DROP.WAV
+%%DATADIR%%/xtra/Sound/HALLU.WAV
+%%DATADIR%%/xtra/Sound/HIT.WAV
+%%DATADIR%%/xtra/Sound/LEVEL.WAV
+%%DATADIR%%/xtra/Sound/MISS.WAV
+%%DATADIR%%/xtra/Sound/PYDIES.WAV
+%%DATADIR%%/xtra/Sound/TERROR.WAV
+%%DATADIR%%/xtra/Sound/VOMIT.WAV
+%%DATADIR%%/xtra/font/10X20.FON
+%%DATADIR%%/xtra/font/12X24.FON
+%%DATADIR%%/xtra/font/16x16.FON
+%%DATADIR%%/xtra/font/5X8.FON
+%%DATADIR%%/xtra/font/6X10.FON
+%%DATADIR%%/xtra/font/6X12.FON
+%%DATADIR%%/xtra/font/6X13.FON
+%%DATADIR%%/xtra/font/6X13B.FON
+%%DATADIR%%/xtra/font/6X9.FON
+%%DATADIR%%/xtra/font/7X13.FON
+%%DATADIR%%/xtra/font/7X13B.FON
+%%DATADIR%%/xtra/font/8X13.FON
+%%DATADIR%%/xtra/font/8X13B.FON
+%%DATADIR%%/xtra/font/9X15.FON
+%%DATADIR%%/xtra/font/9X15B.FON
+%%DATADIR%%/xtra/font/misc6x13.hex
+%%DATADIR%%/xtra/font/nethack10x19-10.hex
+%%DATADIR%%/xtra/graf/16x16.bmp
+%%DATADIR%%/xtra/graf/mask.bmp
+@dirrm %%DATADIR%%/xtra/graf
+@dirrm %%DATADIR%%/xtra/font
+@dirrm %%DATADIR%%/xtra/Sound
+@dirrm %%DATADIR%%/xtra
+@dirrm %%DATADIR%%/user
+@dirrm %%DATADIR%%/text
+@dirrm %%DATADIR%%/save
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/file
+@dirrm %%DATADIR%%/edit
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%