Date: Tue, 20 Jan 2004 10:38:37 +0100 From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: HEADS UP: New bsd.*.mk changes Message-ID: <xzpad4jvu1u.fsf@dwp.des.no> In-Reply-To: <1074590694.85583.20.camel@shumai.marcuscom.com> (Joe Marcus Clarke's message of "Tue, 20 Jan 2004 04:24:55 -0500") References: <1074590694.85583.20.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Joe Marcus Clarke <marcus@FreeBSD.org> 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})"; \
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpad4jvu1u.fsf>