Cleanup build system to get rid of need for preplib.

Package-Manager: portage-2.0.53

4 files changed, 52 insertions, 31 deletions

diff --git a/dev-games/hawknl/ChangeLog b/dev-games/hawknl/ChangeLog
index a4334b5f7c8c..55b771baf3c4 100644
--- a/dev-games/hawknl/ChangeLog
+++ b/dev-games/hawknl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/hawknl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/ChangeLog,v 1.8 2005/05/17 17:21:16 wolf31o2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/ChangeLog,v 1.9 2005/12/17 03:09:42 vapier Exp $
+
+  17 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/hawknl-1.68-build.patch, hawknl-1.68-r1.ebuild:
+  Cleanup build system to get rid of need for preplib.
 
   17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> -hawknl-1.68.ebuild:
   Cleanup for bug #92745.
diff --git a/dev-games/hawknl/Manifest b/dev-games/hawknl/Manifest
index 6884736b1685..dfc45897958b 100644
--- a/dev-games/hawknl/Manifest
+++ b/dev-games/hawknl/Manifest
@@ -1,6 +1,15 @@
-MD5 fe0856994b67cb4efaa61950043601bb hawknl-1.68-r1.ebuild 1425
-MD5 454cfbe6d226a8e07c5bf34a5f0659ba hawknl-1.66.ebuild 1026
-MD5 3513040a160a61b1f05bbbf767589774 ChangeLog 1040
-MD5 b704821d70b9e7b8956ec537e96cb567 metadata.xml 1049
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b320420f6e11511c61305a112edb99a ChangeLog 1201
 MD5 a28b47c48b93202babc367b1b9e48527 files/digest-hawknl-1.68-r1 64
-MD5 2039445f3163e3eceff4859a9f54d422 files/digest-hawknl-1.66 64
+MD5 2cbd156b9443b7ecd5af5e8a4bcf53bd files/hawknl-1.68-build.patch 912
+MD5 3bf899d5fba7b5fffe2574d37e1f18fd hawknl-1.68-r1.ebuild 1195
+MD5 b704821d70b9e7b8956ec537e96cb567 metadata.xml 1049
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDo4GU2+ySkm8kpY0RAnMvAJ9z4yB0t8VU0bmRHV0uRI2P4rdTQwCgvjET
+lK2VQ2ImOJbSGutIi7SGre4=
+=MiLn
+-----END PGP SIGNATURE-----
diff --git a/dev-games/hawknl/files/hawknl-1.68-build.patch b/dev-games/hawknl/files/hawknl-1.68-build.patch
new file mode 100644
index 000000000000..2ae1897d2060
--- /dev/null
+++ b/dev-games/hawknl/files/hawknl-1.68-build.patch
@@ -0,0 +1,21 @@
+--- src/makefile.linux.orig	2005-12-16 22:03:24.000000000 -0500
++++ src/makefile.linux	2005-12-16 22:04:18.000000000 -0500
+@@ -34,13 +34,14 @@
+ nltime.o : nlinternal.h nltime.c

+ 

+ install:

++	mkdir -p $(LIBDIR) $(INCDIR) ; chmod 755 $(LIBDIR) $(INCDIR)
+ 	cp $(OUTPUT) $(LIBDIR)

+ 	cp $(STATIC) $(LIBDIR)

+ 	chmod 755 $(LIBDIR)/$(OUTPUT)

+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)

+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)

+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so

+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/$(LIBNAME).so

++	ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)

++	ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)

++	ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so

++	ln -s $(OUTPUT) $(LIBDIR)/$(LIBNAME).so

+ 	cp ../include/nl.h $(INCDIR)/nl.h

+ 	chmod 644 $(INCDIR)/nl.h

+ 

diff --git a/dev-games/hawknl/hawknl-1.68-r1.ebuild b/dev-games/hawknl/hawknl-1.68-r1.ebuild
index 830c7f25bdff..10d5d18977be 100644
--- a/dev-games/hawknl/hawknl-1.68-r1.ebuild
+++ b/dev-games/hawknl/hawknl-1.68-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation, 2004 Richard Garand <richard@garandnet.net>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68-r1.ebuild,v 1.4 2005/03/21 08:13:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68-r1.ebuild,v 1.5 2005/12/17 03:09:42 vapier Exp $
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs eutils multilib
 
 DESCRIPTION="A cross-platform network library designed for games"
 HOMEPAGE="http://www.hawksoft.com/hawknl/"
@@ -10,10 +10,10 @@ SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ppc hppa amd64"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE="doc"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -21,41 +21,28 @@ S=${WORKDIR}/hawknl${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	ln -s makefile.linux makefile
-
-	sed -i \
-		-e 's:make :$(MAKE) :g' makefile \
-		|| die "sed makefile failed"
-
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
 	sed -i \
 		-e '/echo /d' src/makefile.linux \
 		|| die "sed src/makefile.linux failed"
 }
 
 src_compile() {
-	emake \
+	emake -C src -f makefile.linux \
 		CC="$(tc-getCC)" \
 		OPTFLAGS="${CFLAGS} -D_GNU_SOURCE -D_REENTRANT" \
 		|| die "emake failed"
 }
 
 src_install() {
-	local reallib
-
-	dodir /usr/{include,$(get_libdir)}
-	make install LIBDIR="${D}/usr/$(get_libdir)" INCDIR="${D}/usr/include" \
+	make -C src -f makefile.linux \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		INCDIR="${D}/usr/include" \
+		install \
 		|| die "make install failed"
 	if use doc ; then
 		docinto samples
 		dodoc samples/* || die "dodoc failed"
 	fi
-
-	cd "${D}/usr/$(get_libdir)"
-	for f in *.so* ; do
-		[ ! -L ${f} ] && continue
-		reallib="$(basename $(readlink NL.so))"
-		ln -sf ${reallib} ${f}
-	done
-	preplib
 }