diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index cc99af1e3cd..e55267e7eb0 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/04/05 19:32:22 brad Exp $
+# $OpenBSD: Makefile,v 1.4 1999/06/14 17:08:59 brad Exp $
 
 DISTNAME=	gtkglarea-1.2.1
 CATEGORIES=	x11 graphics
@@ -10,12 +10,12 @@ HOMEPAGE=	http://www.student.oulu.fi/~jlof/gtkglarea/
 
 MAINTAINER=	brad@openbsd.org
 
-LIB_DEPENDS=	MesaGL:${PORTSDIR}/graphics/MesaGL \
-		MesaGLU:${PORTSDIR}/graphics/MesaGL \
+LIB_DEPENDS=	MesaGL.3.0:${PORTSDIR}/graphics/MesaGL \
+		MesaGLU.3.0:${PORTSDIR}/graphics/MesaGL \
 		gtk.1.2:${PORTSDIR}/x11/gtk+
 
 USE_X11=	yes
-SEPARATE_BUILD=	yes
+SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
@@ -23,9 +23,8 @@ CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk-config"
 
 post-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/gtkglarea/
-	cd ${WRKSRC}/docs ; \
-	${INSTALL_MAN} HOWTO.txt ${PREFIX}/share/doc/gtkglarea ; \
-	${INSTALL_MAN} gdkgl.txt ${PREFIX}/share/doc/gtkglarea ; \
-	${INSTALL_MAN} gtkglarea.txt ${PREFIX}/share/doc/gtkglarea
+	${INSTALL_MAN} ${WRKSRC}/docs/HOWTO.txt ${PREFIX}/share/doc/gtkglarea ; \
+	${INSTALL_MAN} ${WRKSRC}/docs/gdkgl.txt ${PREFIX}/share/doc/gtkglarea ; \
+	${INSTALL_MAN} ${WRKSRC}/docs/gtkglarea.txt ${PREFIX}/share/doc/gtkglarea
 	
 .include <bsd.port.mk>
diff --git a/x11/gtkglarea/patches/patch-ab b/x11/gtkglarea/patches/patch-ab
new file mode 100644
index 00000000000..4b13548d8d6
--- /dev/null
+++ b/x11/gtkglarea/patches/patch-ab
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Jun 14 12:29:11 1999
++++ configure	Mon Jun 14 12:29:40 1999
+@@ -1411,7 +1411,7 @@
+ aix*)
+   ac_symcode='[BCDTU]'
+   ;;
+-sunos* | cygwin32* | mingw32*)
++sunos* | cygwin32* | mingw32* | openbsd*)
+   ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
+   ac_symxfrm='_\1 \1'
+   ;;
diff --git a/x11/gtkglarea/patches/patch-ac b/x11/gtkglarea/patches/patch-ac
new file mode 100644
index 00000000000..487a7f9a6f9
--- /dev/null
+++ b/x11/gtkglarea/patches/patch-ac
@@ -0,0 +1,11 @@
+--- gtkgl/Makefile.in.orig	Mon Jun 14 13:02:27 1999
++++ gtkgl/Makefile.in	Mon Jun 14 13:02:40 1999
+@@ -87,7 +87,7 @@
+ 
+ gtkglinclude_HEADERS = gdkgl.h gtkglarea.h
+ libgtkgl_la_SOURCES = gdkgl.c gtkglarea.c
+-libgtkgl_la_LDFLAGS = -version-info $(GTKGL_LIBRARY_VERSION)
++libgtkgl_la_LDFLAGS = -version-info 1:2:0
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
+ LTLIBRARIES =  $(lib_LTLIBRARIES)
diff --git a/x11/gtkglarea/pkg/PLIST b/x11/gtkglarea/pkg/PLIST
index 517583d2134..bebaf379421 100644
--- a/x11/gtkglarea/pkg/PLIST
+++ b/x11/gtkglarea/pkg/PLIST
@@ -1,12 +1,12 @@
 include/gtkgl/gdkgl.h
 include/gtkgl/gtkglarea.h
-@dirrm include/gtkgl
-lib/libgtkgl.so.4.0
+lib/libgtkgl.so.1.2
 @exec /sbin/ldconfig -m %B
-lib/libgtkgl.la
 lib/libgtkgl.a
+lib/libgtkgl.la
 share/aclocal/gtkgl.m4
 share/doc/gtkglarea/HOWTO.txt
 share/doc/gtkglarea/gdkgl.txt
 share/doc/gtkglarea/gtkglarea.txt
+@dirrm include/gtkgl
 @dirrm share/doc/gtkglarea
diff --git a/x11/gtkglarea/pkg/PLIST.noshared b/x11/gtkglarea/pkg/PLIST.noshared
index 679415fc026..5fe9ba73eb0 100644
--- a/x11/gtkglarea/pkg/PLIST.noshared
+++ b/x11/gtkglarea/pkg/PLIST.noshared
@@ -1,10 +1,10 @@
 include/gtkgl/gdkgl.h
 include/gtkgl/gtkglarea.h
-@dirrm include/gtkgl
-lib/libgtkgl.la
 lib/libgtkgl.a
+lib/libgtkgl.la
 share/aclocal/gtkgl.m4
 share/doc/gtkglarea/HOWTO.txt
 share/doc/gtkglarea/gdkgl.txt
 share/doc/gtkglarea/gtkglarea.txt
+@dirrm include/gtkgl
 @dirrm share/doc/gtkglarea