[Midnightbsd-cvs] CVS Commit: mports/Mk: Fix the MAKE_FLAGS bug properly this time.

[ctriv at midnightbsd.org]

Log Message:
-----------
Fix the MAKE_FLAGS bug properly this time.  At port.post.mk include time
any instance of -f is removed from MAKE_FLAGS and -f is appended to the end.
Care is taken to not break things like '-fno-strict-aliasing'.

Modified Files:
--------------
    mports/Mk:
        bsd.gnustep.mk (r1.13 -> r1.14)
        bsd.mport.mk (r1.52 -> r1.53)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.52
retrieving revision 1.53
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.52 -r1.53
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -1864,6 +1864,10 @@
 .include "${PORTSDIR}/Mk/bsd.perl.mk"
 .endif
 
+.if defined(USE_GNUSTEP)
+.include "${PORTSDIR}/Mk/bsd.gnustep.mk"
+.endif
+
 .if defined(USE_JAVA)
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 .endif
Index: bsd.gnustep.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.gnustep.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -LMk/bsd.gnustep.mk -LMk/bsd.gnustep.mk -u -r1.13 -r1.14
--- Mk/bsd.gnustep.mk
+++ Mk/bsd.gnustep.mk
@@ -517,11 +517,20 @@
 
 .endif
 
+ 
 # ---------------------------------------------------------------------------
 # We don't do anything for ldconfig.  We try to set up the environment 
 # properly (sourcing the gnustep shell includes).  This should do any of the hijinks
 # that used to be done via USE_LDCONFIG for us.
 #
+ 
+.ifdef _POSTMKINCLUDED
 
+# Make sure that MAKE_FLAGS ends with -f.  This is done in port.post.mk,
+# so that any changes made by the port's makefile are included.
+MAKE_FLAGS!=	${ECHO_CMD} '${MAKE_FLAGS}' | ${SED} -e 's/\s+-f\s+//'
+MAKE_FLAGS+=	-f
+
+.endif
 
 # eof