Index: head/x11-clocks/wmfishtime/Makefile
===================================================================
--- head/x11-clocks/wmfishtime/Makefile	(revision 491816)
+++ head/x11-clocks/wmfishtime/Makefile	(revision 491817)
@@ -1,43 +1,35 @@
 # Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
 
 PORTNAME=	wmfishtime
 PORTVERSION=	1.24
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
 		http://www.sourcefiles.org/Toys/Clocks/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Time/date applet for WindowMaker with fishes swimming around
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig
+USES=		gnome pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_XORG=	x11
 
-MAKE_ARGS+=	CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall ${GTK_CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		GTK_LIBS="${GTK_LIBS}"
+MAKE_ARGS=	CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall" \
+		LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/wmfishtime man/man1/wmfishtime.1.gz
 
-OPTIONS_SINGLE=		TOOLKIT
-OPTIONS_SINGLE_TOOLKIT=	GTK1 GTK2
-OPTIONS_DEFAULT=	GTK2
-
-GTK1_USE=		gnome=gtk12
-GTK1_CPPFLAGS=		$$(pkg-config --cflags gdk)
-GTK1_LDFLAGS=		$$(pkg-config --libs gdk)
-GTK2_USE=		gnome=gtk20
-GTK2_CPPFLAGS=		$$(pkg-config --cflags gdk-x11-2.0 x11)
-GTK2_LDFLAGS=		$$(pkg-config --libs gdk-x11-2.0 x11) -lm
-TOOLKIT_DESC=		GTK Toolkit
+CPPFLAGS+=		$$(pkg-config --cflags gdk-x11-2.0 x11)
+LDFLAGS+=		$$(pkg-config --libs gdk-x11-2.0 x11) -lm
 
 post-patch:
 	${REINPLACE_CMD} -E -e 's|1\.23|${PORTVERSION}|g' ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/wmfishtime.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.mk>
Index: head/x11-clocks/wmfishtime/files/patch-Makefile
===================================================================
--- head/x11-clocks/wmfishtime/files/patch-Makefile	(revision 491816)
+++ head/x11-clocks/wmfishtime/files/patch-Makefile	(revision 491817)
@@ -1,28 +1,28 @@
---- Makefile.orig	Sun May 27 05:49:41 2001
-+++ Makefile	Sun Jul  6 20:29:07 2003
-@@ -6,23 +6,21 @@
+--- Makefile.orig	2001-05-26 20:49:41 UTC
++++ Makefile
+@@ -6,23 +6,21 @@ PREFIX = $(DESTDIR)/usr/X11R6
  
  # no user serviceable parts below this line
  # optimization cflags
 -CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
  # profiling cflags
  # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
  # test coverage cflags
  # CFLAGS=-fprofile-arcs -ftest-coverage -Wall -ansi -pedantic -g `gtk-config --cflags` ${EXTRA} -DPRO
  
  
 -CC = gcc
  SHELL = sh
  OBJS = fishmon.o
 -LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
-+LIBS = `echo $(GTK_LIBS) | sed "s/-lgtk12//g"`
++LIBS =
  INSTALL = -m 755
  
  all: wmfishtime
  
  wmfishtime: $(OBJS)
 -	$(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS)
 +	$(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS) $(LDFLAGS)
  
  clean:
  	rm -rf wmfishtime *.o *.bb* *.gcov gmon.* *.da *~ .xvpics