Enable "iso" by default. This makes the package more useful for users of binary packages, who can then burn a bootable memtest CD, and only costs 1.8 MB without adding any run-time dependencies. Source users get a dependency on cdrtools, but that's likely already installed, and the option can easily be turned off in that case (unlike binary package users, who can't change options).diff -r1.18 -r1.19 pkgsrc/sysutils/memtestplus/Makefile
(gdt)
@@ -1,22 +1,23 @@ | @@ -1,22 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.18 2013/12/22 21:32:36 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2014/06/04 16:07:34 gdt Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | # Note -- version number also in the do-install rule | 4 | # Note -- version number also in the do-install rule | |
5 | MAJVER=5 | 5 | MAJVER=5 | |
6 | MINVER=01 | 6 | MINVER=01 | |
7 | 7 | |||
8 | DISTNAME= memtest86+-${MAJVER}.${MINVER} | 8 | DISTNAME= memtest86+-${MAJVER}.${MINVER} | |
9 | PKGNAME= memtestplus-${MAJVER}.${MINVER} | 9 | PKGNAME= memtestplus-${MAJVER}.${MINVER} | |
10 | PKGREVISION= 1 | |||
10 | CATEGORIES= sysutils | 11 | CATEGORIES= sysutils | |
11 | MASTER_SITES= http://www.memtest.org/download/${MAJVER}.${MINVER}/ | 12 | MASTER_SITES= http://www.memtest.org/download/${MAJVER}.${MINVER}/ | |
12 | 13 | |||
13 | MAINTAINER= pkgsrc-users@NetBSD.org | 14 | MAINTAINER= pkgsrc-users@NetBSD.org | |
14 | HOMEPAGE= http://www.memtest.org/ | 15 | HOMEPAGE= http://www.memtest.org/ | |
15 | COMMENT= Thorough, stand alone memory test for x86 arch | 16 | COMMENT= Thorough, stand alone memory test for x86 arch | |
16 | LICENSE= gnu-gpl-v2 | 17 | LICENSE= gnu-gpl-v2 | |
17 | 18 | |||
18 | ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 NetBSD-*-x86_64 Linux-*-x86_64 | 19 | ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 NetBSD-*-x86_64 Linux-*-x86_64 | |
19 | 20 | |||
20 | .include "../../mk/bsd.prefs.mk" | 21 | .include "../../mk/bsd.prefs.mk" | |
21 | .if !empty(MACHINE_PLATFORM:MNetBSD-5.*) | 22 | .if !empty(MACHINE_PLATFORM:MNetBSD-5.*) | |
22 | GCC_REQD+= 4.6 | 23 | GCC_REQD+= 4.6 |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: options.mk,v 1.5 2008/11/24 04:06:00 smb Exp $ | 1 | # $NetBSD: options.mk,v 1.6 2014/06/04 16:07:34 gdt Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.memtestplus | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.memtestplus | |
4 | PKG_SUPPORTED_OPTIONS= iso serialconsole | 4 | PKG_SUPPORTED_OPTIONS= iso serialconsole | |
5 | PKG_SUGGESTED_OPTIONS= | 5 | PKG_SUGGESTED_OPTIONS= iso | |
6 | 6 | |||
7 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
8 | 8 | |||
9 | PLIST_VARS+= iso | 9 | PLIST_VARS+= iso | |
10 | .if !empty(PKG_OPTIONS:Miso) | 10 | .if !empty(PKG_OPTIONS:Miso) | |
11 | BUILD_TARGET= iso | 11 | BUILD_TARGET= iso | |
12 | BUILD_DEPENDS+= {cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools | 12 | BUILD_DEPENDS+= {cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools | |
13 | PLIST.iso= yes | 13 | PLIST.iso= yes | |
14 | .endif | 14 | .endif | |
15 | 15 | |||
16 | .if !empty(PKG_OPTIONS:Mserialconsole) | 16 | .if !empty(PKG_OPTIONS:Mserialconsole) | |
17 | SUBST_CLASSES+= serialopt | 17 | SUBST_CLASSES+= serialopt | |
18 | SUBST_STAGE.serialopt= post-patch | 18 | SUBST_STAGE.serialopt= post-patch |