Fix location of pkgconfig-data

Approved by: gerald

24 files changed, 144 insertions, 24 deletions

diff --git a/lang/gcc-ooo/files/patch-libjava::Makefile.in b/lang/gcc-ooo/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc-ooo/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc/files/patch-libjava::Makefile.in b/lang/gcc/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc34/files/patch-libjava::Makefile.in b/lang/gcc34/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc34/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc40/files/patch-libjava::Makefile.in b/lang/gcc40/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc40/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc41/files/patch-libjava::Makefile.in b/lang/gcc41/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc41/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc42/files/patch-libjava::Makefile.in b/lang/gcc42/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc42/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc43/files/patch-libjava::Makefile.in b/lang/gcc43/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc43/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc44/files/patch-libjava::Makefile.in b/lang/gcc44/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc44/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc45/files/patch-libjava::Makefile.in b/lang/gcc45/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc45/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc46/files/patch-libjava::Makefile.in b/lang/gcc46/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc46/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc47/files/patch-libjava::Makefile.in b/lang/gcc47/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc47/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc48/files/patch-libjava::Makefile.in b/lang/gcc48/files/patch-libjava::Makefile.in
new file mode 100644
index 000000000000..561b2632eb42
--- /dev/null
+++ b/lang/gcc48/files/patch-libjava::Makefile.in
@@ -0,0 +1,11 @@
+--- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
++++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
+@@ -180,7 +180,7 @@
+ 
+ toolexecmainlib_DATA = libgcj.spec
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ 
+ jardir = $(datadir)/java
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 1562c57cae29..1075b994c0e2 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -29,8 +29,7 @@ bin/grepjar34
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security