aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--science/gchemutils/Makefile14
-rw-r--r--science/gchemutils/distinfo4
-rw-r--r--science/gchemutils/files/extra-patch-gcu-object.cc16
-rw-r--r--science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc10
-rw-r--r--science/gchemutils/pkg-plist59
5 files changed, 59 insertions, 44 deletions
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index bc1cdf28b662..0700b9627cdf 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= gchemutils
-PORTVERSION= 0.2.7
-PORTREVISION= 3
+PORTVERSION= 0.4.1
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -27,4 +26,13 @@ USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-*
+.endif
+
+post-install:
+ ${RM} -rf ${PREFIX}/share/gnome/doc/gchemutils/reference/html/CVS
+
+.include <bsd.port.post.mk>
diff --git a/science/gchemutils/distinfo b/science/gchemutils/distinfo
index e06f3c68cfb3..673455fd1cb9 100644
--- a/science/gchemutils/distinfo
+++ b/science/gchemutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-chemistry-utils-0.2.7.tar.bz2) = bff67ef7ffc53f004c09c0b739f965b1
-SIZE (gnome-chemistry-utils-0.2.7.tar.bz2) = 396124
+MD5 (gnome-chemistry-utils-0.4.1.tar.bz2) = 5fca2be6de77d944215b1bef19d0647c
+SIZE (gnome-chemistry-utils-0.4.1.tar.bz2) = 478731
diff --git a/science/gchemutils/files/extra-patch-gcu-object.cc b/science/gchemutils/files/extra-patch-gcu-object.cc
new file mode 100644
index 000000000000..9b72965d18c7
--- /dev/null
+++ b/science/gchemutils/files/extra-patch-gcu-object.cc
@@ -0,0 +1,16 @@
+--- gcu/object.cc.orig Thu Mar 17 14:45:35 2005
++++ gcu/object.cc Sat Apr 2 23:05:36 2005
+@@ -392,7 +392,13 @@
+ while (max > TypeNames.size())
+ TypeNames.push_back ("");
+ }
++ /*
+ TypeNames.at (typedesc.Id) = TypeName;
++ */
++ vector<string>::iterator bleh;
++ bleh = TypeNames.begin();
++ bleh += typedesc.Id;
++ TypeNames.insert(bleh, TypeName);
+ return typedesc.Id;
+ }
+
diff --git a/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc b/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc
deleted file mode 100644
index f11658d8b680..000000000000
--- a/science/gchemutils/files/patch-chem3d-gtkchem3dviewer.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/pkg-plist b/science/gchemutils/pkg-plist
index 02b071410658..e6f49335b3f5 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -1,32 +1,25 @@
bin/gchem3d
bin/gchem3d-viewer
-include/gcu/chem3d/gtkchem3dviewer.h
-include/gcu/chemistry/atom.h
-include/gcu/chemistry/bond.h
-include/gcu/chemistry/object.h
-include/gcu/chemistry/element.h
-include/gcu/chemistry/matrix.h
-include/gcu/chemistry/xml-utils.h
-include/gcu/chemistry/chemistry.h
-include/gcu/crystalviewer/gtkcrystalviewer.h
-include/gcu/crystalviewer/crystalview.h
-include/gcu/crystalviewer/crystaldoc.h
-include/gcu/crystalviewer/crystalatom.h
-include/gcu/crystalviewer/crystalline.h
-include/gcu/crystalviewer/crystalcleavage.h
-include/gcu/gtkperiodic/gtkperiodic.h
+include/gcu/gcu/atom.h
+include/gcu/gcu/bond.h
+include/gcu/gcu/object.h
+include/gcu/gcu/document.h
+include/gcu/gcu/element.h
+include/gcu/gcu/matrix.h
+include/gcu/gcu/matrix2d.h
+include/gcu/gcu/xml-utils.h
+include/gcu/gcu/chemistry.h
+include/gcu/gcu/gtkperiodic.h
+include/gcu/gcu/gtkcrystalviewer.h
+include/gcu/gcu/crystalview.h
+include/gcu/gcu/crystaldoc.h
+include/gcu/gcu/crystalatom.h
+include/gcu/gcu/crystalline.h
+include/gcu/gcu/crystalcleavage.h
+include/gcu/gcu/gtkchem3dviewer.h
lib/libgcu.a
lib/libgcu.so
-lib/libgtkchem3dviewer.a
-lib/libgtkchem3dviewer.so
-lib/libgtkchem3dviewer.so.2
-lib/libgcu.so.2
-lib/libgtkcrystalviewer.a
-lib/libgtkcrystalviewer.so
-lib/libgtkcrystalviewer.so.2
-lib/libgtkperiodic.a
-lib/libgtkperiodic.so
-lib/libgtkperiodic.so.2
+lib/libgcu.so.4
libdata/bonobo/servers/gchem3d.server
libdata/pkgconfig/gcu.pc
share/gnome/applications/gchem3d-viewer.desktop
@@ -54,10 +47,15 @@ share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalLine.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalLine-members.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalView.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1CrystalView-members.html
+share/gnome/doc/gchemutils/reference/html/classgcu_1_1Document.html
+share/gnome/doc/gchemutils/reference/html/classgcu_1_1Document.png
+share/gnome/doc/gchemutils/reference/html/classgcu_1_1Document-members.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Element.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Element-members.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix-members.html
+share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix2D.html
+share/gnome/doc/gchemutils/reference/html/classgcu_1_1Matrix2D-members.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Object.html
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Object.png
share/gnome/doc/gchemutils/reference/html/classgcu_1_1Object-members.html
@@ -66,6 +64,10 @@ share/gnome/doc/gchemutils/reference/html/crystalcleavage_8h-source.html
share/gnome/doc/gchemutils/reference/html/crystaldoc_8h-source.html
share/gnome/doc/gchemutils/reference/html/crystalline_8h-source.html
share/gnome/doc/gchemutils/reference/html/crystalview_8h-source.html
+share/gnome/doc/gchemutils/reference/html/dir_000000.html
+share/gnome/doc/gchemutils/reference/html/dir_000001.html
+share/gnome/doc/gchemutils/reference/html/dirs.html
+share/gnome/doc/gchemutils/reference/html/document_8h-source.html
share/gnome/doc/gchemutils/reference/html/doxygen.css
share/gnome/doc/gchemutils/reference/html/doxygen.png
share/gnome/doc/gchemutils/reference/html/element_8h-source.html
@@ -89,9 +91,11 @@ share/gnome/doc/gchemutils/reference/html/chemistry_8h.html
share/gnome/doc/gchemutils/reference/html/chemistry_8h-source.html
share/gnome/doc/gchemutils/reference/html/index.html
share/gnome/doc/gchemutils/reference/html/matrix_8h-source.html
+share/gnome/doc/gchemutils/reference/html/matrix2d_8h-source.html
share/gnome/doc/gchemutils/reference/html/namespacegcu.html
share/gnome/doc/gchemutils/reference/html/namespacemembers.html
share/gnome/doc/gchemutils/reference/html/namespacemembers_enum.html
+share/gnome/doc/gchemutils/reference/html/namespacemembers_type.html
share/gnome/doc/gchemutils/reference/html/namespaces.html
share/gnome/doc/gchemutils/reference/html/object_8h-source.html
share/gnome/doc/gchemutils/reference/html/structGcuAtomicRadius.html
@@ -123,10 +127,7 @@ share/mime/chemical/x-mdl-molfile.xml
share/mime/chemical/x-pdb.xml
share/mime/chemical/x-xyz.xml
share/mime/packages/gchemutils.xml
-@dirrm include/gcu/chem3d
-@dirrm include/gcu/chemistry
-@dirrm include/gcu/crystalviewer
-@dirrm include/gcu/gtkperiodic
+@dirrm include/gcu/gcu
@dirrm include/gcu
@dirrm share/gnome/gchemutils/glade
@dirrm share/gnome/gchemutils