From owner-svn-ports-all@freebsd.org Wed May 16 01:13:25 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 E15B0EE34EF; Wed, 16 May 2018 01:13:24 +0000 (UTC) (envelope-from dvl@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 8AE556E839; Wed, 16 May 2018 01:13:24 +0000 (UTC) (envelope-from dvl@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 6B6E213596; Wed, 16 May 2018 01:13:24 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4G1DO2g025992; Wed, 16 May 2018 01:13:24 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4G1DOO8025991; Wed, 16 May 2018 01:13:24 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201805160113.w4G1DOO8025991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Wed, 16 May 2018 01:13:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470100 - head/sysutils/hared X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: head/sysutils/hared X-SVN-Commit-Revision: 470100 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.26 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: Wed, 16 May 2018 01:13:25 -0000 Author: dvl Date: Wed May 16 01:13:23 2018 New Revision: 470100 URL: https://svnweb.freebsd.org/changeset/ports/470100 Log: Add CONFLICTS_INSTALL. Simplify sample configuration installation after sending patches upstream. Submitted by: Mateusz Piotrowski <0mp@FreeBSD.org> Differential Revision: D15079 Modified: head/sysutils/hared/Makefile head/sysutils/hared/distinfo Modified: head/sysutils/hared/Makefile ============================================================================== --- head/sysutils/hared/Makefile Wed May 16 00:01:38 2018 (r470099) +++ head/sysutils/hared/Makefile Wed May 16 01:13:23 2018 (r470100) @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= hared -DISTVERSION= 1.0-41 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -ge17cdc6 +DISTVERSION= 1.0-45 +DISTVERSIONSUFFIX= -g8341d8a CATEGORIES= sysutils MAINTAINER= 0mp@FreeBSD.org @@ -23,6 +22,8 @@ GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/src/gopkg.in/gcfg. golang:net:9dfe398:net/src/golang.org/x/net \ gorilla:websocket:7a8dacf:websocket/src/github.com/gorilla/websocket +CONFLICTS_INSTALL= sysutils/py-hared + OPTIONS_DEFINE= DOCS ETCDIR= ${PREFIX}/etc @@ -34,8 +35,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_PKGNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.example \ - ${STAGEDIR}${ETCDIR}/hared.ini.sample + ${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.sample ${STAGEDIR}${ETCDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/hared/distinfo ============================================================================== --- head/sysutils/hared/distinfo Wed May 16 00:01:38 2018 (r470099) +++ head/sysutils/hared/distinfo Wed May 16 01:13:23 2018 (r470100) @@ -1,6 +1,6 @@ -TIMESTAMP = 1522849010 -SHA256 (jpmens-hared-hare-1.0-41-ge17cdc6_GH0.tar.gz) = f16038eaf12d7060462f36af60017141be748f5f9be0ebcd064fb39004156179 -SIZE (jpmens-hared-hare-1.0-41-ge17cdc6_GH0.tar.gz) = 16023 +TIMESTAMP = 1523833144 +SHA256 (jpmens-hared-hare-1.0-45-g8341d8a_GH0.tar.gz) = 2db2b095668426752cd8129ddbd0586188dbad171f64638248c6f6f6e5477b20 +SIZE (jpmens-hared-hare-1.0-45-g8341d8a_GH0.tar.gz) = 16042 SHA256 (go-gcfg-gcfg-f02745a_GH0.tar.gz) = cd1eb3b45b0cc06da82118bcd5cb15fa9f65b4ccb39d67050b666028f8bb9233 SIZE (go-gcfg-gcfg-f02745a_GH0.tar.gz) = 28580 SHA256 (go-warnings-warnings-27b9fab_GH0.tar.gz) = 1db6ca861b2f9f3a53e3dff65d6c2d1b675f2fc7c81dc4f5672e1aaf79b9fe7b