Here is an update for wmtz. dockapps.net provides an old version, i preferred to use what they have in their git head, which is already provided by Gentoo, because this new version uses libdockapp, this avoids duplicating patches in wmgeneral.
Port-wise: - FIX_EXTRACT_PERMISSIONS is not needed anymore - their install target is still not good, so keep our own Testing: It builds and runs fine on amd64 and macppc with the provided sample configuration file. Comments/feedback are welcome, Charlène. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/wmtz/Makefile,v retrieving revision 1.24 diff -u -p -u -p -r1.24 Makefile --- Makefile 12 Jul 2019 20:51:24 -0000 1.24 +++ Makefile 1 Feb 2021 13:24:26 -0000 @@ -2,22 +2,28 @@ COMMENT= wm-dockapp; displays the time in different time zones -DISTNAME= wmtz-0.7 -REVISION= 3 +DISTNAME= wmtz-0.7_p20150816 +PKGNAME= ${DISTNAME:S/_p/./} + CATEGORIES= x11 x11/windowmaker -FIX_EXTRACT_PERMISSIONS=Yes HOMEPAGE= http://www.dockapps.net/wmtz # GPL PERMIT_PACKAGE= Yes -WANTLIB= X11 Xext Xpm c m +WANTLIB= X11 Xext Xpm c dockapp m + +# dockapps.net only provides an old tarball without libdockapp support. +MASTER_SITES= http://distfiles.gentoo.org/distfiles/ -MASTER_SITES= http://www.dockapps.net/download/ +LIB_DEPENDS= devel/libdockapp>=0.7.3 -MAKE_FLAGS= CC="${CC}" +MAKE_ENV+= CC="${CC}" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" NO_TEST= Yes + +CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include +LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib WRKSRC= ${WRKDIST}/wmtz Index: distinfo =================================================================== RCS file: /cvs/ports/x11/wmtz/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo 18 Jan 2015 03:16:04 -0000 1.4 +++ distinfo 1 Feb 2021 13:24:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (wmtz-0.7.tar.gz) = ywnmSpgjs9px5ULXzGbmy9ATWAm+4eVl0YrNzwVlgjo= -SIZE (wmtz-0.7.tar.gz) = 26350 +SHA256 (wmtz-0.7_p20150816.tar.gz) = Dvi7e3qRLm8vLOiOblv4CAzNlUv2JYikNTKzQzK6Lls= +SIZE (wmtz-0.7_p20150816.tar.gz) = 19310 Index: patches/patch-wmgeneral_list_h =================================================================== RCS file: patches/patch-wmgeneral_list_h diff -N patches/patch-wmgeneral_list_h --- patches/patch-wmgeneral_list_h 3 May 2017 19:29:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/03 19:29:45 jca Exp $ ---- wmgeneral/list.h.orig -+++ wmgeneral/list.h -@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA. */ - #ifndef __LIST_H_ - #define __LIST_H_ - --#if defined(__GNUC__) && !defined(__STRICT_ANSI__) --# define INLINE inline --#else -+#if 1 - # define INLINE - #endif - Index: patches/patch-wmtz_Makefile =================================================================== RCS file: /cvs/ports/x11/wmtz/patches/patch-wmtz_Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-wmtz_Makefile --- patches/patch-wmtz_Makefile 15 Jun 2001 09:59:34 -0000 1.2 +++ patches/patch-wmtz_Makefile 1 Feb 2021 13:24:26 -0000 @@ -1,26 +1,23 @@ $OpenBSD: patch-wmtz_Makefile,v 1.2 2001/06/15 09:59:34 wilfried Exp $ ---- wmtz/Makefile.orig Sun Mar 11 14:57:59 2001 -+++ wmtz/Makefile Fri Jun 15 11:49:09 2001 -@@ -1,8 +1,5 @@ +Index: wmtz/Makefile +--- wmtz/Makefile.orig ++++ wmtz/Makefile +@@ -1,15 +1,11 @@ -CC = gcc -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib - LIBS = -lXpm -lXext -lX11 -lm + LIBS = -lXpm -lXext -lX11 -lm -ldockapp -FLAGS = -O2 -DESTDIR = /usr/local - OBJS = wmtz.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ -@@ -10,10 +7,10 @@ OBJS = wmtz.o \ - +-OBJS = wmtz.o ++OBJS = wmtz.o .c.o: - $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o -+ $(CC) -I${X11BASE}/include ${CFLAGS} -c $< -o $@ ++ $(CC) $(CFLAGS) -c $< -o $@ wmtz: $(OBJS) - $(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS) -+ $(CC) ${CFLAGS} -o $@ ${OBJS} $(LIBDIR) $(LIBS) ++ $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) all:: wmtz Index: patches/patch-wmtz_wmtz_c =================================================================== RCS file: /cvs/ports/x11/wmtz/patches/patch-wmtz_wmtz_c,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-wmtz_wmtz_c --- patches/patch-wmtz_wmtz_c 22 May 2010 15:15:52 -0000 1.3 +++ patches/patch-wmtz_wmtz_c 1 Feb 2021 13:24:26 -0000 @@ -1,38 +1,22 @@ $OpenBSD: patch-wmtz_wmtz_c,v 1.3 2010/05/22 15:15:52 espie Exp $ ---- wmtz/wmtz.c.orig Mon Apr 16 21:26:34 2001 -+++ wmtz/wmtz.c Sat May 22 17:15:07 2010 -@@ -51,8 +51,7 @@ +Index: wmtz/wmtz.c +--- wmtz/wmtz.c.orig ++++ wmtz/wmtz.c +@@ -51,7 +51,7 @@ #define STRSIZE 10 #define LMST 1 #define GMST 0 --#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 --http://www.geocities.com/jl1n/wmtz/wmtz.html\"" -+#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\nhttp://www.geocities.com/jl1n/wmtz/wmtz.html\"" +-#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 http://www.geocities.com/jl1n/wmtz/wmtz.html\"" ++#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 https://www.dockapps.net/wmtz\"" /* -@@ -196,7 +195,7 @@ int main(int argc, char *argv[]) { +@@ -195,7 +195,7 @@ int main(int argc, char *argv[]) { month[0] = "JAN"; month[1] = "FEB"; month[2] = "MAR"; month[3] = "APR"; month[4] = "MAY"; month[5] = "JUN"; month[6] = "JUL"; month[7] = "AUG"; month[8] = "SEP"; - month[9] = "OUT"; month[10] = "NOV"; month[11] = "DEC"; + month[9] = "OCT"; month[10] = "NOV"; month[11] = "DEC"; - + week_day[0] = "SUNDAY "; week_day[1] = "MONDAY "; -@@ -479,6 +478,7 @@ void wmtz_routine(int argc, char **argv) - but_stat = -1; - break; - default: -+ ; - } - } - -@@ -529,6 +529,7 @@ void handleTheMenu(int but_stat) - exit(0); - break; - default: -+ ; - } - return; - }