Attachment #111804 for bug #153117

View | Details | Raw Unified | Return to bug 153117
Collapse All | Expand All




#

PORTNAME=	weechat
PORTVERSION=	20101212
CATEGORIES=	irc
MASTER_SITES=	http://perturb.me.uk/distfiles/
		http://freebsd.unixfreunde.de/sources/
PKGNAMESUFFIX=	-devel
DISTNAME=	weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad

MAINTAINER=	freebsd@beardz.net
COMMENT=	A lightweight and user friendly ncurse based IRC client

		NLS		"NLS support."			On	\
		DOCUMENTATION	"Build documentation."		Off

WRKSRC=	${WRKDIR}/${PORTNAME}-25d9d6e

.include <bsd.port.options.mk>


.endif

.if defined(WITH_PYTHON)
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


.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

.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


.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

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

Lines 1-3 Link Here

(-)/usr/ports/irc/weechat-devel/distinfo (-3 / +2 lines)
1	MD5 (weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8.tar.gz) = c2ea1cedae57792eadb1fe5c178f659e	1	SHA256 (weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad.tar.gz) = d76296f98b8917aa7da0ba9a38ff706c29073e22b7847c3d7330be3a28b19402
2	SHA256 (weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8.tar.gz) = 9eaf61b7f7b21eaeae27b5e86ef8d92724d11a048b8629e3e6ed999df4e02e1b	2	SIZE (weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad.tar.gz) = 1655384
3	SIZE (weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8.tar.gz) = 1544430




--- 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




--- 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}
     )
 

Lines 1-6 Link Here

(-)/usr/ports/irc/weechat-devel/files/patch-cmake-FindRuby_cmake (-4 / +20 lines)
1	--- cmake/FindRuby.cmake.orig 2010-01-05 21:12:22.000000000 +0000	1	--- cmake/FindRuby.cmake.orig 2010-12-10 15:13:27.000000000 +0000
2	+++ cmake/FindRuby.cmake 2010-01-05 21:14:40.000000000 +0000	2	+++ cmake/FindRuby.cmake 2010-12-12 03:10:20.000000000 +0000
3	@@ -35,7 +35,7 @@	3	@@ -32,13 +32,12 @@
		4	ENDIF(RUBY_FOUND)
		5
		6	FIND_PROGRAM(RUBY_EXECUTABLE
		7	- NAMES ruby ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16
		8	- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
		9	+ NAMES ${BSD_RUBY_CMD}
		10	)
4		11
5	IF(RUBY_EXECUTABLE)	12	IF(RUBY_EXECUTABLE)
6	EXECUTE_PROCESS(	13	EXECUTE_PROCESS(
Lines 9-15 Link Here
9	OUTPUT_VARIABLE RUBY_ARCH_DIR	16	OUTPUT_VARIABLE RUBY_ARCH_DIR
10	)	17	)
11		18
12	@@ -45,12 +45,12 @@	19	@@ -48,12 +47,12 @@
13	)	20	)
14		21
15	EXECUTE_PROCESS(	22	EXECUTE_PROCESS(
Lines 24-26 Link Here
24	OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH	31	OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
25	)	32	)
26		33
		34	@@ -78,7 +77,7 @@
		35	"${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
		36
		37	FIND_LIBRARY(RUBY_LIBRARY
		38	- NAMES ruby ruby1.6 ruby16 ruby1.8 ruby18 ruby1.9 ruby19
		39	+ NAMES ${BSD_RUBY_VER}
		40	PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
		41	)
		42




--- 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)

Lines 4-9 Link Here

(-)/usr/ports/irc/weechat-devel/pkg-plist (+2 lines)
4	lib/weechat/plugins/fifo.so	4	lib/weechat/plugins/fifo.so
5	lib/weechat/plugins/irc.so	5	lib/weechat/plugins/irc.so
6	lib/weechat/plugins/logger.so	6	lib/weechat/plugins/logger.so
		7	lib/weechat/plugins/relay.so
7	lib/weechat/plugins/rmodifier.so	8	lib/weechat/plugins/rmodifier.so
8	lib/weechat/plugins/xfer.so	9	lib/weechat/plugins/xfer.so
9	libdata/pkgconfig/weechat.pc	10	libdata/pkgconfig/weechat.pc
Lines 49-54 Link Here
49	%%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo	50	%%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo
50	%%NLS%%share/locale/it/LC_MESSAGES/weechat.mo	51	%%NLS%%share/locale/it/LC_MESSAGES/weechat.mo
51	%%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo	52	%%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo
		53	%%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo
