From owner-freebsd-ports@FreeBSD.ORG Tue Jul 20 19:26:30 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 BC15E106567E; Tue, 20 Jul 2010 19:26:30 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 4B34A8FC1A; Tue, 20 Jul 2010 19:26:29 +0000 (UTC) Received: by vws19 with SMTP id 19so7949850vws.13 for ; Tue, 20 Jul 2010 12:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=9O7hRYrBk9T/1bfKoTNrbL2YQkJKj/09AnnP9iqkYTM=; b=oqBfRQU+7A6K7iysMobpLlCTW/4tTtZxAgpWY1r5swHIlNLa365GyEs9S9Z6WHk6AC wnch528tni0SurjQOvWWId+TkjUvS79jMH+4OaWIvHoWXVgXD7PbLllavfH/ag2lXuVC EIjuRx5KT52fi4lz0tIqp6mwIJtbhpyjqKr54= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=vAwF1TRR81HSkFgh9a1RNuBh6Nwd/B0UfXjM9w2iGl7gbOO92Pw6aS2DxPAqBWB/tf blHAcZ9wrsIs5QcHz5eY+W6nb/R9l/M0YhXn16qSOGY+0hAWBX+8te/qgQ6cR2MFRNS2 GXQSm6CWJnzU7GCmV151c5Kc2yh95FKPYUiUk= Received: by 10.220.121.144 with SMTP id h16mr3819917vcr.19.1279653989033; Tue, 20 Jul 2010 12:26:29 -0700 (PDT) Received: from localhost (tor1.digineo.de [62.141.53.224]) by mx.google.com with ESMTPS id s20sm1730121vcr.28.2010.07.20.12.26.25 (version=SSLv3 cipher=RC4-MD5); Tue, 20 Jul 2010 12:26:28 -0700 (PDT) From: Anonymous To: ashish@FreeBSD.org (Ashish SHUKLA) References: <86mxtq6sea.fsf@chateau.d.if> <86k4oujb05.fsf@gmail.com> <86y6d97eje.fsf@chateau.d.if> Date: Tue, 20 Jul 2010 23:26:16 +0400 In-Reply-To: <86y6d97eje.fsf@chateau.d.if> (Ashish SHUKLA's message of "Sun, 18 Jul 2010 07:10:53 +0530") Message-ID: <867hkq550n.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: FreeBSD ports list Subject: LICENSE_FILE=${WRKSRC}/LICENSE (Was: Port installing localized manual pages.) 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: Tue, 20 Jul 2010 19:26:30 -0000 ashish@FreeBSD.org (Ashish SHUKLA) writes: >>> [1] http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146513 > >> Why do you need to copy license file in post-extract? > > 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 multiple licenses with same filename but in different directories are affected as well. Does the following diff fixes it for you? %% Index: Mk/bsd.licenses.mk =================================================================== 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+= ${_LICENSE_DIR_REL}/${_LIC PLIST_DIRS+= ${_LICENSE_DIR_REL} .if ${_LICENSE_COMB} == "single" -PLIST_FILES+= ${_LICENSE_DIR_REL}/${_LICENSE_FILE:T} +PLIST_FILES+= ${_LICENSE_DIR_REL}/${_LICENSE} .else . for lic in ${_LICENSE} . if defined(_LICENSE_FILE_${lic}) -PLIST_FILES+= ${_LICENSE_DIR_REL}/${_LICENSE_FILE_${lic}:T} +PLIST_FILES+= ${_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} == "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) %%