Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13214

Modified Files:
        gopenmol.info gopenmol.patch 
Log Message:
Try again to get install_name of lib to be correct and reasonable


Index: gopenmol.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gopenmol.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gopenmol.info       30 Jan 2007 19:21:25 -0000      1.7
+++ gopenmol.info       1 Feb 2007 06:45:32 -0000       1.8
@@ -42,6 +42,8 @@
 Fink packages. Set our Depends for each of those packages >= version
 that comes in Source tarball.
 
+Put libgopenmol in private lib/ instead of private bin/
+
 Some plugins fail to load because "couldn't find procedure Thing_Init"
 (during a tcl "load" call for libthing.dylib). These functions all
 exist in the associated source files and it's not consistent which
@@ -53,11 +55,12 @@
 
 No default $TMP or $TMPDIR, so set GOM_TEMP in environment.txt
 
-The rungOpenMol script just sets vars and calls the actual gopenmol,
-so put the vars in a profile.d and patch install.mk to not bother with
-the wrapper. Move the actual binary into %p/bin.
+The "rungOpenMol" script just sets variables (many of which are not
+needed for fink's installation and/or are not appropriate for OS X)
+and calls the actual "gopenmol" program, so put the key variable in a
+profile.d and patch install.mk to omit the wrapper. Symlink "gopenmol"
+from %p/bin.
 
-The main "gopenmol" program is symlinked from %p/bin/gopenmol.
 Utility programs are in %p/lib/gOpenMol-%v/bin so you have to either
 add that to yout PATH or call the programs using the full pathname.
 This is so we don't conflict with (for example) imagemagick's convert

Index: gopenmol.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gopenmol.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gopenmol.patch      30 Jan 2007 19:21:25 -0000      1.5
+++ gopenmol.patch      1 Feb 2007 06:45:32 -0000       1.6
@@ -1,6 +1,6 @@
 diff -Nurd -x'*~' gOpenMol-3.00.orig/environment.txt 
gOpenMol-3.00/environment.txt
 --- gOpenMol-3.00.orig/environment.txt 2005-08-29 10:04:23.000000000 -0400
-+++ gOpenMol-3.00/environment.txt      2007-01-26 03:48:18.000000000 -0500
++++ gOpenMol-3.00/environment.txt      2007-02-01 01:29:25.000000000 -0500
 @@ -16,4 +16,4 @@
  # GOM_HOME    ""
  ### On Windows, the default value is system temp directory.
@@ -9,7 +9,16 @@
 +GOM_TEMP    /tmp
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/config.mk.ac 
gOpenMol-3.00/src/config.mk.ac
 --- gOpenMol-3.00.orig/src/config.mk.ac        2004-09-23 17:24:29.000000000 
-0400
-+++ gOpenMol-3.00/src/config.mk.ac     2007-01-26 03:48:18.000000000 -0500
++++ gOpenMol-3.00/src/config.mk.ac     2007-02-01 01:30:10.000000000 -0500
+@@ -18,7 +18,7 @@
+ gomdataroot      = $(datadir)/$(gomsubdir)
+ gombindir        = $(gomroot)/bin
+ gomincdir        = $(includedir)/$(gomsubdir)
+-gomlibdir        = $(gomroot)/bin
++gomlibdir        = $(gomroot)/lib
+ # Tcl/Tk entries.
+ TCL_LIBRARY      = @TCL_LIBRARY@
+ TK_LIBRARY       = @TK_LIBRARY@
 @@ -64,7 +64,7 @@
  CCTAGS           = @CCTAGS@
  CCDEPMODE        = @CCDEPMODE@
@@ -19,18 +28,9 @@
  GOM_CFLAGS       = @ALL_CFLAGS@
  GOM_FFLAGS       = @ALL_FFLAGS@
  GOM_LDFLAGS      = @ALL_LDFLAGS@
-@@ -100,7 +100,7 @@
- LINK             = $(LIBTOOL) --mode=link $(CC) $(GOM_CFLAGS) -o
- LINK_SO          = $(LINK)
- LINK_A           = $(LINK)
--LINKFLAGS        = $(GOM_LDFLAGS) $(GOM_LIBS) $(GOM_LTLDFLAGS) -rpath 
$(gomlibdir)
-+LINKFLAGS        = $(GOM_LDFLAGS) $(GOM_LIBS) $(GOM_LTLDFLAGS) -rpath 
__fink_p__/lib/$(gomlibdir)/lib
- LINKFLAGS_SO     = $(LINKFLAGS) -avoid-version
- LINKFLAGS_A      =
- LTPREINSTALL     = :
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/parser/p_showc.c 
gOpenMol-3.00/src/parser/p_showc.c
 --- gOpenMol-3.00.orig/src/parser/p_showc.c    2005-08-29 10:05:21.000000000 
-0400
-+++ gOpenMol-3.00/src/parser/p_showc.c 2007-01-26 03:48:18.000000000 -0500
++++ gOpenMol-3.00/src/parser/p_showc.c 2007-02-01 01:29:25.000000000 -0500
 @@ -42,21 +42,21 @@
  
  #define ALIAS GOM_PARSER_CMD_ALIAS
@@ -84,7 +84,7 @@
      GOM_PARSER_VERIFY( intf->Func() == 0 );
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/plugins/Makefile 
gOpenMol-3.00/src/plugins/Makefile
 --- gOpenMol-3.00.orig/src/plugins/Makefile    2005-08-29 10:05:21.000000000 
-0400
-+++ gOpenMol-3.00/src/plugins/Makefile 2007-01-26 03:48:18.000000000 -0500
++++ gOpenMol-3.00/src/plugins/Makefile 2007-02-01 01:29:25.000000000 -0500
 @@ -22,7 +22,7 @@
  build compile clean clean-libs clean-objs: FORCE
        [EMAIL PROTECTED] dir in *; do \
@@ -96,7 +96,16 @@
  
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/plugins/config.mk.ac 
gOpenMol-3.00/src/plugins/config.mk.ac
 --- gOpenMol-3.00.orig/src/plugins/config.mk.ac        2004-09-23 
17:24:54.000000000 -0400
-+++ gOpenMol-3.00/src/plugins/config.mk.ac     2007-01-26 03:48:18.000000000 
-0500
++++ gOpenMol-3.00/src/plugins/config.mk.ac     2007-02-01 01:30:34.000000000 
-0500
+@@ -11,7 +11,7 @@
+ gombindir        = ${gomroot}/bin
+ gomincdir        = ${gomsrcdir}/include/gomlib
+ #INS gomincdir        = ${includedir}/${gomsubdir}
+-gomlibdir        = ${gomroot}/bin
++gomlibdir        = ${gomroot}/lib
+ gomsrcdir        = @abs_top_srcdir@
+ gombltdir        = @abs_top_builddir@
+ #INS gomsrcdir        = ${gomroot}/src
 @@ -59,7 +59,7 @@
  COMMON_LTLDFLAGS = @COMMON_LTLDFLAGS@
  # Values used by gOpenMol.
@@ -108,7 +117,7 @@
  GOM_LDFLAGS      = @LDFLAGS@
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/unix/make/gomapi.mk 
gOpenMol-3.00/src/unix/make/gomapi.mk
 --- gOpenMol-3.00.orig/src/unix/make/gomapi.mk 2005-08-29 10:05:30.000000000 
-0400
-+++ gOpenMol-3.00/src/unix/make/gomapi.mk      2007-01-30 11:08:42.000000000 
-0500
++++ gOpenMol-3.00/src/unix/make/gomapi.mk      2007-02-01 01:29:25.000000000 
-0500
 @@ -47,6 +47,7 @@
  # (see case statement above).
  graphics/gomapi.exp: include/gomext/*.h
@@ -119,7 +128,7 @@
  
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/unix/make/install.mk 
gOpenMol-3.00/src/unix/make/install.mk
 --- gOpenMol-3.00.orig/src/unix/make/install.mk        2005-08-29 
10:05:31.000000000 -0400
-+++ gOpenMol-3.00/src/unix/make/install.mk     2007-01-26 03:48:18.000000000 
-0500
++++ gOpenMol-3.00/src/unix/make/install.mk     2007-02-01 01:37:23.000000000 
-0500
 @@ -26,6 +26,7 @@
        -e 's%^TCL_LIBRARY=.*%TCL_LIBRARY='"'"'$(TCL_LIBRARY)'"'%" \
        -e 's%^TK_LIBRARY=.*%TK_LIBRARY='"'"'$(TK_LIBRARY)'"'%" \
@@ -128,9 +137,17 @@
        -e '[EMAIL PROTECTED]@%$(PATH_SEPARATOR)%' \
        -e "[EMAIL PROTECTED]@%$${shlibpath_var}%g" )
  
+@@ -85,7 +86,6 @@
+ 
+ install-local-local: install-local-generated \
+                      install-local-environment \
+-                     install-local-rungopenmol \
+                      install-local-data \
+                      FORCE ;
+ 
 diff -Nurd -x'*~' gOpenMol-3.00.orig/src/unix/make/utility.mk.ac 
gOpenMol-3.00/src/unix/make/utility.mk.ac
 --- gOpenMol-3.00.orig/src/unix/make/utility.mk.ac     2005-08-29 
10:05:31.000000000 -0400
-+++ gOpenMol-3.00/src/unix/make/utility.mk.ac  2007-01-26 03:48:18.000000000 
-0500
++++ gOpenMol-3.00/src/unix/make/utility.mk.ac  2007-02-01 01:29:25.000000000 
-0500
 @@ -47,8 +47,7 @@
                 xmol2bamber$(EXEEXT) \
                 xplor2charmm$(EXEEXT) \


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to