Update to 0.9.7

4 files changed, 5 insertions, 38 deletions

diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile
index 7ff27b26e30e..853ec045ad5b 100644
--- a/devel/pkgconf/Makefile
+++ b/devel/pkgconf/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkgconf
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	0.9.7
 CATEGORIES=	devel
 MASTER_SITES=	http://rabbit.dereferenced.org/~nenolod/distfiles/ \
 		http://files.etoilebsd.net/pkgconf/
@@ -18,6 +17,8 @@ CONFIGURE_ARGS=	--with-pkg-config-dir=${PREFIX}/libdata/pkgconfig:/usr/libdata/p
 		--with-system-libdir=/usr/lib \
 		--with-system-includedir=/usr/include
 MAKE_ARGS=	MANDIR="${MAN1PREFIX}/man/man1"
+PLIST_DIRS=	pop
+PLIST_DIRSTRY=	pip
 
 CONFLICTS_INSTALL=	pkg-config-*
 
diff --git a/devel/pkgconf/distinfo b/devel/pkgconf/distinfo
index d4601637bdab..7c94ac8f924f 100644
--- a/devel/pkgconf/distinfo
+++ b/devel/pkgconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkgconf-0.9.6.tar.bz2) = c40a77543fe5c7259b813f70ddaf229c2760a250d1cf2ccef60b81fb1d3fc299
-SIZE (pkgconf-0.9.6.tar.bz2) = 84005
+SHA256 (pkgconf-0.9.7.tar.bz2) = afd2675d3cf39741906ab08e86421381271d67122a8a401d3a0fe59ad46af493
+SIZE (pkgconf-0.9.7.tar.bz2) = 84697
diff --git a/devel/pkgconf/files/patch-fileio.c b/devel/pkgconf/files/patch-fileio.c
deleted file mode 100644
index b7b6e45ca93d..000000000000
--- a/devel/pkgconf/files/patch-fileio.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./fileio.c.orig	2014-06-07 22:32:08.000000000 +0200
-+++ ./fileio.c	2014-08-04 11:24:32.522803742 +0200
-@@ -83,10 +83,18 @@
- 
- 	}
- 
--	*s = '\0';
--
- 	if (c == EOF && (s == line || ferror(stream)))
- 		return NULL;
- 
-+	*s = '\0';
-+
-+	/* Remove newline character. */
-+	if (s > line && *(--s) == '\n') {
-+		*s = '\0';
-+
-+		if (s > line && *(--s) == '\r')
-+			*s = '\0';
-+	}
-+
- 	return line;
- }
diff --git a/devel/pkgconf/files/patch-pkg.c b/devel/pkgconf/files/patch-pkg.c
deleted file mode 100644
index 4ce89fa7c433..000000000000
--- a/devel/pkgconf/files/patch-pkg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pkg.c.orig	2014-06-07 22:32:08.000000000 +0200
-+++ ./pkg.c	2014-08-04 11:24:32.524802321 +0200
-@@ -212,8 +212,6 @@
- 	{
- 		char op, *p, *key, *value;
- 
--		readbuf[strlen(readbuf) - 1] = '\0';
--
- 		p = readbuf;
- 		while (*p && (isalpha(*p) || isdigit(*p) || *p == '_' || *p == '.'))
- 			p++;