Update of /cvsroot/fink/experimental/dmrrsn
In directory sc8-pr-cvs17:/tmp/cvs-serv10433

Added Files:
        libogdi3.info libogdi3.patch 
Log Message:
experimental revision, to make things safer for the future


--- NEW FILE: libogdi3.info ---
Package: libogdi3
Version: 3.1.5
Revision: 1003
Description: OGDI - Open Geographic Datastore Interface
License: BSD
Homepage: http://ogdi.sourceforge.net
Maintainer: BABA Yoshihiko <[EMAIL PROTECTED]>
DescDetail: <<
 an application programming interface (API) that uses a standardized 
access methods to work in conjunction with GIS software packages 
(the application) and various geospatial data products.
<<

# Dependencies.
Depends: %n-shlibs, proj-shlibs, expat-shlibs
BuildDepends: proj, expat, fink (>= 0.24.12)
BuildDependsOnly: true

# Unpack Phase.
Source: mirror:sourceforge:/ogdi/ogdi-%v.tar.gz
Source-MD5: 9ccf8202b63875a68ded23588bd49544

# Patch Phase.
# Patch for PostGIS-1.0 Support
PatchFile: %n.patch
PatchFile-MD5: 810d6bc7cc42de4d15a8741dcb90c10f
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1

# Compile Phase.
GCC: 4.0
ConfigureParams: 
CompileScript: <<
#!/bin/sh -xe
  export TOPDIR=%b
  export TARGET=darwin
  make prefix=%p
<<

# Install Phase.
InstallScript: <<
#!/bin/sh -xe
  export TOPDIR=%b
  export TARGET=darwin
  make install exec_prefix=%i INST_INCLUDE=%i/include
  mkdir %i/lib/%n
  mv %i/bin/example* %i/lib/%n
<<
DocFiles: ChangeLog HOWTO-RELEASE LICENSE NEWS README VERSION

# Additional Phase.
SplitOff: <<
        Package: %N-shlibs
        Description: Shared libraries for OGDI package
        Files: <<
                lib/libadrg.dylib
                lib/libdtcanada.dylib
                lib/libdted.dylib
                lib/libdtusa.dylib
                lib/libogdi31.dylib
                lib/libremote.dylib
                lib/librpf.dylib
                lib/libskeleton.dylib
                lib/libvrf.dylib
<<
        Shlibs:<<
                %p/lib/libadrg.dylib                    3.1.0 %n (>=3.1.5-2)
                %p/lib/libdtcanada.dylib                3.1.0 %n (>=3.1.5-2)
                %p/lib/libdted.dylib                    3.1.0 %n (>=3.1.5-2)
                %p/lib/libdtusa.dylib                   3.1.0 %n (>=3.1.5-2)
                %p/lib/libogdi31.dylib                  3.1.0 %n (>=3.1.5-2)
                %p/lib/libremote.dylib                  3.1.0 %n (>=3.1.5-2)
                %p/lib/librpf.dylib                             3.1.0 %n 
(>=3.1.5-2)
                %p/lib/libskeleton.dylib                3.1.0 %n (>=3.1.5-2)
                %p/lib/libvrf.dylib                             3.1.0 %n 
(>=3.1.5-2)
<<
        DocFiles: ChangeLog HOWTO-RELEASE LICENSE NEWS README VERSION
<<
SplitOff2: <<
  Package: %N-bin
  Depends: %N-shlibs (= %v-%r)
  Files:  bin/gltpd bin/ogdi_*
  Description: Executables for OGDI package
  DocFiles: ChangeLog HOWTO-RELEASE LICENSE NEWS README VERSION
<<

DescPort: <<
http://www.kyngchaos.com/macosx/install/ogdi.php
<<
--- NEW FILE: libogdi3.patch ---
diff -urN ogdi-3.1.4-orig/config/common.mak ogdi-3.1.4/config/common.mak
--- ogdi-3.1.4-orig/config/common.mak   2001-06-26 10:14:46.000000000 +0900
+++ ogdi-3.1.4/config/common.mak        2005-08-15 08:02:49.000000000 +0900
@@ -55,7 +55,7 @@
 #
 #      Final OS installation location.
 #
-prefix         = /usr/local
+prefix         = @PREFIX@
 exec_prefix    = ${prefix}
 INST_INCLUDE   = ${prefix}/include
 INST_LIB       = ${exec_prefix}/lib
