Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jul 2010 08:38:36 +0530
From:      ashish@FreeBSD.org (Ashish SHUKLA)
To:        Anonymous <swell.k@gmail.com>
Cc:        FreeBSD ports list <freebsd-ports@freebsd.org>
Subject:   Re: LICENSE_FILE=${WRKSRC}/LICENSE
Message-ID:  <86lj95pm4r.fsf@chateau.d.if>
In-Reply-To: <867hkq550n.fsf_-_@gmail.com> (Anonymous's message of "Tue, 20 Jul 2010 23:26:16 %2B0400")
References:  <86mxtq6sea.fsf@chateau.d.if> <86k4oujb05.fsf@gmail.com> <86y6d97eje.fsf@chateau.d.if> <867hkq550n.fsf_-_@gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Anonymous  writes:
> ashish@FreeBSD.org (Ashish SHUKLA) writes:

>>>> [1]  http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/146513
>>=20
>>> Why do you need to copy license file in post-extract?
>>=20
>> I added because specifying '${WRKSRC}/LICENSE' as 'LICENSE_FILE' results=
 in
>> a conflict because License infrastructure in ports system also creates a=
 file
>> named LICENSE. So, I'm just copying it to some name other than LICENSE, =
and
>> than mentioning that in the LICENSE_FILE.

> Ah, so you're referring to _LICENSE_REPORT that's created in_LICENSE_DIR.
> It's not just the case of a single license file named `LICENSE' but multi=
ple
> licenses with same filename but in different directories are affected as =
well.
> Does the following diff fixes it for you?

Yes, the following diff works fine and I don't have to rename LICENSE file
anymore.

> %%
> Index: Mk/bsd.licenses.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /a/.cvsup/ports/Mk/bsd.licenses.mk,v
> retrieving revision 1.2
> diff -u -p -r1.2 bsd.licenses.mk
> --- Mk/bsd.licenses.mk	26 May 2010 02:20:27 -0000	1.2
> +++ Mk/bsd.licenses.mk	20 Jul 2010 19:20:41 -0000
> @@ -723,11 +723,11 @@ PLIST_FILES+=3D	${_LICENSE_DIR_REL}/${_LIC
>  PLIST_DIRS+=3D	${_LICENSE_DIR_REL}
=20
>  .if ${_LICENSE_COMB} =3D=3D "single"
> -PLIST_FILES+=3D	${_LICENSE_DIR_REL}/${_LICENSE_FILE:T}
> +PLIST_FILES+=3D	${_LICENSE_DIR_REL}/${_LICENSE}
>  .else
>  .	for lic in ${_LICENSE}
>  .		if defined(_LICENSE_FILE_${lic})
> -PLIST_FILES+=3D	${_LICENSE_DIR_REL}/${_LICENSE_FILE_${lic}:T}
> +PLIST_FILES+=3D	${_LICENSE_DIR_REL}/${lic}
>  .		endif
>  .	endfor
>  .endif
> @@ -737,10 +737,10 @@ install-license:
>  	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${_LICENSE_CATALOG}
>  	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${_LICENSE_REPORT}
>  .if ${_LICENSE_COMB} =3D=3D "single"
> -	@${INSTALL_DATA} ${_LICENSE_FILE} ${_LICENSE_DIR}
> +	@${INSTALL_DATA} ${_LICENSE_FILE} ${_LICENSE_DIR}/${_LICENSE}
>  .else
>  .	for lic in ${_LICENSE}
> -	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${_LICENSE_DIR}
> +	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${_LICENSE_DIR}/${lic}
>  .	endfor
>  .endif
>  # XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)
> %%

Thanks
=2D-=20
Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
freebsd.org!ashish | http://people.freebsd.org/~ashish/

=E2=80=9CI can resist everything except temptation.=E2=80=9D (Oscar Wilde, =
"Lady
Windermere's Fan", 1892)

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (FreeBSD)

iQIcBAEBCgAGBQJMRmS6AAoJEMdGz6nnT6Swon0QAKOo4F8mgQ6tGzpC374etGpS
a1yC3XiXih/uvZ7ZvrkjVP5A7AXxHytqw1b7UHCDY2nm0NwlLOGlv5VUpZF2SCT/
qiLG66Q7c7fa/jywB/+qZN9hj4hBFrAXCIECb1FAQPrvduLqdIQA92lC08a2LYYU
QHjlLL1lTbCTt8lUm42S+2nS47X5mO6myuK+aJ1UCdUZckh/vf3ICxmDuDJsfzVo
0k6sG0LUPNBIehL+tzzz95iYHHdeRNGMQTwhk+ulFRRzyOIxddYt7BENhU5L50Wy
5zrSSvwNI/P/Zlb8dxz/0Sw1zRmkhGp0mfpCTG47+hlhG/Oetb4C/ISDyDIv7kVd
d8aiX0oe3/5rZ0UJv0DxFGrTSjKL1KpdmsXtM3oOOy9TgmBvvMIaHT/N+slRMbIm
C5+n0axuR2c5XaWOSAscjnjTeWV4jetjYuU6MSR0RfyAM6jluZTCPoEQoxM0ShMG
/bs4GI87dKAiRLp1byqIDG+0kamR4xdMcurvfrg8OIiCVLXDrYkKuhofRicSHa1G
469QlOyclXuAQ/xWaJF7QauZnEBImHJ6WveHNFu1k6er+G/6cElc/cFXsJ6PU4Th
3KXZTkl2bd5ES6Tf1zCQCPKlgG4UinVqOeaNAjtLGB8Dn2TkincD/z1h22VL6BEj
Ikn5mGO4LIfpW0xqiGmZ
=yiRh
-----END PGP SIGNATURE-----
--=-=-=--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86lj95pm4r.fsf>