--- Makefile.orig	Wed Aug  9 03:46:18 2006
+++ Makefile	Wed Aug 30 14:26:50 2006
@@ -33,14 +33,15 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	ALL
 
 MAN1=		zsnes.1
 PLIST_FILES=	bin/zsnes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
@@ -49,6 +50,9 @@
 PKGNAMESUFFIX=	-nox11
 .else
 CONFIGURE_ARGS+=--with-x
+CFLAGS+=	-I${X11BASE}/include
+CPPFLAGS+=	-I${X11BASE}/include
+LDFLAGS+=	-L${X11BASE}/lib
 .endif
 
 .if defined(WITH_OPENGL)
@@ -62,6 +66,8 @@
 	@${REINPLACE_CMD} -e \
 		's| -pipe||g ; \
 		 s| -I/usr/local/include||g ; \
+		 s|^VERSION=1.41|VERSION=${PORTVERSION}|; \
+		 s| -D__FreeBSD__||g; \
 		 s| -I/usr/include||g ; \
 		 s| -O3 .* -s||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \