Index: Mk/bsd.cmake.mk =================================================================== RCS file: Mk/bsd.cmake.mk diff -N Mk/bsd.cmake.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Mk/bsd.cmake.mk 20 May 2008 14:07:05 -0000 @@ -0,0 +1,99 @@ +#-*- mode: Makefile; tab-width: 4; -*- +# ex:ts=4 +# +# USE_CMAKE - If set, this port uses cmake. +# +# CMAKE_ENV - Environment passed to cmake. +# Default: ${CONFIGURE_ENV} +# CMAKE_ARGS - Arguments passed to cmake +# Default: see below +# CMAKE_C_FLAGS - CFLAGS passed to cmake via CMAKE_ARGS. +# Default: ${CFLAGS} if CMAKE_USE_PTHREAD is not set, +# ${CFLAGS} ${PTHREAD_CFLAGS} otherwise +# CMAKE_CXX_FLAGS - CXXFLAGS passed to cmake via CMAKE_ARGS. +# Default: ${CXXFLAGS} if CMAKE_USE_PTHREAD is not set, +# ${CXXFLAGS} ${PTHREAD_CFLAGS} otherwise +# CMAKE_USE_PTHREAD - Instruct cmake to use pthreads when compiling/linking +# Default: not set +# CMAKE_BUILDTYPE - Type of build (release, debug) +# Default: Release +# CMAKE_VERBOSE - Verbose build +# Default: not set +# CMAKE_SOURCE_PATH - Path to sourcedir for cmake +# Default: . +# + +.if !defined(_POSTMKINCLUDED) && !defined(Cmake_Pre_Include) +Cmake_Include_MAINTAINER= kde@FreeBSD.org +Cmake_Pre_Include= bsd.cmake.mk + +# +# CMAKE_BIN is the location where the cmake port installs the cmake +# executable +# +# CMAKE_PORT is where the cmake port is located in the ports tree +# +CMAKE_BIN= ${LOCALBASE}/bin/cmake +CMAKE_PORT= ${PORTSDIR}/devel/cmake + +# +# Make sure we depend on cmake +# +BUILD_DEPENDS+= ${CMAKE_BIN}:${CMAKE_PORT} + +# +# Default environment and arguments to cmake +# +CMAKE_ENV?= ${CONFIGURE_ENV} +CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ + -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ + -DCMAKE_C_FLAGS:STRING="${CMAKE_C_FLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${CMAKE_CXX_FLAGS}" \ + -DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \ + -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILDTYPE}" + +# +# Default build type and sourcedir +# +CMAKE_BUILDTYPE?= Release +CMAKE_SOURCE_PATH?= . + +# +# CFLAGS/CXXFLAGS passed to cmake depending on whether threads +# are needed. +# +CMAKE_C_FLAGS?= ${CFLAGS} +CMAKE_CXX_FLAS?= ${CXXFLAGS} + +.if defined(CMAKE_USE_PTHREAD) +CMAKE_C_FLAGS+= ${PTHREAD_CFLAGS} +CMAKE_CXX_FLAGS+= ${PTHREAD_CFLAGS} + +CMAKE_ARGS+= -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \ + -DCMAKE_USE_PTHREADS:BOOL=ON \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" +.endif + +# +# Force DEBUG buildtype if needed +# +.if defined(CMAKE_DEBUG) || defined(WITH_DEBUG) +CMAKE_BUILDTYPE= DEBUG +.endif + +# +# Force makefile verbosity if needed +# +.if defined(CMAKE_VERBOSE) +CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON +.endif + +# +# Redefine do-configure target +# +.if !target(do-configure) +do-configure: + cd ${WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} +.endif + +.endif #defined(_POSTMKINCLUDED) && !defined(Cmake_Pre_Include) Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.592 diff -u -u -r1.592 bsd.port.mk --- Mk/bsd.port.mk 14 Apr 2008 16:46:41 -0000 1.592 +++ Mk/bsd.port.mk 19 May 2008 19:09:59 -0000 @@ -1518,6 +1518,10 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif +.if defined(USE_CMAKE) +.include "${PORTSDIR}/Mk/bsd.cmake.mk" +.endif + # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -2007,6 +2011,10 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif +.if defined(USE_CMAKE) +.include "${PORTSDIR}/Mk/bsd.cmake.mk" +.endif + .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" USE_SUBMAKE= yes Index: astro/stellarium/Makefile =================================================================== RCS file: /home/pcvs/ports/astro/stellarium/Makefile,v retrieving revision 1.21 diff -u -u -r1.21 Makefile --- astro/stellarium/Makefile 29 Apr 2008 08:22:38 -0000 1.21 +++ astro/stellarium/Makefile 20 May 2008 09:19:47 -0000 @@ -19,7 +19,6 @@ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake USE_QT_VER= 4 QT_COMPONENTS= qmake moc gui rcc uic opengl @@ -27,17 +26,10 @@ USE_GL= yes USE_SDL= sdl mixer USE_GMAKE= yes -CMAKE_ENV= QMAKESPEC=${QMAKESPEC} -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" \ - -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \ - -DCMAKE_USE_PTHREADS:BOOL=ON \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DFreeType2_INCLUDE_DIR=${LOCALBASE}/include/freetype2 \ +USE_CMAKE= yes +CMAKE_USE_PTHREAD= yes +CMAKE_ENV+= QMAKESPEC=${QMAKESPEC} +CMAKE_ARGS+= -DFreeType2_INCLUDE_DIR=${LOCALBASE}/include/freetype2 \ -DQT_QMAKE_EXECUTABLE=${QMAKE} PORTDOCS= AUTHORS ChangeLog NEWS README TODO @@ -56,10 +48,6 @@ ${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's/fixx11h.h/fixx11qt4h.h/' @${MV} ${WRKSRC}/src/stelutils/fixx11h.h ${WRKSRC}/src/stelutils/fixx11qt4h.h -do-configure: - @(cd ${WRKSRC}; \ - ${CMAKE_ENV} ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} Index: comms/gammu/Makefile =================================================================== RCS file: /home/pcvs/ports/comms/gammu/Makefile,v retrieving revision 1.34 diff -u -u -r1.34 Makefile --- comms/gammu/Makefile 11 May 2008 13:31:58 -0000 1.34 +++ comms/gammu/Makefile 19 May 2008 21:18:00 -0000 @@ -14,13 +14,11 @@ MAINTAINER= bsam@FreeBSD.org COMMENT= GNU All Mobile Management Utilities -BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake RUN_DEPENDS= cdialog:${PORTSDIR}/devel/cdialog -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata +CMAKE_ARGS+= -DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata +USE_CMAKE= yes USE_GNOME= pkgconfig .if defined(NOPORTDOCS) @@ -30,14 +28,10 @@ PORTDOCS= * .endif -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS}) - @${REINPLACE_CMD} -i '' -e 's:bash:sh:' -e 's:dialog:cdialog:' ${WRKSRC}/utils/gammu-config - .include post-patch: + @${REINPLACE_CMD} -i '' -e 's:bash:sh:' -e 's:dialog:cdialog:' ${WRKSRC}/utils/gammu-config .if ${OSVERSION} < 700042 @${REINPLACE_CMD} -e 's@ -Wno-pointer-sign@@g' ${WRKSRC}/CMakeLists.txt .endif Index: devel/kdesvn/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/kdesvn/Makefile,v retrieving revision 1.22 diff -u -u -r1.22 Makefile --- devel/kdesvn/Makefile 5 May 2008 08:33:55 -0000 1.22 +++ devel/kdesvn/Makefile 19 May 2008 21:41:22 -0000 @@ -12,21 +12,11 @@ MAINTAINER= yuanjue@FreeBSD.org COMMENT= KDE frontend for Subversion -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -WRKSRC= ${WRKDIR}/${DISTNAME}-build -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} - -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} - LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr-svn \ svn_client-1:${PORTSDIR}/devel/subversion \ neon:${PORTSDIR}/www/neon26 +USE_CMAKE= yes USE_BZIP2= yes USE_KDELIBS_VER=3 USE_LDCONFIG= yes @@ -51,8 +41,4 @@ ${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt .endif -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) - .include Index: devel/physfs-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/physfs-devel/Makefile,v retrieving revision 1.15 diff -u -u -r1.15 Makefile --- devel/physfs-devel/Makefile 9 Apr 2007 08:59:42 -0000 1.15 +++ devel/physfs-devel/Makefile 19 May 2008 21:43:00 -0000 @@ -14,14 +14,7 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= A library to provide abstract access to various archives -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} - +USE_CMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes NO_LATEST_LINK= yes @@ -40,8 +33,4 @@ @${REINPLACE_CMD} -e 's|\(define SIZEOF_INT\) 4|\1 (LONG_BIT/8)|g' \ ${WRKSRC}/platform/unix.c -do-configure:: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) - .include Index: devel/qsvn/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/qsvn/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- devel/qsvn/Makefile 20 Feb 2008 00:32:32 -0000 1.3 +++ devel/qsvn/Makefile 19 May 2008 22:12:42 -0000 @@ -14,26 +14,15 @@ MAINTAINER= makc@issp.ac.ru COMMENT= Qt based GUI frontend for Subversion -BUILD_DEPENDS= ${CMAKE}:${PORTSDIR}/devel/cmake LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion USE_QT_VER= 4 QT_COMPONENTS= gui moc_build uic_build rcc_build qmake_build qt3support_build USE_LDCONFIG= yes -MAKE_ENV+= VERBOSE=1 +USE_CMAKE= yes DESKTOP_ENTRIES="QSvn" "SVN client" "" "qsvn" "" false -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} src +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src .include Index: devel/qsvn/files/patch-src__CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/devel/qsvn/files/patch-src__CMakeLists.txt,v retrieving revision 1.1 diff -u -u -r1.1 patch-src__CMakeLists.txt --- devel/qsvn/files/patch-src__CMakeLists.txt 14 Jan 2008 10:00:03 -0000 1.1 +++ devel/qsvn/files/patch-src__CMakeLists.txt 19 May 2008 22:03:56 -0000 @@ -1,5 +1,5 @@ ---- ./src/CMakeLists.txt.orig 2007-11-16 21:56:31.000000000 +0300 -+++ ./src/CMakeLists.txt 2008-01-13 23:03:26.000000000 +0300 +--- ../src/CMakeLists.txt.orig 2007-11-16 21:56:31.000000000 +0300 ++++ ../src/CMakeLists.txt 2008-01-13 23:03:26.000000000 +0300 @@ -157,5 +157,5 @@ ENDIF ( WIN32 ) Index: games/ksudoku/Makefile =================================================================== RCS file: /home/pcvs/ports/games/ksudoku/Makefile,v retrieving revision 1.8 diff -u -u -r1.8 Makefile --- games/ksudoku/Makefile 12 Jul 2007 19:12:38 -0000 1.8 +++ games/ksudoku/Makefile 20 May 2008 09:25:01 -0000 @@ -14,20 +14,10 @@ MAINTAINER= freebsd@chillt.de COMMENT= A Sudoku generator and solver for KDE -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -CMAKE_ARGS= -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} - USE_KDELIBS_VER=3 USE_GMAKE= yes USE_GL= yes - -do-configure: - @cd ${WRKSRC} && \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} +USE_CMAKE= yes +CMAKE_USE_PTHREAD= yes .include Index: games/memonix/Makefile =================================================================== RCS file: /home/pcvs/ports/games/memonix/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- games/memonix/Makefile 13 Mar 2008 14:27:50 -0000 1.2 +++ games/memonix/Makefile 19 May 2008 19:50:08 -0000 @@ -18,22 +18,13 @@ MAINTAINER= amdmi3@amdmi3.ru COMMENT= Brain teasers, puzzle and memory games for kids in one pack -BUILD_DEPENDS= ${CMAKE}:${PORTSDIR}/devel/cmake - -CMAKE?= ${LOCALBASE}/bin/cmake - +USE_CMAKE= yes +CMAKE_VERBOSE= yes +CMAKE_DEBUG= yes USE_ZIP= yes USE_SDL= sdl mixer image USE_GL= yes -CMAKE_DEFS= -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \ - -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ - -DCMAKE_USE_PTHREADS:BOOL=ON \ - -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_CFLAGS}" - WRKSRC= ${WRKDIR}/MemonixSourceCode PLIST_FILES= bin/Memonix %%DATADIR%%/gamedata.vfs @@ -46,9 +37,6 @@ @${REINPLACE_CMD} -e '/strcpy(ProgrammDir,/ s|\./|${DATADIR}/|' \ ${WRKSRC}/src/Main.cpp -do-configure: - cd ${WRKSRC} && ${CMAKE} . ${CMAKE_DEFS} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Memonix ${PREFIX}/bin ${MKDIR} ${DATADIR} Index: games/blinkensisters/Makefile =================================================================== RCS file: /home/pcvs/ports/games/blinkensisters/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- games/blinkensisters/Makefile 13 Mar 2008 14:27:31 -0000 1.7 +++ games/blinkensisters/Makefile 19 May 2008 22:14:33 -0000 @@ -15,18 +15,9 @@ MAINTAINER= amdmi3@amdmi3.ru COMMENT= Parallax-style 2D scrolling platform game -BUILD_DEPENDS= ${CMAKE}:${PORTSDIR}/devel/cmake - -CMAKE?= ${LOCALBASE}/bin/cmake - USE_SDL= sdl image ttf WRKSRC= ${WRKDIR}//blinkensisters/lostpixels/game/software - -CMAKE_DEFS= -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS} -I${LOCALBASE}/include" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} -I${LOCALBASE}/include" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} +USE_CMAKE= yes OPTIONS= SOUND "Build with souns support" on \ NETWORK "Build with network support" on @@ -52,7 +43,4 @@ s|share/doc/blinkensisters|${DOCSDIR:S,${PREFIX}/,,}|' \ ${WRKSRC}/CMakeLists.txt -do-configure: - cd ${WRKSRC} && ${CMAKE} . ${CMAKE_DEFS} - .include Index: games/openastromenace/Makefile =================================================================== RCS file: /home/pcvs/ports/games/openastromenace/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- games/openastromenace/Makefile 13 Mar 2008 14:27:55 -0000 1.2 +++ games/openastromenace/Makefile 20 May 2008 09:28:08 -0000 @@ -18,17 +18,10 @@ USE_GL= yes WANT_SDL= yes USE_SDL= sdl - -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} +USE_CMAKE= yes SUB_FILES= pkg-message -BUILD_DEPENDS+= ${LOCALBASE}/bin/cmake:${PORTSDIR}/devel/cmake \ - LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis \ jpeg:${PORTSDIR}/graphics/jpeg \ openal:${PORTSDIR}/audio/openal \ @@ -61,12 +54,6 @@ DISTFILES+=oamenace-lang-ru-${PORTVERSION}.tar.bz2 .endif -do-configure: -.if defined(WITH_SRC) - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) -.endif - do-install: .if defined(WITH_SRC) ${INSTALL_PROGRAM} ${WRKSRC}/AstroMenace ${PREFIX}/bin Index: math/speedcrunch/Makefile =================================================================== RCS file: /home/pcvs/ports/math/speedcrunch/Makefile,v retrieving revision 1.5 diff -u -u -r1.5 Makefile --- math/speedcrunch/Makefile 6 Mar 2008 22:19:49 -0000 1.5 +++ math/speedcrunch/Makefile 20 May 2008 09:30:20 -0000 @@ -14,15 +14,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A desktop calculator for power users -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build gui -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_LIBS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} +USE_CMAKE= yes +CMAKE_SOURCE_PATH= src +CMAKE_USE_PTHREAD= yes MYPORTDOCS= COPYING ChangeLog HACKING.txt INSTALL.txt LISEZMOI PACKAGERS README \ TRANSLATORS doc/man.docbook doc/speedcrunch.docbook @@ -51,10 +47,6 @@ @${REINPLACE_CMD} -e 's|crunch\"|speedcrunch\"|g' \ ${WRKSRC}/src/main.cpp -pre-build: - @(cd ${WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${WRKSRC}/src) - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/speedcrunch ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/src/crunch.png ${PREFIX}/share/pixmaps Index: math/vtk5/Makefile =================================================================== RCS file: /home/pcvs/ports/math/vtk5/Makefile,v retrieving revision 1.40 diff -u -u -r1.40 Makefile --- math/vtk5/Makefile 3 Feb 2008 10:45:15 -0000 1.40 +++ math/vtk5/Makefile 20 May 2008 13:37:58 -0000 @@ -16,7 +16,6 @@ MAINTAINER= bacon@smithers.neuro.mcw.edu COMMENT= The Visualization Toolkit -BUILD_DEPENDS= cmake>=2.2:${PORTSDIR}/devel/cmake LIB_DEPENDS= expat.[5-6]:${PORTSDIR}/textproc/expat2 \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ @@ -44,9 +43,7 @@ SUB_FILES= pkg-message vtk.3 PKGMESSAGE= ${WRKDIR}/pkg-message -PATCH_WRKSRC= ${WRKDIR}/VTK -WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build - +USE_CMAKE= yes USE_GMAKE= yes USE_GL= yes USE_LDCONFIG= yes @@ -59,22 +56,13 @@ .include -CMAKE?= ${LOCALBASE}/bin/cmake +CMAKE_USE_PTHREAD= yes +CMAKE_SOURCE_PATH= ../VTK CXXFLAGS+= -Wno-deprecated -CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ +CMAKE_ARGS+= ${VTKSRCDIR} \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \ - -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ - -DCMAKE_USE_PTHREADS:BOOL=ON \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \ -DVTK_USE_RENDERING:BOOL=ON \ -DVTK_USE_HYBRID:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ @@ -96,20 +84,17 @@ .if defined(WITH_VTKMPEG2) LIB_DEPENDS+= vtkMPEG2Encode.5:${PORTSDIR}/multimedia/vtkmpeg2encode PLIST_FILES+= include/vtk-5.0/vtkMPEG2Writer.h -CMAKE_DEFS+= -DvtkMPEG2Encode_INCLUDE_PATH=${LOCALBASE}/include/vtk-5.0 \ +CMAKE_ARGS+= -DvtkMPEG2Encode_INCLUDE_PATH=${LOCALBASE}/include/vtk-5.0 \ -DvtkMPEG2Encode_LIBRARIES=vtkMPEG2Encode \ -DVTK_USE_PATENTED:BOOL=ON \ -DVTK_USE_MPEG2_ENCODER:BOOL=ON .endif post-extract: - ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ + ${MKDIR} ${WRKSRC} + ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ ${VTKSRCDIR}/Hybrid/vtkVRMLImporter.cxx -do-configure: - ${MKDIR} ${WRKSRC} - cd ${WRKSRC} && ${CMAKE} ${VTKSRCDIR} ${CMAKE_DEFS} - # FSL links directly to libQVTKWidgetPlugin.so, so put it in a standard # library directory. pre-install: Index: misc/katalog/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/katalog/Makefile,v retrieving revision 1.19 diff -u -u -r1.19 Makefile --- misc/katalog/Makefile 7 Feb 2008 15:14:08 -0000 1.19 +++ misc/katalog/Makefile 20 May 2008 09:35:00 -0000 @@ -17,10 +17,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= CD organizer for KDE -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - USE_KDEBASE_VER= 3 USE_SQLITE= yes +USE_CMAKE= yes +CMAKE_USE_PTHREAD= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \ @@ -32,7 +32,4 @@ @${ECHO_CMD} 'macro_add_compile_flags( katalogxml "-fPIC" )' \ >> ${WRKSRC}/xml_backend/libkatalogxml/CMakeLists.txt -do-configure: - @cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/cmake . - .include Index: misc/kbfx/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/kbfx/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- misc/kbfx/Makefile 5 Jul 2007 13:36:22 -0000 1.7 +++ misc/kbfx/Makefile 20 May 2008 09:35:52 -0000 @@ -15,15 +15,7 @@ MAINTAINER= makc@issp.ac.ru COMMENT= A new K-menu for KDE -BUILD_DEPENDS= ${CMAKE}:${PORTSDIR}/devel/cmake - -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - +USE_CMAKE= yes USE_BZIP2= yes USE_GETTEXT= yes USE_KDELIBS_VER=3 @@ -31,7 +23,4 @@ INSTALLS_ICONS= yes USE_GCC= 3.4+ -do-configure: - (cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS}) - .include Index: multimedia/vtkmpeg2encode/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/vtkmpeg2encode/Makefile,v retrieving revision 1.1 diff -u -u -r1.1 Makefile --- multimedia/vtkmpeg2encode/Makefile 9 Jan 2008 20:08:58 -0000 1.1 +++ multimedia/vtkmpeg2encode/Makefile 20 May 2008 09:39:20 -0000 @@ -15,17 +15,12 @@ MAINTAINER= bacon@smithers.neuro.mcw.edu COMMENT= VTK MPEG2 encoding library -BUILD_DEPENDS= cmake>=2.2:${PORTSDIR}/devel/cmake - NO_CDROM= the MPEG2 format and all software that uses it is subject to patent restrictions NO_PACKAGE= ${NO_CDROM} -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DBUILD_SHARED_LIBS:BOOL=ON - +USE_CMAKE= yes USE_LDCONFIG= yes +CMAKE_ARGS?= -DBUILD_SHARED_LIBS:BOOL=ON MAN3= vtkmpeg2encode.3 @@ -44,9 +39,6 @@ include/vtk-5.0/mpeg2enc_config.h \ include/vtk-5.0/vlc.h -do-configure: - cd ${WRKSRC} && ${CMAKE} . ${CMAKE_DEFS} - post-build: ${MV} ${WRKSRC}/${MPEGLIB}.so ${WRKSRC}/${MPEGLIB}.so.${PORTVERSION} Index: net-im/decibel/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/decibel/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- net-im/decibel/Makefile 28 Feb 2008 16:04:33 -0000 1.3 +++ net-im/decibel/Makefile 20 May 2008 10:15:24 -0000 @@ -13,21 +13,15 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Realtime communications framework -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= QtTapioca.0:${PORTSDIR}/net-im/tapioca-qt USE_QT_VER= 4 QT_COMPONENTS= corelib xml dbus moc uic rcc qtestlib USE_LDCONFIG= yes +USE_CMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_BUILD_TYPE=DEBUG \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" +CMAKE_SOURCE_PATH= .. .include @@ -43,7 +37,4 @@ "s,$${LIB_INSTALL_DIR}/pkgconfig,data/pkgconfig,g"\ ${WRKSRC}/../src/client/Decibel/CMakeLists.txt -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include Index: net-im/tapioca-qt/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/tapioca-qt/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- net-im/tapioca-qt/Makefile 18 Feb 2008 20:37:37 -0000 1.2 +++ net-im/tapioca-qt/Makefile 20 May 2008 10:21:54 -0000 @@ -13,17 +13,12 @@ MAINTAINER= arved@FreeBSD.org COMMENT= Framework for VoIP and IP applications -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= QtTelepathyCore.0:${PORTSDIR}/net-im/telepathy-qt WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_BUILD_TYPE=DEBUG \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" + +USE_CMAKE= yes +CMAKE_SOURCE_PATH= .. USE_QT_VER= 4 QT_COMPONENTS= corelib qmake uic moc rcc USE_LDCONFIG= yes @@ -36,7 +31,4 @@ "s,$${LIB_INSTALL_DIR}/pkgconfig,data/pkgconfig,g"\ ${WRKSRC}/../CMakeLists.txt -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include Index: net-im/telepathy-qt/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/telepathy-qt/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- net-im/telepathy-qt/Makefile 18 Feb 2008 20:37:37 -0000 1.2 +++ net-im/telepathy-qt/Makefile 20 May 2008 10:33:12 -0000 @@ -13,20 +13,14 @@ MAINTAINER= arved@FreeBSD.org COMMENT= Framework for VoIP and IP applications -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_BUILD_TYPE=DEBUG \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" +USE_CMAKE= yes +CMAKE_SOURCE_PATH= .. USE_QT_VER= 4 QT_COMPONENTS= corelib qmake uic moc rcc xml dbus USE_LDCONFIG= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build + post-extract: ${MKDIR} ${WRKSRC} @@ -35,7 +29,4 @@ "s,$${LIB_INSTALL_DIR}/pkgconfig,data/pkgconfig,g"\ ${WRKSRC}/../CMakeLists.txt -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include Index: net-mgmt/macroscope/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/macroscope/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- net-mgmt/macroscope/Makefile 1 Feb 2008 12:38:00 -0000 1.4 +++ net-mgmt/macroscope/Makefile 20 May 2008 10:45:01 -0000 @@ -14,7 +14,6 @@ MAINTAINER= white_raven@users.berlios.de COMMENT= User and IP traffic management with Web interface -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= lzo2:${PORTSDIR}/archivers/lzo2 \ odbc:${PORTSDIR}/databases/unixODBC \ pcap:${PORTSDIR}/net/libpcap @@ -22,13 +21,7 @@ USE_RC_SUBR= macroscope USE_BZIP2= yes USE_DOS2UNIX= yes - -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} +USE_CMAKE= yes OPTIONS= MYSQL "With MySQL support" on \ FIREBIRD "With Firebird support" off @@ -55,8 +48,4 @@ BROKEN= Does not compile .endif -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} .) - .include Index: science/paraview/Makefile =================================================================== RCS file: /home/pcvs/ports/science/paraview/Makefile,v retrieving revision 1.15 diff -u -u -r1.15 Makefile --- science/paraview/Makefile 19 Apr 2008 17:53:20 -0000 1.15 +++ science/paraview/Makefile 21 May 2008 12:42:51 -0000 @@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= ParaView is a powerful scientific data visualization application -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= hdf5.0:${PORTSDIR}/science/hdf5 \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -25,9 +24,24 @@ USE_GL= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_CMAKE= yes +CMAKE_C_FLAGS+= -I${LOCALBASE}/include +CMAKE_CXX_FLAGS+= -I${LOCALBASE}/include +CMAKE_ARGS+= -DPARAVIEW_USE_SYSTEM_HDF5=1 \ + -DBUILD_SHARED_LIBS="ON" \ + -DVTK_USE_SYSTEM_PNG="ON" \ + -DVTK_USE_SYSTEM_JPEG="ON" \ + -DVTK_USE_SYSTEM_TIFF="ON" \ + -DVTK_USE_SYSTEM_ZLIB="ON" \ + -DVTK_USE_SYSTEM_FREETYPE="ON" \ + -DVTK_USE_SYSTEM_EXPAT="ON" \ + -DVTK_USE_X="ON" \ + -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 -WRKSRC= ${WRKDIR}/${DISTNAME}-build PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME}/build +CMAKE_SOURCE_PATH= .. + PLIST_SUB+= VERMAJORMINOR=2.4 CMAKE2INST= Utilities/ParaViewConfig.cmake ParaViewConfig.cmake \ ParaViewLibraryDepends.cmake cmake_install.cmake @@ -35,6 +49,9 @@ CXX="${CXX}" LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R} +post-extract: + ${MKDIR} ${WRKSRC} + pre-patch: @${REINPLACE_CMD} -e 's|vtkpng|png|g' \ ${WRKDIR}/paraview-${PORTVERSION}/GUI/Widgets/CMakeLists.txt @@ -43,24 +60,6 @@ @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKDIR}/paraview-${PORTVERSION}/Utilities/TclTk/tk*/unix/configure -do-configure: - ${MKDIR} ${WRKSRC} - cd ${WRKSRC} && \ - ${LOCALBASE}/bin/cmake ../${DISTNAME} \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - -DPARAVIEW_USE_SYSTEM_HDF5=1 \ - -DBUILD_SHARED_LIBS="ON" \ - -DVTK_USE_SYSTEM_PNG="ON" \ - -DVTK_USE_SYSTEM_JPEG="ON" \ - -DVTK_USE_SYSTEM_TIFF="ON" \ - -DVTK_USE_SYSTEM_ZLIB="ON" \ - -DVTK_USE_SYSTEM_FREETYPE="ON" \ - -DVTK_USE_SYSTEM_EXPAT="ON" \ - -DVTK_USE_X="ON" \ - -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 - post-install: .for c2f in ${CMAKE2INST} ${SED} -e 's|${WRKSRC}|${LIB_INSTDIR}|g' \ Index: sysutils/cdrkit/Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/cdrkit/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- sysutils/cdrkit/Makefile 26 Apr 2008 21:56:11 -0000 1.4 +++ sysutils/cdrkit/Makefile 20 May 2008 12:14:26 -0000 @@ -14,8 +14,8 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Command-line CD/DVD writing suite -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - +USE_CMAKE= yes +CMAKE_USE_PTHREAD= yes USE_ICONV= yes MAN1= cdda2ogg.1 devdump.1 dirsplit.1 genisoimage.1 icedax.1 \ @@ -32,9 +32,7 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt - -do-configure: - @(cd ${WRKSRC}; ${LOCALBASE}/bin/cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_C_FLAGS:STRING="${CFLAGS} -I./libparanoia -I${LOCALBASE}/include -L${LOCALBASE}/lib" -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib") + @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake \ + ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt .include Index: sysutils/kgtk/Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/kgtk/Makefile,v retrieving revision 1.5 diff -u -u -r1.5 Makefile --- sysutils/kgtk/Makefile 20 May 2008 12:03:02 -0000 1.5 +++ sysutils/kgtk/Makefile 21 May 2008 11:01:34 -0000 @@ -16,7 +16,7 @@ MAINTAINER= citycat4@ngs.ru COMMENT= Daemon to use KDE dialogs in GTK applications -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake +BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake24 SUB_FILES= pkg-message @@ -26,11 +26,12 @@ USE_GMAKE= yes USE_GNOME= gtk20 USE_KDEBASE_VER=3 - -CMAKE_PREFIX= ${LOCALBASE} -CMAKE_BUILD_DIR=build3 -BUILD_WRKSRC= ${WRKSRC}/${CMAKE_BUILD_DIR} -INSTALL_WRKSRC= ${WRKSRC}/${CMAKE_BUILD_DIR} +USE_CMAKE= yes +CMAKE_DEBUG= yes +CMAKE_VERBOSE= yes +CMAKE_USE_PTHREAD= yes +CMAKE_ARGS+= \ + -DQT_INCLUDE_DIR=${QT_PREFIX}/include USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} @@ -55,17 +56,6 @@ ${WRKSRC}/gtk2/kgtk2-wrapper.cmake ${WRKSRC}/qt4/kqt4-wrapper.cmake \ ${WRKSRC}/mangled.sh ${WRKSRC}/kdialogd-wrapper ${WRKSRC}/kgtk-wrapper @${CP} ${PATCHDIR}/ru.po ${WRKSRC}/kdialogd3/po/ -pre-configure: - @${MKDIR} ${WRKSRC}/${CMAKE_BUILD_DIR} - -do-configure: - @cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \ - ${CMAKE_PREFIX}/bin/cmake .. \ - -DCMAKE_INSTALL_DIR=${PREFIX} \ - -DQT_INCLUDE_DIR=${QT_PREFIX}/include \ - -DCMAKE_CXX_FLAGS=-I${LOCALBASE}/include \ - -DCMAKE_EXE_LINKER_FLAGS=${PTHREAD_LIBS} \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} post-install: @${CAT} ${PKGMESSAGE} Index: textproc/ctpp/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/ctpp/Makefile,v retrieving revision 1.14 diff -u -u -r1.14 Makefile --- textproc/ctpp/Makefile 14 Apr 2008 19:44:16 -0000 1.14 +++ textproc/ctpp/Makefile 20 May 2008 13:41:09 -0000 @@ -15,13 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C++ library to use templates in C/C++ projects -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - +USE_CMAKE= yes USE_LDCONFIG= yes -do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/cmake ${WRKSRC} - do-install: ${INSTALL_DATA} ${WRKSRC}/libctpp-st.a ${PREFIX}/lib/libctpp.a ${INSTALL_DATA} ${WRKSRC}/libctpp.so.${PORTVERSION} ${PREFIX}/lib/libctpp.so Index: textproc/ctpp2/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/ctpp2/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- textproc/ctpp2/Makefile 25 Apr 2008 13:40:10 -0000 1.3 +++ textproc/ctpp2/Makefile 19 May 2008 20:11:56 -0000 @@ -13,11 +13,7 @@ MAINTAINER= reki@reki.ru COMMENT= C++ library to use templates in C/C++ projects, version 2 -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - +USE_CMAKE= yes USE_LDCONFIG= yes -do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/cmake ${WRKSRC} - .include Index: textproc/lemmatizer2/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/lemmatizer2/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- textproc/lemmatizer2/Makefile 4 Aug 2007 11:41:22 -0000 1.2 +++ textproc/lemmatizer2/Makefile 20 May 2008 12:10:21 -0000 @@ -18,9 +18,10 @@ MAINTAINER= reki@reki.ru COMMENT= Russian / German / English lemmatizer library -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +USE_CMAKE= yes + DB_DIR?= /var/db/lemmatizer DIST_SUBDIR= ${PORTNAME} @@ -35,9 +36,6 @@ @${ECHO} " (default is /var/db/lemmatizer)" @${ECHO} "" -do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/cmake ${WRKSRC} - post-extract: @cd ${WRKDIR} && ${CP} -r Dicts ${WRKSRC} Index: www/khtml2png/Makefile =================================================================== RCS file: /home/pcvs/ports/www/khtml2png/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- www/khtml2png/Makefile 21 Apr 2008 07:47:07 -0000 1.3 +++ www/khtml2png/Makefile 20 May 2008 12:15:00 -0000 @@ -14,17 +14,8 @@ MAINTAINER= rafan@FreeBSD.org COMMENT= Command line program to create screenshots of webpages -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - USE_KDELIBS_VER= 3 - -CMAKE?= ${LOCALBASE}/bin/cmake - -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} +USE_CMAKE= yes PLIST_FILES= bin/khtml2png2 @@ -34,8 +25,4 @@ @${REINPLACE_CMD} -e 's,QT_QT_LIBRARY,QT_LIBRARIES,g' \ ${WRKSRC}/CMakeLists.txt -do-configure: - @cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} -G KDevelop3 ${WRKSRC} && \ - ${CMAKE} ${CMAKE_ARGS} ${WRKSRC} - .include Index: x11-fonts/fontmatrix/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/fontmatrix/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- x11-fonts/fontmatrix/Makefile 13 Apr 2008 12:46:40 -0000 1.3 +++ x11-fonts/fontmatrix/Makefile 20 May 2008 12:19:31 -0000 @@ -14,21 +14,14 @@ MAINTAINER= makc@issp.ac.ru COMMENT= A graphical font manager -BUILD_DEPENDS= ${CMAKE}:${PORTSDIR}/devel/cmake RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_QT_VER= 4 QT_COMPONENTS= gui svg network moc_build uic_build rcc_build qmake_build linguist_build INSTALLS_ICONS= yes -MAKE_ENV+= VERBOSE=1 -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS=${PTHREAD_LIBS} +USE_CMAKE= yes +CMAKE_USE_PTHREAD= yes OPTIONS= FONTFORGE "With FontForge editor" off @@ -49,7 +42,4 @@ ${LOCALBASE}/bin/lupdate-qt4 -noobsolete ../ -ts *.ts && \ ${LOCALBASE}/bin/lrelease-qt4 *.ts -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} - .include Index: x11-themes/gtk-qt-engine/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-themes/gtk-qt-engine/Makefile,v retrieving revision 1.27 diff -u -u -r1.27 Makefile --- x11-themes/gtk-qt-engine/Makefile 20 Mar 2008 12:42:46 -0000 1.27 +++ x11-themes/gtk-qt-engine/Makefile 21 May 2008 12:41:59 -0000 @@ -15,8 +15,6 @@ MAINTAINER= danny@ricin.com COMMENT= GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes @@ -24,15 +22,11 @@ USE_QT_VER= 3 USE_KDEBASE_VER=3 HAS_CONFIGURE= yes +USE_CMAKE= yes OPTIONS= LIBBONOBOUI "Install libbonoboui if missing" off WRKSRC= ${WRKDIR}/${PORTNAME} -CMAKE?= ${LOCALBASE}/bin/cmake -CMAKE_ARGS= -DCMAKE_C_COMPILER:STRING="${CC}"\ - -DCMAKE_CXX_COMPILER:STRING="${CXX}"\ - -DCMAKE_C_FLAGS:STRING="${CFLAGS}"\ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" .include @@ -40,7 +34,4 @@ USE_GNOME+= libbonoboui .endif -do-configure: - cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} . - .include Index: audio/libmusicbrainz3/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/libmusicbrainz3/Makefile,v retrieving revision 1.36 diff -u -u -r1.36 Makefile --- audio/libmusicbrainz3/Makefile 5 May 2008 08:33:55 -0000 1.36 +++ audio/libmusicbrainz3/Makefile 20 May 2008 12:48:08 -0000 @@ -16,16 +16,10 @@ MAINTAINER= bsdkaffee@gmail.com COMMENT= MusicBrainz client library for audio metadata lookup -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= discid:${PORTSDIR}/audio/libdiscid \ neon.26:${PORTSDIR}/www/neon26 -CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_COMPILER:STRING='${CC}' \ - -DCMAKE_CXX_COMPILER:STRING=${CXX} \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} - +USE_CMAKE= yes USE_GMAKE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes @@ -37,8 +31,4 @@ ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}\/pkgconfig|libdata\/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS}) - .include