From 26ddad5a59bd6660bbee4fc409458e0dca361662 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 1 Apr 2009 19:31:39 +0000
Subject: [PATCH] - add myself as maintainer - tweak DESCR - re-do a bit in
 make_local, discussed with upstream

---
 education/gamgi/Makefile                     |  6 ++++--
 education/gamgi/patches/patch-src-make_local | 14 +++++++-------
 education/gamgi/pkg/DESCR                    |  3 ---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/education/gamgi/Makefile b/education/gamgi/Makefile
index 5ed00159758..dc10dedb979 100755
--- a/education/gamgi/Makefile
+++ b/education/gamgi/Makefile
@@ -1,14 +1,16 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/03/31 19:08:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2009/04/01 19:31:39 jasper Exp $
 
 COMMENT=		General Atomistic Modelling Graphic Interface
 
 V=			0.13.11
 DISTNAME=		gamgi-all-${V}
-PKGNAME=		${DISTNAME:S/-all//}
+PKGNAME=		${DISTNAME:S/-all//}p0
 CATEGORIES=		education x11
 
 HOMEPAGE=		http://www.gamgi.org/
 
+MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
+
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/education/gamgi/patches/patch-src-make_local b/education/gamgi/patches/patch-src-make_local
index 2a3af7f52b4..e02e51eef66 100644
--- a/education/gamgi/patches/patch-src-make_local
+++ b/education/gamgi/patches/patch-src-make_local
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src-make_local,v 1.1.1.1 2009/03/31 19:08:29 jasper Exp $
+$OpenBSD: patch-src-make_local,v 1.2 2009/04/01 19:31:39 jasper Exp $
 --- src/make_local.orig	Sun Mar 29 19:02:53 2009
-+++ src/make_local	Tue Mar 31 19:25:04 2009
++++ src/make_local	Wed Apr  1 21:17:25 2009
 @@ -72,3 +72,24 @@ PATH_GTKGL_L =-L/usr/lib
  #
  #======================== Linux Yellow Dog ppc =================================
@@ -11,13 +11,13 @@ $OpenBSD: patch-src-make_local,v 1.1.1.1 2009/03/31 19:08:29 jasper Exp $
 +PATH_EXPAT_H = -I${X11BASE}/include
 +PATH_FREETYPE_H = -I${X11BASE}/include/freetype2
 +PATH_X_H = -I${X11BASE}/include
-+PATH_GLIB_H = `pkg-config --cflags glib-2.0`
++PATH_GLIB_H = -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include
 +PATH_CAIRO_H = -I${LOCALBASE}/include/cairo
-+PATH_PANGO_H = -I${LOCALBASE}/include/pango-2.0
-+PATH_ATK_H = -I${LOCALBASE}/include/atk-2.0
-+PATH_GTK_H =  `pkg-config --cflags gtk+-2.0`
++PATH_PANGO_H = -I${LOCALBASE}/include/pango-1.0
++PATH_ATK_H = -I${LOCALBASE}/include/atk-1.0
++PATH_GTK_H = -I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/lib/gtk-2.0/include
 +PATH_MESA_H = -I${X11BASE}/include/GL
-+PATH_GTKGL_H = `pkg-config --cflags gtkglext-1.0` `pkg-config --cflags gdkglext-1.0`
++PATH_GTKGL_H = -I${LOCALBASE}/include/gtkglext-1.0 -I${LOCALBASE}/lib/gtkglext-1.0/include
 +
 +PATH_X_L = -L${X11BASE}/lib
 +PATH_GLIB_L = -L${LOCALBASE}/lib
diff --git a/education/gamgi/pkg/DESCR b/education/gamgi/pkg/DESCR
index da0a8852be8..12126bb6cc7 100644
--- a/education/gamgi/pkg/DESCR
+++ b/education/gamgi/pkg/DESCR
@@ -8,6 +8,3 @@ graphic interface to study atomic structures and to prepare images for
 presentations; 3) teaching the atomic structure of matter in schools and
 universities, even inviting students to run GAMGI at home; 4) science
 promotion, in exhibitions and science museums.
-
-To run properly, GAMGI requires a graphics environment with at least 16
-bits per pixel, plus a 3-button mouse.