Pass CFLAGS to configure scripts using CONFIGURE_ENV.

3 files changed, 2 insertions, 20 deletions

diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index 0b34881ebfd3..fdb3284aafd0 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -28,6 +28,7 @@ LIBTOOLFILES=	${SABLEVMDIR}/configure ${NATIVEDIR}/configure
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
+CONFIGURE_ENV=	CFLAGS="-D_P1003_1B_VISIBLE -pthread -I${PREFIX}/include -L${PREFIX}/lib"
 # Uncomment to force gnome dependency
 #USE_GNOMELIBS=	yes
 
diff --git a/java/sablevm/files/patch-aa b/java/sablevm/files/patch-aa
index 423a8e8624dd..2c3727e621aa 100644
--- a/java/sablevm/files/patch-aa
+++ b/java/sablevm/files/patch-aa
@@ -1,16 +1,6 @@
 diff -ur work.orig/sablevm-1.0.3/configure work/sablevm-1.0.3/configure
 --- work.orig/sablevm-1.0.3/configure	Wed Aug 14 22:34:00 2002
 +++ work/sablevm-1.0.3/configure	Sat Aug 17 21:14:52 2002
-@@ -7747,6 +7747,9 @@
- 
- 
- 
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+CFLAGS="${CFLAGS} -D_P1003_1B_VISIBLE -pthread -I${prefix}/include -L${prefix}/lib"
-+
- echo "$as_me:$LINENO: checking for ffi_prep_cif in -lffi" >&5
- echo $ECHO_N "checking for ffi_prep_cif in -lffi... $ECHO_C" >&6
- if test "${ac_cv_lib_ffi_ffi_prep_cif+set}" = set; then
 @@ -7989,67 +7992,6 @@
    echo -n
  else
diff --git a/java/sablevm/files/patch-ab b/java/sablevm/files/patch-ab
index 4ac47eacd28c..061c3e18ea16 100644
--- a/java/sablevm/files/patch-ab
+++ b/java/sablevm/files/patch-ab
@@ -1,16 +1,7 @@
 diff -ur work.orig/sablevm-1.0.3/configure.ac work/sablevm-1.0.3/configure.ac
 --- work.orig/sablevm-1.0.3/configure.ac	Wed Aug 14 22:29:54 2002
 +++ work/sablevm-1.0.3/configure.ac	Sat Aug 17 21:14:51 2002
-@@ -114,12 +114,15 @@
- AC_LIBTOOL_DLOPEN
- AM_PROG_LIBTOOL
- 
-+dnl Required FreeBSD compile flags
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+CFLAGS="${CFLAGS} -D_P1003_1B_VISIBLE -pthread -I${prefix}/include -L${prefix}/lib"
-+
- dnl Checks for libraries.
- AC_CHECK_LIB(ffi,ffi_prep_cif,echo -n,echo ***ERROR: libffi is missing; exit 1)
+@@ -119,7 +119,6 @@
  AC_CHECK_LIB(ltdl,lt_dlinit,echo -n,echo ***ERROR: libltdl is missing; exit 1)
  AC_CHECK_LIB(m,fmod,echo -n,echo ***ERROR: libm is missing; exit 1)
  AC_CHECK_LIB(popt,poptGetContext,echo -n,echo ***ERROR: libpopt is missing; exit 1)