From owner-svn-ports-head@freebsd.org Sat Aug 17 01:55:46 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 617B1B78D8; Sat, 17 Aug 2019 01:55:46 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 469NZB205cz3Kjg; Sat, 17 Aug 2019 01:55:46 +0000 (UTC) (envelope-from yuri@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 1FF5AA71D; Sat, 17 Aug 2019 01:55:46 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7H1tjEA009174; Sat, 17 Aug 2019 01:55:45 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7H1tj4D009173; Sat, 17 Aug 2019 01:55:45 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201908170155.x7H1tj4D009173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 17 Aug 2019 01:55:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509132 - head/sysutils/snmp_exporter X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/sysutils/snmp_exporter X-SVN-Commit-Revision: 509132 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Aug 2019 01:55:46 -0000 Author: yuri Date: Sat Aug 17 01:55:45 2019 New Revision: 509132 URL: https://svnweb.freebsd.org/changeset/ports/509132 Log: sysutils/snmp_exporter: Switch to USES=go:modules, fix build with go1.13 PR: 239868 Submitted by: Dmitri Goutnik Approved by: portmgr (unbreak with the upcoming go1.13) Modified: head/sysutils/snmp_exporter/Makefile Modified: head/sysutils/snmp_exporter/Makefile ============================================================================== --- head/sysutils/snmp_exporter/Makefile Sat Aug 17 01:26:24 2019 (r509131) +++ head/sysutils/snmp_exporter/Makefile Sat Aug 17 01:55:45 2019 (r509132) @@ -12,26 +12,20 @@ LICENSE= APACHE20 LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -USES= go +USES= go:modules USE_GITHUB= yes USE_RC_SUBR= snmp_exporter GH_ACCOUNT= prometheus -GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} -GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= . ./generator -do-build: - (cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET}) - (cd ${GO_WRKSRC}/generator; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET}/generator) - post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${GO_WRKSRC}/generator/main.go -do-install: +post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/ ${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml - ${INSTALL_PROGRAM} ${WRKDIR}/bin/snmp_exporter ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKDIR}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator + ${MV} ${STAGEDIR}${PREFIX}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator .include