- Update to 3.2 [1]

- Pass maintainership to submitter [1]
- Convert Makefile headers to new style
- Convert to PLIST_FILES
- Convert to new options framework
- Remove hardcoded CC, optimisation flags
- Improve COMMENT
- Update MASTER_SITES

PR:	ports/174699 (based on) [1]
Submitted by:	"sendtomatt@gmail.com" <sendtomatt@gmail.com>

5 files changed, 49 insertions, 150 deletions

diff --git a/games/dungeon/Makefile b/games/dungeon/Makefile
index 6c0bdce16d97..75a3e795cae1 100644
--- a/games/dungeon/Makefile
+++ b/games/dungeon/Makefile
@@ -1,60 +1,60 @@
-# New ports collection makefile for:	dungeon
-# Date created:		31 October 1999
-# Whom:			Ryo MIYAMOTO
-#
+# Created by: Ryo MIYAMOTO
 # $FreeBSD$
-#
 
 PORTNAME=	dungeon
-PORTVERSION=	1.0
-PORTREVISION=	3
+PORTVERSION=	3.2
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/games/source/ \
-		ftp://ftp.ifarchive.com/if-archive/games/source/ \
-		http://mirror.ifarchive.org/if-archive/games/source/ \
-		ftp://ftp.funet.fi/pub/misc/if-archive/games/source/ \
-		ftp://ftp.planetmirror.com/pub/if-archive/games/source/ \
-		http://www.ibiblio.org/pub/docs/interactive-fiction/games/source/ \
-		http://ifarchive.flavorplex.com/if-archive/games/source/ \
-		http://www.vaxdungeon.com/Archive/dungeon/
-DISTFILES=	dungn27s.zip dungn32b.zip
-EXTRACT_ONLY=	dungn27s.zip
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Text adventure game of ZORK
+MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/games/source/:source \
+	ftp://ftp.ifarchive.com/if-archive/games/source/:source \
+	http://mirror.ifarchive.org/if-archive/games/source/:source \
+	ftp://ftp.funet.fi/pub/misc/ifarchive/games/source/:source \
+	http://ifarchive.flavorplex.com/if-archive/games/source/:source \
+	http://eblong.com/zarf/glk/:glkterm
+DISTFILES=	dungn27s.zip:source \
+		dungn32b.zip:source \
+		dungeon-gdt-glk.tar.gz:source \
+		glkterm-104.tar.gz:glkterm
+EXTRACT_ONLY=	dungeon-gdt-glk.tar.gz \
+		glkterm-104.tar.gz \
+		dungn27s.zip
+
+MAINTAINER=	sailor@63bit.net
+COMMENT=	Text adventure which became Zork I-III
 
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
-#WRKSRC=		${WRKDIR}/${DISTNAME}
 MAN6=		dungeon.6
-TMPFILE=	${WRKSRC}/dungeon.tmp
 
-#do-extract:
-#	${RM} -rf ${WRKSRC}
-#	${MKDIR} ${WRKSRC}
-#	(cd ${WRKSRC} && unzip ${DISTDIR}/dungn27s.zip > /dev/null)
+PLIST_FILES=	bin/dungeon \
+		%%DATADIR%%/dundat \
+		%%PORTDOCS%%%%DOCSDIR%%/dungn32b.zip
+PLIST_DIRS=	%%DATADIR%%
 
-post-extract:
-	(cd ${WRKSRC} && ${LS} > ${TMPFILE}.1)
-	(cd ${WRKSRC} && ${AWK} -f ${FILESDIR}/aa.awk < ${TMPFILE}.1 \
-		> ${TMPFILE}.2)
-	(cd ${WRKSRC} && ${SH} ${TMPFILE}.2)
-	(cd ${WRKSRC} && ${RM} ${TMPFILE}.?)
-	(cd ${WRKSRC} && ${CP} makefile Makefile)
+PORTDOCS=	HISTORY MANIFEST README
 
