aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2011-12-11 23:56:19 +0000
committerMark Linimon <linimon@FreeBSD.org>2011-12-11 23:56:19 +0000
commita2d38620e1ee1c142f858913939cc525327152a9 (patch)
tree5db3eac8d05220904dc5aeebcc3b24d0d5b4c653
parentfdcd7156e3fdc8867f539abaf02e113aa1cd6121 (diff)
downloadports-a2d38620e1ee1c142f858913939cc525327152a9.tar.gz
ports-a2d38620e1ee1c142f858913939cc525327152a9.zip
Re-add lang/gcc42.
Hat: portmgr Feature safe: yes
Notes
Notes: svn path=/head/; revision=287214
-rw-r--r--MOVED1
-rw-r--r--lang/Makefile1
-rw-r--r--lang/gcc42/files/java-patch-hier13
3 files changed, 14 insertions, 1 deletions
diff --git a/MOVED b/MOVED
index cd3bf4da2bd5..79e9f22fd325 100644
--- a/MOVED
+++ b/MOVED
@@ -3016,7 +3016,6 @@ x11/ruby-gnome2-all||2011-12-05|Removed
devel/zeroinstall-injector||2011-12-06|Duplicates PBI functionality, and 0install feeds are available as ports
audio/py-taglib||2011-12-07|Only compatible with Python 2.4. Use audio/py-tagpy instead
x11-wm/wmthemeinstall||2011-12-10|Abandonware: no more upstream, no more public distfiles
-lang/gcc42|lang/gcc46|2011-12-11|Superseded by gcc46
databases/py-pysqlite20||2011-12-11|Unmaintained upstream, only useful for python2.4 or less, no consumers in the ports tree
databases/py-pysqlite21||2011-12-11|Unmaintained upstream, only useful for python2.4 or less, no consumers in the ports tree
databases/py-pysqlite22||2011-12-11|Unmaintained upstream, only useful for python2.4 or less, no consumers in the ports tree
diff --git a/lang/Makefile b/lang/Makefile
index 13dafcdc763b..4dc14a89e23b 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -88,6 +88,7 @@
SUBDIR += gawk
SUBDIR += gcc
SUBDIR += gcc34
+ SUBDIR += gcc42
SUBDIR += gcc44
SUBDIR += gcc46
SUBDIR += gcc47
diff --git a/lang/gcc42/files/java-patch-hier b/lang/gcc42/files/java-patch-hier
new file mode 100644
index 000000000000..edb122b087b8
--- /dev/null
+++ b/lang/gcc42/files/java-patch-hier
@@ -0,0 +1,13 @@
+Index: libjava/Makefile.in
+===================================================================
+--- libjava/Makefile.in (revision 117734)
++++ libjava/Makefile.in (working copy)
+@@ -712,7 +712,7 @@
+ $(am__append_2) $(am__append_3)
+ toolexecmainlib_DATA = libgcj.spec
+ dbexec_LTLIBRARIES = libjvm.la
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ jardir = $(datadir)/java
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
+ @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)