From nobody Mon Dec 25 20:26:19 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 4SzTvH4lGYz54qPq; Mon, 25 Dec 2023 20:26:19 +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 4SzTvH4CDPz3FRl; Mon, 25 Dec 2023 20:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703535979; 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=gpQjmOaPgio7/uSMc7Ux3bRgZoSfB1/7BKzKyJ0MAGU=; b=sZTS70CsOD4p09GESlohd4aa/Mf/oo4vy0N4+LQchc2RLym7YVUoML7zm4YaWmUtUACoWu Q2G9i6TUeVbb2b/80LjWaE4F/Slcmh1z1IVpzvOsKGRWL+N0l/M2q2Z76xRZackIPcW6+6 IzW88QT00tVdMG1MeBhNKoNbekOEr/9I67ew6+Rogq2yeqpNMObnto2LJwaIQmnlJWgdDd I5PVC8q7XicEl2uoq8cFVPp/BNGnD0T4mauo3m9VqzTUpsJM7QI223z64h8L9gUspEnI5D YNZhxqJVCgA2AIxRIELcI5eMSqifxmW28/MXH0VqJ8bTQ6dqtLsdWH8l7PsW8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703535979; a=rsa-sha256; cv=none; b=iZvmr4UlxSJnL7uVHVe8YOw27QE6wJWNnpYWmcHwQ60SwUsdwfkL4+P+BPLYl10FIDN3UN s9DFvZk6exXDX+4vtl5txUCBtEcC1jlFOy9+JNEQvZCrq97M2DNA4898vYb4R1vflvPq0v fm1J3B9hE8ZUo3pZmyMlNuSztJoBihNjinHKyJ5ZidqAsLsojXZ+9Ic1X+1LX1+1MP0gyC 3WXVYfgRUbUXKnE2cIiVK7p0Ha4KdpbYWcdGLkOnTrd2IEzlkBQsisdVw3JMAo9YpeDBR1 coY0Xk8x9bEYc+TSFL4irDO790BVpVyJRpOrPTKH7yF8K0/96stX9xjMxYXS9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703535979; 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=gpQjmOaPgio7/uSMc7Ux3bRgZoSfB1/7BKzKyJ0MAGU=; b=lS44PatW6JxLDnn0er+E30CK8Q0ovBo33vEfVUw1KYxYQKOSc88xBKuOCgzslo/f6hZJ8y /BAyQL2mH1U4PwsRP43aLRun5MIUUV9G5IKldHfSFVOj3ZFARJ4CFxGj7E6YpacYCMdv/W 0q+OcfN+NLRsVTuhr5YtMnSEocZ4eGdMx8hzTYlTUdGgI1NENQ42Hz5zNs6Hq3BgnTGoAK g4OFMeE2fbCsx+7mx/toAYwqsmI2+6zLFZuNyzN44Ha15kEKB3P9RAOOptJUKcG3LHAb1h jmKiGgB7t8GlL/FAB+YWMxYBnopaJfWPnnlKLET6qklehycvp9WtnMmpuipVWA== 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 4SzTvH2yyKz9Kn; Mon, 25 Dec 2023 20:26:19 +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 3BPKQJ33031192; Mon, 25 Dec 2023 20:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPKQJoi031189; Mon, 25 Dec 2023 20:26:19 GMT (envelope-from git) Date: Mon, 25 Dec 2023 20:26:19 GMT Message-Id: <202312252026.3BPKQJoi031189@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: abbd3172a946 - main - x11-wm/selectwm: undeprecate, clean the port up, take maintainership 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: abbd3172a9465e6dac7df52e53d391fec31e7ca2 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=abbd3172a9465e6dac7df52e53d391fec31e7ca2 commit abbd3172a9465e6dac7df52e53d391fec31e7ca2 Author: Alexey Dokuchaev AuthorDate: 2023-12-25 20:25:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-12-25 20:25:00 +0000 x11-wm/selectwm: undeprecate, clean the port up, take maintainership Rephrase COMMENT for better readability and shortness, chase HTTP/1.1 301 redirection in MASTER_SITES, amend USE_GNOME per stage Q/A report, tighten CFLAGS and getline(1)-related patching. --- x11-wm/selectwm/Makefile | 21 +++++++++------------ x11-wm/selectwm/files/patch-src_options.c | 20 -------------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile index 84b4cbc66ccf..8cb4b66054f9 100644 --- a/x11-wm/selectwm/Makefile +++ b/x11-wm/selectwm/Makefile @@ -2,31 +2,28 @@ PORTNAME= selectwm PORTVERSION= 0.4.1 PORTREVISION= 12 CATEGORIES= x11-wm -MASTER_SITES= http://ordiluc.net/selectwm/ +MASTER_SITES= https://ordiluc.net/selectwm/ -MAINTAINER= ports@FreeBSD.org -COMMENT= GTK application to let you select a window manager when starting X +MAINTAINER= danfe@FreeBSD.org +COMMENT= Select a window manager when starting X11 WWW= https://ordiluc.net/selectwm/ -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Last upstream release was in 2004 -EXPIRATION_DATE= 2024-01-18 - USES= gnome pkgconfig tar:bzip2 -USE_GNOME= gtk20 - GNU_CONFIGURE= yes +USE_GNOME= cairo gdkpixbuf2 gtk20 PLIST_FILES= bin/selectwm share/locale/fr/LC_MESSAGES/selectwm.mo \ man/man1/selectwm.1.gz post-patch: - @${REINPLACE_CMD} -e 's,-O2,${CFLAGS},g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,^CFLAGS =,CFLAGS +=,' -e 's,-O2,,' \ + @${REINPLACE_CMD} -e '/^AM_CFLAGS = /s,-s -O2 -Wall ,,' \ ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e 's|#define G.*DISABLE_DEPRECATED||g' \ + @${REINPLACE_CMD} -e '/^#define G.*DISABLE_DEPRECATED/d' \ ${WRKSRC}/src/define.h + @${REINPLACE_CMD} -e 's,getline (,_${PORTNAME}_local_&,' \ + ${WRKSRC}/src/options.c .include diff --git a/x11-wm/selectwm/files/patch-src_options.c b/x11-wm/selectwm/files/patch-src_options.c deleted file mode 100644 index 33f84bf5e891..000000000000 --- a/x11-wm/selectwm/files/patch-src_options.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/options.c.orig 2002-05-22 17:39:27 UTC -+++ src/options.c -@@ -32,7 +32,7 @@ - #include "miscui.h" - #include "modify.h" - --static GString *getline (FILE *fichier) { -+static GString *get_line (FILE *fichier) { - GString *temp; - gchar buf[128]; - -@@ -64,7 +64,7 @@ static gint read_config_file (config *se - } - buf = g_string_new (""); - while (!feof (config)) { -- buf = getline (config); -+ buf = get_line (config); - - if (buf->len > 0 && buf->str[0] != '#') { - if (g_strrstr (buf->str, ":")) {