SF.net SVN: gar:[23410] csw/mgar/pkg/gdal/trunk

Sun Apr 13 19:34:05 CEST 2014

Revision: 23410
          http://sourceforge.net/p/gar/code/23410
Author:   guengel
Date:     2014-04-13 17:34:04 +0000 (Sun, 13 Apr 2014)
Log Message:
-----------
gdal/trunk: Bumped to upstream release 1.9.2. Install libraries in /opt/csw/lib.

Modified Paths:
--------------
    csw/mgar/pkg/gdal/trunk/Makefile
    csw/mgar/pkg/gdal/trunk/checksums

Modified: csw/mgar/pkg/gdal/trunk/Makefile
===================================================================

--- csw/mgar/pkg/gdal/trunk/Makefile	2014-04-13 16:06:27 UTC (rev 23409)
+++ csw/mgar/pkg/gdal/trunk/Makefile	2014-04-13 17:34:04 UTC (rev 23410)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = gdal
-VERSION = 1.9.1
+VERSION = 1.9.2
 GARTYPE = v2
 
 DESCRIPTION = Geospatial Data Abstraction Library
@@ -14,12 +14,6 @@
 
 MASTER_SITES = http://download.osgeo.org/$(NAME)/
 DISTFILES  = $(DISTNAME).tar.gz
-PATCHFILES += 0001-Force-use-of-double-data-type-before-checking-for-is.patch
-PATCHFILES += 0002-apply-patch-from-upstream-to-handle-building-with-a-.patch
-PATCHFILES += 0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch
-PATCHFILES += 0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch
-PATCHFILES += 0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch
-#PATCHFILES += 0001-Force-the-use-of-CSWbash.patch
 
 BUILD_DEP_PKGS += CSWgeos-dev
 
@@ -28,7 +22,7 @@
 SPKG_DESC_CSWgdal = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgif4
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgeos-c1
-RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1-gxx
+RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibstdc++6
@@ -47,68 +41,56 @@
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2
 
-PACKAGES += CSWlibgdal1-gxx
-OBSOLETED_BY_CSWlibgdal1-gxx = CSWlibgdal1
-CATALOGNAME_CSWlibgdal1-gxx = libgdal1_gxx
-SPKG_DESC_CSWlibgdal1-gxx += Geospatial Data Abstraction Library, libgdal.so.1
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibhdf5-7
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWjasper
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibidn11
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibnetcdf7
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibmysqlclient18
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibpq5
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgif4
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgeos-c1
-PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0)
-PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*)
+PACKAGES += CSWlibgdal1
+OBSOLETED_BY_CSWlibgdal1 = CSWlibgdal1-gxx
+CATALOGNAME_CSWlibgdal1-gxx = libgdal1_gxx_stub
+SPKG_DESC_CSWlibgdal1 += Geospatial Data Abstraction Library, libgdal.so.1
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibhdf5-7
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjasper
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgeos-c1
+PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.16\.0)
+PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*)
 
 PACKAGES += CSWgdal-dev
 CATALOGNAME_CSWgdal-dev = gdal_dev
 SPKG_DESC_CSWgdal-dev += Geospatial Data Abstraction Library, development files
-RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1-gxx
+RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1
 PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config
 
-libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR))
-includedir = /opt/csw/gxx/include
+BUILD64 = 1
 
-# enable use of __func__ as required by patch 0004
-ifneq ($(GARCOMPILER),GNU)
-EXTRA_CXXFLAGS += -features=extensions
-endif
-
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --datadir=$(datadir)/gdal-data
 CONFIGURE_ARGS += --with-libz=$(prefix)
 CONFIGURE_ARGS += --with-png=$(prefix)
 CONFIGURE_ARGS += --with-libtiff=$(prefix)
 CONFIGURE_ARGS += --with-jpeg=$(prefix)
 CONFIGURE_ARGS += --with-expat=$(prefix)
-CONFIGURE_ARGS += --with-mysql=/opt/csw/bin/mysql_config
+CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config
 CONFIGURE_ARGS += --with-sqlite3=$(prefix)
-CONFIGURE_ARGS += --with-pg=/opt/csw/bin/pg_config
+CONFIGURE_ARGS += --with-pg=$(bindir)/pg_config
 
 # doesn't have tests?
 TEST_TARGET = 
 
 LICENSE = LICENSE.TXT
 
-EXTRA_LIB += /opt/csw/postgresql/lib
 EXTRA_LDFLAGS += -L$(libdir) -R$(libdir)
 
 include gar/category.mk
-
-
-
-
-# to avoid the __sync_fetch_and_add4 issue (must be after including category)
-ARCHFLAGS_GCC4_sparcvv8 = -m32

Modified: csw/mgar/pkg/gdal/trunk/checksums
===================================================================
--- csw/mgar/pkg/gdal/trunk/checksums	2014-04-13 16:06:27 UTC (rev 23409)
+++ csw/mgar/pkg/gdal/trunk/checksums	2014-04-13 17:34:04 UTC (rev 23410)
@@ -1 +1 @@
-c5cf09b92dac1f5775db056e165b34f5  gdal-1.9.1.tar.gz
+3f39db89f4710269b3a8bf94178e07aa  gdal-1.9.2.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