-pre-install:
-	${RM} -rf ${PREFIX}/share/dungeon
-	${MKDIR} ${PREFIX}/share/dungeon
+MAKE_FLAGS+=	DATADIR=${DATADIR}
+MAKE_ENV+=	GDT_FLAG=-DHAVE_GDT
+
+.include <bsd.port.options.mk>
+
+pre-patch:
+	@${REINPLACE_CMD} -e 's/^CC =/CC ?=/' \
+		-e 's/^CFLAGS =/CFLAGS +=/' \
+		-e 's/^OPTIONS = -g/OPTIONS =/' \
+		-e '/^OPTIONS = -O/d' \
+		${WRKSRC}/glkterm/Makefile ${WRKSRC}/dungeon-gdt/Makefile
+
+do-build:
+	@(cd ${WRKSRC}/glkterm && ${MAKE})
+	@(cd ${WRKSRC}/dungeon-gdt/ && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dungeon ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/dtextc.dat ${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/dungeon.6 ${PREFIX}/man/man6
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/history ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/manifest ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
+	@${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/dungeon-gdt/dungeon ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/dungeon-gdt/dundat ${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/DUNGEON.6 ${MAN6PREFIX}/man/man6/dungeon.6
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/dungn32b.zip ${DOCSDIR}
 .endif
 
diff --git a/games/dungeon/distinfo b/games/dungeon/distinfo
index 51746e376070..fee6fe7dd947 100644
--- a/games/dungeon/distinfo
+++ b/games/dungeon/distinfo
@@ -2,3 +2,7 @@ SHA256 (dungn27s.zip) = 8c5e851596c83f349f4c5f9b38e84e98a8e72d29f620a2d56809e9b6
 SIZE (dungn27s.zip) = 261107
 SHA256 (dungn32b.zip) = 087afdc28a8eee80eb01f8fb2a3c3cc7dc5215feb2b4f0e38bb0dfa041eb5073
 SIZE (dungn32b.zip) = 383455
+SHA256 (dungeon-gdt-glk.tar.gz) = d6587be3f10dda85e152bb6c17966157bc9378f4ad6013b81b9fd285fd122032
+SIZE (dungeon-gdt-glk.tar.gz) = 262052
+SHA256 (glkterm-104.tar.gz) = 473d6ef74defdacade2ef0c3f26644383e8f73b4f1b348e37a9bb669a94d927e
+SIZE (glkterm-104.tar.gz) = 123440
diff --git a/games/dungeon/files/aa.awk b/games/dungeon/files/aa.awk
deleted file mode 100644
index 30d2cfb5bb7c..000000000000
--- a/games/dungeon/files/aa.awk
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-#  printf("mv %s %s\n", $1, tolower($1));
-  printf("tr -d \r < %s | tr -d \032 > %s && rm %s\n", $1, tolower($1), $1);
-}
diff --git a/games/dungeon/files/patch-aa b/games/dungeon/files/patch-aa
deleted file mode 100644
index a6651aefe9ff..000000000000
--- a/games/dungeon/files/patch-aa
+++ /dev/null
@@ -1,93 +0,0 @@
---- Makefile.orig	Sun Sep  1 16:28:21 2002
-+++ Makefile	Sun Sep  1 16:28:53 2002
-@@ -1,10 +1,10 @@
- # Makefile for dungeon
- 
- # Where to install the program
--BINDIR = /usr/games
-+BINDIR = ${PREFIX}/bin
- 
- # Where to install the data file
--LIBDIR = /usr/games/lib
-+LIBDIR = ${PREFIX}/share/dungeon
- 
- # The dungeon program provides a ``more'' facility which tries to
- # figure out how many rows the terminal has.  Several mechanisms are
-@@ -42,7 +42,7 @@
- # GDTFLAG = -DALLOW_GDT
- 
- # Compilation flags
--CFLAGS = -O
-+CFLAGS ?= -O
- # On SCO Unix Development System 3.2.2a, the const type qualifier does
- # not work correctly when using cc.  The following line will cause it
- # to not be used and should be uncommented.
-@@ -62,6 +62,8 @@
- 	dverb2.o gdt.o lightp.o local.o nobjs.o np.o np1.o np2.o np3.o\
- 	nrooms.o objcts.o rooms.o sobjs.o supp.o sverbs.o verbs.o villns.o
- 
-+all: dungeon dtextc.dat
-+
- dungeon: $(OBJS) dtextc.dat
- 	$(CC) $(CFLAGS) -o dungeon $(OBJS) $(LIBS)
- 
-@@ -90,31 +92,31 @@
- supp.o: supp.c funcs.h vars.h
- 	$(CC) $(CFLAGS) $(TERMFLAG) -c supp.c	
- 
--actors.o: funcs.h vars.h
--ballop.o: funcs.h vars.h
--clockr.o: funcs.h vars.h
--demons.o: funcs.h vars.h
--dmain.o: funcs.h vars.h
--dso1.o: funcs.h vars.h
--dso2.o: funcs.h vars.h
--dso3.o: funcs.h vars.h
--dso4.o: funcs.h vars.h
--dso5.o: funcs.h vars.h
--dso6.o: funcs.h vars.h
--dso7.o: funcs.h vars.h
--dsub.o: funcs.h vars.h
--dverb1.o: funcs.h vars.h
--dverb2.o: funcs.h vars.h
--lightp.o: funcs.h vars.h
--nobjs.o: funcs.h vars.h
--np.o: funcs.h vars.h
--np1.o: funcs.h vars.h parse.h
--np2.o: funcs.h vars.h parse.h
--np3.o: funcs.h vars.h parse.h
--nrooms.o: funcs.h vars.h
--objcts.o: funcs.h vars.h
--rooms.o: funcs.h vars.h
--sobjs.o: funcs.h vars.h
--sverbs.o: funcs.h vars.h
--verbs.o: funcs.h vars.h
--villns.o: funcs.h vars.h
-+#actors.o: funcs.h vars.h
-+#ballop.o: funcs.h vars.h
-+#clockr.o: funcs.h vars.h
-+#demons.o: funcs.h vars.h
-+#dmain.o: funcs.h vars.h
-+#dso1.o: funcs.h vars.h
-+#dso2.o: funcs.h vars.h
-+#dso3.o: funcs.h vars.h
-+#dso4.o: funcs.h vars.h
-+#dso5.o: funcs.h vars.h
-+#dso6.o: funcs.h vars.h
-+#dso7.o: funcs.h vars.h
-+#dsub.o: funcs.h vars.h
-+#dverb1.o: funcs.h vars.h
-+#dverb2.o: funcs.h vars.h
-+#lightp.o: funcs.h vars.h
-+#nobjs.o: funcs.h vars.h
-+#np.o: funcs.h vars.h
-+#np1.o: funcs.h vars.h parse.h
-+#np2.o: funcs.h vars.h parse.h
-+#np3.o: funcs.h vars.h parse.h
-+#nrooms.o: funcs.h vars.h
-+#objcts.o: funcs.h vars.h
-+#rooms.o: funcs.h vars.h
-+#sobjs.o: funcs.h vars.h
-+#sverbs.o: funcs.h vars.h
-+#verbs.o: funcs.h vars.h
-+#villns.o: funcs.h vars.h
diff --git a/games/dungeon/pkg-plist b/games/dungeon/pkg-plist
deleted file mode 100644
index ae59551b6ea4..000000000000
--- a/games/dungeon/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/dungeon
-%%DATADIR%%/dtextc.dat
-%%PORTDOCS%%%%DOCSDIR%%/dungn32b.zip
-%%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/manifest
-%%PORTDOCS%%%%DOCSDIR%%/readme
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/dungeon