Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Mar 2014 23:19:30 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349472 - head/lang/mtasc
Message-ID:  <201403282319.s2SNJUiB030819@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Fri Mar 28 23:19:30 2014
New Revision: 349472
URL: http://svnweb.freebsd.org/changeset/ports/349472
QAT: https://qat.redports.org/buildarchive/r349472/

Log:
  - Stage support
  - Conversion to OPTIONS
  - Remove support for deprecated NOPORTDATA

Modified:
  head/lang/mtasc/Makefile
  head/lang/mtasc/pkg-plist

Modified: head/lang/mtasc/Makefile
==============================================================================
--- head/lang/mtasc/Makefile	Fri Mar 28 22:58:33 2014	(r349471)
+++ head/lang/mtasc/Makefile	Fri Mar 28 23:19:30 2014	(r349472)
@@ -14,6 +14,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/si
 
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
+OCAML_PKGDIRS=	# This port uses ocaml-findlib but doesn't install one
 
 OCAMLLEX?=	${LOCALBASE}/bin/ocamllex
 OCAMLOPT?=	${LOCALBASE}/bin/ocamlopt
@@ -25,16 +26,11 @@ SWFLIB_FILES=	as3.mli as3code.ml as3pars
 MTASC_OBJ=	expr.cmx lexer.cmx parser.cmx typer.cmx class.cmx plugin.cmx\
 		genSwf.cmx main.cmx
 
-MAN1=		mtasc.1
-
 WRKSRC=		${WRKDIR}/ocaml
 
-.if !defined(NOPORTDATA)
 PORTDATA=	std std8
-.endif
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-build:
 	(cd ${WRKSRC}/extc && \
@@ -58,23 +54,13 @@ do-build:
 			${MTASC_OBJ} )
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mtasc-bin	${PREFIX}/bin/mtasc
-.if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/mtasc && ${FIND} ${PORTDATA} -type f | ${CPIO} -pdmu ${DATADIR})
-	@${FIND} ${DATADIR} -type d -exec ${CHMOD} 555 {} \;
-	@${FIND} ${DATADIR} -type f -exec ${CHMOD} 444 {} \;
-.endif
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/mtasc/doc/mtasc.1 ${PREFIX}/man/man1
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA}	${WRKSRC}/mtasc/doc/*.txt ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA}	${WRKSRC}/mtasc/doc/HelloWorld.as ${EXAMPLESDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/mtasc-bin ${STAGEDIR}${PREFIX}/bin/mtasc
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/mtasc && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
+	${INSTALL_MAN} ${WRKSRC}/mtasc/doc/mtasc.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA}	${WRKSRC}/mtasc/doc/*.txt ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA}	${WRKSRC}/mtasc/doc/HelloWorld.as ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/lang/mtasc/pkg-plist
==============================================================================
--- head/lang/mtasc/pkg-plist	Fri Mar 28 22:58:33 2014	(r349471)
+++ head/lang/mtasc/pkg-plist	Fri Mar 28 23:19:30 2014	(r349472)
@@ -1,4 +1,5 @@
 bin/mtasc
+man/man1/mtasc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/Future.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt



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