Index | Thread | Search

From:
Antoine Jacoutot <ajacoutot@bsdfrog.org>
Subject:
[update] lang/librep x11/rep-gtk x11/sawfish
To:
ports@openbsd.org
Date:
Sun, 14 Jun 2026 10:59:48 +0200

Download raw body.

Thread
Hi.

While looking at fixing x11/rep-gtk for llvm22, I found that these ports where
out of date.
In the meantime, rep-gtk got fixed (thank you daniel@).

Fetching from tuxfamily.org has been broken for days, so fetch from github.

OK?

 
Index: lang/librep/Makefile
===================================================================
RCS file: /cvs/ports/lang/librep/Makefile,v
diff -u -p -r1.76 Makefile
--- lang/librep/Makefile	21 Nov 2023 12:21:51 -0000	1.76
+++ lang/librep/Makefile	14 Jun 2026 08:56:38 -0000
@@ -1,24 +1,22 @@
 COMMENT=	Emacs Lisp-like runtime library
 
-VERSION=	0.92.3
+VERSION=	0.92.7
+GH_ACCOUNT=	SawfishWM
+GH_PROJECT=	librep
+GH_TAGNAME=	librep-${VERSION}
 DISTNAME=	librep-${VERSION}
-REVISION=	5
 
-SHARED_LIBS +=  rep                  14.0     # .16.0
+SHARED_LIBS +=  rep                  14.0     # 14.0
 
 CATEGORIES=	lang
 
-HOMEPAGE=	https://librep.sourceforge.net/
+HOMEPAGE=	https://sawfish.tuxfamily.org/
 
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
 WANTLIB=  c ffi gdbm gmp iconv intl m curses pthread readline
 
-SITES=           	https://download.tuxfamily.org/librep/
-EXTRACT_SUFX=           .tar.xz
-
-
 LIB_DEPENDS=		databases/gdbm \
 			devel/gmp \
 			devel/libffi
@@ -27,7 +25,10 @@ USE_GMAKE=		Yes
 
 MAKE_FLAGS=		rep_LIBTOOL=${LIBTOOL}
 
-CONFIGURE_STYLE=	gnu
+AUTOCONF_VERSION=	2.72
+AUTOMAKE_VERSION=	1.18
+
+CONFIGURE_STYLE=	autoreconf
 CONFIGURE_ARGS+=	--enable-static \
 			--with-aclocaldir=${PREFIX}/share/aclocal
 .if ${MACHINE_ARCH} == hppa
