summaryrefslogtreecommitdiff
path: root/dev-games/hawknl
diff options
context:
space:
mode:
Diffstat (limited to 'dev-games/hawknl')
-rw-r--r--dev-games/hawknl/Manifest4
-rw-r--r--dev-games/hawknl/files/hawknl-1.68-build.patch59
-rw-r--r--dev-games/hawknl/hawknl-1.68-r2.ebuild39
-rw-r--r--dev-games/hawknl/hawknl-1.68-r3.ebuild40
4 files changed, 84 insertions, 58 deletions
diff --git a/dev-games/hawknl/Manifest b/dev-games/hawknl/Manifest
index f76c5794d3f5..ab7cc1866c5f 100644
--- a/dev-games/hawknl/Manifest
+++ b/dev-games/hawknl/Manifest
@@ -1,4 +1,4 @@
-AUX hawknl-1.68-build.patch 1538 BLAKE2B 08f02aee539b5436dbadaadba32336dbaf54d7ec08b4e902d12124c40c97b449e5641ab5b2485d5f7aeb864c8ac410c1720dc2406213f4c676b4f0aa00be7e60 SHA512 c3bce38bd43987dbe2707c7ab0f13f36689f322e15b9ef7c9bba4d39bae30f2f4992593d74ee11a97c0367eabda42e6d3af84f0821062c0f984dbaea0066467a
+AUX hawknl-1.68-build.patch 2314 BLAKE2B 572af66b0b0f01cb9034c1b681f11434658ffce7cebaeeff28640db5c903e69a1b43fb4c803b98e154a0cd865d62dc4aace37111b48b9396272d8cec4d494c4a SHA512 4eae14cb6d31ab3f0ed42406657a3f4cb90df254562e5699b9f14380c63f80f2ea9fcbbcc37b105a253e52d5eeecec3afeb1ef588dfd951fd76acb48f2ed717f
DIST HawkNL168src.tar.gz 181263 BLAKE2B cbd16d6564782dc2a0a70ba875fbe64968063ac2fc2a4f9cd98f268c221d07e3ca0649cf27a6fcfd7735ed43e3e3adb634c1715f83f6bad2924239f79811cdf3 SHA512 52d518a19aaa8005e2e43a693571244a81a5a4450e2f92e6c0a64efb4b32ebfc3aff5d5b3ed09a3cdbee2e444d83067471ac714d7ae03d8cd78f905364c510f0
-EBUILD hawknl-1.68-r2.ebuild 853 BLAKE2B 95490fab3afc628a0491209a7fcef5962905990aa2185713c7c33592f20ad7fbfbb045c4e6bb5d8e964499f62005d9b58a92d716f14157a9692e576e21cb4f4c SHA512 5749a3bb03b77a857ab79eaf8d65307aa9c12a2bb18319a63dd87d20f63d1dd059aefb3df9ee984c44add2c89cc13d248c3fd83033006be3b7e2a7173e123e27
+EBUILD hawknl-1.68-r3.ebuild 830 BLAKE2B 64def6d0a3aad18642e0c3abbff9dd8f7d52f707ffc10a9628faf5ee560bd7e0f33df89fd6b3ce4a39f83f86cf02d5d4c6002f4a39d5000a02a3ddc8ddb3753b SHA512 7a78aeb97920d657df94addca92699eacdea33c04455fecb598017277d5bdc7dc99678c78fbebfb0aa3b26f8007c999d8a726e217bf58c16c468d45c8822a6d9
MISC metadata.xml 1140 BLAKE2B a7fa35900288b1da3adce095bb122b135d1c9af7eea15b180b6eecbcdc394a7755cc04874bab72e1f88a39b21ac4a9a6070af036bcee2eea03d69af596ba0b0a SHA512 088f17589d2c28f7673b68de696fab59559d1074092b804d72550cfd591094fdaf487250928092cf926e90c7699780145d07c49c1132d472b99a3c6caeec7381
diff --git a/dev-games/hawknl/files/hawknl-1.68-build.patch b/dev-games/hawknl/files/hawknl-1.68-build.patch
index d94daaaf6d88..eb07d5cc1798 100644
--- a/dev-games/hawknl/files/hawknl-1.68-build.patch
+++ b/dev-games/hawknl/files/hawknl-1.68-build.patch
@@ -1,12 +1,39 @@
---- 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 @@
+--- a/src/makefile.linux
++++ b/src/makefile.linux
+@@ -1,6 +1,3 @@
+-CC = gcc
+-AR = ar cru
+-RANLIB = ranlib
+ MAJOR_VERSION = 1
+ MINOR_VERSION = 6
+ PATCH_LEVEL = 8
+@@ -11,15 +8,13 @@
+ OUTPUT = libNL.so.$(VERSION)
+ LIBNAME = NL
+ STATIC = libNL.a
+-OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
+-CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
+-LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
++CPPFLAGS += -D_GNU_SOURCE -D_REENTRANT $(INCLUDE)
++CFLAGS += -Wall -fPIC
++LIBFLAGS = -shared -Wl,-soname,libNL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
+ OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
+
+ all: $(OBJECTS)
+- $(CC) -o $(OUTPUT) $(OBJECTS) $(LIBFLAGS) $(CFLAGS)
+- $(AR) $(STATIC) $(OBJECTS)
+- $(RANLIB) $(STATIC)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT) $(OBJECTS) $(LIBFLAGS)
+
+ nl.o : nlinternal.h nl.c
+ sock.o : nlinternal.h sock.h sock.c
+@@ -34,23 +29,14 @@
nltime.o : nlinternal.h nltime.c
install:
-+ mkdir -p $(LIBDIR) $(INCDIR) ; chmod 755 $(LIBDIR) $(INCDIR)
++ mkdir -p $(LIBDIR) $(INCDIR) ; chmod 755 $(LIBDIR) $(INCDIR)
cp $(OUTPUT) $(LIBDIR)
- cp $(STATIC) $(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)
@@ -15,18 +42,16 @@
+ 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
+- @echo ""
+- @echo "*************************************************"
+- @echo "* Installed HawkNL. *"
+- @echo "* Remember to run /sbin/ldconfig before using *"
+- @echo "* the library, you may also want to check that *"
+- @echo "* $(LIBDIR) is included in /etc/ld.so.conf *"
+- @echo "* You must be root to run ldconfig. *"
+- @echo "*************************************************"
---- src/makefile.linux.old 2010-09-10 09:44:53.000000000 +0200
-+++ src/makefile.linux 2010-09-10 09:45:09.000000000 +0200
-@@ -13,7 +13,7 @@
- STATIC = libNL.a
- OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
- CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
--LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
-+LIBFLAGS = ${LDFLAGS} -shared -Wl,-soname,libNL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
- OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
-
- all: $(OBJECTS)
+ uninstall:
+ rm -f $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
diff --git a/dev-games/hawknl/hawknl-1.68-r2.ebuild b/dev-games/hawknl/hawknl-1.68-r2.ebuild
deleted file mode 100644
index ff46abad3e7a..000000000000
--- a/dev-games/hawknl/hawknl-1.68-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="A cross-platform network library designed for games"
-HOMEPAGE="http://www.hawksoft.com/hawknl/"
-SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/hawknl${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
- sed -i\ -e '/echo /d' src/makefile.linux || die
-}
-
-src_compile() {
- emake -C src -f makefile.linux \
- CC="$(tc-getCC)" \
- OPTFLAGS="${CFLAGS} -D_GNU_SOURCE -D_REENTRANT"
-}
-
-src_install() {
- emake -j1 -C src -f makefile.linux \
- LIBDIR="${D}/usr/$(get_libdir)" \
- INCDIR="${D}/usr/include" install
- if use doc ; then
- dodoc -r samples
- fi
-}
diff --git a/dev-games/hawknl/hawknl-1.68-r3.ebuild b/dev-games/hawknl/hawknl-1.68-r3.ebuild
new file mode 100644
index 000000000000..1263783a20ec
--- /dev/null
+++ b/dev-games/hawknl/hawknl-1.68-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A cross-platform network library designed for games"
+HOMEPAGE="http://www.hawksoft.com/hawknl/"
+SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE="examples"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_configure() {
+ tc-export CC
+}
+
+src_compile() {
+ emake -C src -f makefile.linux
+}
+
+src_install() {
+ emake -j1 -C src -f makefile.linux \
+ LIBDIR="${ED}"/usr/$(get_libdir) \
+ INCDIR="${ED}"/usr/include install
+
+ dodoc src/{nlchanges.txt,readme.txt}
+ if use examples; then
+ docinto examples
+ dodoc -r samples/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}