3 files changed, 49 insertions, 32 deletions

diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index 90379cd914c0..81341dcb4e58 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	termit
-PORTVERSION=	2.9.2
+PORTVERSION=	2.9.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	http://cloud.github.com/downloads/nonstop/termit/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Small terminal emulator
 
 LICENSE=	GPLv2
@@ -24,26 +24,36 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		${PORTNAME}.1
 
+TERMIT_ETC=	${PREFIX}/etc/xdg/${PORTNAME}
+
+.if defined(WITH_DEBUG)
+CMAKE_ARGS+=	-DDEBUG:BOOL=YES
+.endif
+
+.if defined(WITHOUT_NLS)
+CMAKE_ARGS+=	-DENABLE_NLS:BOOL=NO
+PLIST_SUB+=	NLS="@comment "
+.else
+PLIST_SUB+=	NLS=""
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/doc/s|^|#|' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e \
-		's| /etc| etc|' ${WRKSRC}/etc/CMakeLists.txt
-	@${REINPLACE_CMD} -e \
-		's|:/etc|:${PREFIX}/etc| ; \
-		 s|"/etc|"${PREFIX}/etc|' ${WRKSRC}/src/lua_conf.c
+.if !defined(NOPORTDOCS)
+	@${REINPLACE_CMD} 's|../COPYING||' ${WRKSRC}/doc/CMakeLists.txt
+.else
+	@${REINPLACE_CMD} '/TERMIT_DOCS/s|^|#|' ${WRKSRC}/doc/CMakeLists.txt
+.endif
+	@${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
 
 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}
+	${MKDIR} ${TERMIT_ETC}
+.for file in colormaps.lua rc.lua utils.lua
+	${CP} ${WRKSRC}/etc/termit/${file} ${TERMIT_ETC}/${file}.sample
+	@if [ ! -f ${TERMIT_ETC}/${file} ]; then \
+		${CP} -p ${TERMIT_ETC}/${file}.sample ${TERMIT_ETC}/${file}; \
+	fi
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/termit/distinfo b/x11-toolkits/termit/distinfo
index 92b909ba889e..841632526f40 100644
--- a/x11-toolkits/termit/distinfo
+++ b/x11-toolkits/termit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (termit-2.9.2.tar.bz2) = 80aaf83e37df0f0fc137b3be7f0056ce523f6279646cfdac440a73110e0113c6
-SIZE (termit-2.9.2.tar.bz2) = 44584
+SHA256 (termit-2.9.3.tar.bz2) = 81a7577441a4d6dacb8c6cd2b074eb99629475372cb0e369cbbceee9a6033139
+SIZE (termit-2.9.3.tar.bz2) = 46008
diff --git a/x11-toolkits/termit/pkg-plist b/x11-toolkits/termit/pkg-plist
index 789fc893aff3..16212d0da6d0 100644
--- a/x11-toolkits/termit/pkg-plist
+++ b/x11-toolkits/termit/pkg-plist
@@ -1,19 +1,26 @@
 bin/termit
-etc/xdg/termit/colormaps.lua
-etc/xdg/termit/rc.lua
-etc/xdg/termit/utils.lua
+@unexec if cmp -s %D/etc/xdg/termit/colormaps.lua.sample %D/etc/xdg/termit/colormaps.lua; then rm -f %  %D/etc/xdg/termit/colormaps.lua; fi
+etc/xdg/termit/colormaps.lua.sample
+@exec if [ ! -f %D/etc/colormaps.lua ] ; then cp -p %D/%F %B/colormaps.lua; fi
+@unexec if cmp -s %D/etc/xdg/termit/rc.lua.sample %D/etc/xdg/termit/rc.lua; then rm -f %D/etc/xdg/termit/rc.lua; fi
+etc/xdg/termit/rc.lua.sample
+@exec if [ ! -f %D/etc/rc.lua ] ; then cp -p %D/%F %B/rc.lua; fi
+@unexec if cmp -s %D/etc/xdg/termit/utils.lua.sample %D/etc/xdg/termit/utils.lua; then rm -f %D/etc/xdg/termit/utils.lua; fi
+etc/xdg/termit/utils.lua.sample
+@exec if [ ! -f %D/etc/utils.lua ] ; then cp -p %D/%F %B/utils.lua; fi
 share/applications/termit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%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/ja/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
+%%NLS%%share/locale/de/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/es/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/termit.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/termit.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrm etc/xdg/termit
+@dirrmtry etc/xdg/termit
 @dirrmtry etc/xdg