Date: Fri, 5 May 2006 17:50:37 +0400 From: "Andrew Pantyukhin" <infofarmer@gmail.com> To: "Ion-Mihai Tetcu" <itetcu@people.tecnik93.com> Cc: FreeBSD Ports <ports@freebsd.org>, Sam Lawrance <lawrance@freebsd.org> Subject: Re: sourceforge subdir default Message-ID: <cb5206420605050650j71bb7c81scd2bdba0a80823ca@mail.gmail.com> In-Reply-To: <20060428003008.19f61dbc@it.buh.tecnik93.com> References: <cb5206420602180112k135e0569o360f02aad4fd4b0b@mail.gmail.com> <127FEBDA-4446-47DB-B6CA-4AB6A5CE8562@FreeBSD.org> <cb5206420604270827r2c03fbacx9e391a3e9489398@mail.gmail.com> <20060428003008.19f61dbc@it.buh.tecnik93.com>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_16974_3709748.1146837037269
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On 4/28/06, Ion-Mihai Tetcu <itetcu@people.tecnik93.com> wrote:
> On Thu, 27 Apr 2006 19:27:38 +0400
> "Andrew Pantyukhin" <infofarmer@gmail.com> wrote:
> > Okay, I wonder if we can set M_S_SUBDIR to PORTNAME
> > by default no matter what MASTER_SITES we have. I mean
> > if there's a %SUBDIR% to replace, PORTNAME seems to be
> > a reasonable default value, doesn't it?
>
> I've been thinking about the same thing for some time.
>
> Care to provide:
> a) patch for b.p.m
> b) patch for affected ports where this is true
> ( c) the rest of M_S_SF ports should work w/o modifications ) ?
>
> I'll do a test for all the affected ports.
% find /usr/ports -iname Makefile\* -exec egrep -H
'^MASTER_SITE_SUBDIR=3D[[:space:]]*\$\{PORTNAME\}$' {} + | wc -l
1357
So I think I won't provide a patch for the ports, we'll do patching
step-by-step later (in the manner of USE_REINPLACE deprecation)
Attached is a very simple diff. Even without any testing, I don't see
how it can break anything at all. I'll submit a pr some time later.
------=_Part_16974_3709748.1146837037269
Content-Type: application/octet-stream; name=bsd.port.mk.subdir.diff
Content-Transfer-Encoding: 7bit
X-Attachment-Id: f_emukw8dt
Content-Disposition: attachment; filename="bsd.port.mk.subdir.diff"
--- /usr/ports/Mk/bsd.port.mk Tue May 2 14:09:23 2006
+++ bsd.port.mk Fri May 5 17:40:55 2006
@@ -97,11 +97,9 @@
# locally. See bsd.sites.mk for common choices for
# MASTER_SITES.
# MASTER_SITE_SUBDIR
-# - Subdirectory of MASTER_SITES. Will sometimes need to be
-# set to ${PORTNAME} for (e.g.) MASTER_SITE_SOURCEFORGE.
-# Only guaranteed to work for choices of ${MASTER_SITES}
-# defined in bsd.sites.mk.
-# Default: not set.
+# - Subdirectory of MASTER_SITES. Only guaranteed to work for
+# choices of ${MASTER_SITES} defined in bsd.sites.mk.
+# Default: ${PORTNAME}
# PATCHFILES - Name(s) of additional files that contain distribution
# patches. Make will look for them at PATCH_SITES (see below).
# They will automatically be uncompressed before patching if
@@ -2196,6 +2194,8 @@
_PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
. endif
.endfor
+
+MASTER_SITE_SUBDIR?= ${PORTNAME}
# Feed internal _{MASTER,PATCH}_SITE_SUBDIR_n where n is a group designation
# as per grouping rules (:something)
------=_Part_16974_3709748.1146837037269--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cb5206420605050650j71bb7c81scd2bdba0a80823ca>