Attachment #162684 for bug #204200

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





PORTNAME=	wmfishtime
PORTVERSION=	1.24
PORTREVISION=	6
CATEGORIES=	x11-clocks windowmaker
MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
		http://www.sourcefiles.org/Toys/Clocks/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Time/date applet for WindowMaker with fishes swimming around

LICENSE=	GPLv2

USES=		pkgconfig

PLIST_FILES=	bin/wmfishtime man/man1/wmfishtime.1.gz

OPTIONS_SINGLE=		TOOLKIT
OPTIONS_SINGLE_TOOLKIT=	GTK1 GTK2
OPTIONS_DEFAULT=	GTK2

GTK1_USE=		gnome=gtk12
GTK1_CPPFLAGS=		$$(pkg-config --cflags gdk)
GTK1_LDFLAGS=		$$(pkg-config --libs gdk)
GTK2_USE=		gnome=gtk20
GTK2_CPPFLAGS=		$$(pkg-config --cflags gdk-x11-2.0 x11)
GTK2_LDFLAGS=		$$(pkg-config --libs gdk-x11-2.0 x11) -lm
TOOLKIT_DESC=		GTK Toolkit

post-patch:
	@${REINPLACE_CMD} -e \
		'/^CFLAGS/s|\([[:blank:]]\)=.*|\1+= $$(CPPFLAGS)| ; \
		 /^CC/s|\([[:blank:]]\)=|\1?=| ; \
		 /^LIBS/s|\([[:blank:]]\)=.*|\1+= $$(LDFLAGS)|' \
		${WRKSRC}/Makefile
.for i in fishmon.c wmfishtime.1
	@${REINPLACE_CMD} -e \
		's|1\.23|${PORTVERSION}|g' ${WRKSRC}/${i}
.endfor

do-install:
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} wmfishtime \
		${STAGEDIR}${PREFIX}/bin)
	(cd ${WRKSRC} && ${INSTALL_MAN} wmfishtime.1 \
		${STAGEDIR}${MANPREFIX}/man/man1)

.include <bsd.port.mk>




--- Makefile.orig	Sun May 27 05:49:41 2001
+++ Makefile	Sun Jul  6 20:29:07 2003
@@ -6,23 +6,21 @@
 
 # no user serviceable parts below this line
 # optimization cflags
-CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
 # profiling cflags
 # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
 # test coverage cflags
 # CFLAGS=-fprofile-arcs -ftest-coverage -Wall -ansi -pedantic -g `gtk-config --cflags` ${EXTRA} -DPRO
 
 
-CC = gcc
 SHELL = sh
 OBJS = fishmon.o
-LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+LIBS = `echo $(GTK_LIBS) | sed "s/-lgtk12//g"`
 INSTALL = -m 755
 
 all: wmfishtime
 
 wmfishtime: $(OBJS)
-	$(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS) $(LDFLAGS)
 
 clean:
 	rm -rf wmfishtime *.o *.bb* *.gcov gmon.* *.da *~ .xvpics




--- fishmon.c.orig	2004-05-12 23:55:59 UTC
+++ fishmon.c
@@ -152,6 +152,10 @@ static char month[12][4] = { "JAN", "FEB
 
 int main(int argc, char **argv)
 {
+#if (GTK_MAJOR_VERSION >= 2)
+    /* This is needed to proper dockapp work on >=GTK+=2.18 */
+    setenv("GDK_NATIVE_WINDOWS", "1", 0);
+#endif
     int ch;
     GdkEvent *event;
 #ifdef PRO
@@ -648,6 +652,9 @@ static void make_new_fishmon_dockapp(voi
 
     /* make a copy for the iconwin - parameters are the same */
     memcpy(&attri, &attr, sizeof(GdkWindowAttr));
+#if (GTK_MAJOR_VERSION >= 2)
+    attri.window_type = GTK_WINDOW_CHILD;
+#endif
 
     sizehints.flags = USSize;
     sizehints.width = 64;
@@ -679,7 +686,11 @@ static void make_new_fishmon_dockapp(voi
     wmhints.window_group = win;
     wmhints.flags =
 	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
+#if (GTK_MAJOR_VERSION >= 2)
+    gdk_window_show(bm.iconwin);
+#else
     XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+#endif
 
     bm.gc = gdk_gc_new(bm.win);
 
@@ -1020,27 +1031,29 @@ static void parse_options(int argc, char
 {
     static int ch = 0;
     static struct option long_opts[] = {

+	    case 'v':
 		do_version();
 		exit(0);
 		break;
+	    case 'c':
+		enable_check_mail = 1;
+		break;
+	    case 'b':
+		broken_wm = 1;
+		break;
 	}
     }
 }

Lines 1-9 Link Here

(-)x11-clocks/wmfishtime/pkg-descr (-7 / +7 lines)
1	This is a time/date applet for WindowMaker (and BlackBox, E, SawFish...). Top	1	WMFishTime is a time/date applet for WindowMaker (and BlackBox, E,
2	part has the clock face, bottom part has day of the week, followed by day,	2	SawFish...). Top part has the clock face, bottom part has day of the
3	followed by month. Yellow hand counts seconds, green hand counts minutes, red	3	week, followed by day, followed by month. Yellow hand counts seconds,
4	hand counts hours. Few seconds after startup there are at least 32 bubbles	4	green hand counts minutes, red hand counts hours. Few seconds after
5	floating up behind the clock face. There are 4 fishes randomly swimming back	5	startup there are at least 32 bubbles floating up behind the clock face.
6	and forth. If you move your mouse inside the dockapp window, the fish will get	6	There are 4 fishes randomly swimming back and forth. If you move your
7	scared and run away.	7	mouse inside the dockapp window, the fish will get scared and run away.
8		8
9	WWW: http://www.ne.jp/asahi/linux/timecop/#wmfishtime	9	WWW: http://www.ne.jp/asahi/linux/timecop/#wmfishtime

Return to bug 204200

Lines 3-31 Link Here

(-)x11-clocks/wmfishtime/Makefile (-13 / +31 lines)
3		3
4	PORTNAME= wmfishtime	4	PORTNAME= wmfishtime
5	PORTVERSION= 1.24	5	PORTVERSION= 1.24
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= x11-clocks windowmaker	7	CATEGORIES= x11-clocks windowmaker
8	MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \	8	MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
9	http://atreides.freenix.no/~anders/	9	http://www.sourcefiles.org/Toys/Clocks/
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Time/date applet for WindowMaker with fishes swimming around	12	COMMENT= Time/date applet for WindowMaker with fishes swimming around
13		13
14	USE_GNOME= gtk12	14	LICENSE= GPLv2
15		15
16	BROKEN= does not fetch	16	USES= pkgconfig
17	GTK_LIBS?= `${GTK_CONFIG} --libs`	17
18	GTK_CFLAGS?= `${GTK_CONFIG} --cflags`	18	PLIST_FILES= bin/wmfishtime man/man1/wmfishtime.1.gz
19	MAKE_ARGS+= CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall ${GTK_CFLAGS}" \	19
20	LDFLAGS="${LDFLAGS}" \	20	OPTIONS_SINGLE= TOOLKIT
21	GTK_LIBS="${GTK_LIBS}"	21	OPTIONS_SINGLE_TOOLKIT= GTK1 GTK2
22	PLIST_FILES= bin/wmfishtime man/man1/${PORTNAME}.1.gz	22	OPTIONS_DEFAULT= GTK2
		23
		24	GTK1_USE= gnome=gtk12
		25	GTK1_CPPFLAGS= $$(pkg-config --cflags gdk)
		26	GTK1_LDFLAGS= $$(pkg-config --libs gdk)
		27	GTK2_USE= gnome=gtk20
		28	GTK2_CPPFLAGS= $$(pkg-config --cflags gdk-x11-2.0 x11)
		29	GTK2_LDFLAGS= $$(pkg-config --libs gdk-x11-2.0 x11) -lm
		30	TOOLKIT_DESC= GTK Toolkit
23		31
24	post-patch:	32	post-patch:
25	${REINPLACE_CMD} -E -e "s@1\.23@1\.24@g" ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1	33	@${REINPLACE_CMD} -e \
		34	'/^CFLAGS/s\|\([[:blank:]]\)=.*\|\1+= $$(CPPFLAGS)\| ; \
		35	/^CC/s\|\([[:blank:]]\)=\|\1?=\| ; \
		36	/^LIBS/s\|\([[:blank:]]\)=.*\|\1+= $$(LDFLAGS)\|' \
		37	${WRKSRC}/Makefile
		38	.for i in fishmon.c wmfishtime.1
		39	@${REINPLACE_CMD} -e \
		40	's\|1\.23\|${PORTVERSION}\|g' ${WRKSRC}/${i}
		41	.endfor
26		42
27	do-install:	43	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${STAGEDIR}${PREFIX}/bin	44	(cd ${WRKSRC} && ${INSTALL_PROGRAM} wmfishtime \
29	${INSTALL_MAN} ${WRKSRC}/wmfishtime.1 ${STAGEDIR}${PREFIX}/man/man1/	45	${STAGEDIR}${PREFIX}/bin)
		46	(cd ${WRKSRC} && ${INSTALL_MAN} wmfishtime.1 \
		47	${STAGEDIR}${MANPREFIX}/man/man1)
30		48
31	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)x11-clocks/wmfishtime/files/patch-Makefile (-28 lines)
1	--- Makefile.orig Sun May 27 05:49:41 2001
2	+++ Makefile Sun Jul 6 20:29:07 2003
3	@@ -6,23 +6,21 @@
4
5	# no user serviceable parts below this line
6	# optimization cflags
7	-CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
8	# profiling cflags
9	# CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
10	# test coverage cflags
11	# CFLAGS=-fprofile-arcs -ftest-coverage -Wall -ansi -pedantic -g `gtk-config --cflags` ${EXTRA} -DPRO
12
13
14	-CC = gcc
15	SHELL = sh
16	OBJS = fishmon.o
17	-LIBS = `gtk-config --libs \| sed "s/-lgtk//g"`
18	+LIBS = `echo $(GTK_LIBS) \| sed "s/-lgtk12//g"`
19	INSTALL = -m 755
20
21	all: wmfishtime
22
23	wmfishtime: $(OBJS)
24	- $(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS)
25	+ $(CC) $(CFLAGS) -o wmfishtime $(OBJS) $(LIBS) $(LDFLAGS)
26
27	clean:
28	rm -rf wmfishtime .o .bb* .gcov gmon. .da ~ .xvpics

Lines 1-6 Link Here

(-)x11-clocks/wmfishtime/files/patch-fishmon.c (-5 / +39 lines)
1	--- fishmon.c.orig Sun May 27 05:53:09 2001	1	--- fishmon.c.orig 2004-05-12 23:55:59 UTC
2	+++ fishmon.c Mon Jul 7 04:01:52 2003	2	+++ fishmon.c
3	@@ -1018,26 +1018,28 @@	3	@@ -152,6 +152,10 @@ static char month[12][4] = { "JAN", "FEB
		4
		5	int main(int argc, char **argv)
		6	{
		7	+#if (GTK_MAJOR_VERSION >= 2)
		8	+ /* This is needed to proper dockapp work on >=GTK+=2.18 */
		9	+ setenv("GDK_NATIVE_WINDOWS", "1", 0);
		10	+#endif
		11	int ch;
		12	GdkEvent *event;
		13	#ifdef PRO
		14	@@ -648,6 +652,9 @@ static void make_new_fishmon_dockapp(voi
		15
		16	/* make a copy for the iconwin - parameters are the same */
		17	memcpy(&attri, &attr, sizeof(GdkWindowAttr));
		18	+#if (GTK_MAJOR_VERSION >= 2)
		19	+ attri.window_type = GTK_WINDOW_CHILD;
		20	+#endif
		21
		22	sizehints.flags = USSize;
		23	sizehints.width = 64;
		24	@@ -679,7 +686,11 @@ static void make_new_fishmon_dockapp(voi
		25	wmhints.window_group = win;
		26	wmhints.flags =
		27	StateHint \| IconWindowHint \| IconPositionHint \| WindowGroupHint;
		28	+#if (GTK_MAJOR_VERSION >= 2)
		29	+ gdk_window_show(bm.iconwin);
		30	+#else
		31	XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
		32	+#endif
		33
		34	bm.gc = gdk_gc_new(bm.win);
		35
		36	@@ -1020,27 +1031,29 @@ static void parse_options(int argc, char
4	{	37	{
5	static int ch = 0;	38	static int ch = 0;
6	static struct option long_opts[] = {	39	static struct option long_opts[] = {
Lines 31-42 Link Here
31	+ case 'v':	64	+ case 'v':
32	do_version();	65	do_version();
33	exit(0);	66	exit(0);
34	+ break;	67	break;
35	+ case 'c':	68	+ case 'c':
36	+ enable_check_mail = 1;	69	+ enable_check_mail = 1;
37	+ break;	70	+ break;
38	+ case 'b':	71	+ case 'b':
39	+ broken_wm = 1;	72	+ broken_wm = 1;
40	break;	73	+ break;
41	}	74	}
42	}	75	}
		76	}