From owner-freebsd-ports@FreeBSD.ORG Wed Jul 21 03:08:52 2010 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCDD01065674 for ; Wed, 21 Jul 2010 03:08:52 +0000 (UTC) (envelope-from wahjava@gmail.com) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id 8B6728FC16 for ; Wed, 21 Jul 2010 03:08:52 +0000 (UTC) Received: by pzk7 with SMTP id 7so2349134pzk.13 for ; Tue, 20 Jul 2010 20:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:from:to:cc :subject:organization:references:x-face:x-uptime:x-url :x-operating-system:x-openpgp-id:x-openpgp-fingerprint:x-mailer :x-mail-morse:x-attribution:organisation:date:in-reply-to:message-id :user-agent:face:mime-version:content-type; bh=QQ6KKyHnh7B3BnXm7Jqe8YtPnLQAj0ccGDkT17UaRJg=; b=Ysyy9UXj+nt1DEvnxvIuWIy3Lczbb2pGzmox2Wrf2mv2LHv+5Iq86qBuRg3JObgYr6 VlsKEpVvfJkSS+lqRw4uS4oU1hKO4B6NfpI92QDIN4jzmsEnbzv39poGtrEzvrZqw41S bfZmPFi+oultUl83w6rIv4UDk2loFKif1QZs4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:organization:references:x-face:x-uptime :x-url:x-operating-system:x-openpgp-id:x-openpgp-fingerprint :x-mailer:x-mail-morse:x-attribution:organisation:date:in-reply-to :message-id:user-agent:face:mime-version:content-type; b=MfrSpLBK1RQxUZNHjWMhd92JkpJbJhaQ97O8w01Ye6v1omLS/RcXt38bL6W8xt+/dX WQ47ezUlramV/2jRSZN42WypdfyADrOWOL9sjrwJGjXLzKEmg9tOH4eHcUy4Jl8WYocV jLMLZHMOMwhFThbDmRgbC1XmypudWsxjeoTsE= Received: by 10.114.111.13 with SMTP id j13mr10867346wac.123.1279681731646; Tue, 20 Jul 2010 20:08:51 -0700 (PDT) Received: from chateau.d.if ([122.163.155.4]) by mx.google.com with ESMTPS id c38sm1352027rvf.5.2010.07.20.20.08.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 20 Jul 2010 20:08:50 -0700 (PDT) Sender: Ashish SHUKLA Received: from chateau.d.if (chateau.d.if [IPv6:::1]) by chateau.d.if (Postfix) with ESMTP id 871634AF7C; Wed, 21 Jul 2010 08:38:43 +0530 (IST) From: ashish@FreeBSD.org (Ashish SHUKLA) To: Anonymous Organization: The FreeBSD Project References: <86mxtq6sea.fsf@chateau.d.if> <86k4oujb05.fsf@gmail.com> <86y6d97eje.fsf@chateau.d.if> <867hkq550n.fsf_-_@gmail.com> X-Face: )vGQ9yK7Y$Flebu1C>(B\gYBm)[$zfKM+p&TT[[JWl6:]S>cc$%-z7-`46Zf0B*syL.C]oCq[upTG~zuS0.$"_%)|Q@$hA=9{3l{%u^h3jJ^Zl; t7 X-Uptime: 8:35AM up 47 mins, 6 users, load averages: 0.08, 0.05, 0.11 X-URL: http://762e5e74.wordpress.com/ X-Operating-System: FreeBSD/FreeBSD 8.0-RELEASE-p4/amd64 X-OpenPGP-ID: E74FA4B0 X-OpenPGP-Fingerprint: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 X-Mailer: Gnus v5.13 X-Mail-Morse: .-- .- .... .--- .- ...- .- .--.-. --. -- .- .. .-.. .-.-.- -.-. --- -- X-Attribution: =?utf-8?B?4KSG4KS24KWA4KS3?= Organisation: The FreeBSD Project Date: Wed, 21 Jul 2010 08:38:36 +0530 In-Reply-To: <867hkq550n.fsf_-_@gmail.com> (Anonymous's message of "Tue, 20 Jul 2010 23:26:16 +0400") Message-ID: <86lj95pm4r.fsf@chateau.d.if> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (amd64-portbld-freebsd8.0) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJ1BMVEWpqal/f39tbW1jY2Md HR2goKCenp6UlJROTk7////9/f35+fnT09ORJdieAAACVklEQVQ4jXXUP2vbQBQA8AvUTkgz5OzY Z0iGWhpS6BSrkECn0mvx0MEJ6AjtYrfoBCVDlD8naJYmNlRfwZq8+mkKlIZaGpJSYmP7Q/XkJDrJ Td8i/H68u3vHPaPufwLdf32AMA4A6GcAgvAamY1pOJiDIFqicTwLswDhfr3uxfFtkAY/GFHPMwzD 8zpnACmIOnE6js7rQb+v4NJrG9od0C+QgpHMy5jBewV+UDSMWiw1Y4fWfyV7+NGFzDsYa3pth9LJ Q4XvXxFHcJRvHOmygn5NAEabnDcQQguarnfoiwSCJ99jmKKcphsZONmWsDK9Ro7cvZOCtQdg8nje egLhc2LNlkLmsezzTFUUy5w18ocox/f0LaLgJy0zO75zk+9pp85GAj36xjqhdI0y3tq2m4dqqcWX zQWBTz8L1irvolXV4J+3q7eCDgVnttjNq6X8H+9KOZsuNk1uCzx8pSp+E9HImfJOTLdcGqo+YKnG EIovizkEn48V7BO+ch2DXcD4ENSpWiU+q8hjjbgTBZCXnZtyj0Ws4Q1Q0B2WXFtYZo65Bbyeeldw RS6qFueM80LlLA29YlVwGRYvFD+kwI/0O+A2PlpOP9GwslUVciHuYGechuBTp922YiDZCrghTknm XSyOM+D3aoRZlo0Jb42zY7DN4p2x4AeZ+QAYutx1sHwTHzMT5cMNduQ9yW3GczN4KZ86kb0c9O8T yXDeFqpl2fryPEAYGXIlezAPXYh2NgVr/gvdoHIuDwuPwOhcWE8f8mmICq41eATkn8x0kuRTIKcB wE9+/QUtiiAnYcaN7wAAAABJRU5ErkJggg== MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Cc: FreeBSD ports list Subject: Re: LICENSE_FILE=${WRKSRC}/LICENSE X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2010 03:08:52 -0000 --=-=-= 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----- --=-=-=--