svn commit: r479486 - in head/ports-mgmt/pkg: . files

[Brad Davis]

Author: brd
Date: Mon Sep 10 22:28:59 2018
New Revision: 479486
URL: https://svnweb.freebsd.org/changeset/ports/479486

Log:
  Apply a patch from git that fixes make packages with hardlinks and config files.

Added:
  head/ports-mgmt/pkg/files/patch-60666a1   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Mon Sep 10 21:48:05 2018	(r479485)
+++ head/ports-mgmt/pkg/Makefile	Mon Sep 10 22:28:59 2018	(r479486)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.10.5
-PORTREVISION=	2
+PORTREVISION=	3
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\

Added: head/ports-mgmt/pkg/files/patch-60666a1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-60666a1	Mon Sep 10 22:28:59 2018	(r479486)
@@ -0,0 +1,16 @@
+--- libpkg/pkg_ports.c
++++ libpkg/pkg_ports.c
+@@ -353,13 +353,6 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config)
+ 			pkg_addconfig_file(p->pkg, path, content);
+ 			free(content);
+ 		}
+-	} else {
+-		if (is_config) {
+-			pkg_emit_error("Plist error, @config %s: not a regular "
+-			    "file", line);
+-			free(buf);
+-			return (EPKG_FATAL);
+-		}
+ 	}
+ 
+ 	if (S_ISDIR(st.st_mode) &&