svn commit: r310296 - in head/games/dungeon: . files

[Alex Kozlov]

Author: ak
Date: Sun Jan 13 01:02:26 2013
New Revision: 310296
URL: http://svnweb.freebsd.org/changeset/ports/310296

Log:
  - 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 at gmail.com" <sendtomatt at gmail.com>

Deleted:
  head/games/dungeon/files/
  head/games/dungeon/pkg-plist
Modified:
  head/games/dungeon/Makefile   (contents, props changed)
  head/games/dungeon/distinfo   (contents, props changed)

Modified: head/games/dungeon/Makefile
==============================================================================
--- head/games/dungeon/Makefile	Sat Jan 12 23:30:35 2013	(r310295)
+++ head/games/dungeon/Makefile	Sun Jan 13 01:02:26 2013	(r310296)
@@ -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
+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=	ports at FreeBSD.org
-COMMENT=	Text adventure game of ZORK
+MAINTAINER=	sailor at 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)
-
-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)
-
-pre-install:
-	${RM} -rf ${PREFIX}/share/dungeon
-	${MKDIR} ${PREFIX}/share/dungeon
+PLIST_FILES=	bin/dungeon \
+		%%DATADIR%%/dundat \
+		%%PORTDOCS%%%%DOCSDIR%%/dungn32b.zip
+PLIST_DIRS=	%%DATADIR%%
+
+PORTDOCS=	HISTORY MANIFEST README
+
+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
 

Modified: head/games/dungeon/distinfo
==============================================================================
--- head/games/dungeon/distinfo	Sat Jan 12 23:30:35 2013	(r310295)
+++ head/games/dungeon/distinfo	Sun Jan 13 01:02:26 2013	(r310296)
@@ -2,3 +2,7 @@ SHA256 (dungn27s.zip) = 8c5e851596c83f34
 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