Attachment 111804 Details for Bug 153117 – weechat-devel-20101212.patch

[patch] weechat-devel-20101212.patch

weechat-devel-20101212.patch (text/plain), 12.21 KB, created by Jase Thew on 2010-12-13 06:50:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jase Thew

Created: 2010-12-13 06:50:08 UTC

Size: 12.21 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/Makefile /usr/ports/irc/weechat-devel/Makefile
>--- /usr/ports/irc/weechat-devel.orig/Makefile	2010-09-30 05:49:02.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/Makefile	2010-12-13 06:16:33.500472721 +0000
>@@ -6,12 +6,11 @@
> #
> 
> PORTNAME=	weechat
>-PORTVERSION=	20100928
>+PORTVERSION=	20101212
> CATEGORIES=	irc
>-MASTER_SITES=	http://perturb.me.uk/distfiles/ \
>-		http://freebsd.unixfreunde.de/sources/
>+MASTER_SITES=	http://perturb.me.uk/distfiles/
> PKGNAMESUFFIX=	-devel
>-DISTNAME=	weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8
>+DISTNAME=	weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad
> 
> MAINTAINER=	freebsd@beardz.net
> COMMENT=	A lightweight and user friendly ncurse based IRC client
>@@ -38,7 +37,7 @@
> 		NLS		"NLS support."			On	\
> 		DOCUMENTATION	"Build documentation."		Off
> 
>-WRKSRC=	${WRKDIR}/${PORTNAME}-b3b0f2d
>+WRKSRC=	${WRKDIR}/${PORTNAME}-25d9d6e
> 
> .include <bsd.port.options.mk>
> 
>@@ -70,7 +69,9 @@
> .endif
> 
> .if defined(WITH_PYTHON)
>-USE_PYTHON=	yes
>+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
>@@ -79,6 +80,8 @@
> 
> .if defined(WITH_RUBY)
> USE_RUBY=	yes
>+CMAKE_ARGS+=	-DBSD_RUBY_CMD=${RUBY} \
>+		-DBSD_RUBY_VER=${RUBY_NAME}
> PLIST_SUB+=	RUBY=""
> .else
> CMAKE_ARGS+=	-DENABLE_RUBY=no
>@@ -102,6 +105,9 @@
> .if defined(WITH_TCL)
> 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
>@@ -110,6 +116,9 @@
> 
> .if defined(WITH_LUA)
> USE_LUA=	5.0+
>+CMAKE_ARGS+=	-DBSD_LUA_VER=${LUA_VER} \
>+		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
>+		-DBSD_LUA_INCDIR=${LUA_INCDIR}
> PLIST_SUB+=	LUA=""
> .else
> CMAKE_ARGS+=	-DENABLE_LUA=no
>@@ -137,6 +146,9 @@
> 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 defined(WITHOUT_BACKTRACE)
> 	@${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt
> .endif
>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/distinfo /usr/ports/irc/weechat-devel/distinfo
>--- /usr/ports/irc/weechat-devel.orig/distinfo	2010-09-30 05:49:02.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/distinfo	2010-12-13 06:16:33.499457231 +0000
>@@ -1,3 +1,2 @@
>-MD5 (weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8.tar.gz) = c2ea1cedae57792eadb1fe5c178f659e
>-SHA256 (weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8.tar.gz) = 9eaf61b7f7b21eaeae27b5e86ef8d92724d11a048b8629e3e6ed999df4e02e1b
>-SIZE (weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8.tar.gz) = 1544430
>+SHA256 (weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad.tar.gz) = d76296f98b8917aa7da0ba9a38ff706c29073e22b7847c3d7330be3a28b19402
>+SIZE (weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad.tar.gz) = 1655384
>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindLua_cmake /usr/ports/irc/weechat-devel/files/patch-cmake-FindLua_cmake
>--- /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindLua_cmake	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/files/patch-cmake-FindLua_cmake	2010-12-13 06:16:33.494397943 +0000
>@@ -0,0 +1,67 @@
>+--- 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 @@
>+    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)
>+-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
>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindPython_cmake /usr/ports/irc/weechat-devel/files/patch-cmake-FindPython_cmake
>--- /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindPython_cmake	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/files/patch-cmake-FindPython_cmake	2010-12-13 06:16:33.496416909 +0000
>@@ -0,0 +1,23 @@
>+--- cmake/FindPython.cmake.orig	2010-12-10 15:13:27.000000000 +0000
>++++ cmake/FindPython.cmake	2010-12-12 18:23:24.000000000 +0000
>+@@ -34,9 +34,8 @@
>+ ENDIF(PYTHON_FOUND)
>+ 
>+ FIND_PROGRAM(PYTHON_EXECUTABLE
>+-  NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
>+-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
>+-  )
>++   NAMES ${BSD_PYTHON_CMD}
>++   )
>+ 
>+ IF(PYTHON_EXECUTABLE)
>+   EXECUTE_PROCESS(
>+@@ -65,7 +64,7 @@
>+     )
>+   
>+   FIND_LIBRARY(PYTHON_LIBRARY
>+-    NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
>++    NAMES ${BSD_PYTHON_VER}
>+     PATHS ${PYTHON_POSSIBLE_LIB_PATH}
>+     )
>+ 
>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindRuby_cmake /usr/ports/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
>--- /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindRuby_cmake	2010-09-30 05:49:02.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/files/patch-cmake-FindRuby_cmake	2010-12-13 06:16:33.495408683 +0000
>@@ -1,6 +1,13 @@
>---- cmake/FindRuby.cmake.orig	2010-01-05 21:12:22.000000000 +0000
>-+++ cmake/FindRuby.cmake	2010-01-05 21:14:40.000000000 +0000
>-@@ -35,7 +35,7 @@
>+--- cmake/FindRuby.cmake.orig	2010-12-10 15:13:27.000000000 +0000
>++++ cmake/FindRuby.cmake	2010-12-12 03:10:20.000000000 +0000
>+@@ -32,13 +32,12 @@
>+ ENDIF(RUBY_FOUND)
>+ 
>+ FIND_PROGRAM(RUBY_EXECUTABLE
>+-  NAMES ruby ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16
>+-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
>++  NAMES ${BSD_RUBY_CMD}
>+   )
>  
>  IF(RUBY_EXECUTABLE)
>    EXECUTE_PROCESS(
>@@ -9,7 +16,7 @@
>      OUTPUT_VARIABLE RUBY_ARCH_DIR
>      )
>  
>-@@ -45,12 +45,12 @@
>+@@ -48,12 +47,12 @@
>      )
>  
>    EXECUTE_PROCESS(
>@@ -24,3 +31,12 @@
>      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
>      )
>  
>+@@ -78,7 +77,7 @@
>+     "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
>+ 
>+   FIND_LIBRARY(RUBY_LIBRARY
>+-    NAMES ruby ruby1.6 ruby16 ruby1.8 ruby18 ruby1.9 ruby19
>++    NAMES ${BSD_RUBY_VER}
>+     PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
>+     )
>+ 
>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindTCL_cmake /usr/ports/irc/weechat-devel/files/patch-cmake-FindTCL_cmake
>--- /usr/ports/irc/weechat-devel.orig/files/patch-cmake-FindTCL_cmake	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/files/patch-cmake-FindTCL_cmake	2010-12-13 06:16:33.497432399 +0000
>@@ -0,0 +1,102 @@
>+--- cmake/FindTCL.cmake.orig	2010-12-10 15:13:27.000000000 +0000
>++++ cmake/FindTCL.cmake	2010-12-12 19:23:43.000000000 +0000
>+@@ -55,94 +55,18 @@
>+   SET(TCL_FIND_QUIETLY TRUE)
>+ ENDIF(TCL_FOUND)
>+ 
>+-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
>+-  "^.*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_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
>+-  "${TCL_INCLUDE_PATH_PARENT}/lib"
>+-  "${TCL_LIBRARY_PATH}"
>+-  "${TCL_TCLSH_PATH_PARENT}/lib"
>+-  /usr/lib
>+-  /usr/local/lib
>+-  )
>+-
>+-IF(WIN32)
>+-  GET_FILENAME_COMPONENT(
>+-    ActiveTcl_CurrentVersion
>+-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
>+-    NAME)
>+-  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"
>+-    "$ENV{ProgramFiles}/Tcl/Lib"
>+-    "C:/Program Files/Tcl/lib"
>+-    "C:/Tcl/lib"
>+-    )
>+-ENDIF(WIN32)
>++SET(TCL_VERSION ${BSD_TCL_VER})
>++STRING(REPLACE "." "" TCL_INT_VERSION ${TCL_VERSION})
>+ 
>+ FIND_LIBRARY(TCL_LIBRARY
>+   NAMES
>+-  tcl86 tcl8.6
>+-  tcl85 tcl8.5
>+-  tcl
>+-  tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
>+-  PATHS ${TCL_POSSIBLE_LIB_PATHS}
>++  tcl${TCL_INT_VERSION}
>++  PATHS ${BSD_TCL_LIBDIR}
>+   )
>+ 
>+-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_POSSIBLE_INCLUDE_PATHS
>+-  "${TCL_LIBRARY_PATH_PARENT}/include"
>+-  "${TCL_INCLUDE_PATH}"
>+-  ${TCL_FRAMEWORK_INCLUDES}
>+-  "${TCL_TCLSH_PATH_PARENT}/include"
>+-  /usr/include/tcl8.6
>+-  /usr/include/tcl8.5
>+-  /usr/include
>+-  /usr/local/include
>+-  /usr/include/tcl${TCL_VERSION}
>+-  /usr/local/include/tcl${TCL_VERSION}
>+-  /usr/local/include/tcl8.6
>+-  /usr/local/include/tcl8.5
>+-  )
>+-
>+-
>+-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"
>+-    "$ENV{ProgramFiles}/Tcl/include"
>+-    "C:/Program Files/Tcl/include"
>+-    "C:/Tcl/include"
>+-    )
>+-ENDIF(WIN32)
>+-
>+ FIND_PATH(TCL_INCLUDE_PATH
>+   NAMES tcl.h
>+-  PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
>++  PATHS ${BSD_TCL_INCDIR}
>+   )
>+ 
>+ IF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
>diff -ruN --exclude=CVS /usr/ports/irc/weechat-devel.orig/pkg-plist /usr/ports/irc/weechat-devel/pkg-plist
>--- /usr/ports/irc/weechat-devel.orig/pkg-plist	2010-09-10 05:37:23.000000000 +0100
>+++ /usr/ports/irc/weechat-devel/pkg-plist	2010-12-13 06:16:33.498445094 +0000
>@@ -4,6 +4,7 @@
> 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
>@@ -49,6 +50,7 @@
> %%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo
> %%NLS%%share/locale/it/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

Actions: View | Diff

Attachments on bug 153117: 111804