3 files changed, 39 insertions, 66 deletions

diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index ac8b4485f3f2..7907c419bcc3 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xlife
-PORTVERSION=	6.6.1
+PORTVERSION=	6.7.5
 CATEGORIES=	games
 MASTER_SITES=	http://litwr2.atspace.eu/xlife/
 
@@ -12,50 +12,57 @@ COMMENT=	John Horton Conway's Game of Life
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	multi
 
+RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_BZIP2=	yes
+USES=		imake:notall
 USE_XORG=	x11
 
-MLINKS=		xlife.6 lifeconv.6
-MAN6=		xlife.6
 PORTDOCS=	*
 
 DESKTOP_ENTRIES="XLife" "" "" "${PORTNAME}" "" false
 
-DOC_FILES=	CHANGES DEVELOPMENT-TREE HACKING HOW-TO-INSTALL INSTALL \
-		MISSED README SHORT-INFO changelog.debian changelog.openbsd
+DOC_FILES=	CHANGES HACKING HOW-TO-INSTALL INSTALL MISSED README \
+		SHORT-INFO XLIFE-HISTORY.dot changelog.debian changelog.openbsd
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract:
 	@${LN} -sf xlife.man ${WRKSRC}/xlife.6
 
 pre-patch:
-	@(${CAT} ${WRKDIR}/xlife6.6to6.6.1.patch | ${PATCH} -d ${WRKSRC} -p1 -s)
+.for i in xlife6.7to6.7.1.patch xlife6.7.1to6.7.2.patch xlife6.7.2to6.7.3.patch
+	@(${CAT} ${WRKDIR}/${i} | ${PATCH} -d ${WRKSRC} -p1 -s)
+.endfor
 
-do-configure:
-	@(cd ${WRKSRC} && ${SED} -e \
-		's|/usr/games|$$(PREFIX)/bin| ; \
-		 s|/usr/share|$$(PREFIX)/share| ; \
-		 s|/usr/X11R6|$$(LOCALBASE)| ; \
-		 s|-g -O3|$$(CFLAGS)| ; \
-		 s|-lstdc++|| ; \
-		 s|$$(CC) -o|$$(CXX) -o|' < Makefile.common > Makefile)
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/CDEBUGFLAGS[[:space:]]/s|^|XCOMM | ; \
+		 s|/usr/share/xlife|${DATADIR}|' ${WRKSRC}/Imakefile
+	@${REINPLACE_CMD} -e \
+		's|GAWKPATH|${LOCALBASE}/bin/gawk|' ${WRKSRC}/table2r
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xlife ${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_SCRIPT} table2r ${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_MAN} xlife.6 ${MAN6PREFIX}/man/man6)
-	@${LN} -sf xlife ${PREFIX}/bin/lifeconv
-	@${MKDIR} ${DATADIR}/patterns
-	@(cd ${WRKSRC}/patterns && ${COPYTREE_SHARE} . ${DATADIR}/patterns)
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR})
-	@${MKDIR} ${DOCSDIR}/doc
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}/doc)
-.endif
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} gen-multirules xlife \
+		${STAGEDIR}${PREFIX}/bin)
+	@${LN} -sf xlife ${STAGEDIR}${PREFIX}/bin/lifeconv
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} table2r \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} xlife.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6)
+	@${LN} -sf xlife.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/lifeconv.6
+	@${MKDIR} ${STAGEDIR}${DATADIR}/patterns
+	(cd ${WRKSRC}/patterns && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${DATADIR}/patterns)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${DOCSDIR}/doc)
 
 .include <bsd.port.mk>
diff --git a/games/xlife/distinfo b/games/xlife/distinfo
index b53ea3678b40..99328ce438a6 100644
--- a/games/xlife/distinfo
+++ b/games/xlife/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xlife-6.6.1.tar.bz2) = caf18480c08446faa22974788fe45acb580058921a67656e5baea252990f5d79
-SIZE (xlife-6.6.1.tar.bz2) = 159098
+SHA256 (xlife-6.7.5.tar.bz2) = 4f470e37594284b00803bdd805d7ef6e889075225530d4e5717e0b4161f15a5a
+SIZE (xlife-6.7.5.tar.bz2) = 151686
diff --git a/games/xlife/pkg-plist b/games/xlife/pkg-plist
index 8cf1d59affef..ebbbc84612f4 100644
--- a/games/xlife/pkg-plist
+++ b/games/xlife/pkg-plist
@@ -1,18 +1,15 @@
+bin/gen-multirules
 bin/lifeconv
 bin/table2r
 bin/xlife
