Date: Sat, 25 Jan 2014 20:59:24 GMT From: Jakub Lach <jakub_lach@mailplus.pl> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/186109: [maintainer-patch] converting games/doom-data to OPTIONS_MULTI Message-ID: <201401252059.s0PKxOGQ086684@oldred.freebsd.org> Resent-Message-ID: <201401252100.s0PL01Rm031828@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186109
>Category: ports
>Synopsis: [maintainer-patch] converting games/doom-data to OPTIONS_MULTI
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 25 21:00:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Jakub Lach
>Release: FreeBSD 10.0-STABLE #0 r261164 amd64
>Organization:
>Environment:
>Description:
I think it makes more sense now. Previously, port allowed to uncheck all options, and install doom-data nonetheless breaking Makefile & ports (line 52 of Makefile).
Maybe freeing chocolate-doom from doom-data as dependency would be a good idea also, as you don't exactly need shareware data to play.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -rupN /usr/ports/games/doom-data.orig/Makefile /usr/ports/games/doom-data/Makefile
--- /usr/ports/games/doom-data.orig/Makefile 2014-01-25 21:27:14.000000000 +0100
+++ /usr/ports/games/doom-data/Makefile 2014-01-25 21:42:20.000000000 +0100
@@ -17,7 +17,8 @@ USE_BZIP2= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
-OPTIONS_DEFINE= DOOM HERETIC HEXEN STRIFE
+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
@@ -39,7 +40,7 @@ NO_STAGE= yes
.include <bsd.port.options.mk>
-.for f in ${OPTIONS_DEFINE}
+.for f in ${OPTIONS_MULTI_WADS}
.if ${PORT_OPTIONS:M${f}}
DISTFILES+= ${${f}_WAD}${EXTRACT_SUFX}
PLIST_SUB+= ${f}=""
@@ -48,13 +49,9 @@ PLIST_SUB+= ${f}="@comment "
. endif
.endfor
-.if ${DISTFILES} == ""
-. undef DIST_SUBDIR
-.endif
-
do-extract:
@${MKDIR} ${WRKDIR}
-.for f in ${OPTIONS_DEFINE}
+.for f in ${OPTIONS_MULTI_WADS}
. if ${PORT_OPTIONS:M${f}}
@${BZIP2_CMD} -dc ${_DISTDIR}/${${f}_WAD}${EXTRACT_SUFX} > \
${WRKDIR}/${${f}_WAD}
@@ -63,7 +60,7 @@ do-extract:
do-install:
@${MKDIR} ${DATADIR}
-.for f in ${OPTIONS_DEFINE}
+.for f in ${OPTIONS_MULTI_WADS}
. if ${PORT_OPTIONS:M${f}}
${INSTALL_DATA} ${WRKSRC}/${${f}_WAD} ${DATADIR}
. endif
diff -rupN /usr/ports/games/doom-data.orig/distinfo /usr/ports/games/doom-data/distinfo
--- /usr/ports/games/doom-data.orig/distinfo 2014-01-25 21:27:14.000000000 +0100
+++ /usr/ports/games/doom-data/distinfo 2014-01-25 21:43:33.000000000 +0100
@@ -1,8 +1,2 @@
SHA256 (doom-data/doom1.wad.bz2) = 415b18724d35cee07aa52f85bedc98ff28fd116c0c4d8ffe2031377e84543fad
SIZE (doom-data/doom1.wad.bz2) = 1689027
-SHA256 (doom-data/heretic1.wad.bz2) = c45d071b204d8186996b1e168326b72f9ed41d76158bbd955e83790380ab03ae
-SIZE (doom-data/heretic1.wad.bz2) = 2218057
-SHA256 (doom-data/hexen.wad.bz2) = ab1244006eb71aec85b45f136a28b4d889dd9e50b5630aa23d72145a086eb821
-SIZE (doom-data/hexen.wad.bz2) = 4897389
-SHA256 (doom-data/strife0.wad.bz2) = 86d04b2128957d2ea972b7b22b84cb455d65bb70a4df2eee8ef3dbe0cadb002b
-SIZE (doom-data/strife0.wad.bz2) = 4051675
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401252059.s0PKxOGQ086684>