Update to pgpointcloud 1.2.0.

This commit is contained in:
landry 2019-01-23 17:37:50 +00:00
parent 5dd90c0e09
commit dc62b815a3
6 changed files with 26 additions and 71 deletions

View File

@ -1,28 +1,36 @@
# $OpenBSD: Makefile,v 1.3 2017/11/04 21:26:00 landry Exp $
# $OpenBSD: Makefile,v 1.4 2019/01/23 17:37:50 landry Exp $
COMMENT = point cloud storage extension for PostgreSQL
GH_COMMIT = 0130a1c49dc3f8c3beaa5f033c66691bdc422987
GH_TAGNAME = v1.2.0
GH_PROJECT = pointcloud
GH_ACCOUNT = pgpointcloud
DISTNAME = pgpointcloud-1.1.0pre0
REVISION = 0
CATEGORIES = geo databases
# BSD
PERMIT_PACKAGE_CDROM= Yes
MODULES = devel/cmake
COMPILER = base-clang ports-gcc
LIB_DEPENDS = textproc/libxml
BUILD_DEPENDS = databases/postgresql,-server \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/cunit
WANTLIB += m z xml2
WANTLIB += c iconv lzma m z xml2
WANTLIB += ${COMPILER_LIBCXX}
do-test:
cd ${WRKBUILD} && lib/cunit/cu_tester
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-cunit=${LOCALBASE}
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
USE_GMAKE = Yes
#otherwise gmake defaults to g++ ?
MAKE_ENV = CXX=c++
do-gen:
cd ${WRKSRC} && ${AUTOCONF_ENV} ./autogen.sh
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pgpointcloud-1.1.0pre0-0130a1c4.tar.gz) = uwyxxvvwxkaNTL6hCM+Vjft+8TsV0e+ILK4Kyq272J8=
SIZE (pgpointcloud-1.1.0pre0-0130a1c4.tar.gz) = 320250
SHA256 (pointcloud-1.2.0.tar.gz) = hUKkxxS00MZ/ENCSKRpDtWUIcbTsjK+DHkkoEPJbuTw=
SIZE (pointcloud-1.2.0.tar.gz) = 311231

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2017/07/11 18:50:19 landry Exp $
Fix libxml2 include dirs var name, needs cmake 3.7.2p3
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -89,9 +89,9 @@ exec_program(${PG_CONFIG} ARGS --libs OUTPUT_VARIABLE
# libxml2
find_package (LibXml2 REQUIRED)
-mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIR)
+mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIRS)
mark_as_advanced (CLEAR LIBXML2_LIBRARIES)
-include_directories (${LIBXML2_INCLUDE_DIR})
+include_directories (${LIBXML2_INCLUDE_DIRS})
#------------------------------------------------------------------------------

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-lib_CMakeLists_txt,v 1.1 2017/07/27 15:43:59 zhuk Exp $
Fix build by using CMake find_package() goo correctly.
Index: lib/CMakeLists.txt
--- lib/CMakeLists.txt.orig
+++ lib/CMakeLists.txt
@@ -51,8 +51,8 @@ set_target_properties (liblazperf-static
COMPILE_FLAGS "-fPIC -std=c++0x"
)
-target_link_libraries (libpc-static xml2)
-target_link_libraries (libpc-static z)
+target_link_libraries (libpc-static ${LIBXML2_LIBRARIES})
+target_link_libraries (libpc-static ${ZLIB_LIBRARIES})
target_link_libraries (libpc-static m)
if (LIBGHT_FOUND)
target_link_libraries (libpc-static ${LIBGHT_LIBRARY})

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_sort_r_sort_r_h,v 1.1.1.1 2017/07/11 18:50:19 landry Exp $
Index: lib/sort_r/sort_r.h
--- lib/sort_r/sort_r.h.orig
+++ lib/sort_r/sort_r.h
@@ -24,14 +24,13 @@ void sort_r(void *base, size_t nel, size_t width,
*/
+# define _SORT_R_INLINE inline
#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
defined __FreeBSD__ || defined __DragonFly__)
# define _SORT_R_BSD
-# define _SORT_R_INLINE inline
#elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
defined __linux__ || (defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR) || defined __GLIBC__)
# define _SORT_R_LINUX
-# define _SORT_R_INLINE inline
#elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
# define _SORT_R_WINDOWS
# define _SORT_R_INLINE __inline

View File

@ -1,9 +1,13 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/07/11 18:50:19 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2019/01/23 17:37:50 landry Exp $
lib/postgresql/
lib/postgresql/pointcloud-1.1.so
lib/postgresql/pointcloud-1.2.so
share/postgresql/
share/postgresql/extension/
share/postgresql/extension/pointcloud--1.1.0.sql
share/postgresql/extension/pointcloud--1.1.0--1.2.0.sql
share/postgresql/extension/pointcloud--1.1.1--1.2.0.sql
share/postgresql/extension/pointcloud--1.2.0--1.2.0next.sql
share/postgresql/extension/pointcloud--1.2.0.sql
share/postgresql/extension/pointcloud--1.2.0next--1.2.0.sql
share/postgresql/extension/pointcloud.control
share/postgresql/extension/pointcloud_postgis--1.0.sql
share/postgresql/extension/pointcloud_postgis--1.2.0.sql
share/postgresql/extension/pointcloud_postgis.control