svn commit: r507936 - head/databases/ip4r

[Tobias Kortkamp]

Author: tobik
Date: Sat Aug  3 08:23:00 2019
New Revision: 507936
URL: https://svnweb.freebsd.org/changeset/ports/507936

Log:
  databases/ip4r: Update to 2.4.1
  
  This fixes the build with newer PostgreSQL versions.
  
  Drop the IDXPATCH option.  The patch no longer applies.  Unfortunately
  it was never upstreamed, its purpose is not clear, and the port no
  longer has a maintainer to ask about this.
  
  Changes:	https://github.com/RhodiumToad/ip4r/blob/2.4.1/README.ip4r
  PR:		239514

Modified:
  head/databases/ip4r/Makefile
  head/databases/ip4r/distinfo
  head/databases/ip4r/pkg-plist

Modified: head/databases/ip4r/Makefile
==============================================================================
--- head/databases/ip4r/Makefile	Sat Aug  3 08:21:25 2019	(r507935)
+++ head/databases/ip4r/Makefile	Sat Aug  3 08:23:00 2019	(r507936)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ip4r
-PORTVERSION=	2.2
-PORTREVISION=	2
+PORTVERSION=	2.4.1
 CATEGORIES=	databases net
 
 MAINTAINER=	ports at FreeBSD.org
@@ -11,24 +10,13 @@ COMMENT=	IP address and IP range index types for Postg
 
 LICENSE=	PostgreSQL
 
-OPTIONS_DEFINE=	IDXPATCH
-
-IDXPATCH_DESC=	Prefer ip4r indexes over seq_scan on large datasets
-
 USES=		gmake pgsql
-LLD_UNSAFE=	yes
-
-MAKE_ARGS=	USE_PGXS=1
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIDXPATCH}
-# Patch if the option is supplied, however we need to unpatch if the option is de-selected after previously selecting (TODO)
-PATCH_SITES=	https://raw.githubusercontent.com/amutu/patch/master/:SORBS
-PATCHFILES=	ip4r-2.2-SORBS-prefer-index.patch:-p1:SORBS
-.endif
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	RhodiumToad
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/postgresql/server/extension/ip4r
+	${INSTALL_DATA} ${WRKSRC}/src/ipr.h ${STAGEDIR}${PREFIX}/include/postgresql/server/extension/ip4r
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/ip4r.so
 
 .include <bsd.port.mk>

Modified: head/databases/ip4r/distinfo
==============================================================================
--- head/databases/ip4r/distinfo	Sat Aug  3 08:21:25 2019	(r507935)
+++ head/databases/ip4r/distinfo	Sat Aug  3 08:23:00 2019	(r507936)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1496567402
-SHA256 (RhodiumToad-ip4r-2.2_GH0.tar.gz) = b513ca2f5e71c33b82566096e9b0ed420405845ed5ac396936ef676527074dc3
-SIZE (RhodiumToad-ip4r-2.2_GH0.tar.gz) = 103362
-SHA256 (ip4r-2.2-SORBS-prefer-index.patch) = 7f0740c8278dc01964323e74683a7d1e43bc761e8698201aee60da479b8d5b41
-SIZE (ip4r-2.2-SORBS-prefer-index.patch) = 9160
+TIMESTAMP = 1564818466
+SHA256 (RhodiumToad-ip4r-2.4.1_GH0.tar.gz) = 78b9f0c1ae45c22182768fe892a32d533c82281035e10914111400bf6301c726
+SIZE (RhodiumToad-ip4r-2.4.1_GH0.tar.gz) = 128212

Modified: head/databases/ip4r/pkg-plist
==============================================================================
--- head/databases/ip4r/pkg-plist	Sat Aug  3 08:21:25 2019	(r507935)
+++ head/databases/ip4r/pkg-plist	Sat Aug  3 08:23:00 2019	(r507936)
@@ -1,8 +1,10 @@
+include/postgresql/server/extension/ip4r/ipr.h
 lib/postgresql/ip4r.so
 share/doc/postgresql/extension/README.ip4r
 share/postgresql/extension/ip4r--2.0--2.1.sql
 share/postgresql/extension/ip4r--2.1--2.2.sql
-share/postgresql/extension/ip4r--2.2.sql
+share/postgresql/extension/ip4r--2.2--2.4.sql
+share/postgresql/extension/ip4r--2.4.sql
 share/postgresql/extension/ip4r--unpackaged1--2.0.sql
 share/postgresql/extension/ip4r--unpackaged2.0--2.0.sql
 share/postgresql/extension/ip4r--unpackaged2.1--2.1.sql