Index: lang/librep/distinfo
===================================================================
RCS file: /cvs/ports/lang/librep/distinfo,v
diff -u -p -r1.17 distinfo
--- lang/librep/distinfo	19 Jan 2015 09:19:15 -0000	1.17
+++ lang/librep/distinfo	14 Jun 2026 08:56:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (librep-0.92.3.tar.xz) = RcmKW7395PHZjjg5sxnZrhWFfS0a6OODjZoY1T8+i4U=
-SIZE (librep-0.92.3.tar.xz) = 607128
+SHA256 (librep-0.92.7.tar.gz) = kY+geJaVDIH3fnVlgbwh1+scn5dm4iz33QANgpcnUS8=
+SIZE (librep-0.92.7.tar.gz) = 610892
Index: lang/librep/patches/patch-src_repint_h
===================================================================
RCS file: lang/librep/patches/patch-src_repint_h
diff -N lang/librep/patches/patch-src_repint_h
--- lang/librep/patches/patch-src_repint_h	6 Feb 2023 19:39:19 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: src/repint.h
---- src/repint.h.orig
-+++ src/repint.h
-@@ -244,8 +244,8 @@ typedef struct rep_cons_block_struct {
-    call when the heap needs to grow. */
- 
- #if defined __GNUC__ && defined __OPTIMIZE__
--extern __inline__ repv inline_Fcons (repv x, repv y);
--extern __inline__ repv
-+static __inline__ repv inline_Fcons (repv x, repv y);
-+static __inline__ repv
- inline_Fcons (repv x, repv y)
- {
-     rep_cons *c = rep_cons_freelist;
Index: x11/rep-gtk/Makefile
===================================================================
RCS file: /cvs/ports/x11/rep-gtk/Makefile,v
diff -u -p -r1.74 Makefile
--- x11/rep-gtk/Makefile	13 Jun 2026 18:47:53 -0000	1.74
+++ x11/rep-gtk/Makefile	14 Jun 2026 08:56:38 -0000
@@ -1,11 +1,14 @@
 COMMENT=	GTK+ binding for librep Lisp environment
 
-VERSION=	0.90.8.1
+VERSION=	0.90.8.3
+GH_ACCOUNT=	SawfishWM
+GH_PROJECT=	rep-gtk
+GH_TAGNAME=	rep-gtk-${VERSION}
 DISTNAME=	rep-gtk-${VERSION}
+
 CATEGORIES=     x11
-REVISION=	9
 
-HOMEPAGE=       https://rep-gtk.sourceforge.net/
+HOMEPAGE=	https://sawfish.tuxfamily.org/
 
 # GPLv2
 PERMIT_PACKAGE=	Yes
@@ -18,11 +21,8 @@ WANTLIB += graphite2 gtk-x11-2.0 harfbuz
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png xcb
 WANTLIB += xcb-render xcb-shm z
 
-SITES=			https://download.tuxfamily.org/librep/rep-gtk/
-EXTRACT_SUFX=		.tar.xz
-
-BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		lang/librep>=0.92.2
+BUILD_DEPENDS=		lang/librep>=0.92.7
+RUN_DEPENDS=		lang/librep>=0.92.7
 LIB_DEPENDS= 		devel/gettext,-runtime \
 			x11/gtk+2
 
@@ -30,7 +30,10 @@ USE_GMAKE=		Yes
 
 CFLAGS_base-clang =	-Wno-error=int-conversion
 
-CONFIGURE_STYLE=	gnu
+AUTOCONF_VERSION=	2.72
+AUTOMAKE_VERSION=	1.18
+
+CONFIGURE_STYLE=	autoreconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
Index: x11/rep-gtk/distinfo
===================================================================
RCS file: /cvs/ports/x11/rep-gtk/distinfo,v
diff -u -p -r1.14 distinfo
--- x11/rep-gtk/distinfo	18 Jan 2015 03:16:01 -0000	1.14
+++ x11/rep-gtk/distinfo	14 Jun 2026 08:56:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (rep-gtk-0.90.8.1.tar.xz) = rrsq41bLEaKlplFnA/G1xtHXHEhxW8NAwT25i5vRplA=
-SIZE (rep-gtk-0.90.8.1.tar.xz) = 251652
+SHA256 (rep-gtk-0.90.8.3.tar.gz) = cVGZd/qIG8ezWBDFDQkiQzE0wDT+NbzrWA280ulE6lA=
+SIZE (rep-gtk-0.90.8.3.tar.gz) = 151135
Index: x11/rep-gtk/patches/patch-rep-gtk_h
===================================================================
RCS file: /cvs/ports/x11/rep-gtk/patches/patch-rep-gtk_h,v
diff -u -p -r1.4 patch-rep-gtk_h
--- x11/rep-gtk/patches/patch-rep-gtk_h	13 Jun 2026 18:47:53 -0000	1.4
+++ x11/rep-gtk/patches/patch-rep-gtk_h	14 Jun 2026 08:56:38 -0000
@@ -6,7 +6,7 @@ Adapted from https://src.fedoraproject.o
 Index: rep-gtk.h
 --- rep-gtk.h.orig
 +++ rep-gtk.h
-@@ -340,6 +340,14 @@ void gtk_color_selection_set_color_interp (GtkColorSel
+@@ -341,6 +341,14 @@ void gtk_color_selection_set_color_interp (GtkColorSel
  GdkColor *gtk_color_selection_get_color_interp (GtkColorSelection *sel);
  char *gtk_color_button_get_color_interp (GtkColorButton *button);
  extern void gtk_widget_draw_interp (GtkWidget *widget);
Index: x11/sawfish/Makefile
===================================================================
RCS file: /cvs/ports/x11/sawfish/Makefile,v
diff -u -p -r1.90 Makefile
--- x11/sawfish/Makefile	27 Sep 2023 20:37:22 -0000	1.90
+++ x11/sawfish/Makefile	14 Jun 2026 08:56:38 -0000
@@ -1,17 +1,14 @@
 COMMENT=		extensible window manager
 
-VERSION=		1.12.90
-DISTNAME=		sawfish_${VERSION}
-PKGNAME=		sawfish-${VERSION}
-REVISION=		4
+VERSION=		1.13.0
+GH_ACCOUNT=		SawfishWM
+GH_PROJECT=		sawfish
+GH_TAGNAME=		sawfish-${VERSION}
+DISTNAME=		sawfish-${VERSION}
 
 CATEGORIES=		x11
 
-SITES=			https://download.tuxfamily.org/sawfish/ \
-			https://download.tuxfamily.org/sawfish/Archive/
-EXTRACT_SUFX=		.tar.xz
-
-HOMEPAGE=		https://sawfish.fandom.com/wiki/Main_Page
+HOMEPAGE=		https://sawfish.tuxfamily.org/
 
 # GPLv2
 # Sounds: Artistic License 2.0
@@ -38,10 +35,10 @@ LIB_DEPENDS=		devel/gettext,-runtime \
 			lang/librep \
 			x11/gtk+2
 
-USE_GMAKE=	      Yes
+USE_GMAKE=		Yes
 
-AUTOCONF_VERSION=	2.69
-AUTOMAKE_VERSION=	1.16
+AUTOCONF_VERSION=	2.72
+AUTOMAKE_VERSION=	1.18
 
 CONFIGURE_STYLE=	autoreconf
 
@@ -54,7 +51,7 @@ CONFIGURE_ARGS=		--with-gnome-prefix=${L
 CONFIGURE_ARGS +=	--without-kde4session \
 			--without-kde5session
 
-NO_TEST=	Yes
+NO_TEST=		Yes
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/themes/Makefile.in
Index: x11/sawfish/distinfo
===================================================================
RCS file: /cvs/ports/x11/sawfish/distinfo,v
diff -u -p -r1.18 distinfo
--- x11/sawfish/distinfo	30 Dec 2019 14:10:52 -0000	1.18
+++ x11/sawfish/distinfo	14 Jun 2026 08:56:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (sawfish_1.12.90.tar.xz) = YVQVExLZnJfQph+DoN0mMOQnvrsa4hGec3IniXHW6KI=
-SIZE (sawfish_1.12.90.tar.xz) = 2602372
+SHA256 (sawfish-1.13.0.tar.gz) = SL1jxmD82Qh/8eG8hP97U2fczK/U8m6qYMwPFYItaKg=
+SIZE (sawfish-1.13.0.tar.gz) = 5043050
Index: x11/sawfish/patches/patch-src_flippers_c
===================================================================
RCS file: x11/sawfish/patches/patch-src_flippers_c
diff -N x11/sawfish/patches/patch-src_flippers_c
--- x11/sawfish/patches/patch-src_flippers_c	11 Mar 2022 20:17:19 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-Fix "multiple definition of" errors
-https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
-
-Index: src/flippers.c
---- src/flippers.c.orig
-+++ src/flippers.c
-@@ -22,10 +22,6 @@
- 
- static Window edge_left, edge_right, edge_top, edge_bottom;
- 
--DEFSYM(left, "left");
--DEFSYM(right, "right");
--DEFSYM(top, "top");
--DEFSYM(bottom, "bottom");
- DEFSYM(enter_flipper_hook, "enter-flipper-hook");
- DEFSYM(leave_flipper_hook, "leave-flipper-hook");
- 
-@@ -155,10 +151,6 @@ flippers_init (void)
- 
-     rep_pop_structure (tem);
- 
--    rep_INTERN (left);
--    rep_INTERN (right);
--    rep_INTERN (top);
--    rep_INTERN (bottom);
-     rep_INTERN_SPECIAL (enter_flipper_hook);
-     rep_INTERN_SPECIAL (leave_flipper_hook);
-     Fset(Qenter_flipper_hook, Qnil);
Index: x11/sawfish/patches/patch-src_functions_c
===================================================================
RCS file: x11/sawfish/patches/patch-src_functions_c
diff -N x11/sawfish/patches/patch-src_functions_c
--- x11/sawfish/patches/patch-src_functions_c	11 Mar 2022 20:17:19 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Fix "multiple definition of" errors
-https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
-
-Index: src/functions.c
---- src/functions.c.orig
-+++ src/functions.c
-@@ -65,7 +65,6 @@ static int xinerama_heads;
- # endif
- #endif
- 
--DEFSYM(root, "root");
- DEFSYM(after_restacking_hook, "after-restacking-hook");
- DEFSYM(position, "position");
- DEFSYM(spacing, "spacing");
-@@ -1406,7 +1405,6 @@ functions_init (void)
-     rep_ADD_SUBR(Ssend_client_message);
-     rep_pop_structure (tem);
- 
--    rep_INTERN(root);
-     rep_INTERN_SPECIAL(after_restacking_hook);
-     Fset(Qafter_restacking_hook, Qnil);
-     rep_INTERN(position);
Index: x11/sawfish/patches/patch-src_sawfish_subrs_h
===================================================================
RCS file: x11/sawfish/patches/patch-src_sawfish_subrs_h
diff -N x11/sawfish/patches/patch-src_sawfish_subrs_h
--- x11/sawfish/patches/patch-src_sawfish_subrs_h	11 Mar 2022 20:17:19 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Fix "multiple definition of" errors
-https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
-
-Index: src/sawfish_subrs.h
---- src/sawfish_subrs.h.orig
-+++ src/sawfish_subrs.h
-@@ -79,7 +79,7 @@ extern void (*event_handlers[LASTEvent])(XEvent *ev);
- extern Time last_event_time;
- extern XEvent *current_x_event;
- extern repv Qvisibility_notify_hook, Qdestroy_notify_hook, Qmap_notify_hook,
--    Qunmap_notify_hook, Qreparent_notify_hook, Qenter_notify_hook,
-+    Qunmap_notify_hook, Qreparent_notify_hook, Qenter_notify_hook, Qroot,
-     Qleave_notify_hook, Qfocus_in_hook, Qfocus_out_hook, Qclient_message_hook,
-     Qwindow_moved_hook, Qwindow_resized_hook, Qrandr_change_notify_hook;
- extern repv Qiconify_window, Quniconify_window;
-@@ -158,7 +158,7 @@ extern void frames_init (void);
- extern void frames_kill (void);
- 
- /* from functions.c */
--extern repv Qroot, Qafter_restacking_hook, Qposition, Qspacing;
-+extern repv Qafter_restacking_hook, Qposition, Qspacing;
- extern repv Fdelete_window (repv win);
- extern repv Fdestroy_window (repv win);
- extern repv Frestack_windows (repv list);
Index: x11/sawfish/patches/patch-src_windows_c
===================================================================
RCS file: x11/sawfish/patches/patch-src_windows_c
diff -N x11/sawfish/patches/patch-src_windows_c
--- x11/sawfish/patches/patch-src_windows_c	11 Mar 2022 20:17:19 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Fix "multiple definition of" errors
-https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
-
-Index: src/windows.c
---- src/windows.c.orig
-+++ src/windows.c
-@@ -75,7 +75,6 @@ DEFSYM(north_west, "north-west");
- DEFSYM(north, "north");
- DEFSYM(north_east, "north-east");
- DEFSYM(west, "west");
--DEFSYM(center, "center");
- DEFSYM(east, "east");
- DEFSYM(south_west, "south-west");
- DEFSYM(south, "south");
-@@ -1845,7 +1844,6 @@ windows_init (void)
-     rep_INTERN(north);
-     rep_INTERN(north_east);
-     rep_INTERN(west);
--    rep_INTERN(center);
-     rep_INTERN(east);
-     rep_INTERN(south_west);
-     rep_INTERN(south);
Index: x11/sawfish/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/sawfish/pkg/PLIST,v
diff -u -p -r1.24 PLIST
--- x11/sawfish/pkg/PLIST	11 Mar 2022 20:17:19 -0000	1.24
+++ x11/sawfish/pkg/PLIST	14 Jun 2026 08:56:38 -0000
@@ -200,8 +200,6 @@ share/sawfish/lisp/poweroff.jl
 share/sawfish/lisp/poweroff.jlc
 share/sawfish/lisp/prompt.jl
 share/sawfish/lisp/prompt.jlc
-share/sawfish/lisp/razor-int.jl
-share/sawfish/lisp/razor-int.jlc
 share/sawfish/lisp/rects.jl
 share/sawfish/lisp/rects.jlc
 share/sawfish/lisp/sawfish/
@@ -390,8 +388,6 @@ share/sawfish/lisp/sawfish/wm/integratio
 share/sawfish/lisp/sawfish/wm/integration/lxde.jlc
 share/sawfish/lisp/sawfish/wm/integration/mate.jl
 share/sawfish/lisp/sawfish/wm/integration/mate.jlc
-share/sawfish/lisp/sawfish/wm/integration/razor.jl
-share/sawfish/lisp/sawfish/wm/integration/razor.jlc
 share/sawfish/lisp/sawfish/wm/integration/xfce.jl
 share/sawfish/lisp/sawfish/wm/integration/xfce.jlc
 share/sawfish/lisp/sawfish/wm/keymaps.jl


-- 
Antoine