diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index 26e6453be26d..cc3e5990611c 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Nov 17 13:51:11 CET 1998
 # Whom:			Dirk Froemberg <ibex@physik.TU-Berlin.DE>
 #
-# $Id: Makefile,v 1.1.1.1 1998/11/19 17:00:26 vanilla Exp $
+# $Id: Makefile,v 1.2 1999/01/08 14:18:42 dirk Exp $
 #
 
 DISTNAME=	gtkfig-0.6.0
@@ -13,10 +13,12 @@ MASTER_SITES=	ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
 
 MAINTAINER=	dirk@FreeBSD.ORG
 
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}" \
-		GTK_CONFIG=${X11BASE}/bin/gtk11-config
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/graphics/gtkfig/files/patch-aa b/graphics/gtkfig/files/patch-aa
new file mode 100644
index 000000000000..b4a4c2d212b3
--- /dev/null
+++ b/graphics/gtkfig/files/patch-aa
@@ -0,0 +1,10 @@
+--- src/group.h.orig	Mon May 10 01:51:36 1999
++++ src/group.h	Mon May 10 01:51:57 1999
+@@ -7,6 +7,7 @@
+ #ifndef GTKFIG_GROUP_H
+ #define GTKFIG_GROUP_H
+ 
++#include <gtk/gtkcompat.h>
+ #include "rectangleobject.h"
+ 
+ /*