From 890cb2cf274413211208517396d1e4bf8996eeff Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Sun, 24 Oct 2010 19:03:55 +0000
Subject: [PATCH] - rename Terminal binary to xfce4-terminal using
 --program-transform-name - rename package to xfce4-terminal - add @conflict
 for the upgrade path - bump REVISION

---
 x11/xfce4/terminal/Makefile  |  7 ++++---
 x11/xfce4/terminal/pkg/PLIST | 34 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/x11/xfce4/terminal/Makefile b/x11/xfce4/terminal/Makefile
index 299e1abd77e..6149901ae63 100644
--- a/x11/xfce4/terminal/Makefile
+++ b/x11/xfce4/terminal/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/19 08:14:00 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2010/10/24 19:03:55 landry Exp $
 
 COMMENT=	Xfce4 vte-based terminal
 
 XFCE_VERSION=	0.4.5
 XFCE_GOODIE=	Terminal
 # :L is here for a reason
-PKGNAME=	${DISTNAME:L}
-REVISION=	1
+PKGNAME=	xfce4-${DISTNAME:L}
+REVISION=	2
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 MODULES=	x11/xfce4
 DESKTOP_FILES=	Yes
 USE_GROFF =	Yes
+CONFIGURE_ARGS +=	--program-transform-name='s/Terminal/xfce4-terminal/'
 
 LIB_DEPENDS=	::x11/xfce4/exo \
 		::x11/dbus-glib \
diff --git a/x11/xfce4/terminal/pkg/PLIST b/x11/xfce4/terminal/pkg/PLIST
index c0cf86e08b2..bc952dc6b24 100644
--- a/x11/xfce4/terminal/pkg/PLIST
+++ b/x11/xfce4/terminal/pkg/PLIST
@@ -1,46 +1,46 @@
-@comment $OpenBSD: PLIST,v 1.11 2010/06/05 15:23:28 landry Exp $
-@bin bin/Terminal
-bin/terminal
+@comment $OpenBSD: PLIST,v 1.12 2010/10/24 19:03:55 landry Exp $
+@conflict terminal-<=0.4.5p1
+@bin bin/xfce4-terminal
 man/ca/
 man/ca/man1/
-@man man/ca/man1/Terminal.1
+@man man/ca/man1/xfce4-terminal.1
 man/da/
 man/da/man1/
-@man man/da/man1/Terminal.1
+@man man/da/man1/xfce4-terminal.1
 man/es/
 man/es/man1/
-@man man/es/man1/Terminal.1
+@man man/es/man1/xfce4-terminal.1
 man/fr/
 man/fr/man1/
-@man man/fr/man1/Terminal.1
+@man man/fr/man1/xfce4-terminal.1
 man/gl/
 man/gl/man1/
-@man man/gl/man1/Terminal.1
+@man man/gl/man1/xfce4-terminal.1
 man/hr/
 man/hr/man1/
-@man man/hr/man1/Terminal.1
+@man man/hr/man1/xfce4-terminal.1
 man/id/
 man/id/man1/
-@man man/id/man1/Terminal.1
+@man man/id/man1/xfce4-terminal.1
 man/it/
 man/it/man1/
-@man man/it/man1/Terminal.1
+@man man/it/man1/xfce4-terminal.1
 man/ja/
 man/ja/man1/
-@man man/ja/man1/Terminal.1
-@man man/man1/Terminal.1
+@man man/ja/man1/xfce4-terminal.1
+@man man/man1/xfce4-terminal.1
 man/pt/
 man/pt/man1/
-@man man/pt/man1/Terminal.1
+@man man/pt/man1/xfce4-terminal.1
 man/ru/
 man/ru/man1/
-@man man/ru/man1/Terminal.1
+@man man/ru/man1/xfce4-terminal.1
 man/ug/
 man/ug/man1/
-@man man/ug/man1/Terminal.1
+@man man/ug/man1/xfce4-terminal.1
 man/zh_CN/
 man/zh_CN/man1/
-@man man/zh_CN/man1/Terminal.1
+@man man/zh_CN/man1/xfce4-terminal.1
 share/Terminal/
 share/Terminal/Terminal-toolbars.ui
 share/Terminal/Terminal.glade