52	%%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo	54	%%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo
53	@dirrmtry lib/weechat/plugins	55	@dirrmtry lib/weechat/plugins
54	@dirrmtry lib/weechat	56	@dirrmtry lib/weechat

Return to bug 153117

Lines 6-17 Link Here

(-)/usr/ports/irc/weechat-devel/Makefile (-6 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= weechat	8	PORTNAME= weechat
9	PORTVERSION= 20100928	9	PORTVERSION= 20101212
10	CATEGORIES= irc	10	CATEGORIES= irc
11	MASTER_SITES= http://perturb.me.uk/distfiles/ \	11	MASTER_SITES= http://perturb.me.uk/distfiles/
12	http://freebsd.unixfreunde.de/sources/
13	PKGNAMESUFFIX= -devel	12	PKGNAMESUFFIX= -devel
14	DISTNAME= weechat-devel-b3b0f2d31c4d3c6a31561c3793c61dd81287daa8	13	DISTNAME= weechat-devel-25d9d6e0fec88c9ee0377d08132fd394b4577bad
15		14
16	MAINTAINER= freebsd@beardz.net	15	MAINTAINER= freebsd@beardz.net
17	COMMENT= A lightweight and user friendly ncurse based IRC client	16	COMMENT= A lightweight and user friendly ncurse based IRC client
Lines 38-44 Link Here
38	NLS "NLS support." On \	37	NLS "NLS support." On \
39	DOCUMENTATION "Build documentation." Off	38	DOCUMENTATION "Build documentation." Off
40		39
41	WRKSRC= ${WRKDIR}/${PORTNAME}-b3b0f2d	40	WRKSRC= ${WRKDIR}/${PORTNAME}-25d9d6e
42		41
43	.include <bsd.port.options.mk>	42	.include <bsd.port.options.mk>
44		43
Lines 70-76 Link Here
70	.endif	69	.endif
71		70
72	.if defined(WITH_PYTHON)	71	.if defined(WITH_PYTHON)
73	USE_PYTHON= yes	72	USE_PYTHON= -2.7
		73	CMAKE_ARGS+= -DBSD_PYTHON_CMD=${PYTHON_CMD} \
		74	-DBSD_PYTHON_VER=${PYTHON_VERSION}
74	PLIST_SUB+= PYTHON=""	75	PLIST_SUB+= PYTHON=""
75	.else	76	.else
76	CMAKE_ARGS+= -DENABLE_PYTHON=no	77	CMAKE_ARGS+= -DENABLE_PYTHON=no
Lines 79-84 Link Here
79		80
80	.if defined(WITH_RUBY)	81	.if defined(WITH_RUBY)
81	USE_RUBY= yes	82	USE_RUBY= yes
		83	CMAKE_ARGS+= -DBSD_RUBY_CMD=${RUBY} \
		84	-DBSD_RUBY_VER=${RUBY_NAME}
82	PLIST_SUB+= RUBY=""	85	PLIST_SUB+= RUBY=""
83	.else	86	.else
84	CMAKE_ARGS+= -DENABLE_RUBY=no	87	CMAKE_ARGS+= -DENABLE_RUBY=no
Lines 102-107 Link Here
102	.if defined(WITH_TCL)	105	.if defined(WITH_TCL)
103	USE_TCL= 83+	106	USE_TCL= 83+
104	.include "${PORTSDIR}/Mk/bsd.tcl.mk"	107	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
		108	CMAKE_ARGS+= -DBSD_TCL_VER=${TCL_VER} \
		109	-DBSD_TCL_LIBDIR=${LOCALBASE}/lib \
		110	-DBSD_TCL_INCDIR=${TCL_INCLUDEDIR}
105	PLIST_SUB+= TCL=""	111	PLIST_SUB+= TCL=""
106	.else	112	.else
107	CMAKE_ARGS+= -DENABLE_TCL=no	113	CMAKE_ARGS+= -DENABLE_TCL=no
Lines 110-115 Link Here
110		116
111	.if defined(WITH_LUA)	117	.if defined(WITH_LUA)
112	USE_LUA= 5.0+	118	USE_LUA= 5.0+
		119	CMAKE_ARGS+= -DBSD_LUA_VER=${LUA_VER} \
		120	-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
		121	-DBSD_LUA_INCDIR=${LUA_INCDIR}
113	PLIST_SUB+= LUA=""	122	PLIST_SUB+= LUA=""
114	.else	123	.else
115	CMAKE_ARGS+= -DENABLE_LUA=no	124	CMAKE_ARGS+= -DENABLE_LUA=no
Lines 137-142 Link Here
137	post-patch:	146	post-patch:
138	@${REINPLACE_CMD} -e 's\|$${LIBDIR}/../pkgconfig\|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/CMakeLists.txt	147	@${REINPLACE_CMD} -e 's\|$${LIBDIR}/../pkgconfig\|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/CMakeLists.txt
139	@${REINPLACE_CMD} -e 's\|INSTALL\|#INSTALL\|' ${WRKSRC}/doc/CMakeLists.txt	148	@${REINPLACE_CMD} -e 's\|INSTALL\|#INSTALL\|' ${WRKSRC}/doc/CMakeLists.txt
		149	.for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake
		150	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' ${WRKSRC}/${f}
		151	.endfor
140	.if defined(WITHOUT_BACKTRACE)	152	.if defined(WITHOUT_BACKTRACE)
141	@${REINPLACE_CMD} -e '/IF.FreeBSD/,/ENDIF.FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt	153	@${REINPLACE_CMD} -e '/IF.FreeBSD/,/ENDIF.FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt
142	.endif	154	.endif

Line 0 Link Here

(-)/usr/ports/irc/weechat-devel/files/patch-cmake-FindLua_cmake (+67 lines)
		1	--- cmake/FindLua.cmake.orig 2010-12-10 15:13:27.000000000 +0000
		2	+++ cmake/FindLua.cmake 2010-12-12 04:00:45.000000000 +0000
		3	@@ -33,51 +33,24 @@
		4	SET(LUA_FIND_QUIETLY TRUE)
		5	ENDIF(LUA_FOUND)
		6
		7	-FIND_PATH(
		8	- LUA51_INCLUDE_PATH lua.h
		9	- PATHS /usr/include /usr/local/include /usr/pkg/include
		10	- PATH_SUFFIXES lua51 lua5.1 lua-5.1
		11	+FIND_PATH(LUA_INCLUDE_PATH lua.h
		12	+ PATHS ${BSD_LUA_INCDIR}
		13	)
		14
		15	-FIND_LIBRARY(
		16	- LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
		17	- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
		18	- PATH_SUFFIXES lua51 lua5.1 lua-5.1
		19	+FIND_LIBRARY(LUA_LIBRARY
		20	+ NAMES lua
		21	+ PATHS ${BSD_LUA_LIBDIR}
		22	)
		23
		24	-IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
		25	- SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}")
		26	- SET(LUA_LIBRARY "${LUA51_LIBRARY}")
		27	- SET(LUA_VERSION "5.1")
		28	- SET(LUA_FOUND TRUE)
		29	-ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
		30	- FIND_PATH(
		31	- LUA50_INCLUDE_PATH lua.h
		32	- PATHS /usr/include /usr/local/include /usr/pkg/include
		33	- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
		34	- )
		35	-
		36	- FIND_LIBRARY(
		37	- LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
		38	- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
		39	- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
		40	- )
		41	-
		42	- FIND_LIBRARY(
		43	- LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
		44	- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
		45	- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
		46	- )
		47	-
		48	- IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
		49	- SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}")
		50	- SET(LUA_LIBRARY "${LUA50_LIBRARY}")
		51	- SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}")
		52	- SET(LUA_VERSION "5.0")
		53	- SET(LUA_FOUND TRUE)
		54	- ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
		55	-ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
		56	+SET(LUA_VERSION ${BSD_LUA_VER})
		57	+
		58	+IF(LUA_VERSION STREQUAL "5.0")
		59	+ SET(LUALIB_LIBRARY ${LUA_LIBRARY})
		60	+ENDIF(LUA_VERSION STREQUAL "5.0")
		61
		62	+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
		63	+ SET(LUA_FOUND TRUE)
		64	+ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
