svn commit: r423303 - in head/irc/weechat: . files
Bernard Spil
brnrd at FreeBSD.org
Tue Oct 4 21:07:02 UTC 2016
Author: brnrd
Date: Tue Oct 4 21:07:00 2016
New Revision: 423303
URL: https://svnweb.freebsd.org/changeset/ports/423303
Log:
irc/weechat: Update to 1.6
- Update to 1.6
- Take maintainership
- OPT_CMAKE_ON= -DENABLE_OPT=yes to OPT_CMAKE_BOOL= OPT
- Add LICENSE_FILE
- Drop BSD_LUA_* extra CMAKE_ARGS
- Add asciidoctor depend for DOCS and MANPAGES
- Fix build with Python 3.5 / Add warning
- Transform to post-patch-ICON-off target
PR: 205981
Reported by: Vladimir Krstulja <vlad-fbsd at acheronmedia.com>
Added:
head/irc/weechat/files/patch-CMakeLists.txt (contents, props changed)
head/irc/weechat/files/patch-src_core_CMakeLists.txt (contents, props changed)
Deleted:
head/irc/weechat/files/patch-cmake_FindIconv.cmake
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
Modified:
head/irc/weechat/Makefile
head/irc/weechat/distinfo
head/irc/weechat/pkg-plist
Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile Tue Oct 4 20:08:35 2016 (r423302)
+++ head/irc/weechat/Makefile Tue Oct 4 21:07:00 2016 (r423303)
@@ -2,98 +2,98 @@
# $FreeBSD$
PORTNAME= weechat
-PORTVERSION= 1.4
-PORTREVISION= 1
+PORTVERSION= 1.6
CATEGORIES= irc
-MASTER_SITES= http://weechat.org/files/src/
+MASTER_SITES= https://weechat.org/files/src/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= brnrd at FreeBSD.org
COMMENT= Lightweight and user friendly ncurses based IRC client
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= weechat-devel-[0-9]*
+LIB_DEPENDS+= libcurl.so:ftp/curl \
+ libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error
+
+USES= cmake:outsource ncurses tar:bzip2
USE_LDCONFIG= yes
-USES= cmake iconv localbase ncurses tar:bzip2
-CMAKE_ARGS+= -DENABLE_GUILE=no \
- -DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH}
-LIB_DEPENDS+= libcurl.so:ftp/curl \
- libgcrypt.so:security/libgcrypt
+CMAKE_ARGS+= -DENABLE_GUILE=no \
+ -DLIBDATADIR=${LOCALBASE}/libdata
-OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA JAVASCRIPT CHARSET BACKTRACE ASPELL \
- GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
-OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \
- GNUTLS CA_BUNDLE ICON MANPAGES
-
-OPTIONS_SUB= yes
-
-BACKTRACE_DESC= Provide crash backtraces
-CA_BUNDLE_DESC= Include CA bundle for certificate verification
-CHARSET_DESC= Charset conversion support
-ICON_DESC= Desktop icon
-JAVASCRIPT_DESC=Javascript support
-PYTHON_DESC= Python scripting language support
-RUBY_DESC= Ruby scripting language support
+OPTIONS_DEFINE= BACKTRACE DOCS CA_BUNDLE GNUTLS ICON ICONV MANPAGES NLS
+OPTIONS_DEFAULT= ASPELL BACKTRACE CA_BUNDLE CHARSET GNUTLS ICON LUA MANPAGES PERL PYTHON RUBY TCL
+OPTIONS_SUB= yes
+
+OPTIONS_GROUP= PLUGINS
+OPTIONS_GROUP_PLUGINS= ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON RUBY TCL
+
+BACKTRACE_DESC= Provide crash backtraces
+CA_BUNDLE_DESC= Include CA bundle for certificate verification
+ICON_DESC= Desktop icon
+
+PLUGINS_DESC= Weechat Plugins
+CHARSET_DESC= Charset plugin (implies ICONV)
+JAVASCRIPT_DESC= Javascript script support
+PYTHON_DESC= Python script support
+RUBY_DESC= Ruby script support
-ASPELL_CMAKE_OFF= -DENABLE_ASPELL=no
+ASPELL_CMAKE_BOOLL= ENABLE_ASPELL
ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
+BACKTRACE_CMAKE_BOOL= ENABLE_BACKTRACE
BACKTRACE_USES= execinfo
CA_BUNDLE_CMAKE_ON= -DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-CHARSET_CMAKE_OFF= -DENABLE_CHARSET=no
+CHARSET_CMAKE_BOOL= ENABLE_CHARSET
+CHARSET_IMPLIES= ICONV
+
+DOCS_CMAKE_BOOL= ENABLE_DOC
+DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
-DOCS_CMAKE_ON= -DENABLE_DOC=yes
+ICONV_CMAKE_BOOL= ENABLE_ICONV
+ICONV_USES= iconv
-JAVASCRIPT_CMAKE_OFF= -DENABLE_JAVASCRIPT=no
-JAVASCRIPT_CMAKE_ON= -DENABLE_JAVASCRIPT=yes
+JAVASCRIPT_CMAKE_BOOL= ENABLE_JAVASCRIPT
JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8
-GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no
-GNUTLS_USES= pkgconfig
+GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
+GNUTLS_USES= pkgconfig
-LUA_CMAKE_OFF= -DENABLE_LUA=no
-LUA_CMAKE_ON= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
- -DBSD_LUA_INCDIR=${LUA_INCDIR} \
- -DBSD_LUA_VER=${LUA_VER}
-LUA_USES= lua:51
+LUA_CMAKE_BOOL= ENABLE_LUA
+LUA_USES= lua pkgconfig
-MANPAGES_CMAKE_ON= -DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man
+MANPAGES_CMAKE_BOOL= ENABLE_MAN
+MANPAGES_CMAKE_ON= -DMANDIR=${MANPREFIX}/man
+MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
-NLS_CMAKE_OFF= -DENABLE_NLS=no
+NLS_CMAKE_BOOL= ENABLE_NLS
NLS_USES= gettext
-PERL_CMAKE_OFF= -DENABLE_PERL=no
+PERL_CMAKE_BOOL= ENABLE_PERL
PERL_USES= perl5
-PYTHON_CMAKE_OFF= -DENABLE_PYTHON=no
-PYTHON_CMAKE_ON= -DBSD_PYTHON_CMD=${PYTHON_CMD} \
- -DBSD_PYTHON_VER=${PYTHON_VERSION}
+PYTHON_CMAKE_BOOL= ENABLE_PYTHON
PYTHON_USES= python
-RUBY_CMAKE_OFF= -DENABLE_RUBY=no
-RUBY_CMAKE_ON= -DBSD_RUBY_CMD=${RUBY} \
- -DBSD_RUBY_VER=${RUBY_NAME}
+RUBY_CMAKE_BOOL= ENABLE_RUBY
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_CMAKE_BOOL= ENABLE_TCL
TCL_USES= tcl:85+
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+= xsltproc:textproc/libxslt \
- docbook-xsl>=0:textproc/docbook-xsl \
- asciidoc:textproc/asciidoc \
- source-highlight>=3.1.5:textproc/source-highlight
+.if ${PYTHON_MAJOR_VER} >= 3
+WARNING= "Using Python 3.x is NOT recommended because many \"official\" scripts won\'t work"
+CMAKE_ARGS+= -DENABLE_PYTHON3:BOOL=true \
+ -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/libpython${PYTHON_VER}m.so
.endif
post-patch:
@@ -103,16 +103,11 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/${f}
.endfor
-.if empty(PORT_OPTIONS:MBACKTRACE)
- @${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' \
- ${WRKSRC}/src/core/CMakeLists.txt
-.endif
-.if empty(PORT_OPTIONS:MICON)
- @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' \
- ${WRKSRC}/CMakeLists.txt
-.endif
+
+post-patch-ICON-off:
+ @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt
post-install:
- ${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses
+ ${LN} -sf weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/irc/weechat/distinfo
==============================================================================
--- head/irc/weechat/distinfo Tue Oct 4 20:08:35 2016 (r423302)
+++ head/irc/weechat/distinfo Tue Oct 4 21:07:00 2016 (r423303)
@@ -1,2 +1,3 @@
-SHA256 (weechat-1.4.tar.bz2) = e06d9949ccececdd9692c95c41304c2f7fe9ec47b5eedd0d0a8529f6a3c1ddd4
-SIZE (weechat-1.4.tar.bz2) = 2464362
+TIMESTAMP = 1475608262
+SHA256 (weechat-1.6.tar.bz2) = 73eca5212fadb7056f5f72d9dfc96453dea0342c963d1f1ca36c84def5653c34
+SIZE (weechat-1.6.tar.bz2) = 2558398
Added: head/irc/weechat/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/irc/weechat/files/patch-CMakeLists.txt Tue Oct 4 21:07:00 2016 (r423303)
@@ -0,0 +1,60 @@
+--- CMakeLists.txt.orig 2016-05-01 10:50:12 UTC
++++ CMakeLists.txt
+@@ -64,6 +64,10 @@ else()
+ set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+ endif()
+
++if(NOT DEFINED LIBDATADIR)
++ set (LIBDATADIR ${CMAKE_INSTALL_PREFIX}/lib)
++endif()
++
+ if(NOT DEFINED SHAREDIR)
+ set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+ endif()
+@@ -88,10 +92,12 @@ option(ENABLE_GNUTLS "Enable SSLv3/T
+ option(ENABLE_LARGEFILE "Enable Large File Support" ON)
+ option(ENABLE_ALIAS "Enable Alias plugin" ON)
+ option(ENABLE_ASPELL "Enable Aspell plugin" ON)
++option(ENABLE_BACKTRACE "Enable backtraces (via libexecinfo)" ON)
+ option(ENABLE_ENCHANT "Enable Enchant lib for Aspell plugin" OFF)
+ option(ENABLE_CHARSET "Enable Charset plugin" ON)
+ option(ENABLE_EXEC "Enable Exec plugin" ON)
+ option(ENABLE_FIFO "Enable FIFO plugin" ON)
++option(ENABLE_ICONV "Enable character conversion support" ON)
+ option(ENABLE_IRC "Enable IRC plugin" ON)
+ option(ENABLE_LOGGER "Enable Logger plugin" ON)
+ option(ENABLE_RELAY "Enable Relay plugin" ON)
+@@ -167,6 +173,7 @@ endif()
+ # Check for libgcrypt
+ find_package(GCRYPT REQUIRED)
+ add_definitions(-DHAVE_GCRYPT)
++add_definitions(${GCRYPT_CFLAGS})
+ list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
+
+ # Check for GnuTLS
+@@ -185,10 +192,12 @@ endif()
+ find_package(ZLIB REQUIRED)
+ add_definitions(-DHAVE_ZLIB)
+
+-# Check for iconv
+-find_package(Iconv)
+-if(ICONV_FOUND)
+- add_definitions(-DHAVE_ICONV)
++if (ENABLE_ICONV)
++ # Check for iconv
++ find_package(Iconv)
++ if(ICONV_FOUND)
++ add_definitions(-DHAVE_ICONV)
++ endif()
+ endif()
+
+ # Check for CURL
+@@ -247,7 +256,7 @@ set(exec_prefix "\${prefix}")
+ set(libdir "\${exec_prefix}/lib")
+ set(includedir "\${prefix}/include")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDATADIR}/pkgconfig)
+
+ # cygport file (used to build Cygwin packages)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
Added: head/irc/weechat/files/patch-src_core_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/irc/weechat/files/patch-src_core_CMakeLists.txt Tue Oct 4 21:07:00 2016 (r423303)
@@ -0,0 +1,23 @@
+--- src/core/CMakeLists.txt.orig 2016-05-01 10:50:12 UTC
++++ src/core/CMakeLists.txt
+@@ -51,12 +51,14 @@ wee-version.c wee-version.h)
+ include(CheckSymbolExists)
+ check_symbol_exists(flock "sys/file.h" HAVE_FLOCK)
+
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+- find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib)
+- set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}")
+- check_function_exists(backtrace HAVE_BACKTRACE)
+-else()
+- check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
++if(ENABLE_BACKTRACE)
++ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
++ find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib)
++ set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}")
++ check_function_exists(backtrace HAVE_BACKTRACE)
++ else()
++ check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
++ endif()
+ endif()
+
+ if(GNUTLS_FOUND)
Modified: head/irc/weechat/pkg-plist
==============================================================================
--- head/irc/weechat/pkg-plist Tue Oct 4 20:08:35 2016 (r423302)
+++ head/irc/weechat/pkg-plist Tue Oct 4 21:07:00 2016 (r423303)
@@ -80,5 +80,6 @@ libdata/pkgconfig/weechat.pc
%%NLS%%share/locale/ja/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo
More information about the svn-ports-head
mailing list