diff options
Diffstat (limited to 'x11-toolkits/jx/files/post-patch-aa')
| -rw-r--r-- | x11-toolkits/jx/files/post-patch-aa | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/x11-toolkits/jx/files/post-patch-aa b/x11-toolkits/jx/files/post-patch-aa index c7932e4d2877..4a25da9d6060 100644 --- a/x11-toolkits/jx/files/post-patch-aa +++ b/x11-toolkits/jx/files/post-patch-aa @@ -1,20 +1,35 @@ ---- include/make/sys/FreeBSD-3.x_g++.orig Tue Aug 31 20:36:33 1999 -+++ include/make/sys/FreeBSD-3.x_g++ Tue May 30 21:08:07 2000 @@ -6,11 +6,11 @@ # This tells us where to find the X libraries. -J_X11_LIB_DIR := -L/usr/X11R6/lib -+J_X11_LIB_DIR := -LX11PREFIX/lib ++J_X11_LIB_DIR := -L@x_libraries@ # Uncomment this and change it if your X11 headers are not in /usr/include/X11. -J_X11_INCLUDE_DIR := -I/usr/X11R6/include -+J_X11_INCLUDE_DIR := -IX11PREFIX/include ++J_X11_INCLUDE_DIR := -I@x_includes@ # Uncomment this if you want to compile libXpm into libjx -@@ -88,15 +88,15 @@ +@@ -66,7 +66,7 @@ + # Adjust these until everything compiles + + J_RAW_SYSTEM_STUFF := \ +- -DSIZEOF_LONG=4 -DSIZEOF_INT=4 ++ @DEFS@ + + # + # Nothing below this line should ever need to be changed. +@@ -79,7 +79,6 @@ + J_COMPILER_DEPEND_FLAGS_FOR_BISON := \ + -Wall -Wno-unused \ + -fno-implicit-templates -fno-rtti \ +- -O${J_OPTIMIZE_LEVEL} \ + -D_J_UNIX ${J_ISTRSTREAM_BROKEN} ${J_ARRAY_NEW_OVERRIDABLE} \ + ${J_RAW_SYSTEM_STUFF} + +@@ -88,15 +87,15 @@ # makemake variables @@ -30,8 +45,8 @@ CPPFLAGS = ${DEPENDFLAGS} -CFLAGS = ${J_MAKE_NEEDS_OUTPUT_ARG} -CXXFLAGS = ${J_MAKE_NEEDS_OUTPUT_ARG} -+CFLAGS = ${J_MAKE_NEEDS_OUTPUT_ARG} ${PORTCFLAGS} -+CXXFLAGS = ${J_MAKE_NEEDS_OUTPUT_ARG} ${PORTCXXFLAGS} ++CFLAGS := ${CFLAGS} ++CXXFLAGS := ${CXXFLAGS} # libraries to link |