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
@@ -1,32 +1,29 @@
 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 <bsd.port.mk>
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, ":")) {