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

[Pawel Pekala]

Author: pawel
Date: Sat Sep  6 20:21:18 2014
New Revision: 367469
URL: http://svnweb.freebsd.org/changeset/ports/367469
QAT: https://qat.redports.org/buildarchive/r367469/

Log:
  - Update to version 2.10.0
  - Fetch by using USE_GITHUB macros
  - Make COMMENT description better

Modified:
  head/x11-toolkits/termit/Makefile
  head/x11-toolkits/termit/distinfo
  head/x11-toolkits/termit/files/patch-src__CMakeLists.txt
  head/x11-toolkits/termit/pkg-plist

Modified: head/x11-toolkits/termit/Makefile
==============================================================================
--- head/x11-toolkits/termit/Makefile	Sat Sep  6 19:21:56 2014	(r367468)
+++ head/x11-toolkits/termit/Makefile	Sat Sep  6 20:21:18 2014	(r367469)
@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	termit
-PORTVERSION=	2.9.6
-PORTREVISION=	4
+PORTVERSION=	2.10.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	http://cloud.github.com/downloads/nonstop/termit/
 
 MAINTAINER=	pawel at FreeBSD.org
-COMMENT=	Small terminal emulator
+COMMENT=	Small terminal emulator with Lua scripting
 
 LICENSE=	GPLv2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	nonstop
+GH_COMMIT=	7d6e712
+
 USES=		cmake lua pkgconfig tar:bzip2
 USE_GNOME=	gdkpixbuf2 vte
 
@@ -28,11 +30,12 @@ NLS_CMAKE_OFF=	-DENABLE_NLS:BOOL=NO
 NLS_USES=	gettext
 
 post-patch:
-	@${REINPLACE_CMD} 's|share/man|man|' ${WRKSRC}/doc/CMakeLists.txt
+	@${REINPLACE_CMD} 's|share/man|man|; s|../COPYING||' \
+		${WRKSRC}/doc/CMakeLists.txt
+	@${REINPLACE_CMD} 's|OpenBSD|${OPSYS}|; s|lua52|lua-${LUA_VER}|' \
+		${WRKSRC}/src/CMakeLists.txt
 	@${REINPLACE_CMD} 's|ADD_SUBDIRECTORY(etc)||' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/src/lua_conf.c
-	@${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	Sat Sep  6 19:21:56 2014	(r367468)
+++ head/x11-toolkits/termit/distinfo	Sat Sep  6 20:21:18 2014	(r367469)
@@ -1,2 +1,2 @@
-SHA256 (termit-2.9.6.tar.bz2) = f22cef9359155bb2f57ad2f724cf061fe03600ef555c16d41375f4d53897bf03
-SIZE (termit-2.9.6.tar.bz2) = 48096
+SHA256 (termit-2.10.0.tar.bz2) = 0c2bbf7e389c9984b6e207646f86788d757acfc37391525ba2c7e57e92f63ad9
+SIZE (termit-2.10.0.tar.bz2) = 56408

Modified: head/x11-toolkits/termit/files/patch-src__CMakeLists.txt
==============================================================================
--- head/x11-toolkits/termit/files/patch-src__CMakeLists.txt	Sat Sep  6 19:21:56 2014	(r367468)
+++ head/x11-toolkits/termit/files/patch-src__CMakeLists.txt	Sat Sep  6 20:21:18 2014	(r367469)
@@ -1,5 +1,5 @@
---- ./src/CMakeLists.txt.orig	2012-09-12 22:14:24.000000000 +0200
-+++ ./src/CMakeLists.txt	2012-09-12 22:16:09.000000000 +0200
+--- src/CMakeLists.txt.orig	2014-04-12 18:19:11 UTC
++++ src/CMakeLists.txt
 @@ -19,9 +19,9 @@
  
  SET(GTK_VERSION "" CACHE STRING "Gtk version")
@@ -12,20 +12,3 @@
  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)

Modified: head/x11-toolkits/termit/pkg-plist
==============================================================================
--- head/x11-toolkits/termit/pkg-plist	Sat Sep  6 19:21:56 2014	(r367468)
+++ head/x11-toolkits/termit/pkg-plist	Sat Sep  6 20:21:18 2014	(r367469)
@@ -19,4 +19,3 @@ share/applications/termit.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/termit.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry etc/xdg/termit
- at dirrmtry etc/xdg