Here is an update for wmtime to 0.4. The main change is that it uses libdockapp now.
Port-wise: - drop wmgeneral stuff (it's in libdockapp) - remove the upstream Makefile patch, explaining that ours expanded - once again, i had to add libconv flags Testing: This builds and works fine on macppc and amd64. OK? Charlène. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/wmtime/Makefile,v retrieving revision 1.19 diff -u -p -u -p -r1.19 Makefile --- Makefile 12 Jul 2019 21:02:30 -0000 1.19 +++ Makefile 4 Feb 2021 19:38:09 -0000 @@ -2,23 +2,32 @@ COMMENT= time/date applet for WindowMaker -DISTNAME= wmtime-1.0b2 -REVISION= 2 +DISTNAME= wmtime-1.4 CATEGORIES= x11 x11/windowmaker +HOMEPAGE= https://www.dockapps.net/wmtime + # GPL PERMIT_PACKAGE= Yes -WANTLIB= X11 Xext Xpm c m +WANTLIB += X11 Xext Xpm c dockapp iconv m -MASTER_SITES= http://mirror2.unixfreunde.de/ \ - http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ +MASTER_SITES= https://www.dockapps.net/download/ -MAKE_FLAGS= CC="${CC}" +LIB_DEPENDS= converters/libiconv \ + devel/libdockapp>=0.7.3 -WRKDIST= ${WRKDIR}/wmtime.app -WRKSRC= ${WRKDIST}/wmtime +MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + MANDIR="${PREFIX}/man/man1" NO_TEST= Yes + +CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include + +LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -liconv + +WRKDIST= ${WRKDIR}/dockapps-7d1ef92 + +ALL_TARGET+= wmtime .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/wmtime/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 4 Feb 2021 19:38:09 -0000 @@ -1,2 +1,2 @@ -SHA256 (wmtime-1.0b2.tar.gz) = +6R8IM7ej5d73TzB5Rs+1su1Tx1oAi2Q+cSnDBVynZY= -SIZE (wmtime-1.0b2.tar.gz) = 20680 +SHA256 (wmtime-1.4.tar.gz) = lY/qJBAAlJ755JK950FQlVLdw6mbSyhd2e7XkDVTQ5Y= +SIZE (wmtime-1.4.tar.gz) = 19045 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 5 May 2017 13:48:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/05 13:48:23 jca Exp $ - -Index: wmgeneral/list.h ---- 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-wmtime_Makefile =================================================================== RCS file: patches/patch-wmtime_Makefile diff -N patches/patch-wmtime_Makefile --- patches/patch-wmtime_Makefile 26 Dec 2000 18:22:14 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-wmtime_Makefile,v 1.1.1.1 2000/12/26 18:22:14 naddy Exp $ ---- wmtime/Makefile.orig Tue May 19 23:04:53 1998 -+++ wmtime/Makefile Tue Dec 26 19:02:32 2000 -@@ -1,18 +1,23 @@ --LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib - LIBS = -lXpm -lXext -lX11 -lm - OBJS = wmtime.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ - ../wmgeneral/list.o - -+all: wmtime -+ - .c.o: -- cc -c -O2 -Wall $< -o $*.o -+ $(CC) $(CFLAGS) -I$(X11BASE)/include -c $< -o $@ - - wmtime: $(OBJS) -- cc -o wmtime $^ $(LIBDIR) $(LIBS) -+ $(CC) -o wmtime $(OBJS) $(LIBDIR) $(LIBS) - - clean:: - for i in $(OBJS) ; do \ - rm $$i; \ - done - rm wmtime -+ -+install: -+ ${BSD_INSTALL_PROGRAM} wmtime ${PREFIX}/bin Index: patches/patch-wmtime_wmtime_c =================================================================== RCS file: /cvs/ports/x11/wmtime/patches/patch-wmtime_wmtime_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-wmtime_wmtime_c --- patches/patch-wmtime_wmtime_c 5 May 2017 13:47:35 -0000 1.2 +++ patches/patch-wmtime_wmtime_c 4 Feb 2021 19:38:09 -0000 @@ -1,26 +1,15 @@ $OpenBSD: patch-wmtime_wmtime_c,v 1.2 2017/05/05 13:47:35 jca Exp $ -Index: wmtime/wmtime.c ---- wmtime/wmtime.c.orig -+++ wmtime/wmtime.c -@@ -98,7 +98,7 @@ void printversion(void); - void wmtime_routine(int, char **); - void get_lang(); +Index: wmtime.c +--- wmtime.c.orig ++++ wmtime.c +@@ -282,8 +282,8 @@ void wmtime_routine(int argc, char **argv) { --void main(int argc, char *argv[]) { -+int main(int argc, char *argv[]) { - - int i; - -@@ -187,9 +187,9 @@ void wmtime_routine(int argc, char **argv) { struct tm *time_struct; - struct tm old_time_struct; - long starttime; - long curtime; -- long nexttime; + time_t starttime; + time_t curtime; -+ time_t nexttime; - char temp[128]; - char *p; + char *conffile = NULL; + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/wmtime/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 25 May 2018 13:01:41 -0000 1.2 +++ pkg/PLIST 4 Feb 2021 19:38:09 -0000 @@ -1,2 +1,3 @@ @comment $OpenBSD: PLIST,v 1.2 2018/05/25 13:01:41 espie Exp $ @bin bin/wmtime +@man man/man1/wmtime.1
