From nobody Mon Oct 21 09:39:27 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XX9J21SY2z5Ym4Y; Mon, 21 Oct 2024 09:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX9J01fJWz4q9J; Mon, 21 Oct 2024 09:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KA1AQcFxOWCssh7q/2iEXwEV9ixJ59gOow4c2q+LkhY=; b=BK48Oyiyhxl4P80uvoI0QwPC0jgIXXUqvoILlrmF+a7qPYDwdba4ar/u+KCarydKLeSVTY xRUvWT7RbkxOlMayStdTklqrYNok9qxz/3hUoLp4jGrj01ECalfBoWm2rF1GtX+Ew3ZMy+ mXUJ6Q0St+xivEOJBzJVcVA+1dqjD10l9RhoxUBYZ8PAq5byBtU7hyPJk2RDpAEr8CymxX 54XKG/aK1wkJQla8Kcpm9ZE9WnKD8FFxF+Jf51HOUdnEvHwbFet97Hf9Zxo35TWEUbQ8pt oXc/3TZfgMqL98+4Lt7uMKTyB51TzsNU3NUnRMJ1K9ehqHihlUS9urNkZzPt0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KA1AQcFxOWCssh7q/2iEXwEV9ixJ59gOow4c2q+LkhY=; b=VJlPMRr70n0B1gy1sMafqvh31H/T+q+aRdrnOmvnaTvLe5tRzGlDzZaL8wmOtLtAx9pmbs D9QIFi9hsohn+FNZUWgF0u1KQAh2qt7X5OH6raamYeeYOP+eVTlZHmIs1whGLGdhUnrutV NbzCnxh/Zm5VkIP57xYJKkwoJQeNIogL0IT1E96W6MuBosT96NorTd10zi4iByKFqkCClf 94WqyygDtNgt7X2o/kf4R3sVxy1vl5KiZzyWJkieFoSFxuAY2xm8w/A2R+17+loa0OMe1V 8w52EuMY9ORSkUCzyH6mr+vTIn0MQ6MUuxiSmuGCGiip2fE8OWwDVp5fVmTbiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729503568; a=rsa-sha256; cv=none; b=SI/f4j5ux6ZI8lvZ3obbdcwTQweofOM9WMnClWrGIDgJbCs7WX4xr7rctA4usn9i9tEdUe xRGOjglLCVM6oDOzBOl6Xl3M3cLb9ZmZzpCtIEICRh9H/IMb5jIxhwIhmau2bQrdeTbpNc JoFZhaPHcN5mhVTJSwYhhxdVUcqelSOq0QVSGXRj7411QhIbhegCbv8PdUWw3DsNzAXWMg SF117jYREf7NQob/BiAM8wLob34FwIatIdnywmt4V5+bRpCc9hY4XTPaeSSBbQ8k3pZW2w WbTzVgHoojG6Fd4YNCtl58JbLJ/XQBGuDc2VYJ4W17h6Cs17sfhjvB9Ux95Ilw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX9J00YdMzPr5; Mon, 21 Oct 2024 09:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L9dR7Y034598; Mon, 21 Oct 2024 09:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L9dRUU034595; Mon, 21 Oct 2024 09:39:27 GMT (envelope-from git) Date: Mon, 21 Oct 2024 09:39:27 GMT Message-Id: <202410210939.49L9dRUU034595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: cc8f0be6b95f - 2024Q4 - net/lambdamoo: fix build on current FreeBSD, define LICENSE List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: cc8f0be6b95f57e44e956b839f2a856ea3372e67 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc8f0be6b95f57e44e956b839f2a856ea3372e67 commit cc8f0be6b95f57e44e956b839f2a856ea3372e67 Author: Robert Clausecker AuthorDate: 2024-10-18 08:59:15 +0000 Commit: Robert Clausecker CommitDate: 2024-10-21 09:38:51 +0000 net/lambdamoo: fix build on current FreeBSD, define LICENSE - this has some seriously ancient autotools stuff in it - it doesn't even quite work these days MFH: 2024Q2 (cherry picked from commit f0c5bad08af6408c2643d2cfe9b47b6c80ab3830) --- net/lambdamoo/Makefile | 11 ++++++++++- net/lambdamoo/files/patch-Makefile.in | 6 +++--- net/lambdamoo/files/patch-config.h.in | 20 ++++++++++++++++---- net/lambdamoo/files/patch-configure | 20 -------------------- net/lambdamoo/files/patch-configure.in | 19 +++++++++++++++---- net/lambdamoo/files/patch-my-stat.h | 14 ++++++++++++++ net/lambdamoo/files/patch-my-string.h | 11 +++++++++++ 7 files changed, 69 insertions(+), 32 deletions(-) diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile index 5bed0e76da17..c2b045c286f9 100644 --- a/net/lambdamoo/Makefile +++ b/net/lambdamoo/Makefile @@ -9,7 +9,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The most commonly used program to run MOOs WWW= https://www.moo.mud.org/ -USES= bison +LICENSE= XEROX +LICENSE_NAME= unknown +LICENSE_FILE= ${WRKSRC}/server.c +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= autoreconf:build bison GNU_CONFIGURE= yes CONFIGURE_ENV= YACC=${YACC} @@ -23,6 +28,10 @@ ALL_TARGET= OPTIONS_DEFINE= DOCS + # needs to run just autoconf, autoreconf doesn't work +pre-configure: + cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf${_AUTORECONF} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/moo ${STAGEDIR}${PREFIX}/sbin diff --git a/net/lambdamoo/files/patch-Makefile.in b/net/lambdamoo/files/patch-Makefile.in index 28d9f61bcaad..a16a0575d01b 100644 --- a/net/lambdamoo/files/patch-Makefile.in +++ b/net/lambdamoo/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2000-01-10 20:54:05.000000000 -0500 -+++ Makefile.in 2014-08-16 12:36:54.000000000 -0400 -@@ -14,10 +14,10 @@ +--- Makefile.in.orig 2000-01-11 01:54:05 UTC ++++ Makefile.in +@@ -14,10 +14,10 @@ CC = @CC@ # Pavel@Xerox.Com CC = @CC@ diff --git a/net/lambdamoo/files/patch-config.h.in b/net/lambdamoo/files/patch-config.h.in index 5ee90ab4fb9a..6094d3c193b5 100644 --- a/net/lambdamoo/files/patch-config.h.in +++ b/net/lambdamoo/files/patch-config.h.in @@ -1,6 +1,18 @@ ---- config.h.in.orig Sun Jul 4 16:45:44 1999 -+++ config.h.in Sun Jul 4 16:45:54 1999 -@@ -163,7 +163,7 @@ +--- config.h.in.orig 1998-12-29 05:26:51 UTC ++++ config.h.in +@@ -94,9 +94,10 @@ + #undef NDECL_FORK /* */ + #undef NDECL_WAITPID /* */ + +-/* Some systems declare bzero() in instead of in . */ ++/* Some systems declare bzero() in or instead of in . */ + + #undef BZERO_IN_STDLIB_H ++#undef BZERO_IN_STRINGS_H + + /* Some header files are only present on certain kinds of UNIXes (e.g., BSD, + * System V, or POSIX). The following symbols are defined only if the named +@@ -163,7 +164,7 @@ * system provides the named functions. */ @@ -9,7 +21,7 @@ #undef HAVE_MATHERR #undef HAVE_MKFIFO #undef HAVE_REMOVE -@@ -257,12 +257,16 @@ +@@ -257,12 +258,16 @@ #if INT_MAX == 2147483647 typedef int int32; typedef unsigned unsigned32; diff --git a/net/lambdamoo/files/patch-configure b/net/lambdamoo/files/patch-configure deleted file mode 100644 index 9d8f229f1cb2..000000000000 --- a/net/lambdamoo/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Mon Apr 8 22:32:10 2002 -+++ configure Mon Apr 8 22:51:13 2002 -@@ -599,7 +599,7 @@ - cat > conftest.c < conftest.c < -@@ -260,7 +260,7 @@ +@@ -260,7 +260,7 @@ AC_TEST_PROGRAM([ SAVECC="$CC" CC="$CC $opt" AC_TEST_PROGRAM([ @@ -18,3 +18,14 @@ ], [have_ansi=1 break], +@@ -333,8 +333,9 @@ MOO_NDECL_FUNCS(string.h, bzero memcpy memset strerror + #include + #endif + ]) +-echo checking for bzero being declared in stdlib.h ++echo checking for bzero being declared in stdlib.h and strings.h + MOO_FUNC_DECL_CHECK(stdlib.h, bzero, AC_DEFINE(BZERO_IN_STDLIB_H)) ++MOO_FUNC_DECL_CHECK(strings.h, bzero, AC_DEFINE(BZERO_IN_STRINGS_H)) + MOO_NDECL_FUNCS(sys/time.h, getitimer setitimer select, [ + #if NEED_SELECT_H + #include diff --git a/net/lambdamoo/files/patch-my-stat.h b/net/lambdamoo/files/patch-my-stat.h new file mode 100644 index 000000000000..24ffe961139a --- /dev/null +++ b/net/lambdamoo/files/patch-my-stat.h @@ -0,0 +1,14 @@ +--- my-stat.h.orig 2024-10-18 08:58:26 UTC ++++ my-stat.h +@@ -31,11 +31,6 @@ extern int mkfifo(const char *, mode_t); + extern int mkfifo(const char *, mode_t); + #endif + +-#if !HAVE_MKFIFO +-extern int mknod(const char *file, int mode, int dev); +-#define mkfifo(path, mode) mknod(path, S_IFIFO | (mode), 0) +-#endif +- + /* + * $Log: my-stat.h,v $ + * Revision 1.3 1998/12/14 13:18:15 nop diff --git a/net/lambdamoo/files/patch-my-string.h b/net/lambdamoo/files/patch-my-string.h new file mode 100644 index 000000000000..1f06942e7389 --- /dev/null +++ b/net/lambdamoo/files/patch-my-string.h @@ -0,0 +1,11 @@ +--- my-string.h.orig 2024-10-18 08:41:29 UTC ++++ my-string.h +@@ -72,6 +72,8 @@ extern const char *sys_errlist[]; + #if NDECL_BZERO && !defined(bzero) + # if BZERO_IN_STDLIB_H + # include "my-stdlib.h" ++# elif BZERO_IN_STRINGS_H ++# include + # else + extern void bzero(char *, int); + # endif