diff options
Diffstat (limited to 'sysutils/sge60')
| -rw-r--r-- | sysutils/sge60/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/sge60/files/aimk.private | 2 | ||||
| -rw-r--r-- | sysutils/sge60/files/patch-aimk | 6 | ||||
| -rw-r--r-- | sysutils/sge60/files/patch-dist_util_arch__variables | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile index 38194ec17d1f..20c72f2f609e 100644 --- a/sysutils/sge60/Makefile +++ b/sysutils/sge60/Makefile @@ -129,7 +129,7 @@ QMON= noqmon post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/pvm/src/aimk @@ -137,7 +137,7 @@ post-patch: -e "s|%%CXX%%|${CXX}|g" \ -e "s|%%CFLAGS%%|${CFLAGS}|g" \ -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/aimk \ ${WRKSRC}/dist/pvm/src/aimk @test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \ @@ -156,7 +156,7 @@ post-patch: ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|" @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \ diff --git a/sysutils/sge60/files/aimk.private b/sysutils/sge60/files/aimk.private index 7257c0d00c4c..f883b4c4dbbc 100644 --- a/sysutils/sge60/files/aimk.private +++ b/sysutils/sge60/files/aimk.private @@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%% set BERKELEYDB_HOME = %%LOCALBASE%% set BDB_INCLUDE_SUBDIR = db42 set BDB_LIB_SUFFIX = -4.2 -set X11BASE = %%X11BASE%% +set LOCALBASE = %%LOCALBASE%% diff --git a/sysutils/sge60/files/patch-aimk b/sysutils/sge60/files/patch-aimk index 5fad14fbc275..83a4c1990e21 100644 --- a/sysutils/sge60/files/patch-aimk +++ b/sysutils/sge60/files/patch-aimk @@ -24,7 +24,7 @@ $FreeBSD$ 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${X11BASE}/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include" set NOERR_CFLAG = "-Wno-error" set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" set LIBS = "$LIBS -lkvm" @@ -33,10 +33,10 @@ $FreeBSD$ set XMTDEF = "" - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" -+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/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${X11BASE}/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" diff --git a/sysutils/sge60/files/patch-dist_util_arch__variables b/sysutils/sge60/files/patch-dist_util_arch__variables index 7a75f9d6d92d..f990992e69ea 100644 --- a/sysutils/sge60/files/patch-dist_util_arch__variables +++ b/sysutils/sge60/files/patch-dist_util_arch__variables @@ -11,7 +11,7 @@ $FreeBSD$ + RC_PREFIX=%%LOCALBASE%%/etc/rc.d RC_SUFFIX=.sh - XTERM=/usr/X11R6/bin/xterm -+ XTERM=%%X11BASE%%/bin/xterm ++ XTERM=%%LOCALBASE%%/bin/xterm MAILER=/usr/bin/mail QLOGIN_COMMAND=telnet QLOGIN_DAEMON=/usr/libexec/telnetd |