public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lambdamoo/, net-misc/lambdamoo/files/
@ 2016-05-04  0:10 Austin English
  0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-05-04  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     af0c29ef228e4dcd90d25cde3b6412ae1eec0d6a
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 00:00:23 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May  4 00:08:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af0c29ef

net-misc/lambdamoo: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 net-misc/lambdamoo/files/lambdamoo.rc        |  4 +--
 net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild | 48 ++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/net-misc/lambdamoo/files/lambdamoo.rc b/net-misc/lambdamoo/files/lambdamoo.rc
index 142ce15..579076f 100644
--- a/net-misc/lambdamoo/files/lambdamoo.rc
+++ b/net-misc/lambdamoo/files/lambdamoo.rc
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
new file mode 100644
index 0000000..de08a46
--- /dev/null
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="networked mud that can be used for different types of collaborative software"
+HOMEPAGE="http://sourceforge.net/projects/lambdamoo/"
+SRC_URI="mirror://sourceforge/lambdamoo/LambdaMOO-${PV}.tar.gz"
+
+LICENSE="LambdaMOO GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+DEPEND="sys-devel/bison"
+RDEPEND=""
+
+S=${WORKDIR}/MOO-${PV}
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${PV}-enable-outbound.patch
+	sed -i Makefile.in \
+		-e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		|| die "sed Makefile.in"
+	eautoreconf
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS} \
+		-DHAVE_MKFIFO=1"
+}
+
+src_install() {
+	dosbin moo
+	insinto /usr/share/${PN}
+	doins Minimal.db
+	dodoc *.txt README*
+
+	newinitd "${FILESDIR}"/lambdamoo.rc ${PN}
+	newconfd "${FILESDIR}"/lambdamoo.conf ${PN}
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/lambdamoo/, net-misc/lambdamoo/files/
@ 2024-06-08  7:49 Joonas Niilola
  0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2024-06-08  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7b6a0730daccd6ca3700e19b47c37e8d7e096c8b
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Mon Apr  1 07:15:14 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 07:49:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6a0730

net-misc/lambdamoo: fix configure for C99 porting

Add missing include, fix test program for configure.in

Closes: https://bugs.gentoo.org/927734
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36033
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/lambdamoo-1.8.1-C99-configure.patch      | 111 +++++++++++++++++++++
 .../files/lambdamoo-1.8.1-respect-cflags.patch     |  24 +++++
 net-misc/lambdamoo/lambdamoo-1.8.1-r4.ebuild       |  43 ++++++++
 3 files changed, 178 insertions(+)

diff --git a/net-misc/lambdamoo/files/lambdamoo-1.8.1-C99-configure.patch b/net-misc/lambdamoo/files/lambdamoo-1.8.1-C99-configure.patch
new file mode 100644
index 000000000000..972bf918db06
--- /dev/null
+++ b/net-misc/lambdamoo/files/lambdamoo-1.8.1-C99-configure.patch
@@ -0,0 +1,111 @@
+Original minimal fix for bug https://bugs.gentoo.org/927734
+with it lambdaroo starts compiling
+diff -ur MOO-1.8.1.orig/configure.in MOO-1.8.1/configure.in
+--- a/configure.in	2024-04-01 07:02:38.948009581 +0000
++++ b/configure.in	2024-04-01 07:04:19.706417934 +0000
+@@ -260,7 +260,8 @@
+ SAVECC="$CC"
+ CC="$CC $opt"
+ AC_TEST_PROGRAM([
+-int main(int argc, char *argv) { void *ptr; exit(0); }
++#include <stdlib.h>
++int main(int argc, char **argv) { void *ptr; exit(0); }
+ ],
+ [have_ansi=1
+ break],
+diff -ur MOO-1.8.1.orig/config.h.in MOO-1.8.1/config.h.in
+--- a/config.h.in	2024-04-01 07:11:20.263972630 +0000
++++ b/config.h.in	2024-04-01 07:13:06.909341833 +0000
+@@ -253,6 +253,7 @@
+  */
+ 
+ #include <limits.h>
++#include <string.h>
+ 
+ #if INT_MAX == 2147483647
+    typedef int		int32;
+fix for old name of configure.in
+--- a/Makefile.in	2024-05-09 05:39:45.019672388 -0000
++++ b/Makefile.in	2024-05-09 05:40:41.162384171 -0000
+@@ -69,7 +69,7 @@
+ 
+ DISTFILES = $(SRCS) Makefile.in restart restart.sh \
+ 	Minimal.db README.Minimal \
+-	ChangeLog.txt README configure.in configure config.h.in \
++	ChangeLog.txt README configure.ac configure config.h.in \
+ 	MOOCodeSequences.txt AddingNewMOOTypes.txt pgperf aclocal.m4
+ 
+ COBJS = $(CSRCS:.c=.o)
+@@ -94,7 +94,7 @@
+ restart:
+ 	touch restart
+ 
+-configure: configure.in
++configure: configure.ac
+ 	# autoconf
+ 	@echo "Not running autoconf; you must do this by hand."
+ 	touch configure
+QA fixes from Sam, modified for configure.in, as they are applied
+before renaming
+https://github.com/gentoo/gentoo/pull/36033#issuecomment-2101077890
+diff --git a/configure.in b/configure.in
+index 685bdfe..24cfe64 100644
+--- a/configure.in
++++ b/configure.in
+@@ -381,8 +381,10 @@ dnl ***************************************************************************
+ echo "checking whether or not fstat() can tell how much data is in a FIFO"
+ AC_TEST_PROGRAM([#include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+-main()
++#include <unistd.h>
++int main()
+ {
+ #ifdef NeXT
+ /* The NeXT claims to have FIFOs, but using them panics the kernel... */
+@@ -407,13 +409,15 @@ AC_TEST_PROGRAM([#include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #ifndef FD_ZERO
+ #define	NFDBITS		(sizeof(fd_set)*8)
+ #define	FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
+ #define	FD_SET(n, p)	((p)->fds_bits[0] |= (1L<<((n)%NFDBITS)))
+ #define	FD_ISSET(n, p)	((p)->fds_bits[0] &  (1L<<((n)%NFDBITS)))
+ #endif /* FD_ZERO */
+-main()
++int main()
+ {
+ #ifdef NeXT
+ /* The NeXT claims to have FIFOs, but using them panics the kernel... */
+@@ -443,7 +447,9 @@ AC_TEST_PROGRAM([#include <sys/types.h>
+ #include <poll.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-main()
++#include <stdlib.h>
++#include <unistd.h>
++int main()
+ {
+   int	rfd, wfd, result; struct pollfd fds[1];
+   unlink("/tmp/conftest-fifo");
+@@ -461,11 +467,14 @@ main()
+ dnl ***************************************************************************
+ echo checking whether POSIX-style non-blocking I/O works
+ AC_TEST_PROGRAM([#include <sys/types.h>
++#include <sys/stat.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <signal.h>
+-handler(int sig) { }
+-main ()
++#include <stdlib.h>
++#include <unistd.h>
++void handler(int sig) { return; }
++int main ()
+ { /* Testing a POSIX feature, so assume FIFOs */
+ #ifdef NeXT
+ /* The NeXT claims to have FIFOs, but using them panics the kernel... */

diff --git a/net-misc/lambdamoo/files/lambdamoo-1.8.1-respect-cflags.patch b/net-misc/lambdamoo/files/lambdamoo-1.8.1-respect-cflags.patch
new file mode 100644
index 000000000000..2ebfdadb59c9
--- /dev/null
+++ b/net-misc/lambdamoo/files/lambdamoo-1.8.1-respect-cflags.patch
@@ -0,0 +1,24 @@
+was sed -i Makefile.in -e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|g'
+--- a/Makefile.in	2024-05-09 05:12:18.249018601 -0000
++++ b/Makefile.in	2024-05-09 05:12:20.497004963 -0000
+@@ -79,16 +79,16 @@
+ OBJS = $(COBJS) $(YOBJS)
+ 
+ moo:	$(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBRARIES) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBRARIES) -o $@
+ 
+ pure_moo: moo
+-	purify $(CC) $(CFLAGS) $(OBJS) $(LIBRARIES) -o $@
++	purify $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBRARIES) -o $@
+ 
+ client_bsd: client_bsd.o
+-	$(CC) $(CFLAGS) client_bsd.o $(LIBRARIES) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) client_bsd.o $(LIBRARIES) -o $@
+ 
+ client_sysv: client_sysv.o
+-	$(CC) $(CFLAGS) client_sysv.o $(LIBRARIES) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) client_sysv.o $(LIBRARIES) -o $@
+ 
+ # This rule gets around some "make"s' desire to `derive' it from `restart.sh'.
+ restart:

diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r4.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r4.ebuild
new file mode 100644
index 000000000000..4587428b7bc3
--- /dev/null
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="networked mud that can be used for different types of collaborative software"
+HOMEPAGE="https://sourceforge.net/projects/lambdamoo/"
+SRC_URI="https://downloads.sourceforge.net/lambdamoo/LambdaMOO-${PV}.tar.gz"
+S=${WORKDIR}/MOO-${PV}
+
+LICENSE="LambdaMOO GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-alternatives/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-enable-outbound.patch"
+	"${FILESDIR}/${P}-C99-configure.patch"
+	"${FILESDIR}/${P}-respect-cflags.patch"
+)
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -DHAVE_MKFIFO=1"
+}
+
+src_install() {
+	dosbin moo
+	insinto /usr/share/${PN}
+	doins Minimal.db
+	dodoc *.txt README*
+
+	newinitd "${FILESDIR}"/lambdamoo.rc ${PN}
+	newconfd "${FILESDIR}"/lambdamoo.conf ${PN}
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-06-08  7:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-08  7:49 [gentoo-commits] repo/gentoo:master commit in: net-misc/lambdamoo/, net-misc/lambdamoo/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2016-05-04  0:10 Austin English

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox