dont use `ldconfig -l` since ldconfig isnt a portable app #92587

Package-Manager: portage-2.0.51.21-r1

3 files changed, 15 insertions, 15 deletions

diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 822c3718734d..ecc584740b51 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,6 +1,6 @@
 MD5 3de9fe59a8735fb88695e5111e50be99 ChangeLog 9239
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b5d59a259f2a1467a9b864e9aa95bde9 gawk-3.1.4-r4.ebuild 3815
+MD5 cc598629da038a912dc65fb5c5fc5405 gawk-3.1.4-r4.ebuild 3821
 MD5 560c671909467b8f321e5db41ce92383 gawk-3.1.3-r2.ebuild 2783
 MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
 MD5 e01879d30ddf2eb060f2ba2fa745a922 files/digest-gawk-3.1.4-r4 132
@@ -11,5 +11,5 @@ MD5 8a25d43ff539b0c949fc5bbce8488e06 files/gawk-3.1.3-getpgrp_void.patch 1225
 MD5 6778659e2892fddf115cee2c244e60a8 files/gawk-3.1.4-flonum.patch 3341
 MD5 334e1cf92033c20c5e401f5ae5f498cc files/gawk-3.1.4-nextc.patch 716
 MD5 513af85f3e12197f97b42c3fee7c491c files/gawk-3.1.4-uplow.patch 5636
-MD5 63cb8e8ee794fe00894c4af0dfa28255 files/filefuncs/Makefile 989
+MD5 f3561ccd6d2c2893dc5685743786dcb7 files/filefuncs/Makefile 973
 MD5 3159f74841ac19ed6237645e562f60c0 files/filefuncs/filefuncs.c 10992
diff --git a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile
index 785b481500de..c3d99de9328e 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.5 2005/01/14 13:25:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.6 2005/05/14 17:56:03 vapier Exp $
 
 CC ?= gcc
 LD = $(CC)
@@ -12,24 +12,24 @@ MINORVER = 0.1
 AWKINCDIR = /usr/include/awk
 DESTDIR =
 
-TARGET = filefuncs.so.$(MAJORVER).$(MINORVER)
+TARGET = filefuncs
+TARGET_LIB = $(TARGET).so.$(MAJORVER).$(MINORVER)
 
 LIBDIR = lib
 
-all: $(TARGET)
+all: $(TARGET_LIB)
 
-filefuncs.o: filefuncs.c
+$(TARGET).o: $(TARGET).c
 	$(CC) -shared -Wall -DHAVE_CONFIG_H -c -O2 -fPIC -I$(AWKINCDIR) $^
 
-filefuncs.so.$(MAJORVER).$(MINORVER): filefuncs.o
-	$(LD) -o $@ -shared -Wl,-soname -Wl,filefuncs.so.$(MAJORVER) $^
+$(TARGET_LIB): $(TARGET).o
+	$(LD) -o $@ -shared -Wl,-soname -Wl,$(TARGET).so.$(MAJORVER) $^
 
-install: $(TARGET)
+install: $(TARGET_LIB)
 	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
+	install -m 0755 $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts
+	ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so.$(MAJORVER)
+	ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so
 
 clean:
 	rm -f $(TARGET)
diff --git a/sys-apps/gawk/gawk-3.1.4-r4.ebuild b/sys-apps/gawk/gawk-3.1.4-r4.ebuild
index b65b0bf60046..6668741ad220 100644
--- a/sys-apps/gawk/gawk-3.1.4-r4.ebuild
+++ b/sys-apps/gawk/gawk-3.1.4-r4.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-r4.ebuild,v 1.4 2005/05/06 01:35:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4-r4.ebuild,v 1.5 2005/05/14 17:56:03 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls build xml"
 
 RDEPEND="xml? ( dev-libs/expat )"