Fix X11BASE!=/usr/X11R6 case.

Fix an apparently harmless typo in CXXFLAGS substitution.

8 files changed, 76 insertions, 24 deletions

diff --git a/sysutils/sge/Makefile b/sysutils/sge/Makefile
index 48bb491694e0..221cf05fed3e 100644
--- a/sysutils/sge/Makefile
+++ b/sysutils/sge/Makefile
@@ -148,8 +148,11 @@ post-patch:
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
-	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \
-	    -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \
+	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
+	    -e "s|%%CXX%%|${CXX}|g" \
+	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
+	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
+	    -e "s|%%X11BASE%%|${X11BASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \
diff --git a/sysutils/sge/files/patch-aimk b/sysutils/sge/files/patch-aimk
index 90b307c388a6..7936b6d9c408 100644
--- a/sysutils/sge/files/patch-aimk
+++ b/sysutils/sge/files/patch-aimk
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- aimk.orig
-+++ aimk
+--- aimk.orig	Tue Oct 25 17:48:15 2005
++++ aimk	Mon Dec  4 15:57:37 2006
 @@ -397,7 +397,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1171,8 +1171,8 @@
+@@ -1180,12 +1180,12 @@
     set MAKE = gmake
     set OFLAG = "-O"
     set ARFLAGS     = rcv
@@ -23,7 +23,17 @@ $FreeBSD$
     set DLLIB	= ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
-@@ -1191,7 +1191,7 @@
+-   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 NOERR_CFLAG = "-Wno-error"
+    set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
+    set LIBS     = "$LIBS -lkvm"
+@@ -1196,11 +1196,11 @@
+    set XMTDEF   = ""
+    set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
+    set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
+-   set XLIBD    = "-L/usr/X11R6/lib"
++   set XLIBD    = "-L%%X11BASE%%/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/Makefile b/sysutils/sge60/Makefile
index 48bb491694e0..221cf05fed3e 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -148,8 +148,11 @@ post-patch:
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
-	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \
-	    -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \
+	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
+	    -e "s|%%CXX%%|${CXX}|g" \
+	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
+	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
+	    -e "s|%%X11BASE%%|${X11BASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \
diff --git a/sysutils/sge60/files/patch-aimk b/sysutils/sge60/files/patch-aimk
index 90b307c388a6..7936b6d9c408 100644
--- a/sysutils/sge60/files/patch-aimk
+++ b/sysutils/sge60/files/patch-aimk
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- aimk.orig
-+++ aimk
+--- aimk.orig	Tue Oct 25 17:48:15 2005
++++ aimk	Mon Dec  4 15:57:37 2006
 @@ -397,7 +397,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1171,8 +1171,8 @@
+@@ -1180,12 +1180,12 @@
     set MAKE = gmake
     set OFLAG = "-O"
     set ARFLAGS     = rcv
@@ -23,7 +23,17 @@ $FreeBSD$
     set DLLIB	= ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
-@@ -1191,7 +1191,7 @@
+-   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 NOERR_CFLAG = "-Wno-error"
+    set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
+    set LIBS     = "$LIBS -lkvm"
+@@ -1196,11 +1196,11 @@
+    set XMTDEF   = ""
+    set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
+    set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
+-   set XLIBD    = "-L/usr/X11R6/lib"
++   set XLIBD    = "-L%%X11BASE%%/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/sge61/Makefile b/sysutils/sge61/Makefile
index 48bb491694e0..221cf05fed3e 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -148,8 +148,11 @@ post-patch:
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
-	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \
-	    -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \
+	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
+	    -e "s|%%CXX%%|${CXX}|g" \
+	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
+	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
+	    -e "s|%%X11BASE%%|${X11BASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \
diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk
index 90b307c388a6..7936b6d9c408 100644
--- a/sysutils/sge61/files/patch-aimk
+++ b/sysutils/sge61/files/patch-aimk
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- aimk.orig
-+++ aimk
+--- aimk.orig	Tue Oct 25 17:48:15 2005
++++ aimk	Mon Dec  4 15:57:37 2006
 @@ -397,7 +397,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1171,8 +1171,8 @@
+@@ -1180,12 +1180,12 @@
     set MAKE = gmake
     set OFLAG = "-O"
     set ARFLAGS     = rcv
@@ -23,7 +23,17 @@ $FreeBSD$
     set DLLIB	= ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
-@@ -1191,7 +1191,7 @@
+-   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 NOERR_CFLAG = "-Wno-error"
+    set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
+    set LIBS     = "$LIBS -lkvm"
+@@ -1196,11 +1196,11 @@
+    set XMTDEF   = ""
+    set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
+    set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
+-   set XLIBD    = "-L/usr/X11R6/lib"
++   set XLIBD    = "-L%%X11BASE%%/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/sge62/Makefile b/sysutils/sge62/Makefile
index 48bb491694e0..221cf05fed3e 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -148,8 +148,11 @@ post-patch:
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
-	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \
-	    -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \
+	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
+	    -e "s|%%CXX%%|${CXX}|g" \
+	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
+	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
+	    -e "s|%%X11BASE%%|${X11BASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index 90b307c388a6..7936b6d9c408 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- aimk.orig
-+++ aimk
+--- aimk.orig	Tue Oct 25 17:48:15 2005
++++ aimk	Mon Dec  4 15:57:37 2006
 @@ -397,7 +397,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1171,8 +1171,8 @@
+@@ -1180,12 +1180,12 @@
     set MAKE = gmake
     set OFLAG = "-O"
     set ARFLAGS     = rcv
@@ -23,7 +23,17 @@ $FreeBSD$
     set DLLIB	= ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
-@@ -1191,7 +1191,7 @@
+-   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 NOERR_CFLAG = "-Wno-error"
+    set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
+    set LIBS     = "$LIBS -lkvm"
+@@ -1196,11 +1196,11 @@
+    set XMTDEF   = ""
+    set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
+    set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
+-   set XLIBD    = "-L/usr/X11R6/lib"
++   set XLIBD    = "-L%%X11BASE%%/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"