Date: Tue, 19 Mar 2013 16:43:52 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314666 - in head: audio/aften comms/usrp games/deng Message-ID: <201303191643.r2JGhqpJ060569@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Mar 19 16:43:51 2013 New Revision: 314666 URL: http://svnweb.freebsd.org/changeset/ports/314666 Log: audio/aften and comms/usrp: - Cleanup cmake usage games/deng: - Convert to USE_CMAKE - Convert to new options framework and remove autodetection for openal option - Trip header Approved by: portmgr (bapt) Modified: head/audio/aften/Makefile (contents, props changed) head/comms/usrp/Makefile head/games/deng/Makefile (contents, props changed) Modified: head/audio/aften/Makefile ============================================================================== --- head/audio/aften/Makefile Tue Mar 19 16:27:59 2013 (r314665) +++ head/audio/aften/Makefile Tue Mar 19 16:43:51 2013 (r314666) @@ -11,12 +11,8 @@ COMMENT= ATSC A/52 audio encoder USE_BZIP2= yes -BUILDDIR= ${WRKSRC}/portbuild -BUILD_WRKSRC= ${BUILDDIR} -INSTALL_WRKSRC= ${BUILDDIR} - USE_CMAKE= yes -CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}" +CMAKE_OUTSOURCE= yes OPTIONS_DEFINE= SHARED_LIB CXX_BINDINGS DOUBLE OPTIONS_DEFAULT= @@ -50,8 +46,4 @@ PLIST_SUB+= LIBS="@comment " CMAKE_ARGS+= -DDOUBLE:BOOL=ON .endif -do-configure: - @${MKDIR} ${BUILDDIR} - @cd ${BUILDDIR}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} .. - .include <bsd.port.mk> Modified: head/comms/usrp/Makefile ============================================================================== --- head/comms/usrp/Makefile Tue Mar 19 16:27:59 2013 (r314665) +++ head/comms/usrp/Makefile Tue Mar 19 16:43:51 2013 (r314666) @@ -23,6 +23,7 @@ USE_CMAKE= yes USE_GMAKE= yes USE_LDCONFIG= yes CMAKE_OUTSOURCE= yes +CMAKE_SOURCE_PATH= ${WRKSRC}/host # for excruciating debug use this -db CMAKE_ARGS= --debug-output --trace @@ -63,12 +64,6 @@ PLIST_SUB+= PUSRP2="" PLIST_SUB+= PUSRP2="@comment " .endif -do-configure: -# Configure the cmake portion of the host build - ${MKDIR} ${CONFIGURE_WRKSRC} - cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} \ - ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/host - do-build: # build host component (export PATH=${LOCALBASE}/zpu/bin:${PATH};cd ${CONFIGURE_WRKSRC}&&${GMAKE}) Modified: head/games/deng/Makefile ============================================================================== --- head/games/deng/Makefile Tue Mar 19 16:27:59 2013 (r314665) +++ head/games/deng/Makefile Tue Mar 19 16:43:51 2013 (r314666) @@ -1,9 +1,5 @@ -# New ports collection makefile for: deng -# Date created: 25 Aug 2004 -# Whom: Igor Pokrovsky <ip@doom.homeunix.org> -# +# Created by: Igor Pokrovsky <ip@doom.homeunix.org> # $FreeBSD$ -# PORTNAME= deng PORTVERSION= 1.9.0b6.9 @@ -25,26 +21,26 @@ USE_LDCONFIG= yes USE_SDL= sdl mixer net USE_XORG= x11 USE_PYTHON= yes - -BUILDDIR= ${WRKSRC}/doomsday/portbuild -BUILD_WRKSRC= ${BUILDDIR} -INSTALL_WRKSRC= ${BUILDDIR} - USE_CMAKE= yes +CMAKE_OUTSOURCE= yes +CMAKE_SOURCE_PATH= ${WRKSRC}/doomsday CFLAGS+= -I${LOCALBASE}/include/libpng15 CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--export-dynamic" MAN6= doomsday.6 -OPTIONS= OPENAL "Build OpenAL sound plugin" off +OPTIONS_DEFINE= OPENAL DOCS +OPTIONS_DEFAULT= DOCS +OPENAL_DESC= Build OpenAL sound plugin -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so) +.if ${PORT_OPTIONS:MOPENAL} USE_OPENAL= al CMAKE_ARGS+= -DBUILDOPENAL:BOOL=ON PLIST_SUB= OPENAL="" .else +CMAKE_ARGS+= -DBUILDOPENAL:BOOL=OFF PLIST_SUB= OPENAL="@comment " .endif @@ -54,18 +50,14 @@ post-patch: -e '/TARGET_LINK_LIBRARIES/s/dl//' \ ${WRKSRC}/doomsday/CMakeLists.txt -do-configure: - @${MKDIR} ${BUILDDIR} - @cd ${BUILDDIR}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} .. - post-install: @${LN} -s ${PREFIX}/bin/doomsday ${PREFIX}/bin/deng ${INSTALL_MAN} ${WRKSRC}/doomsday/engine/doc/doomsday.6 ${MANPREFIX}/man/man6/ -.ifndef (NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in LICENSE changelog.txt cnsname.txt cvars.txt deddoc.txt dhistory.txt naming.txt network.txt ${INSTALL_DATA} ${WRKSRC}/doomsday/engine/doc/${i} ${DOCSDIR}/ .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303191643.r2JGhqpJ060569>