Date: Thu, 16 Oct 2014 19:29:33 +0000 (UTC) From: Jase Thew <jase@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371017 - in head/irc/weechat: . files Message-ID: <201410161929.s9GJTXGj031599@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Thu Oct 16 19:29:33 2014 New Revision: 371017 URL: https://svnweb.freebsd.org/changeset/ports/371017 QAT: https://qat.redports.org/buildarchive/r371017/ Log: irc/weechat: Update to 1.0.1 - Utilise OPTIONS helpers - Quieten compiler warnings about unused arguments (caused by unconditionally passing LOCALBASE/{lib,includes} via CFLAGS) - Remove occurrences of deprecated @dirrm and @dirrmtry from plist Changes: http://www.weechat.org/files/changelog/ChangeLog-1.0.1.html Modified: head/irc/weechat/Makefile head/irc/weechat/distinfo head/irc/weechat/files/patch-cmake-FindLua_cmake head/irc/weechat/files/patch-cmake-FindPython_cmake head/irc/weechat/files/patch-cmake-FindRuby_cmake head/irc/weechat/files/patch-cmake-FindTCL_cmake head/irc/weechat/pkg-plist Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/Makefile Thu Oct 16 19:29:33 2014 (r371017) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 0.4.3 -PORTREVISION= 5 +PORTVERSION= 1.0.1 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ \ http://perturb.me.uk/distfiles/weechat/:mandocs \ @@ -16,148 +15,90 @@ COMMENT= Lightweight and user friendly n LICENSE= GPLv3 -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt - -CONFLICTS= weechat-devel-0.* +CONFLICTS= weechat-devel-[0-9]* USE_LDCONFIG= yes -USES= cmake iconv ncurses +USES= cmake iconv ncurses CMAKE_ARGS+= -DENABLE_GUILE=no -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib + +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ - GNUTLS NLS ICON MANPAGES DOCS + GNUTLS NLS ICON MANPAGES DOCS OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ - GNUTLS ICON MANPAGES + GNUTLS ICON MANPAGES + +OPTIONS_SUB= yes BACKTRACE_DESC= Provide crash backtraces CHARSET_DESC= Charset conversion support -LUA_DESC= Lua scripting support -PERL_DESC= Perl scripting support +ICON_DESC= Desktop icon +LUA_DESC= Lua scripting support +PERL_DESC= Perl scripting support PYTHON_DESC= Python scripting support -RUBY_DESC= Ruby scripting support -TCL_DESC= Tcl scripting support -ICON_DESC= Desktop icon - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCHARSET} -PLIST_SUB+= CHARSET="" -.else -CMAKE_ARGS+= -DENABLE_CHARSET=no -PLIST_SUB+= CHARSET="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DENABLE_NLS=no -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell -PLIST_SUB+= ASPELL="" -.else -CMAKE_ARGS+= -DENABLE_ASPELL=no -PLIST_SUB+= ASPELL="@comment " -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= 2 -CMAKE_ARGS+= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ - -DBSD_PYTHON_VER=${PYTHON_VERSION} -PLIST_SUB+= PYTHON="" -.else -CMAKE_ARGS+= -DENABLE_PYTHON=no -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MRUBY} -USE_RUBY= yes -CMAKE_ARGS+= -DBSD_RUBY_CMD=${RUBY} \ - -DBSD_RUBY_VER=${RUBY_NAME} -PLIST_SUB+= RUBY="" -.else -CMAKE_ARGS+= -DENABLE_RUBY=no -PLIST_SUB+= RUBY="@comment " -.endif - -.if ${PORT_OPTIONS:MGNUTLS} -USES+= pkgconfig -LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls -.else -CMAKE_ARGS+= -DENABLE_GNUTLS=no -.endif +RUBY_DESC= Ruby scripting support +TCL_DESC= Tcl scripting support -.if ${PORT_OPTIONS:MPERL} -USES+= perl5 -PLIST_SUB+= PERL="" -.else -CMAKE_ARGS+= -DENABLE_PERL=no -PLIST_SUB+= PERL="@comment " -.endif +ASPELL_CMAKE_OFF= -DENABLE_ASPELL=no +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell -.if ${PORT_OPTIONS:MTCL} -USES+= tcl:85+ -CMAKE_ARGS+= -DBSD_TCL_VER=${TCL_VER} \ - -DBSD_TCL_LIBDIR=${LOCALBASE}/lib \ - -DBSD_TCL_INCDIR=${TCL_INCLUDEDIR} -PLIST_SUB+= TCL="" -.else -CMAKE_ARGS+= -DENABLE_TCL=no -PLIST_SUB+= TCL="@comment " -.endif +BACKTRACE_LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -CMAKE_ARGS+= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ - -DBSD_LUA_INCDIR=${LUA_INCDIR} -PLIST_SUB+= LUA="" -.else -CMAKE_ARGS+= -DENABLE_LUA=no -PLIST_SUB+= LUA="@comment " -.endif +CHARSET_CMAKE_OFF= -DENABLE_CHARSET=no + +GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no +GNUTLS_USES= pkgconfig +GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls + +LUA_CMAKE_OFF= -DENABLE_LUA=no +LUA_CMAKE_ON= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ + -DBSD_LUA_INCDIR=${LUA_INCDIR} +LUA_USES= lua:51 + +NLS_CMAKE_OFF= -DENABLE_NLS=no +NLS_USES= gettext + +PERL_CMAKE_OFF= -DENABLE_PERL=no +PERL_USES= perl5 + +PYTHON_CMAKE_OFF= -DENABLE_PYTHON=no +PYTHON_CMAKE_ON= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ + -DBSD_PYTHON_VER=${PYTHON_VERSION} +PYTHON_USES= python + +RUBY_CMAKE_OFF= -DENABLE_RUBY=no +RUBY_CMAKE_ON= -DBSD_RUBY_CMD=${RUBY} \ + -DBSD_RUBY_VER=${RUBY_NAME} +RUBY_USE= ruby=yes + +TCL_CMAKE_OFF= -DENABLE_TCL=no +TCL_CMAKE_ON= -DBSD_TCL_VER=${TCL_VER} \ + -DBSD_TCL_LIBDIR=${LOCALBASE}/lib \ + -DBSD_TCL_INCDIR=${TCL_INCLUDEDIR} +TCL_USES= tcl:85+ .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ - docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ - asciidoc:${PORTSDIR}/textproc/asciidoc \ - source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight + docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ + asciidoc:${PORTSDIR}/textproc/asciidoc \ + source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight CMAKE_ARGS+= -DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man -DENABLE_DOC=yes .else CMAKE_ARGS+= -DENABLE_MAN=no -DENABLE_DOC=no +CFLAGS+= -Qunused-arguments .endif -.if ${PORT_OPTIONS:MDOCS} -PLIST_SUB+= DOCS="" -.if !defined(MAINTAINER_MODE) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} && !defined(MAINTAINER_MODE) DISTFILES+= ${DISTNAME}-docs.txz:mandocs .endif -.else -PLIST_SUB+= DOCS="@comment " -.endif -.if ${PORT_OPTIONS:MMANPAGES} -PLIST_SUB+= MANPAGES="" -.if !defined(MAINTAINER_MODE) +.if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE) DISTFILES+= ${DISTNAME}-manpages.txz:mandocs .endif -.else -PLIST_SUB+= MANPAGES="@comment " -.endif - -.if ${PORT_OPTIONS:MBACKTRACE} -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif - -.if ${PORT_OPTIONS:MICON} -PLIST_SUB+= ICON="" -.else -PLIST_SUB+= ICON="@comment " -.endif post-patch: @${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt @@ -174,10 +115,10 @@ post-patch: post-install: .if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE) - ${INSTALL_MAN} ${WRKDIR}/manpages/weechat.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/manpages/man1/weechat.1.gz ${STAGEDIR}${PREFIX}/man/man1 .for f in de fr it ja pl @${MKDIR} ${STAGEDIR}${PREFIX}/man/${f}/man1 - ${INSTALL_MAN} ${WRKDIR}/manpages/${f}/weechat.1 ${STAGEDIR}${PREFIX}/man/${f}/man1 + ${INSTALL_MAN} ${WRKDIR}/manpages/${f}/man1/weechat.1.gz ${STAGEDIR}${PREFIX}/man/${f}/man1 .endfor .endif .if ${PORT_OPTIONS:MDOCS} && !defined(MAINTAINER_MODE) Modified: head/irc/weechat/distinfo ============================================================================== --- head/irc/weechat/distinfo Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/distinfo Thu Oct 16 19:29:33 2014 (r371017) @@ -1,6 +1,6 @@ -SHA256 (weechat-0.4.3.tar.gz) = bfb5a34f78eaad0e22e1aa0783ff330907f253fcd50a1d3fd0aa19df9114dde9 -SIZE (weechat-0.4.3.tar.gz) = 2985048 -SHA256 (weechat-0.4.3-docs.txz) = 7267a8571763ce6ffccfab07043f6d3d4b28b420f43a525cc29795f73e5970de -SIZE (weechat-0.4.3-docs.txz) = 671236 -SHA256 (weechat-0.4.3-manpages.txz) = adbe5e72f219c5b10a921ea67b53a99ca772a28e35d52e390b9eb8f773bc5107 -SIZE (weechat-0.4.3-manpages.txz) = 6996 +SHA256 (weechat-1.0.1.tar.gz) = 3f53b6dd17f1e62d86b100a81f6f7c8b8e0e7eb2670b62b4640a6e7b60a4c653 +SIZE (weechat-1.0.1.tar.gz) = 3237820 +SHA256 (weechat-1.0.1-docs.txz) = e721f8a9253920efbb7faa95c609713427e340fd1ef2b94ccf9897353f55bd77 +SIZE (weechat-1.0.1-docs.txz) = 748792 +SHA256 (weechat-1.0.1-manpages.txz) = 1a3df3d71ddce57be9b222a832bf146f2ab5115ea60773408121a8286ad97cee +SIZE (weechat-1.0.1-manpages.txz) = 13380 Modified: head/irc/weechat/files/patch-cmake-FindLua_cmake ============================================================================== --- head/irc/weechat/files/patch-cmake-FindLua_cmake Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/files/patch-cmake-FindLua_cmake Thu Oct 16 19:29:33 2014 (r371017) @@ -1,61 +1,56 @@ ---- cmake/FindLua.cmake.orig 2012-07-07 11:41:16.000000000 +0000 -+++ cmake/FindLua.cmake 2012-07-08 09:00:30.126123501 +0000 -@@ -33,51 +33,18 @@ - SET(LUA_FIND_QUIETLY TRUE) - ENDIF(LUA_FOUND) +--- cmake/FindLua.cmake.orig 2014-09-29 21:49:22.725682010 +0100 ++++ cmake/FindLua.cmake 2014-09-29 22:06:18.215011520 +0100 +@@ -35,14 +35,12 @@ --FIND_PATH( -- LUA51_INCLUDE_PATH lua.h + find_path( + LUA51_INCLUDE_PATH lua.h - PATHS /usr/include /usr/local/include /usr/pkg/include - PATH_SUFFIXES lua51 lua5.1 lua-5.1 -+FIND_PATH(LUA_INCLUDE_PATH lua.h -+ PATHS ${BSD_LUA_INCDIR} ++ PATHS ${BSD_LUA_INCDIR} ) --FIND_LIBRARY( + find_library( - LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - PATH_SUFFIXES lua51 lua5.1 lua-5.1 -+FIND_LIBRARY(LUA_LIBRARY -+ NAMES lua lua-5.1 -+ PATHS ${BSD_LUA_LIBDIR} ++ LUA51_LIBRARY NAMES lua lua-5.1 ++ PATHS ${BSD_LUA_LIBDIR} ) --IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) -- SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}") -- SET(LUA_LIBRARY "${LUA51_LIBRARY}") -- SET(LUA_VERSION "5.1") -+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY) - SET(LUA_FOUND TRUE) --ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) -- FIND_PATH( + if(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) +@@ -50,34 +48,11 @@ + set(LUA_LIBRARY "${LUA51_LIBRARY}") + set(LUA_VERSION "5.1") + set(LUA_FOUND TRUE) +-else() +- find_path( - LUA50_INCLUDE_PATH lua.h - PATHS /usr/include /usr/local/include /usr/pkg/include - PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua - ) -- -- FIND_LIBRARY( +- find_library( - LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua - ) -- -- FIND_LIBRARY( +- find_library( - LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua - ) -- -- IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) -- SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}") -- SET(LUA_LIBRARY "${LUA50_LIBRARY}") -- SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}") -- SET(LUA_VERSION "5.0") -- SET(LUA_FOUND TRUE) -- ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) --ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) -- -+ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY) +- if(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) +- set(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}") +- set(LUA_LIBRARY "${LUA50_LIBRARY}") +- set(LUALIB_LIBRARY "${LUALIB50_LIBRARY}") +- set(LUA_VERSION "5.0") +- set(LUA_FOUND TRUE) +- endif() + endif() - MARK_AS_ADVANCED( + mark_as_advanced( LUA_INCLUDE_PATH + LUA_LIBRARY +- LUALIB_LIBRARY ++# LUALIB_LIBRARY + # LUA_VERSION + ) Modified: head/irc/weechat/files/patch-cmake-FindPython_cmake ============================================================================== --- head/irc/weechat/files/patch-cmake-FindPython_cmake Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/files/patch-cmake-FindPython_cmake Thu Oct 16 19:29:33 2014 (r371017) @@ -1,61 +1,61 @@ ---- cmake/FindPython.cmake.orig 2014-02-09 08:52:53.000000000 +0000 -+++ cmake/FindPython.cmake 2014-02-09 18:20:48.432096579 +0000 +--- cmake/FindPython.cmake.orig 2014-09-29 22:07:54.174485838 +0100 ++++ cmake/FindPython.cmake 2014-09-29 22:13:00.475191375 +0100 @@ -33,17 +33,9 @@ - SET(PYTHON_FIND_QUIETLY TRUE) - ENDIF(PYTHON_FOUND) + set(PYTHON_FIND_QUIETLY TRUE) + endif() --IF(ENABLE_PYTHON3) -- FIND_PROGRAM(PYTHON_EXECUTABLE +-if(ENABLE_PYTHON3) +- find_program(PYTHON_EXECUTABLE - NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) --ELSE(ENABLE_PYTHON3) -- FIND_PROGRAM(PYTHON_EXECUTABLE +-else() +- find_program(PYTHON_EXECUTABLE - NAMES python2.7 python2.6 python2.5 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) --ENDIF(ENABLE_PYTHON3) -+FIND_PROGRAM(PYTHON_EXECUTABLE -+ NAMES ${BSD_PYTHON_CMD} -+ ) +-endif() ++find_program(PYTHON_EXECUTABLE ++ NAMES ${BSD_PYTHON_CMD} ++ ) - IF(PYTHON_EXECUTABLE) - EXECUTE_PROCESS( + if(PYTHON_EXECUTABLE) + execute_process( @@ -65,32 +57,13 @@ NAMES Python.h PATHS ${PYTHON_INC_DIR} ) -- IF(ENABLE_PYTHON3) -- FIND_LIBRARY(PYTHON_LIBRARY +- if(ENABLE_PYTHON3) +- find_library(PYTHON_LIBRARY - NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python - PATHS ${PYTHON_POSSIBLE_LIB_PATH} - ) -- ELSE(ENABLE_PYTHON3) -- FIND_LIBRARY(PYTHON_LIBRARY +- else() +- find_library(PYTHON_LIBRARY - NAMES python2.7 python2.6 python2.5 python - PATHS ${PYTHON_POSSIBLE_LIB_PATH} - ) -- ENDIF(ENABLE_PYTHON3) +- endif() + -+ FIND_LIBRARY(PYTHON_LIBRARY ++ find_library(PYTHON_LIBRARY + NAMES ${BSD_PYTHON_VER} + ) - IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) -- EXECUTE_PROCESS( + if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) +- execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" - OUTPUT_VARIABLE PYTHON_VERSION - ) -- EXECUTE_PROCESS( +- execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))" - OUTPUT_VARIABLE PYTHON_OLD_VERSION - ) -- IF(${PYTHON_OLD_VERSION} STREQUAL "True") -- MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}") -- ELSE() -- SET(PYTHON_FOUND TRUE) -- ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True") -+ SET(PYTHON_FOUND TRUE) - ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) +- if(${PYTHON_OLD_VERSION} STREQUAL "True") +- message("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}") +- else() +- set(PYTHON_FOUND TRUE) +- endif() ++ set(PYTHON_FOUND TRUE) + endif() - MARK_AS_ADVANCED( + mark_as_advanced( Modified: head/irc/weechat/files/patch-cmake-FindRuby_cmake ============================================================================== --- head/irc/weechat/files/patch-cmake-FindRuby_cmake Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/files/patch-cmake-FindRuby_cmake Thu Oct 16 19:29:33 2014 (r371017) @@ -1,56 +1,53 @@ ---- cmake/FindRuby.cmake.orig 2014-02-09 18:24:48.291574320 +0000 -+++ cmake/FindRuby.cmake 2014-02-09 18:27:20.902318912 +0000 -@@ -31,11 +31,6 @@ - SET(RUBY_FIND_QUIETLY TRUE) - ENDIF(RUBY_FOUND) - --FIND_PACKAGE(PkgConfig) --IF(PKG_CONFIG_FOUND) -- pkg_search_module(RUBY ruby-2.0 ruby-1.9 ruby-1.8) --ENDIF(PKG_CONFIG_FOUND) +--- cmake/FindRuby.cmake.orig 2014-09-29 22:14:17.584653052 +0100 ++++ cmake/FindRuby.cmake 2014-09-29 22:18:39.115247583 +0100 +@@ -31,22 +31,16 @@ + set(RUBY_FIND_QUIETLY TRUE) + endif() + +-find_package(PkgConfig) +-if(PKG_CONFIG_FOUND) +- pkg_search_module(RUBY ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8) +-endif() - - IF(RUBY_FOUND) - - SET(RUBY_LIB "") -@@ -44,14 +39,13 @@ - ELSE(RUBY_FOUND) - - FIND_PROGRAM(RUBY_EXECUTABLE + if(RUBY_FOUND) + set(RUBY_LIB "") + mark_as_advanced(RUBY_LIB) + else() + find_program(RUBY_EXECUTABLE - NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby - PATHS /usr/bin /usr/local/bin /usr/pkg/bin + NAMES ${BSD_RUBY_CMD} ) - - IF(RUBY_EXECUTABLE) - - EXECUTE_PROCESS( + if(RUBY_EXECUTABLE) + execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']" + COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']" OUTPUT_VARIABLE RUBY_ARCH_DIR ) - -@@ -61,12 +55,12 @@ + execute_process( +@@ -54,11 +48,11 @@ + OUTPUT_VARIABLE RUBY_ARCH ) - - EXECUTE_PROCESS( + execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib'" ++ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib'" OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH ) - - EXECUTE_PROCESS( + execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']" ++ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']" OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH ) - -@@ -78,8 +72,7 @@ - SET(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}") - - FIND_LIBRARY(RUBY_LIB + find_path(RUBY_INCLUDE_DIRS +@@ -67,9 +61,8 @@ + ) + set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}") + find_library(RUBY_LIB - NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby - PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} +- ) + NAMES ${BSD_RUBY_VER} - ) - - IF(RUBY_LIB AND RUBY_INCLUDE_DIRS) ++ ) + if(RUBY_LIB AND RUBY_INCLUDE_DIRS) + set(RUBY_FOUND TRUE) + endif() Modified: head/irc/weechat/files/patch-cmake-FindTCL_cmake ============================================================================== --- head/irc/weechat/files/patch-cmake-FindTCL_cmake Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/files/patch-cmake-FindTCL_cmake Thu Oct 16 19:29:33 2014 (r371017) @@ -1,25 +1,25 @@ ---- cmake/FindTCL.cmake.orig 2011-04-02 18:26:10.225070885 +0100 -+++ cmake/FindTCL.cmake 2011-04-02 18:29:21.009167958 +0100 -@@ -55,98 +55,18 @@ - SET(TCL_FIND_QUIETLY TRUE) - ENDIF(TCL_FOUND) +--- cmake/FindTCL.cmake.orig 2014-09-29 22:19:32.084542773 +0100 ++++ cmake/FindTCL.cmake 2014-09-29 22:22:19.254589245 +0100 +@@ -55,97 +55,18 @@ + set(TCL_FIND_QUIETLY TRUE) + endif() --INCLUDE(CMakeFindFrameworks) --INCLUDE(FindTclsh) +-include(CMakeFindFrameworks) +-include(FindTclsh) - --GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) --GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) --STRING(REGEX REPLACE +-get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) +-get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) +-string(REGEX REPLACE - "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") - --GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) +-get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) - --GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) --GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) --STRING(REGEX REPLACE +-get_filename_component(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) +-get_filename_component(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) +-string(REGEX REPLACE - "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}") - --SET(TCL_POSSIBLE_LIB_PATHS +-set(TCL_POSSIBLE_LIB_PATHS - "${TCL_INCLUDE_PATH_PARENT}/lib" - "${TCL_INCLUDE_PATH_PARENT}/lib64" - "${TCL_LIBRARY_PATH}" @@ -31,12 +31,12 @@ - /usr/local/lib64 - ) - --IF(WIN32) -- GET_FILENAME_COMPONENT( +-if(WIN32) +- get_filename_component( - ActiveTcl_CurrentVersion - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" - NAME) -- SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS} +- set(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib" @@ -44,11 +44,11 @@ - "C:/Program Files/Tcl/lib" - "C:/Tcl/lib" - ) --ENDIF(WIN32) +-endif() +SET(TCL_VERSION ${BSD_TCL_VER}) +STRING(REPLACE "." "" TCL_INT_VERSION ${TCL_VERSION}) - FIND_LIBRARY(TCL_LIBRARY + find_library(TCL_LIBRARY NAMES - tcl86 tcl8.6 - tcl85 tcl8.5 @@ -59,18 +59,18 @@ + PATHS ${BSD_TCL_LIBDIR} ) --CMAKE_FIND_FRAMEWORKS(Tcl) +-cmake_find_frameworks(Tcl) - --SET(TCL_FRAMEWORK_INCLUDES) --IF(Tcl_FRAMEWORKS) -- IF(NOT TCL_INCLUDE_PATH) -- FOREACH(dir ${Tcl_FRAMEWORKS}) -- SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers) -- ENDFOREACH(dir) -- ENDIF(NOT TCL_INCLUDE_PATH) --ENDIF(Tcl_FRAMEWORKS) +-set(TCL_FRAMEWORK_INCLUDES) +-if(Tcl_FRAMEWORKS) +- if(NOT TCL_INCLUDE_PATH) +- foreach(dir ${Tcl_FRAMEWORKS}) +- set(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers) +- endforeach(dir) +- endif() +-endif() - --SET(TCL_POSSIBLE_INCLUDE_PATHS +-set(TCL_POSSIBLE_INCLUDE_PATHS - "${TCL_LIBRARY_PATH_PARENT}/include" - "${TCL_INCLUDE_PATH}" - ${TCL_FRAMEWORK_INCLUDES} @@ -85,9 +85,8 @@ - /usr/local/include/tcl8.5 - ) - -- --IF(WIN32) -- SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS} +-if(WIN32) +- set(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include" @@ -95,12 +94,12 @@ - "C:/Program Files/Tcl/include" - "C:/Tcl/include" - ) --ENDIF(WIN32) +-endif() - - FIND_PATH(TCL_INCLUDE_PATH + find_path(TCL_INCLUDE_PATH NAMES tcl.h - PATHS ${TCL_POSSIBLE_INCLUDE_PATHS} + PATHS ${BSD_TCL_INCDIR} ) - IF(TCL_LIBRARY AND TCL_INCLUDE_PATH) + if(TCL_LIBRARY AND TCL_INCLUDE_PATH) Modified: head/irc/weechat/pkg-plist ============================================================================== --- head/irc/weechat/pkg-plist Thu Oct 16 18:48:43 2014 (r371016) +++ head/irc/weechat/pkg-plist Thu Oct 16 19:29:33 2014 (r371017) @@ -2,12 +2,13 @@ bin/weechat bin/weechat-curses include/weechat/weechat-plugin.h lib/weechat/plugins/alias.so +lib/weechat/plugins/exec.so lib/weechat/plugins/fifo.so lib/weechat/plugins/irc.so lib/weechat/plugins/logger.so lib/weechat/plugins/relay.so -lib/weechat/plugins/rmodifier.so lib/weechat/plugins/script.so +lib/weechat/plugins/trigger.so lib/weechat/plugins/xfer.so libdata/pkgconfig/weechat.pc %%MANPAGES%%man/man1/weechat.1.gz @@ -46,6 +47,7 @@ libdata/pkgconfig/weechat.pc %%DOCS%%%%DOCSDIR%%/weechat_quickstart.ru.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.en.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.fr.html +%%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.ja.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.de.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.en.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.fr.html @@ -76,19 +78,3 @@ libdata/pkgconfig/weechat.pc %%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo %%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo -@dirrmtry lib/weechat/plugins -@dirrmtry lib/weechat -%%MANPAGES%%@dirrmtry man/pl/man1 -%%MANPAGES%%@dirrmtry man/pl -%%MANPAGES%%@dirrmtry man/it/man1 -%%MANPAGES%%@dirrmtry man/it -%%MANPAGES%%@dirrmtry man/fr/man1 -%%MANPAGES%%@dirrmtry man/fr -%%MANPAGES%%@dirrmtry man/de/man1 -%%MANPAGES%%@dirrmtry man/de -%%DOCS%%@dirrmtry %%DOCSDIR%% -%%ICON%%@dirrmtry share/icons/hicolor/32x32/apps -%%ICON%%@dirrmtry share/icons/hicolor/32x32 -%%ICON%%@dirrmtry share/icons/hicolor -%%ICON%%@dirrmtry share/icons -@dirrm include/weechat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410161929.s9GJTXGj031599>