diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-05-27 22:12:09 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-05-27 22:12:09 +0000 |
| commit | 18dd6954f3060c12b7882f4cb2a1f68dbfc0f102 (patch) | |
| tree | 51edb00936e1a3da263df313cad16c1fa2858d19 | |
| parent | eb37a12fc9841da5f3a397814fbb99436d82a988 (diff) | |
| download | ports-18dd6954f3060c12b7882f4cb2a1f68dbfc0f102.tar.gz ports-18dd6954f3060c12b7882f4cb2a1f68dbfc0f102.zip | |
Notes
54 files changed, 521 insertions, 501 deletions
diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk new file mode 100644 index 000000000000..72f7652a543b --- /dev/null +++ b/Mk/bsd.cmake.mk @@ -0,0 +1,92 @@ +#-*- 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_USE_PTHREAD - Instruct cmake to use pthreads when +# compiling/linking +# Default: not set +# CMAKE_BUILD_TYPE - Type of build (release, debug) +# Default: Release +# CMAKE_VERBOSE - Verbose build +# Default: not set +# CMAKE_SOURCE_PATH - Path to sourcedir for cmake +# Default: . +# CMAKE_INSTALL_PREFIX - prefix for cmake to use for installation. +# Default: ${PREFIX} +# +# +# $FreeBSD$ + +CMAKE_MAINTAINER= kde@FreeBSD.org + +# +# 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="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ + -DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \ + -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" + +# +# Default build type and sourcedir +# +CMAKE_BUILD_TYPE?= Release +CMAKE_SOURCE_PATH?= . +CMAKE_INSTALL_PREFIX?= ${PREFIX} + +# +# Instruct cmake to compile/link with pthreads +# +.if defined(CMAKE_USE_PTHREAD) +CFLAGS+= ${PTHREAD_CFLAGS} +CXXFLAGS+= ${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_BUILD_TYPE=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 + diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b2a1f3c4b380..d15ad3c33ba2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2007,6 +2007,10 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ .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 diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 1c77b09f03c4..e60cee24cbb6 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \ 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_GETTEXT= yes 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 @@ post-patch: ${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} diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile index 2fe8cb7d92d7..c07a0a92f137 100644 --- a/comms/gammu-devel/Makefile +++ b/comms/gammu-devel/Makefile @@ -14,13 +14,11 @@ MASTER_SITES= ftp://dl.cihar.com/gammu/releases/ \ 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 @@ MAN1= gammu.1 gammu-config.1 jadmaker.1 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 <bsd.port.pre.mk> 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 diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile index 2fe8cb7d92d7..c07a0a92f137 100644 --- a/comms/gammu/Makefile +++ b/comms/gammu/Makefile @@ -14,13 +14,11 @@ MASTER_SITES= ftp://dl.cihar.com/gammu/releases/ \ 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 @@ MAN1= gammu.1 gammu-config.1 jadmaker.1 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 <bsd.port.pre.mk> 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 diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile index 0bc85bb1f28b..2694f6d5f6f5 100644 --- a/deskutils/qtm/Makefile +++ b/deskutils/qtm/Makefile @@ -13,23 +13,14 @@ MASTER_SITES= SF/catkin MAINTAINER= ports@FreeBSD.org COMMENT= Blog management application based on Qt 4 -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - USE_QT_VER= 4 QT_COMPONENTS= corelib gui rcc network xml moc_build qmake_build uic_build +USE_CMAKE= yes +CMAKE_ARGS+= -DMANPAGE_DIRECTORY="${MANPREFIX}/man/man1" MANCOMPRESSED= yes MAN1= qtm.1 -pre-build: - @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} cmake . \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ - -DCMAKE_C_LINK_FLAGS="${PTHREAD_LIBS}" \ - -DCMAKE_CXX_LINK_FLAGS="${PTHREAD_LIBS}" \ - -DMANPAGE_DIRECTORY="${MANPREFIX}/man/man1" - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 20201b816510..68d5d97bec4a 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cmake -PORTVERSION= 2.4.8 +PORTVERSION= 2.6.0 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \ ${MASTER_SITE_LOCAL} @@ -21,7 +21,15 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --docdir=${DOCSDIR:S|^${PREFIX}||} CONFIGURE_ENV= MAKE=make -MAN1= ccmake.1 cmake.1 ctest.1 +MAN1= ccmake.1 \ + cmake.1 \ + cmakecommands.1 \ + cmakecompat.1 \ + cmakemodules.1 \ + cmakeprops.1 \ + cmakevars.1 \ + cpack.1 \ + ctest.1 post-patch: @${GREP} -rl '/usr/X11R6' ${WRKSRC}/Modules ${WRKSRC}/Tests | \ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index cf2222b7ca1a..ff59c379a0e6 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,3 +1,3 @@ -MD5 (cmake-2.4.8.tar.gz) = f5dd061c31765a49dc17ae8bdc986779 -SHA256 (cmake-2.4.8.tar.gz) = f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1 -SIZE (cmake-2.4.8.tar.gz) = 2608800 +MD5 (cmake-2.6.0.tar.gz) = e95ae003672dfc6c8151a1ee49a0d4a6 +SHA256 (cmake-2.6.0.tar.gz) = 4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27 +SIZE (cmake-2.6.0.tar.gz) = 3460096 diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake new file mode 100644 index 000000000000..7667e25d09f2 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -0,0 +1,23 @@ +--- ./Modules/FindQt4.cmake.orig 2008-01-21 19:59:51.000000000 +0100 ++++ ./Modules/FindQt4.cmake 2008-04-25 21:45:15.000000000 +0200 +@@ -250,7 +250,7 @@ + + GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) + # check for qmake +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +@@ -790,9 +790,9 @@ + "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) + + SET(QT_MOC_EXECUTABLE +- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable") ++ ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE) + SET(QT_UIC_EXECUTABLE +- ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable") ++ ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE) + + FIND_PROGRAM(QT_UIC3_EXECUTABLE + NAMES uic3 diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 15918621c207..08655f6fa5bf 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -4,28 +4,43 @@ bin/cpack bin/ctest %%DATADIR%%/Modules/AddFileDependencies.cmake %%DATADIR%%/Modules/CMake.cmake +%%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake +%%DATADIR%%/Modules/CMakeASMCompiler.cmake.in +%%DATADIR%%/Modules/CMakeASMInformation.cmake %%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake %%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake %%DATADIR%%/Modules/CMakeBorlandFindMake.cmake %%DATADIR%%/Modules/CMakeBuildSettings.cmake.in %%DATADIR%%/Modules/CMakeCCompiler.cmake.in +%%DATADIR%%/Modules/CMakeCCompilerABI.c +%%DATADIR%%/Modules/CMakeCCompilerId.c.in %%DATADIR%%/Modules/CMakeCInformation.cmake %%DATADIR%%/Modules/CMakeCXXCompiler.cmake.in +%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp +%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in %%DATADIR%%/Modules/CMakeCXXInformation.cmake %%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake +%%DATADIR%%/Modules/CMakeCompilerABI.h %%DATADIR%%/Modules/CMakeConfigurableFile.in %%DATADIR%%/Modules/CMakeDependentOption.cmake +%%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake +%%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake +%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake +%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake %%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineSystem.cmake %%DATADIR%%/Modules/CMakeExportBuildSettings.cmake +%%DATADIR%%/Modules/CMakeFindBinUtils.cmake %%DATADIR%%/Modules/CMakeFindFrameworks.cmake %%DATADIR%%/Modules/CMakeFindWMake.cmake %%DATADIR%%/Modules/CMakeFindXCode.cmake +%%DATADIR%%/Modules/CMakeForceCompiler.cmake %%DATADIR%%/Modules/CMakeFortranCompiler.cmake.in +%%DATADIR%%/Modules/CMakeFortranCompilerId.F90.in %%DATADIR%%/Modules/CMakeFortranInformation.cmake %%DATADIR%%/Modules/CMakeGenericSystem.cmake %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake @@ -34,11 +49,14 @@ bin/ctest %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake +%%DATADIR%%/Modules/CMakePlatformId.h.in %%DATADIR%%/Modules/CMakePrintSystemInformation.cmake %%DATADIR%%/Modules/CMakeRCCompiler.cmake.in %%DATADIR%%/Modules/CMakeRCInformation.cmake %%DATADIR%%/Modules/CMakeSystem.cmake.in %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake +%%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake +%%DATADIR%%/Modules/CMakeTestASMCompiler.cmake %%DATADIR%%/Modules/CMakeTestCCompiler.cmake %%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake %%DATADIR%%/Modules/CMakeTestForFreeVC.cxx @@ -48,8 +66,6 @@ bin/ctest %%DATADIR%%/Modules/CMakeTestNMakeCLVersion.c %%DATADIR%%/Modules/CMakeTestRCCompiler.cmake %%DATADIR%%/Modules/CMakeUnixFindMake.cmake -%%DATADIR%%/Modules/CMakeVCManifest.cmake -%%DATADIR%%/Modules/CMakeVCManifestExe.cmake %%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake %%DATADIR%%/Modules/CMakeVS6FindMake.cmake %%DATADIR%%/Modules/CMakeVS71FindMake.cmake @@ -57,10 +73,19 @@ bin/ctest %%DATADIR%%/Modules/CMakeVS7FindMake.cmake %%DATADIR%%/Modules/CMakeVS8FindMake.cmake %%DATADIR%%/Modules/CMakeVS9FindMake.cmake +%%DATADIR%%/Modules/CPack.DS_Store.in %%DATADIR%%/Modules/CPack.Description.plist.in %%DATADIR%%/Modules/CPack.Info.plist.in +%%DATADIR%%/Modules/CPack.OSXScriptLauncher.in +%%DATADIR%%/Modules/CPack.OSXX11.Info.plist.in +%%DATADIR%%/Modules/CPack.RuntimeScript.in %%DATADIR%%/Modules/CPack.STGZ_Header.sh.in +%%DATADIR%%/Modules/CPack.VolumeIcon.icns.in +%%DATADIR%%/Modules/CPack.background.png.in %%DATADIR%%/Modules/CPack.cmake +%%DATADIR%%/Modules/CPackDeb.cmake +%%DATADIR%%/Modules/CPackRPM.cmake +%%DATADIR%%/Modules/CPackZIP.cmake %%DATADIR%%/Modules/CTest.cmake %%DATADIR%%/Modules/CTestTargets.cmake %%DATADIR%%/Modules/CheckCCompilerFlag.cmake @@ -70,6 +95,7 @@ bin/ctest %%DATADIR%%/Modules/CheckCXXSourceCompiles.cmake %%DATADIR%%/Modules/CheckCXXSourceRuns.cmake %%DATADIR%%/Modules/CheckForPthreads.c +%%DATADIR%%/Modules/CheckFortranFunctionExists.cmake %%DATADIR%%/Modules/CheckFunctionExists.c %%DATADIR%%/Modules/CheckFunctionExists.cmake %%DATADIR%%/Modules/CheckIncludeFile.c.in @@ -80,21 +106,27 @@ bin/ctest %%DATADIR%%/Modules/CheckLibraryExists.cmake %%DATADIR%%/Modules/CheckLibraryExists.lists.in %%DATADIR%%/Modules/CheckSizeOf.cmake +%%DATADIR%%/Modules/CheckStructHasMember.cmake %%DATADIR%%/Modules/CheckSymbolExists.cmake -%%DATADIR%%/Modules/CheckTypeSize.c.in %%DATADIR%%/Modules/CheckTypeSize.cmake +%%DATADIR%%/Modules/CheckTypeSizeC.c.in %%DATADIR%%/Modules/CheckVariableExists.c %%DATADIR%%/Modules/CheckVariableExists.cmake %%DATADIR%%/Modules/Dart.cmake %%DATADIR%%/Modules/DartConfiguration.tcl.in %%DATADIR%%/Modules/Documentation.cmake %%DATADIR%%/Modules/DummyCXXFile.cxx +%%DATADIR%%/Modules/FLTKCompatibility.cmake +%%DATADIR%%/Modules/FeatureSummary.cmake %%DATADIR%%/Modules/FindASPELL.cmake %%DATADIR%%/Modules/FindAVIFile.cmake +%%DATADIR%%/Modules/FindBLAS.cmake %%DATADIR%%/Modules/FindBZip2.cmake %%DATADIR%%/Modules/FindBoost.cmake %%DATADIR%%/Modules/FindCABLE.cmake %%DATADIR%%/Modules/FindCURL.cmake +%%DATADIR%%/Modules/FindCVS.cmake +%%DATADIR%%/Modules/FindCups.cmake %%DATADIR%%/Modules/FindCurses.cmake %%DATADIR%%/Modules/FindCygwin.cmake %%DATADIR%%/Modules/FindDCMTK.cmake @@ -102,10 +134,15 @@ bin/ctest %%DATADIR%%/Modules/FindDoxygen.cmake %%DATADIR%%/Modules/FindEXPAT.cmake %%DATADIR%%/Modules/FindFLTK.cmake +%%DATADIR%%/Modules/FindFLTK2.cmake +%%DATADIR%%/Modules/FindFreetype.cmake %%DATADIR%%/Modules/FindGCCXML.cmake +%%DATADIR%%/Modules/FindGDAL.cmake +%%DATADIR%%/Modules/FindGIF.cmake %%DATADIR%%/Modules/FindGLU.cmake %%DATADIR%%/Modules/FindGLUT.cmake %%DATADIR%%/Modules/FindGTK.cmake +%%DATADIR%%/Modules/FindGettext.cmake %%DATADIR%%/Modules/FindGnuplot.cmake %%DATADIR%%/Modules/FindHSPELL.cmake %%DATADIR%%/Modules/FindHTMLHelp.cmake @@ -115,12 +152,14 @@ bin/ctest %%DATADIR%%/Modules/FindJPEG.cmake %%DATADIR%%/Modules/FindJasper.cmake %%DATADIR%%/Modules/FindJava.cmake -%%DATADIR%%/Modules/FindKDE.cmake %%DATADIR%%/Modules/FindKDE3.cmake %%DATADIR%%/Modules/FindKDE4.cmake +%%DATADIR%%/Modules/FindLAPACK.cmake %%DATADIR%%/Modules/FindLATEX.cmake %%DATADIR%%/Modules/FindLibXml2.cmake %%DATADIR%%/Modules/FindLibXslt.cmake +%%DATADIR%%/Modules/FindLua50.cmake +%%DATADIR%%/Modules/FindLua51.cmake %%DATADIR%%/Modules/FindMFC.cmake %%DATADIR%%/Modules/FindMPEG.cmake %%DATADIR%%/Modules/FindMPEG2.cmake @@ -130,18 +169,23 @@ bin/ctest %%DATADIR%%/Modules/FindOpenAL.cmake %%DATADIR%%/Modules/FindOpenGL.cmake %%DATADIR%%/Modules/FindOpenSSL.cmake +%%DATADIR%%/Modules/FindOpenThreads.cmake %%DATADIR%%/Modules/FindPHP4.cmake %%DATADIR%%/Modules/FindPNG.cmake +%%DATADIR%%/Modules/FindPackageHandleStandardArgs.cmake +%%DATADIR%%/Modules/FindPackageMessage.cmake %%DATADIR%%/Modules/FindPerl.cmake %%DATADIR%%/Modules/FindPerlLibs.cmake %%DATADIR%%/Modules/FindPhysFS.cmake %%DATADIR%%/Modules/FindPike.cmake %%DATADIR%%/Modules/FindPkgConfig.cmake +%%DATADIR%%/Modules/FindProducer.cmake %%DATADIR%%/Modules/FindPythonInterp.cmake %%DATADIR%%/Modules/FindPythonLibs.cmake %%DATADIR%%/Modules/FindQt.cmake %%DATADIR%%/Modules/FindQt3.cmake %%DATADIR%%/Modules/FindQt4.cmake +%%DATADIR%%/Modules/FindQuickTime.cmake %%DATADIR%%/Modules/FindRuby.cmake %%DATADIR%%/Modules/FindSDL.cmake %%DATADIR%%/Modules/FindSDL_image.cmake @@ -154,6 +198,7 @@ bin/ctest %%DATADIR%%/Modules/FindSubversion.cmake %%DATADIR%%/Modules/FindTCL.cmake %%DATADIR%%/Modules/FindTIFF.cmake +%%DATADIR%%/Modules/FindTclStub.cmake %%DATADIR%%/Modules/FindTclsh.cmake %%DATADIR%%/Modules/FindThreads.cmake %%DATADIR%%/Modules/FindUnixCommands.cmake @@ -163,26 +208,64 @@ bin/ctest %%DATADIR%%/Modules/FindX11.cmake %%DATADIR%%/Modules/FindXMLRPC.cmake %%DATADIR%%/Modules/FindZLIB.cmake +%%DATADIR%%/Modules/Findosg.cmake +%%DATADIR%%/Modules/FindosgDB.cmake +%%DATADIR%%/Modules/FindosgFX.cmake +%%DATADIR%%/Modules/FindosgGA.cmake +%%DATADIR%%/Modules/FindosgIntrospection.cmake +%%DATADIR%%/Modules/FindosgManipulator.cmake +%%DATADIR%%/Modules/FindosgParticle.cmake +%%DATADIR%%/Modules/FindosgProducer.cmake +%%DATADIR%%/Modules/FindosgShadow.cmake +%%DATADIR%%/Modules/FindosgSim.cmake +%%DATADIR%%/Modules/FindosgTerrain.cmake +%%DATADIR%%/Modules/FindosgText.cmake +%%DATADIR%%/Modules/FindosgUtil.cmake +%%DATADIR%%/Modules/FindosgViewer.cmake %%DATADIR%%/Modules/FindwxWidgets.cmake %%DATADIR%%/Modules/FindwxWindows.cmake +%%DATADIR%%/Modules/GetPrerequisites.cmake +%%DATADIR%%/Modules/ITKCompatibility.cmake %%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake %%DATADIR%%/Modules/KDE3Macros.cmake -%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in %%DATADIR%%/Modules/MacroAddFileDependencies.cmake %%DATADIR%%/Modules/NSIS.InstallOptions.ini.in %%DATADIR%%/Modules/NSIS.template.in +%%DATADIR%%/Modules/Platform/AIX-VisualAge-Fortran.cmake %%DATADIR%%/Modules/Platform/AIX.cmake %%DATADIR%%/Modules/Platform/BSDOS.cmake +%%DATADIR%%/Modules/Platform/BeOS.cmake +%%DATADIR%%/Modules/Platform/BlueGeneL.cmake %%DATADIR%%/Modules/Platform/CYGWIN-g77.cmake %%DATADIR%%/Modules/Platform/CYGWIN.cmake +%%DATADIR%%/Modules/Platform/Catamount.cmake +%%DATADIR%%/Modules/Platform/Darwin-icc.cmake +%%DATADIR%%/Modules/Platform/Darwin-icpc.cmake %%DATADIR%%/Modules/Platform/Darwin-xlc.cmake %%DATADIR%%/Modules/Platform/Darwin.cmake %%DATADIR%%/Modules/Platform/DragonFly.cmake %%DATADIR%%/Modules/Platform/FreeBSD.cmake %%DATADIR%%/Modules/Platform/GNU.cmake +%%DATADIR%%/Modules/Platform/Generic-ADSP-ASM.cmake +%%DATADIR%%/Modules/Platform/Generic-ADSP-C.cmake +%%DATADIR%%/Modules/Platform/Generic-ADSP-CXX.cmake +%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake +%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake +%%DATADIR%%/Modules/Platform/Generic.cmake %%DATADIR%%/Modules/Platform/HP-UX.cmake %%DATADIR%%/Modules/Platform/IRIX.cmake %%DATADIR%%/Modules/Platform/IRIX64.cmake +%%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-Intel-C.cmake +%%DATADIR%%/Modules/Platform/Linux-Intel-CXX.cmake +%%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake +%%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake +%%DATADIR%%/Modules/Platform/Linux-SunPro-C.cmake +%%DATADIR%%/Modules/Platform/Linux-SunPro-CXX.cmake +%%DATADIR%%/Modules/Platform/Linux-SunPro-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-VisualAge-C.cmake +%%DATADIR%%/Modules/Platform/Linux-VisualAge-Fortran.cmake %%DATADIR%%/Modules/Platform/Linux-como.cmake %%DATADIR%%/Modules/Platform/Linux-icpc.cmake %%DATADIR%%/Modules/Platform/Linux-ifort.cmake @@ -195,6 +278,7 @@ bin/ctest %%DATADIR%%/Modules/Platform/RISCos.cmake %%DATADIR%%/Modules/Platform/SCO_SV.cmake %%DATADIR%%/Modules/Platform/SINIX.cmake +%%DATADIR%%/Modules/Platform/SunOS-SunPro-Fortran.cmake %%DATADIR%%/Modules/Platform/SunOS.cmake %%DATADIR%%/Modules/Platform/Tru64.cmake %%DATADIR%%/Modules/Platform/ULTRIX.cmake @@ -204,6 +288,7 @@ bin/ctest %%DATADIR%%/Modules/Platform/Windows-bcc32.cmake %%DATADIR%%/Modules/Platform/Windows-cl.cmake %%DATADIR%%/Modules/Platform/Windows-cl.cmake.in +%%DATADIR%%/Modules/Platform/Windows-df.cmake %%DATADIR%%/Modules/Platform/Windows-g++.cmake %%DATADIR%%/Modules/Platform/Windows-g77.cmake %%DATADIR%%/Modules/Platform/Windows-gcc.cmake @@ -213,12 +298,19 @@ bin/ctest %%DATADIR%%/Modules/Platform/Windows.cmake %%DATADIR%%/Modules/Platform/WindowsPaths.cmake %%DATADIR%%/Modules/Platform/Xenix.cmake +%%DATADIR%%/Modules/Platform/cl.cmake +%%DATADIR%%/Modules/Platform/eCos.cmake %%DATADIR%%/Modules/Platform/g77.cmake +%%DATADIR%%/Modules/Platform/gas.cmake %%DATADIR%%/Modules/Platform/gcc.cmake %%DATADIR%%/Modules/Platform/kFreeBSD.cmake -%%DATADIR%%/Modules/TestBigEndian.c +%%DATADIR%%/Modules/Platform/syllable.cmake +%%DATADIR%%/Modules/Platform/xlf.cmake +%%DATADIR%%/Modules/SystemInformation.cmake +%%DATADIR%%/Modules/SystemInformation.in %%DATADIR%%/Modules/TestBigEndian.cmake %%DATADIR%%/Modules/TestCXXAcceptsFlag.cmake +%%DATADIR%%/Modules/TestEndianess.c.in %%DATADIR%%/Modules/TestForANSIForScope.cmake %%DATADIR%%/Modules/TestForANSIStreamHeaders.cmake %%DATADIR%%/Modules/TestForANSIStreamHeaders.cxx @@ -237,12 +329,14 @@ bin/ctest %%DATADIR%%/Modules/Use_wxWindows.cmake %%DATADIR%%/Modules/UsewxWidgets.cmake %%DATADIR%%/Modules/VTKCompatibility.cmake +%%DATADIR%%/Modules/ecos_clean.cmake %%DATADIR%%/Modules/kde3init_dummy.cpp.in %%DATADIR%%/Modules/kde3uic.cmake %%DATADIR%%/Modules/readme.txt %%DATADIR%%/Templates/CMakeLists.txt +%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros +%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros %%DATADIR%%/Templates/CMakeVisualStudio6Configurations.cmake -%%DATADIR%%/Templates/CMakeWindowsSystemConfig.cmake %%DATADIR%%/Templates/CPack.GenericDescription.txt %%DATADIR%%/Templates/CPack.GenericLicense.txt %%DATADIR%%/Templates/CPack.GenericWelcome.txt @@ -256,14 +350,26 @@ bin/ctest %%DATADIR%%/Templates/TestDriver.cxx.in %%DATADIR%%/Templates/UtilityFooter.dsptemplate %%DATADIR%%/Templates/UtilityHeader.dsptemplate +%%DATADIR%%/Templates/cygwin-package.sh.in %%DATADIR%%/Templates/staticLibFooter.dsptemplate %%DATADIR%%/Templates/staticLibHeader.dsptemplate %%DATADIR%%/include/cmCPluginAPI.h -%%DOCSDIR%%/Copyright.txt %%DOCSDIR%%/ccmake.html %%DOCSDIR%%/ccmake.txt +%%DOCSDIR%%/cmake-commands.html +%%DOCSDIR%%/cmake-commands.txt +%%DOCSDIR%%/cmake-compatcommands.html +%%DOCSDIR%%/cmake-compatcommands.txt +%%DOCSDIR%%/cmake-modules.html +%%DOCSDIR%%/cmake-modules.txt +%%DOCSDIR%%/cmake-properties.html +%%DOCSDIR%%/cmake-properties.txt +%%DOCSDIR%%/cmake-variables.html +%%DOCSDIR%%/cmake-variables.txt %%DOCSDIR%%/cmake.html %%DOCSDIR%%/cmake.txt +%%DOCSDIR%%/cpack.html +%%DOCSDIR%%/cpack.txt %%DOCSDIR%%/ctest.html %%DOCSDIR%%/ctest.txt @dirrm %%DOCSDIR%% diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile index 2fac46bec9d4..a5797f5ec0e8 100644 --- a/devel/kdesvn-kde4/Makefile +++ b/devel/kdesvn-kde4/Makefile @@ -6,27 +6,18 @@ PORTNAME= kdesvn PORTVERSION= 0.14.1 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/ 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 +42,4 @@ post-extract: ${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt .endif -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) - .include <bsd.port.mk> diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile index 2fac46bec9d4..a5797f5ec0e8 100644 --- a/devel/kdesvn/Makefile +++ b/devel/kdesvn/Makefile @@ -6,27 +6,18 @@ PORTNAME= kdesvn PORTVERSION= 0.14.1 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/ 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 +42,4 @@ post-extract: ${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt .endif -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) - .include <bsd.port.mk> diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile index 5f291a4e1e29..91528b03bb3e 100644 --- a/devel/physfs-devel/Makefile +++ b/devel/physfs-devel/Makefile @@ -14,14 +14,7 @@ MASTER_SITES= http://offload1.icculus.org/${PORTNAME}/downloads/ 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 @@ post-patch: @${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 <bsd.port.mk> diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile index 0f08d611d8de..4da6579ca503 100644 --- a/devel/qsvn/Makefile +++ b/devel/qsvn/Makefile @@ -14,26 +14,15 @@ MASTER_SITES= http://www.anrichter.net/projects/qsvn/chrome/site/ 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}/src -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} src +DESKTOP_ENTRIES="QSvn" "SVN client" "" "qsvn" "" false .include <bsd.port.mk> diff --git a/devel/qsvn/files/patch-src__CMakeLists.txt b/devel/qsvn/files/patch-src__CMakeLists.txt index 1350065f75bf..a5c3630e2978 100644 --- a/devel/qsvn/files/patch-src__CMakeLists.txt +++ b/devel/qsvn/files/patch-src__CMakeLists.txt @@ -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 ) diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile index e2ea8a2a5fde..7b71af2bd5de 100644 --- a/games/blinkensisters/Makefile +++ b/games/blinkensisters/Makefile @@ -15,18 +15,12 @@ DISTNAME= LostPixels-${PORTVERSION}-source 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 +USE_CMAKE= yes -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} +CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include OPTIONS= SOUND "Build with souns support" on \ NETWORK "Build with network support" on @@ -52,7 +46,4 @@ post-patch: s|share/doc/blinkensisters|${DOCSDIR:S,${PREFIX}/,,}|' \ ${WRKSRC}/CMakeLists.txt -do-configure: - cd ${WRKSRC} && ${CMAKE} . ${CMAKE_DEFS} - .include <bsd.port.post.mk> diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile index 47d4271e8ff2..feabf986127e 100644 --- a/games/ksudoku/Makefile +++ b/games/ksudoku/Makefile @@ -14,20 +14,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 <bsd.port.mk> diff --git a/games/memonix/Makefile b/games/memonix/Makefile index 1cbc9bc33aa4..9cf8f9e179d5 100644 --- a/games/memonix/Makefile +++ b/games/memonix/Makefile @@ -18,22 +18,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 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 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 +35,6 @@ post-patch: @${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} diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile index a19724631726..0df35bad34ae 100644 --- a/games/openastromenace/Makefile +++ b/games/openastromenace/Makefile @@ -7,90 +7,54 @@ PORTNAME= openastromenace PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF +DISTFILES= oamenace-src-${PORTVERSION}${EXTRACT_SUFX} \ + oamenace-data-${PORTVERSION}${EXTRACT_SUFX} \ + oamenace-lang-${LANGPACK}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= proler@gmail.com COMMENT= Hardcore 3D space shooter with spaceship upgrade possibilities +LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis \ + jpeg:${PORTSDIR}/graphics/jpeg \ + openal:${PORTSDIR}/audio/openal \ + alut:${PORTSDIR}/audio/freealut + USE_BZIP2= yes -USE_GL= yes +USE_GL= gl glu WANT_SDL= yes USE_SDL= sdl +USE_CMAKE= yes -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} - -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 \ - alut:${PORTSDIR}/audio/freealut \ - -OPTIONS= SRC "build src" on \ - DATA "install data file" on \ - EN " en lang" on \ - DE " de lang " on \ - RU " ru lang " on \ +OPTIONS= EN "English language pack" on \ + DE "German language pack" off \ + RU "Russian language pack" off .include <bsd.port.pre.mk> -.undef DISTFILES -.if defined(WITH_SRC) -DISTFILES+=oamenace-src-${PORTVERSION}.tar.bz2 +.if !defined(WITHOUT_EN) +LANGPACK= en +.elif defined(WITH_DE) +LANGPACK= de +.elif defined(WITH_RU) +LANGPACK= ru .else -NO_BUILD= yes -.endif -.if defined(WITH_DATA) -DISTFILES+=oamenace-data-${PORTVERSION}.tar.bz2 -.endif -.if defined(WITH_EN) -DISTFILES+=oamenace-lang-en-${PORTVERSION}.tar.bz2 -.endif -.if defined(WITH_DE) -DISTFILES+=oamenace-lang-de-${PORTVERSION}.tar.bz2 -.endif -.if defined(WITH_RU) -DISTFILES+=oamenace-lang-ru-${PORTVERSION}.tar.bz2 +IGNORE= cannot be build without/with multiple language packs. Please rerun 'make config' and select single language pack .endif -do-configure: -.if defined(WITH_SRC) - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC}) -.endif +post-patch: + ${REINPLACE_CMD} -e 's|/usr/local/share/openastromenace|${DATADIR}|' \ + ${WRKSRC}/AstroMenaceSource/Main.cpp do-install: -.if defined(WITH_SRC) ${INSTALL_PROGRAM} ${WRKSRC}/AstroMenace ${PREFIX}/bin -.endif ${MKDIR} ${DATADIR} -.if defined(WITH_DATA) ${INSTALL_DATA} ${WRKDIR}/gamedata.vfs ${DATADIR}/ ${MKDIR} ${DATADIR}/DATA/SCRIPT ${INSTALL_DATA} ${WRKDIR}/DATA/SCRIPT/* ${DATADIR}/DATA/SCRIPT -.endif -.if defined(WITH_EN) - ${INSTALL_DATA} ${WRKDIR}/gamelang_en.vfs ${DATADIR}/ - ${LN} -sf ${DATADIR}/gamelang_en.vfs ${DATADIR}/gamelang.vfs -.endif -.if defined(WITH_DE) - ${INSTALL_DATA} ${WRKDIR}/gamelang_de.vfs ${DATADIR}/ - ${LN} -sf ${DATADIR}/gamelang_de.vfs ${DATADIR}/gamelang.vfs -.endif -.if defined(WITH_RU) - ${INSTALL_DATA} ${WRKDIR}/gamelang_ru.vfs ${DATADIR}/ - ${LN} -sf ${DATADIR}/gamelang_ru.vfs ${DATADIR}/gamelang.vfs -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKDIR}/gamelang_${LANGPACK}.vfs \ + ${DATADIR}/gamelang.vfs .include <bsd.port.post.mk> diff --git a/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp b/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp new file mode 100644 index 000000000000..694ff12fa93f --- /dev/null +++ b/games/openastromenace/files/patch-AstroMenaceSource-Main.cpp @@ -0,0 +1,39 @@ +--- AstroMenaceSource/Main.cpp.orig 2007-09-23 00:51:32.000000000 +0400 ++++ AstroMenaceSource/Main.cpp 2008-05-19 04:59:05.387115362 +0400 +@@ -312,35 +312,7 @@ + const char* key = "HOME"; + const char* homeval = getenv(key); + +- bool dirpresent = false; +- for (int i=1; i<argc; i++) +- { +- if (!strncmp(argv[i], "--dir=", sizeof("--dir"))) +- { +- dirpresent = true; +- // если передали относительный путь в папку пользователя с тильдой +- if (argv[i][6] != '~') +- strncpy(ProgrammDir, argv[i]+strlen("--dir="), strlen(argv[i])-strlen("--dir=")+1); +- else +- { +- strcpy(ProgrammDir, homeval);// -1, это тильда... а в кол-ве нет, т.к. /0 там должен остаться +- strncat(ProgrammDir, argv[i]+strlen("--dir=")+1, strlen(argv[i])-strlen("--dir=")); +- } +- // если в конце нет слеша - ставим его +- if (ProgrammDir[strlen(ProgrammDir)-1] != '/') +- strncat(ProgrammDir, "/", strlen("/")); +- +- } +- } +- if (!dirpresent) +- { +- strcpy(ProgrammDir, argv[0]); +- char* s = strrchr(ProgrammDir,'/'); +- if (s) s[0]=0x0; +- const char *Fi = "/"; +- strcat( ProgrammDir, Fi ); +- } +- ++ strcpy(ProgrammDir, "/usr/local/share/openastromenace/"); + + strcpy(ScreenshotDir, homeval); + strcat(ScreenshotDir, "/Desktop/AstroMenaceScreenshot"); diff --git a/games/openastromenace/files/patch-CMakeLists.txt b/games/openastromenace/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..581b17f0bc30 --- /dev/null +++ b/games/openastromenace/files/patch-CMakeLists.txt @@ -0,0 +1,26 @@ +--- CMakeLists.txt.orig 2007-09-23 00:51:32.000000000 +0400 ++++ CMakeLists.txt 2008-05-19 04:24:59.253802609 +0400 +@@ -12,6 +12,8 @@ + # into current directory and run ./AstroMenace + # + ++CMAKE_MINIMUM_REQUIRED(VERSION 2.4) ++ + # project name + PROJECT(AstroMenace) + +@@ -34,9 +36,12 @@ + FILE(GLOB_RECURSE astromenace_SRCS AstroMenaceSource/*.cpp) + + # targets +-ADD_DEFINITIONS(`${SDL_CONFIG} --cflags` -g -Wall) ++EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS) ++EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS) ++ ++ADD_DEFINITIONS(${SDL_CFLAGS}) + ADD_EXECUTABLE(AstroMenace ${astromenace_SRCS}) +-TARGET_LINK_LIBRARIES(AstroMenace `${SDL_CONFIG} --libs` ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile) ++TARGET_LINK_LIBRARIES(AstroMenace ${SDL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile) + IF(CYGWIN) + TARGET_LINK_LIBRARIES(AstroMenace -lGL.dll -lGLU.dll -lglfw -lX11.dll) + # ADD_DEFINITIONS(-mno-cygwin) diff --git a/games/openastromenace/pkg-plist b/games/openastromenace/pkg-plist index 5eb89039b384..79c47d860958 100644 --- a/games/openastromenace/pkg-plist +++ b/games/openastromenace/pkg-plist @@ -24,9 +24,6 @@ bin/AstroMenace %%DATADIR%%/DATA/SCRIPT/my_aimode_7.xml %%DATADIR%%/gamedata.vfs %%DATADIR%%/gamelang.vfs -%%DATADIR%%/gamelang_de.vfs -%%DATADIR%%/gamelang_en.vfs -%%DATADIR%%/gamelang_ru.vfs @dirrm %%DATADIR%%/DATA/SCRIPT @dirrm %%DATADIR%%/DATA @dirrm %%DATADIR%% diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index 114d869802c9..9b331790b2ec 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -13,14 +13,11 @@ MASTER_SITES= SF MAINTAINER= alepulver@FreeBSD.org COMMENT= Doom, Doom II, Heretic, Hexen and Strife source port -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes -CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - -DCMAKE_C_COMPILER:STRING="${CC}" \ - -DCMAKE_CXX_COMPILER:STRING="${CXX}" +USE_CMAKE= yes OPTIONS= ALLEGRO "Use Allegro for hardware API" off \ FLAC "Enable FLAC support" off \ @@ -129,9 +126,6 @@ post-patch: @${REINPLACE_CMD} -e 's|$$\* $${IWADDIR}|-iwaddir ${DMDIR} $$*|' \ ${WRKSRC}/source/CMakeLists.txt -pre-build: - @cd ${WRKSRC} && cmake ${CMAKE_ARGS} . - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/math/eigen/Makefile b/math/eigen/Makefile index aa602cac18ba..be26db571c7b 100644 --- a/math/eigen/Makefile +++ b/math/eigen/Makefile @@ -12,22 +12,11 @@ MASTER_SITES= http://download.tuxfamily.org/eigen/ MAINTAINER= kde@FreeBSD.org COMMENT= Lightweight library for vector and matrix math -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -CMAKE?= ${LOCALBASE}/bin/cmake +USE_CMAKE= yes +CMAKE_SOURCE_PATH= .. WRKSRC= ${WRKDIR}/${PORTNAME}/build -MAKE_ENV= VERBOSE="1" -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}" post-patch: ${MKDIR} ${WRKSRC} -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include <bsd.port.mk> diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile index aa602cac18ba..be26db571c7b 100644 --- a/math/eigen2/Makefile +++ b/math/eigen2/Makefile @@ -12,22 +12,11 @@ MASTER_SITES= http://download.tuxfamily.org/eigen/ MAINTAINER= kde@FreeBSD.org COMMENT= Lightweight library for vector and matrix math -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -CMAKE?= ${LOCALBASE}/bin/cmake +USE_CMAKE= yes +CMAKE_SOURCE_PATH= .. WRKSRC= ${WRKDIR}/${PORTNAME}/build -MAKE_ENV= VERBOSE="1" -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}" post-patch: ${MKDIR} ${WRKSRC} -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include <bsd.port.mk> diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile index aa602cac18ba..be26db571c7b 100644 --- a/math/eigen3/Makefile +++ b/math/eigen3/Makefile @@ -12,22 +12,11 @@ MASTER_SITES= http://download.tuxfamily.org/eigen/ MAINTAINER= kde@FreeBSD.org COMMENT= Lightweight library for vector and matrix math -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - -CMAKE?= ${LOCALBASE}/bin/cmake +USE_CMAKE= yes +CMAKE_SOURCE_PATH= .. WRKSRC= ${WRKDIR}/${PORTNAME}/build -MAKE_ENV= VERBOSE="1" -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}" post-patch: ${MKDIR} ${WRKSRC} -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include <bsd.port.mk> diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile index 47724e527631..8d47f4f2696c 100644 --- a/math/speedcrunch/Makefile +++ b/math/speedcrunch/Makefile @@ -14,15 +14,11 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} 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 @@ post-patch: @${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 diff --git a/math/vtk-python/Makefile b/math/vtk-python/Makefile index 0785d527de95..eb75b0d432d3 100644 --- a/math/vtk-python/Makefile +++ b/math/vtk-python/Makefile @@ -33,6 +33,15 @@ LINKERFLAGS= -L${PREFIX}/lib # to link vtkpython to vtk libs CMAKE_DEFS= -DVTK_WRAP_PYTHON:BOOL=ON \ -DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR} \ -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBDIR}/config/lib${PYTHON_VERSION}.a \ + -DOPENGL_INCLUDE_DIR:PATH=${LOCALBASE}/include \ + -DZLIB_LIBRARY:PATH=/usr/lib/libz.so \ + -DZLIB_INCLUDE_DIR:PATH=/usr/include \ + -DJPEG_LIBRARY:PATH=${LOCALBASE}/lib/libjpeg.so \ + -DJPEG_INCLUDE_DIR:PATH=${LOCALBASE}/include \ + -DPNG_LIBRARY:PATH=${LOCALBASE}/lib/libpng.so \ + -DPNG_INCLUDE_DIR:PATH=${LOCALBASE}/include \ + -DTIFF_LIBRARY:PATH=${LOCALBASE}/lib/libtiff.so \ + -DTIFF_INCLUDE_DIR:PATH=${LOCALBASE}/include \ -DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDE_DIR} \ -DTK_INCLUDE_PATH:PATH=${TK_INCLUDE_DIR} \ -DEXPAT_LIBRARY:PATH=${LOCALBASE}/lib/libexpat.so \ diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 2c96ac593852..d5ef078ed59f 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -16,7 +16,6 @@ DISTNAME?= vtk-${PORTVERSION} 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 @@ VTK_KITS= Common Filtering GenericFiltering Graphics \ 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 @@ MAN3= vtk.3 .include <bsd.port.pre.mk> -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 @@ CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ .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: diff --git a/misc/katalog/Makefile b/misc/katalog/Makefile index 5fe04b665ed4..02d218c69a78 100644 --- a/misc/katalog/Makefile +++ b/misc/katalog/Makefile @@ -17,10 +17,10 @@ PATCH_DIST_STRIP= -p1 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 @@ post-patch: @${ECHO_CMD} 'macro_add_compile_flags( katalogxml "-fPIC" )' \ >> ${WRKSRC}/xml_backend/libkatalogxml/CMakeLists.txt -do-configure: - @cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/cmake . - .include <bsd.port.mk> diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile index 828e17a27ee7..ad82a7ff2673 100644 --- a/misc/kbfx/Makefile +++ b/misc/kbfx/Makefile @@ -15,15 +15,7 @@ MASTER_SITE_SUBDIR=kbfx 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 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GCC= 3.4+ -do-configure: - (cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS}) - .include <bsd.port.mk> diff --git a/multimedia/vtkmpeg2encode/Makefile b/multimedia/vtkmpeg2encode/Makefile index f0c743a00ef9..770f5ee0916b 100644 --- a/multimedia/vtkmpeg2encode/Makefile +++ b/multimedia/vtkmpeg2encode/Makefile @@ -15,17 +15,12 @@ DISTNAME= vtkmpeg2encode 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 @@ PLIST_FILES= lib/${MPEGLIB}.so.${PORTVERSION} \ 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} diff --git a/net-im/decibel/Makefile b/net-im/decibel/Makefile index 25a431819fd9..8ea6ad37062b 100644 --- a/net-im/decibel/Makefile +++ b/net-im/decibel/Makefile @@ -13,21 +13,15 @@ MASTER_SITES= http://decibel.kde.org/fileadmin/downloads/decibel/releases/ 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 <bsd.port.pre.mk> @@ -43,7 +37,4 @@ post-patch: "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 <bsd.port.post.mk> diff --git a/net-im/tapioca-qt/Makefile b/net-im/tapioca-qt/Makefile index 3d2cd4723e0e..0501a8bc4079 100644 --- a/net-im/tapioca-qt/Makefile +++ b/net-im/tapioca-qt/Makefile @@ -6,6 +6,7 @@ PORTNAME= tapioca-qt PORTVERSION= 0.14.1 +PORTREVISION= CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tapioca-voip @@ -13,17 +14,12 @@ MASTER_SITE_SUBDIR= tapioca-voip 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 +32,4 @@ post-patch: "s,$${LIB_INSTALL_DIR}/pkgconfig,data/pkgconfig,g"\ ${WRKSRC}/../CMakeLists.txt -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include <bsd.port.mk> diff --git a/net-im/telepathy-qt/Makefile b/net-im/telepathy-qt/Makefile index b32dd3c0e636..48759f2d6ec2 100644 --- a/net-im/telepathy-qt/Makefile +++ b/net-im/telepathy-qt/Makefile @@ -13,20 +13,14 @@ MASTER_SITE_SUBDIR= tapioca-voip 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 @@ post-patch: "s,$${LIB_INSTALL_DIR}/pkgconfig,data/pkgconfig,g"\ ${WRKSRC}/../CMakeLists.txt -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} .. - .include <bsd.port.mk> diff --git a/net-mgmt/macroscope/Makefile b/net-mgmt/macroscope/Makefile index 24db587a496d..67f06536684b 100644 --- a/net-mgmt/macroscope/Makefile +++ b/net-mgmt/macroscope/Makefile @@ -14,7 +14,6 @@ MASTER_SITES= ftp://ftp.berlios.de/pub/macroscope/ \ 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 @@ LIB_DEPENDS= lzo2:${PORTSDIR}/archivers/lzo2 \ 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,8 @@ USE_FIREBIRD= yes BROKEN= Does not compile .endif -do-configure: - @(cd ${WRKSRC}; \ - ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} .) +post-patch: + @${REINPLACE_CMD} -e 's|".*\.c\.in"|"${FILESDIR}/CheckTypeSize.c.in"|' \ + ${WRKSRC}/builds/cmake/CheckTypeSize.cmake .include <bsd.port.post.mk> diff --git a/net-mgmt/macroscope/files/CheckTypeSize.c.in b/net-mgmt/macroscope/files/CheckTypeSize.c.in new file mode 100644 index 000000000000..8c9a0163e524 --- /dev/null +++ b/net-mgmt/macroscope/files/CheckTypeSize.c.in @@ -0,0 +1,34 @@ +#cmakedefine CHECK_TYPE_SIZE_TYPE @CHECK_TYPE_SIZE_TYPE@ +#ifdef CHECK_TYPE_SIZE_TYPE + +@CHECK_TYPE_SIZE_PREINCLUDE@ +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif /* HAVE_SYS_TYPES_H */ + +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif /* HAVE_STDINT_H */ + +#ifdef HAVE_STDDEF_H +# include <stddef.h> +#endif /* HAVE_STDDEF_H */ + +@CHECK_TYPE_SIZE_PREMAIN@ + +#ifdef __CLASSIC_C__ +int main(){ + int ac; + char*av[]; +#else +int main(int ac, char*av[]){ +#endif + if(ac > 1000){return *av[0];} + return sizeof(CHECK_TYPE_SIZE_TYPE); +} + +#else /* CHECK_TYPE_SIZE_TYPE */ + +# error "CHECK_TYPE_SIZE_TYPE has to specify the type" + +#endif /* CHECK_TYPE_SIZE_TYPE */ diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile index b863dcbd14ab..43f272422ee3 100644 --- a/science/InsightToolkit/Makefile +++ b/science/InsightToolkit/Makefile @@ -7,6 +7,7 @@ PORTNAME= InsightToolkit PORTVERSION= 2.8.1 +PORTREVISION= 1 CATEGORIES= science biology MASTER_SITES= SF MASTER_SITE_SUBDIR= itk @@ -14,18 +15,14 @@ MASTER_SITE_SUBDIR= itk MAINTAINER= bacon@smithers.neuro.mcw.edu COMMENT= Insight Toolkit -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - OPTIONS= EXAMPLES "Build examples (very time consuming)" off \ TESTING "Build testing programs (very time consuming)" off USE_LDCONFIG= ${PREFIX}/lib/InsightToolkit NO_PACKAGE= License does not allow redistribution of binaries -BUILD_WRKSRC= ${WRKSRC}/Build -INSTALL_WRKSRC= ${BUILD_WRKSRC} -CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DBUILD_SHARED_LIBS:BOOL=ON +USE_CMAKE= yes +CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON SUB_FILES= pkg-message @@ -39,10 +36,6 @@ CMAKE_ARGS+= "-DBUILD_EXAMPLES:BOOL=OFF" CMAKE_ARGS+= "-DBUILD_TESTING:BOOL=OFF" .endif -pre-build: - @${MKDIR} ${BUILD_WRKSRC} - @cd ${BUILD_WRKSRC} && cmake ${CMAKE_ARGS} .. - post-install: @for lib in ${PREFIX}/lib/InsightToolkit/*.so ; do \ ${LN} -s $$lib.2.8.0 $$lib.2 ; \ diff --git a/science/InsightToolkit/pkg-plist b/science/InsightToolkit/pkg-plist index d26f24fb9fd2..dada69482fe4 100644 --- a/science/InsightToolkit/pkg-plist +++ b/science/InsightToolkit/pkg-plist @@ -2521,6 +2521,7 @@ include/InsightToolkit/Utilities/vxl/vcl/vcl_utility.txx include/InsightToolkit/Utilities/vxl/vcl/vcl_valarray.h include/InsightToolkit/Utilities/vxl/vcl/vcl_vector.h include/InsightToolkit/Utilities/vxl/vcl/vcl_vector.txx +include/InsightToolkit/Utilities/vxl/vcl/vcl_where_root_dir.h include/InsightToolkit/Utilities/vxl/vcl/win32-vc60/vcl_cmath.h include/InsightToolkit/Utilities/vxl/vcl/win32-vc60/vcl_complex.h include/InsightToolkit/Utilities/vxl/vcl/win32-vc60/vcl_cstdarg.h diff --git a/science/paraview/Makefile b/science/paraview/Makefile index e91faf12a1e9..7ea45ef9043d 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -14,7 +14,6 @@ MASTER_SITES= http://www.paraview.org/files/v2.4/ 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,22 @@ LIB_DEPENDS= hdf5.0:${PORTSDIR}/science/hdf5 \ USE_GL= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_CMAKE= yes +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 +47,9 @@ MAKE_ENV= CC="${CC}" \ 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 +58,6 @@ post-patch: @${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' \ diff --git a/security/ike/Makefile b/security/ike/Makefile index bb5eb677801c..fec55e94727b 100644 --- a/security/ike/Makefile +++ b/security/ike/Makefile @@ -15,12 +15,11 @@ EXTRACT_SUFX= .tbz2 MAINTAINER= mgrooms@shrew.net COMMENT= Shrew Soft IKE daemon and client tools -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - ONLY_FOR_ARCHS= i386 amd64 USE_BISON= build USE_OPENSSL= yes +USE_CMAKE= yes USE_BZIP2= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -34,8 +33,6 @@ MAN1= ikea.1 ikec.1 MAN5= iked.conf.5 MAN8= iked.8 -CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX=${PREFIX} - .include <bsd.port.pre.mk> .ifdef(WITH_DEBUG) @@ -78,9 +75,6 @@ post-patch: @sleep 3 .endif -do-configure: - @cd ${BUILD_WRKSRC}; cmake ${CMAKE_ARGS} . - post-build: # QT 3.3 UIC (User Interface Compiler) creates these, so remove them. # Otherwise x11-toolkits/qt33 would have to be patched, as Gentoo did. diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index 053364d09ec6..5e083ad12751 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -14,8 +14,8 @@ MASTER_SITES= http://cdrkit.org/releases/ \ 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 @@ BROKEN= does not compile .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 <bsd.port.post.mk> diff --git a/sysutils/kgtk/Makefile b/sysutils/kgtk/Makefile index d6901ec88ffe..d02f4d7ce783 100644 --- a/sysutils/kgtk/Makefile +++ b/sysutils/kgtk/Makefile @@ -16,8 +16,6 @@ DISTNAME= KGtk-${PORTVERSION} MAINTAINER= citycat4@ngs.ru COMMENT= Daemon to use KDE dialogs in GTK applications -BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake - SUB_FILES= pkg-message OPTIONS= UNICODE "System locale is utf-8" off @@ -26,11 +24,10 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 USE_KDEBASE_VER=3 +USE_CMAKE= yes -CMAKE_PREFIX= ${LOCALBASE} -CMAKE_BUILD_DIR=build3 -BUILD_WRKSRC= ${WRKSRC}/${CMAKE_BUILD_DIR} -INSTALL_WRKSRC= ${WRKSRC}/${CMAKE_BUILD_DIR} +WRKSRC= ${WRKDIR}/${DISTNAME}/build +CMAKE_SOURCE_PATH= .. USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} @@ -48,25 +45,22 @@ EXTRA_PATCHES+= ${PATCHDIR}/opt-patch-kgtk-wrapper \ ${PATCHDIR}/opt-patch-gtk2__kgtk2-wrapper.cmake .endif +post-extract: + ${MKDIR} ${WRKSRC} + post-patch: - @${REINPLACE_CMD} -e 's| -ldl||' ${WRKSRC}/gtk2/CMakeLists.txt \ - ${WRKSRC}/qt3/CMakeLists.txt ${WRKSRC}/qt4/CMakeLists.txt - @${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/qt3/kqt3-wrapper.cmake \ - ${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} + @${REINPLACE_CMD} -e 's| -ldl||' ${WRKSRC}/../gtk2/CMakeLists.txt \ + ${WRKSRC}/../qt3/CMakeLists.txt ${WRKSRC}/../qt4/CMakeLists.txt + @${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/../qt3/kqt3-wrapper.cmake \ + ${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/ -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-configure: + @${REINPLACE_CMD} -e '/pofiles/ s|\.\./||' \ + ${WRKSRC}/kdialogd3/po/CMakeFiles/pofiles.dir/build.make post-install: @${CAT} ${PKGMESSAGE} + .include <bsd.port.post.mk> diff --git a/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake b/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake index 62686c0193d9..bc5fdb8e490e 100644 --- a/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake +++ b/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake @@ -1,5 +1,5 @@ ---- ./gtk2/kgtk2-wrapper.cmake.orig 2007-10-31 22:33:19.000000000 +0200 -+++ ./gtk2/kgtk2-wrapper.cmake 2008-05-04 22:49:28.000000000 +0300 +--- ../gtk2/kgtk2-wrapper.cmake.orig 2007-10-31 22:33:19.000000000 +0200 ++++ ../gtk2/kgtk2-wrapper.cmake 2008-05-04 22:49:28.000000000 +0300 @@ -11,6 +11,7 @@ # Released under the GPL v2 or later # -- diff --git a/sysutils/kgtk/files/opt-patch-kgtk-wrapper b/sysutils/kgtk/files/opt-patch-kgtk-wrapper index 03c668891502..5aab26e09c4e 100644 --- a/sysutils/kgtk/files/opt-patch-kgtk-wrapper +++ b/sysutils/kgtk/files/opt-patch-kgtk-wrapper @@ -1,5 +1,5 @@ ---- ./kgtk-wrapper.orig 2007-10-31 22:33:19.000000000 +0200 -+++ ./kgtk-wrapper 2008-05-04 22:49:28.000000000 +0300 +--- ../kgtk-wrapper.orig 2007-10-31 22:33:19.000000000 +0200 ++++ ../kgtk-wrapper 2008-05-04 22:49:28.000000000 +0300 @@ -14,6 +14,7 @@ # This script attempts to determine which KGtk library (if any) should # be used when launching the app diff --git a/textproc/ctpp/Makefile b/textproc/ctpp/Makefile index f8a9bec46ec0..90a618801e95 100644 --- a/textproc/ctpp/Makefile +++ b/textproc/ctpp/Makefile @@ -15,13 +15,9 @@ MASTER_SITE_SUBDIR= miwi 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 diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile index 554957c2e6ee..3e171cd22144 100644 --- a/textproc/ctpp2/Makefile +++ b/textproc/ctpp2/Makefile @@ -13,11 +13,7 @@ MASTER_SITES= http://ctpp.havoc.ru/download/ 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 <bsd.port.mk> diff --git a/textproc/lemmatizer2/Makefile b/textproc/lemmatizer2/Makefile index 930da8175981..797ce87587d6 100644 --- a/textproc/lemmatizer2/Makefile +++ b/textproc/lemmatizer2/Makefile @@ -18,9 +18,10 @@ DISTFILES= lemmatizer2-2.0.1.tar.gz \ 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 @@ pre-fetch: @${ECHO} " (default is /var/db/lemmatizer)" @${ECHO} "" -do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/cmake ${WRKSRC} - post-extract: @cd ${WRKDIR} && ${CP} -r Dicts ${WRKSRC} diff --git a/www/khtml2png/Makefile b/www/khtml2png/Makefile index bb24611e2655..d53e049d3a83 100644 --- a/www/khtml2png/Makefile +++ b/www/khtml2png/Makefile @@ -14,17 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 @@ post-patch: @${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 <bsd.port.post.mk> diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile index 343b403f8197..a80428ec15f2 100644 --- a/x11-fonts/fontmatrix/Makefile +++ b/x11-fonts/fontmatrix/Makefile @@ -14,21 +14,14 @@ MASTER_SITES= http://www.fontmatrix.net/archives/ 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 @@ pre-configure: ${LOCALBASE}/bin/lupdate-qt4 -noobsolete ../ -ts *.ts && \ ${LOCALBASE}/bin/lrelease-qt4 *.ts -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} - .include <bsd.port.post.mk> diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile index 87ab9c21a049..ca7bdb4de180 100644 --- a/x11-themes/gtk-qt-engine/Makefile +++ b/x11-themes/gtk-qt-engine/Makefile @@ -15,8 +15,6 @@ MASTER_SITES= http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \ 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_GNOME= gtk20 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 <bsd.port.pre.mk> @@ -40,7 +34,4 @@ CMAKE_ARGS= -DCMAKE_C_COMPILER:STRING="${CC}"\ USE_GNOME+= libbonoboui .endif -do-configure: - cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} . - .include <bsd.port.post.mk> diff --git a/x11-themes/gtk-qt-engine/files/patch-CMakeLists.txt b/x11-themes/gtk-qt-engine/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b744c10ad78a --- /dev/null +++ b/x11-themes/gtk-qt-engine/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orgi 2008-05-21 13:40:34.000000000 +0200 ++++ CMakeLists.txt 2008-05-21 13:41:09.000000000 +0200 +@@ -1,6 +1,8 @@ + PROJECT (gtk-qt-engine) + INCLUDE (UsePkgConfig) + ++cmake_minimum_required(VERSION 2.4.8) ++ + # Find KDE + FIND_PACKAGE(KDE3 REQUIRED) + diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile index 87ab9c21a049..ca7bdb4de180 100644 --- a/x11-themes/gtk-qt4-engine/Makefile +++ b/x11-themes/gtk-qt4-engine/Makefile @@ -15,8 +15,6 @@ MASTER_SITES= http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \ 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_GNOME= gtk20 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 <bsd.port.pre.mk> @@ -40,7 +34,4 @@ CMAKE_ARGS= -DCMAKE_C_COMPILER:STRING="${CC}"\ USE_GNOME+= libbonoboui .endif -do-configure: - cd ${WRKSRC} && ${CMAKE} ${CMAKE_ARGS} . - .include <bsd.port.post.mk> diff --git a/x11-themes/gtk-qt4-engine/files/patch-CMakeLists.txt b/x11-themes/gtk-qt4-engine/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b744c10ad78a --- /dev/null +++ b/x11-themes/gtk-qt4-engine/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orgi 2008-05-21 13:40:34.000000000 +0200 ++++ CMakeLists.txt 2008-05-21 13:41:09.000000000 +0200 +@@ -1,6 +1,8 @@ + PROJECT (gtk-qt-engine) + INCLUDE (UsePkgConfig) + ++cmake_minimum_required(VERSION 2.4.8) ++ + # Find KDE + FIND_PACKAGE(KDE3 REQUIRED) + |