CVS commit: pkgsrc/databases/postgresql-postgis2

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Sep 22 17:18:42 UTC 2017

Modified Files:
        pkgsrc/databases/postgresql-postgis2: Makefile distinfo
Added Files:
        pkgsrc/databases/postgresql-postgis2/patches:
            patch-raster_rt__core_librtcore.h

Log Message:
postgresql-postgis2: Work around an upstream configure bug

Upstream has very complicated ifdefs that try to define UNIX
everywhere but windows, except that it fails to include NetBSD.  Then,
it uses UNIX to avoid using the non-standard stricmp and instead use
the POSIX-conforming strcasecmp.

For pkgsrc, rip out an entire screenful of complexity and just define
UNIX if not defined.  Resolves build on NetBSD 7, and probably other places.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/postgresql-postgis2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/postgresql-postgis2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql-postgis2/patches/patch-raster_rt__core_librtcore.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql-postgis2/Makefile
diff -u pkgsrc/databases/postgresql-postgis2/Makefile:1.29 pkgsrc/databases/postgresql-postgis2/Makefile:1.30
--- pkgsrc/databases/postgresql-postgis2/Makefile:1.29  Sat Sep  2 16:53:29 2017
+++ pkgsrc/databases/postgresql-postgis2/Makefile       Fri Sep 22 17:18:42 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2017/09/02 16:53:29 gdt Exp $
+# $NetBSD: Makefile,v 1.30 2017/09/22 17:18:42 gdt Exp $
 
 DISTNAME=      postgis-2.3.3
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    databases geography
 MASTER_SITES=  http://download.osgeo.org/postgis/source/
 

Index: pkgsrc/databases/postgresql-postgis2/distinfo
diff -u pkgsrc/databases/postgresql-postgis2/distinfo:1.10 pkgsrc/databases/postgresql-postgis2/distinfo:1.11
--- pkgsrc/databases/postgresql-postgis2/distinfo:1.10  Sat Sep  2 16:53:29 2017
+++ pkgsrc/databases/postgresql-postgis2/distinfo       Fri Sep 22 17:18:42 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2017/09/02 16:53:29 gdt Exp $
+$NetBSD: distinfo,v 1.11 2017/09/22 17:18:42 gdt Exp $
 
 SHA1 (postgis-2.3.3.tar.gz) = 9be0c182bc50a99a89f7190ea9ab5053647c2e2b
 RMD160 (postgis-2.3.3.tar.gz) = 12724a16d41131c322c55fdd40bfc2e6fe0fdd95
@@ -6,3 +6,4 @@ SHA512 (postgis-2.3.3.tar.gz) = c0ec4b4b
 Size (postgis-2.3.3.tar.gz) = 11342032 bytes
 SHA1 (patch-extensions_address__standardizer_Makefile.in) = e560e734b3652b5ae4c539af8f077754979f2f29
 SHA1 (patch-extensions_postgis__topology_Makefile.in) = f1095e0a852d746027417d49a0c14bf00a5da00f
+SHA1 (patch-raster_rt__core_librtcore.h) = 4dd79beda6e8213addbe6280e1d1b90d5277e18f

Added files:

Index: pkgsrc/databases/postgresql-postgis2/patches/patch-raster_rt__core_librtcore.h
diff -u /dev/null pkgsrc/databases/postgresql-postgis2/patches/patch-raster_rt__core_librtcore.h:1.1
--- /dev/null   Fri Sep 22 17:18:42 2017
+++ pkgsrc/databases/postgresql-postgis2/patches/patch-raster_rt__core_librtcore.h      Fri Sep 22 17:18:42 2017
@@ -0,0 +1,74 @@
+$NetBSD: patch-raster_rt__core_librtcore.h,v 1.1 2017/09/22 17:18:42 gdt Exp $
+
+Work around configure code that fails to check HAVE_STRNICMP because
+the previous twisty maze of defines do not define UNIX.  Complaint
+submitted upstream; this patch would break Windows (which is ok in
+pkgsrc).
+
+--- raster/rt_core/librtcore.h.orig    2016-07-04 15:45:56.000000000 +0000
++++ raster/rt_core/librtcore.h
+@@ -58,61 +58,10 @@
+ #ifndef LIBRTCORE_H_INCLUDED
+ #define LIBRTCORE_H_INCLUDED
+ 
+-/* define the systems */
+-#if defined(__linux__)  /* (predefined) */
+-#if !defined(LINUX)
+-#define LINUX
+-#endif
+-#if !defined(UNIX)
+-#define UNIX        /* make sure this is defined */
+-#endif
+-#endif
+-
+-
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)    /* seems to work like Linux... */
+-#if !defined(LINUX)
+-#define LINUX
+-#endif
+-#if !defined(UNIX)
+-#define UNIX        /* make sure this is defined */
+-#endif
+-#endif
+-
+-#if defined(__GNU__)    /* GNU/Hurd is also like Linux */
+-#if !defined(LINUX)
+-#define LINUX
+-#endif
+-#if !defined(UNIX)
+-#define UNIX        /* make sure this is defined */
+-#endif
+-#endif
+-
+-#if defined(__MSDOS__)
+-#if !defined(MSDOS)
+-#define MSDOS       /* make sure this is defined */
+-#endif
+-#endif
+-
+-#if defined(__WIN32__) || defined(__NT__) || defined(_WIN32)
+-#if !defined(WIN32)
+-#define WIN32
+-#endif
+-#if defined(__BORLANDC__) && defined(MSDOS) /* Borland always defines MSDOS */
+-#undef  MSDOS
+-#endif
+-#endif
+-
+-#if defined(__APPLE__)
+-#if !defined(UNIX)
++/* For pkgsrc, assume POSIX. */
++#ifndef UNIX
+ #define UNIX
+-#endif
+-#endif
+-
+-#if defined(sun) || defined(__sun)
+-#if !defined(UNIX)
+-#define UNIX
+-#endif
+-#endif
++#endif /* UNIX */
+ 
+ /* if we are in Unix define stricmp to be strcasecmp and strnicmp to */
+ /* be strncasecmp. I'm not sure if all Unices have these, but Linux */