Clean up this port.

x11/gtk2-theme-switch/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2013/03/11 11:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2014/04/18 12:03:00 ajacoutot Exp $
 
 COMMENT=		switch GTK+2 themes quickly
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-REVISION=		8
+REVISION=		9
 CATEGORIES=		x11 graphics
 
 HOMEPAGE=		http://www.muhri.net/nav.php3?node=gts
@@ -12,18 +12,17 @@ HOMEPAGE=		http://www.muhri.net/nav.php3?node=gts
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += z pthread-stubs xcb gtk-x11-2.0 gdk_pixbuf-2.0 gdk-x11-2.0
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pthread z
 
 MASTER_SITES=		http://www.muhri.net/
 
 MODULES=		devel/gettext
 LIB_DEPENDS=		x11/gtk+2
 
-USE_GROFF =		Yes
 NO_TEST=		Yes
 
 .include <bsd.port.mk>

x11/gtk2-theme-switch/patches/patch-Makefile

@@ -1,24 +1,21 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2005/10/31 20:14:11 alek Exp $
+$OpenBSD: patch-Makefile,v 1.2 2014/04/18 12:03:00 ajacoutot Exp $
 --- Makefile.orig	Wed Jun 11 07:16:36 2003
-+++ Makefile	Mon Oct 31 16:15:19 2005
-@@ -1,24 +1,22 @@
- GCC = cc
++++ Makefile	Fri Apr 18 13:58:40 2014
+@@ -1,8 +1,8 @@
+-GCC = cc
 -PREFIX=/usr/local
 -CFLAGS = -O2 -Wall $(shell pkg-config --cflags gtk+-2.0)
 -LIBS = $(shell pkg-config --libs gtk+-2.0)
 -CFLAGS += -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
-+CFLAGS += -O2 -Wall `pkg-config --cflags gtk+-2.0`
-+LIBS = `pkg-config --libs gtk+-2.0`
++GCC = ${CC}
++PREFIX ?= /usr/local
++CFLAGS += -Wall $$(pkg-config --cflags gtk+-2.0)
++LIBS = $$(pkg-config --libs gtk+-2.0)
 +CFLAGS += -DGTK_DISABLE_BROKEN
  
  VERSION = 2.0.0rc2
  all: switch
- 
- switch: switch.c switch.h
--	${GCC} -o switch2 switch.c ${CFLAGS} ${LIBS}
-+	${CC} -o switch2 switch.c ${CFLAGS} ${LIBS}
- 
- clean:
+@@ -14,11 +14,10 @@ clean:
  	-rm -f switch2 *~
  	
  install: all

x11/gtk2-theme-switch/patches/patch-switch_1

@@ -1,25 +1,25 @@
-$OpenBSD: patch-switch_1,v 1.1.1.1 2005/10/31 20:14:11 alek Exp $
---- switch.1.orig	Mon Oct 31 21:08:06 2005
-+++ switch.1	Mon Oct 31 21:08:42 2005
+$OpenBSD: patch-switch_1,v 1.2 2014/04/18 12:03:00 ajacoutot Exp $
+--- switch.1.orig	Wed Jun 11 07:16:36 2003
++++ switch.1	Fri Apr 18 13:43:32 2014
 @@ -3,7 +3,7 @@
  .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
  .\" other parms are allowed: see man(7), man(1)
  .SH NAME
 -gtk-theme-switch \- fast and easy tool for switching and installing GTK themes
-+gtk2-theme-switch \- fast and easy tool for switching and installing GTK themes
++gtk-theme-switch2 \- fast and easy tool for switching and installing GTK themes
  .SH COMMAND LINE ARGUMENTS
  .nf
  .BR "\-h[elp] " (display\ command-line\ argument\ reference)
-@@ -18,10 +18,10 @@ Multiple command line arguments can be p
+@@ -18,10 +18,10 @@ Multiple command line arguments can be passed to the e
  invocation.
  .PP
  Passing no arguments will start
 -.B gtk-theme-switch
-+.B gtk2-theme-switch
++.B gtk-theme-switch2
  in dock-mode.
  .SH DESCRIPTION
 -.B gtk-theme-switch
-+.B gtk2-theme-switch
++.B gtk-theme-switch2
  is a Gtk+ theme switching utility that can be run from the console, and has an
  optional GUI dock and theme preview. It also can install themes downloaded
  from gtk.themes.org.

x11/gtk2-theme-switch/pkg/PLIST

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/10/31 20:14:11 alek Exp $
-bin/gtk-theme-switch2
+@comment $OpenBSD: PLIST,v 1.2 2014/04/18 12:03:00 ajacoutot Exp $
+@bin bin/gtk-theme-switch2
 @man man/man1/gtk-theme-switch2.1