65
66	MARK_AS_ADVANCED(
67	LUA_INCLUDE_PATH

Line 0 Link Here

(-)/usr/ports/irc/weechat-devel/files/patch-cmake-FindPython_cmake (+23 lines)
	1	--- cmake/FindPython.cmake.orig 2010-12-10 15:13:27.000000000 +0000
	2	+++ cmake/FindPython.cmake 2010-12-12 18:23:24.000000000 +0000
	3	@@ -34,9 +34,8 @@
	4	ENDIF(PYTHON_FOUND)
	5
	6	FIND_PROGRAM(PYTHON_EXECUTABLE
	7	- NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
	8	- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
	9	- )
	10	+ NAMES ${BSD_PYTHON_CMD}
	11	+ )
	12
	13	IF(PYTHON_EXECUTABLE)
	14	EXECUTE_PROCESS(
	15	@@ -65,7 +64,7 @@
	16	)
	17
	18	FIND_LIBRARY(PYTHON_LIBRARY
	19	- NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
	20	+ NAMES ${BSD_PYTHON_VER}
	21	PATHS ${PYTHON_POSSIBLE_LIB_PATH}
	22	)
	23

Line 0 Link Here

(-)/usr/ports/irc/weechat-devel/files/patch-cmake-FindTCL_cmake (+102 lines)
		1	--- cmake/FindTCL.cmake.orig 2010-12-10 15:13:27.000000000 +0000
		2	+++ cmake/FindTCL.cmake 2010-12-12 19:23:43.000000000 +0000
		3	@@ -55,94 +55,18 @@
		4	SET(TCL_FIND_QUIETLY TRUE)
		5	ENDIF(TCL_FOUND)
		6
		7	-INCLUDE(CMakeFindFrameworks)
		8	-INCLUDE(FindTclsh)
		9	-
		10	-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
		11	-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
		12	-STRING(REGEX REPLACE
		13	- "^.tclsh([0-9]\\.[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
		14	-
		15	-GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
		16	-
		17	-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
		18	-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
		19	-STRING(REGEX REPLACE
		20	- "^.tcl([0-9]\\.[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}")
		21	-
		22	-SET(TCL_POSSIBLE_LIB_PATHS
		23	- "${TCL_INCLUDE_PATH_PARENT}/lib"
		24	- "${TCL_LIBRARY_PATH}"
		25	- "${TCL_TCLSH_PATH_PARENT}/lib"
		26	- /usr/lib
		27	- /usr/local/lib
		28	- )
		29	-
		30	-IF(WIN32)
		31	- GET_FILENAME_COMPONENT(
		32	- ActiveTcl_CurrentVersion
		33	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
		34	- NAME)
		35	- SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
		36	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
		37	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
		38	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
		39	- "$ENV{ProgramFiles}/Tcl/Lib"
		40	- "C:/Program Files/Tcl/lib"
		41	- "C:/Tcl/lib"
		42	- )
		43	-ENDIF(WIN32)
		44	+SET(TCL_VERSION ${BSD_TCL_VER})
		45	+STRING(REPLACE "." "" TCL_INT_VERSION ${TCL_VERSION})
		46
		47	FIND_LIBRARY(TCL_LIBRARY
		48	NAMES
		49	- tcl86 tcl8.6
		50	- tcl85 tcl8.5
		51	- tcl
		52	- tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
		53	- PATHS ${TCL_POSSIBLE_LIB_PATHS}
		54	+ tcl${TCL_INT_VERSION}
		55	+ PATHS ${BSD_TCL_LIBDIR}
		56	)
		57
		58	-CMAKE_FIND_FRAMEWORKS(Tcl)
		59	-
		60	-SET(TCL_FRAMEWORK_INCLUDES)
		61	-IF(Tcl_FRAMEWORKS)
		62	- IF(NOT TCL_INCLUDE_PATH)
		63	- FOREACH(dir ${Tcl_FRAMEWORKS})
		64	- SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