diff -urN ogdi-3.1.4-orig/config/darwin.mak ogdi-3.1.4/config/darwin.mak
--- ogdi-3.1.4-orig/config/darwin.mak   2003-12-16 03:08:00.000000000 +0900
+++ ogdi-3.1.4/config/darwin.mak        2005-08-15 08:04:20.000000000 +0900
@@ -33,7 +33,7 @@
 SHLIB_CFLAGS   = -fno-common
 COMMON_CFLAGS  = $(OPTIMIZATION) -fno-common
 
-SHLIB_LDFLAGS  = -dynamiclib
+SHLIB_LDFLAGS  = -dynamiclib -compatibility_version 3.1.0 -current_version 
3.1.5
 COMMON_LDFLAGS  = $(OPTIMIZATION)
 
 
@@ -50,6 +50,16 @@
 
 BIG_ENDIAN          = 1
 
+RPC_LINKLIB    =       -ldl 
+PROJ_SETTING=external
+PROJ_INCLUDE :=        [EMAIL PROTECTED]@/include
+PROJ_STATICLIB := [EMAIL PROTECTED]@/lib -lproj
+ZLIB_SETTING=external
+ZLIB_INCLUDE :=        
+ZLIB_LINKLIB := -lz
+EXPAT_SETTING=external
+EXPAT_INCLUDE := [EMAIL PROTECTED]@/include
+EXPAT_LINKLIB := [EMAIL PROTECTED]@/lib -lexpat
 
 #
 # make rules
@@ -62,5 +72,5 @@
        
 $(DYNAGEN): $(OBJECTS)
        @echo Making shared library: $@
-       $(SHLIB_LD) $(SHLIB_LDFLAGS) $(COMMON_LDFLAGS) -o $@ $^ $(LINK_LIBS) 
+       $(SHLIB_LD) $(SHLIB_LDFLAGS) -install_name $(INST_LIB)/$(notdir $@) 
$(COMMON_LDFLAGS) -o $@ $^ $(LINK_LIBS) 
        @echo $@ made successfully ...
diff -urN ogdi-3.1.4-orig/ogdi/c-api/ecs_dyna.c ogdi-3.1.4/ogdi/c-api/ecs_dyna.c
--- ogdi-3.1.4-orig/ogdi/c-api/ecs_dyna.c       2004-02-19 06:50:21.000000000 
+0900
+++ ogdi-3.1.4/ogdi/c-api/ecs_dyna.c    2005-08-15 08:02:05.000000000 +0900
@@ -82,11 +82,11 @@
   if (handle == NULL) {
     /* Try with the .so extension */
 
-    if ((temp = (char *) malloc(strlen(libname)+7)) == NULL)
+    if ((temp = (char *) malloc(strlen(libname)+10)) == NULL)
       return NULL;
     strcpy(temp,"lib");
     strcat(temp,libname);
-    strcat(temp,".so");
+    strcat(temp,".dylib");
 
     handle = dlopen(temp,RTLD_LAZY);
 #ifdef notdef
diff -ruN ogdi-3.1.5/ogdi/driver/rpf/rpf.h 
ogdi-3.1.5-patched/ogdi/driver/rpf/rpf.h
--- ogdi-3.1.5/ogdi/driver/rpf/rpf.h    2001-04-12 12:22:46.000000000 -0700
+++ ogdi-3.1.5-patched/ogdi/driver/rpf/rpf.h    2007-08-19 09:46:05.000000000 
-0700
@@ -52,7 +52,7 @@
 typedef unsigned short ushort;
 typedef unsigned long  uint;
 */
-typedef unsigned char  bool;
+typedef unsigned char  bbool;
 typedef unsigned char  uchar;
 typedef unsigned char* ucharp;
 typedef char           ascii;
@@ -114,7 +114,7 @@
 
 typedef struct header
 {
-  bool     endian;
+  bbool    endian;
   ushort   hdr_sec_len;       /* header section length */
   ascii    filename[12];
   uchar    new;
@@ -330,8 +330,8 @@
 
 typedef struct display1
 {
-  bool      all_subframes;
-  bool      no_transparent;
+  bbool     all_subframes;
+  bbool     no_transparent;
   ushort    subframe_seq_length;
   ushort    transparent_seq_length;
   uint      image_rows;
@@ -355,7 +355,7 @@
   RPF_image    img;
   Attribute    att;
   Replace      repupd;
-  bool         all_subframes;
+  bbool        all_subframes;
   int         NITF_hdr_len;
 } Frame_file;
 


-------------------------------------------------------------------------
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
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to