[Midnightbsd-cvs] mports [22244] trunk/Mk: since we are still on fmake for 0.8, define the historical USE_FOO style for testing in pathfix.mk

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jan 28 13:18:11 EST 2017


Revision: 22244
          http://svnweb.midnightbsd.org/mports/?rev=22244
Author:   laffer1
Date:     2017-01-28 13:18:10 -0500 (Sat, 28 Jan 2017)
Log Message:
-----------
since we are still on fmake for 0.8, define the historical USE_FOO style for testing in pathfix.mk

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

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2017-01-27 17:33:58 UTC (rev 22243)
+++ trunk/Mk/bsd.mport.mk	2017-01-28 18:18:10 UTC (rev 22244)
@@ -393,6 +393,9 @@
 .endif
 .endfor
 .for f in ${USES}
+.if !defined(USE_${f:tu})
+USE_${f:tu}=yes
+.endif
 .include "${MPORTEXTENSIONS}/${f:C/\:.*//}.mk"
 .endfor
 

Modified: trunk/Mk/extensions/pathfix.mk
===================================================================
--- trunk/Mk/extensions/pathfix.mk	2017-01-27 17:33:58 UTC (rev 22243)
+++ trunk/Mk/extensions/pathfix.mk	2017-01-28 18:18:10 UTC (rev 22244)
@@ -11,7 +11,7 @@
 .endif
 
 PATHFIX_CMAKELISTSTXT?=	CMakeLists.txt
-.if ${USES:Mautoreconf*}
+.if defined(USE_AUTORECONF)
 PATHFIX_MAKEFILEIN?=	Makefile.am Makefile.in
 .else
 PATHFIX_MAKEFILEIN?=	Makefile.in
@@ -21,7 +21,7 @@
 pre-patch: pathfix-pre-patch
 
 pathfix-pre-patch:
-.if ${USES:Mcmake*}
+.if defined(USE_CMAKE)
 .for file in ${PATHFIX_CMAKELISTSTXT}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \



More information about the Midnightbsd-cvs mailing list