Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Apr 2024 13:47:08 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1fc0867d51ad - main - devel/dmucs: Remove expired port
Message-ID:  <202404061347.436Dl8g6067677@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1fc0867d51adceeb7e775e098ec22587091252af

commit 1fc0867d51adceeb7e775e098ec22587091252af
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-04-06 13:46:58 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-04-06 13:46:58 +0000

    devel/dmucs: Remove expired port
    
    2024-04-06 devel/dmucs: Unmaintained, upstream last release was in 2006
---
 MOVED                                  |  1 +
 devel/Makefile                         |  1 -
 devel/dmucs/Makefile                   | 37 ------------------------
 devel/dmucs/distinfo                   |  2 --
 devel/dmucs/files/patch-COSMIC-error.c | 10 -------
 devel/dmucs/files/patch-dmucs_db.cc    | 46 -----------------------------
 devel/dmucs/files/patch-dmucs_db.h     | 53 ----------------------------------
 devel/dmucs/files/patch-dmucs_msg.cc   | 11 -------
 devel/dmucs/files/patch-main.cc        | 11 -------
 devel/dmucs/files/patch-remhost.cc     | 11 -------
 devel/dmucs/pkg-descr                  | 12 --------
 11 files changed, 1 insertion(+), 194 deletions(-)

diff --git a/MOVED b/MOVED
index 762e21c9256a..4aa6ceef2d3d 100644
--- a/MOVED
+++ b/MOVED
@@ -3158,3 +3158,4 @@ science/py-qiskit-optimization||2024-04-05|Removed
 games/spider||2024-04-06|Has expired: SUNSITE is no longer maintained
 graphics/liblug||2024-04-06|Has expired: SUNSITE is no longer maintained
 misc/xgas||2024-04-06|Has expired: SUNSITE is no longer maintained
+devel/dmucs||2024-04-06|Has expired: Unmaintained, upstream last release was in 2006
diff --git a/devel/Makefile b/devel/Makefile
index 995389fa88a4..0a4ad492094b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -569,7 +569,6 @@
     SUBDIR += dmake
     SUBDIR += dmalloc
     SUBDIR += dmlc-core
-    SUBDIR += dmucs
     SUBDIR += docopt.cpp
     SUBDIR += doctest
     SUBDIR += doctorj
diff --git a/devel/dmucs/Makefile b/devel/dmucs/Makefile
deleted file mode 100644
index a3f8f5004351..000000000000
--- a/devel/dmucs/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PORTNAME=	dmucs
-PORTVERSION=	0.6.1
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Distributed Multi-User Compilation System (for use with distcc)
-WWW=		https://dmucs.sourceforge.net/
-
-DEPRECATED=	Unmaintained, upstream last release was in 2006
-EXPIRATION_DATE=2024-04-06
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BROKEN_aarch64=		fails to compile: passing char * to parameter of incompatible type __builtin_va_list
-BROKEN_armv6=		fails to compile: passing char * to parameter of incompatible type __builtin_va_list
-BROKEN_armv7=		fails to compile: passing char * to parameter of incompatible type __builtin_va_list
-
-USES=	tar:bzip2
-
-GNU_CONFIGURE=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/dmucs bin/gethost bin/loadavg bin/monitor bin/remhost
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
-	@${REINPLACE_CMD} -e 's|CFLAGS    = -O -I./HDR|CFLAGS=-Wno-error=int-conversion -O -I./HDR|' \
-		${WRKSRC}/COSMIC/Makefile
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/dmucs/distinfo b/devel/dmucs/distinfo
deleted file mode 100644
index 21c22e10353a..000000000000
--- a/devel/dmucs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dmucs-0.6.1.tar.bz2) = cbcb0f866880018de36b1bbf37dc13888a3c897feac47398f38b5dafe245326e
-SIZE (dmucs-0.6.1.tar.bz2) = 399161
diff --git a/devel/dmucs/files/patch-COSMIC-error.c b/devel/dmucs/files/patch-COSMIC-error.c
deleted file mode 100644
index bf326d547ec3..000000000000
--- a/devel/dmucs/files/patch-COSMIC-error.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- COSMIC/error.c.orig	2007-11-26 02:32:21.000000000 +0600
-+++ COSMIC/error.c	2007-11-26 02:32:39.000000000 +0600
-@@ -1,6 +1,7 @@
- /* error.c: this file contains an error function
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include "sockets.h"
- 
diff --git a/devel/dmucs/files/patch-dmucs_db.cc b/devel/dmucs/files/patch-dmucs_db.cc
deleted file mode 100644
index fd5d0f8e2fd5..000000000000
--- a/devel/dmucs/files/patch-dmucs_db.cc
+++ /dev/null
@@ -1,46 +0,0 @@
---- dmucs_db.cc.orig	2008-07-07 23:02:33.000000000 +0700
-+++ dmucs_db.cc	2008-07-07 23:12:12.000000000 +0700
-@@ -63,7 +63,7 @@
- void
- DmucsDb::assignCpuToClient(const unsigned int clientIp,
-                            const DmucsDprop dprop,
--                           const unsigned int sock)
-+                           const void *sock)
- {
-     MutexMonitor m(&mutex_);
- 
-@@ -74,7 +74,7 @@
- 
- 
- void
--DmucsDb::releaseCpu(const unsigned int sock)
-+DmucsDb::releaseCpu(const void *sock)
- {
-     /* Get the dprop so that we can release the cpu back into the
-        correct sub-db in the DmucsDb. */
-@@ -146,7 +146,7 @@
- 
- void
- DmucsDpropDb::assignCpuToClient(const unsigned int hostIp,
--                                const unsigned int sock)
-+                                const void *sock)
- {
-     struct in_addr t2;
-     t2.s_addr = hostIp;
-@@ -164,13 +164,13 @@
- 
- 
- void
--DmucsDpropDb::releaseCpu(const unsigned int sock)
-+DmucsDpropDb::releaseCpu(const void *sock)
- {
--    DMUCS_DEBUG((stderr, "releaseCpu for socket 0x%x\n", sock));
-+    DMUCS_DEBUG((stderr, "releaseCpu for socket %p\n", sock));
- 
-     dmucs_assigned_cpus_iter_t itr = assignedCpus_.find(sock);
-     if (itr == assignedCpus_.end()) {
--	DMUCS_DEBUG((stderr, "No cpu found in assignedCpus for sock 0x%x\n",
-+	DMUCS_DEBUG((stderr, "No cpu found in assignedCpus for sock %p\n",
- 		     sock));
- 	return;
-     }
diff --git a/devel/dmucs/files/patch-dmucs_db.h b/devel/dmucs/files/patch-dmucs_db.h
deleted file mode 100644
index aa5ca828e31d..000000000000
--- a/devel/dmucs/files/patch-dmucs_db.h
+++ /dev/null
@@ -1,53 +0,0 @@
---- dmucs_db.h.orig	2008-07-07 23:02:38.000000000 +0700
-+++ dmucs_db.h	2008-07-07 23:10:18.000000000 +0700
-@@ -56,7 +56,7 @@
-     /* This is a mapping from sock address to host ip address -- the socket
-        of the connection from the "gethost" application to the dmucs server,
-        and the hostip of the cpu assigned to the "gethost" application. */
--    typedef std::map<const unsigned int, const unsigned int>
-+    typedef std::map<const void *, const unsigned int>
-     		dmucs_assigned_cpus_t;
-     typedef dmucs_assigned_cpus_t::iterator dmucs_assigned_cpus_iter_t;
- 
-@@ -98,12 +98,12 @@
-     bool 	haveHost(const struct in_addr &ipAddr);
-     unsigned int getBestAvailCpu();
-     void	assignCpuToClient(const unsigned int clientIp,
--				  const unsigned int cpuIp);
-+				  const void *cpuIp);
-     void 	moveCpus(DmucsHost *host, int oldTier, int newTier);
-     int 	delCpusFromTier(int tier, unsigned int ipAddr);
- 
-     void 	addNewHost(DmucsHost *host);
--    void	releaseCpu(const unsigned int sock);
-+    void	releaseCpu(const void *sock);
- 
-     void 	addToHostSet(dmucs_host_set_t *theSet, DmucsHost *host);
-     void 	delFromHostSet(dmucs_host_set_t *theSet, DmucsHost *host);
-@@ -154,7 +154,7 @@
-     /* A mapping of socket to distinguishing property -- so that when a
-        host is released and all we have is the socket information, we can
-        figure out which DpropDb to put the host back into. */
--    typedef std::map<int, DmucsDprop> dmucs_sock_dprop_db_t;
-+    typedef std::map<const void *, DmucsDprop> dmucs_sock_dprop_db_t;
-     typedef dmucs_sock_dprop_db_t::iterator dmucs_sock_dprop_db_iter_t;
- 
-     dmucs_sock_dprop_db_t sock2DpropDb_;
-@@ -197,7 +197,7 @@
-     }
-     void assignCpuToClient(const unsigned int clientIp,
-                            const DmucsDprop dprop,
--                           const unsigned int sock);
-+                           const void *sock);
-     void moveCpus(DmucsHost *host, int oldTier, int newTier) {
- 	MutexMonitor m(&mutex_);
- 	// Assume the DmucsDpropDb is definitely there.
-@@ -261,7 +261,7 @@
- 	return dbDb_.find(host->getDprop())->second.delFromUnavailDb(host);
-     }
- 
--    void releaseCpu(const unsigned int sock);
-+    void releaseCpu(const void *sock);
- 
-     void handleSilentHosts() {
- 	MutexMonitor m(&mutex_);
diff --git a/devel/dmucs/files/patch-dmucs_msg.cc b/devel/dmucs/files/patch-dmucs_msg.cc
deleted file mode 100644
index 48ff1958f5b8..000000000000
--- a/devel/dmucs/files/patch-dmucs_msg.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- dmucs_msg.cc.orig	2008-07-07 23:02:45.000000000 +0700
-+++ dmucs_msg.cc	2008-07-07 23:10:25.000000000 +0700
-@@ -130,7 +130,7 @@
- 
- 	fprintf(stderr, "Giving out %s\n", resolved_name.c_str());
- 
--	db->assignCpuToClient(cpuIpAddr, dprop_, (unsigned int) sock);
-+	db->assignCpuToClient(cpuIpAddr, dprop_, sock);
- #if 0
- 	fprintf(stderr, "The databases are now:\n");
- 	db->dump();
diff --git a/devel/dmucs/files/patch-main.cc b/devel/dmucs/files/patch-main.cc
deleted file mode 100644
index 5731c689f142..000000000000
--- a/devel/dmucs/files/patch-main.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.cc.orig	2008-07-07 23:03:07.000000000 +0700
-+++ main.cc	2008-07-07 23:05:51.000000000 +0700
-@@ -286,7 +286,7 @@
- 
-     if (Sgets(buf, BUFSIZE, sock_req) == NULL) {
- 	DMUCS_DEBUG((stderr, "Socket closed: %s\n", peer2buf(sock_req, buf)));
--	db->releaseCpu((unsigned int)sock_req);
-+	db->releaseCpu(sock_req);
- 	removeFd(sock_req);
- 	return;
-     }
diff --git a/devel/dmucs/files/patch-remhost.cc b/devel/dmucs/files/patch-remhost.cc
deleted file mode 100644
index a48d9091a400..000000000000
--- a/devel/dmucs/files/patch-remhost.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- remhost.cc.orig	2018-01-26 22:32:32.721538000 +0000
-+++ remhost.cc	2018-01-26 22:38:33.566682000 +0000
-@@ -62,7 +62,7 @@
-     std::ostringstream serverName;
-     serverName << "@" << SERVER_MACH_NAME;
-     int serverPortNum = SERVER_PORT_NUM;
--    char *distingProp = '\0';
-+    const char *distingProp = "";
- 
-     int nextarg = 1;
-     for (; nextarg < argc; nextarg++) {
diff --git a/devel/dmucs/pkg-descr b/devel/dmucs/pkg-descr
deleted file mode 100644
index d90b466caa63..000000000000
--- a/devel/dmucs/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-DMUCS is a system that allows a group of users to share a compilation farm.
-Each compilation request from each user will be sent to the fastest available
-machine, every time. The system has these fine qualities:
-* Supports multiple users compiling simultaneously, and scales well to handle
-the new loads.
-* Supports multiple operating systems in the compilation farm.
-* Uses all processors of a multi-processor compilation host.
-* Makes best use of compilation hosts with widely differing CPU speeds.
-* Guarantees that a compilation host will not be overloaded by compilations.
-* Takes into account the load on a host caused by non-compilation tasks.
-* Supports the dynamic addition and removal of hosts to the compilation farm.
-* Works with distcc, which need not be altered in any way.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404061347.436Dl8g6067677>