svn commit: r412809 - in head: dns/libpsl dns/libpsl/files ftp/curl

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Apr  9 12:29:38 2016
New Revision: 412809
URL: https://svnweb.freebsd.org/changeset/ports/412809

Log:
  - Update to 0.13.0
  - Bump PORTREVISION for dns/libpsl shlib change
  
  Changes:	https://github.com/rockdaboot/libpsl/blob/master/NEWS

Modified:
  head/dns/libpsl/Makefile
  head/dns/libpsl/distinfo
  head/dns/libpsl/files/patch-src-psl.c
  head/dns/libpsl/files/patch-src-psl2c.c
  head/dns/libpsl/pkg-plist
  head/ftp/curl/Makefile

Modified: head/dns/libpsl/Makefile
==============================================================================
--- head/dns/libpsl/Makefile	Sat Apr  9 12:21:14 2016	(r412808)
+++ head/dns/libpsl/Makefile	Sat Apr  9 12:29:38 2016	(r412809)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpsl
-PORTVERSION=	0.11.0
+PORTVERSION=	0.13.0
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	dns
 
@@ -30,11 +30,13 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
-USES=		autoreconf libtool pathfix pkgconfig
+USES=		autoreconf libtool pathfix pkgconfig python:build shebangfix
 
 GH_ACCOUNT=	rockdaboot
 USE_GITHUB=	yes
 
+SHEBANG_FILES=	src/make_dafsa.py
+
 ICU_CONFIGURE_ON=	--enable-builtin=libicu --enable-runtime=libicu
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 IDN_CONFIGURE_ON=	--enable-builtin=libidn --enable-runtime=libidn

Modified: head/dns/libpsl/distinfo
==============================================================================
--- head/dns/libpsl/distinfo	Sat Apr  9 12:21:14 2016	(r412808)
+++ head/dns/libpsl/distinfo	Sat Apr  9 12:29:38 2016	(r412809)
@@ -1,2 +1,2 @@
-SHA256 (rockdaboot-libpsl-libpsl-0.11.0_GH0.tar.gz) = 60d0fea883f5bbe141542b53e7fedc7f6d1713c0789474fc2ccd67fd06563398
-SIZE (rockdaboot-libpsl-libpsl-0.11.0_GH0.tar.gz) = 43866
+SHA256 (rockdaboot-libpsl-libpsl-0.13.0_GH0.tar.gz) = 67abb1ff15166182930d02d7be95601c4b94a495bcfd2abeb19a1f336cf7c963
+SIZE (rockdaboot-libpsl-libpsl-0.13.0_GH0.tar.gz) = 57131

Modified: head/dns/libpsl/files/patch-src-psl.c
==============================================================================
--- head/dns/libpsl/files/patch-src-psl.c	Sat Apr  9 12:21:14 2016	(r412808)
+++ head/dns/libpsl/files/patch-src-psl.c	Sat Apr  9 12:29:38 2016	(r412809)
@@ -1,22 +1,11 @@
---- src/psl.c.orig	2015-09-23 12:52:04 UTC
+--- src/psl.c.orig	2016-01-02 13:38:37 UTC
 +++ src/psl.c
-@@ -54,8 +54,10 @@
- #	define ngettext(STRING1,STRING2,N) STRING2
+@@ -67,6 +67,8 @@
  #endif
  
--#include <sys/types.h>
+ #include <sys/types.h>
 +#include <netinet/in.h>
 +#include <sys/socket.h>
  #include <sys/stat.h>
-+#include <sys/types.h>
  #include <unistd.h>
  #include <stdio.h>
- #include <stdlib.h>
-@@ -87,7 +89,6 @@
- #endif
- 
- #include <libpsl.h>
--#include <bits/stat.h>
- 
- /* number of elements within an array */
- #define countof(a) (sizeof(a)/sizeof(*(a)))

Modified: head/dns/libpsl/files/patch-src-psl2c.c
==============================================================================
--- head/dns/libpsl/files/patch-src-psl2c.c	Sat Apr  9 12:21:14 2016	(r412808)
+++ head/dns/libpsl/files/patch-src-psl2c.c	Sat Apr  9 12:29:38 2016	(r412809)
@@ -1,11 +1,11 @@
---- src/psl2c.c.orig	2015-09-23 12:52:04 UTC
+--- src/psl2c.c.orig	2016-01-02 13:38:37 UTC
 +++ src/psl2c.c
-@@ -246,7 +246,7 @@ int main(int argc, const char **argv)
+@@ -271,7 +271,7 @@ int main(int argc, const char **argv)
  
- 		_print_psl_entries(fpout, psl->suffixes, "suffixes");
+ 		_print_psl_entries_dafsa(fpout, psl->suffixes);
  
--		snprintf(cmd, cmdsize, "sha1sum %s", argv[1]);
-+		snprintf(cmd, cmdsize, "sha1 %s", argv[1]);
+-		snprintf(cmd, cmdsize, "sha1sum %s", argv[argpos]);
++		snprintf(cmd, cmdsize, "sha1 %s", argv[argpos]);
  		if ((pp = popen(cmd, "r"))) {
  			if (fscanf(pp, "%63[0-9a-zA-Z]", checksum) < 1)
  				*checksum = 0;

Modified: head/dns/libpsl/pkg-plist
==============================================================================
--- head/dns/libpsl/pkg-plist	Sat Apr  9 12:21:14 2016	(r412808)
+++ head/dns/libpsl/pkg-plist	Sat Apr  9 12:29:38 2016	(r412809)
@@ -3,6 +3,6 @@ bin/psl2c
 include/libpsl.h
 lib/libpsl.a
 lib/libpsl.so
-lib/libpsl.so.0
-lib/libpsl.so.0.4.0
+lib/libpsl.so.5
+lib/libpsl.so.5.0.0
 libdata/pkgconfig/libpsl.pc

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Sat Apr  9 12:21:14 2016	(r412808)
+++ head/ftp/curl/Makefile	Sat Apr  9 12:29:38 2016	(r412809)
@@ -3,7 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.48.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet