From owner-freebsd-ports@FreeBSD.ORG Tue Jan 20 01:39:01 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAF1516A4CE; Tue, 20 Jan 2004 01:39:00 -0800 (PST) Received: from smtp.des.no (flood.des.no [217.116.83.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7FA943D1F; Tue, 20 Jan 2004 01:38:58 -0800 (PST) (envelope-from des@des.no) Received: by smtp.des.no (Pony Express, from userid 666) id ABF3A530A; Tue, 20 Jan 2004 10:38:57 +0100 (CET) Received: from dwp.des.no (des.no [80.203.228.37]) by smtp.des.no (Pony Express) with ESMTP id 18F585308; Tue, 20 Jan 2004 10:38:37 +0100 (CET) Received: by dwp.des.no (Postfix, from userid 2602) id A7FD133C6A; Tue, 20 Jan 2004 10:38:37 +0100 (CET) To: Joe Marcus Clarke References: <1074590694.85583.20.camel@shumai.marcuscom.com> From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) Date: Tue, 20 Jan 2004 10:38:37 +0100 In-Reply-To: <1074590694.85583.20.camel@shumai.marcuscom.com> (Joe Marcus Clarke's message of "Tue, 20 Jan 2004 04:24:55 -0500") Message-ID: User-Agent: Gnus/5.090024 (Oort Gnus v0.24) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Checker-Version: SpamAssassin 2.61 (1.212.2.1-2003-12-09-exp) on flood.des.no X-Spam-Level: ss X-Spam-Status: No, hits=2.6 required=5.0 tests=RCVD_IN_DYNABLOCK, RCVD_IN_SORBS autolearn=no version=2.61 cc: ports@FreeBSD.org Subject: Re: HEADS UP: New bsd.*.mk changes X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2004 09:39:01 -0000 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Joe Marcus Clarke writes: > Type: FEATURE > > Title: Add new command macros to bsd.port.mk > > Affects: bsd.port.mk > > Description: The following new command macros have been added to > bsd.port.mk: BRANDELF =3D> /usr/bin/brandelf, CPIO =3D> /usr/bin/cpio, > DIALOG =3D> /usr/bin/dialog, OBJCOPY =3D> /usr/bin/objcopy, PASTE =3D> > /usr/bin/paste, PAX =3D> /bin/pax, PRINTF =3D> /usr/bin/printf, SORT =3D> > /usr/bin/sort, UNZIP_CMD =3D> /usr/bin/unzip or ${LOCALBASE}/bin/unzip. > > > PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=3D59058 > > Submitted by: eik I actually submitted a patch for CPIO ages ago, along with a few others which still haven't been committed (see attached patch). The perl part of the patch is especially important and should have been committed before the 5.2-RELEASE package builds. Perl 5.6.1 is so old it's nearly useless, and installing a package with a dependency on Perl 5.6.1 will clobber Perl 5.8.2 without warning if it's installed. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=bsd.port.mk.diff ? bsd.gnome.mk.des Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.475 diff -u -r1.475 bsd.port.mk --- bsd.port.mk 20 Jan 2004 09:14:09 -0000 1.475 +++ bsd.port.mk 20 Jan 2004 09:33:14 -0000 @@ -1146,6 +1146,11 @@ PERL_LEVEL=0 .endif # !defined(PERL_LEVEL) && defined(PERL_VERSION) +.if ${OSVERSION} >= 501113 +PERL_VERSION?= 5.8.2 +PERL_VER?= 5.8.2 +PERL_ARCH?= mach +.else .if ${OSVERSION} >= 500032 PERL_VERSION?= 5.6.1 PERL_VER?= 5.6.1 @@ -1165,6 +1170,7 @@ PERL_ARCH?= ${ARCH}-freebsd .endif .endif +.endif .if ${PERL_LEVEL} >= 500800 PERL_PORT?= perl5.8 @@ -3116,7 +3122,7 @@ fi \ done .if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ + @if [ ${UID} -eq 0 ]; then \ ${CHMOD} -R ug-s ${WRKDIR}; \ ${CHOWN} -R 0:0 ${WRKDIR}; \ fi @@ -3453,7 +3459,7 @@ .if !target(install-mtree) install-mtree: @${MKDIR} ${PREFIX} - @if [ `id -u` != 0 ]; then \ + @if [ ${UID} -ne 0 ]; then \ if [ -w ${PREFIX}/ ]; then \ ${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \ else \ @@ -3462,7 +3468,7 @@ fi; \ fi .if !defined(NO_MTREE) - @if [ `id -u` = 0 ]; then \ + @if [ ${UID} -eq 0 ]; then \ if [ ! -f ${MTREE_FILE} ]; then \ ${ECHO_CMD} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ ${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ @@ -4136,7 +4142,7 @@ OK="true"; \ fi; \ fi; \ - fi ; \ + fi ; \ if [ "$$OK" != "true" -a ${FETCH_REGET} -eq 0 ]; then \ ${ECHO_MSG} "===> Giving up on fetching files: $$refetchlist"; \ ${ECHO_MSG} "Make sure the Makefile and distinfo file (${MD5_FILE})"; \ --=-=-=--