From owner-svn-ports-all@FreeBSD.ORG Fri Jan 3 15:53:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 907225B1; Fri, 3 Jan 2014 15:53:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 70AEF18D7; Fri, 3 Jan 2014 15:53:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03Frj4x023933; Fri, 3 Jan 2014 15:53:45 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03FrhG1023922; Fri, 3 Jan 2014 15:53:43 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201401031553.s03FrhG1023922@svn.freebsd.org> From: Adam Weinberger Date: Fri, 3 Jan 2014 15:53:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338552 - in head/cad: atlc calculix cascade cider gdsreader mars sceptre scotch varkon z88 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 15:53:45 -0000 Author: adamw Date: Fri Jan 3 15:53:42 2014 New Revision: 338552 URL: http://svnweb.freebsd.org/changeset/ports/338552 Log: Convert cad to MDOCS and MEXAMPLES Modified: head/cad/atlc/Makefile head/cad/calculix/Makefile head/cad/cascade/Makefile head/cad/cider/Makefile head/cad/gdsreader/Makefile head/cad/mars/Makefile head/cad/sceptre/Makefile head/cad/scotch/Makefile head/cad/varkon/Makefile head/cad/z88/Makefile Modified: head/cad/atlc/Makefile ============================================================================== --- head/cad/atlc/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/atlc/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -44,6 +44,9 @@ PLIST_FILES= bin/atlc bin/coax bin/creat bin/locatediff bin/myfilelength bin/mymd5sum bin/readbin NO_STAGE= yes + +.include + post-patch: .for file in Makefile.in @${REINPLACE_CMD} -e \ @@ -51,7 +54,7 @@ post-patch: .endfor post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @(${TAR} -C ${WRKSRC}/docs --exclude "*Makefile*" -cf - . | \ ${TAR} -C ${DOCSDIR} --unlink -xf -) @@ -59,7 +62,7 @@ post-install: @${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @${FIND} ${DOCDIR} | ${XARGS} ${CHOWN} ${SHHAREOWN}:${SHAREGRP} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @(${TAR} -C ${WRKSRC}/examples --exclude "*Makefile*" -cf - . | \ ${TAR} -C ${EXAMPLESDIR} --unlink -xf -) Modified: head/cad/calculix/Makefile ============================================================================== --- head/cad/calculix/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/calculix/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -126,7 +126,7 @@ do-install: ${PREFIX}/bin/ccx @${INSTALL_PROGRAM} ${WRKSRC}/${CGX_VER}/src/cgx \ ${PREFIX}/bin/cgx -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/ccx @${INSTALL_DATA} ${WRKSRC}/${CCX_VER}/doc/ccx/* \ @@ -139,7 +139,7 @@ do-install: ${DOCSDIR} @${GZIP_CMD} ${DOCSDIR}/*.ps .endif -.ifdef WITH_EXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @${TAR} cf - -C ${WRKSRC}/${CGX_VER}/examples . | ${TAR} xf - -C ${EXAMPLESDIR} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} Modified: head/cad/cascade/Makefile ============================================================================== --- head/cad/cascade/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/cascade/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -18,15 +18,18 @@ PLIST_FILES= bin/cascade MAN1= cascade.1 NO_STAGE= yes + +.include + do-install: @${INSTALL_SCRIPT} ${WRKSRC}/cascade ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/cascade.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/examples/* \ ${WRKSRC}/cascade-mode.el ${EXAMPLESDIR} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif Modified: head/cad/cider/Makefile ============================================================================== --- head/cad/cider/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/cider/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -21,6 +21,9 @@ MLINKS= spice.1 spice3.1 USE_XORG= xt xaw xmu NO_STAGE= yes + +.include + pre-patch: @${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt @@ -41,7 +44,7 @@ do-install: @(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE} install) post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${PREFIX}/share/examples/spice3 @${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir ${PREFIX}/share/examples/spice3 @${MKDIR} ${PREFIX}/share/examples/cider Modified: head/cad/gdsreader/Makefile ============================================================================== --- head/cad/gdsreader/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/gdsreader/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -19,9 +19,12 @@ PLIST_FILES= bin/gdsreader bin/maptolaye PLIST_DIRS= ${EXAMPLESDIR_REL} NO_STAGE= yes + +.include + post-install: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-data -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-docs .endif Modified: head/cad/mars/Makefile ============================================================================== --- head/cad/mars/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/mars/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -7,9 +7,6 @@ PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= ftp://ftp.cs.umd.edu/pub/sdag/MaRS/ DISTNAME= MaRS-${PORTVERSION} -.if !defined(NOPORTDOCS) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX} -.endif EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gahr@FreeBSD.org @@ -18,6 +15,8 @@ COMMENT= Maryland Routing Simulator OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 +DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX} + MAKE_JOBS_UNSAFE= yes NO_WRKSUBDIR= yes @@ -45,7 +44,7 @@ post-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mars ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/man1/mars.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${PREFIX}/share/doc/mars @${CHMOD} a+rx ${PREFIX}/share/doc/mars @(cd ${PREFIX}/share/doc ; \ Modified: head/cad/sceptre/Makefile ============================================================================== --- head/cad/sceptre/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/sceptre/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -22,9 +22,7 @@ NO_STAGE= yes FFLAGS+= -fno-automatic -.if !defined(NOPORTDOCS) PORTDOCS= doc_en.pdf doc_ger.pdf install.pdf -.endif post-patch: @${REINPLACE_CMD} -E \ @@ -50,7 +48,7 @@ post-patch: ${WRKSRC}/bin/sceptre post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/install.pdf ${DOCSDIR} cd ${WRKSRC}/doc ; ${INSTALL_DATA} ${PORTDOCS:Mdoc_*} ${DOCSDIR} Modified: head/cad/scotch/Makefile ============================================================================== --- head/cad/scotch/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/scotch/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -98,12 +98,12 @@ do-install: ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${LICDOCS:S|^|${WRKSRC}/doc/|} ${DATADIR} ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/man/man1/|} ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt ${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/grf/* ${EXAMPLESDIR}/grf Modified: head/cad/varkon/Makefile ============================================================================== --- head/cad/varkon/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/varkon/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -27,6 +27,9 @@ MAKE_JOBS_UNSAFE= yes VARKON_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_STAGE= yes + +.include + post-extract: @${FIND} ${WRKSRC} -name "*.o" -delete @@ -58,7 +61,7 @@ do-install: @${MKDIR} ${VARKON_PREFIX}/cnf/ini (cd ${WRKSRC}/cnf/ini/english && ${INSTALL_DATA} linux \ ${VARKON_PREFIX}/cnf/ini/freebsd) -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} #Varkon Manual @(cd ${WRKSRC}/man && ${COPYTREE_SHARE} . ${DOCSDIR}) .endif Modified: head/cad/z88/Makefile ============================================================================== --- head/cad/z88/Makefile Fri Jan 3 15:50:42 2014 (r338551) +++ head/cad/z88/Makefile Fri Jan 3 15:53:42 2014 (r338552) @@ -29,6 +29,9 @@ Z88_BINS= z88f z88i1 z88i2 z88com z88d z Z88_DATA= z88.fcd z88.dyn *.dxf *.txt NO_STAGE= yes + +.include + post-patch: @${CP} ${WRKSRC}/z88.fcd.linux ${WRKSRC}/z88.fcd @${CP} ${WRKSRC}/z88.mk.kernel.gcc32 ${WRKSRC}/z88.kernel.mk @@ -65,7 +68,7 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/*.htm ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/*.gif ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/*.jpg ${DOCSDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/z88mane.pdf ${DOCSDIR} .endif