From owner-svn-ports-head@freebsd.org Wed Dec 6 07:05:53 2017 Return-Path: Delivered-To: svn-ports-head@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 99FF4E9865C; Wed, 6 Dec 2017 07:05:53 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A38166B63; Wed, 6 Dec 2017 07:05:53 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 9A88E60A1; Wed, 6 Dec 2017 07:05:52 +0000 (UTC) Date: Wed, 6 Dec 2017 07:05:52 +0000 From: Alexey Dokuchaev To: Steve Wills Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r455594 - in head/science/mcstas: . files Message-ID: <20171206070552.GA29159@FreeBSD.org> References: <201712051732.vB5HWbUA018987@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201712051732.vB5HWbUA018987@repo.freebsd.org> User-Agent: Mutt/1.9.1 (2017-09-22) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 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: Wed, 06 Dec 2017 07:05:53 -0000 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 < > > -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). ./danfe