diff options
author | tron <tron@pkgsrc.org> | 1999-06-03 17:52:48 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 1999-06-03 17:52:48 +0000 |
commit | 0257751df8d52a54b611862b3039aa8af9b13c5d (patch) | |
tree | 1156892de3ad6dae4cd2bd911ecf084e16b3adf7 | |
parent | 8d5e23375684d434059a3467c33c8768dc123bbd (diff) | |
download | pkgsrc-0257751df8d52a54b611862b3039aa8af9b13c5d.tar.gz |
Import new "dclock" package submitted by Mike Grupenhoff in PR pkg/7070:
digital clock for X
-rw-r--r-- | x11/dclock/Makefile | 15 | ||||
-rw-r--r-- | x11/dclock/files/md5 | 3 | ||||
-rw-r--r-- | x11/dclock/patches/patch-aa | 25 | ||||
-rw-r--r-- | x11/dclock/patches/patch-ab | 208 | ||||
-rw-r--r-- | x11/dclock/pkg/COMMENT | 1 | ||||
-rw-r--r-- | x11/dclock/pkg/DESCR | 2 | ||||
-rw-r--r-- | x11/dclock/pkg/PLIST | 3 |
7 files changed, 257 insertions, 0 deletions
diff --git a/x11/dclock/Makefile b/x11/dclock/Makefile new file mode 100644 index 00000000000..8f35b6aa443 --- /dev/null +++ b/x11/dclock/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ + +DISTNAME= dclock +PKGNAME= dclock-pl4 +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/} +EXTRACT_SUFX= .shar.Z + +MAINTAINER= packages@netbsd.org + +USE_X11BASE= yes +EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} - +WRKSRC= ${WRKDIR} + +.include "../../mk/bsd.pkg.mk" diff --git a/x11/dclock/files/md5 b/x11/dclock/files/md5 new file mode 100644 index 00000000000..2f232f39df2 --- /dev/null +++ b/x11/dclock/files/md5 @@ -0,0 +1,3 @@ +$NetBSD: md5,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ + +MD5 (dclock.shar.Z) = c02279a04e7ca617b327bc4963920593 diff --git a/x11/dclock/patches/patch-aa b/x11/dclock/patches/patch-aa new file mode 100644 index 00000000000..e9662939458 --- /dev/null +++ b/x11/dclock/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ + +--- Makefile.orig 1999/02/27 20:32:36 1.1 ++++ Makefile 1999/03/01 19:53:45 +@@ -3,12 +3,18 @@ + OBJS= Dclock.o dclock.o + HFILES= Dclock.h DclockP.h patchlevel.h + +-CFLAGS= -O +-LDFLAGS= ++CFLAGS= -O -I$(X11BASE)/include ++LDFLAGS= -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib + LIBS= -lXt -lX11 + ++all: dclock ++ + dclock: ${OBJS} + 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 + + clean: ; rm -f ${OBJS} core dclock + diff --git a/x11/dclock/patches/patch-ab b/x11/dclock/patches/patch-ab new file mode 100644 index 00000000000..ae2303b04d0 --- /dev/null +++ b/x11/dclock/patches/patch-ab @@ -0,0 +1,208 @@ +$NetBSD: patch-ab,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ + +--- Dclock.c.orig 1999/02/27 20:35:01 1.1 ++++ Dclock.c 1999/02/27 20:41:17 +@@ -21,8 +21,6 @@ + #define CLOCK_WIDTH 256 + #define CLOCK_HEIGHT 80 + #define DATE_FMT "%W, %M %d" +-#define when break;case +-#define otherwise break;default + + + static Boolean SetValues(), show_time(); +@@ -367,8 +365,8 @@ + + if (w->dclock.interval_id != (XtIntervalId)NULL) + XtRemoveTimeOut(w->dclock.interval_id); +- XtReleaseGC (w, w->dclock.foreGC); +- XtReleaseGC (w, w->dclock.backGC); ++ XtReleaseGC ((Widget) w, w->dclock.foreGC); ++ XtReleaseGC ((Widget) w, w->dclock.backGC); + for (n = 0; n < 10; n++) { + XFreePixmap(XtDisplay(w), w->dclock.digits[n]); + XFreePixmap(XtDisplay(w), w->dclock.tiny_digits[n]); +@@ -388,7 +386,7 @@ + Pixmap pix; + GC gc = w->dclock.foreGC; + +- if (!XtIsRealized(w)) ++ if (!XtIsRealized((Widget) w)) + return; + + winwidth = w->core.width; +@@ -450,7 +448,7 @@ + make_number(w, w->dclock.tiny_digits[i], gc, i, tiny_segment_pts); + } + else +- w->dclock.tiny_digits[i] = NULL; ++ (Widget) w->dclock.tiny_digits[i] = (Pixmap) NULL; + } + /* The colon[0] area is blank */ + if (w->dclock.colon[0]) +@@ -629,7 +627,7 @@ + Boolean save_fade = w->dclock.fade; + long t; + +- if (!XtIsRealized(w)) ++ if (!XtIsRealized((Widget) w)) + return; + + if (w->dclock.interval_id != (XtIntervalId)NULL) { +@@ -802,7 +800,7 @@ + turn_off[i] = oldmask & ~newmask; + } + else +- tmp_pix[i] = NULL; ++ tmp_pix[i] = (Pixmap) NULL; + + for (j = 1; j != FADE_ITER; ++j) + { +@@ -875,27 +873,35 @@ + if (*p != '%') + *datep++ = *p; + else switch (*++p) { +- when 'M': ++ case 'M': + datep += strlen(strcpy(datep, Months[now->tm_mon])); +- when 'm': ++ break; ++ case 'm': + datep += strlen(strcpy(datep, months[now->tm_mon])); +- when 'W': ++ break; ++ case 'W': + datep += strlen(strcpy(datep, Days[now->tm_wday])); +- when 'w': ++ break; ++ case 'w': + datep += strlen(strcpy(datep, days[now->tm_wday])); +- when 'd': ++ break; ++ case 'd': + if (now->tm_mday >= 10) + *datep++ = (now->tm_mday / 10 + '0'); + *datep++ = now->tm_mday % 10 + '0'; +- when 'Y': ++ break; ++ case 'Y': + *datep++ = '1', *datep++ = '9'; +- /* fall thru */ ++ /* FALLTHROUGH */ + case 'y': + *datep++ = now->tm_year / 10 + '0'; + *datep++ = now->tm_year % 10 + '0'; +- when '%': ++ break; ++ case '%': + *datep++ = *p; +- otherwise: ; /* nothing */ ++ break; ++ default: ++ break; /* nothing */ + } + } + *datep = 0; +@@ -906,7 +912,7 @@ + + /* remove what was there in case the whole thing isn't overwritten */ + XFillRectangle(XtDisplay(w), XtWindow(w), w->dclock.backGC, +- 0, winheight - (w->dclock.font->ascent + w->dclock.font->descent), ++ 0, winheight - (w->dclock.font->ascent + BORDER), + winwidth, w->dclock.font->ascent + w->dclock.font->descent); + + XDrawString(XtDisplay(w), XtWindow(w), w->dclock.foreGC, +@@ -960,8 +966,8 @@ + || new->dclock.tails != current->dclock.tails + || new->dclock.fade != current->dclock.fade + || new->dclock.miltime != current->dclock.miltime) { +- XtReleaseGC (current, current->dclock.foreGC); +- XtReleaseGC (current, current->dclock.backGC); ++ XtReleaseGC ((Widget) current, current->dclock.foreGC); ++ XtReleaseGC ((Widget) current, current->dclock.backGC); + GetGC(new); + Resize(new); /* pixmaps need to be redrawn */ + do_redraw = True; +@@ -1024,7 +1030,7 @@ + Arg arg; + + XtSetArg(arg, XtNreverseVideo, !w->dclock.reverse); +- XtSetValues(w, &arg, 1); ++ XtSetValues((Widget) w, &arg, 1); + } + + static void +@@ -1038,7 +1044,7 @@ + return; + } + XtSetArg(arg, XtNmilitaryTime, !w->dclock.miltime); +- XtSetValues(w, &arg, 1); ++ XtSetValues((Widget) w, &arg, 1); + } + + static void +@@ -1052,7 +1058,7 @@ + return; + } + XtSetArg(arg, XtNseconds, !w->dclock.seconds); +- XtSetValues(w, &arg, 1); ++ XtSetValues((Widget) w, &arg, 1); + } + + static void +@@ -1062,7 +1068,7 @@ + Arg arg; + + XtSetArg(arg, XtNfade, !w->dclock.fade); +- XtSetValues(w, &arg, 1); ++ XtSetValues((Widget) w, &arg, 1); + if (w->dclock.fade && w->dclock.scroll) + toggle_scroll(w); + } +@@ -1074,7 +1080,7 @@ + Arg arg; + + XtSetArg(arg, XtNtails, !w->dclock.tails); +- XtSetValues(w, &arg, 1); ++ XtSetValues((Widget) w, &arg, 1); + } + + static void +@@ -1084,7 +1090,7 @@ + Arg arg; + + XtSetArg(arg, XtNalarm, !w->dclock.alarm); +- XtSetValues(w, &arg, 1); ++ XtSetValues((Widget) w, &arg, 1); + } + + static void +@@ -1124,20 +1130,24 @@ + int digit = w->dclock.alarm_time[i>1?i+1:i] - '0'; + int mod; + switch (i) { +- when 0: ++ case 0: + if (Alarm.hrs > 13 && digit == 1) + digit++; + mod = 3; + before.tm_hour = -1; +- when 1 : ++ break; ++ case 1 : + mod = (Alarm.hrs < 20)? 10 : 4; + before.tm_hour = -1; +- when 2: ++ break; ++ case 2: + mod = 6; + before.tm_min = -1; +- when 3 : ++ break; ++ case 3 : + mod = 10; + before.tm_min = -1; ++ break; + } + if (event->button == 1) + digit = (digit + 1) % mod; diff --git a/x11/dclock/pkg/COMMENT b/x11/dclock/pkg/COMMENT new file mode 100644 index 00000000000..eb5b80e65dc --- /dev/null +++ b/x11/dclock/pkg/COMMENT @@ -0,0 +1 @@ +digital clock for X diff --git a/x11/dclock/pkg/DESCR b/x11/dclock/pkg/DESCR new file mode 100644 index 00000000000..483090076b4 --- /dev/null +++ b/x11/dclock/pkg/DESCR @@ -0,0 +1,2 @@ +Dclock is a digital clock for X. It has support for one alarm. Other than +that, it's a pretty bare-bones clock. diff --git a/x11/dclock/pkg/PLIST b/x11/dclock/pkg/PLIST new file mode 100644 index 00000000000..b05126314e4 --- /dev/null +++ b/x11/dclock/pkg/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/03 17:52:48 tron Exp $ +bin/dclock +man/man1/dclock.1.gz |