multilib fixes for filefuncs.

Package-Manager: portage-2.0.51-r12

5 files changed, 29 insertions, 21 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index eed42bf9d6f7..eb674b7cb169 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.48 2005/01/12 18:27:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.49 2005/01/14 13:25:15 eradicator Exp $
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/filefuncs/Makefile, gawk-3.1.3-r2.ebuild, gawk-3.1.4.ebuild:
+  multilib fixes for filefuncs.
 
 *gawk-3.1.4 (12 Jan 2005)
 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index e92460aa4b9a..f32bfcaf4a2c 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f2ffec9aa739364a23094bedbe530a46 ChangeLog 7879
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fe2ef30f6c6ecc539a5d80ad175400ad ChangeLog 8042
+MD5 560c671909467b8f321e5db41ce92383 gawk-3.1.3-r2.ebuild 2783
 MD5 a13c990268a1ab8ade8162e8ef3e9ee2 gawk-3.1.3-r1.ebuild 3190
-MD5 77fe366e0fc8419e84ca070b2577352d gawk-3.1.3-r2.ebuild 2752
-MD5 be6f37afe638fda47c80c3b67b0fdf60 gawk-3.1.4.ebuild 2723
-MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
-MD5 9f439b073b0d1903a54a04dca5aa44af files/gawk-3.1.2-input-filesize.patch 13485
-MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r1 63
+MD5 7ff5790ba452aaa16a1516fa2b85869f gawk-3.1.4.ebuild 2754
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c40ec6dfabda5864b7f62fa57d2329bd files/64bitnumfile.patch 340
 MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r2 63
 MD5 1bb4d37878683f5c8276bb091f2c1384 files/digest-gawk-3.1.4 63
-MD5 36b5ebb691c9060f293762de7adc9d50 files/filefuncs/Makefile 943
+MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r1 63
+MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
+MD5 9f439b073b0d1903a54a04dca5aa44af files/gawk-3.1.2-input-filesize.patch 13485
+MD5 63cb8e8ee794fe00894c4af0dfa28255 files/filefuncs/Makefile 989
 MD5 faae1ef835ae32125111e20cb9701c82 files/filefuncs/filefuncs.c 11021
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5WxqroRuSHgZdywRAoBbAKCMFXogayQGWgFyp9c8rQqWDyuKTwCfbdYa
-kQ2qmuLdFg89CVtx6NINCZ8=
-=h0k3
+iD8DBQFB58ilArHZZzCEUG0RArAEAJ9IvD/3zHz4n/xQ6TcVgAKOhEVUdQCggtsE
+iCvjDXuRFeKhEl28sY4/LUI=
+=xFCc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile
index 8358fb72c6ea..785b481500de 100644
--- a/sys-apps/gawk/files/filefuncs/Makefile
+++ b/sys-apps/gawk/files/filefuncs/Makefile
@@ -1,7 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.4 2004/07/15 00:42:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.5 2005/01/14 13:25:15 eradicator Exp $
 
 CC ?= gcc
 LD = $(CC)
@@ -14,6 +14,8 @@ DESTDIR =
 
 TARGET = filefuncs.so.$(MAJORVER).$(MINORVER)
 
+LIBDIR = lib
+
 all: $(TARGET)
 
 filefuncs.o: filefuncs.c
@@ -23,11 +25,11 @@ filefuncs.so.$(MAJORVER).$(MINORVER): filefuncs.o
 	$(LD) -o $@ -shared -Wl,-soname -Wl,filefuncs.so.$(MAJORVER) $^
 
 install: $(TARGET)
-	install -m 0755 -d $(DESTDIR)/lib/rcscripts
-	install -m 0755 $(TARGET) $(DESTDIR)/lib/rcscripts
-	ldconfig -l $(DESTDIR)/lib/rcscripts/$(TARGET)
-	rm -f $(DESTDIR)/lib/rcscripts/filefuncs.so
-	ln -s $(TARGET) $(DESTDIR)/lib/rcscripts/filefuncs.so
+	install -m 0755 -d $(DESTDIR)/$(LIBDIR)/rcscripts
+	install -m 0755 $(TARGET) $(DESTDIR)/$(LIBDIR)/rcscripts
+	ldconfig -l $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET)
+	rm -f $(DESTDIR)/$(LIBDIR)/rcscripts/filefuncs.so
+	ln -s $(TARGET) $(DESTDIR)/$(LIBDIR)/rcscripts/filefuncs.so
 
 clean:
 	rm -f $(TARGET)
diff --git a/sys-apps/gawk/gawk-3.1.3-r2.ebuild b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
index 922c449965c0..dc65496e5c3d 100644
--- a/sys-apps/gawk/gawk-3.1.3-r2.ebuild
+++ b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.2 2005/01/12 18:27:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.3 2005/01/14 13:25:15 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
@@ -43,6 +43,7 @@ src_install() {
 	make \
 		DESTDIR=${D} \
 		AWKINCDIR=${S} \
+		LIBDIR="$(get_libdir)" \
 		install || die "filefuncs install failed"
 
 	dodir /usr/bin
diff --git a/sys-apps/gawk/gawk-3.1.4.ebuild b/sys-apps/gawk/gawk-3.1.4.ebuild
index a99edfc59130..156ef83d9091 100644
--- a/sys-apps/gawk/gawk-3.1.4.ebuild
+++ b/sys-apps/gawk/gawk-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4.ebuild,v 1.1 2005/01/12 18:27:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4.ebuild,v 1.2 2005/01/14 13:25:15 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
@@ -42,6 +42,7 @@ src_install() {
 	make \
 		DESTDIR="${D}" \
 		AWKINCDIR="${S}" \
+		LIBDIR="$(get_libdir)" \
 		install \
 		|| die "filefuncs install failed"