diff --git a/www/oops/Makefile b/www/oops/Makefile
index fd412322eb40..6638da27590d 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oops
 PORTVERSION=	${OOPSVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://oops-cache.org/
 DISTNAME=	${PORTNAME}-${OOPSVERSION}
@@ -20,7 +20,6 @@ BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 OOPSVERSION=	1.5.23
 
 USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc/oops \
@@ -28,7 +27,8 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--libdir=${PREFIX}/libexec/oops \
 		--enable-oops-user=oops \
 		--enable-large-files
-MAKE_ENV+=	CXX="${CXX}" \
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" \
+		CXXFLAGS="${CXXFLAGS} -fPIC" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
@@ -46,10 +46,6 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|CXX=g++||g' \
-		${WRKSRC}/configure.in
-
 pre-configure:
 	@cd ${WRKSRC} && ${AUTOHEADER}
 
diff --git a/www/oops/files/patch-configure.in b/www/oops/files/patch-configure.in
new file mode 100644
index 000000000000..8d77e9ee874c
--- /dev/null
+++ b/www/oops/files/patch-configure.in
@@ -0,0 +1,43 @@
+--- configure.in.orig	Thu Feb 12 13:38:59 2004
++++ configure.in	Thu Feb 12 13:44:17 2004
+@@ -315,7 +315,6 @@
+ 
+ 	  ;;
+ freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
+-	  CXX=g++
+ 	  CXXSOFLAGS="-shared -Xlinker -Bstatic"
+ 	  LIBS="$LEXLIB $LIBS"
+ 	  if test "$large_files" = "yes" ; then
+@@ -328,14 +327,14 @@
+           rel=`uname -r`
+           case "$rel" in
+             4*)
+-              CFLAGS="$CFLAGS -pthread"
++              CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
+               ;;
+             5*)
+-              LIBS="-lc_r $LEXLIB $LIBS"
++              LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
+               ;;
+             *)
+-              CFLAGS="$CFLAGS -pthread"
+-              LIBS="-lc_r $LEXLIB $LIBS"
++              CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++              LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
+               ;;
+           esac
+ 	  RPATH_OPTION="-rpath"
+@@ -430,10 +429,10 @@
+ esac
+ 
+ if test "X$MYSQL_PATH" != "X" ; then
+-    LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
++    LIBS="-L$MYSQL_PATH/lib/mysql -lmysqlclient $LIBS"
+     AC_DEFINE(HAVE_MYSQL)
+-    CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
+-    MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
++    CFLAGS="$CFLAGS -I$MYSQL_PATH/include/mysql"
++    MYSQL_LIB="-L$MYSQL_PATH/lib/mysql -lmysqlclient"
+ fi
+ 
+ if test "X$PGSQL_PATH" != "X" ; then