Date: Sun, 3 Oct 1999 15:01:02 -0500 (EST) From: Don Croyle <croyle@gelemna.ft-wayne.in.us> To: FreeBSD-gnats-submit@freebsd.org Subject: misc/14104: DISTFILES name clash between release/Makefile and bsd.port.mk Message-ID: <199910032001.PAA77213@gelemna.ft-wayne.in.us>
next in thread | raw e-mail | index | archive | help
>Number: 14104
>Category: misc
>Synopsis: DISTFILES name clash between release/Makefile and bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 3 13:10:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Don Croyle
>Release: FreeBSD 3.3-STABLE i386
>Organization:
>Environment:
>Description:
Prior to building a release I set DISTFILES in the environment to a
directory containing only the files needed by the documentation ports.
The build eventually died when the jade port took DISTFILES to be
*it's* list of files required to build.
Arguably, setting DISTFILES in the environment instead of on the make
command line is a silly thing to do, but since there's an easy fix....
>How-To-Repeat:
>Fix:
Apply this patch. Tested through a make release on -stable. Applies
with a small fuzz to -current, but I don't have enough drive space on
that machine to build a test release.
*** release/Makefile.orig Sat Oct 2 04:28:50 1999
--- release/Makefile Sun Oct 3 14:35:17 1999
***************
*** 55,61 ****
ALLLANG= yes
DOCPORTS= textproc/docproj
# Set this to wherever the distfiles required by ${DOCPORTS} live.
! DISTFILES?= ${.CURDIR}/../../ports/distfiles
DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
INSTALL.TXT RELNOTES.TXT TROUBLE.TXT UPGRADE.TXT
--- 55,61 ----
ALLLANG= yes
DOCPORTS= textproc/docproj
# Set this to wherever the distfiles required by ${DOCPORTS} live.
! DISTFILEDIR?= ${.CURDIR}/../../ports/distfiles
DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
INSTALL.TXT RELNOTES.TXT TROUBLE.TXT UPGRADE.TXT
***************
*** 188,195 ****
.endif
.if !defined(NODOC)
cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
! if [ -d ${DISTFILES}/ ]; then \
! cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
fi
.endif
.endif
--- 188,195 ----
.endif
.if !defined(NODOC)
cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
! if [ -d ${DISTFILEDIR}/ ]; then \
! cp -rp ${DISTFILEDIR} ${CHROOTDIR}/usr/ports/distfiles; \
fi
.endif
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199910032001.PAA77213>