From owner-freebsd-ports@FreeBSD.ORG Thu Dec 7 20:51:02 2006 Return-Path: X-Original-To: ports@freebsd.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 582EE16A51F for ; Thu, 7 Dec 2006 20:51:02 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.FreeBSD.org (Postfix) with SMTP id AC85143CAF for ; Thu, 7 Dec 2006 20:50:07 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 28793 invoked by uid 399); 7 Dec 2006 20:51:00 -0000 Received: from localhost (HELO ?192.168.0.7?) (dougb@dougbarton.us@127.0.0.1) by localhost with SMTP; 7 Dec 2006 20:51:00 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <45787EAD.4030104@FreeBSD.org> Date: Thu, 07 Dec 2006 12:50:53 -0800 From: Doug Barton Organization: http://www.freebsd.org/ User-Agent: Thunderbird 1.5.0.8 (X11/20061125) MIME-Version: 1.0 To: Wesley Shields References: <45749998.3070308@FreeBSD.org> <20061204232125.GA42307@atarininja.org> <790a9fff0612050838s66c655fapfde80d4038f64ca2@mail.gmail.com> <20061205172803.GA51892@atarininja.org> <4575C568.70905@FreeBSD.org> <20061205194146.GC52966@atarininja.org> <20061205203120.GA53894@atarininja.org> <4575EBA8.3020601@FreeBSD.org> <20061206014049.GA43656@atarininja.org> <20061207183103.GA73597@atarininja.org> In-Reply-To: <20061207183103.GA73597@atarininja.org> X-Enigmail-Version: 0.94.1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig94BD94A04526D74A4FF852C9" Cc: ports@freebsd.org Subject: Re: distfile belongs to? 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: Thu, 07 Dec 2006 20:51:02 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig94BD94A04526D74A4FF852C9 Content-Type: multipart/mixed; boundary="------------060309030503010505070601" This is a multi-part message in MIME format. --------------060309030503010505070601 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Wesley Shields wrote: > Part 2 (the bsd.port.mk piece) is the patch posted by Doug with Ade's > suggestions. You missed the second patch I sent with the ${file%:*} changes. I've attached a modified version of that patch which incorporates Ade's change. I plan to start adding the DISTFILE string to +CONTENTS files in portmaster until it's supported in bsd.port.mk, so if anyone has a comment on the format, please speak up now. > The entire thing no longer requires a change to pkg_create in order to > function. Cool! Thanks again for taking this on, Doug --=20 This .signature sanitized for your protection --------------060309030503010505070601 Content-Type: text/plain; name="package-distinfo.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="package-distinfo.diff" Index: bsd.port.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: /usr/local/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.544 diff -u -r1.544 bsd.port.mk --- bsd.port.mk 30 Sep 2006 19:25:45 -0000 1.544 +++ bsd.port.mk 5 Dec 2006 22:16:53 -0000 @@ -5395,11 +5395,20 @@ # files exist. =20 .if !target(generate-plist) +.if defined(DIST_SUBDIR) +PDS=3D ${DIST_SUBDIR}/ +.endif generate-plist: @${ECHO_MSG} "=3D=3D=3D> Generating temporary packing list" @${MKDIR} `${DIRNAME} ${TMPPLIST}` @if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for ${PKG= NAME}."; exit 1; fi @>${TMPPLIST} + @for file in ${DISTFILES} ${PATCHFILES}; do \ + distsize=3D`${GREP} "^SIZE (${PDS}$${file%:*})" ${MD5_FILE} | ${CUT} -= f4 -d' '`; \ + distsha256=3D`${GREP} "^SHA256 (${PDS}$${file%:*})" ${MD5_FILE} | ${CU= T} -f4 -d' '`; \ + distmd5=3D`${GREP} "^MD5 (${PDS}$${file%:*})" ${MD5_FILE} | ${CUT} -f4= -d' '`; \ + ${ECHO_CMD} "@comment DISTFILE:${PDS}$${file%:*}:SIZE=3D$${distsize}:S= HA256=3D$${distsha256}:MD5=3D$${distmd5}" >> ${TMPPLIST}; \ + done @for file in ${PLIST_FILES}; do \ ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=3D/= %%!/} >> ${TMPPLIST}; \ done --------------060309030503010505070601-- --------------enig94BD94A04526D74A4FF852C9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (FreeBSD) iD8DBQFFeH6xyIakK9Wy8PsRAoQpAKDNqz+T/+002cZc8jyuS5Ouk1esbgCguXoD bwYl8gN+F3ERmq/Lvdge5EE= =54+0 -----END PGP SIGNATURE----- --------------enig94BD94A04526D74A4FF852C9--