diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/pointcloud/Makefile | 9 | ||||
| -rw-r--r-- | databases/pointcloud/distinfo | 6 | ||||
| -rw-r--r-- | databases/pointcloud/files/patch-CMakeLists.txt | 19 | ||||
| -rw-r--r-- | databases/pointcloud/files/patch-configure.ac | 38 | ||||
| -rw-r--r-- | databases/pointcloud/files/patch-pgsql_pc__access.c | 11 | ||||
| -rw-r--r-- | databases/pointcloud/pkg-plist | 10 |
6 files changed, 52 insertions, 41 deletions
diff --git a/databases/pointcloud/Makefile b/databases/pointcloud/Makefile index af682fa1aec5..ea9f7772e26a 100644 --- a/databases/pointcloud/Makefile +++ b/databases/pointcloud/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pointcloud -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.0 DISTVERSIONPREFIX= v CATEGORIES= databases geography @@ -15,13 +15,12 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT BUILD_DEPENDS= ${LOCALBASE}/include/laz-perf/las.hpp:archivers/lazperf LIB_DEPENDS= libght.so:devel/libght -USES= cmake pgsql +USES= autoreconf gmake pgsql WANT_PGSQL= server -CMAKE_ARGS+= -DWITH_TESTS:BOOL=FALSE -CFLAGS+= -I${LOCALBASE}/include USE_GNOME= libxml2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-lazperf=${LOCALBASE} USE_LDCONFIG= yes - USE_GITHUB= yes GH_ACCOUNT= pgpointcloud diff --git a/databases/pointcloud/distinfo b/databases/pointcloud/distinfo index df98e8d92f8d..46528c53a8c3 100644 --- a/databases/pointcloud/distinfo +++ b/databases/pointcloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502912568 -SHA256 (pgpointcloud-pointcloud-v1.0.1_GH0.tar.gz) = 3fac2efe1263b0876c26fc77e28f3664b56aa1e142c92383f9eb5b828999d0e7 -SIZE (pgpointcloud-pointcloud-v1.0.1_GH0.tar.gz) = 281146 +TIMESTAMP = 1527795430 +SHA256 (pgpointcloud-pointcloud-v1.1.0_GH0.tar.gz) = 24f69ccc06a15ae9cb3cf150461b1c8d4e96167d30667972c9bbb46c36c6f274 +SIZE (pgpointcloud-pointcloud-v1.1.0_GH0.tar.gz) = 314576 diff --git a/databases/pointcloud/files/patch-CMakeLists.txt b/databases/pointcloud/files/patch-CMakeLists.txt deleted file mode 100644 index 425ea890f0ae..000000000000 --- a/databases/pointcloud/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2015-08-09 08:58:06 UTC -+++ CMakeLists.txt -@@ -79,7 +79,7 @@ exec_program(${PG_CONFIG} ARGS --include - exec_program(${PG_CONFIG} ARGS --pkglibdir OUTPUT_VARIABLE PGSQL_PKGLIBDIR) - exec_program(${PG_CONFIG} ARGS --sharedir OUTPUT_VARIABLE PGSQL_SHAREDIR) - exec_program(${PG_CONFIG} ARGS --bindir OUTPUT_VARIABLE PGSQL_BINDIR) --exec_program(${PG_CONFIG} ARGS --cppflags OUTPUT_VARIABLE PGSQL_CPPFLAGS) -+exec_program(${PG_CONFIG} ARGS --cflags OUTPUT_VARIABLE PGSQL_CFLAGS) - exec_program(${PG_CONFIG} ARGS --ldflags OUTPUT_VARIABLE PGSQL_LDFLAGS) - exec_program(${PG_CONFIG} ARGS --libs OUTPUT_VARIABLE PGSQL_LIBS) - -@@ -90,7 +90,7 @@ find_package (LibXml2 REQUIRED) - mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIR) - mark_as_advanced (CLEAR LIBXML2_LIBRARIES) - include_directories (${LIBXML2_INCLUDE_DIR}) -- -+link_directories (${CMAKE_INSTALL_PREFIX}/lib) - - #------------------------------------------------------------------------------ diff --git a/databases/pointcloud/files/patch-configure.ac b/databases/pointcloud/files/patch-configure.ac new file mode 100644 index 000000000000..e8c8c55749ca --- /dev/null +++ b/databases/pointcloud/files/patch-configure.ac @@ -0,0 +1,38 @@ +--- configure.ac.orig 2018-04-30 09:08:10 UTC ++++ configure.ac +@@ -119,7 +119,7 @@ if test "x$CUNITDIR" != "x"; then + fi + + if test "$FOUND_CUNIT" = "YES"; then +- AC_DEFINE([HAVE_CUNIT]) ++ AC_DEFINE([HAVE_CUNIT], [1], [Have Cunit]) + CUNIT_STATUS="enabled" + if test $CUNITDIR; then + CUNIT_STATUS="$CUNITDIR" +@@ -319,7 +319,7 @@ elif test "x$GHTDIR" != "xno"; then + fi + + if test "x$FOUND_GHT_H" = "xYES" -a "x$FOUND_GHT_LIB" = "xYES"; then +- AC_DEFINE([HAVE_LIBGHT]) ++ AC_DEFINE([HAVE_LIBGHT], [1], [Have libght]) + GHT_STATUS="enabled" + if test $GHTDIR; then + GHT_STATUS="$GHTDIR" +@@ -368,7 +368,7 @@ elif test "x$LAZPERFDIR" != "xno"; then + fi + + if test "x$FOUND_LAZPERF" = "xYES"; then +- AC_DEFINE([HAVE_LAZPERF]) ++ AC_DEFINE([HAVE_LAZPERF], [1], [Have lazperf]) + LAZPERF_STATUS="enabled" + if test $LAZPERFDIR; then + LAZPERF_STATUS="$LAZPERFDIR/include/laz-perf" +@@ -384,7 +384,7 @@ dnl ==================================== + dnl Figure out where this script is running + + PROJECT_SOURCE_DIR="$( cd "$( dirname $0 )" && pwd )" +-AC_DEFINE_UNQUOTED([PROJECT_SOURCE_DIR],"$PROJECT_SOURCE_DIR") ++AC_DEFINE_UNQUOTED([PROJECT_SOURCE_DIR], ["$PROJECT_SOURCE_DIR"], [Project source dir]) + + + dnl =========================================================================== diff --git a/databases/pointcloud/files/patch-pgsql_pc__access.c b/databases/pointcloud/files/patch-pgsql_pc__access.c deleted file mode 100644 index bd9dda2c1e67..000000000000 --- a/databases/pointcloud/files/patch-pgsql_pc__access.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pgsql/pc_access.c.orig 2015-08-09 08:58:06 UTC -+++ pgsql/pc_access.c -@@ -315,7 +315,7 @@ Datum pointcloud_agg_transfn(PG_FUNCTION - - if (fcinfo->context && IsA(fcinfo->context, AggState)) - { -- aggcontext = ((AggState *) fcinfo->context)->aggcontext; -+ aggcontext = ((AggState *) fcinfo->context)->aggcontexts; - } - else if (fcinfo->context && IsA(fcinfo->context, WindowAggState)) - { diff --git a/databases/pointcloud/pkg-plist b/databases/pointcloud/pkg-plist index 0293b303274f..cf07db70c1bc 100644 --- a/databases/pointcloud/pkg-plist +++ b/databases/pointcloud/pkg-plist @@ -1,5 +1,9 @@ -lib/postgresql/pointcloud.so -share/postgresql/extension/pointcloud--1.0.1.sql +lib/postgresql/pointcloud-1.1.so +share/postgresql/extension/pointcloud--1.0--1.1.0.sql +share/postgresql/extension/pointcloud--1.0.1--1.1.0.sql +share/postgresql/extension/pointcloud--1.1.0--1.1.0next.sql +share/postgresql/extension/pointcloud--1.1.0.sql +share/postgresql/extension/pointcloud--1.1.0next--1.1.0.sql share/postgresql/extension/pointcloud.control -share/postgresql/extension/pointcloud_postgis--1.0.sql +share/postgresql/extension/pointcloud_postgis--1.1.0.sql share/postgresql/extension/pointcloud_postgis.control |