From owner-svn-ports-all@freebsd.org Tue Dec 8 18:15:23 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB8EF9D3DA1; Tue, 8 Dec 2015 18:15:23 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 693091A80; Tue, 8 Dec 2015 18:15:23 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8IFMoO099038; Tue, 8 Dec 2015 18:15:22 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8IFMUK099034; Tue, 8 Dec 2015 18:15:22 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201512081815.tB8IFMUK099034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Tue, 8 Dec 2015 18:15:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403328 - in head/x11-clocks/wmfishtime: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2015 18:15:23 -0000 Author: miwi Date: Tue Dec 8 18:15:22 2015 New Revision: 403328 URL: https://svnweb.freebsd.org/changeset/ports/403328 Log: - Update MASTER_SITES - Add optional GTK2 support - Add LICENSE - Update WWW PR: 204200 Submitted by: Ports Fury Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D4298 Modified: head/x11-clocks/wmfishtime/Makefile head/x11-clocks/wmfishtime/files/patch-fishmon.c head/x11-clocks/wmfishtime/pkg-descr Modified: head/x11-clocks/wmfishtime/Makefile ============================================================================== --- head/x11-clocks/wmfishtime/Makefile Tue Dec 8 18:09:55 2015 (r403327) +++ head/x11-clocks/wmfishtime/Makefile Tue Dec 8 18:15:22 2015 (r403328) @@ -3,26 +3,38 @@ PORTNAME= wmfishtime PORTVERSION= 1.24 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \ - http://atreides.freenix.no/~anders/ + http://www.sourcefiles.org/Toys/Clocks/ MAINTAINER= ports@FreeBSD.org COMMENT= Time/date applet for WindowMaker with fishes swimming around -USE_GNOME= gtk12 +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= pkgconfig -BROKEN= does not fetch -GTK_LIBS?= `${GTK_CONFIG} --libs` -GTK_CFLAGS?= `${GTK_CONFIG} --cflags` MAKE_ARGS+= CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall ${GTK_CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ GTK_LIBS="${GTK_LIBS}" -PLIST_FILES= bin/wmfishtime man/man1/${PORTNAME}.1.gz +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 -e "s@1\.23@1\.24@g" ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1 + ${REINPLACE_CMD} -E -e 's|1\.23|${PORTVERSION}|g' ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${STAGEDIR}${PREFIX}/bin Modified: head/x11-clocks/wmfishtime/files/patch-fishmon.c ============================================================================== --- head/x11-clocks/wmfishtime/files/patch-fishmon.c Tue Dec 8 18:09:55 2015 (r403327) +++ head/x11-clocks/wmfishtime/files/patch-fishmon.c Tue Dec 8 18:15:22 2015 (r403328) @@ -1,6 +1,39 @@ ---- fishmon.c.orig Sun May 27 05:53:09 2001 -+++ fishmon.c Mon Jul 7 04:01:52 2003 -@@ -1018,26 +1018,28 @@ +--- 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[] = { @@ -31,12 +64,13 @@ + case 'v': do_version(); exit(0); -+ break; + break; + case 'c': + enable_check_mail = 1; + break; + case 'b': + broken_wm = 1; - break; ++ break; } } + } Modified: head/x11-clocks/wmfishtime/pkg-descr ============================================================================== --- head/x11-clocks/wmfishtime/pkg-descr Tue Dec 8 18:09:55 2015 (r403327) +++ head/x11-clocks/wmfishtime/pkg-descr Tue Dec 8 18:15:22 2015 (r403328) @@ -1,9 +1,9 @@ -This is a time/date applet for WindowMaker (and BlackBox, E, SawFish...). Top -part has the clock face, bottom part has day of the week, followed by day, -followed by month. Yellow hand counts seconds, green hand counts minutes, red -hand counts hours. Few seconds after startup there are at least 32 bubbles -floating up behind the clock face. There are 4 fishes randomly swimming back -and forth. If you move your mouse inside the dockapp window, the fish will get -scared and run away. +WMFishTime is a time/date applet for WindowMaker (and BlackBox, E, +SawFish...). Top part has the clock face, bottom part has day of the +week, followed by day, followed by month. Yellow hand counts seconds, +green hand counts minutes, red hand counts hours. Few seconds after +startup there are at least 32 bubbles floating up behind the clock face. +There are 4 fishes randomly swimming back and forth. If you move your +mouse inside the dockapp window, the fish will get scared and run away. WWW: http://www.ne.jp/asahi/linux/timecop/#wmfishtime