freebsd-ports/lang/gcc44/files/java-patch-hier

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)
Update to the 20050528 snapshot of GCC 4.1.0. Adjust the libjava-related part of the packaging list. 2005-05-30 00:29:08 +02:00			`Index: libjava/Makefile.in`
			`===================================================================`
Update lang/gcc42 to the 20061014 snapshot of GCC 4.2.0, which appends a version number to libdata/pkgconfig/libgcj.pc. Fix packaging on amd64 on the way (enabling Java actually was a noop, except for pkg-plist). Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2. These changes allow us to remove the CONFLICT between lang/gcc41 and lang/gcc42 when building with Java support (the default on i386). Approved by: portmgr (erwin) 2006-10-19 18:43:58 +02:00			`--- libjava/Makefile.in (revision 117734)`
Update to the 20060624 snapshot of GCC 4.2.0. mf-runtime.h no longer pollutes public filename space, so we can remove our workaround. Refresh files/java-patch-hier. 2006-06-26 19:03:03 +02:00			`+++ libjava/Makefile.in (working copy)`
Update lang/gcc42 to the 20061014 snapshot of GCC 4.2.0, which appends a version number to libdata/pkgconfig/libgcj.pc. Fix packaging on amd64 on the way (enabling Java actually was a noop, except for pkg-plist). Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2. These changes allow us to remove the CONFLICT between lang/gcc41 and lang/gcc42 when building with Java support (the default on i386). Approved by: portmgr (erwin) 2006-10-19 18:43:58 +02:00			`@@ -712,7 +712,7 @@`
			`$(am__append_2) $(am__append_3)`
Update to the 20050528 snapshot of GCC 4.1.0. Adjust the libjava-related part of the packaging list. 2005-05-30 00:29:08 +02:00			`toolexecmainlib_DATA = libgcj.spec`
Update to the 20060624 snapshot of GCC 4.2.0. mf-runtime.h no longer pollutes public filename space, so we can remove our workaround. Refresh files/java-patch-hier. 2006-06-26 19:03:03 +02:00			`dbexec_LTLIBRARIES = libjvm.la`
Update to the 20050528 snapshot of GCC 4.1.0. Adjust the libjava-related part of the packaging list. 2005-05-30 00:29:08 +02:00			`-pkgconfigdir = $(libdir)/pkgconfig`
			`+pkgconfigdir = $(prefix)/libdata/pkgconfig`
			`jardir = $(datadir)/java`
Update lang/gcc42 to the 20061014 snapshot of GCC 4.2.0, which appends a version number to libdata/pkgconfig/libgcj.pc. Fix packaging on amd64 on the way (enabling Java actually was a noop, except for pkg-plist). Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2. These changes allow us to remove the CONFLICT between lang/gcc41 and lang/gcc42 when building with Java support (the default on i386). Approved by: portmgr (erwin) 2006-10-19 18:43:58 +02:00			`jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar`
			`@JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)`