Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22157/10.4-transitional/unstable/main/finkinfo/libs
Modified Files: libogdi3.info libogdi3.patch Log Message: fixed many many problems Index: libogdi3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libogdi3.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libogdi3.info 14 Aug 2005 11:19:29 -0000 1.1 +++ libogdi3.info 27 Aug 2005 02:08:32 -0000 1.2 @@ -1,6 +1,6 @@ Package: libogdi3 Version: 3.1.5 -Revision: 1 +Revision: 2 Description: OGDI - Open Geographic Datastore Interface License: BSD Homepage: http://ogdi.sourceforge.net @@ -31,7 +31,7 @@ #!/bin/sh -xe export TOPDIR=%b export TARGET=darwin - make + make prefix=%p << # Install Phase. @@ -40,6 +40,8 @@ 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 @@ -59,22 +61,22 @@ lib/libvrf.dylib << Shlibs:<< - %p/lib/libadrg.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libdtcanada.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libdted.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libdtusa.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libogdi31.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libremote.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/librpf.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libskeleton.dylib 0.0.0 libogdi3 (>=3.1.4-1) - %p/lib/libvrf.dylib 0.0.0 libogdi3 (>=3.1.4-1) + %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 + Files: bin/gltpd bin/ogdi_* Description: Executables for OGDI package DocFiles: ChangeLog HOWTO-RELEASE LICENSE NEWS README VERSION << Index: libogdi3.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libogdi3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libogdi3.patch 14 Aug 2005 11:19:29 -0000 1.1 +++ libogdi3.patch 27 Aug 2005 02:08:32 -0000 1.2 @@ -1,6 +1,27 @@ -diff -ruN ogdi-orig ogdi ---- ogdi-orig/config/darwin.mak 2005-08-14 12:08:00.000000000 -0600 -+++ ogdi/config/darwin.mak 2005-08-14 15:53:40.000000000 -0500 +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 @@ -25,8 +46,9 @@ - $(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 ... ---- ogdi-orig/ogdi/c-api/ecs_dyna.c 2005-06-19 23:15:06.000000000 -0500 -+++ ogdi/ogdi/c-api/ecs_dyna.c 2005-07-03 11:27:56.000000000 -0500 +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 */ @@ -40,4 +62,4 @@ + strcat(temp,".dylib"); handle = dlopen(temp,RTLD_LAZY); - #ifdef notdef \ No newline at end of file + #ifdef notdef ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits