Index: Mk/bsd.gecko.mk
===================================================================
RCS file: /a/.csup/ports/Mk/bsd.gecko.mk,v
retrieving revision 1.42
diff -u -p -r1.42 bsd.gecko.mk
--- Mk/bsd.gecko.mk	28 Sep 2011 03:14:22 -0000	1.42
+++ Mk/bsd.gecko.mk	9 Oct 2011 09:23:18 -0000
@@ -764,10 +774,14 @@ gecko-post-patch:
 		${WRKSRC}/configure
 .for subdir in config/system_wrappers nsprpub/config/system_wrappers js/src/config/system_wrappers_js
 	@${MKDIR} ${MOZSRC}/${subdir}
-	@${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/iconv.h
-	@${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/iconv.h
-	@${ECHO_CMD} "#include \"${LOCALBASE}/include/iconv.h\"" >> ${MOZSRC}/${subdir}/iconv.h
-	@${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/iconv.h
+.for h in iconv.h:\"${LOCALBASE}/include/iconv.h\" \
+	  event.h:<event2/compat/event.h> \
+	  evutil.h:<event2/compat/evutil.h>
+	@${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+	@${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+	@${ECHO_CMD} "#include ${h:C/.*://}" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+	@${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+.endfor
 .endfor
 .for subdir in "" nsprpub js/src
 	@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \