From owner-svn-ports-all@freebsd.org Wed Dec 6 16:15:17 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A309E84416; Wed, 6 Dec 2017 16:15:17 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A35577D6C; Wed, 6 Dec 2017 16:15:16 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from lrrr.mouf.net (cpe-24-163-43-246.nc.res.rr.com [24.163.43.246]) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id vB6GF6fq077836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 6 Dec 2017 16:15:13 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r455594 - in head/science/mcstas: . files To: Alexey Dokuchaev Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, Jason Unovitch , Kurt Jaeger , erkn@fysik.dtu.dk References: <201712051732.vB5HWbUA018987@repo.freebsd.org> <20171206070552.GA29159@FreeBSD.org> From: Steve Wills Message-ID: <5377178e-9559-11dc-603f-5cb60c06e01e@FreeBSD.org> Date: Wed, 6 Dec 2017 11:15:01 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171206070552.GA29159@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Wed, 06 Dec 2017 16:15:14 +0000 (UTC) X-Spam-Status: No, score=1.3 required=4.5 tests=RCVD_IN_RP_RNBL autolearn=no autolearn_force=no version=3.4.1 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99.2 at mouf.net X-Virus-Status: Clean X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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, 06 Dec 2017 16:15:17 -0000 Hi, On 12/06/2017 02:05, Alexey Dokuchaev wrote: > On Tue, Dec 05, 2017 at 05:32:37PM +0000, Steve Wills wrote: >> New Revision: 455594 >> URL: https://svnweb.freebsd.org/changeset/ports/455594 >> >> Log: >> science/mcstas: simplify Makefile >> >> While here, remove unecessary pkg-install/deinstall >> >> PR: 223905 >> Submitted by: Erik B Knudsen (maintainer) >> >> ... >> PORTNAME= mcstas >> -PORTVERSION= 2.2a >> +DISTVERSION= 2.2a > > Ok, so PKGVERSION had changed now, I think you might need PORTEPOCH :( > > $ make -V PKGVERSION > 2.2.a > $ pkg version -t 2.2.a 2.2a > < > I will do as Mat suggested and put back PORTVERSION, I like it better anyway. >> >> -PLIST_SUB+= PORTVERSION=${PORTVERSION} >> -SUB_FILES= pkg-deinstall pkg-install >> +MANDIRS= ${PREFIX}/${PORTNAME}/${DISTVERSION}/doc/man/man1 > > There is MANPREFIX for manpages, but more importantly, why embed version > in the path at all? > >> +PLIST_SUB+= DISTVERSION=${DISTVERSION} >> >> +MCEXECS= mcstas mcformat >> + >> post-install: >> - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcformat >> - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcstas >> +.for e in ${MCEXECS} >> + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/${DISTVERSION}/bin/${e} >> + ${LN} -s ${PREFIX}/${PORTNAME}/${DISTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e} > > Symlinks should not point to an absolute path. > >> @@ -1,2 +1,3 @@ >> +TIMESTAMP = 1511649139 > > This change was uncalled for since the remaining of distinfo was left > intact. It should have been removed from the commit bach to reduce > the diff noise and repo churn. > >> -mcstas/%%PORTVERSION%%/share/ref-lib.h >> -mcstas/%%PORTVERSION%%/share/vitess-lib.c >> -mcstas/%%PORTVERSION%%/share/vitess-lib.h >> +mcstas/%%DISTVERSION%%/LGPL >> +mcstas/%%DISTVERSION%%/LICENSE.LIB >> +mcstas/%%DISTVERSION%%/NOMENCLATURE >> +mcstas/%%DISTVERSION%%/README >> +mcstas/%%DISTVERSION%%/bin/mcformat >> +mcstas/%%DISTVERSION%%/bin/mcstas >> +mcstas/%%DISTVERSION%%/data/Al.nxs >> +mcstas/%%DISTVERSION%%/data/Cu.nxs >> +mcstas/%%DISTVERSION%%/doc/man/man1/mcformat-%%DISTVERSION%%.1.gz >> +mcstas/%%DISTVERSION%%/doc/man/man1/mcstas-%%DISTVERSION%%.1.gz > > Ditt (what's the reason behind having PORTVERSION in the path? I don't > see any potentially conflicting versions of the port in the tree. This > also breaks its conformance to hier(7). Dunno, it was like that when I found it. Perhaps the maintainer or previous committers can say? Steve