ports/91108: [UNBREAK] deskutils/gtimer

[Rainer Alves]

>Number:         91108
>Category:       ports
>Synopsis:       [UNBREAK] deskutils/gtimer
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 30 20:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Rainer Alves
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
>Description:

- Fix distinfo
- Update WWW
- Added some patches to fix build errors
- Remove broken status

>How-To-Repeat:
>Fix:

--- gtimer-unbreak.diff begins here ---
diff -ruN deskutils/gtimer.orig/Makefile deskutils/gtimer/Makefile
--- deskutils/gtimer.orig/Makefile	Fri Dec 30 17:41:28 2005
+++ deskutils/gtimer/Makefile	Fri Dec 30 17:50:45 2005
@@ -9,12 +9,11 @@
 PORTVERSION=	1.1.6
 PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.cknudsen.com/gtimer/
+MASTER_SITES=	http://www.k5n.us/files/ \
+		http://www.cknudsen.com/gtimer/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A timer for your personal activities
-
-BROKEN=		Size mismatch
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff -ruN deskutils/gtimer.orig/distinfo deskutils/gtimer/distinfo
--- deskutils/gtimer.orig/distinfo	Fri Dec 30 17:41:28 2005
+++ deskutils/gtimer/distinfo	Fri Dec 30 17:48:19 2005
@@ -1,3 +1,3 @@
-MD5 (gtimer-1.1.6.tar.bz2) = 8acc1939abc5c3b25f400688f1d9b053
-SHA256 (gtimer-1.1.6.tar.bz2) = 24f41f3a2440aa375f87a770a1c32bbadcbabed80232af61d6c25086e2704f78
-SIZE (gtimer-1.1.6.tar.bz2) = 105135
+MD5 (gtimer-1.1.6.tar.bz2) = dd129daf0046ca4de05c67456989d226
+SHA256 (gtimer-1.1.6.tar.bz2) = 8e6738ddb02803a3af3af50ead427b7a08108fc3ff95cf8a4f8cf459a41e9727
+SIZE (gtimer-1.1.6.tar.bz2) = 98953
diff -ruN deskutils/gtimer.orig/files/patch-ab deskutils/gtimer/files/patch-ab
--- deskutils/gtimer.orig/files/patch-ab	Fri Dec 30 17:41:28 2005
+++ deskutils/gtimer/files/patch-ab	Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- task.c.orig	Thu Mar  9 07:27:50 2000
-+++ task.c	Sat Apr 29 14:35:16 2000
-@@ -54,7 +54,6 @@
- #include <dirent.h>
- #endif
- #include <errno.h>
--#include <malloc.h>
- #include <string.h>
- #include <ctype.h>
- #include <sys/types.h>
diff -ruN deskutils/gtimer.orig/files/patch-annotation deskutils/gtimer/files/patch-annotation
--- deskutils/gtimer.orig/files/patch-annotation	Wed Dec 31 21:00:00 1969
+++ deskutils/gtimer/files/patch-annotation	Fri Dec 30 18:20:30 2005
@@ -0,0 +1,14 @@
+--- annotate.c.orig	Fri Dec 30 18:15:44 2005
++++ annotate.c	Fri Dec 30 18:15:57 2005
+@@ -95,9 +95,9 @@
+     len = GTK_TEXT ( td->text )->gap_position;
+     str = (char *) malloc ( len + 1 );
+ #if GTK_VERSION < 10100
+-    strncpy ( str, (char *) GTK_TEXT ( td->text )->text, len );
++    strncpy ( str, (char *) &GTK_TEXT ( td->text )->text, len );
+ #else
+-    strncpy ( str, (char *) GTK_TEXT ( td->text )->text.wc, len );
++    strncpy ( str, (char *) &GTK_TEXT ( td->text )->text.wc, len );
+ #endif
+     str[len] = '\0';
+     if ( strlen ( str ) )
diff -ruN deskutils/gtimer.orig/files/patch-fix-version deskutils/gtimer/files/patch-fix-version
--- deskutils/gtimer.orig/files/patch-fix-version	Wed Dec 31 21:00:00 1969
+++ deskutils/gtimer/files/patch-fix-version	Fri Dec 30 18:03:16 2005
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Dec 30 18:01:56 2005
++++ configure	Fri Dec 30 18:02:16 2005
+@@ -701,7 +701,7 @@
+ 
+ PACKAGE=gtimer
+ 
+-VERSION=1.1.2
++VERSION=1.1.6
+ 
+ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff -ruN deskutils/gtimer.orig/files/patch-gtk deskutils/gtimer/files/patch-gtk
--- deskutils/gtimer.orig/files/patch-gtk	Wed Dec 31 21:00:00 1969
+++ deskutils/gtimer/files/patch-gtk	Fri Dec 30 18:31:23 2005
@@ -0,0 +1,15 @@
+--- main.c.orig	Fri Dec 30 18:29:18 2005
++++ main.c	Fri Dec 30 18:30:02 2005
+@@ -2455,10 +2455,12 @@
+   task_list = create_list_column_def ( 4, task_list_columns );
+   gtk_clist_set_selection_mode (GTK_CLIST (task_list), GTK_SELECTION_BROWSE);
+   gtk_widget_set_usize (GTK_WIDGET (task_list), 350, 150);
++/*
+ #if GTK_VERSION < 10100
+   gtk_clist_set_policy (GTK_CLIST (task_list),
+     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ #endif
++*/
+   gtk_signal_connect (GTK_OBJECT (task_list), "click_column",
+     GTK_SIGNAL_FUNC (column_selected_callback), NULL);
+   gtk_signal_connect (GTK_OBJECT (task_list), "event",
diff -ruN deskutils/gtimer.orig/files/patch-malloc deskutils/gtimer/files/patch-malloc
--- deskutils/gtimer.orig/files/patch-malloc	Wed Dec 31 21:00:00 1969
+++ deskutils/gtimer/files/patch-malloc	Sat Apr 29 18:36:57 2000
@@ -0,0 +1,10 @@
+--- task.c.orig	Thu Mar  9 07:27:50 2000
++++ task.c	Sat Apr 29 14:35:16 2000
+@@ -54,7 +54,6 @@
+ #include <dirent.h>
+ #endif
+ #include <errno.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <sys/types.h>
diff -ruN deskutils/gtimer.orig/pkg-descr deskutils/gtimer/pkg-descr
--- deskutils/gtimer.orig/pkg-descr	Fri Dec 30 17:41:28 2005
+++ deskutils/gtimer/pkg-descr	Fri Dec 30 17:47:56 2005
@@ -1,6 +1,6 @@
 gtimer is an application built with GTK that keeps track of all
 your activities and the amount of time spent on those activities.
 
-Author: Craig Knudsen <cknudsen at radix.net>
+Author: Craig Knudsen <cknudsen at cknudsen.com>
 
-WWW: http://www.cknudsen.com/gtimer/
+WWW: http://www.k5n.us/gtimer.php
--- gtimer-unbreak.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: