4 files changed, 33 insertions, 43 deletions

diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index 24b12f55dc94..147180fabaef 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -6,47 +6,36 @@
 #
 
 PORTNAME=	termit
-PORTVERSION=	1.3.2
-PORTREVISION=	8
+PORTVERSION=	2.5.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	GOOGLE_CODE \
-		LOCAL/chinsan/${PORTNAME}/
+MASTER_SITES=	http://cloud.github.com/downloads/nonstop/termit/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small terminal emulator
 
-MAKE_JOBS_SAFE=	yes
-
-BUILD_DEPENDS=	vte:${PORTSDIR}/x11-toolkits/vte
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_BZIP2=	yes
-USE_CMAKE=	yes
-CMAKE_ARGS=	-DCMAKE_INSTALL_PREFIX=${LOCALBASE}
-
-.if !defined(WITHOUT_NLS)
+USE_GNOME=	vte
+USE_LUA=	yes
 USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-.else
-CMAKE_ARGS+=	-DENABLE_NLS:BOOL=false
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 
-do-build:
-	@(cd ${BUILD_WRKSRC}; \
-	cmake ${CMAKE_ARGS} .; \
-	${MAKE})
+MAN1=		${PORTNAME}.1
 
 post-patch:
-.ifdef NOPORTDOCS
-	@${REINPLACE_CMD} -e '1,3 d' ${WRKSRC}/doc/CMakeLists.txt
+	@${REINPLACE_CMD} -e '/doc/s|^|#|' ${WRKSRC}/CMakeLists.txt
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.desktop ${PREFIX}/share/applications
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.svg ${PREFIX}/share/pixmaps
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in README lua_api.txt rc.lua.example
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
 .endif
 
-do-install:
-	@(cd ${BUILD_WRKSRC}; \
-	${MAKE} install)
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/termit/distinfo b/x11-toolkits/termit/distinfo
index 953cdf722984..d045ba6ab3cb 100644
--- a/x11-toolkits/termit/distinfo
+++ b/x11-toolkits/termit/distinfo
@@ -1,3 +1,3 @@
-MD5 (termit-1.3.2.tar.bz2) = 63e2feaffc79a85278f8503a969e748f
-SHA256 (termit-1.3.2.tar.bz2) = 0cdd85f92352c390477404d53ee50818e926f7a6730fbed52d8fa6cd7581a118
-SIZE (termit-1.3.2.tar.bz2) = 22612
+MD5 (termit-2.5.0.tar.bz2) = b4114e1eb6f37967d026dedd76b5cc75
+SHA256 (termit-2.5.0.tar.bz2) = df1a3a92df257fbdef9c311feec5d09924e5e07ac3280b9e2e3b5c60e096c613
+SIZE (termit-2.5.0.tar.bz2) = 37813
diff --git a/x11-toolkits/termit/pkg-descr b/x11-toolkits/termit/pkg-descr
index ed83220871ca..edcd169610fb 100644
--- a/x11-toolkits/termit/pkg-descr
+++ b/x11-toolkits/termit/pkg-descr
@@ -1,4 +1,4 @@
 Small terminal emulator. The only dependencies are Vte and Gtk2 libs.
 Termit supports tabs, bookmarks, encoding switching and sessions.
 
-WWW: http://code.google.com/p/termit/wiki/TermIt
+WWW: http://wiki.github.com/nonstop/termit/
diff --git a/x11-toolkits/termit/pkg-plist b/x11-toolkits/termit/pkg-plist
index 67fff5ca0976..457787c6183d 100644
--- a/x11-toolkits/termit/pkg-plist
+++ b/x11-toolkits/termit/pkg-plist
@@ -1,12 +1,13 @@
 bin/termit
-%%NLS%%share/locale/fr/LC_MESSAGES/termit.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/termit.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/termit.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/termit.mo
 share/applications/termit.desktop
-@dirrmtry share/applications
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/termit.example
-%%PORTDOCS%%%%DOCSDIR%%/session.example
+%%PORTDOCS%%%%DOCSDIR%%/lua_api.txt
+%%PORTDOCS%%%%DOCSDIR%%/rc.lua.example
+share/locale/fr/LC_MESSAGES/termit.mo
+share/locale/hu/LC_MESSAGES/termit.mo
+share/locale/ko/LC_MESSAGES/termit.mo
+share/locale/ru/LC_MESSAGES/termit.mo
+share/locale/zh_TW/LC_MESSAGES/termit.mo
+share/pixmaps/termit.svg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-
+@dirrmtry share/applications