From owner-freebsd-ports@FreeBSD.ORG Tue Sep 28 10:01:36 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 26B1B106566B; Tue, 28 Sep 2010 10:01:36 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-qy0-f175.google.com (mail-qy0-f175.google.com [209.85.216.175]) by mx1.freebsd.org (Postfix) with ESMTP id 64F318FC12; Tue, 28 Sep 2010 10:01:35 +0000 (UTC) Received: by qyk30 with SMTP id 30so2242197qyk.13 for ; Tue, 28 Sep 2010 03:01:34 -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=6lB9dVlNRXbhGqzdVwBQb6FWIpaePda5PFs0zpPHS8A=; b=HFz/Gd9kdNC5IFRy2GuM1Y4QE2Xm7FIoT6qRedmPUhfpIZeENL4r++cwQJ7Oil++br OnUBAgf4C6nC2JmZByOiPNhC17gcxC71ckjDEwZPazZxXsdcd0XZBOA0ItjteU8tLFdA Q8V5BHEqSreMsFzgOd+oVZ6OWSW2KdUMyJ+CU= 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=keNVJwWMtrnHE3BR4MBhwg7RSNL6cRhZKtVpPia63GXMo9eFxRFW7D7ciyGL/ak39f +7o/iv7gt+nGJ9lDRPnJ5nFMDOkvhaJ5RcoukM7F+CIiw7su2uDZjZcA2Rr38a4G4m3y Ak3zLFvDE5ZK8HQ3j4nyY0l9woALJ+5XH2BnE= Received: by 10.229.83.145 with SMTP id f17mr6866801qcl.165.1285668092871; Tue, 28 Sep 2010 03:01:32 -0700 (PDT) Received: from localhost (anonymous-relay.omegamicro.net [216.86.61.205]) by mx.google.com with ESMTPS id f15sm7838454qcr.13.2010.09.28.03.01.25 (version=SSLv3 cipher=RC4-MD5); Tue, 28 Sep 2010 03:01:31 -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> <867hkq550n.fsf_-_@gmail.com> <86lj95pm4r.fsf@chateau.d.if> <86oce12vao.fsf@gmail.com> <86mxtlnwv8.fsf@chateau.d.if> <86mxr2xot7.fsf@gmail.com> Date: Tue, 28 Sep 2010 14:01:22 +0400 In-Reply-To: <86mxr2xot7.fsf@gmail.com> (Anonymous's message of "Tue, 28 Sep 2010 12:19:48 +0400") Message-ID: <861v8euqz1.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 Cc: Dirk Meyer , Giuseppe PILICHI , 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: Tue, 28 Sep 2010 10:01:36 -0000 Anonymous writes: >> ashish@FreeBSD.org (Ashish SHUKLA) writes: >>> Anonymous writes: >>>> 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. > >> I've filed ports/148808 for the sweeping change so it's not forgotten >> after 8.1-RELEASE is out. > > Since that PR is committed can you remove workarounds then? A few more obvious workarounds this time by other committers (CC'd). Renaming license files no longer has an effect, bsd.licenses.mk will always install them under their respective names in _LICENSE_DIR to avoid confusion/collision. %% diff --git a/devel/buildapp/Makefile b/devel/buildapp/Makefile index fcb24e4..31e3dc5 100644 --- a/devel/buildapp/Makefile +++ b/devel/buildapp/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= sbcl:${PORTSDIR}/lang/sbcl RUN_DEPENDS= ${BUILD_DEPENDS} LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/doc/LICENSE-buildapp +LICENSE_FILE= ${WRKSRC}/doc/LICENSE PLIST_FILES= bin/buildapp PORTDOCS= * @@ -27,9 +27,6 @@ PORTDOCS= * WRKSRC= ${WRKDIR}/${DISTNAME}-${PORTVERSION} ALL_TARGET= -post-extract: - @${MV} ${WRKSRC}/doc/LICENSE ${WRKSRC}/doc/LICENSE-buildapp - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 18f1495..7b96c20 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -21,7 +21,7 @@ COMMENT= An open-source JPEG 2000 codec LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/jp3d/LICENSE.txt MAKE_JOBS_UNSAFE= yes USE_GMAKE= yes @@ -39,9 +39,6 @@ PLIST_FILES= include/openjpeg.h \ SHLIB_VER= 2 -post-extract: - ${LN} ${WRKSRC}/jp3d/LICENSE.txt ${WRKSRC}/COPYRIGHT - post-patch: .SILENT ${FIND} ${WRKSRC} -type f -name Makefile -exec ${REINPLACE_CMD} 's|gcc|$$(CC)|g' {} + diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile index 2ad28d2..a2aef9d 100644 --- a/mail/spamilter/Makefile +++ b/mail/spamilter/Makefile @@ -17,7 +17,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= A Sendmail LibMilter filter to block spam LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/LICENSE HAS_CONFIGURE= yes USE_RC_SUBR= spamilter.sh @@ -67,9 +67,6 @@ PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \ PORTDOCS= Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \ db.rdnsbl db.sndr policy.html spamilter.rc -post-extract: - ${LN} ${WRKSRC}/LICENSE ${WRKSRC}/COPYRIGHT - pre-configure: ${REINPLACE_CMD} \ -e "s=/etc/spamilter.rc=${PREFIX}/etc/spamilter.rc=" \ diff --git a/math/stepulator/Makefile b/math/stepulator/Makefile index a443e0c..6d505aa 100644 --- a/math/stepulator/Makefile +++ b/math/stepulator/Makefile @@ -18,7 +18,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Scientific calculator implementing RPN notation for GNUstep LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/LICENSE USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes @@ -27,9 +27,6 @@ USE_GNUSTEP_INSTALL= yes WRKSRC= ${WRKDIR}/Stepulator-gs -post-extract: - ${LN} ${WRKSRC}/LICENSE ${WRKSRC}/COPYRIGHT - post-install: ${INSTALL_DATA} ${WRKSRC}/LICENSE \ ${GNUSTEP_LOCAL_APPS}/Stepulator.app/Resources/ diff --git a/net/sixxs-aiccu/Makefile b/net/sixxs-aiccu/Makefile index 8480a29..7662f7a 100644 --- a/net/sixxs-aiccu/Makefile +++ b/net/sixxs-aiccu/Makefile @@ -20,7 +20,7 @@ COMMENT= SixXS IPv6 TIC+ tunnel broker heartbeat client LIB_DEPENDS= gnutls-openssl.40:${PORTSDIR}/security/gnutls LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/doc/LICENSE USE_RC_SUBR= sixxs-aiccu USE_GMAKE= yes @@ -32,9 +32,6 @@ WRKSRC= ${WRKDIR}/aiccu BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console PORTDOCS= README -post-extract: - ${CP} ${WRKSRC}/doc/LICENSE ${WRKSRC}/COPYRIGHT - post-patch: @${REINPLACE_CMD} \ -e 's:verbose true:verbose false:' \ diff --git a/security/xyssl/Makefile b/security/xyssl/Makefile index 3039459..f482ad3 100644 --- a/security/xyssl/Makefile +++ b/security/xyssl/Makefile @@ -16,16 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A liteweight SSL and TLS toolkit for C developers LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/BSD.txt # HAS_CONFIGURE= no # GNU_CONFIGURE= no PORTDOCS= BSD.txt ChangeLog -post-extract: - ${LN} ${WRKSRC}/BSD.txt ${WRKSRC}/COPYRIGHT - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} %%