svn commit: r304162 - in head/x11-toolkits/termit: . files

[Pawel Pekala]

Author: pawel
Date: Wed Sep 12 20:39:39 2012
New Revision: 304162
URL: http://svn.freebsd.org/changeset/ports/304162

Log:
  Update to version 2.9.6

Added:
  head/x11-toolkits/termit/files/
  head/x11-toolkits/termit/files/patch-src__CMakeLists.txt   (contents, props changed)
Modified:
  head/x11-toolkits/termit/Makefile
  head/x11-toolkits/termit/distinfo

Modified: head/x11-toolkits/termit/Makefile
==============================================================================
--- head/x11-toolkits/termit/Makefile	Wed Sep 12 20:15:53 2012	(r304161)
+++ head/x11-toolkits/termit/Makefile	Wed Sep 12 20:39:39 2012	(r304162)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	termit
-PORTVERSION=	2.9.5
+PORTVERSION=	2.9.6
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	http://cloud.github.com/downloads/nonstop/termit/
 
@@ -34,7 +34,7 @@ USE_XORG=	pixman x11 xau xcomposite xcur
 		xi xinerama xrandr xrender
 MAKE_JOBS_SAFE=	yes
 
-CFLAGS+=	-I${LUA_INCDIR}
+CFLAGS+=	-I${LOCALBASE}/include/vte-0.0
 
 MAN1=		${PORTNAME}.1
 
@@ -65,8 +65,8 @@ post-patch:
 	@${REINPLACE_CMD} 's|share/man|man|' ${WRKSRC}/doc/CMakeLists.txt
 	@${REINPLACE_CMD} 's|ADD_SUBDIRECTORY(etc)||' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/src/lua_conf.c
-	@${REINPLACE_CMD} -e 's|/usr/lib/liblua.a|${LUA_LIBDIR}/liblua.a|' \
-		-e 's|-ldl||' ${WRKSRC}/src/CMakeLists.txt
+	@${REINPLACE_CMD} 's|/usr/lib/liblua.a|${LUA_LIBDIR}/liblua.a|' \
+		${WRKSRC}/src/CMakeLists.txt
 
 post-install:
 	${MKDIR} ${TERMIT_ETC}

Modified: head/x11-toolkits/termit/distinfo
==============================================================================
--- head/x11-toolkits/termit/distinfo	Wed Sep 12 20:15:53 2012	(r304161)
+++ head/x11-toolkits/termit/distinfo	Wed Sep 12 20:39:39 2012	(r304162)
@@ -1,2 +1,2 @@
-SHA256 (termit-2.9.5.tar.bz2) = 85aae941ec265d341ec2dbe4a6b60c6e075810345632767032dfd4fb451ce757
-SIZE (termit-2.9.5.tar.bz2) = 47675
+SHA256 (termit-2.9.6.tar.bz2) = f22cef9359155bb2f57ad2f724cf061fe03600ef555c16d41375f4d53897bf03
+SIZE (termit-2.9.6.tar.bz2) = 48096

Added: head/x11-toolkits/termit/files/patch-src__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/termit/files/patch-src__CMakeLists.txt	Wed Sep 12 20:39:39 2012	(r304162)
@@ -0,0 +1,31 @@
+--- ./src/CMakeLists.txt.orig	2012-09-12 22:14:24.000000000 +0200
++++ ./src/CMakeLists.txt	2012-09-12 22:16:09.000000000 +0200
+@@ -19,9 +19,9 @@
+ 
+ SET(GTK_VERSION "" CACHE STRING "Gtk version")
+ IF(GTK_VERSION STREQUAL "")
+-  pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0>=2.12)
++  pkg_search_module(GTK REQUIRED gtk+-2.0>=2.12)
+ ELSE(GTK_VERSION STREQUAL "")
+-  pkg_search_module(GTK REQUIRED gtk+-3.0=${GTK_VERSION} gtk+-2.0=${GTK_VERSION})
++  pkg_search_module(GTK REQUIRED gtk+-2.0=${GTK_VERSION})
+ ENDIF(GTK_VERSION STREQUAL "")
+ IF(NOT GTK_FOUND)
+   message(FATAL_ERROR "Gtk library was not found.")
+@@ -45,7 +45,7 @@
+ 
+ SET(LUA_VERSION "" CACHE STRING "Lua version")
+ IF(LUA_VERSION STREQUAL "")
+-  pkg_search_module(LUA REQUIRED lua>=5.0 lua5.2 lua5.1)
++  pkg_search_module(LUA REQUIRED lua>=5.0 lua-5.2 lua-5.1)
+ ELSE(LUA_VERSION STREQUAL "")
+   pkg_search_module(LUA REQUIRED
+     lua=${LUA_VERSION} lua5.2=${LUA_VERSION} lua5.1=${LUA_VERSION} lua5.0=${LUA_VERSION})
+@@ -79,7 +79,6 @@
+ 
+ ADD_EXECUTABLE(${TARGET} ${TERMIT_SRCS})
+ 
+-SET(TERMIT_LDFLAGS "-ldl")
+ FOREACH(ldflag ${VTE_LDFLAGS} ${GTK_LDFLAGS} ${LUA_LDFLAGS})
+   LIST(APPEND TERMIT_LDFLAGS "${ldflag}")
+ ENDFOREACH(ldflag)