Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Jul 2004 15:46:20 +0200 (CEST)
From:      Florent Thoumie <flz@xbsd.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        portmgr@FreeBSD.org
Subject:   ports/68988: Mk/bsd.port.mk - Add USE_MK_DEVEL option to use devel/portmk/Mk
Message-ID:  <20040713134620.AA65E1133@gw.xbsd.org>
Resent-Message-ID: <200407131350.i6DDoJSf092717@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         68988
>Category:       ports
>Synopsis:       Mk/bsd.port.mk - Add USE_MK_DEVEL option to use devel/portmk/Mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 13 13:50:19 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Florent Thoumie
>Release:        FreeBSD 4.9-RC i386
>Organization:
Xbsd.org
>Environment:

System: FreeBSD gw 4.9-RC FreeBSD 4.9-RC #4: Sun Oct 5 14:25:09 CEST 2003 rf@gw:/usr/src/sys/compile/GW i386

>Description:

devel/portmk has been introduced on 07/06/2004.
This is a development version of Mk/.

As things currently works, you need to make all install activate to use
this development version. Once this has been done, you have to use omake
to use the "stable" version.

This offers no possiblity for porters to use new features, and forces users
to type omake, instead of make if make failed.

This light patch introduces the option USE_MK_DEVEL. If this is set, make
will use ${PORTSDIR}/devel/portmk/Mk/ instead of ${PORTSDIR}/Mk/. With
this option, new features in devel/portmk can be used by porters if they
specify USE_MK_DEVEL=yes in their Makefiles.

As this is a new option, this shouldn't cause any problem.

>How-To-Repeat:

N/A

>Fix:

--- bsd.port.mk.old	Sun May 30 13:54:33 2004
+++ bsd.port.mk	Tue Jul 13 13:26:02 2004
@@ -790,6 +790,13 @@
 # Most port authors should not need to understand anything after this point.
 #
 
+# Use ${PORTSDIR}/devel/portmk/Mk if asked
+.if defined(USE_MK_DEVEL)
+
+.include "${PORTSDIR}/devel/portmk/Mk/bsd.port.mk"
+
+.else
+
 # Start of pre-makefile section.
 .if !defined(AFTERPORTMK)
 
@@ -4836,3 +4843,5 @@
 
 .endif
 # End of post-makefile section.
+
+.endif
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040713134620.AA65E1133>