From owner-svn-ports-all@FreeBSD.ORG Tue Jul 15 15:00:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 967822A3; Tue, 15 Jul 2014 15:00:16 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 830002ED5; Tue, 15 Jul 2014 15:00:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FF0GSw013682; Tue, 15 Jul 2014 15:00:16 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FF0Fiu013352; Tue, 15 Jul 2014 15:00:15 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407151500.s6FF0Fiu013352@svn.freebsd.org> From: Adam Weinberger Date: Tue, 15 Jul 2014 15:00:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361936 - in head/cad: calculix gmsh opencascade scotch 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.18 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: Tue, 15 Jul 2014 15:00:16 -0000 Author: adamw Date: Tue Jul 15 15:00:15 2014 New Revision: 361936 URL: http://svnweb.freebsd.org/changeset/ports/361936 QAT: https://qat.redports.org/buildarchive/r361936/ Log: Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS. Modified: head/cad/calculix/Makefile head/cad/gmsh/Makefile head/cad/opencascade/Makefile head/cad/scotch/Makefile Modified: head/cad/calculix/Makefile ============================================================================== --- head/cad/calculix/Makefile Tue Jul 15 14:56:31 2014 (r361935) +++ head/cad/calculix/Makefile Tue Jul 15 15:00:15 2014 (r361936) @@ -7,14 +7,8 @@ PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ DISTFILES= ${DIST_SOURCES} -.ifdef WITH_EXAMPLES -DISTFILES+= ${DIST_EXAMPLES} -.endif DIST_SUBDIR= calculix EXTRACT_ONLY= ${DIST_SOURCES} -.ifdef WITH_EXAMPLES -EXTRACT_ONLY+= ${DIST_EXAMPLES} -.endif MAINTAINER= maho@FreeBSD.org COMMENT= Three-Dimensional Structural Finite Element Program @@ -46,12 +40,17 @@ USE_GL= glut BROWSER?= firefox PSVIEWER?= gv -OPTIONS_DEFINE= METIS METIS_EDF +OPTIONS_DEFINE= ATLAS METIS METIS_EDF DOCS EXAMPLES OPTIONS_DEFAULT=METIS .include -.if $(PORT_OPTIONS:MDOCS) +.if ${PORT_OPTIONS:MEXAMPLES} +DISTFILES+= ${DIST_EXAMPLES} +EXTRACT_ONLY+= ${DIST_EXAMPLES} +.endif + +.if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${DIST_HTM} ${DIST_PS} ${DIST_PDF} EXTRACT_ONLY+= ${DIST_HTM} ccx_${PORTVERSION}.ps${EXTRACT_SUFX} .endif @@ -66,7 +65,8 @@ LIB_DEPENDS+= libmetis.so:${PORTSDIR}/m .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif -.if defined(WITH_ATLAS) + +.if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS_LIBS= -lf77blas LAPACK_LIBS= -lalapack -lcblas @@ -85,17 +85,12 @@ CFLAGS+= -fpic FFLAGS+= -fpic .endif -.if !defined(WITH_EXAMPLES) +.if empty(PORT_OPTIONS:MEXAMPLES) PLIST_SUB= WITH_EXAMPLES="@comment " .else PLIST_SUB= WITH_EXAMPLES="" .endif -.ifndef (WITH_EXAMPLES) -pre-everything:: - @${ECHO} "You can define WITH_EXAMPLES=yes to install example files" -.endif - pre-build: @${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \ s+%%BLAS_LIBS%%+${BLAS_LIBS}+ ; \ @@ -131,7 +126,7 @@ do-install: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.pdf \ ${STAGEDIR}${DOCSDIR} .endif -.ifdef WITH_EXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) Modified: head/cad/gmsh/Makefile ============================================================================== --- head/cad/gmsh/Makefile Tue Jul 15 14:56:31 2014 (r361935) +++ head/cad/gmsh/Makefile Tue Jul 15 15:00:15 2014 (r361936) @@ -33,6 +33,8 @@ MAKE_JOBS_UNSAFE= yes CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=YES +OPTIONS_DEFINE= DOCS + .if !defined(WITHOUT_STATIC_LIB) CMAKE_ARGS+= -DENABLE_BUILD_LIB=ON ALL_TARGET+= lib Modified: head/cad/opencascade/Makefile ============================================================================== --- head/cad/opencascade/Makefile Tue Jul 15 14:56:31 2014 (r361935) +++ head/cad/opencascade/Makefile Tue Jul 15 15:00:15 2014 (r361936) @@ -28,9 +28,9 @@ SHEBANG_FILES= adm/templates/env.sh.in a adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in \ gendoc codeblocks.sh -OPTIONS_DEFINE= TBB VIS -TBB_DESC= "Build with TBB" -VIS_DESC= "Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps)" +OPTIONS_DEFINE= TBB VIS DOCS +TBB_DESC= Build with TBB +VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps) OPTIONS_DEFAULT=TBB VIS OPTIONS_SUB= yes Modified: head/cad/scotch/Makefile ============================================================================== --- head/cad/scotch/Makefile Tue Jul 15 14:56:31 2014 (r361935) +++ head/cad/scotch/Makefile Tue Jul 15 15:00:15 2014 (r361936) @@ -22,6 +22,8 @@ USES= gmake MAKE_JOBS_UNSAFE=yes +OPTIONS_DEFINE= DOCS EXAMPLES + .if defined(MAINTAINER_MODE) USES+= fortran .endif