+man/man6/lifeconv.6.gz
+man/man6/xlife.6.gz
 %%DATADIR%%/patterns/boundedgrid/14-2-t.l
 %%DATADIR%%/patterns/boundedgrid/beginning-plain.l
 %%DATADIR%%/patterns/boundedgrid/beginning-torus.l
 %%DATADIR%%/patterns/boundedgrid/glider-torus.l
 %%DATADIR%%/patterns/boundedgrid/ice-nine-24.l
 %%DATADIR%%/patterns/boundedgrid/snowflakes.l
-%%DATADIR%%/patterns/codd/Codd.colors
-%%DATADIR%%/patterns/codd/codd.r
-%%DATADIR%%/patterns/codd/coders-demo.l
-%%DATADIR%%/patterns/codd/construction-arm-demo.l
-%%DATADIR%%/patterns/codd/lr-growth.l
-%%DATADIR%%/patterns/codd/tape-reader-demo.l
 %%DATADIR%%/patterns/formats/123p271_105.lif
 %%DATADIR%%/patterns/formats/13enginecordership.rle
 %%DATADIR%%/patterns/formats/17c45reaction.cells
@@ -25,46 +22,15 @@ bin/xlife
 %%DATADIR%%/patterns/langton/langton-ant.r
 %%DATADIR%%/patterns/langton/langton-loop.r
 %%DATADIR%%/patterns/langton/loop.l
-%%DATADIR%%/patterns/life/Eric_Angelini_integer_glider_gun.l
-%%DATADIR%%/patterns/life/acorn.l
-%%DATADIR%%/patterns/life/bi-gun.l
-%%DATADIR%%/patterns/life/bunnies.l
-%%DATADIR%%/patterns/life/cmu.l
-%%DATADIR%%/patterns/life/futility.l
-%%DATADIR%%/patterns/life/match.l
-%%DATADIR%%/patterns/life/named-patterns
-%%DATADIR%%/patterns/life-like/2-expanding-rakes.l
-%%DATADIR%%/patterns/life-like/DNShips.l
-%%DATADIR%%/patterns/life-like/Day-and-Night-gun-and-antigun.l
-%%DATADIR%%/patterns/life-like/S8B0+.l
-%%DATADIR%%/patterns/life-like/breeder2.l
-%%DATADIR%%/patterns/life-like/brians-brain/Giles_BBP3.l
-%%DATADIR%%/patterns/life-like/brians-brain/Giles_butterfly_gun.l
-%%DATADIR%%/patterns/life-like/brians-brain/Stretcher.l
-%%DATADIR%%/patterns/life-like/brians-brain/butterfly.l
-%%DATADIR%%/patterns/life-like/brians-brain/gen3.l
-%%DATADIR%%/patterns/life-like/brians-brain/puffer-l1.l
-%%DATADIR%%/patterns/life-like/brians-brain/puffer-l2.l
-%%DATADIR%%/patterns/life-like/coral.l
-%%DATADIR%%/patterns/life-like/enterprise-gun.l
-%%DATADIR%%/patterns/life-like/highlife.l
 %%DATADIR%%/patterns/life-like/osc-b3-s23-g32.l
-%%DATADIR%%/patterns/life-like/p168-knightship.l
-%%DATADIR%%/patterns/life-like/persian-rugs.l
-%%DATADIR%%/patterns/life-like/replicator.l
-%%DATADIR%%/patterns/life-like/spiral-growth.l
-%%DATADIR%%/patterns/life-like/white-whale.l
 %%DATADIR%%/patterns/pd/lloyd-torus.l
 %%DATADIR%%/patterns/pd/lloyd.l
 %%DATADIR%%/patterns/pd/lloyd2.l
 %%DATADIR%%/patterns/pd/osc-3.l
 @dirrm %%DATADIR%%/patterns/pd
-@dirrm %%DATADIR%%/patterns/life-like/brians-brain
 @dirrm %%DATADIR%%/patterns/life-like
-@dirrm %%DATADIR%%/patterns/life
 @dirrm %%DATADIR%%/patterns/langton
 @dirrm %%DATADIR%%/patterns/formats
-@dirrm %%DATADIR%%/patterns/codd
 @dirrm %%DATADIR%%/patterns/boundedgrid
 @dirrm %%DATADIR%%/patterns
 @dirrm %%DATADIR%%