From fd73932cba10f380076ee4244a189b0633e1e328 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 27 Apr 2010 21:50:45 +0000 Subject: [PATCH] - update gamgi to 0.14.7 - partly unbreak it after gtk+2 update, the other part will be automagically happen when the gtkglext fix is committed. --- education/gamgi/Makefile | 8 ++++---- education/gamgi/distinfo | 10 +++++----- education/gamgi/patches/patch-src-make_rules | 17 ++++++++++++---- education/gamgi/pkg/PLIST | 21 +++++++++----------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/education/gamgi/Makefile b/education/gamgi/Makefile index 920a04a1d2b..e71fefee8f6 100755 --- a/education/gamgi/Makefile +++ b/education/gamgi/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2010/01/16 22:01:29 matthieu Exp $ +# $OpenBSD: Makefile,v 1.9 2010/04/27 21:50:45 jasper Exp $ COMMENT= General Atomistic Modelling Graphic Interface -V= 0.14.4 +V= 0.14.7 DISTNAME= gamgi-all-${V} -PKGNAME= ${DISTNAME:S/-all//}p0 +PKGNAME= ${DISTNAME:S/-all//} CATEGORIES= education x11 HOMEPAGE= http://www.gamgi.org/ @@ -24,7 +24,7 @@ USE_X11= Yes WANTLIB += GL GLU X11 Xext Xi Xmu atk-1.0 c cairo expat freetype WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 +WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pthread LIB_DEPENDS= gdkglext-x11-1.0,gtkglext-x11-1.0::x11/gtkglext RUN_DEPENDS= ::graphics/netpbm diff --git a/education/gamgi/distinfo b/education/gamgi/distinfo index 779daaaabfc..ff970f86c47 100644 --- a/education/gamgi/distinfo +++ b/education/gamgi/distinfo @@ -1,5 +1,5 @@ -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 +MD5 (gamgi-all-0.14.7.tar.gz) = W+2c+evbwVs3trfAVZ83sw== +RMD160 (gamgi-all-0.14.7.tar.gz) = J2A8Yhv3Kdev5ml1NCR0OGbNW+I= +SHA1 (gamgi-all-0.14.7.tar.gz) = pqoQdpaHqrGb/KM+Ofup5y+o6pg= +SHA256 (gamgi-all-0.14.7.tar.gz) = E1GLQr3N2WgdC6gULjkMoFTu5sV8wgtP/kHP6rqxNiw= +SIZE (gamgi-all-0.14.7.tar.gz) = 2133846 diff --git a/education/gamgi/patches/patch-src-make_rules b/education/gamgi/patches/patch-src-make_rules index 29e98cb8930..aabcba2b181 100644 --- a/education/gamgi/patches/patch-src-make_rules +++ b/education/gamgi/patches/patch-src-make_rules @@ -1,12 +1,21 @@ -$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 +$OpenBSD: patch-src-make_rules,v 1.5 2010/04/27 21:50:45 jasper Exp $ +--- src/make_rules.orig Sun Feb 7 18:06:00 2010 ++++ src/make_rules Tue Apr 27 23:30:38 2010 +@@ -18,7 +18,7 @@ CC ?= gcc + + CFLAGS ?= -O3 -Wall -ansi + override CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED ++ -DGDK_PIXBUF_DISABLE_DEPRECATED -pthread + # -DGSEAL_ENABLE \ + # -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES \ + # -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES @@ -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 \ - -lXi -lXmu -lfreetype -lexpat -lm -ldl -+ -lXi -lXmu -lfreetype -lexpat -lm ++ -lXi -lXmu -lfreetype -lexpat -lm -pthread #================================ full paths =============================== diff --git a/education/gamgi/pkg/PLIST b/education/gamgi/pkg/PLIST index f325fc8b040..59bfe429100 100644 --- a/education/gamgi/pkg/PLIST +++ b/education/gamgi/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2010/01/11 12:05:39 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.4 2010/04/27 21:50:45 jasper Exp $ @bin bin/gamgi share/doc/gamgi/ share/doc/gamgi/LICENSE @@ -137,19 +137,14 @@ share/doc/gamgi/icon/icon.html share/doc/gamgi/icon/icon.xml share/doc/gamgi/icon/icon_screen.xml share/doc/gamgi/images/ -share/doc/gamgi/images/above0.png -share/doc/gamgi/images/above1.png -share/doc/gamgi/images/above2.png -share/doc/gamgi/images/above3.png -share/doc/gamgi/images/below0.png -share/doc/gamgi/images/below1.png -share/doc/gamgi/images/below2.png -share/doc/gamgi/images/below3.png +share/doc/gamgi/images/front02.png +share/doc/gamgi/images/front12.png +share/doc/gamgi/images/front20.png +share/doc/gamgi/images/front22.png share/doc/gamgi/images/gamgi.png share/doc/gamgi/images/header0.png share/doc/gamgi/images/patents.png share/doc/gamgi/index.shtml -share/doc/gamgi/index_draft.shtml share/doc/gamgi/installation/ share/doc/gamgi/installation/compilation.html share/doc/gamgi/installation/configuration.html @@ -160,6 +155,7 @@ share/doc/gamgi/installation/options.html share/doc/gamgi/installation/requirements.html share/doc/gamgi/installation/tips.html share/doc/gamgi/interfaces/ +share/doc/gamgi/interfaces.tar.gz share/doc/gamgi/interfaces/arrow/ share/doc/gamgi/interfaces/arrow/select.html share/doc/gamgi/interfaces/assembly/ @@ -175,19 +171,19 @@ share/doc/gamgi/interfaces/atom/config_view.html share/doc/gamgi/interfaces/atom/copy_copies.html share/doc/gamgi/interfaces/atom/copy_shift.html share/doc/gamgi/interfaces/atom/create_analysis.html -share/doc/gamgi/interfaces/atom/create_element.html share/doc/gamgi/interfaces/atom/create_position.html share/doc/gamgi/interfaces/atom/create_property.html +share/doc/gamgi/interfaces/atom/create_type.html share/doc/gamgi/interfaces/atom/create_view.html share/doc/gamgi/interfaces/atom/link_object.html share/doc/gamgi/interfaces/atom/measure_angle.html share/doc/gamgi/interfaces/atom/measure_length.html share/doc/gamgi/interfaces/atom/modify_analysis.html share/doc/gamgi/interfaces/atom/modify_angle.html -share/doc/gamgi/interfaces/atom/modify_element.html share/doc/gamgi/interfaces/atom/modify_length.html share/doc/gamgi/interfaces/atom/modify_position.html share/doc/gamgi/interfaces/atom/modify_property.html +share/doc/gamgi/interfaces/atom/modify_type.html share/doc/gamgi/interfaces/atom/modify_view.html share/doc/gamgi/interfaces/atom/remove_object.html share/doc/gamgi/interfaces/atom/select_list.html @@ -447,6 +443,7 @@ share/doc/gamgi/questions/questions.html share/doc/gamgi/questions/troubleshooting_formats.html share/doc/gamgi/questions/troubleshooting_interfaces.html share/doc/gamgi/tutorials/ +share/doc/gamgi/tutorials.tar.gz share/doc/gamgi/tutorials/calcite_page1.html share/doc/gamgi/tutorials/cscl_page1.html share/doc/gamgi/tutorials/interstices_bcc_page1.html