Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci In directory sc8-pr-cvs17:/tmp/cvs-serv21735/10.3/unstable/main/finkinfo/sci
Modified Files: ghemical.info ghemical.patch Log Message: switch to freeglut; fix -I ordering Index: ghemical.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ghemical.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ghemical.patch 14 Sep 2005 05:24:59 -0000 1.2 +++ ghemical.patch 15 Oct 2007 03:56:19 -0000 1.3 @@ -1,17 +1,18 @@ -diff -ruN ghemical-1.01/src/graphics/objects.h ghemical-1.01-patched/src/graphics/objects.h ---- ghemical-1.01/src/graphics/objects.h 2001-12-29 09:56:49.000000000 -0500 -+++ ghemical-1.01-patched/src/graphics/objects.h 2005-03-18 22:02:59.000000000 -0500 -@@ -177,7 +177,7 @@ - { - protected: - -- friend obj_loc_data * dummy_object::GetLocDataRW(void) const; -+ friend class dummy_object; - - obj_loc_data * data; - ---- ghemical-1.01/openbabel/fileformat.h~ 2005-08-12 16:04:19.000000000 +0200 -+++ ghemical-1.01/openbabel/fileformat.h 2005-08-12 16:04:56.000000000 +0200 +diff -Nurd -x'*~' ghemical-1.01.orig/openbabel/Makefile.in ghemical-1.01/openbabel/Makefile.in +--- ghemical-1.01.orig/openbabel/Makefile.in 2002-06-19 17:18:59.000000000 -0400 ++++ ghemical-1.01/openbabel/Makefile.in 2007-10-14 23:01:19.000000000 -0400 +@@ -8,7 +8,7 @@ + CXX = @CXX@ + + CFLAGS = @CFLAGS@ +-CXXFLAGS = @CXXFLAGS@ -DDATADIR=\"${pkgdatadir}\" -I$(builddir) ++CXXFLAGS = -DDATADIR=\"${pkgdatadir}\" -I$(builddir) @CXXFLAGS@ + LIBS = @LIBS@ + LIBFLAGS = -DLIBRARY + +diff -Nurd -x'*~' ghemical-1.01.orig/openbabel/fileformat.h ghemical-1.01/openbabel/fileformat.h +--- ghemical-1.01.orig/openbabel/fileformat.h 2002-06-19 17:19:00.000000000 -0400 ++++ ghemical-1.01/openbabel/fileformat.h 2007-10-14 23:00:56.000000000 -0400 @@ -122,7 +122,7 @@ bool WriteQChem(std::ostream &,OBMol &); bool WriteReport(std::ostream &,OBMol &); @@ -21,8 +22,30 @@ //test bool WriteSmiOrderedMol2(std::ostream &,OBMol &,char *dimension="3D"); //test ---- ghemical-1.01/src/common/utility.h~ 2001-07-24 18:56:37.000000000 +0200 -+++ ghemical-1.01/src/common/utility.h 2005-08-12 16:17:35.000000000 +0200 +diff -Nurd -x'*~' ghemical-1.01.orig/src/common/Makefile.in ghemical-1.01/src/common/Makefile.in +--- ghemical-1.01.orig/src/common/Makefile.in 2002-06-19 17:19:02.000000000 -0400 ++++ ghemical-1.01/src/common/Makefile.in 2007-10-14 23:23:27.000000000 -0400 +@@ -47,7 +47,7 @@ + ######################################################################### + + %.o: %.cpp +- $(CXX) $(DEFINES) -c $(CXXFLAGS) $(INCS) $(srcdir)/$(@:.o=.cpp) ++ $(CXX) $(DEFINES) -c $(INCS) $(CXXFLAGS) $(srcdir)/$(@:.o=.cpp) + + all: $(TARGET) + +@@ -60,7 +60,7 @@ + + depend: + [EMAIL PROTECTED] i in $(SRC); do \ +- $(CXX) -c -MM $(CXXFLAGS) $(INCS) $(srcdir)/$$i >> depend; \ ++ $(CXX) -c -MM $(INCS) $(CXXFLAGS) $(srcdir)/$$i >> depend; \ + done && test -z "$$fail" + + distclean: clean +diff -Nurd -x'*~' ghemical-1.01.orig/src/common/utility.h ghemical-1.01/src/common/utility.h +--- ghemical-1.01.orig/src/common/utility.h 2001-07-24 12:56:37.000000000 -0400 ++++ ghemical-1.01/src/common/utility.h 2007-10-14 23:00:56.000000000 -0400 @@ -149,7 +149,7 @@ public: @@ -32,3 +55,96 @@ ~singleton_cleaner(void) { if (instance) delete instance; } bool SetInstance(TYPE1 * p1) { if (instance) return false; instance = p1; return true; } +diff -Nurd -x'*~' ghemical-1.01.orig/src/graphics/Makefile.in ghemical-1.01/src/graphics/Makefile.in +--- ghemical-1.01.orig/src/graphics/Makefile.in 2002-06-19 17:19:02.000000000 -0400 ++++ ghemical-1.01/src/graphics/Makefile.in 2007-10-14 23:23:12.000000000 -0400 +@@ -44,7 +44,7 @@ + ########################################################################### + + %.o: %.cpp +- $(CXX) $(DEFINES) -c $(CXXFLAGS) $(INCS) $(srcdir)/$(@:.o=.cpp) ++ $(CXX) $(DEFINES) -c $(INCS) $(CXXFLAGS) $(srcdir)/$(@:.o=.cpp) + + all: $(TARGET) + +@@ -57,7 +57,7 @@ + + depend: + [EMAIL PROTECTED] i in $(SRC); do \ +- $(CXX) -c -MM $(CXXFLAGS) $(INCS) $(srcdir)/$$i >> depend; \ ++ $(CXX) -c -MM $(INCS) $(CXXFLAGS) $(srcdir)/$$i >> depend; \ + done && test -z "$$fail" + + distclean: clean +diff -Nurd -x'*~' ghemical-1.01.orig/src/graphics/objects.h ghemical-1.01/src/graphics/objects.h +--- ghemical-1.01.orig/src/graphics/objects.h 2001-12-29 09:56:49.000000000 -0500 ++++ ghemical-1.01/src/graphics/objects.h 2007-10-14 23:00:56.000000000 -0400 +@@ -177,7 +177,7 @@ + { + protected: + +- friend obj_loc_data * dummy_object::GetLocDataRW(void) const; ++ friend class dummy_object; + + obj_loc_data * data; + +diff -Nurd -x'*~' ghemical-1.01.orig/src/target3/Makefile.in ghemical-1.01/src/target3/Makefile.in +--- ghemical-1.01.orig/src/target3/Makefile.in 2002-06-17 05:52:20.000000000 -0400 ++++ ghemical-1.01/src/target3/Makefile.in 2007-10-14 23:21:44.000000000 -0400 +@@ -33,7 +33,7 @@ + @GNOMEUI_LIBS@ \ + @LIBGLADE_LIBS@ \ + @SC_LIBS@ +- ++ + GHEMICAL_LIBS= $(top_builddir)/src/target3/glade/libdialogs.a \ + $(top_builddir)/src/graphics/libgraphics.a \ + $(top_builddir)/src/common/libcommon.a \ +@@ -65,7 +65,7 @@ + $(CXX) -o $(TARGET) $(OBJ) $(GHEMICAL_LIBS) $(LIBS) + + %.o: %.cpp +- $(CXX) $(DEFINES) -c $(CXXFLAGS) $(INCS) $(srcdir)/$(@:.o=.cpp) ++ $(CXX) $(DEFINES) -c $(INCS) $(CXXFLAGS) $(srcdir)/$(@:.o=.cpp) + + all: $(TARGET) + +@@ -73,7 +73,7 @@ + + depend: + [EMAIL PROTECTED] i in $(SRC); do \ +- $(CXX) -c -MM $(CXXFLAGS) $(INCS) $(srcdir)/$$i >> depend; \ ++ $(CXX) -c -MM $(INCS) $(CXXFLAGS) $(srcdir)/$$i >> depend; \ + done + + distclean: clean +diff -Nurd -x'*~' ghemical-1.01.orig/src/target3/glade/Makefile.in ghemical-1.01/src/target3/glade/Makefile.in +--- ghemical-1.01.orig/src/target3/glade/Makefile.in 2002-06-07 06:54:57.000000000 -0400 ++++ ghemical-1.01/src/target3/glade/Makefile.in 2007-10-14 23:22:44.000000000 -0400 +@@ -33,7 +33,7 @@ + SRC = geomopt_dialog.cpp moldyn_dialog.cpp trajview_dialog.cpp \ + file_import_dialog.cpp file_export_dialog.cpp \ + setup_qm1_dialog.cpp setup_mm1_dialog.cpp +- ++ + OBJ = $(SRC:.cpp=.o) + + TARGET= libdialogs.a +@@ -41,7 +41,7 @@ + ########################################################################### + + %.o: %.cpp +- $(CXX) $(DEFINES) -c $(CXXFLAGS) $(INCS) $(srcdir)/$(@:.o=.cpp) ++ $(CXX) $(DEFINES) -c $(INCS) $(CXXFLAGS) $(srcdir)/$(@:.o=.cpp) + + all: $(TARGET) + +@@ -54,7 +54,7 @@ + + depend: + [EMAIL PROTECTED] i in $(SRC); do \ +- $(CXX) -c -MM $(CXXFLAGS) $(INCS) $(srcdir)/$$i >> depend; \ ++ $(CXX) -c -MM $(INCS) $(CXXFLAGS) $(srcdir)/$$i >> depend; \ + done && test -z "$$fail" + + distclean: clean Index: ghemical.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ghemical.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ghemical.info 13 Apr 2005 01:10:48 -0000 1.5 +++ ghemical.info 15 Oct 2007 03:56:19 -0000 1.6 @@ -1,9 +1,9 @@ Package: ghemical Version: 1.01 -Revision: 2 +Revision: 3 Maintainer: None <[EMAIL PROTECTED]> -Depends: glut-shlibs (>= 3.7-3), gnome-libs-shlibs, libxml-shlibs, libglade-shlibs -BuildDepends: gtkglarea, glut (>= 3.7-3), gnome-libs-dev, glib, gtk+, esound, audiofile, f2c (>= 20020123-3), libxml, libglade, imlib, orbit-dev, gettext-dev, gettext-bin +Depends: freeglut-shlibs, gnome-libs-shlibs, libxml-shlibs, libglade-shlibs +BuildDepends: gtkglarea, freeglut, gnome-libs-dev, glib, gtk+, esound, audiofile, f2c (>= 20020123-3), libxml, libglade, imlib, orbit-dev, gettext-dev, gettext-bin, fink (>= 0.24.12-1) BuildConflicts: singular-factory Source: mirror:custom:%n-%v.tgz CustomMirror: << @@ -11,7 +11,8 @@ Secondary: http://www.bioinformatics.org/ghemical/download/archive/ << Source-MD5: 41f7b6ce38b4a1be9a9cf00d7d068b4a -Patch: %n.patch +PatchFile: %n.patch +PatchFile-MD5: 24130384e898fd4e470d19f182220404 GCC: 3.3 SetCFLAGS: -I%p/include SetCXXFLAGS: -I%p/include -I/usr/X11R6/include @@ -19,7 +20,7 @@ DocFiles: AUTHORS BUGLIST CHANGES COPYING PROJECT Description: Molecular modelling environment for GNOME DescDetail: << - Ghemical is a computational chemistry software package written in C++. It +Ghemical is a computational chemistry software package written in C++. It has a graphical user interface and it supports both quantum- mechanics (semi-empirical) models and molecular mechanics models. Geometry optimization, molecular dynamics and a large set of visualization tools ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs