Index: head/irc/weechat-devel/Makefile =================================================================== --- head/irc/weechat-devel/Makefile (revision 300767) +++ head/irc/weechat-devel/Makefile (revision 300768) @@ -1,171 +1,179 @@ # New ports collection makefile for: weechat-devel # Date created: 2010-01-06 # Whom: Jase Thew # # $FreeBSD$ # PORTNAME= weechat -PORTVERSION= 20120610 +PORTVERSION= 20120707 CATEGORIES= irc MASTER_SITES= http://perturb.me.uk/distfiles/ 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_BASE= 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= 9c5116b +GITREV= 92aa9bf 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 +OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG -BACKTRACE_DESC= Enable crash backtraces -CHARSET_DESC= Enable charset conversion support +BACKTRACE_DESC= Provide crash backtraces +CHARSET_DESC= Charset conversion support DOCUMENTATION_DESC= Build and install documentation -GUILE_DESC= Enable Guile scripting support -LUA_DESC= Enable Lua scripting support -PERL_DESC= Enable Perl scripting support -PYTHON_DESC= Enable Python scripting support -RUBY_DESC= Enable Ruby scripting support -TCL_DESC= Enable Tcl scripting support +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 .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.0+ -CMAKE_ARGS+= -DBSD_LUA_VER=${LUA_VER} \ - -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ +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 +PLIST_SUB+= SASL="@comment " .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 post-install: ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1 .include Property changes on: head/irc/weechat-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.86 \ No newline at end of property +1.87 \ No newline at end of property Index: head/irc/weechat-devel/distinfo =================================================================== --- head/irc/weechat-devel/distinfo (revision 300767) +++ head/irc/weechat-devel/distinfo (revision 300768) @@ -1,2 +1,2 @@ -SHA256 (weechat-devel-9c5116b.tar.gz) = 7367e72ab1134f8651ca0200791291ae47e9366d39ac93536f211eafabfe62d9 -SIZE (weechat-devel-9c5116b.tar.gz) = 2213501 +SHA256 (weechat-devel-92aa9bf.tar.gz) = accf76561ea0192c968d3094ad6ebdf35d1e72caeb9b374ccd1529b13ca18adf +SIZE (weechat-devel-92aa9bf.tar.gz) = 2229030 Property changes on: head/irc/weechat-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.58 \ No newline at end of property +1.59 \ No newline at end of property Index: head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h =================================================================== --- head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h (revision 300767) +++ head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h (nonexistent) @@ -1,12 +0,0 @@ ---- src/gui/curses/gui-curses.h.orig 2011-08-17 14:08:18.000000000 +0100 -+++ src/gui/curses/gui-curses.h 2011-08-18 05:02:47.647960373 +0100 -@@ -23,7 +23,8 @@ - #include - - #ifdef HAVE_NCURSESW_CURSES_H --#include -+#define _XOPEN_SOURCE_EXTENDED 1 -+#include - #elif HAVE_NCURSES_H - #include - #else Property changes on: head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c =================================================================== --- head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c (revision 300767) +++ head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c (nonexistent) @@ -1,11 +0,0 @@ ---- src/gui/curses/gui-curses-term.c.orig 2011-08-18 04:25:40.510233646 +0100 -+++ src/gui/curses/gui-curses-term.c 2011-08-18 04:25:55.436405801 +0100 -@@ -26,7 +26,7 @@ - #endif - - #ifdef HAVE_NCURSESW_CURSES_H --#include -+#include - #else - #include - #endif Property changes on: head/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt =================================================================== --- head/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt (revision 300767) +++ head/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt (nonexistent) @@ -1,11 +0,0 @@ ---- src/gui/curses/CMakeLists.txt.orig 2011-08-18 04:19:10.997333389 +0100 -+++ src/gui/curses/CMakeLists.txt 2011-08-18 04:19:56.348074585 +0100 -@@ -38,7 +38,7 @@ - - FIND_PACKAGE(Ncurses) - IF(NCURSES_FOUND) -- CHECK_INCLUDE_FILES(ncursesw/ncurses.h NCURSESW_HEADERS) -+ CHECK_INCLUDE_FILES(ncurses.h NCURSESW_HEADERS) - IF(NCURSESW_HEADERS) - ADD_DEFINITIONS(-DHAVE_NCURSESW_CURSES_H) - ELSE(NCURSESW_HEADERS) Property changes on: head/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/irc/weechat-devel/files/patch-cmake-FindLua_cmake =================================================================== --- head/irc/weechat-devel/files/patch-cmake-FindLua_cmake (revision 300767) +++ head/irc/weechat-devel/files/patch-cmake-FindLua_cmake (revision 300768) @@ -1,67 +1,61 @@ ---- cmake/FindLua.cmake.orig 2010-12-10 15:13:27.000000000 +0000 -+++ cmake/FindLua.cmake 2010-12-12 04:00:45.000000000 +0000 -@@ -33,51 +33,24 @@ +--- 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) -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} ) -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 + 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") -- SET(LUA_FOUND TRUE) ++IF(LUA_INCLUDE_PATH AND LUA_LIBRARY) + SET(LUA_FOUND TRUE) -ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) - 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( - 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( - 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) -+SET(LUA_VERSION ${BSD_LUA_VER}) -+ -+IF(LUA_VERSION STREQUAL "5.0") -+ SET(LUALIB_LIBRARY ${LUA_LIBRARY}) -+ENDIF(LUA_VERSION STREQUAL "5.0") - -+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY) -+ SET(LUA_FOUND TRUE) +- +ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY) MARK_AS_ADVANCED( LUA_INCLUDE_PATH Property changes on: head/irc/weechat-devel/files/patch-cmake-FindLua_cmake ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/irc/weechat-devel/files/patch-cmake-FindRuby_cmake =================================================================== --- head/irc/weechat-devel/files/patch-cmake-FindRuby_cmake (revision 300767) +++ head/irc/weechat-devel/files/patch-cmake-FindRuby_cmake (revision 300768) @@ -1,42 +1,43 @@ ---- cmake/FindRuby.cmake.orig 2011-11-21 17:12:47.000000000 +0000 -+++ cmake/FindRuby.cmake 2011-11-22 21:04:12.114830585 +0000 +--- cmake/FindRuby.cmake.orig 2012-07-06 10:35:11.000000000 +0000 ++++ cmake/FindRuby.cmake 2012-07-07 04:50:51.807510722 +0000 @@ -32,13 +32,12 @@ ENDIF(RUBY_FOUND) FIND_PROGRAM(RUBY_EXECUTABLE -- NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby +- NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby - PATHS /usr/bin /usr/local/bin /usr/pkg/bin + NAMES ${BSD_RUBY_CMD} ) IF(RUBY_EXECUTABLE) EXECUTE_PROCESS( -- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']" +- 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 ) @@ -48,12 +47,12 @@ ) EXECUTE_PROCESS( -- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib'" +- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']" ++ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib'" OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH ) EXECUTE_PROCESS( -- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']" +- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" + COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']" OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH ) -@@ -78,7 +77,7 @@ +@@ -71,8 +70,7 @@ "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}") FIND_LIBRARY(RUBY_LIBRARY -- NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby +- 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 ruby1.6 ruby16 ruby +- PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} + NAMES ${BSD_RUBY_VER} - PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} ) + IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) Property changes on: head/irc/weechat-devel/files/patch-cmake-FindRuby_cmake ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property