diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-29 19:36:09 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-29 19:36:09 +0000 |
commit | 8ac8c0761ac4091da86ccbf75e34f89e40d65423 (patch) | |
tree | 62ac705080488330278c031325c3a5e3da0ba369 /science/gchemutils | |
parent | * Update to 1.100.1 (diff) |
Update to 0.1.4.
PR: 53851
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=83852
Diffstat (limited to 'science/gchemutils')
-rw-r--r-- | science/gchemutils/Makefile | 10 | ||||
-rw-r--r-- | science/gchemutils/distinfo | 2 | ||||
-rw-r--r-- | science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc | 10 | ||||
-rw-r--r-- | science/gchemutils/files/patch-chemistry_element.cc | 13 | ||||
-rw-r--r-- | science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c | 35 | ||||
-rw-r--r-- | science/gchemutils/files/patch-tests-testgtkcrystalviewer.c | 23 | ||||
-rw-r--r-- | science/gchemutils/pkg-plist | 12 |
7 files changed, 27 insertions, 78 deletions
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile index cd304ef4c521..bd2f3bc33920 100644 --- a/science/gchemutils/Makefile +++ b/science/gchemutils/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= gchemutils -PORTVERSION= 0.1.3 +PORTVERSION= 0.1.4 CATEGORIES= science MASTER_SITES= http://savannah.nongnu.org/download/gchemutils/unstable.pkg/${PORTVERSION}/ DISTNAME= gnome-chemistry-utils-${PORTVERSION} @@ -13,7 +13,8 @@ DISTNAME= gnome-chemistry-utils-${PORTVERSION} MAINTAINER= pav@oook.cz COMMENT= C++ classes and Gtk2 widgets related to chemistry -LIB_DEPENDS= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext +LIB_DEPENDS= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext \ + openbabel.0:${PORTSDIR}/science/openbabel USE_BZIP2= yes USE_X_PREFIX= yes @@ -21,9 +22,6 @@ USE_GNOME= gnomehack gnomeprefix libglade2 libgnomeprint USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes - -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/science/gchemutils/distinfo b/science/gchemutils/distinfo index e75d456b0142..bc566e4d7e33 100644 --- a/science/gchemutils/distinfo +++ b/science/gchemutils/distinfo @@ -1 +1 @@ -MD5 (gnome-chemistry-utils-0.1.3.tar.bz2) = 0be12cb53fad3ccbb70aaa600da34cf7 +MD5 (gnome-chemistry-utils-0.1.4.tar.bz2) = 148bcaa8fdd3cfc876f46ddd5aa4c31b diff --git a/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc b/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc new file mode 100644 index 000000000000..f11658d8b680 --- /dev/null +++ b/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc @@ -0,0 +1,10 @@ +--- chem3d/gtkchem3dviewer.cc.orig Thu Jun 12 23:03:04 2003 ++++ chem3d/gtkchem3dviewer.cc Fri Jun 27 18:21:44 2003 +@@ -30,6 +30,7 @@ + #include <gtk/gtk.h> + #include <GL/gl.h> + #include <GL/glu.h> ++#include <locale.h> + #ifdef HAVE_GTKGLAREA + # include <gtkgl/gtkglarea.h> + #else diff --git a/science/gchemutils/files/patch-chemistry_element.cc b/science/gchemutils/files/patch-chemistry_element.cc deleted file mode 100644 index aceb4fe25c99..000000000000 --- a/science/gchemutils/files/patch-chemistry_element.cc +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -r1.3 element.cc ---- chemistry/element.cc 1 Mar 2003 17:02:49 -0000 1.3 -+++ chemistry/element.cc 2 Apr 2003 04:14:46 -0000 -@@ -97,7 +97,7 @@ - if (!strcmp((const char*)child->name, "name")) - { - tmp = (char*) xmlNodeGetLang(child); -- if ((!tmp) && (!lang) && (!strncmp(lang, tmp, 2))) Elt->name = (char*) xmlNodeGetContent(child); -+ if (tmp && lang && (!strncmp(lang, tmp, 2))) Elt->name = (char*) xmlNodeGetContent(child); - else DefaultName = (char*) xmlNodeGetContent(child); - } - else if (!strcmp((const char*)child->name, "color")) - diff --git a/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c b/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c deleted file mode 100644 index d80aeb660567..000000000000 --- a/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c +++ /dev/null @@ -1,35 +0,0 @@ ---- gtkperiodic/gtkperiodic.c.orig Sat Mar 1 20:49:14 2003 -+++ gtkperiodic/gtkperiodic.c Wed Mar 19 01:13:51 2003 -@@ -157,6 +157,9 @@ - { - GladeXML* xml; - GtkStyle* style; -+ char name[8] = "elt"; -+ GtkToggleButton* button; -+ int i; - xml = glade_xml_new(DATADIR"/gchemutils/glade/gtkperiodic.glade", "vbox1", NULL); - if (xml) glade_xml_signal_autoconnect (xml); - periodic->priv = g_new0(GtkPeriodicPrivate, 1); -@@ -164,9 +167,6 @@ - periodic->priv->vbox = GTK_VBOX(glade_xml_get_widget(xml, "vbox1")); - periodic->priv->colorstyle = GTK_PERIODIC_COLOR_NONE; - memset(periodic->priv->buttons, 0, sizeof(GtkToggleButton*) * 119); -- char name[8] = "elt"; -- GtkToggleButton* button; -- int i; - for (i = 1; i <= 118; i++) - { - sprintf(name + 3, "%d", i); -@@ -217,10 +217,11 @@ - static gboolean change = FALSE; - if (button != periodic->priv->buttons[0]) - { -+ const gchar* name; - change = TRUE; - if (periodic->priv->buttons[0]) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(periodic->priv->buttons[0]), FALSE); - periodic->priv->buttons[0] = button; -- const gchar* name = gtk_widget_get_name(GTK_WIDGET(periodic->priv->buttons[0])); -+ name = gtk_widget_get_name(GTK_WIDGET(periodic->priv->buttons[0])); - periodic->priv->Z = atoi(name + 3); - g_signal_emit(periodic, gtk_periodic_signals[ELEMENT_CHANGED], 0, periodic->priv->Z); - change = FALSE; diff --git a/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c b/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c deleted file mode 100644 index ce17206cfa84..000000000000 --- a/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c +++ /dev/null @@ -1,23 +0,0 @@ ---- tests/testgtkcrystalviewer.c.orig Mon Nov 11 19:50:18 2002 -+++ tests/testgtkcrystalviewer.c Tue Mar 18 11:25:55 2003 -@@ -8,6 +8,8 @@ - { - GtkWidget *window; - GtkWidget *viewer; -+ const char* filename; -+ xmlDocPtr xml; - gtk_init (&argc, &argv); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); -@@ -16,10 +18,9 @@ - GTK_SIGNAL_FUNC(gtk_main_quit), - NULL); - -- const char* filename; - if (argc >= 2) filename = argv[1]; - else filename = "nickel.gcrystal"; -- xmlDocPtr xml = xmlParseFile(filename); -+ xml = xmlParseFile(filename); - - viewer = gtk_crystal_viewer_new(xml->children); - gtk_container_add(GTK_CONTAINER(window), viewer); diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist index 3d43187c3e79..f545cd98b6f8 100644 --- a/science/gchemutils/pkg-plist +++ b/science/gchemutils/pkg-plist @@ -1,3 +1,5 @@ +bin/gchem3d +include/gcu/chem3d/gtkchem3dviewer.h include/gcu/chemistry/atom.h include/gcu/chemistry/bond.h include/gcu/chemistry/object.h @@ -15,6 +17,9 @@ include/gcu/crystalviewer/crystalcleavage.h include/gcu/gtkperiodic/gtkperiodic.h lib/libgcu.a lib/libgcu.so +lib/libgtkchem3dviewer.a +lib/libgtkchem3dviewer.so +lib/libgtkchem3dviewer.so.1 lib/libgcu.so.1 lib/libgtkcrystalviewer.a lib/libgtkcrystalviewer.so @@ -22,9 +27,16 @@ lib/libgtkcrystalviewer.so.1 lib/libgtkperiodic.a lib/libgtkperiodic.so lib/libgtkperiodic.so.1 +libdata/bonobo/servers/gchem3d.server libdata/pkgconfig/gcu.pc share/gnome/gchemutils/elements.xml share/gnome/gchemutils/glade/gtkperiodic.glade +share/gnome/mime-info/gchemutils.keys +share/gnome/mime-info/gchemutils.mime +share/locale/fr/LC_MESSAGES/gnome-chemistry-utils.mo +share/locale/it/LC_MESSAGES/gnome-chemistry-utils.mo +share/locale/pl/LC_MESSAGES/gnome-chemistry-utils.mo +@dirrm include/gcu/chem3d @dirrm include/gcu/chemistry @dirrm include/gcu/crystalviewer @dirrm include/gcu/gtkperiodic |