Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Feb 2016 10:13:28 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407696 - head/emulators/nonpareil
Message-ID:  <201602011013.u11ADSLN031478@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Feb  1 10:13:28 2016
New Revision: 407696
URL: https://svnweb.freebsd.org/changeset/ports/407696

Log:
  - Clarify LICENSE
  - Switch to options helpers
  - Simplify plist handling

Added:
  head/emulators/nonpareil/pkg-plist   (contents, props changed)
Modified:
  head/emulators/nonpareil/Makefile

Modified: head/emulators/nonpareil/Makefile
==============================================================================
--- head/emulators/nonpareil/Makefile	Mon Feb  1 10:12:53 2016	(r407695)
+++ head/emulators/nonpareil/Makefile	Mon Feb  1 10:13:28 2016	(r407696)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://nonpareil.brouhaha.
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simulator for many HP calculators
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
@@ -19,34 +19,10 @@ USES=		bison pkgconfig scons
 USE_GNOME=	gtk20 libxml2
 USE_SDL=	sdl
 
-PLIST_EXECS=	bin/modutil bin/nonpareil bin/uasm
-PLIST_DATA=	lib/nonpareil/21.kml lib/nonpareil/21.obj \
-		lib/nonpareil/21.png lib/nonpareil/25.kml \
-		lib/nonpareil/25.obj lib/nonpareil/25.png \
-		lib/nonpareil/32e.kml lib/nonpareil/32e.obj \
-		lib/nonpareil/32e.png lib/nonpareil/33c.kml \
-		lib/nonpareil/33c.obj lib/nonpareil/33c.png \
-		lib/nonpareil/34c.kml lib/nonpareil/34c.obj \
-		lib/nonpareil/34c.png lib/nonpareil/35.kml \
-		lib/nonpareil/35.lst lib/nonpareil/35.obj \
-		lib/nonpareil/35.png lib/nonpareil/37e.kml \
-		lib/nonpareil/37e.obj lib/nonpareil/37e.png \
-		lib/nonpareil/38c.kml lib/nonpareil/38c.obj \
-		lib/nonpareil/38c.png lib/nonpareil/38e.kml \
-		lib/nonpareil/38e.obj lib/nonpareil/41cv.kml \
-		lib/nonpareil/41cv.mod lib/nonpareil/41cv.png \
-		lib/nonpareil/41cx.kml lib/nonpareil/41cx.mod \
-		lib/nonpareil/45.kml lib/nonpareil/45.lst \
-		lib/nonpareil/45.obj lib/nonpareil/45.png \
-		lib/nonpareil/55.kml lib/nonpareil/55.lst \
-		lib/nonpareil/55.obj lib/nonpareil/55.png \
-		lib/nonpareil/80.kml lib/nonpareil/80.lst \
-		lib/nonpareil/80.obj lib/nonpareil/80.png \
-		lib/nonpareil/82143a.mod lib/nonpareil/82182a.mod
-
-PLIST_FILES=	${PLIST_EXECS} ${PLIST_DATA}
 PORTDOCS=	CREDITS DEBUGGING README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%CFLAGS%%|${CFLAGS}| ; \
@@ -57,8 +33,10 @@ post-patch:
 		's|<stdint.h>|<inttypes.h>|g' ${WRKSRC}/src/*.[cly]
 
 post-install:
-	${STRIP_CMD} ${PLIST_EXECS:S|^|${STAGEDIR}${PREFIX}/|}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/emulators/nonpareil/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/nonpareil/pkg-plist	Mon Feb  1 10:13:28 2016	(r407696)
@@ -0,0 +1,49 @@
+bin/modutil
+bin/nonpareil
+bin/uasm
+lib/nonpareil/21.kml
+lib/nonpareil/21.obj
+lib/nonpareil/21.png
+lib/nonpareil/25.kml
+lib/nonpareil/25.obj
+lib/nonpareil/25.png
+lib/nonpareil/32e.kml
+lib/nonpareil/32e.obj
+lib/nonpareil/32e.png
+lib/nonpareil/33c.kml
+lib/nonpareil/33c.obj
+lib/nonpareil/33c.png
+lib/nonpareil/34c.kml
+lib/nonpareil/34c.obj
+lib/nonpareil/34c.png
+lib/nonpareil/35.kml
+lib/nonpareil/35.lst
+lib/nonpareil/35.obj
+lib/nonpareil/35.png
+lib/nonpareil/37e.kml
+lib/nonpareil/37e.obj
+lib/nonpareil/37e.png
+lib/nonpareil/38c.kml
+lib/nonpareil/38c.obj
+lib/nonpareil/38c.png
+lib/nonpareil/38e.kml
+lib/nonpareil/38e.obj
+lib/nonpareil/41cv.kml
+lib/nonpareil/41cv.mod
+lib/nonpareil/41cv.png
+lib/nonpareil/41cx.kml
+lib/nonpareil/41cx.mod
+lib/nonpareil/45.kml
+lib/nonpareil/45.lst
+lib/nonpareil/45.obj
+lib/nonpareil/45.png
+lib/nonpareil/55.kml
+lib/nonpareil/55.lst
+lib/nonpareil/55.obj
+lib/nonpareil/55.png
+lib/nonpareil/80.kml
+lib/nonpareil/80.lst
+lib/nonpareil/80.obj
+lib/nonpareil/80.png
+lib/nonpareil/82143a.mod
+lib/nonpareil/82182a.mod



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