From 7cbc7f8c79a47189057b9652bfd8643e0a010deb Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 20 Oct 1999 11:01:17 +0000 Subject: Make this package compile on Solaris. Apply Robert Elz's patch from PR 8366 to make the package behave like a clock, rather than a sundial, when it comes to updating the displayed time. Modify the man page to identify the correct resource for "military time". Whilst I share Robert's concerns about this being an incorrectly-used term, it's outwith the scope of pkgsrc to modify arguments to the program such as "-m", or any resources that the program uses. Fixes PR 8366. --- x11/dclock/patches/patch-aa | 22 +++++++++++++++------- x11/dclock/patches/patch-ab | 35 ++++++++++++++++++++++++----------- x11/dclock/patches/patch-ac | 19 +++++++++++++++++++ 3 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 x11/dclock/patches/patch-ac (limited to 'x11/dclock/patches') diff --git a/x11/dclock/patches/patch-aa b/x11/dclock/patches/patch-aa index e9662939458..afe281771de 100644 --- a/x11/dclock/patches/patch-aa +++ b/x11/dclock/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ +$NetBSD: patch-aa,v 1.2 1999/10/20 11:01:18 agc Exp $ ---- Makefile.orig 1999/02/27 20:32:36 1.1 -+++ Makefile 1999/03/01 19:53:45 -@@ -3,12 +3,18 @@ +--- Makefile.orig Wed Oct 20 11:40:45 1999 ++++ Makefile Wed Oct 20 11:43:33 1999 +@@ -3,12 +3,25 @@ OBJS= Dclock.o dclock.o HFILES= Dclock.h DclockP.h patchlevel.h @@ -12,14 +12,22 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ +LDFLAGS= -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib LIBS= -lXt -lX11 ++# Make this link properly on Solaris ++OPSYS!= uname -s ++ ++.if ${OPSYS} == "SunOS" ++LIBS+= -lSM -lICE -lsocket -lnsl ++.endif ++ +all: dclock + dclock: ${OBJS} - cc ${LDFLAGS} ${OBJS} ${LIBS} -o dclock +- cc ${LDFLAGS} ${OBJS} ${LIBS} -o dclock ++ ${CC} ${LDFLAGS} ${OBJS} ${LIBS} -o dclock + +install: dclock -+ install -c -m 555 -o root -g wheel dclock $(X11BASE)/bin -+ install -c -m 444 -o root -g wheel dclock.man $(X11BASE)/man/man1/dclock.1 ++ ${BSD_INSTALL_PROGRAM} dclock $(X11BASE)/bin ++ ${BSD_INSTALL_MAN} dclock.man $(X11BASE)/man/man1/dclock.1 clean: ; rm -f ${OBJS} core dclock diff --git a/x11/dclock/patches/patch-ab b/x11/dclock/patches/patch-ab index ae2303b04d0..47c8067e8fc 100644 --- a/x11/dclock/patches/patch-ab +++ b/x11/dclock/patches/patch-ab @@ -1,7 +1,10 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ +$NetBSD: patch-ab,v 1.2 1999/10/20 11:01:18 agc Exp $ ---- Dclock.c.orig 1999/02/27 20:35:01 1.1 -+++ Dclock.c 1999/02/27 20:41:17 +Patch from Robert Elz to make the clock behave as a clock, +rather than a sundial. + +--- Dclock.c.orig Fri Sep 10 16:51:04 1999 ++++ Dclock.c Fri Sep 10 17:06:19 1999 @@ -21,8 +21,6 @@ #define CLOCK_WIDTH 256 #define CLOCK_HEIGHT 80 @@ -112,7 +115,17 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ winwidth, w->dclock.font->ascent + w->dclock.font->descent); XDrawString(XtDisplay(w), XtWindow(w), w->dclock.foreGC, -@@ -960,8 +966,8 @@ +@@ -924,7 +930,8 @@ + { + Boolean alarm_went_off = show_time(w); + w->dclock.interval_id = +- XtAddTimeOut((unsigned long)((alarm_went_off || w->dclock.seconds)? 1000 : 60000), ++ XtAddTimeOut((unsigned long)((alarm_went_off || w->dclock.seconds) ? ++ 1000 : 60000 - ((time(0L) % 60) * 1000)), + timeout, (XtPointer)w); + } + +@@ -960,8 +967,8 @@ || new->dclock.tails != current->dclock.tails || new->dclock.fade != current->dclock.fade || new->dclock.miltime != current->dclock.miltime) { @@ -123,7 +136,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ GetGC(new); Resize(new); /* pixmaps need to be redrawn */ do_redraw = True; -@@ -1024,7 +1030,7 @@ +@@ -1024,7 +1031,7 @@ Arg arg; XtSetArg(arg, XtNreverseVideo, !w->dclock.reverse); @@ -132,7 +145,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ } static void -@@ -1038,7 +1044,7 @@ +@@ -1038,7 +1045,7 @@ return; } XtSetArg(arg, XtNmilitaryTime, !w->dclock.miltime); @@ -141,7 +154,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ } static void -@@ -1052,7 +1058,7 @@ +@@ -1052,7 +1059,7 @@ return; } XtSetArg(arg, XtNseconds, !w->dclock.seconds); @@ -150,7 +163,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ } static void -@@ -1062,7 +1068,7 @@ +@@ -1062,7 +1069,7 @@ Arg arg; XtSetArg(arg, XtNfade, !w->dclock.fade); @@ -159,7 +172,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ if (w->dclock.fade && w->dclock.scroll) toggle_scroll(w); } -@@ -1074,7 +1080,7 @@ +@@ -1074,7 +1081,7 @@ Arg arg; XtSetArg(arg, XtNtails, !w->dclock.tails); @@ -168,7 +181,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ } static void -@@ -1084,7 +1090,7 @@ +@@ -1084,7 +1091,7 @@ Arg arg; XtSetArg(arg, XtNalarm, !w->dclock.alarm); @@ -177,7 +190,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ } static void -@@ -1124,20 +1130,24 @@ +@@ -1124,20 +1131,24 @@ int digit = w->dclock.alarm_time[i>1?i+1:i] - '0'; int mod; switch (i) { diff --git a/x11/dclock/patches/patch-ac b/x11/dclock/patches/patch-ac new file mode 100644 index 00000000000..7259fc17036 --- /dev/null +++ b/x11/dclock/patches/patch-ac @@ -0,0 +1,19 @@ +$NetBSD: patch-ac,v 1.1 1999/10/20 11:01:18 agc Exp $ + +As pointed out by Robert Elz, the resource name is wrong, and despite +the concerns expressed by Robert that "military time" is an +incorrectly-used term, it's outwith the scope of pkgsrc to modify +arguments to the program such as -m to comply. Modify the +documentation to show the correct resource name. + +--- dclock.man 1999/10/20 10:52:06 1.1 ++++ dclock.man 1999/10/20 10:52:33 +@@ -168,7 +168,7 @@ + .B font (\fPclass\fB Font) + Specifies the font to be used for the date. + .TP 8 +-.B miltime (\fPclass\fB Boolean) ++.B militaryTime (\fPclass\fB Boolean) + Specifies whether the military (24hr) time format should be used. + .TP 8 + .B reverseVideo (\fPclass\fB ReverseVideo) -- cgit v1.2.3