From 1fa39fd2c3d6f5edbc6d4a9d6f9ceae142a0f184 Mon Sep 17 00:00:00 2001 From: bapt Date: Mon, 5 May 2014 09:45:36 +0000 Subject: Convert all :U to :tu and :L to :tl Since FreeBSD 8.4 and FreeBSD 9.1 make(1) do support :tu and :tl as a replacement for :U and :L (which has been marked as deprecated) bmake which is the default on FreeBSD 10+ only support by default :tu/:tl a hack has been added at the time to support :U and :L to ease migration. This hack is now not necessary anymore Note that this makes the ports tree incompatible with make(1) from FreeBSD 8.3 or earlier With hat: portmgr --- news/inn/Makefile.layout | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'news/inn') diff --git a/news/inn/Makefile.layout b/news/inn/Makefile.layout index b0961dd46d48..c9e09176590a 100644 --- a/news/inn/Makefile.layout +++ b/news/inn/Makefile.layout @@ -1,11 +1,8 @@ # $FreeBSD$ -# tell bmake we use the old :L :U modifiers -.MAKE.FreeBSD_UL= yes - INN_LAYOUT?= old -.if !empty(INN_LAYOUT:L:Mnew) +.if !empty(INN_LAYOUT:tl:Mnew) #----------------------------------------------------------------------- # New-style layout. Keep database, spool, and other transient data under # /var, where it should be. @@ -18,7 +15,7 @@ INN_LOGDIR= ${VARBASE}/log/news INN_DBDIR= ${VARBASE}/news/db INN_TMPDIR= ${VARBASE}/news/tmp INN_NEWSSPOOL= ${VARBASE}/news -.elif !empty(INN_LAYOUT:L:Mhier) +.elif !empty(INN_LAYOUT:tl:Mhier) #----------------------------------------------------------------------- # hier(7)-ish layout. As above, but try to use standard directories # under /var. -- cgit