--==========36C2035E0297B122F72C==========
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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>: 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"
--==========36C2035E0297B122F72C==========
Content-Type: text/plain; charset=us-ascii;
 name="x11_xorg-imake_Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Description: "\"x11/xorg-imake/Makefile.diff\""
Content-Disposition: attachment; filename="x11_xorg-imake_Makefile.diff";
 size=661

--- 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

--==========36C2035E0297B122F72C==========
Content-Type: text/plain; charset=us-ascii;
 name="meta-pkgs_xorg_Makefile.cmmn.diff"
Content-Transfer-Encoding: 7bit
Content-Description: "meta-pkgs/xorg/Makefile.common.diff"
Content-Disposition: attachment;
 filename="meta-pkgs_xorg_Makefile.cmmn.diff"; size=1529

--- 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
 

--==========36C2035E0297B122F72C==========--