[Midnightbsd-cvs] mports [18089] trunk/Mk/bsd.mport.mk: drop soft makeflags.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 8 18:27:14 EDT 2015


Revision: 18089
          http://svnweb.midnightbsd.org/mports/?rev=18089
Author:   laffer1
Date:     2015-03-08 18:27:13 -0400 (Sun, 08 Mar 2015)
Log Message:
-----------
drop soft makeflags. refactor os version check

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-03-08 21:33:28 UTC (rev 18088)
+++ trunk/Mk/bsd.mport.mk	2015-03-08 22:27:13 UTC (rev 18089)
@@ -140,10 +140,10 @@
 OPSYS!=	${UNAME} -s
 .endif
 
+UNAMER!=${UNAME} -r
+
 # Get the operating system revision
-.if !defined(OSREL)
-OSREL!=	${UNAME} -r | ${SED} -e 's/[-(].*//'
-.endif
+OSREL?=	${UNAMER:C/-.*//}
 
 # Get __MidnightBSD_version
 .if !defined(OSVERSION)
@@ -290,10 +290,10 @@
 _SUF2=	,${PORTEPOCH}
 .endif
 
-PKGVERSION?=	${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
-PKGBASE?=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PKGVERSION=	${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
+PKGBASE=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PKGSUBNAME=	${PKGBASE}
-PKGNAME?=	${PKGBASE}-${PKGVERSION}
+PKGNAME=	${PKGBASE}-${PKGVERSION}
 DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
 
@@ -339,7 +339,7 @@
 _LOAD_${EXT:tu}_EXT=	yes
 .endfor
 
-# This is the order that we used before the extensions where refactored. 
+# This is the order that we used before the extensions were refactored. 
 # in the future if things could be fixed to work when loaded alphabetacally, then
 # we could go back to the above approach.
 _ALL_EXT=	charsetfix desthack pathfix pkgconfig compiler kmod uidfix \
@@ -2666,7 +2666,7 @@
 	@if [ -e ${.TARGET} ]; then \
 		${DO_NADA}; \
 	else \
-		cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${.TARGET}; \
+		cd ${.CURDIR} && ${MAKE} ${.TARGET}; \
 	fi
 .endif
 



More information about the Midnightbsd-cvs mailing list