Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jan 2014 12:55:03 +0000 (UTC)
From:      Alex Kozlov <ak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341171 - head/games/doom-data
Message-ID:  <201401261255.s0QCt3Lp034961@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ak
Date: Sun Jan 26 12:55:03 2014
New Revision: 341171
URL: http://svnweb.freebsd.org/changeset/ports/341171
QAT: https://qat.redports.org/buildarchive/r341171/

Log:
  - Switch to OPTIONS_MULTI [1]
  - Use options helpers
  - Support STAGEDIR
  
  PR:	ports/186109 (based on) [1]
  Submitted by:	Jakub Lach <jakub_lach@mailplus.pl> (maintainer) [1]

Modified:
  head/games/doom-data/Makefile

Modified: head/games/doom-data/Makefile
==============================================================================
--- head/games/doom-data/Makefile	Sun Jan 26 12:36:59 2014	(r341170)
+++ head/games/doom-data/Makefile	Sun Jan 26 12:55:03 2014	(r341171)
@@ -7,18 +7,20 @@ PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.ijs.si/~lesi/distfiles/doom/
 PKGNAMEPREFIX=	${DMPKGNAMEPREFIX}
-EXTRACT_SUFX=	.bz2
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
 MAINTAINER=	jakub_lach@mailplus.pl
 COMMENT=	Shareware data files for Doom, Doom II, Hexen, Heretic, and Strife
 
-USE_BZIP2=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS_DEFINE=	DOOM HERETIC HEXEN STRIFE
+OPTIONS_SUB=	yes
+
+OPTIONS_MULTI=	WADS
+OPTIONS_MULTI_WADS=	DOOM HERETIC HEXEN STRIFE
 OPTIONS_DEFAULT=	DOOM
+
 DOOM_DESC=	Install Doom shareware data
 HERETIC_DESC=	Install Heretic shareware data
 HEXEN_DESC=	Install Hexen shareware data
@@ -29,49 +31,24 @@ SUB_FILES=	pkg-message
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${DMDIR}
 
-DOOM_WAD=	doom1.wad
-HERETIC_WAD=	heretic1.wad
-HEXEN_WAD=	hexen.wad
-STRIFE_WAD=	strife0.wad
+DOOM_DISTFILES=	doom1.wad.bz2
+HERETIC_DISTFILES=	heretic1.wad.bz2
+HEXEN_DISTFILES=	hexen.wad.bz2
+STRIFE_DISTFILES=	strife0.wad.bz2
 
-NO_STAGE=	yes
 .include "Makefile.include"
-
 .include <bsd.port.options.mk>
 
-.for f in ${OPTIONS_DEFINE}
-.if ${PORT_OPTIONS:M${f}}
-DISTFILES+=	${${f}_WAD}${EXTRACT_SUFX}
-PLIST_SUB+=	${f}=""
-.   else
-PLIST_SUB+=	${f}="@comment "
-.   endif
-.endfor
-
-.if ${DISTFILES} == ""
-.   undef DIST_SUBDIR
-.endif
-
 do-extract:
 	@${MKDIR} ${WRKDIR}
-.for f in ${OPTIONS_DEFINE}
-.   if ${PORT_OPTIONS:M${f}}
-	@${BZIP2_CMD} -dc ${_DISTDIR}/${${f}_WAD}${EXTRACT_SUFX} > \
-		${WRKDIR}/${${f}_WAD}
-.   endif
+.for f in ${DISTFILES}
+	@${BZIP2_CMD} -dc ${_DISTDIR}/${f} > ${WRKDIR}/${f:S/.bz2$//}
 .endfor
 
 do-install:
-	@${MKDIR} ${DATADIR}
-.for f in ${OPTIONS_DEFINE}
-.   if ${PORT_OPTIONS:M${f}}
-	${INSTALL_DATA} ${WRKSRC}/${${f}_WAD} ${DATADIR}
-.   endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+.for f in ${DISTFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f:S/.bz2$//} ${STAGEDIR}${DATADIR}/
 .endfor
 
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401261255.s0QCt3Lp034961>