diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile index 1b21c4261e8f..9da79c7a2a39 100644 --- a/irc/weechat-devel/Makefile +++ b/irc/weechat-devel/Makefile @@ -1,179 +1,197 @@ # New ports collection makefile for: weechat-devel # Date created: 2010-01-06 # Whom: Jase Thew # # $FreeBSD$ # PORTNAME= weechat -PORTVERSION= 20120707 +PORTVERSION= 20120808 CATEGORIES= irc -MASTER_SITES= http://perturb.me.uk/distfiles/ +MASTER_SITES= http://perturb.me.uk/distfiles/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= jase PKGNAMESUFFIX= -devel DISTNAME= weechat-devel-${GITREV} MAINTAINER= jase@FreeBSD.org COMMENT= A lightweight and user friendly ncurses based IRC client LICENSE= GPLv3 CONFLICTS= weechat-0.3* USE_ICONV= yes USE_LDCONFIG= yes USE_NCURSES= yes -WITH_NCURSES_PORT= yes USE_CMAKE= yes -CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib WANT_PERL= yes LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl -GITREV= 92aa9bf +GITREV= 3c615a9 WRKSRC= ${WRKDIR}/${PORTNAME}-${GITREV} # Please note: the DEBUG option is *NOT* empty, it is utilised by # bsd.cmake.mk to set the cmake build type to Debug instead of # Release. -OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL +OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL COLOR256 OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG BACKTRACE_DESC= Provide crash backtraces CHARSET_DESC= Charset conversion support DOCUMENTATION_DESC= Build and install documentation GUILE_DESC= Guile scripting support 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 +SASL_DESC= SASL with DH-Blowfish support +COLOR256_DESC= Use ncurses port for 256 color support .include .if ${PORT_OPTIONS:MCHARSET} PLIST_SUB+= CHARSET="" .else CMAKE_ARGS+= -DENABLE_CHARSET=no PLIST_SUB+= CHARSET="@comment " .endif .if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else CMAKE_ARGS+= -DENABLE_NLS=no PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MASPELL} BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell PLIST_SUB+= ASPELL="" .else CMAKE_ARGS+= -DENABLE_ASPELL=no PLIST_SUB+= ASPELL="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= -2.7 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} LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls .else CMAKE_ARGS+= -DENABLE_GNUTLS=no .endif .if ${PORT_OPTIONS:MPERL} USE_PERL5= yes PLIST_SUB+= PERL="" .else CMAKE_ARGS+= -DENABLE_PERL=no PLIST_SUB+= PERL="@comment " .endif .if ${PORT_OPTIONS:MTCL} USE_TCL= 83+ .include "${PORTSDIR}/Mk/bsd.tcl.mk" 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 .if ${PORT_OPTIONS:MLUA} USE_LUA= 5.1+ 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 .if ${PORT_OPTIONS:MGUILE} IGNORE= guile support currently causes a segfault on exit. Please re-run 'make config' and disable GUILE LIB_DEPENDS+= guile:${PORTSDIR}/lang/guile PLIST_SUB+= GUILE="" .else CMAKE_ARGS+= -DENABLE_GUILE=no PLIST_SUB+= GUILE="@comment " .endif .if ${PORT_OPTIONS:MDOCUMENTATION} BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc BUILD_DEPENDS+= source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight PLIST_SUB+= DOCUMENTATION="" .else CMAKE_ARGS+= -DENABLE_DOC=no PLIST_SUB+= DOCUMENTATION="@comment " .endif .if ${PORT_OPTIONS:MBACKTRACE} LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo .endif .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt PLIST_SUB+= SASL="" .else -CMAKE_ARGS+= -DENABLE_SASL=no +CMAKE_ARGS+= -DENABLE_GCRYPT=no PLIST_SUB+= SASL="@comment " .endif +.if ${PORT_OPTIONS:MCOLOR256} +WITH_NCURSES_PORT= yes +CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses +.endif + MAN1= weechat-curses.1 post-patch: @${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|INSTALL|#INSTALL|' ${WRKSRC}/doc/CMakeLists.txt .for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake @${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 +pre-configure: +.if ${PORT_OPTIONS:MCOLOR256} + @${ECHO_MSG} "" + @${ECHO_MSG} "==> You have selected the ncurses 256 color option. Please ensure that" + @${ECHO_MSG} "==> the devel/ncurses port is built with the EXTCOLORS option enabled." + @${ECHO_MSG} "==>" + @${ECHO_MSG} "==> Ctrl-C now if you'd like to reconfigure." + @${ECHO_MSG} "" + @sleep 5 +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1 .include diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo index 29d132cba9f8..1184649b306c 100644 --- a/irc/weechat-devel/distinfo +++ b/irc/weechat-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (weechat-devel-92aa9bf.tar.gz) = accf76561ea0192c968d3094ad6ebdf35d1e72caeb9b374ccd1529b13ca18adf -SIZE (weechat-devel-92aa9bf.tar.gz) = 2229030 +SHA256 (weechat-devel-3c615a9.tar.gz) = f0ef85a540e887819d58649008d68ae42f10b20d57a61138a2a37a0d8d4b0095 +SIZE (weechat-devel-3c615a9.tar.gz) = 2340064 diff --git a/irc/weechat-devel/files/patch-cmake-FindPython_cmake b/irc/weechat-devel/files/patch-cmake-FindPython_cmake index bf80f23b1fe0..4e5f60e2a6a3 100644 --- a/irc/weechat-devel/files/patch-cmake-FindPython_cmake +++ b/irc/weechat-devel/files/patch-cmake-FindPython_cmake @@ -1,21 +1,21 @@ ---- cmake/FindPython.cmake.orig 2010-12-20 18:43:34.102131358 +0000 -+++ cmake/FindPython.cmake 2010-12-20 19:16:11.918184057 +0000 +--- cmake/FindPython.cmake.orig 2012-08-11 14:06:55.086663842 +0100 ++++ cmake/FindPython.cmake 2012-08-11 14:23:55.301504695 +0100 @@ -34,8 +34,7 @@ ENDIF(PYTHON_FOUND) FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 +- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin + NAMES ${BSD_PYTHON_CMD} ) IF(PYTHON_EXECUTABLE) @@ -65,7 +64,7 @@ ) - + FIND_LIBRARY(PYTHON_LIBRARY -- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 +- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python + NAMES ${BSD_PYTHON_VER} PATHS ${PYTHON_POSSIBLE_LIB_PATH} ) diff --git a/irc/weechat-devel/pkg-plist b/irc/weechat-devel/pkg-plist index 7ddb1a07c816..b43562288e28 100644 --- a/irc/weechat-devel/pkg-plist +++ b/irc/weechat-devel/pkg-plist @@ -1,64 +1,65 @@ bin/weechat-curses include/weechat/weechat-plugin.h lib/weechat/plugins/alias.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/xfer.so libdata/pkgconfig/weechat.pc %%ASPELL%%lib/weechat/plugins/aspell.so %%CHARSET%%lib/weechat/plugins/charset.so %%LUA%%lib/weechat/plugins/lua.so %%PERL%%lib/weechat/plugins/perl.so %%PYTHON%%lib/weechat/plugins/python.so %%RUBY%%lib/weechat/plugins/ruby.so %%TCL%%lib/weechat/plugins/tcl.so %%DOCUMENTATION%%share/doc/weechat/weechat_dev.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_faq.de.html %%DOCUMENTATION%%share/doc/weechat/weechat_faq.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_faq.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_faq.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_faq.ja.html %%DOCUMENTATION%%share/doc/weechat/weechat_faq.pl.html %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.de.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.es.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.ja.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.pl.html %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.ru.html %%DOCUMENTATION%%share/doc/weechat/weechat_relay_protocol.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.de.html %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.pl.html %%DOCUMENTATION%%share/doc/weechat/weechat_tester.de.html %%DOCUMENTATION%%share/doc/weechat/weechat_tester.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_tester.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_tester.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_tester.pl.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.de.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html +%%DOCUMENTATION%%share/doc/weechat/weechat_user.ja.html %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo %%NLS%%share/locale/fr/LC_MESSAGES/weechat.mo %%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo %%NLS%%share/locale/it/LC_MESSAGES/weechat.mo %%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/ru/LC_MESSAGES/weechat.mo @dirrmtry lib/weechat/plugins @dirrmtry lib/weechat %%DOCUMENTATION%%@dirrmtry share/doc/weechat @dirrm include/weechat