sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix X11BASE!=/usr/X11R6 case.

Browse source 
Fix an apparently harmless typo in CXXFLAGS substitution.
This commit is contained in:
Brooks Davis 2006-12-04 16:39:10 +00:00
parent 55b20f3ee8
commit 1e333c4b7c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=178838
8 changed files with 76 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sysutils/sge/Makefile
View file

@ -148,8 +148,11 @@ post-patch:
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/util/arch_variables \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \ @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \ -e "s|%%CXX%%|${CXX}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" \
-e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-e "s|%%X11BASE%%|${X11BASE}|g" \
${WRKSRC}/aimk \ ${WRKSRC}/aimk \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \ @${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \

18
sysutils/sge/files/patch-aimk
View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- aimk.orig --- aimk.orig Tue Oct 25 17:48:15 2005
+++ aimk +++ aimk Mon Dec 4 15:57:37 2006
@@ -397,7 +397,7 @@ @@ -397,7 +397,7 @@
if ( $?SGE_INPUT_CFLAGS ) then if ( $?SGE_INPUT_CFLAGS ) then
set INP_CFLAGS = "$SGE_INPUT_CFLAGS" set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
@ -12,7 +12,7 @@ $FreeBSD$
endif endif
# Default build targets for which we have seperate make files # Default build targets for which we have seperate make files
@@ -1171,8 +1171,8 @@ @@ -1180,12 +1180,12 @@
set MAKE = gmake set MAKE = gmake
set OFLAG = "-O" set OFLAG = "-O"
set ARFLAGS = rcv set ARFLAGS = rcv
@ -23,7 +23,17 @@ $FreeBSD$
set DLLIB = "" set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" 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 XLFLAGS = "$XLIBD"
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f" set RM = "rm -f"

7
sysutils/sge60/Makefile
View file

@ -148,8 +148,11 @@ post-patch:
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/util/arch_variables \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \ @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \ -e "s|%%CXX%%|${CXX}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" \
-e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-e "s|%%X11BASE%%|${X11BASE}|g" \
${WRKSRC}/aimk \ ${WRKSRC}/aimk \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \ @${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \

18
sysutils/sge60/files/patch-aimk
View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- aimk.orig --- aimk.orig Tue Oct 25 17:48:15 2005
+++ aimk +++ aimk Mon Dec 4 15:57:37 2006
@@ -397,7 +397,7 @@ @@ -397,7 +397,7 @@
if ( $?SGE_INPUT_CFLAGS ) then if ( $?SGE_INPUT_CFLAGS ) then
set INP_CFLAGS = "$SGE_INPUT_CFLAGS" set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
@ -12,7 +12,7 @@ $FreeBSD$
endif endif
# Default build targets for which we have seperate make files # Default build targets for which we have seperate make files
@@ -1171,8 +1171,8 @@ @@ -1180,12 +1180,12 @@
set MAKE = gmake set MAKE = gmake
set OFLAG = "-O" set OFLAG = "-O"
set ARFLAGS = rcv set ARFLAGS = rcv
@ -23,7 +23,17 @@ $FreeBSD$
set DLLIB = "" set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" 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 XLFLAGS = "$XLIBD"
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f" set RM = "rm -f"

7
sysutils/sge61/Makefile
View file

@ -148,8 +148,11 @@ post-patch:
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/util/arch_variables \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \ @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \ -e "s|%%CXX%%|${CXX}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" \
-e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-e "s|%%X11BASE%%|${X11BASE}|g" \
${WRKSRC}/aimk \ ${WRKSRC}/aimk \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \ @${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \

18
sysutils/sge61/files/patch-aimk
View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- aimk.orig --- aimk.orig Tue Oct 25 17:48:15 2005
+++ aimk +++ aimk Mon Dec 4 15:57:37 2006
@@ -397,7 +397,7 @@ @@ -397,7 +397,7 @@
if ( $?SGE_INPUT_CFLAGS ) then if ( $?SGE_INPUT_CFLAGS ) then
set INP_CFLAGS = "$SGE_INPUT_CFLAGS" set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
@ -12,7 +12,7 @@ $FreeBSD$
endif endif
# Default build targets for which we have seperate make files # Default build targets for which we have seperate make files
@@ -1171,8 +1171,8 @@ @@ -1180,12 +1180,12 @@
set MAKE = gmake set MAKE = gmake
set OFLAG = "-O" set OFLAG = "-O"
set ARFLAGS = rcv set ARFLAGS = rcv
@ -23,7 +23,17 @@ $FreeBSD$
set DLLIB = "" set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" 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 XLFLAGS = "$XLIBD"
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f" set RM = "rm -f"

7
sysutils/sge62/Makefile
View file

@ -148,8 +148,11 @@ post-patch:
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/util/arch_variables \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \ @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \ -e "s|%%CXX%%|${CXX}|g" \
-e "s|%%CFLAGS%%|${CFLAGS}|g" \
-e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-e "s|%%X11BASE%%|${X11BASE}|g" \
${WRKSRC}/aimk \ ${WRKSRC}/aimk \
${WRKSRC}/dist/pvm/src/aimk ${WRKSRC}/dist/pvm/src/aimk
@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \ @${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \

18
sysutils/sge62/files/patch-aimk
View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- aimk.orig --- aimk.orig Tue Oct 25 17:48:15 2005
+++ aimk +++ aimk Mon Dec 4 15:57:37 2006
@@ -397,7 +397,7 @@ @@ -397,7 +397,7 @@
if ( $?SGE_INPUT_CFLAGS ) then if ( $?SGE_INPUT_CFLAGS ) then
set INP_CFLAGS = "$SGE_INPUT_CFLAGS" set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
@ -12,7 +12,7 @@ $FreeBSD$
endif endif
# Default build targets for which we have seperate make files # Default build targets for which we have seperate make files
@@ -1171,8 +1171,8 @@ @@ -1180,12 +1180,12 @@
set MAKE = gmake set MAKE = gmake
set OFLAG = "-O" set OFLAG = "-O"
set ARFLAGS = rcv set ARFLAGS = rcv
@ -23,7 +23,17 @@ $FreeBSD$
set DLLIB = "" set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" 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 XLFLAGS = "$XLIBD"
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f" set RM = "rm -f"