From nobody Fri Jul 21 04:57:54 2023 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 4R6ckW5dHxz4p9WV; Fri, 21 Jul 2023 04:57:55 +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 4R6ckW2Cl2z3yBF; Fri, 21 Jul 2023 04:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689915475; 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=e53JruxUBfYAdBP1zxbYGVg5obyY4VuGZhsj3I2rHMg=; b=CHneh5b9tvaS0rynuZVllRO2Fgxtlfv/2jRr2yVGtY7uj0XM8Jkw83IwYuC1IBCfmfy2dZ t9l1HBtp1WYV7nk37JyxeZbCXPW6cH8z23d646A15f9+0mqVZnZXtFUmbSa4bRAH+TEkpZ Dx2HM37cQrfgbKPRF8O5EYj5GzzUluOq5I4PgtLwmLbaQpHb9nuJR4LM2rvof4KJY6ZYrs qw4Dsdp8yw1EZYJ07Un696q9MQvvZLbfyWvN0GRyghDcQ1OCEU158dj6npubcbsYs5S9M7 xME2EvewCZBFirgtPnRT5kMSF00I7KJIxRiFFLEgEyzFPROZqJ8Hip/Uz5xoOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689915475; 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=e53JruxUBfYAdBP1zxbYGVg5obyY4VuGZhsj3I2rHMg=; b=VraSyH02i/iLkhzJCKBuikpouris126zTBEIFfHpe59EDdS2XpbWoQFWKGY/HrUw8FJMkw ZJ4DsgCSQiZ6mOaMHJrOGe7RVkrY0OxkeUxEsGxXKxyozomk4oMflYC/gaWybb18zhCfYc 2FZ5IKVDHJAoungklRTar5ZQiKbzO0EwCSbAP6grtHJHO+KTUhUYyYWmThHM96uh5LFqH2 usVdWSd/BOUPB7g9H+mAlJwk0GLhUAj9hn3mNYPdHXvs5WNY06DLBWOP6391+xjKF7TYYB NioUCoEdQjS5BgB+/b+1eeiFSXGRWNqFz4qNISN6+384VGuXFlo+cggJblnWpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689915475; a=rsa-sha256; cv=none; b=C51GKvfGIPVvnuNo3Nlva+qScSiti6xPKTOyfi/o+qedxd5QUfHkF+yy72GJdQrst6Fp9p LCl4bcrP/H0uSZ1AJ3zfzavlGL/Q4xrPiTPPmdnIzNYQFC5y5MA3ibfzWHGGODYzfD38Tl RH6Yosk9aVY5JwaGFEhcySyPKg0xbIiJhYnP5It1S05f4L0+GCSQ6HjzM0l/mOktNwgcb7 DJPnzA0VROHt+CfzuNcg46heVC7N/RKXSyFTncbAfYR5gGz7cs5SZmtatA2/htb3UYUiRa jzrUHoxkKgZcLWhV/2zN3cygGF9Gqx2Uu+L1QylX9OGyhp3pG0AydSnsHl4zLg== 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 4R6ckW0qJnzyxf; Fri, 21 Jul 2023 04:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L4vsad048149; Fri, 21 Jul 2023 04:57:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L4vsgb048148; Fri, 21 Jul 2023 04:57:54 GMT (envelope-from git) Date: Fri, 21 Jul 2023 04:57:54 GMT Message-Id: <202307210457.36L4vsgb048148@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 8010c52fdd45 - main - sysutils/wmmemfree: clean the port up prior to unbreaking it (+) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8010c52fdd4568b8253b31513ee016194c9f688d Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8010c52fdd4568b8253b31513ee016194c9f688d commit 8010c52fdd4568b8253b31513ee016194c9f688d Author: Alexey Dokuchaev AuthorDate: 2023-07-21 04:56:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-07-21 04:56:32 +0000 sysutils/wmmemfree: clean the port up prior to unbreaking it (+) Ditch most of the gratuitous patching of the program's Makefile as we only need to adjust object files, compiler, and libraries. --- sysutils/wmmemfree/Makefile | 4 +-- sysutils/wmmemfree/files/patch-Makefile | 64 +++++++++------------------------ 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile index 13956535685d..37ffa81f9091 100644 --- a/sysutils/wmmemfree/Makefile +++ b/sysutils/wmmemfree/Makefile @@ -15,8 +15,8 @@ BROKEN_FreeBSD_14= fails to compile: read_mem.c: invalid use of undefined type ' BROKEN_mips= fails to compile: mem_freebsd.c: storage size of 'vm' isn't known BROKEN_mips64= fails to compile: mem_freebsd.c: storage size of 'vm' isn't known -USES= tar:bzip2 xorg -USE_XORG= xpm +USES= localbase tar:bzip2 xorg +USE_XORG= x11 xext xpm PLIST_FILES= "@(,kmem,2555) bin/wmmemfree" man/man1/${PORTNAME}.1.gz diff --git a/sysutils/wmmemfree/files/patch-Makefile b/sysutils/wmmemfree/files/patch-Makefile index ef220cc50a7b..26f34c806042 100644 --- a/sysutils/wmmemfree/files/patch-Makefile +++ b/sysutils/wmmemfree/files/patch-Makefile @@ -1,54 +1,24 @@ ---- Makefile.orig Sat Mar 22 02:59:07 2003 -+++ Makefile Fri Apr 11 12:50:48 2003 -@@ -1,38 +1,17 @@ --#Makefile -+CC ?= cc -+LDIR = -L${LOCALBASE}/lib -+IDIR = -I${LOCALBASE}/include +--- Makefile.orig 2003-03-21 20:59:07 UTC ++++ Makefile +@@ -1,18 +1,18 @@ + #Makefile --PROG=wmmemfree + PROG=wmmemfree -OBJS=dockapp.o draw.o mem_linux.o options.o wmmemfree.o -+LIBS = -lX11 -lXpm -lXext -lkvm ++OBJS=dockapp.o draw.o mem_freebsd.o options.o wmmemfree.o --PREFIX=/usr/local --BINDIR=$(PREFIX)/bin --MANUALDIR=$(PREFIX)/share/man/man1 + PREFIX=/usr/local + BINDIR=$(PREFIX)/bin + MANUALDIR=$(PREFIX)/share/man/man1 -CC=gcc --STRIP=strip --FLAGS=-Wall -O2 --RM=rm -f --INST=install --MANUAL=$(PROG).1 ++CC?=gcc + STRIP=strip + FLAGS=-Wall -O2 + RM=rm -f + INST=install + MANUAL=$(PROG).1 -LIBS=-L/usr/X11R6/lib -lX11 -lXext -lXpm -+OBJS = dockapp.o\ -+ draw.o\ -+ mem_freebsd.o\ -+ options.o\ -+ wmmemfree.o ++LIBS+=-lX11 -lXext -lXpm -lkvm --all: $(PROG) -+.c.o: -+ ${CC} ${CFLAGS} ${IDIR} ${DEFS} -c $< -o $*.o + all: $(PROG) --$(PROG): $(OBJS) -- $(CC) -o $(PROG) $(OBJS) $(LIBS) -- $(STRIP) $(PROG) --%.o: %.c -- $(CC) $(FLAGS) -c $< -o $@ --clean: -- $(RM) $(OBJS) $(PROG) --install: $(PROG) -- $(INST) -m 755 $(PROG) $(BINDIR) -- $(INST) -m 644 $(MANUAL) $(MANUALDIR) --uninstall: -- $(RM) $(BINDIR)/$(PROG) -- $(RM) $(MANUALDIR)/$(MANUAL) -- --dockapp.o: dockapp.c wmmemfree.h options.h draw.h xpm/bg.xpm xpm/on.xpm \ -- xpm/off.xpm xpm/numbers.xpm xpm/panel.xpm --draw.o: draw.c dockapp.h draw.h mem_linux.h options.h --mem_linux.o: mem_linux.c --options.o: options.c wmmemfree.h options.h --wmmemfree.o: wmmemfree.c wmmemfree.h dockapp.h draw.h options.h -+all: ${OBJS} -+ ${CC} ${CFLAGS} -o wmmemfree ${OBJS} ${LDIR} ${LIBS}