svn commit: r309251 - head/x11-toolkits/termit

[Pawel Pekala]

Author: pawel
Date: Wed Dec 19 17:37:48 2012
New Revision: 309251
URL: http://svnweb.freebsd.org/changeset/ports/309251

Log:
  - Fix package installation removing modified config files
    due wrong paths in @exec commands
  - Order USE_ flags properly

Modified:
  head/x11-toolkits/termit/Makefile
  head/x11-toolkits/termit/pkg-plist

Modified: head/x11-toolkits/termit/Makefile
==============================================================================
--- head/x11-toolkits/termit/Makefile	Wed Dec 19 17:30:57 2012	(r309250)
+++ head/x11-toolkits/termit/Makefile	Wed Dec 19 17:37:48 2012	(r309251)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	termit
-# Date created:				2008/06/20
-# Whom:					chinsan
-#
+# Created by: chinsan
 # $FreeBSD$
-#
 
 PORTNAME=	termit
 PORTVERSION=	2.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	http://cloud.github.com/downloads/nonstop/termit/
 
@@ -26,13 +22,13 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
 		xcb:${PORTSDIR}/x11/libxcb
 
 USE_BZIP2=	yes
-USE_GNOME=	gdkpixbuf2 vte
-USE_LUA=	yes
 USE_CMAKE=	yes
 USE_PKGCONFIG=	build
 USE_ICONV=	yes
+USE_LUA=	yes
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
+USE_GNOME=	gdkpixbuf2 vte
 MAKE_JOBS_SAFE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include/vte-0.0

Modified: head/x11-toolkits/termit/pkg-plist
==============================================================================
--- head/x11-toolkits/termit/pkg-plist	Wed Dec 19 17:30:57 2012	(r309250)
+++ head/x11-toolkits/termit/pkg-plist	Wed Dec 19 17:37:48 2012	(r309251)
@@ -1,13 +1,13 @@
 bin/termit
- at 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
+ at 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
- at exec if [ ! -f %D/etc/colormaps.lua ] ; then cp -p %D/%F %B/colormaps.lua; fi
+ at exec if [ ! -f %D/etc/xdg/termit/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
- at exec if [ ! -f %D/etc/rc.lua ] ; then cp -p %D/%F %B/rc.lua; fi
+ at exec if [ ! -f %D/etc/xdg/termit/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
- at exec if [ ! -f %D/etc/utils.lua ] ; then cp -p %D/%F %B/utils.lua; fi
+ at exec if [ ! -f %D/etc/xdg/termit/utils.lua ] ; then cp -p %D/%F %B/utils.lua; fi
 share/applications/termit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/lua_api.txt