Index: head/sysutils/sge62/files/patch-aimk =================================================================== --- head/sysutils/sge62/files/patch-aimk (revision 225131) +++ head/sysutils/sge62/files/patch-aimk (revision 225132) @@ -1,61 +1,61 @@ $FreeBSD$ --- aimk.orig +++ aimk -@@ -226,7 +226,7 @@ +@@ -228,7 +228,7 @@ if ( $?SGE_INPUT_CFLAGS ) then set INP_CFLAGS = "$SGE_INPUT_CFLAGS" else - set INP_CFLAGS = "" + set INP_CFLAGS = "%%CFLAGS%%" endif # Default build targets for which we have seperate make files -@@ -1077,24 +1077,24 @@ +@@ -1085,24 +1085,24 @@ set OFLAG = "-O" endif set ARFLAGS = rcv - set CC = gcc - set CXX = g++ + set CC = %%CC%% + set CXX = %%CXX%% set DLLIB = "" set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" -+ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include -DNeedFunctionPrototypes -DNeedVarargsPrototypes" set NOERR_CFLAG = "-Wno-error" set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" - set LIBS = "$LIBS -lkvm" + set LIBS = "$LIBS -lkvm -lutil" set SHAREDLD = $CC set SHARED_CFLAGS = "-fPIC" set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic" set AUTHLIBS = "-lcrypt -lpam" set XMTDEF = "" - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" + set XINCD = "$XMTINCD $XINCD -I${LOCALBASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L/usr/X11R6/lib" + set XLIBD = "-L${LOCALBASE}/lib" set XLFLAGS = "$XLIBD" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set RM = "rm -f" -@@ -1774,6 +1774,7 @@ +@@ -1795,6 +1795,7 @@ if ("$JAVA_ARCH" != "") then set CORE_INCLUDE = "$CORE_INCLUDE -I${JAVA_HOME}/${JAVA_INCL}/${JAVA_ARCH}" switch ($buildarch) + case fbsd-i386: case lx24-x86: case ulx24-x86: case lx26-x86: -@@ -1791,6 +1792,7 @@ +@@ -1812,6 +1813,7 @@ case usol-sparc: set JAVA_LIB_ARCH = sparc breaksw + case fbsd-amd64: case lx24-amd64: case ulx24-amd64: case lx26-amd64: Property changes on: head/sysutils/sge62/files/patch-aimk ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property