[SCM] Rasmol packaging branch, p/imakefile, updated. upstream/2.7.5-6-g9134526

[Teemu Ikonen]

The following commit has been merged in the p/imakefile branch:
commit 2370cb9a94d8e128dcc6979afaf68d82dae506fc
Merge: b0d67bdc08f1867e826cd271ef180921c581238d 0e65c857800f66c3fa254e27c27c9a8566d16b68
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Tue Sep 27 19:58:30 2011 +0200

    Merge branch 'upstream' into p/imakefile
    
    Conflicts:
    	src/Imakefile

diff --combined src/Imakefile
index a7047c9,b5a88dd..7c2faed
--- a/src/Imakefile
+++ b/src/Imakefile
@@@ -1,8 -1,8 +1,8 @@@
- # #define NEARTREE_LOCAL
 -#define CBFLIB_LOCAL
 -#define CQRLIB_LOCAL
 -#define CVECTOR_LOCAL
 -#define NEARTREE_LOCAL
 -#define XFORMSLIB_LOCAL
++# #define CBFLIB_LOCAL
 +# #define CQRLIB_LOCAL
 +# #define CVECTOR_LOCAL
++# #define NEARTREE_LOCAL
 +# #define XFORMSLIB_LOCAL
- # #define CBFLIB_LOCAL
  ###########################################################################
  #                               RasMol 2.7.5                              #
  #                                                                         #
@@@ -124,7 -124,7 +124,7 @@@ DEPTHDEF = -DTHIRTYTWOBI
    LOCALEDEF =
  #endif
  
 -PKGDIR = $(HOME)
 +PKGDIR = /usr
  
  #ifndef GTKWIN
  #define X11WIN
@@@ -185,7 -185,7 +185,7 @@@ XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_D
  # Definitions for CBFLIB
  #
  #ifdef CBFLIB_LOCAL
- CBFLIB_VERSION = 0.8.1
+ CBFLIB_VERSION = 0.9.2
  CBFLIB_TARBALL = CBFlib-$(CBFLIB_VERSION).tar.gz
  CBFLIB_TARBALLDIR = $(EXTPKGDIR)
  CBFLIB_TARBALL_URL = http://downloads.sf.net/cbflib/$(CBFLIB_TARBALL)
@@@ -197,7 -197,7 +197,7 @@@ CBFLIB_OBJDEP = $(CBFLIB_DIR)/lib/libcb
  ifeq ($(strip $(CBFLIB_DIR)),)
  CBFLIB_DIR = $(PKGDIR)
  endif
- CBFLIB_INCLUDE_DIR = $(CBFLIB_DIR)/include/cbf
+ CBFLIB_INCLUDE_DIR = $(CBFLIB_DIR)/include/cbflib
  CBFLIB_LDLIB = -L$(CBFLIB_DIR)/lib -lcbf
  CBFLIB_OBJDEP =
  #define NO_CBFLIB_BUILD
@@@ -206,7 -206,7 +206,7 @@@
  # Definitions for CQRLIB
  #
  #ifdef CQRLIB_LOCAL
- CQRLIB_VERSION = 1.0.3
+ CQRLIB_VERSION = 1.1.2
  CQRLIB_TARBALL = CQRlib-$(CQRLIB_VERSION).tar.gz
  CQRLIB_TARBALLDIR = $(EXTPKGDIR)
  CQRLIB_TARBALL_URL = http://downloads.sf.net/cqrlib/$(CQRLIB_TARBALL)
@@@ -252,14 -252,14 +252,14 @@@ CVECTOR_OBJDEP 
  # Definitions for NEARTREE
  #
  #ifdef NEARTREE_LOCAL
- NEARTREE_VERSION = 2.1.3
+ NEARTREE_VERSION = 3.1
  NEARTREE_TARBALL = NearTree-$(NEARTREE_VERSION).tar.gz
  NEARTREE_TARBALLDIR = $(EXTPKGDIR)
  NEARTREE_TARBALL_URL = http://downloads.sf.net/neartree/$(NEARTREE_TARBALL)
  NEARTREE_DIR = $(NEARTREE_TARBALLDIR)/NearTree-$(NEARTREE_VERSION)
  NEARTREE_INCLUDE_DIR = $(NEARTREE_DIR)
  NEARTREE_LDLIB = $(NEARTREE_DIR)/CNearTree.o
- NEARTREE_SRC = $(NEARTREE_DIR)/CNearTree.c
+ NEARTREE_SRC = -DCNEARTREE_FORCEFLIP $(NEARTREE_DIR)/CNearTree.c
  NEARTREE_OBJDEP = $(NEARTREE_DIR)/CNearTree.o
  #else
  ifeq ($(strip $(NEARTREE_DIR)),)
@@@ -276,7 -276,7 +276,7 @@@ NEARTREE_OBJDEP 
  
  # RasMol's on-line help direcory
  #   e.g. /usr/local/lib/rasmol/rasmol.hlp
 -RASMOLDIR = $(USRLIBDIR)/rasmol/
 +RASMOLDIR = /usr/share/rasmol/
  
  
  #ifndef USE_XFORMSLIB
@@@ -332,23 -332,23 +332,23 @@@ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRA
  #
  
  #ifdef HPArchitecture
 -CCOPTIONS = -Ae
 -CDEBUGFLAGS = +O2 +Onolimit
 +#CCOPTIONS = -Ae
 +#CDEBUGFLAGS = -O2 # -Onolimit
  
  #ifdef HPUX_PARISC_32
 -CCOPTIONS = -Ae +DA2.0 +DS2.0
 +#CCOPTIONS = -Ae -DA2.0 -DS2.0
  #endif
  
  #ifdef HPUX_PARISC_64
 -CCOPTIONS = -Ae +DA2.0W +DS2.0 -D_LONGLONG
 +#CCOPTIONS = -Ae -DA2.0W -DS2.0 -D_LONGLONG
  #endif
  
  #ifdef HPUX_IA64_32
 -CCOPTIONS = -Ae +DD32 +DSmckinley
 +#CCOPTIONS = -Ae -DD32 -DSmckinley
  #endif
  
  #ifdef HPUX_IA64_64
 -CCOPTIONS = -Ae +DD64 +DSmckinley -D_LONGLONG
 +#CCOPTIONS = -Ae -DD64 -DSmckinley -D_LONGLONG
  #endif
  #endif
  

-- 
Rasmol packaging