From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 27 11:40:19 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A49A37B404 for ; Fri, 27 Jun 2003 11:40:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0463743FF3 for ; Fri, 27 Jun 2003 11:40:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5RIeGUp016761 for ; Fri, 27 Jun 2003 11:40:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5RIeG8X016760; Fri, 27 Jun 2003 11:40:16 -0700 (PDT) Resent-Date: Fri, 27 Jun 2003 11:40:16 -0700 (PDT) Resent-Message-Id: <200306271840.h5RIeG8X016760@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pav Lucistnik Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 538F737B401 for ; Fri, 27 Jun 2003 11:30:28 -0700 (PDT) Received: from hood.oook.cz (hood.oook.cz [212.27.205.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17CCB43FAF for ; Fri, 27 Jun 2003 11:30:25 -0700 (PDT) (envelope-from pav@hood.oook.cz) Received: from pav.hide.vol.cz (localhost [127.0.0.1])h5RHMdAV086700 for ; Fri, 27 Jun 2003 19:22:39 +0200 (CEST) (envelope-from pav@pav.hide.vol.cz) Received: (from pav@localhost) by pav.hide.vol.cz (8.12.9/8.12.9/Submit) id h5RHMcX7086699; Fri, 27 Jun 2003 19:22:38 +0200 (CEST) (envelope-from pav) Message-Id: <200306271722.h5RHMcX7086699@pav.hide.vol.cz> Date: Fri, 27 Jun 2003 19:22:38 +0200 (CEST) From: Pav Lucistnik To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53851: [maintainer update] science/gchemutils to 0.1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Pav Lucistnik List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2003 18:40:19 -0000 >Number: 53851 >Category: ports >Synopsis: [maintainer update] science/gchemutils to 0.1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jun 27 11:40:16 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Pav Lucistnik >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD pav.hide.vol.cz 4.8-STABLE FreeBSD 4.8-STABLE #1: Tue May 20 09:27:29 CEST 2003 root@pav.hide.vol.cz:/usr/obj/usr/src/sys/PAV i386 >Description: Update science/gchemutils to 0.1.4. This update requires openbabel shared libraries, see PR 53845. remove files/patch-gtkperiodic-gtkperiodic.c (merged upstream) remove files/patch-chemistry_element.cc (merged upstream) remove files/patch-tests-testgtkcrystalviewer.c (merged upstream) add patch-chem3d-gtkchem3dviewer.cc >How-To-Repeat: >Fix: diff -ruN /usr/ports/science/gchemutils/Makefile gchemutils/Makefile --- /usr/ports/science/gchemutils/Makefile Tue Apr 8 02:04:57 2003 +++ gchemutils/Makefile Fri Jun 27 18:15:41 2003 @@ -5,7 +5,7 @@ # $FreeBSD: ports/science/gchemutils/Makefile,v 1.1 2003/04/08 00:04:57 marcus Exp $ 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 @@ 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_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 diff -ruN /usr/ports/science/gchemutils/distinfo gchemutils/distinfo --- /usr/ports/science/gchemutils/distinfo Tue Apr 8 02:04:57 2003 +++ gchemutils/distinfo Fri Jun 27 14:29:19 2003 @@ -1 +1 @@ -MD5 (gnome-chemistry-utils-0.1.3.tar.bz2) = 0be12cb53fad3ccbb70aaa600da34cf7 +MD5 (gnome-chemistry-utils-0.1.4.tar.bz2) = 148bcaa8fdd3cfc876f46ddd5aa4c31b diff -ruN /usr/ports/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc gchemutils/files/patch-chem3d-gtkchem3dviewer.cc --- /usr/ports/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc Thu Jan 1 01:00:00 1970 +++ gchemutils/files/patch-chem3d-gtkchem3dviewer.cc Fri Jun 27 18:22:20 2003 @@ -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 + #include + #include ++#include + #ifdef HAVE_GTKGLAREA + # include + #else diff -ruN /usr/ports/science/gchemutils/files/patch-chemistry_element.cc gchemutils/files/patch-chemistry_element.cc --- /usr/ports/science/gchemutils/files/patch-chemistry_element.cc Tue Apr 8 02:04:57 2003 +++ gchemutils/files/patch-chemistry_element.cc Thu Jan 1 01:00:00 1970 @@ -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 -ruN /usr/ports/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c gchemutils/files/patch-gtkperiodic-gtkperiodic.c --- /usr/ports/science/gchemutils/files/patch-gtkperiodic-gtkperiodic.c Tue Apr 8 02:04:57 2003 +++ gchemutils/files/patch-gtkperiodic-gtkperiodic.c Thu Jan 1 01:00:00 1970 @@ -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 -ruN /usr/ports/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c gchemutils/files/patch-tests-testgtkcrystalviewer.c --- /usr/ports/science/gchemutils/files/patch-tests-testgtkcrystalviewer.c Tue Apr 8 02:04:57 2003 +++ gchemutils/files/patch-tests-testgtkcrystalviewer.c Thu Jan 1 01:00:00 1970 @@ -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 -ruN /usr/ports/science/gchemutils/pkg-plist gchemutils/pkg-plist --- /usr/ports/science/gchemutils/pkg-plist Tue Apr 8 02:04:57 2003 +++ gchemutils/pkg-plist Fri Jun 27 18:30:24 2003 @@ -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/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/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 >Release-Note: >Audit-Trail: >Unformatted: