Date: Tue, 19 Dec 2000 22:17:40 -0500 (EST) From: Trevor Johnson <trevor@jpj.net> To: Dan Moschuk <dan@FreeBSD.org> Cc: <asami@FreeBSD.org>, <ports@FreeBSD.org> Subject: Re: Proposed bsd.port.mk patch Message-ID: <Pine.BSI.4.30.0012192212550.28423-100000@blues.jpj.net> In-Reply-To: <20001219135257.A16295@spirit.jaded.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Dan Moschuk wrote:
>
> The following patch changes the test that checks for old port layouts. For
> those of us that use cvs for ports and forget to supply the -P flag when
> checking out, it will still let us build ports.
>
> You could also add somewhere a check to see if ${MASTERDIR}/files exists but
> is empty, and print a note that -P should be used from now on when checking
> out/updating.
>
> Index: bsd.port.mk
> ===================================================================
> RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
> retrieving revision 1.360
> diff -u -r1.360 bsd.port.mk
> --- bsd.port.mk 2000/11/16 13:06:25 1.360
> +++ bsd.port.mk 2000/12/19 18:48:49
> @@ -620,9 +620,8 @@
> PACKAGES?= ${PORTSDIR}/packages
> TEMPLATES?= ${PORTSDIR}/Templates
>
> -.if (!defined(PATCHDIR) && exists(${MASTERDIR}/patches)) || \
> - (!defined(PKGDIR) && exists(${MASTERDIR}/pkg)) || \
> - (!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5))
> +.if (!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5)) || \
> + (!defined(PATCHDIR) && !exists(${MASTERDIR}/pkg-plist))
Neither of these files (md5 nor pkg-plist) were required in the old
layout. However, the pkg/DESCR file was required. I've submitted a patch
to check for that (http://www.freebsd.org/cgi/query-pr.cgi?pr=21885) which
has been rejected for unclear reasons.
--
Trevor Johnson
http://jpj.net/~trevor/gpgkey.txt
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSI.4.30.0012192212550.28423-100000>