From nobody Sun Nov 28 16:17:59 2021 X-Original-To: dev-commits-ports-all@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 190BB18AD24B; Sun, 28 Nov 2021 16:18:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J2DD75D8tz3QVl; Sun, 28 Nov 2021 16:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8F45511A7C; Sun, 28 Nov 2021 16:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ASGHxq8086615; Sun, 28 Nov 2021 16:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ASGHxoS086614; Sun, 28 Nov 2021 16:17:59 GMT (envelope-from git) Date: Sun, 28 Nov 2021 16:17:59 GMT Message-Id: <202111281617.1ASGHxoS086614@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 5e543050a907 - main - sysutils/asmon: Mark DEPRECATED List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e543050a907914386b13078cdfda1eba7cdf95d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638116279; 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=DXShAQ8PDJLnaOqN/Y6B3IKE7gZ0PXI3w2RryJDglMk=; b=fqnOvj9hlkKcdkt1rGctARyCF3V0U7ty5WE5nSIep19m8/qZC8gFnlmOO0sDxjxswWuvgN hXiks6+yCskPMPkZ08eS9+1hBxs0dYkQZhTTKbfx46FAv7uwpn9chK8L3qLtPphl84muph xGQhmfE6zeIFjiKVvGarWFz/sv/Kt7n/vp5K/+trlUZmD0VyDofcK8QtfmnZ67iT5cXmji hBYzTWazRSGs9pHg25ABQjzcq1M81GAfjwr10lKKsjsdNKhBLsTm9/dYLiUsI9NZTGTUz6 7K/AErRgvzBvCPjMhNN+seekCyrvthc79SobelCy6lvRJZEZOB+ekIr5xTD/3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638116279; a=rsa-sha256; cv=none; b=pzgiYD5NzlNcuzkwp3bCJvB4wVnzzWmYmyzz0wYC887D1yr+pezBtu2Qy0U1ARUomlqG6Z e+R6WNdYZ7BlzDGxf6jDHy0tWGVaFQt9UxwQAhSM+y4hwyQRRhYBFgplkIdhebWL0mKWrR e2s9Jtkv4fdgwBHLqFVjhU3APOL8wF0BSbTP9ZbIWx6fUysHBL0FlWmU/OPa//p96/DpBk 9gTFnLuzwoURYqs7QfA8tWIgao8q4ikae2e8YahawFBJhXCmNME4iV51G2/D9Ff0bQ61U4 vi4KECnblqVp7Yz+OIaUq9R54Eqf7/BB0ordbH52CoC1OeizL8u6pK3d71sKGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e543050a907914386b13078cdfda1eba7cdf95d commit 5e543050a907914386b13078cdfda1eba7cdf95d Author: Muhammad Moinur Rahman AuthorDate: 2021-11-28 16:15:46 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-11-28 16:17:39 +0000 sysutils/asmon: Mark DEPRECATED - Fails to build on modern compilers - Set EXPIRATION_DATE to 2021-12-27 - Return to pool - Make patches makepatch compatible --- sysutils/asmon/Makefile | 10 +++++++--- sysutils/asmon/files/patch-asmon-asmon.c | 12 ++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile index 21027ea4a52c..bb2589087f7d 100644 --- a/sysutils/asmon/Makefile +++ b/sysutils/asmon/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 3 CATEGORIES= sysutils afterstep MASTER_SITES= AFTERSTEP/apps/asmon -MAINTAINER= bofh@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Swallowable applet monitors the CPU usage, memory, and swap, etc LICENSE= GPLv2 @@ -17,11 +17,15 @@ BROKEN_FreeBSD_14= fails to compile: read_mem.c: invalid use of undefined type ' BROKEN_mips= fails to compile: asmon.c: storage size of 'sum' isn't known BROKEN_mips64= fails to compile: asmon.c: storage size of 'sum' isn't known -BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon -CFLAGS+= -I${LOCALBASE}/include +DEPRECATED= Fails to build on modern FreeBSD +EXPIRATION_DATE= 2021-12-27 + USES= gmake xorg USE_CSTD= gnu89 USE_XORG= xpm x11 + +BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= asmon MAKE_ARGS+= LIBDIR="-L${LOCALBASE}/lib" \ SOLARIS_LIBS=-lkvm diff --git a/sysutils/asmon/files/patch-asmon-asmon.c b/sysutils/asmon/files/patch-asmon-asmon.c index 7fce50d6a099..39f0e813e1a6 100644 --- a/sysutils/asmon/files/patch-asmon-asmon.c +++ b/sysutils/asmon/files/patch-asmon-asmon.c @@ -1,15 +1,11 @@ ---- asmon/asmon.c.bak 2012-03-13 19:03:06.795252708 +0600 -+++ asmon/asmon.c 2012-03-13 19:04:16.395242371 +0600 -@@ -990,7 +990,11 @@ +--- asmon/asmon.c.orig 2000-07-20 11:08:47 UTC ++++ asmon/asmon.c +@@ -990,7 +990,7 @@ void DrawXmem(int Xpid, float total) kproc = kvm_getprocs(kd, KERN_PROC_PID, Xpid, &kcnt); - Xsize = kproc->kp_eproc.e_vm.vm_map.size / 1024; -+ #if __FreeBSD_version < 500000 -+ Xsize = kproc->kp_eproc.e_vm.vm_map.size / 1024; -+ #else -+ Xsize = kproc->ki_size / 1024; -+ #endif ++ Xsize = kproc->ki_size / 1024; #endif if(old_Xsize!=Xsize) {