Make CONFIGURE_ARGS and MAKE_ARGS additive, for the sake of child

ports and to bring my lang/gcc* ports more in sync.

Employ the new USE_LDCONFIG feature, which allows us to get rid of the
various, much more manual and error-prone hacks we needed so far. [1]

Reviewed by:	flz (for lang/gcc40) [1]

lang/gcc33/Makefile

@@ -47,20 +47,16 @@ SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls \
+CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-MAKE_ARGS=	MAKEINFOFLAGS="--no-split"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 MAKE_ENV=	LD_LIBRARY_PATH=.:${WRKSRC}/gcc
 ALL_TARGET=	bootstrap-lean
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	${TARGLIB}
-SUB_LIST=	TARGLIB="${TARGLIB}"
-SUB_FILES=	gcc.sh
-RC_D_SH=	etc/rc.d/gcc${SUFFIX}.sh
+USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
@@ -96,8 +92,6 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	-@${MKDIR} ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKDIR}/gcc.sh ${PREFIX}/${RC_D_SH}
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \

lang/gcc33/files/gcc.sh.in

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	ldconfig -m %%TARGLIB%%
-	;;
-stop)
-	;;
-*)
-	echo "Usage: ${0##*/} { start | stop }" >&2
-	exit 64
-	;;
-esac
-exit 0

lang/gcc33/pkg-plist

@@ -10,6 +10,5 @@ bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-etc/rc.d/gcc%%SUFFIX%%.sh
 info/gcc%%SUFFIX%%/dir
 @comment Insert PLIST.lib here