- update gamgi to 0.14.3

This commit is contained in:
jasper 2009-12-16 17:59:43 +00:00
parent 85e459adf6
commit b269775226
5 changed files with 76 additions and 41 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2009/08/10 06:31:09 kili Exp $
# $OpenBSD: Makefile,v 1.5 2009/12/16 17:59:43 jasper Exp $
COMMENT= General Atomistic Modelling Graphic Interface
V= 0.13.13
V= 0.14.3
DISTNAME= gamgi-all-${V}
PKGNAME= ${DISTNAME:S/-all//}p0
PKGNAME= ${DISTNAME:S/-all//}
CATEGORIES= education x11
HOMEPAGE= http://www.gamgi.org/
@ -19,15 +19,16 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.gamgi.org/gamgi/src/
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 pthread-stubs xcb
USE_GMAKE= Yes
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
LIB_DEPENDS= gdkglext-x11-1.0,gtkglext-x11-1.0::x11/gtkglext
RUN_DEPENDS= ::graphics/netpbm
RUN_DEPENDS= ::graphics/netpbm \
::x11/dejavu-fonts
WRKDIST= ${WRKDIR}/gamgi${V}/
WRKSRC= ${WRKDIST}/src/
@ -40,7 +41,7 @@ DOC_DIR= ${PREFIX}/share/doc/gamgi/
DATA_DIR= ${PREFIX}/share/gamgi/
pre-configure:
${SUBST_CMD} ${WRKSRC}/make_local
${SUBST_CMD} ${WRKSRC}/make_local ${WRKSRC}/io/gamgi_io.h
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gamgi ${PREFIX}/bin

View File

@ -1,5 +1,5 @@
MD5 (gamgi-all-0.13.13.tar.gz) = Pfwi5Lw5Z8sg2DqgJt6iEA==
RMD160 (gamgi-all-0.13.13.tar.gz) = jlHzdQgYAIcN7Ticp/SXl8JvnAI=
SHA1 (gamgi-all-0.13.13.tar.gz) = XDvyLqE+jucjOpACvXe6iBW3H4A=
SHA256 (gamgi-all-0.13.13.tar.gz) = xdtaEPcZBsJbja91E60K2/xryslNJ4zPgT6n8TF77CQ=
SIZE (gamgi-all-0.13.13.tar.gz) = 2206179
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

View File

@ -1,25 +1,21 @@
$OpenBSD: patch-src-make_rules,v 1.2 2009/06/03 22:46:06 jasper Exp $
--- src/make_rules.orig Wed Jun 3 16:27:53 2009
+++ src/make_rules Wed Jun 3 16:28:31 2009
@@ -14,12 +14,12 @@ SHELL=/bin/sh
$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 =================================
-COMPILE = gcc -g -O0 -Wall -ansi
+COMPILE = $(CC) -g -Wall -ansi
#COMPILE = gcc -g -Wall -ansi -O3 -pedantic -Werror -MMD
-LINK = gcc
+LINK = $(CC)
#LINK = g++
-CC = gcc
+CC ?= gcc
-CFLAGS = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED # -DGTK_DISABLE_DEPRECATED
#================================ executable ===============================
@@ -31,7 +31,7 @@ EXE = gamgi
LIBS = -lgtkglext-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 \
-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
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

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_io_gamgi_io_h,v 1.1 2009/12/16 17:59:43 jasper Exp $
--- src/io/gamgi_io.h.orig Wed Dec 16 17:51:05 2009
+++ src/io/gamgi_io.h Wed Dec 16 17:51:07 2009
@@ -230,7 +230,7 @@ GAMGI_IO_DEJAVU_MONO_ITALIC, GAMGI_IO_DEJAVU_MONO_BOLD
* Truetype fonts: default path and filenames *
**********************************************/
-#define GAMGI_IO_PATH_TRUETYPE "/usr/share/fonts/truetype/ttf-dejavu/"
+#define GAMGI_IO_PATH_TRUETYPE "${LOCALBASE}/lib/X11/fonts/dejavu"
#define GAMGI_IO_FILENAME_DEJAVU_SANS "DejaVuSans.ttf"
#define GAMGI_IO_FILENAME_DEJAVU_SANS_BOLD "DejaVuSans-Bold.ttf"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/31 19:08:29 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/12/16 17:59:43 jasper Exp $
@bin bin/gamgi
share/doc/gamgi/
share/doc/gamgi/LICENSE
@ -138,11 +138,18 @@ 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/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
@ -162,6 +169,9 @@ share/doc/gamgi/interfaces/assembly/remove_object.html
share/doc/gamgi/interfaces/assembly/select.html
share/doc/gamgi/interfaces/atom/
share/doc/gamgi/interfaces/atom/config.html
share/doc/gamgi/interfaces/atom/config_analysis.html
share/doc/gamgi/interfaces/atom/config_element.html
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
@ -173,12 +183,14 @@ 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_view.html
share/doc/gamgi/interfaces/atom/remove_object.html
share/doc/gamgi/interfaces/atom/select.html
share/doc/gamgi/interfaces/atom/select_list.html
share/doc/gamgi/interfaces/bond/
share/doc/gamgi/interfaces/bond/config_length.html
share/doc/gamgi/interfaces/bond/config_view.html
@ -243,8 +255,10 @@ share/doc/gamgi/interfaces/direction/modify_view.html
share/doc/gamgi/interfaces/direction/remove_object.html
share/doc/gamgi/interfaces/direction/select.html
share/doc/gamgi/interfaces/file/
share/doc/gamgi/interfaces/file/export.html
share/doc/gamgi/interfaces/file/import.html
share/doc/gamgi/interfaces/file/export_filters.html
share/doc/gamgi/interfaces/file/export_location.html
share/doc/gamgi/interfaces/file/import_filters.html
share/doc/gamgi/interfaces/file/import_location.html
share/doc/gamgi/interfaces/gamgi/
share/doc/gamgi/interfaces/gamgi/about.html
share/doc/gamgi/interfaces/gamgi/config_color.html
@ -255,7 +269,12 @@ share/doc/gamgi/interfaces/gamgi/reset.html
share/doc/gamgi/interfaces/graph/
share/doc/gamgi/interfaces/graph/select.html
share/doc/gamgi/interfaces/group/
share/doc/gamgi/interfaces/group/create.html
share/doc/gamgi/interfaces/group/coordination.html
share/doc/gamgi/interfaces/group/create_polytope.html
share/doc/gamgi/interfaces/group/create_scope.html
share/doc/gamgi/interfaces/group/create_tolerance.html
share/doc/gamgi/interfaces/group/create_type.html
share/doc/gamgi/interfaces/group/create_view.html
share/doc/gamgi/interfaces/group/geometry.html
share/doc/gamgi/interfaces/group/link_object.html
share/doc/gamgi/interfaces/group/measure_symmetry.html
@ -263,9 +282,11 @@ share/doc/gamgi/interfaces/group/measure_tolerance.html
share/doc/gamgi/interfaces/group/measure_type.html
share/doc/gamgi/interfaces/group/measure_view.html
share/doc/gamgi/interfaces/group/measure_voronoi.html
share/doc/gamgi/interfaces/group/modify_angle.html
share/doc/gamgi/interfaces/group/modify_length.html
share/doc/gamgi/interfaces/group/modify_torsion.html
share/doc/gamgi/interfaces/group/modify_polytope.html
share/doc/gamgi/interfaces/group/modify_scope.html
share/doc/gamgi/interfaces/group/modify_tolerance.html
share/doc/gamgi/interfaces/group/modify_type.html
share/doc/gamgi/interfaces/group/modify_view.html
share/doc/gamgi/interfaces/group/remove_object.html
share/doc/gamgi/interfaces/group/select.html
share/doc/gamgi/interfaces/group/symmetry.html
@ -470,6 +491,8 @@ share/gamgi/cell/Al_M/Al5Mo_h_r.xml
share/gamgi/cell/Al_M/Al5Mo_r.xml
share/gamgi/cell/Al_M/Al7Cr.xml
share/gamgi/cell/Al_M/Al7Cr_bw.xml
share/gamgi/cell/blenda.xml
share/gamgi/cell/blenda_screen.xml
share/gamgi/cell/calcite_solid.xml
share/gamgi/cell/calcite_wired.xml
share/gamgi/cell/interstices/
@ -498,6 +521,10 @@ share/gamgi/cell/rcp100.xml
share/gamgi/cell/screenshot
share/gamgi/cell/styles.xml
share/gamgi/cell/styles_bw.xml
share/gamgi/cell/superconductors/
share/gamgi/cell/superconductors/yba2cu3o6.xml
share/gamgi/cell/superconductors/yba2cu3o7.xml
share/gamgi/cell/superconductors/yba2cu3o7_structure.txt
share/gamgi/cell/tetragonal.xml
share/gamgi/cluster/
share/gamgi/cluster/H2O.xml
@ -725,7 +752,6 @@ 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