The below diff updates wmitime to 0.5. This dockapp now uses libdockapp, so there is no further patch for -fno-common needed.
Port-wise: - provide .desktop file, manpage and HOMEPAGE - drop wmgeneral patch since it's dealt with by libdockapp - add build flags for iconv, it has been forgotten by upstream Testing: This builds and works fine on macppc and amd64. Comments/feedback are welcome, Charlène. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/wmitime/Makefile,v retrieving revision 1.19 diff -u -p -u -p -r1.19 Makefile --- Makefile 12 Jul 2019 20:51:24 -0000 1.19 +++ Makefile 1 Feb 2021 13:36:07 -0000 @@ -2,25 +2,33 @@ COMMENT= wm-dockapp; shows the date, time, and Internet time -DISTNAME= wmitime-0.3 -REVISION= 2 +DISTNAME= wmitime-0.5 CATEGORIES= x11 x11/windowmaker +HOMEPAGE= https://www.dockapps.net/wmitime + # GPL PERMIT_PACKAGE= Yes -WANTLIB= X11 Xext Xpm c m -MASTER_SITES= http://dockapps.org/files/22/29/ \ - http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ +WANTLIB += X11 Xext Xpm c dockapp iconv m + +MASTER_SITES= https://www.dockapps.net/download/ -MAKE_FLAGS= CC="${CC}" +RUN_DEPENDS= devel/desktop-file-utils +LIB_DEPENDS= converters/libiconv \ + devel/libdockapp>=0.7.3 + +MAKE_FLAGS= CC="${CC}" PREFIX="${PREFIX}" \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" NO_TEST= Yes -WRKDIST= ${WRKDIR}/wmitime -WRKSRC= ${WRKDIST}/wmitime +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib + +WRKDIST= ${WRKDIR}/dockapps-26db447 -do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin +#do-install: +# ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/wmitime/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:36:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (wmitime-0.3.tar.gz) = /OxEG6wYOsL7u/nVd8Lqr5ueApKmBBJW5aQoanbN3GE= -SIZE (wmitime-0.3.tar.gz) = 21442 +SHA256 (wmitime-0.5.tar.gz) = oYPiCNi6v5fopA4356WoseE3HKVH14lvMU+AhRb0Xm0= +SIZE (wmitime-0.5.tar.gz) = 15099 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/x11/wmitime/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 9 Mar 2001 14:29:58 -0000 1.2 +++ patches/patch-Makefile 1 Feb 2021 13:36:07 -0000 @@ -1,26 +1,27 @@ -$OpenBSD: patch-Makefile,v 1.2 2001/03/09 14:29:58 wilfried Exp $ ---- wmitime/Makefile.orig Mon Mar 29 05:51:39 1999 -+++ wmitime/Makefile Thu Mar 8 13:17:14 2001 -@@ -1,7 +1,6 @@ - #LANG = fr --LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib - LIBS = -lXpm -lXext -lX11 -lm --FLAGS = -O2 - OBJS = wmitime.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ -@@ -9,12 +8,12 @@ OBJS = wmitime.o \ - +$OpenBSD$ + +Index: Makefile +--- Makefile.orig ++++ Makefile +@@ -1,19 +1,18 @@ +-LIBS = -lXpm -lXext -lX11 -lm -ldockapp +-CFLAGS = -O2 -Wall ++LIBS = -lXpm -lXext -lX11 -lm -ldockapp -liconv + OBJS = wmitime.o + INSTALL = install +-PREFIX = /usr/local ++PREFIX ?= /usr/local + BINDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/share/man/man1 ++MANDIR = $(PREFIX)/man/man1 + DESKTOPDIR = $(PREFIX)/share/applications .c.o: -- cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o -+ ${CC} -I${X11BASE}/include ${CFLAGS} -c $< -o $@ + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o --wmtime: $(OBJS) -- cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS) -+wmitime: $(OBJS) -+ ${CC} ${CFLAGS} -o $@ $(OBJS) $(LIBDIR) $(LIBS) + wmitime: $(OBJS) +- $(CC) $(LDFLAGS) -o wmitime $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS) -all:: wmtime +all:: wmitime 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:18:27 -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:18:27 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-wmitime_c =================================================================== RCS file: /cvs/ports/x11/wmitime/patches/patch-wmitime_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-wmitime_c --- patches/patch-wmitime_c 9 Mar 2001 14:29:58 -0000 1.2 +++ patches/patch-wmitime_c 1 Feb 2021 13:36:07 -0000 @@ -1,18 +1,20 @@ -$OpenBSD: patch-wmitime_c,v 1.2 2001/03/09 14:29:58 wilfried Exp $ ---- wmitime/wmitime.c.orig Mon Mar 29 05:56:05 1999 -+++ wmitime/wmitime.c Thu Mar 8 13:14:35 2001 -@@ -281,7 +281,7 @@ void DrawInetTime(void) +$OpenBSD$ + +Index: wmitime.c +--- wmitime.c.orig ++++ wmitime.c +@@ -248,7 +248,7 @@ void DrawInetTime(void) - // Compute Inet Time + /* Compute Inet Time */ iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec); - iTime=iTime+((timezone-1)+3600); + iTime=iTime+((1-clk->tm_gmtoff)+3600); if (clk->tm_isdst) iTime-=3600; iTime=(iTime*1000)/86400; -@@ -398,7 +398,7 @@ void DrawInetWheel(void) +@@ -374,7 +374,7 @@ void DrawInetWheel(void) - // Calculate Wheel Position... + /* Calculate Wheel Position... */ iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec); - iTime=iTime+((timezone-1)+3600); + iTime=iTime+((1-clk->tm_gmtoff)+3600); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/wmitime/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 1 Feb 2021 13:36:07 -0000 @@ -1,2 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2018/05/25 13:01:41 espie Exp $ @bin bin/wmitime +@man man/man1/wmitime.1 +share/applications/wmitime.desktop +@tag update-desktop-database