65	- ENDFOREACH(dir)
66	- ENDIF(NOT TCL_INCLUDE_PATH)
67	-ENDIF(Tcl_FRAMEWORKS)
68	-
69	-SET(TCL_POSSIBLE_INCLUDE_PATHS
70	- "${TCL_LIBRARY_PATH_PARENT}/include"
71	- "${TCL_INCLUDE_PATH}"
72	- ${TCL_FRAMEWORK_INCLUDES}
73	- "${TCL_TCLSH_PATH_PARENT}/include"
74	- /usr/include/tcl8.6
75	- /usr/include/tcl8.5
76	- /usr/include
77	- /usr/local/include
78	- /usr/include/tcl${TCL_VERSION}
79	- /usr/local/include/tcl${TCL_VERSION}
80	- /usr/local/include/tcl8.6
81	- /usr/local/include/tcl8.5
82	- )
83	-
84	-
85	-IF(WIN32)
86	- SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
87	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
88	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
89	- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
90	- "$ENV{ProgramFiles}/Tcl/include"
91	- "C:/Program Files/Tcl/include"
92	- "C:/Tcl/include"
93	- )
94	-ENDIF(WIN32)
95	-
96	FIND_PATH(TCL_INCLUDE_PATH
97	NAMES tcl.h
98	- PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
99	+ PATHS ${BSD_TCL_INCDIR}
100	)
101
102	IF(TCL_LIBRARY AND TCL_INCLUDE_PATH)