xorg patches to honor ${MAKE_ENV} and ${MAKE_FLAGS}

[Yarema <yds%CoolRat.org@localhost>]

xorg-imake/Makefile and meta-pkgs/xorg/Makefile.common patches attached to 
honor ${MAKE_ENV} and ${MAKE_FLAGS} in the do-configure, do-build, and 
do-install targets.  This enables custom ${CFLAGS} settings to be picked up.

--
Yarema
http://yds.CoolRat.org

P.S. Resending this message because the first time around I found this in 
my logs:

addr=<pkgsrc-users%netbsd.org@localhost>: 550 Error: Sorry, we do not accept .com 
file types.

so this time I renamed the second patch file.  Perhaps there's a way to 
adjust the mail filters to differentiate between "*.com" files and 
"*.common.diff"
--- x11/xorg-imake/Makefile.orig        Mon Jun 12 05:27:28 2006
+++ x11/xorg-imake/Makefile     Mon Jun 12 05:27:28 2006
@@ -67,8 +67,8 @@
                -e "s|@LOCALBASE@|${LOCALBASE}|g "      \
                -e "s|@MAKE@|${MAKE_PROGRAM}|"  ${FILESDIR}/host.def > \
                ${WRKSRC}/config/cf/host.def
-       cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile.boot &&        \
-       ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 
${BUILD_MAKE_FLAGS}
Makefile.boot &&        \
+       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f xmakefile
VerifyOS version.def Makefiles includes
 
 pre-install:
        @${CP} ${WRKSRC}/xmakefile ${WRKSRC}/xmakefile.bak

--- meta-pkgs/xorg/Makefile.common.orig Fri May  5 23:14:12 2006
+++ meta-pkgs/xorg/Makefile.common      Fri May  5 23:14:12 2006
@@ -293,13 +293,16 @@
                        -I${WRKSRC}/config/cf; \
        done
        @for dir in ${_XINCLUDE_DIRS}; do \
-               cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} Makefiles; \
+               cd ${WRKSRC}/$${dir} && \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} 
Makefiles; \
        done
        @for dir in ${_XINCLUDE_DIRS}; do \
-               cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} includes; \
+               cd ${WRKSRC}/$${dir} && \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} 
includes; \
        done
        @for dir in include ${XBUILD_DIRS}; do \
-               cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} depend; \
+               cd ${WRKSRC}/$${dir} && \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} 
depend; \
        done
 .  endif
 
@@ -322,17 +325,20 @@
 .  if !target(do-build)
 do-build:
        @for dir in ${XBUILD_DIRS}; do \
-               cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} all; \
+               cd ${WRKSRC}/$${dir} && \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} all; \
        done
 .  endif
 
 .  if !target(do-install)
 do-install:
        @for dir in ${XINSTALL_DIRS}; do \
-               cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} install; \
+               cd ${WRKSRC}/$${dir} && \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} 
install; \
        done
        @for dir in ${XINSTALL_MAN_DIRS}; do \
-               cd ${WRKSRC}/$${dir} && ${MAKE_PROGRAM} install.man; \
+               cd ${WRKSRC}/$${dir} && \
+               ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} 
install.man;
\
        done
 .  endif