diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index 018e73febdff..0e5f63ee4bdf 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,103 +1,103 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= ${_CMAKE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMESUFFIX= -core MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform Makefile generator WWW= https://www.cmake.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt LIB_DEPENDS= libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash USES= cmake:_internal compiler:c++11-lang cpe localbase ncurses ssl CPE_VENDOR= cmake_project HAS_CONFIGURE= yes CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" \ --system-expat \ --system-jsoncpp \ --system-zlib \ --system-zstd \ --system-bzip2 \ --system-liblzma \ --system-libarchive \ --system-librhash \ --system-libuv \ --no-system-curl \ --no-system-nghttp2 \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${WRKSRC}/InitialCache.cmake" OPTIONS_DEFINE= DOCS CPACK OPTIONS_DEFAULT= CPACK OPTIONS_SUB= yes CPACK_DESC= Enable FreeBSD generator in CPack (experimental) CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN} CXXFLAGS+= -D__BSD_VISIBLE .include .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) INSTALL_TARGET= install/strip .endif # Before running configure, substitute in the values of options # for the build. CMake's configure doesn't accept --with-foo # or similar options: it expects them to be set in CMake-style # syntax in the initial cache. pre-configure: @${CP} "${FILESDIR}/InitialCache.cmake" "${WRKSRC}/InitialCache.cmake" pre-configure-CPACK-on: @${REINPLACE_CMD} \ -e 's/@@CPACK_OPTION_VALUE@@/ON/' \ -e 's/@@CPACK_OPTION_COMMENT@@//' \ "${WRKSRC}/InitialCache.cmake" pre-configure-CPACK-off: @${REINPLACE_CMD} \ -e 's/@@CPACK_OPTION_VALUE@@/OFF/' \ -e 's/@@CPACK_OPTION_COMMENT@@/# /' \ "${WRKSRC}/InitialCache.cmake" post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ ${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \ s,/usr/X11R6,${LOCALBASE},g' @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${WRKSRC}/Source/cmLocalGenerator.cxx \ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \ ${WRKSRC}/bootstrap @${REINPLACE_CMD} -e 's,/opt/kde4,${PREFIX},g' \ ${WRKSRC}/Modules/FindKDE4.cmake @${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \ ${WRKSRC}/Modules/FindDCMTK.cmake @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Modules/FindFLEX.cmake @${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete # cmake-gui(1) is installed by devel/cmake-gui. Remove the man page's source to # prevent it from being built/installed by devel/cmake. ${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst post-install: ${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp # The .NoDartCoverage is supposed to suppress testing in the # source directories, but gets accidentally installed. @${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete .include diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 8fc18a76114a..bcce5e488d08 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,61 +1,62 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -gui-${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Qt-based GUI for CMake WWW= https://www.cmake.org LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash FLAVORS= qt5 qt6 FLAVOR?= qt5 qt5_CONFLICTS_INSTALL= cmake-gui-qt6 qt6_CONFLICTS_INSTALL= cmake-gui-qt5 USES= cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \ shared-mime-info qt:${FLAVOR:S/qt//} _USE_QT5= core gui widgets buildtools:build qmake:build _USE_QT6= base USE_QT= ${_USE_QT${FLAVOR:S/qt//}} CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ -DCMake_QT_MAJOR_VERSION=${FLAVOR:S/qt//} CMAKE_ON= BUILD_QtDialog \ CMAKE_USE_SYSTEM_LIBRARIES \ SPHINX_MAN CMAKE_OFF= BUILD_CursesDialog \ CMake_SPHINX_DEPEND_ON_EXECUTABLES ALL_TARGET= cmake-gui documentation CXXFLAGS+= -D__BSD_VISIBLE INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog DISTINFO_FILE= ${.CURDIR}/../cmake-core/distinfo post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ ${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \ s,/usr/X11R6,${LOCALBASE},g' pre-install: ${LN} -sf ${CMAKE_BIN} ${WRKSRC}/bin post-install: ${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile index 1a2d36f72ac3..e2b5e34d140c 100644 --- a/misc/mbuffer/Makefile +++ b/misc/mbuffer/Makefile @@ -1,43 +1,44 @@ PORTNAME= mbuffer PORTVERSION= 20230301 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www.maier-komor.de/software/mbuffer/ MAINTAINER= loader@FreeBSD.org COMMENT= Tool for buffering data streams WWW= https://www.maier-komor.de/mbuffer.html LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= gtar:archivers/gtar USES= localbase ssl tar:tgz autoreconf gmake GNU_CONFIGURE= yes # for --ignore-failed-read TEST_ARGS= TAR=gtar TEST_TARGET= check OPTIONS_DEFINE= GCRYPT MHASH RHASH OPTIONS_DEFAULT= MHASH GCRYPT_DESC= Use gcrypt for hash generation MHASH_DESC= Use mhash for hash generation RHASH_DESC= Use rhash for hash generation GCRYPT_RUN_DEPENDS= libgcrypt>=1.8.4_1:security/libgcrypt MHASH_RUN_DEPENDS= mhash>=0.9.9.9_5:security/mhash RHASH_RUN_DEPENDS= rhash>=1.3.5:security/rhash post-patch: ${REINPLACE_CMD} \ -e 's@bash@sh@' ${WRKSRC}/Makefile.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mbuffer ${MV} ${STAGEDIR}${PREFIX}/etc/mbuffer.rc \ ${STAGEDIR}${PREFIX}/etc/mbuffer.rc.sample .include diff --git a/misc/mbuffer/files/patch-hashing.c b/misc/mbuffer/files/patch-hashing.c new file mode 100644 index 000000000000..6b75015ccf37 --- /dev/null +++ b/misc/mbuffer/files/patch-hashing.c @@ -0,0 +1,11 @@ +--- hashing.c.orig 2023-02-27 19:18:52 UTC ++++ hashing.c +@@ -102,7 +102,7 @@ static void initHashLibs() + LibMhash = 0; + } + } +- LibRhash = dlopen("librhash.so.0",RTLD_NOW); ++ LibRhash = dlopen("librhash.so",RTLD_NOW); + if (LibRhash) { + debugmsg("found librhash\n"); + void (*rhash_library_init)() = (void (*)(void)) dlsym(LibRhash,"rhash_library_init");