Use PLIST_SUB to only include curses.h when OSVERSION >= 400000. (It

is not built on 3-stable systems.)

Change the ELF-only stuff to use PLIST_SUB too.  (This part is purely
cosmetic -- no functional changes.)

4 files changed, 30 insertions, 18 deletions

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 59cced9ef9e8..ed89d55e4ee2 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -30,16 +30,24 @@ USE_BZIP2=	yes
 GCC_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
+.if ${OSVERSION} < 400000
+PLIST_SUB+=     CURSES:="@comment "
+.else
+PLIST_SUB+=     CURSES:=""
+.endif
+
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
-PLIST=		${WRKDIR}/PLIST
+PLIST_SUB+=	ELF:=""
+.else
+PLIST_SUB+=	ELF:="@comment "
 .endif
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-PLIST_SUB=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB+=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
@@ -63,9 +71,6 @@ pre-configure:
 	${SED} -e "s:__FreeBSD__[0-9=]*:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
 		>${WRKSRC}/gcc/config/freebsd.h )
 	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
-.if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
-	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST}
-.endif
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
 	@touch ${WRKSRC}/gcc/configure
diff --git a/lang/egcs/pkg-plist b/lang/egcs/pkg-plist
index b6843a02d12e..86d7c8841830 100644
--- a/lang/egcs/pkg-plist
+++ b/lang/egcs/pkg-plist
@@ -13,6 +13,7 @@ bin/protoize
 bin/unprotoize
 %%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
+%%CURSES:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/PlotFile.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/SFile.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algo.h
@@ -231,10 +232,10 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbeginS.o
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtend.o
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtendS.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbeginS.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtend.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtendS.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 59cced9ef9e8..ed89d55e4ee2 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -30,16 +30,24 @@ USE_BZIP2=	yes
 GCC_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
+.if ${OSVERSION} < 400000
+PLIST_SUB+=     CURSES:="@comment "
+.else
+PLIST_SUB+=     CURSES:=""
+.endif
+
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
-PLIST=		${WRKDIR}/PLIST
+PLIST_SUB+=	ELF:=""
+.else
+PLIST_SUB+=	ELF:="@comment "
 .endif
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-PLIST_SUB=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB+=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
@@ -63,9 +71,6 @@ pre-configure:
 	${SED} -e "s:__FreeBSD__[0-9=]*:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
 		>${WRKSRC}/gcc/config/freebsd.h )
 	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
-.if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
-	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST}
-.endif
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
 	@touch ${WRKSRC}/gcc/configure
diff --git a/lang/gcc295/pkg-plist b/lang/gcc295/pkg-plist
index b6843a02d12e..86d7c8841830 100644
--- a/lang/gcc295/pkg-plist
+++ b/lang/gcc295/pkg-plist
@@ -13,6 +13,7 @@ bin/protoize
 bin/unprotoize
 %%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
+%%CURSES:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/PlotFile.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/SFile.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algo.h
@@ -231,10 +232,10 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbeginS.o
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtend.o
-@comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtendS.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbeginS.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtend.o
+%%ELF:%%lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtendS.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h