Index: head/Mk/Uses/pathfix.mk =================================================================== --- head/Mk/Uses/pathfix.mk (revision 405448) +++ head/Mk/Uses/pathfix.mk (revision 405449) @@ -1,35 +1,48 @@ # $FreeBSD$ # # Lookup common paths in Makefile.in, configure and similar files, and replace # their values to respect FreeBSD hier(7) for file installation. # # Feature: pathfix # Usage: USES=pathfix # Valid ARGS: does not require args # # MAINTAINER: portmgr@FreeBSD.org .if !defined(_INCLUDE_USES_PATHFIX_MK) _INCLUDE_USES_PATHFIX_MK= yes .if !empty(pathfix_ARGS) IGNORE= USES=pathfix does not require args .endif +PATHFIX_CMAKELISTSTXT?= CMakeLists.txt PATHFIX_MAKEFILEIN?= Makefile.in PATHFIX_WRKSRC?= ${WRKSRC} _USES_patch+= 190:pathfix pathfix: +.if ${USES:Mcmake*} + @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_CMAKELISTSTXT}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]LIB_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]LIBRARY_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]libdir[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|lib/pkgconfig|libdata/pkgconfig|g' +.else @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \ s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \ s|[{]libdir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[{]LIBDIR[}]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \ s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \ s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' +.endif .endif Index: head/cad/brlcad/Makefile =================================================================== --- head/cad/brlcad/Makefile (revision 405448) +++ head/cad/brlcad/Makefile (revision 405449) @@ -1,59 +1,57 @@ # Created by: Pedro F. Giffuni # $FreeBSD$ PORTNAME= brlcad PORTVERSION= 7.24.0 PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION} MAINTAINER= erik@brlcad.org COMMENT= CSG modelling system from the US Ballistic Research Laboratory BUILD_DEPENDS= ${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama \ xsltproc:${PORTSDIR}/textproc/libxslt LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ libdrm.so:${PORTSDIR}/graphics/libdrm \ libpng.so:${PORTSDIR}/graphics/png \ librle.so:${PORTSDIR}/graphics/urt \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig USE_GL= gl glu USE_XORG= ice inputproto sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \ xproto xrender xscrnsaver xt xxf86vm USES= tar:bzip2 bison pathfix cmake:outsource pkgconfig tk:85 USE_LDCONFIG= yes PREFIX?= ${LOCALBASE}/${PORTNAME} NO_MTREE= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} CFLAGS+= -I${LOCALBASE}/include #LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS= -DBRLCAD_ENABLE_STRICT:BOOL=OFF MANPREFIX= ${PREFIX}/share BROKEN_sparc64= does not compile: invokes i386 assembler post-patch: @${REINPLACE_CMD} "s+-exact Tcl 8\.5\.9+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl - @${REINPLACE_CMD} -e 's|{LIB_DIR}|{prefix}/libdata|' \ - ${WRKSRC}/misc/pkgconfig/CMakeLists.txt pre-install: ${CP} ${FILESDIR}/mged.sh ${WRKSRC} ${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}+g;' ${WRKSRC}/mged.sh # note that installing outside of PREFIX wigs out package stuff... :/ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${STAGEDIR}${PREFIX}/bin/mged.sh ${MKDIR} ${STAGEDIR}${LOCALBASE}/bin ${LN} -s ${PREFIX}/bin/mged.sh ${STAGEDIR}${LOCALBASE}/bin/mged.sh regression-test: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test) .include Index: head/chinese/fcitx/Makefile =================================================================== --- head/chinese/fcitx/Makefile (revision 405448) +++ head/chinese/fcitx/Makefile (revision 405449) @@ -1,118 +1,118 @@ # Created by: Shen Chuan-Hsing # $FreeBSD$ PORTNAME= fcitx PORTVERSION= 4.2.8.6 PORTREVISION= 1 CATEGORIES= chinese x11 MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \ http://download.fcitx-im.org/data/:data DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:fcitx \ en_dict-${_DICT_VER}.tar.gz:data \ pinyin.tar.gz:data \ py_stroke-${_PYSTROKE_VER}.tar.gz:data \ py_table-${_PYTABLE_VER}.tar.gz:data \ table.tar.gz:data DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= lichray@gmail.com COMMENT= Flexible Input Method Framework LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libicuuc.so:${PORTSDIR}/devel/icu RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils SUB_FILES= pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} CONFLICTS= zh-scim-fcitx-3.* USE_GNOME= pango intltool libxml2 introspection USE_XORG= x11 xext xkbfile USE_LDCONFIG= yes USES= tar:xz cmake desktop-file-utils execinfo gettext iconv:wchar_t \ - pathfix pkgconfig shared-mime-info + pkgconfig shared-mime-info INSTALLS_ICONS= yes OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC DOCS OPTIONS_DEFAULT=GTK2 QT4 GTK2_DESC= Enable Gtk2 IM module GTK3_DESC= Enable Gtk3 IM module QT4_DESC= Enable Qt4 IM module OPENCC_DESC= Enable OpenCC for Chinese Transform TPUNC_DESC= Use traditional quotation marks .include CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \ -DLIBICONV_LIBC_HAS_ICONV_OPEN=OFF \ -DDATADIR=${DATADIR} \ -DDOCSDIR=${DOCSDIR} \ -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \ -DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \ -DMANPREFIX=${MANPREFIX} \ -DPREFIX=${PREFIX} \ -DQT_PLUGINS_DIR=${PREFIX}/lib/qt4/plugins .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 PLIST_SUB+= GTK2="" SUB_LIST+= GTK2_IM=fcitx .else CMAKE_ARGS+= -DENABLE_GTK2_IM_MODULE=OFF PLIST_SUB+= GTK2="@comment " SUB_LIST+= GTK2_IM=xim .endif .if ${PORT_OPTIONS:MGTK3} USE_GNOME+= gtk30 CMAKE_ARGS+= -DENABLE_GTK3_IM_MODULE=ON PLIST_SUB+= GTK3="" SUB_LIST+= GTK3_IM=fcitx .else PLIST_SUB+= GTK3="@comment " SUB_LIST+= GTK3_IM=xim .endif .if ${PORT_OPTIONS:MQT4} USE_QT4+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods USE_LDCONFIG+= ${PREFIX}/lib/fcitx/qt PLIST_SUB+= QT4="" .else CMAKE_ARGS+= -DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF PLIST_SUB+= QT4="@comment " .endif .if ${PORT_OPTIONS:MOPENCC} LIB_DEPENDS+= libopencc.so:${PORTSDIR}/chinese/opencc .else CMAKE_ARGS+= -DENABLE_OPENCC=OFF .endif .if ${PORT_OPTIONS:MTPUNC} EXTRA_PATCHES+= ${FILESDIR}/tpunc-data_punc.mb.zh_CN .endif .if defined(WITH_DEBUG) CMAKE_ARGS+= -DENABLE_DEBUG=ON .endif DOCS_EXTRA_PATCHES_OFF= ${FILESDIR}/nodocs-doc_CMakeLists.txt _DICT_VER= 20121020 _PYSTROKE_VER= 20121124 _PYTABLE_VER= 20121124 post-patch: @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict/. @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data/. @${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. @${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/. .include Index: head/chinese/libchewing/files/patch-CMakeLists.txt =================================================================== --- head/chinese/libchewing/files/patch-CMakeLists.txt (revision 405448) +++ head/chinese/libchewing/files/patch-CMakeLists.txt (revision 405449) @@ -1,33 +1,24 @@ ---- CMakeLists.txt.orig 2014-04-11 09:25:28.000000000 +0800 -+++ CMakeLists.txt 2015-02-15 11:25:11.959775965 +0800 -@@ -103,8 +103,9 @@ set(TEST_BIN_DIR ${PROJECT_BINARY_DIR}/t - +--- CMakeLists.txt.orig 2014-04-11 01:25:28 UTC ++++ CMakeLists.txt +@@ -104,7 +104,7 @@ set(TEST_BIN_DIR ${PROJECT_BINARY_DIR}/t set(INSTALL_INC_DIR ${CMAKE_INSTALL_PREFIX}/include/chewing) set(INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib) -+set(INSTALL_LIBDATA_DIR ${CMAKE_INSTALL_PREFIX}/libdata) set(INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/libchewing) -set(INSTALL_INFO_DIR ${CMAKE_INSTALL_PREFIX}/share/info) +set(INSTALL_INFO_DIR ${CMAKE_INSTALL_PREFIX}/info) set(INFO_SRC ${PROJECT_SOURCE_DIR}/doc/libchewing.texi) set(INFO_BIN ${PROJECT_BINARY_DIR}/doc/libchewing.info) -@@ -166,11 +167,7 @@ if (MAKEINFO) +@@ -166,11 +166,7 @@ if (MAKEINFO) add_custom_target(INFO ALL DEPENDS ${INFO_BIN}) add_dependencies(check INFO) - find_program(INSTALL_INFO NAMES ginstall-info install-info) - if (INSTALL_INFO) - install(FILES ${INFO_BIN} DESTINATION ${INSTALL_INFO_DIR}) - install(CODE "execute_process(COMMAND ${INSTALL_INFO} --info-dir=${INSTALL_INFO_DIR} ${INFO_BIN})") - endif() + install(FILES ${INFO_BIN} DESTINATION ${INSTALL_INFO_DIR}) endif() -@@ -428,5 +425,5 @@ install(FILES ${ALL_DATA} DESTINATION ${ - install(FILES ${ALL_STATIC_DATA} DESTINATION ${INSTALL_DATA_DIR}) - install(FILES ${ALL_INC} DESTINATION ${INSTALL_INC_DIR}) - install(FILES ${PROJECT_BINARY_DIR}/chewing.pc -- DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) -+ DESTINATION ${INSTALL_LIBDATA_DIR}/pkgconfig) - install(TARGETS ${LIBS} DESTINATION ${INSTALL_LIB_DIR}) Index: head/comms/openobex/Makefile =================================================================== --- head/comms/openobex/Makefile (revision 405448) +++ head/comms/openobex/Makefile (revision 405449) @@ -1,28 +1,28 @@ # $FreeBSD$ PORTNAME= openobex PORTVERSION= 1.7.1 PORTREVISION= 2 CATEGORIES= comms net MASTER_SITES= http://www.hendrik-sattler.de/downloads/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source MAINTAINER= madpilot@FreeBSD.org COMMENT= Open source implementation of the OBEX protocol USE_LDCONFIG= yes -USES= pathfix cmake dos2unix +USES= cmake dos2unix DOS2UNIX_FILES= CMakeLists.txt CMAKE_ARGS+= -DPKGCONFIG_INSTALL_DIR:STRING="${PREFIX}/libdata/pkgconfig" OPTIONS_DEFINE= DOXYGEN .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= DOXYGEN .endif OPTIONS_SUB=yes DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen DOXYGEN_CMAKE_OFF= -DBUILD_DOCUMENTATION=OFF .include Index: head/deskutils/cairo-dock/Makefile =================================================================== --- head/deskutils/cairo-dock/Makefile (revision 405448) +++ head/deskutils/cairo-dock/Makefile (revision 405449) @@ -1,46 +1,46 @@ # $FreeBSD$ PORTNAME= cairo-dock PORTVERSION= 3.4.1 CATEGORIES= deskutils MAINTAINER= fidaj@ukr.net COMMENT= Cairo-Dock is a light and eye-candy dock LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libcurl.so:${PORTSDIR}/ftp/curl \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ sox:${PORTSDIR}/audio/sox USE_GITHUB= yes GH_ACCOUNT= Cairo-Dock GH_PROJECT= ${PORTNAME}-core GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 librsvg2 libxml2 USE_LDCONFIG= yes USE_XORG= xrender xtst -USES= cmake gettext pathfix pkgconfig +USES= cmake gettext pkgconfig LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" CMAKE_ARGS+= -DROOT_PREFIX:PATH=${STAGEDIR} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=man post-patch: @${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \ s|/usr/bin/cairo-dock|${LOCALBASE}/bin/cairo-dock|g; \ s|/bin/bash|${LOCALBASE}/bin/bash|g; \ s|/usr/share/applications|${LOCALBASE}/share/applications|g; \ s|/usr/share/icons|${LOCALBASE}/share/icons|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g;' post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so .include Index: head/devel/libftdi1/Makefile =================================================================== --- head/devel/libftdi1/Makefile (revision 405448) +++ head/devel/libftdi1/Makefile (revision 405449) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= libftdi1 PORTVERSION= 1.1 CATEGORIES= devel MASTER_SITES= http://www.intra2net.com/en/developer/libftdi/download/ MAINTAINER= uffe@uffe.org COMMENT= Library (using libusb) to talk to FTDI chips LICENSE= GPLv2 LIB_DEPENDS= libconfuse.so:${PORTSDIR}/devel/libconfuse OPTIONS_DEFINE= PYTHON BOOST DOCS EXAMPLES OPTIONS_DEFAULT= PYTHON BOOST DOCS EXAMPLES OPTIONS_SUB= yes BOOST_DESC= Build with boost PYTHON_DESC= Build Python bindings -USES= pathfix pkgconfig cmake tar:bzip2 +USES= cmake pkgconfig tar:bzip2 USE_LDCONFIG= yes PORTDOCS= COPYING.LIB ChangeLog README .include .if ${PORT_OPTIONS:MDOCS} CMAKE_ARGS+= -DDOCUMENTATION:BOOL=true .else CMAKE_ARGS+= -DDOCUMENTATION:BOOL=false .endif .if ${PORT_OPTIONS:MEXAMPLES} CMAKE_ARGS+= -DEXAMPLES:BOOL=true .else CMAKE_ARGS+= -DEXAMPLES:BOOL=false .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python:2 CMAKE_ARGS+= -DPYTHON_BINDINGS:BOOL=true BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 .else CMAKE_ARGS+= -DPYTHON_BINDINGS:BOOL=false .endif .if ${PORT_OPTIONS:MBOOST} CMAKE_ARGS+= -DFTDIPP:BOOL=true LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs .else CMAKE_ARGS+= -DFTDIPP:BOOL=false .endif post-install: .if ${PORT_OPTIONS:MEXAMPLES} .for fname in baud_test bitbang bitbang2 bitbang_cbus bitbang_ft2232 eeprom find_all serial_test simple stream_test ${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${PREFIX}/bin/ftdi1_${fname}_example .endfor .if ${PORT_OPTIONS:MBOOST} .for fname in find_all_pp ${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${PREFIX}/bin/ftdi1_${fname}_example .endfor .endif .endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif .include Index: head/devel/libical/files/patch-CMakeLists.txt =================================================================== --- head/devel/libical/files/patch-CMakeLists.txt (revision 405448) +++ head/devel/libical/files/patch-CMakeLists.txt (nonexistent) @@ -1,8 +0,0 @@ ---- CMakeLists.txt.orig 2013-05-04 23:25:27.000000000 +0200 -+++ CMakeLists.txt 2013-12-01 00:16:33.000000000 +0100 -@@ -201,4 +201,4 @@ - set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libical.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libical.pc @ONLY) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libical.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libical.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) Property changes on: head/devel/libical/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: mcom:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libical/Makefile =================================================================== --- head/devel/libical/Makefile (revision 405448) +++ head/devel/libical/Makefile (revision 405449) @@ -1,29 +1,29 @@ # Created by: Joe Kelsey # $FreeBSD$ PORTNAME= libical PORTVERSION= 1.0.1 CATEGORIES= devel MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the IETF Calendaring and Scheduling protocols LICENSE_COMB= dual LICENSE= MPL LGPL21 USE_GITHUB= yes GH_TAGNAME= da69aae -USES= cmake gmake pathfix perl5 +USES= cmake pathfix perl5 USE_PERL5= build USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes .include .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif .include Index: head/devel/ucommon/files/patch-CMakeLists.txt =================================================================== --- head/devel/ucommon/files/patch-CMakeLists.txt (revision 405448) +++ head/devel/ucommon/files/patch-CMakeLists.txt (revision 405449) @@ -1,82 +1,68 @@ --- CMakeLists.txt.orig 2014-05-05 09:49:48.000000000 +0200 +++ CMakeLists.txt 2014-05-05 09:58:30.000000000 +0200 @@ -53,6 +55,7 @@ set(MODULE_FLAGS "-module -shared -avoid-version") set(SYSCONFDIR "/etc" CACHE PATH "config directory") set(STATEDIR "/var" CACHE PATH "state directory") + set(INSTALL_MANDIR man) endif() if(NOT INSTALL_SBINDIR) @@ -227,13 +230,15 @@ if(UNIX OR MSYS OR MINGW OR CYGWIN) - check_library_exists(dl dlopen "" HAVE_DL_LIB) - if (HAVE_DL_LIB) - set (UCOMMON_LIBS ${UCOMMON_LIBS} dl) - else() - check_library_exists(compat dlopen "" HAVE_COMPAT_LIB) - if(HAVE_COMPAT_LIB) - set (UCOMMON_LIBS ${UCOMMON_LIBS} compat) + if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + check_library_exists(dl dlopen "" HAVE_DL_LIB) + if (HAVE_DL_LIB) + set (UCOMMON_LIBS ${UCOMMON_LIBS} dl) + else() + check_library_exists(compat dlopen "" HAVE_COMPAT_LIB) + if(HAVE_COMPAT_LIB) + set (UCOMMON_LIBS ${UCOMMON_LIBS} compat) + endif() endif() endif() @@ -330,7 +335,11 @@ check_include_files(sys/event.h HAVE_SYS_EVENT_H) check_include_files(syslog.h HAVE_SYSLOG_H) check_include_files(openssl/ssl.h HAVE_OPENSSL) -check_include_files(openssl/fips.h HAVE_OPENSSL_FIPS_H) +if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + set(HAVE_OPENSSL_FIPS_H "") +else() + check_include_files(openssl/fips.h HAVE_OPENSSL_FIPS_H) +endif() check_include_files(libintl.h HAVE_LIBINTL_H) check_include_files(netinet/in.h HAVE_NETINET_IN_H) check_include_files(net/if.h HAVE_NET_IF_H) @@ -434,11 +443,19 @@ endforeach() foreach(lib ${UCOMMON_LIBS}) STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) - set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") + if(${lib} STREQUAL "-pthread") + set(PACKAGE_LIBS "${PACKAGE_LIBS} ${slib}" ) + else() + set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") + endif() endforeach() foreach(lib ${SECURE_LIBS}) STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) - set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") + if(${lib} STREQUAL "-pthread") + set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} ${slib}") + else() + set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") + endif() endforeach() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config) -@@ -594,11 +611,11 @@ - endif() - - if(NOT WIN32) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION libdata/pkgconfig) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ucommon-config DESTINATION ${INSTALL_BINDIR}) - if(BUILD_STDLIB) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp-config DESTINATION ${INSTALL_BINDIR}) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION libdata/pkgconfig) - endif() - endif(NOT WIN32) - Index: head/graphics/cegui/Makefile =================================================================== --- head/graphics/cegui/Makefile (revision 405448) +++ head/graphics/cegui/Makefile (revision 405449) @@ -1,127 +1,127 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= cegui PORTVERSION= 0.8.4 PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8 MAINTAINER= oliver@FreeBSD.org COMMENT= Library providing windowing and widgets for graphics APIs LICENSE= MIT WRKSRC= ${WRKDIR}/${DISTNAME:S/2b/2/} CONFIGURE_ENV+= TOLUA_INC="${LUA_INCDIR}" CMAKE_ARGS= -DCEGUI_SAMPLES_ENABLED:BOOL=OFF \ -DCEGUI_BUILD_TESTS=OFF USE_LDCONFIG= yes -USES= compiler:c++11-lib cmake execinfo pathfix pkgconfig tar:bzip2 +USES= compiler:c++11-lib cmake execinfo pkgconfig tar:bzip2 PORTDOCS= * OPTIONS_DEFINE= FREETYPE PCRE LUA FRIBIDI DOCS OPTIONS_GROUP= XMLPARSER IMAGECODEC RENDERER OPTIONS_GROUP_XMLPARSER= EXPAT XERCES LIBXML2 RAPIDXML TINYXML OPTIONS_GROUP_IMAGECODEC= DEVIL FREEIMAGE OPTIONS_GROUP_RENDERER= OPENGL OPENGL3 OGRE IRRLICHT OPTIONS_DEFAULT= FREETYPE PCRE LUA FRIBIDI PYTHON OPTIONS_DEFAULT+= EXPAT LIBXML2 TINYXML OPTIONS_DEFAULT+= DEVIL FREEIMAGE OPTIONS_DEFAULT+= OPENGL OPENGL3 OGRE OPTIONS_SUB= yes FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CMAKE_ON= -DCEGUI_HAS_FREETYPE=ON FREETYPE_CMAKE_OFF= -DCEGUI_HAS_FREETYPE=OFF PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CMAKE_ON= -DCEGUI_HAS_PCRE_REGEX=ON PCRE_CMAKE_OFF= -DCEGUI_HAS_PCRE_REGEX=OFF LUA_USES= lua:51 LUA_LIB_DEPENDS= libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++ LUA_CMAKE_ON= -DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON LUA_CMAKE_OFF= -DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below) PYTHON_USES= python PYTHON_LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs PYTHON_CMAKE_ON= -DCEGUI_BUILD_PYTHON_MODULES=ON PYTHON_CMAKE_OFF= -DCEGUI_BUILD_PYTHON_MODULES=OFF FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CMAKE_ON= -DCEGUI_USE_FRIBIDI=ON FRIBIDI_CMAKE_OFF= -DCEGUI_USE_FRIBIDI=OFF EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 EXPAT_CMAKE_ON= -DCEGUI_BUILD_XMLPARSER_EXPAT=ON EXPAT_CMAKE_OFF= -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF XERCES_LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 XERCES_CMAKE_ON= -DCEGUI_BUILD_XMLPARSER_XERCES=ON XERCES_CMAKE_OFF= -DCEGUI_BUILD_XMLPARSER_XERCES=OFF LIBXML2_USE= GNOME=libxml2 LIBXML2_CMAKE_ON= -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON LIBXML2_CMAKE_OFF= -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF RAPIDXML_BUILD_DEPENDS= ${LOCALBASE}/include/rapidxml.hpp:${PORTSDIR}/textproc/rapidxml RAPIDXML_DESC= XML parser support via RapidXML RAPIDXML_CMAKE_ON= -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON RAPIDXML_CMAKE_OFF= -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF TINYXML_LIB_DEPENDS= libtinyxml.so:${PORTSDIR}/textproc/tinyxml TINYXML_CMAKE_ON= -DCEGUI_BUILD_XMLPARSER_TINYXML=ON TINYXML_CMAKE_OFF= -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF DEVIL_DESC= DevIL based ImageCodec module DEVIL_LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil DEVIL_CMAKE_ON= -DCEGUI_BUILD_IMAGECODEC_DEVIL=ON DEVIL_CMAKE_OFF= -DCEGUI_BUILD_IMAGECODEC_DEVIL=OFF FREEIMAGE_DESC= FreeImage based ImageCodec module FREEIMAGE_LIB_DEPENDS= libfreeimage.so:${PORTSDIR}/graphics/freeimage FREEIMAGE_CMAKE_ON= -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON FREEIMAGE_CMAKE_OFF= -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF OGRE_DESC= Ogre3D support OGRE_LIB_DEPENDS= libOgreMain.so:${PORTSDIR}/graphics/ogre3d OGRE_CMAKE_ON= -DCEGUI_BUILD_RENDERER_OGRE=ON OGRE_CMAKE_OFF= -DCEGUI_BUILD_RENDERER_OGRE=OFF IRRLICHT_DESC= Irrlicht support IRRLICHT_LIB_DEPENDS= libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht IRRLICHT_CMAKE_ON= -DCEGUI_BUILD_RENDERER_IRRLICHT=ON IRRLICHT_CMAKE_OFF= -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF OPENGL_BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm OPENGL_USE= GL=gl,glew OPENGL_CMAKE_ON= -DCEGUI_BUILD_RENDERER_OPENGL=ON OPENGL_CMAKE_OFF= -DCEGUI_BUILD_RENDERER_OPENGL=OFF OPENGL3_DESC= OpenGL 3+ support (core profile) OPENGL3_BUILD_DEPENDS= ${OPENGL_BUILD_DEPENDS} OPENGL3_USE= ${OPENGL_USE} OPENGL3_CMAKE_ON= -DCEGUI_BUILD_RENDERER_OPENGL3=ON OPENGL3_CMAKE_OFF= -DCEGUI_BUILD_RENDERER_OPENGL3=OFF # not present in ports/unsupported, but may appear later CMAKE_ARGS+= -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \ -DCEGUI_BUILD_IMAGECODEC_CORONA=OFF \ -DCEGUI_BUILD_IMAGECODEC_SILLY=OFF \ -DCEGUI_BUILD_IMAGECODEC_PVR=OFF \ -DCEGUI_BUILD_RENDERER_OPENGLES=OFF \ -DCEGUI_BUILD_RENDERER_DIRECTFB=OFF CMAKE_ARGS+= -DCEGUI_BUILD_PYTHON_MODULES=OFF # python support doesn't build .include .if ${PORT_OPTIONS:MEXPAT} || ${PORT_OPTIONS:MXERCES} || ${PORT_OPTIONS:MLIBXML2} || ${PORT_OPTIONS:MRAPIDXML} || ${PORT_OPTIONS:MTINYXML} PLIST_SUB+= XMLPARSERS="" .else PLIST_SUB+= XMLPARSERS="@comment " .endif .if ${PORT_OPTIONS:MOPENGL} || ${PORT_OPTIONS:MOPENGL3} PLIST_SUB+= ANYOPENGL="" .else PLIST_SUB+= ANYOPENGL="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|\$${CEGUI_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|g' \ ${WRKSRC}/CMakeLists.txt .include Index: head/mail/geary/Makefile =================================================================== --- head/mail/geary/Makefile (revision 405448) +++ head/mail/geary/Makefile (revision 405449) @@ -1,40 +1,40 @@ # Created by: Gustau Perez # $FreeBSD$ # $MCom: ports/trunk/mail/geary/Makefile 20050 2014-11-10 09:22:41Z gusi $ PORTNAME= geary PORTVERSION= 0.10.0 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Mail client for GNOME 3 BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \ libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libnotify.so:${PORTSDIR}/devel/libnotify \ libgee-0.8.so:${PORTSDIR}/devel/libgee \ libgcr-3.so:${PORTSDIR}/security/gcr USES= cmake desktop-file-utils gettext gmake \ - libtool pathfix pkgconfig shebangfix tar:xz + libtool pkgconfig shebangfix tar:xz USE_GNOME= gnomedocutils gnomeprefix gtk30 intlhack SHEBANG_FILES= desktop/geary-attach USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --prefix=${PREFIX} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.yorba.geary.gschema.xml post-patch: @${REINPLACE_CMD} -e 's|abort $$option||g' \ ${WRKSRC}/configure .include