Update to 4.8.3

* Convert gcc48 to simple meta-pkg
* Potentially fix non-NetBSD packaging
* Fix gcc48-libs/gcc48-cc++ build under OpenBSD/amd64 5.5
* Enable graphite option, from wip/gcc48snapshot via Xiyue Deng
* Tweak nls option

Changelog:
GCC 4.8.3

   This is the [35]list of problem reports (PRs) from GCC's bug tracking
   system that are known to be fixed in the 4.8.3 release. This list might
   not be complete (that is, it is possible that some PRs that have been
   fixed are not listed here).

   Support for the new powerpc64le-linux platform has been added. It
   defaults to generating code that conforms to the ELFV2

3 files changed, 19 insertions, 9 deletions

diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index 1c9d3d52e42..0d21992f3bc 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2014/05/20 19:12:36 adam Exp $
+# $NetBSD: Makefile,v 1.15 2014/05/31 13:06:25 ryoon Exp $
 
 PKGNAME=	${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
-PKGREVISION=	5
 
 COMMENT=	Runtime libraries from the GNU Compiler Collection (GCC) 4.8
 
@@ -24,14 +23,22 @@ INSTALLATION_DIRS+=	java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/
 .endif
 
 do-install:
+.if ${OPSYS} != "NetBSD"
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libquadmath/libquadmath.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+.endif
+
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libatomic/libatomic.la \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
+.if ${OPSYS} == "NetBSD"
 # libgcc_s has no libtool la file.
 	${INSTALL_LIB} \
 		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgcc/libgcc_s.* \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+.endif
 
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgfortran/libgfortran.la \
diff --git a/lang/gcc48-libs/PLIST b/lang/gcc48-libs/PLIST
index eb3d0563446..9103627f963 100644
--- a/lang/gcc48-libs/PLIST
+++ b/lang/gcc48-libs/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2014/05/20 19:12:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/05/31 13:06:25 ryoon Exp $
 ${PLIST.java}gcc48/lib/gcj-${PKGVERSION}-14/libjvm.la
 gcc48/lib/libatomic.la
-gcc48/lib/libgcc_s.so
-gcc48/lib/libgcc_s.so.1
+${PLIST.libgcc_s}gcc48/lib/libgcc_s.so
+${PLIST.libgcc_s}gcc48/lib/libgcc_s.so.1
 ${PLIST.java}gcc48/lib/libgcj-tools.la
 ${PLIST.java}gcc48/lib/libgcj.la
 gcc48/lib/libgfortran.la
@@ -11,10 +11,11 @@ gcc48/lib/libgomp.la
 gcc48/lib/libitm.la
 ${PLIST.darwin}gcc48/lib/libobjc-gnu.la
 ${PLIST.unix}gcc48/lib/libobjc.la
+${PLIST.nonetbsd}gcc48/lib/libquadmath.la
 gcc48/lib/libssp.la
 gcc48/lib/libstdc++.la
-${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/liblto_plugin.la
-${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto-wrapper
-${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto1
+${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/liblto_plugin.la
+${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/lto-wrapper
+${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/lto1
 ${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/client/libjvm.so
 ${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/server/libjvm.so
diff --git a/lang/gcc48-libs/buildlink3.mk b/lang/gcc48-libs/buildlink3.mk
index a4c9ab82cad..768a45a829e 100644
--- a/lang/gcc48-libs/buildlink3.mk
+++ b/lang/gcc48-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2014/04/22 20:46:41 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2014/05/31 13:06:25 ryoon Exp $
 
 BUILDLINK_TREE+=	gcc48-libs
 
@@ -14,6 +14,7 @@ BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.gcc48-libs}/gcc48
 BUILDLINK_FILES.gcc48-libs=	#empty
 BUILDLINK_AUTO_VARS.gcc48-libs=	no
 
+.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 # Use custom specs file to ensure we link against pkgsrc libraries.
 SPECS_LIBGCC=		${WRAPPER_DIR}/specs.libgcc
 WRAPPER_TARGETS+=	${SPECS_LIBGCC}
@@ -30,6 +31,7 @@ ${SPECS_LIBGCC}:
 _WRAP_EXTRA_ARGS.CC+=	-specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.CXX+=	-specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.FC+=	-specs=${SPECS_LIBGCC}
+.endif
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"