Date: Wed, 16 May 2018 01:13:24 +0000 (UTC) From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470100 - head/sysutils/hared Message-ID: <201805160113.w4G1DOO8025991@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805160113.w4G1DOO8025991>