- update gamgi to 0.14.4

This commit is contained in:
jasper 2010-01-11 12:05:39 +00:00
parent 43e63e86e9
commit 906420ba55
5 changed files with 54 additions and 43 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2009/12/16 17:59:43 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2010/01/11 12:05:39 jasper Exp $
COMMENT= General Atomistic Modelling Graphic Interface
V= 0.14.3
V= 0.14.4
DISTNAME= gamgi-all-${V}
PKGNAME= ${DISTNAME:S/-all//}
CATEGORIES= education x11
@ -33,7 +33,7 @@ RUN_DEPENDS= ::graphics/netpbm \
WRKDIST= ${WRKDIR}/gamgi${V}/
WRKSRC= ${WRKDIST}/src/
MAKE_FILE= ${WRKSRC}/makefile
ALL_TARGET= # empty
ALL_TARGET= # This comment intentionally left senseless.
NO_REGRESS= Yes

View File

@ -1,5 +1,5 @@
MD5 (gamgi-all-0.14.3.tar.gz) = fEyS1c3/Fzb3uFO2T4fqHQ==
RMD160 (gamgi-all-0.14.3.tar.gz) = NzXDarlRL59dtuk7k7sJrxHCxjk=
SHA1 (gamgi-all-0.14.3.tar.gz) = kYlINJ1tVzYZdmRfTqZeeti0Eiw=
SHA256 (gamgi-all-0.14.3.tar.gz) = GgPWUYQmEgTyLBjxAhKhkOqRRriPQaeaD0YoFW5kZkQ=
SIZE (gamgi-all-0.14.3.tar.gz) = 1963985
MD5 (gamgi-all-0.14.4.tar.gz) = pCFuQl/wEo3yAbOiWtisFg==
RMD160 (gamgi-all-0.14.4.tar.gz) = P9PXQwTn9m0rKnJ/WyFoENvhO8o=
SHA1 (gamgi-all-0.14.4.tar.gz) = xWOLsTVDJpzMfecOJsaTyDVtm08=
SHA256 (gamgi-all-0.14.4.tar.gz) = WiBsgfpCXC9Ypo93NmWqlJ6Wjwxu7x/YJ/7ugGokvBM=
SIZE (gamgi-all-0.14.4.tar.gz) = 2002175

View File

@ -1,13 +1,21 @@
$OpenBSD: patch-src-make_local,v 1.3 2009/06/03 22:46:06 jasper Exp $
--- src/make_local.orig Wed May 13 08:03:56 2009
+++ src/make_local Wed Jun 3 16:28:51 2009
@@ -97,3 +97,24 @@ PATH_GTKGL_L =-L/usr/lib
$OpenBSD: patch-src-make_local,v 1.4 2010/01/11 12:05:39 jasper Exp $
--- src/make_local.orig Mon Jan 11 11:09:14 2010
+++ src/make_local Mon Jan 11 11:10:19 2010
@@ -68,28 +68,25 @@ PATH_GTKGL_L =-L/usr/lib
#================================= OpenBSD =====================================
#
#======================== Linux Yellow Dog ppc =================================
#
+
+#===================== OpenBSD ================================
+#
-# PATH_EXPAT_H = -I/usr/X11R6/include
-# PATH_FREETYPE_H = -I/usr/X11R6/include/freetype2
-# PATH_X_H = -I/usr/X11R6/include
-# PATH_GLIB_H = I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
-# PATH_CAIRO_H = -I/usr/local/include/cairo
-# PATH_PANGO_H = -I/usr/local/include/pango-2.0
-# PATH_ATK_H = -I/usr/local/include/atk-2.0
-# PATH_GTK_H = -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include
-# PATH_MESA_H = -I/usr/X11R6/include/GL
-# PATH_GTKGL_H = -I/usr/local/include/gtkglext-1.0 \
- -I/usr/local/lib/gtkglext-1.0/include
+PATH_EXPAT_H = -I${X11BASE}/include
+PATH_FREETYPE_H = -I${X11BASE}/include/freetype2
+PATH_X_H = -I${X11BASE}/include
@ -17,8 +25,19 @@ $OpenBSD: patch-src-make_local,v 1.3 2009/06/03 22:46:06 jasper Exp $
+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 = -I${LOCALBASE}/include/gtkglext-1.0 -I${LOCALBASE}/lib/gtkglext-1.0/include
+
+PATH_GTKGL_H = -I${LOCALBASE}/include/gtkglext-1.0 \
+ -I${LOCALBASE}/lib/gtkglext-1.0/include
-# PATH_EXPAT_L = -L/usr/X11R6/lib
-# PATH_FREETYPE_L = -L/usr/X11R6/lib
-# PATH_X_L = -L/usr/X11R6/lib
-# PATH_GLIB_L = -L/usr/local/lib
-# PATH_CAIRO_L = -L/usr/local/lib
-# PATH_PANGO_L = -L/usr/local/lib
-# PATH_ATK_L = -L/usr/local/lib
-# PATH_GTK_L = -L/usr/local/lib
-# PATH_MESA_L = -L/usr/X11R6/lib
-# PATH_GTKGL_L = -L/usr/local/lib
+PATH_X_L = -L${X11BASE}/lib
+PATH_GLIB_L = -L${LOCALBASE}/lib
+PATH_GTK_L = -L${LOCALBASE}/lib
@ -26,3 +45,6 @@ $OpenBSD: patch-src-make_local,v 1.3 2009/06/03 22:46:06 jasper Exp $
+PATH_GTKGL_L = -L${LOCALBASE}/lib
+PATH_EXPAT_L = -L${X11BASE}/lib
+PATH_FREETYPE_L = -L${X11BASE}/lib
#======================== Mac OS X 1.03 / MacPort =============================
#

View File

@ -1,19 +1,7 @@
$OpenBSD: patch-src-make_rules,v 1.3 2009/12/16 17:59:43 jasper Exp $
--- src/make_rules.orig Wed Nov 4 22:34:50 2009
+++ src/make_rules Wed Dec 16 17:30:50 2009
@@ -14,9 +14,9 @@ SHELL=/bin/sh
#================================ compiler =================================
-CC = gcc
+CC ?= gcc
-CFLAGS = -g -O3 -Wall -ansi
+CFLAGS ?= -g -O3 -Wall -ansi
override CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
LDFLAGS =
@@ -33,7 +33,7 @@ EXE = gamgi
$OpenBSD: patch-src-make_rules,v 1.4 2010/01/11 12:05:39 jasper Exp $
--- src/make_rules.orig Mon Jan 11 11:08:35 2010
+++ src/make_rules Mon Jan 11 11:08:51 2010
@@ -37,7 +37,7 @@ EXE = gamgi
LIBS = -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -lGLU -lGL -lgtk-x11-2.0 \
-lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 \
-lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lXext -lX11 \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/12/16 17:59:43 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/01/11 12:05:39 jasper Exp $
@bin bin/gamgi
share/doc/gamgi/
share/doc/gamgi/LICENSE
@ -195,11 +195,11 @@ share/doc/gamgi/interfaces/bond/
share/doc/gamgi/interfaces/bond/config_length.html
share/doc/gamgi/interfaces/bond/config_view.html
share/doc/gamgi/interfaces/bond/create_length.html
share/doc/gamgi/interfaces/bond/create_mode.html
share/doc/gamgi/interfaces/bond/create_type.html
share/doc/gamgi/interfaces/bond/create_method.html
share/doc/gamgi/interfaces/bond/create_property.html
share/doc/gamgi/interfaces/bond/create_view.html
share/doc/gamgi/interfaces/bond/link_object.html
share/doc/gamgi/interfaces/bond/modify_type.html
share/doc/gamgi/interfaces/bond/modify_property.html
share/doc/gamgi/interfaces/bond/modify_view.html
share/doc/gamgi/interfaces/bond/remove_object.html
share/doc/gamgi/interfaces/bond/select.html
@ -207,8 +207,8 @@ share/doc/gamgi/interfaces/cell/
share/doc/gamgi/interfaces/cell/create_origin.html
share/doc/gamgi/interfaces/cell/create_position.html
share/doc/gamgi/interfaces/cell/create_symmetry.html
share/doc/gamgi/interfaces/cell/create_type.html
share/doc/gamgi/interfaces/cell/create_view.html
share/doc/gamgi/interfaces/cell/create_volume.html
share/doc/gamgi/interfaces/cell/groups.html
share/doc/gamgi/interfaces/cell/lattices.html
share/doc/gamgi/interfaces/cell/link_object.html
@ -219,8 +219,8 @@ share/doc/gamgi/interfaces/cell/measure_reciprocal.html
share/doc/gamgi/interfaces/cell/modify_origin.html
share/doc/gamgi/interfaces/cell/modify_position.html
share/doc/gamgi/interfaces/cell/modify_symmetry.html
share/doc/gamgi/interfaces/cell/modify_type.html
share/doc/gamgi/interfaces/cell/modify_view.html
share/doc/gamgi/interfaces/cell/modify_volume.html
share/doc/gamgi/interfaces/cell/rcp.html
share/doc/gamgi/interfaces/cell/remove_object.html
share/doc/gamgi/interfaces/cell/rotation.html
@ -336,11 +336,11 @@ share/doc/gamgi/interfaces/light/config_color.html
share/doc/gamgi/interfaces/light/config_materials.html
share/doc/gamgi/interfaces/light/create_attenuation.html
share/doc/gamgi/interfaces/light/create_color.html
share/doc/gamgi/interfaces/light/create_type.html
share/doc/gamgi/interfaces/light/create_geometry.html
share/doc/gamgi/interfaces/light/link_object.html
share/doc/gamgi/interfaces/light/modify_attenuation.html
share/doc/gamgi/interfaces/light/modify_color.html
share/doc/gamgi/interfaces/light/modify_type.html
share/doc/gamgi/interfaces/light/modify_geometry.html
share/doc/gamgi/interfaces/light/remove_object.html
share/doc/gamgi/interfaces/light/select.html
share/doc/gamgi/interfaces/molecule/
@ -752,6 +752,7 @@ share/gamgi/molecule/proteines/
share/gamgi/molecule/proteines/Protein.xml
share/gamgi/molecule/silicates/
share/gamgi/molecule/silicates/README
share/gamgi/molecule/silicates/q10.xml
share/gamgi/molecule/silicates/q21.xml
share/gamgi/molecule/silicates/q21q12.xml
share/gamgi/molecule/silicates/q22q13q11.xml