From cbb716d97ebca2ca45deaa23e19bd98e9ce1b93f Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sat, 12 Apr 2014 23:36:24 +0000
Subject: [PATCH] Update to the 20140406 snapshot of GCC 4.9.0.

Add pkg-message that references the need to use -Wl,-rpath=... . [1]

No longer install rebuild-gcj-db49 (which requires bash among others)
and its man page.

PR:		185902 [1]
---
 lang/gcc49/Makefile             | 6 +++++-
 lang/gcc49/distinfo             | 4 ++--
 lang/gcc49/files/pkg-message.in | 6 ++++++
 lang/gcc49/pkg-plist            | 2 --
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 lang/gcc49/files/pkg-message.in

diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 82a14256a642..2df794b64478 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc49
-PORTVERSION=	4.9.0.20140330
+PORTVERSION=	4.9.0.20140406
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -99,6 +99,8 @@ INFO=		gcc${SUFFIX}/cpp \
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 .endif
+SUB_FILES=	pkg-message
+SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
@@ -133,6 +135,8 @@ full-regression-test: build
 post-install:
 	${RM} -f ${STAGEDIR}${TARGLIB}/*.la
 	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
diff --git a/lang/gcc49/distinfo b/lang/gcc49/distinfo
index 66c9e9ce76f7..0c022826636a 100644
--- a/lang/gcc49/distinfo
+++ b/lang/gcc49/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.9-20140330.tar.bz2) = 34374d87b1a58bf5d11d7bc53b921088281c731bc141907049f2f57f453af104
-SIZE (gcc-4.9-20140330.tar.bz2) = 85486216
+SHA256 (gcc-4.9-20140406.tar.bz2) = 5f9e1c96b5bc000456b7fe7805dca90866cd18b6fbe00e26f3f3e8236d07d0a3
+SIZE (gcc-4.9-20140406.tar.bz2) = 85440592
diff --git a/lang/gcc49/files/pkg-message.in b/lang/gcc49/files/pkg-message.in
new file mode 100644
index 000000000000..388c8f848deb
--- /dev/null
+++ b/lang/gcc49/files/pkg-message.in
@@ -0,0 +1,6 @@
+To ensure binaries built with this toolchain find appropriate versions
+of the necessary run-time libraries, you may want to link using
+
+  -Wl,-rpath=%%TARGLIB%%
+
+For ports leveraging USE_GCC or USES=compiler this happens transparently.
diff --git a/lang/gcc49/pkg-plist b/lang/gcc49/pkg-plist
index a9d1aae6e309..9f29d3d8f134 100644
--- a/lang/gcc49/pkg-plist
+++ b/lang/gcc49/pkg-plist
@@ -52,7 +52,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
 %%JAVA%%bin/gtnameserv%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.9.pc
 %%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
@@ -75,7 +74,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
 %%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/rebuild-gcj-db%%SUFFIX%%.1.gz
 %%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi