Add some defines to CFLAGS to avoid clashing with the newer system

headers. While here, change PERL to RE_INPLACE and lock things down with
-Werror (in CFLAGS only, the C++ files generate some warnings, fixing
which is in the domain of the authors).

Submitted by:	Naoya Nishimura

graphics/libfpx/Makefile

@@ -31,12 +31,15 @@ MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 MAKE_ARGS+=	-j2
+#CFLAGS+=	-DHAVE_WCHAR_H=1 -DHAVE_DLFCN_H=1
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 
 post-patch:
 	# Replacing references to <malloc.h> with <stdlib.h>
 	# Ignore the /dev/stderr warning below. (What a hack!)
-	${PERL} -pi -e 's/<malloc.h>/<stdlib.h>/' \
-		`find ${WRKSRC} -type f | xargs ${GREP} -l '<malloc.h>'` /dev/stderr
+	${REINPLACE_CMD} -e 's,<malloc\.h>,<stdlib\.h>,' \
+		${WRKSRC}/oless/h/ref.hxx ${WRKSRC}/oless/h/vect.hxx
 
 INSTALLS_SHLIB=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd

graphics/libfpx/files/Makefile.bsd

@@ -7,6 +7,7 @@ LIBDIR	=	${LOCALBASE}/lib
 INCDIR	=	${LOCALBASE}/include
 
 NOPROFILE=	Don't want it
+CFLAGS+=	-DHAVE_WCHAR_H=1 -DHAVE_DLFCN_H=1 -Werror
 
 CPPS	!=	find ${.CURDIR} -name \*.cpp -print
 # Some of the .cxx files are #include-ed into others, so can't use `find' here: