Attachment #203211 for bug #236848

View | Details | Raw Unified | Return to bug 236848
Collapse All | Expand All





PORTNAME=	tclock
PORTVERSION=	1.0.1
PORTREVISION=	3
CATEGORIES=	x11-clocks
MASTER_SITES=	http://www.linta.de/distfiles/ \
		ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/

MAINTAINER=	aehlig@linta.de
COMMENT=	Transparent analog clock for x11

LICENSE=	GPLv1
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		imake tar:Z
USE_XORG=	x11 xext
PLIST_FILES=	bin/tclock man/man1/${PORTNAME}.1.gz

PLIST_FILES=	bin/tclock man/man1/${PORTNAME}.1.gz
NO_WRKSUBDIR=	yes

.include <bsd.port.mk>




--- tclock.c.orig	1992-12-21 19:56:29 UTC
+++ tclock.c
@@ -22,7 +22,10 @@
  */ 
 

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
@@ -51,7 +54,7 @@ Display *display;
 int     screen_number;
 Window  rootWindow, mainWindow;
 int     ShapeEventNumber, ShapeErrorNumber;

 struct tm lastTimes, times;
 Pixmap  border, clip;
 GC      clearGC, drawGC;
@@ -113,6 +116,8 @@ initHand(h, s)
 
   hand[h].radius[i] = hand[h].radius[0];
   hand[h].offset[i] = hand[h].offset[0];
+
+  hand[h].position = -1;
 }
 
 void
@@ -212,7 +217,7 @@ reshape()
   XShapeCombineMask(display, mainWindow, ShapeBounding, 0, 0, border, ShapeSet);
   XShapeCombineMask(display, mainWindow, ShapeClip, 0, 0, clip, ShapeSet);
 

 
   /* This call to XPending ensures that if the window gets closed, we die */
   XPending(display);
@@ -222,8 +227,6 @@ XTextProperty *
 strToTP(s)
   char *s;
 {

 
   XTextProperty *tp = (XTextProperty *)malloc(sizeof *tp);
   XStringListToTextProperty(&s, 1, tp);
@@ -233,11 +236,11 @@ strToTP(s)
 int
 sigalrm()
 {

 }
 
 unsigned long
@@ -294,7 +297,7 @@ makeAppName(r)
   strcpy(appClass, "Tclock");
 }
 

 main(ac, av)
   int ac;
   char **av;
@@ -309,6 +312,7 @@ main(ac, av)
   extern
   char		*getenv();
   char		*displayName, fn[1000];

   int		parseReturn, rc;
 
   XrmParseCommand(&db, option, numOptions, "tclock", &ac, av);
@@ -330,7 +334,7 @@ main(ac, av)
   display = XOpenDisplay(displayName);
   if(display == 0)
   {

     exit(-1);
   }
 
@@ -341,13 +345,14 @@ main(ac, av)
     exit(1);
 
   db = XrmGetStringDatabase(tclockDefaults);

     XrmMergeDatabases(XrmGetFileDatabase(getenv("XENVIRONMENT")), &db);
 
   XrmMergeDatabases(cmdDB, &db);
@@ -410,7 +415,7 @@ main(ac, av)
   XMapRaised(display, mainWindow);
   XFlush(display);
 

   new.it_interval.tv_sec = 1;
   new.it_value.tv_sec = 1;
   new.it_interval.tv_usec = 0;
@@ -420,4 +425,3 @@ main(ac, av)
   for(;;)
     sigpause(0);
 }

Return to bug 236848

Lines 3-9 Link Here

(-)tclock/Makefile (-5 / +6 lines)
3		3
4	PORTNAME= tclock	4	PORTNAME= tclock
5	PORTVERSION= 1.0.1	5	PORTVERSION= 1.0.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= x11-clocks	7	CATEGORIES= x11-clocks
8	MASTER_SITES= http://www.linta.de/distfiles/ \	8	MASTER_SITES= http://www.linta.de/distfiles/ \
9	ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/	9	ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/
Lines 11-22 Link Here
11	MAINTAINER= aehlig@linta.de	11	MAINTAINER= aehlig@linta.de
12	COMMENT= Transparent analog clock for x11	12	COMMENT= Transparent analog clock for x11
13		13
14	NO_WRKSUBDIR= yes	14	LICENSE= GPLv1
		15	LICENSE_FILE= ${WRKSRC}/COPYING
		16
15	USES= imake tar:Z	17	USES= imake tar:Z
16	USE_XORG= x11 xext	18	USE_XORG= x11 xext
17	PLIST_FILES= bin/tclock man/man1/${PORTNAME}.1.gz
18		19
19	LICENSE= GPLv1	20	PLIST_FILES= bin/tclock man/man1/${PORTNAME}.1.gz
20	LICENSE_FILE= ${WRKSRC}/COPYING	21	NO_WRKSUBDIR= yes
21		22
22	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)tclock/files/patch-tclock.c (-12 / +21 lines)
1	--- tclock.c.orig 1992-12-21 19:56:29.000000000 +0000	1	--- tclock.c.orig 1992-12-21 19:56:29 UTC
2	+++ tclock.c 2011-06-20 18:42:37.000000000 +0100	2	+++ tclock.c
3	@@ -22,7 +22,10 @@	3	@@ -22,7 +22,10 @@
4	*/	4	*/
5		5
Lines 11-17 Link Here
11	#include <X11/Xlib.h>	11	#include <X11/Xlib.h>
12	#include <X11/Xutil.h>	12	#include <X11/Xutil.h>
13	#include <X11/Xos.h>	13	#include <X11/Xos.h>
14	@@ -51,7 +54,7 @@	14	@@ -51,7 +54,7 @@ Display *display;
15	int screen_number;	15	int screen_number;
16	Window rootWindow, mainWindow;	16	Window rootWindow, mainWindow;
17	int ShapeEventNumber, ShapeErrorNumber;	17	int ShapeEventNumber, ShapeErrorNumber;
Lines 20-26 Link Here
20	struct tm lastTimes, times;	20	struct tm lastTimes, times;
21	Pixmap border, clip;	21	Pixmap border, clip;
22	GC clearGC, drawGC;	22	GC clearGC, drawGC;
23	@@ -212,7 +215,7 @@	23	@@ -113,6 +116,8 @@ initHand(h, s)
		24
		25	hand[h].radius[i] = hand[h].radius[0];
		26	hand[h].offset[i] = hand[h].offset[0];
		27	+
		28	+ hand[h].position = -1;
		29	}
		30
		31	void
		32	@@ -212,7 +217,7 @@ reshape()
24	XShapeCombineMask(display, mainWindow, ShapeBounding, 0, 0, border, ShapeSet);	33	XShapeCombineMask(display, mainWindow, ShapeBounding, 0, 0, border, ShapeSet);
25	XShapeCombineMask(display, mainWindow, ShapeClip, 0, 0, clip, ShapeSet);	34	XShapeCombineMask(display, mainWindow, ShapeClip, 0, 0, clip, ShapeSet);
26		35
Lines 29-35 Link Here
29		38
30	/* This call to XPending ensures that if the window gets closed, we die */	39	/* This call to XPending ensures that if the window gets closed, we die */
31	XPending(display);	40	XPending(display);
32	@@ -222,8 +225,6 @@	41	@@ -222,8 +227,6 @@ XTextProperty *
33	strToTP(s)	42	strToTP(s)
34	char *s;	43	char *s;
35	{	44	{
Lines 38-44 Link Here
38		47
39	XTextProperty tp = (XTextProperty )malloc(sizeof *tp);	48	XTextProperty tp = (XTextProperty )malloc(sizeof *tp);
40	XStringListToTextProperty(&s, 1, tp);	49	XStringListToTextProperty(&s, 1, tp);
41	@@ -233,11 +234,11 @@	50	@@ -233,11 +236,11 @@ strToTP(s)
42	int	51	int
43	sigalrm()	52	sigalrm()
44	{	53	{
Lines 53-59 Link Here
53	}	62	}
54		63
55	unsigned long	64	unsigned long
56	@@ -294,7 +295,7 @@	65	@@ -294,7 +297,7 @@ makeAppName(r)
57	strcpy(appClass, "Tclock");	66	strcpy(appClass, "Tclock");
58	}	67	}
59		68
Lines 62-68 Link Here
62	main(ac, av)	71	main(ac, av)
63	int ac;	72	int ac;
64	char **av;	73	char **av;
65	@@ -309,6 +310,7 @@	74	@@ -309,6 +312,7 @@ main(ac, av)
66	extern	75	extern
67	char *getenv();	76	char *getenv();
68	char *displayName, fn[1000];	77	char *displayName, fn[1000];
Lines 70-76 Link Here
70	int parseReturn, rc;	79	int parseReturn, rc;
71		80
72	XrmParseCommand(&db, option, numOptions, "tclock", &ac, av);	81	XrmParseCommand(&db, option, numOptions, "tclock", &ac, av);
73	@@ -330,7 +332,7 @@	82	@@ -330,7 +334,7 @@ main(ac, av)
74	display = XOpenDisplay(displayName);	83	display = XOpenDisplay(displayName);
75	if(display == 0)	84	if(display == 0)
76	{	85	{
Lines 79-85 Link Here
79	exit(-1);	88	exit(-1);
80	}	89	}
81		90
82	@@ -341,13 +343,14 @@	91	@@ -341,13 +345,14 @@ main(ac, av)
83	exit(1);	92	exit(1);
84		93
85	db = XrmGetStringDatabase(tclockDefaults);	94	db = XrmGetStringDatabase(tclockDefaults);
Lines 96-102 Link Here
96	XrmMergeDatabases(XrmGetFileDatabase(getenv("XENVIRONMENT")), &db);	105	XrmMergeDatabases(XrmGetFileDatabase(getenv("XENVIRONMENT")), &db);
97		106
98	XrmMergeDatabases(cmdDB, &db);	107	XrmMergeDatabases(cmdDB, &db);
99	@@ -410,7 +413,7 @@	108	@@ -410,7 +415,7 @@ main(ac, av)
100	XMapRaised(display, mainWindow);	109	XMapRaised(display, mainWindow);
101	XFlush(display);	110	XFlush(display);
102		111
Lines 105-111 Link Here
105	new.it_interval.tv_sec = 1;	114	new.it_interval.tv_sec = 1;
106	new.it_value.tv_sec = 1;	115	new.it_value.tv_sec = 1;
107	new.it_interval.tv_usec = 0;	116	new.it_interval.tv_usec = 0;
108	@@ -420,4 +423,3 @@	117	@@ -420,4 +425,3 @@ main(ac, av)
109	for(;;)	118	for(;;)
110	sigpause(0);	119	sigpause(0);
111	}	120	}