From owner-freebsd-ports  Mon Oct  1 23:38:25 2001
Delivered-To: freebsd-ports@freebsd.org
Received: from mail.imp.ch (mail.imp.ch [157.161.1.2])
	by hub.freebsd.org (Postfix) with ESMTP
	id 94B0F37B40A; Mon,  1 Oct 2001 23:38:20 -0700 (PDT)
Received: from levais.imp.ch (levais.imp.ch [157.161.4.66])
	by mail.imp.ch (8.11.1/8.11.1) with ESMTP id f926cJa77292;
	Tue, 2 Oct 2001 08:38:19 +0200 (CEST)
	(envelope-from Martin.Blapp@imp.ch)
Date: Tue, 2 Oct 2001 08:38:52 +0200 (CEST)
From: Martin Blapp <mb@imp.ch>
To: <ports@freebsd.org>
Cc: <jedgar@freebsd.org>
Subject: [PATCH] CD_MOUNTPT defined in the wrong section
Message-ID: <20011002083334.F10086-100000@levais.imp.ch>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


In some ports I've checks like:

.if !exists(${CD_MOUNTPT}/linux/office52/setup)

These checks fail, cause CD_MOUNTPT is defined in the
post makefile section of bsd.port.mk. II move the definition
of CD_MOUNTPT to the PRE makefile section of bsd.port.mk
it works again.

See this patch that fixes
it: (http://home.teleport.ch/freebsd/ports.mk.diff)

--- bsd.port.mk Fri Sep 28 18:45:15 2001
+++ bsd.port.mk.new     Tue Oct  2 00:40:10 2001
@@ -723,6 +723,9 @@
 # defaults to 3.3.6; will be changed to 4.0 when it is ready
 XFREE86_VERSION?=      3

+# Define CD_MOUNTPT here, else some ports will fail
+CD_MOUNTPT?=   /cdrom
+
 .endif
 # End of pre-makefile section.

@@ -1158,7 +1163,6 @@

 # Search CDROM first if mounted, symlink instead of copy if
 # FETCH_SYMLINK_DISTFILES is set
-CD_MOUNTPT?=   /cdrom
 .if exists(${CD_MOUNTPT}/ports/distfiles)
 _MASTER_SITE_OVERRIDE:=
file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/
${_MASTER_SITE_OVERRIDE}
 .if defined(FETCH_SYMLINK_DISTFILES)

Thanks for committing it.
Martin

Martin Blapp, mb@imp.ch
------------------------------------------------------------------
Improware AG, UNIX solution and service provider
Zurlindenstrasse 29, 4133 Pratteln, Switzerland
Phone: +41 061 826 93 00: +41 61 826 93 01
PGP Fingerprint: 57E 7CCD 2769 E7AC C5FA  DF2C 19C6 DCD1 1B3A EC9C
------------------------------------------------------------------


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message