Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Oct 2014 17:13:19 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r370373 - head/sysutils/memtest86+
Message-ID:  <201410071713.s97HDJHQ001829@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Oct  7 17:13:19 2014
New Revision: 370373
URL: https://svnweb.freebsd.org/changeset/ports/370373
QAT: https://qat.redports.org/buildarchive/r370373/

Log:
  Simplify plist management

Modified:
  head/sysutils/memtest86+/Makefile

Modified: head/sysutils/memtest86+/Makefile
==============================================================================
--- head/sysutils/memtest86+/Makefile	Tue Oct  7 17:10:08 2014	(r370372)
+++ head/sysutils/memtest86+/Makefile	Tue Oct  7 17:13:19 2014	(r370373)
@@ -30,6 +30,9 @@ BOOT_DESC=	Build ELF image loadable by b
 SERIAL_DESC=	Enable serial console at COM1/9600
 HISPEED_DESC=	Set COM1 serial console speed to 115200
 
+ISO_PLIST_FILES=	${DATADIR}/mt${PORTVERSION:C/\.//}.iso
+BOOT_PLIST_FILES=	${BOOT_DIR}/memtest86+
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBOOT}
@@ -62,21 +65,6 @@ pre-fetch:
 post-patch:
 	${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
 
-PLIST=		${WRKDIR}/pkg-plist
-
-pre-install:
-# Generate PLIST dynamically because install things outside normal ${PREFIX}
-	@${TEST} -f ${PLIST} && ${RM} ${PLIST} || ${TRUE}
-.if ${PORT_OPTIONS:MISO}
-	@${ECHO} "%%DATADIR%%/mt${PORTVERSION:C/\.//}.iso" >> ${PLIST}
-	@${ECHO} "@dirrm %%DATADIR%%" >> ${PLIST}
-.endif
-.if ${PORT_OPTIONS:MBOOT}
-	@${ECHO} "@cwd ${BOOT_DIR:H}" >> ${PLIST}
-	@${ECHO} "${BOOT_DIR:T}/memtest86+" >> ${PLIST}
-	@${ECHO} "@dirrm ${BOOT_DIR:T}" >> ${PLIST}
-.endif
-
 do-install:
 .if ${PORT_OPTIONS:MISO}
 	@${MKDIR} ${STAGEDIR}${DATADIR}



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