From owner-svn-ports-all@freebsd.org Mon Sep 10 22:29:00 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE2B8109DD8C; Mon, 10 Sep 2018 22:29:00 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 924A378866; Mon, 10 Sep 2018 22:29:00 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D2CE6F1D; Mon, 10 Sep 2018 22:29:00 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8AMT0UR067352; Mon, 10 Sep 2018 22:29:00 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8AMT0i9067351; Mon, 10 Sep 2018 22:29:00 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201809102229.w8AMT0i9067351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Mon, 10 Sep 2018 22:29:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479486 - in head/ports-mgmt/pkg: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head/ports-mgmt/pkg: . files X-SVN-Commit-Revision: 479486 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2018 22:29:01 -0000 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) &&