Index: head/devel/pkgconf/files/patch-pkg.c =================================================================== --- head/devel/pkgconf/files/patch-pkg.c (revision 368815) +++ head/devel/pkgconf/files/patch-pkg.c (nonexistent) @@ -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++; Property changes on: head/devel/pkgconf/files/patch-pkg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/pkgconf/files/patch-fileio.c =================================================================== --- head/devel/pkgconf/files/patch-fileio.c (revision 368815) +++ head/devel/pkgconf/files/patch-fileio.c (nonexistent) @@ -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; - } Property changes on: head/devel/pkgconf/files/patch-fileio.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/pkgconf/Makefile =================================================================== --- head/devel/pkgconf/Makefile (revision 368815) +++ head/devel/pkgconf/Makefile (revision 368816) @@ -1,27 +1,28 @@ # $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/ MAINTAINER= bapt@FreeBSD.org COMMENT= Utility to help to configure compiler and linker flags LICENSE= ISCL USES= tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig:/usr/libdata/pkgconfig \ --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-* post-install: ${LN} -sf pkgconf ${STAGEDIR}${PREFIX}/bin/pkg-config .include Index: head/devel/pkgconf/distinfo =================================================================== --- head/devel/pkgconf/distinfo (revision 368815) +++ head/devel/pkgconf/distinfo (revision 368816) @@ -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