svn commit: r357635 - head/devel/nasm

[Adam Weinberger]

Author: adamw
Date: Thu Jun 12 21:09:47 2014
New Revision: 357635
URL: http://svnweb.freebsd.org/changeset/ports/357635
QAT: https://qat.redports.org/buildarchive/r357635/

Log:
  Update to 2.11.05. Turn DOCS and the RDOFF stuff into OPTIONS.

Modified:
  head/devel/nasm/Makefile
  head/devel/nasm/distinfo
  head/devel/nasm/pkg-plist

Modified: head/devel/nasm/Makefile
==============================================================================
--- head/devel/nasm/Makefile	Thu Jun 12 20:40:41 2014	(r357634)
+++ head/devel/nasm/Makefile	Thu Jun 12 21:09:47 2014	(r357635)
@@ -1,28 +1,38 @@
 # Created by: Murray Stokely <murray at cdrom.com>
 # $FreeBSD$
 
-PORTNAME=	nasm
-PORTVERSION=	2.10.09
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	devel lang
+PORTNAME=		nasm
+PORTVERSION=	2.11.05
+PORTEPOCH=		1
+CATEGORIES=		devel lang
 MASTER_SITES=	http://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX}
 
-MAINTAINER=	adamw at FreeBSD.org
-COMMENT=	General-purpose multi-platform x86 and amd64 assembler
+MAINTAINER=		adamw at FreeBSD.org
+COMMENT=		General-purpose multi-platform x86 and amd64 assembler
 
-LICENSE=	BSD2CLAUSE
+LICENSE=		BSD2CLAUSE
 
 GNU_CONFIGURE=	yes
-USES=		tar:xz gmake	# parallel builds (-jX) are broken with BSD make(1)
-MAKE_ARGS+=	INSTALLROOT=${STAGEDIR}
-INSTALL_TARGET=	install install_rdf
+USES=			tar:xz gmake
+MAKE_ARGS+=		INSTALLROOT=${STAGEDIR}
 
-PORTDOCS=	*
+OPTIONS_DEFINE=	RDOFF DOCS
+OPTIONS_DEFAULT=RDOFF
+OPTIONS_SUB=	yes
 
+RDOFF_DESC=		Install tools to handle RDOFF object files
+RDOFF_INSTALL_TARGET=	install install_rdf
+
+DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX}
+PORTDOCS=		*
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/nasmdoc.txt ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/doc/nasmdoc.txt ${STAGEDIR}${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>

Modified: head/devel/nasm/distinfo
==============================================================================
--- head/devel/nasm/distinfo	Thu Jun 12 20:40:41 2014	(r357634)
+++ head/devel/nasm/distinfo	Thu Jun 12 21:09:47 2014	(r357635)
@@ -1,4 +1,4 @@
-SHA256 (nasm-2.10.09.tar.xz) = 9ffd9f910c783ee798cf2986cec01ebeeb01ba0ecacef64d2d4bea927c41fbf2
-SIZE (nasm-2.10.09.tar.xz) = 686416
-SHA256 (nasm-2.10.09-xdoc.tar.xz) = 42598c7b7c82054fee9da071040bd910a5aeba454415d065bb31ac5b38968180
-SIZE (nasm-2.10.09-xdoc.tar.xz) = 695840
+SHA256 (nasm-2.11.05.tar.xz) = 2f4769c2fc88dbd8df4383ce30bc86919b5d488854ab906ebcee5d5a38828a6b
+SIZE (nasm-2.11.05.tar.xz) = 744740
+SHA256 (nasm-2.11.05-xdoc.tar.xz) = cd8209714acab9b7fe764c4c9fb43466cc079c4ebb83adafddc1e838595ac44b
+SIZE (nasm-2.11.05-xdoc.tar.xz) = 730376

Modified: head/devel/nasm/pkg-plist
==============================================================================
--- head/devel/nasm/pkg-plist	Thu Jun 12 20:40:41 2014	(r357634)
+++ head/devel/nasm/pkg-plist	Thu Jun 12 21:09:47 2014	(r357635)
@@ -1,22 +1,22 @@
-bin/ldrdf
 bin/nasm
 bin/ndisasm
-bin/rdf2bin
-bin/rdf2com
-bin/rdf2ihx
-bin/rdf2ith
-bin/rdf2srec
-bin/rdfdump
-bin/rdflib
-bin/rdx
-man/man1/ldrdf.1.gz
 man/man1/nasm.1.gz
 man/man1/ndisasm.1.gz
-man/man1/rdf2bin.1.gz
-man/man1/rdf2com.1.gz
-man/man1/rdf2ihx.1.gz
-man/man1/rdf2ith.1.gz
-man/man1/rdf2srec.1.gz
-man/man1/rdfdump.1.gz
-man/man1/rdflib.1.gz
-man/man1/rdx.1.gz
+%%RDOFF%%bin/ldrdf
+%%RDOFF%%bin/rdf2bin
+%%RDOFF%%bin/rdf2com
+%%RDOFF%%bin/rdf2ihx
+%%RDOFF%%bin/rdf2ith
+%%RDOFF%%bin/rdf2srec
+%%RDOFF%%bin/rdfdump
+%%RDOFF%%bin/rdflib
+%%RDOFF%%bin/rdx
+%%RDOFF%%man/man1/ldrdf.1.gz
+%%RDOFF%%man/man1/rdf2bin.1.gz
+%%RDOFF%%man/man1/rdf2com.1.gz
+%%RDOFF%%man/man1/rdf2ihx.1.gz
+%%RDOFF%%man/man1/rdf2ith.1.gz
+%%RDOFF%%man/man1/rdf2srec.1.gz
+%%RDOFF%%man/man1/rdfdump.1.gz
+%%RDOFF%%man/man1/rdflib.1.gz
+%%RDOFF%%man/man1/rdx.1.gz