From tkato432@yahoo.com  Mon May 17 18:00:54 2010
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CB0D106564A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 17 May 2010 18:00:54 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168])
	by mx1.freebsd.org (Postfix) with ESMTP id 2361B8FC15
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 17 May 2010 18:00:53 +0000 (UTC)
Received: from localhost.localdomain (ZT037242.ppp.dion.ne.jp [59.128.37.242])
	by msa105lp.auone-net.jp (au one net msa) with ESMTP id 1440250036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 18 May 2010 03:00:48 +0900 (JST)
Message-Id: <20100518030011.11909827.tkato432@yahoo.com>
Date: Tue, 18 May 2010 03:00:11 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: deskutils/gtimer to 2.0.0

>Number:         146670
>Category:       ports
>Synopsis:       Update port: deskutils/gtimer to 2.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 17 20:20:04 UTC 2010
>Closed-Date:    Sat Jun 05 21:47:03 UTC 2010
>Last-Modified:  Sat Jun  5 22:00:17 UTC 2010
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.0.0

Remove file:
files/patch-annotation
files/patch-fix-version
files/patch-gtk
files/patch-malloc

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/gtimer/Makefile deskutils/gtimer/Makefile
--- /usr/ports/deskutils/gtimer/Makefile	2008-06-07 00:19:49.000000000 +0900
+++ deskutils/gtimer/Makefile	2010-04-01 01:12:32.000000000 +0900
@@ -6,28 +6,56 @@
 #
 
 PORTNAME=	gtimer
-PORTVERSION=	1.1.6
-PORTREVISION=	4
+PORTVERSION=	2.0.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.k5n.us/files/ \
-		http://www.cknudsen.com/gtimer/
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A timer for your personal activities
 
-USE_BZIP2=	yes
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+
+USE_XORG=	xscrnsaver
+USE_GNOME=	gtk20
+USE_PERL5_BUILD=yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=		gtimer.1
-PLIST_FILES=	bin/gtimer
+MAN1=		${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME} \
+		share/locale/cs/LC_MESSAGES/${PORTNAME}.mo \
+		share/locale/cz/LC_MESSAGES/${PORTNAME}.mo \
+		share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
+		share/locale/fr/LC_MESSAGES/${PORTNAME}.mo \
+		share/locale/sv/LC_MESSAGES/${PORTNAME}.mo
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
-		${WRKSRC}/project.c
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/gtimer.1 ${PREFIX}/man/man1
+post-patch:
+	@${REINPLACE_CMD} -e 's|1.1.7|${PORTVERSION}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|"sensible-browser"|"xdg-open"|g' ${WRKSRC}/config.h
+.for file in project.c task.c
+	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/${file}
+.endfor
+
+pre-build:
+	@(cd ${WRKSRC} && ${PERL} ./txt2h.pl < ChangeLog > changelog.h)
+
+post-build:
+.for lang in cs cz es fr sv
+	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -o ${lang}.mo ${lang}.po
+.endfor
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+.for lang in cs cz es fr sv
+	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/deskutils/gtimer/distinfo deskutils/gtimer/distinfo
--- /usr/ports/deskutils/gtimer/distinfo	2006-01-01 03:03:27.000000000 +0900
+++ deskutils/gtimer/distinfo	2010-03-29 05:55:13.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (gtimer-1.1.6.tar.bz2) = dd129daf0046ca4de05c67456989d226
-SHA256 (gtimer-1.1.6.tar.bz2) = 8e6738ddb02803a3af3af50ead427b7a08108fc3ff95cf8a4f8cf459a41e9727
-SIZE (gtimer-1.1.6.tar.bz2) = 98953
+MD5 (gtimer-2.0.0.tar.gz) = 1cc0ff18f566b5e497dc34ad9627b062
+SHA256 (gtimer-2.0.0.tar.gz) = a2dd70793a5b1b4d497be0c4429b8e8cef6910497b6af8fbdedff00764308458
+SIZE (gtimer-2.0.0.tar.gz) = 199961
diff -urN /usr/ports/deskutils/gtimer/files/patch-annotation deskutils/gtimer/files/patch-annotation
--- /usr/ports/deskutils/gtimer/files/patch-annotation	2006-01-01 03:03:28.000000000 +0900
+++ deskutils/gtimer/files/patch-annotation	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
---- 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 -urN /usr/ports/deskutils/gtimer/files/patch-fix-version deskutils/gtimer/files/patch-fix-version
--- /usr/ports/deskutils/gtimer/files/patch-fix-version	2006-01-01 03:03:28.000000000 +0900
+++ deskutils/gtimer/files/patch-fix-version	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- 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 -urN /usr/ports/deskutils/gtimer/files/patch-gtk deskutils/gtimer/files/patch-gtk
--- /usr/ports/deskutils/gtimer/files/patch-gtk	2006-01-01 03:03:28.000000000 +0900
+++ deskutils/gtimer/files/patch-gtk	1970-01-01 09:00:00.000000000 +0900
@@ -1,15 +0,0 @@
---- 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 -urN /usr/ports/deskutils/gtimer/files/patch-malloc deskutils/gtimer/files/patch-malloc
--- /usr/ports/deskutils/gtimer/files/patch-malloc	2006-01-01 03:03:28.000000000 +0900
+++ deskutils/gtimer/files/patch-malloc	1970-01-01 09:00:00.000000000 +0900
@@ -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>
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 17 20:20:27 UTC 2010 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146670 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sat May 22 04:27:15 UTC 2010 
State-Changed-Why:  
plist failed 
http://32bit.miwibox.org/index.php?action=describe_port&id=2057 
http://64bit.miwibox.org/index.php?action=describe_port&id=2065 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146670 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jun 5 21:47:02 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146670 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146670: commit references a PR
Date: Sat,  5 Jun 2010 21:50:21 +0000 (UTC)

 miwi        2010-06-05 21:46:47 UTC
 
   FreeBSD ports repository
 
   Modified files:
     deskutils/gtimer     Makefile distinfo 
   Added files:
     deskutils/gtimer     pkg-plist 
   Removed files:
     deskutils/gtimer/files patch-annotation patch-fix-version 
                            patch-gtk patch-malloc 
   Log:
   - Update to 2.0.0
   
   PR:             146670
   Submitted by:   Ports Fury
   
   Revision  Changes    Path
   1.28      +35 -13    ports/deskutils/gtimer/Makefile
   1.9       +3 -3      ports/deskutils/gtimer/distinfo
   1.2       +0 -14     ports/deskutils/gtimer/files/patch-annotation (dead)
   1.2       +0 -11     ports/deskutils/gtimer/files/patch-fix-version (dead)
   1.2       +0 -15     ports/deskutils/gtimer/files/patch-gtk (dead)
   1.2       +0 -10     ports/deskutils/gtimer/files/patch-malloc (dead)
   1.3       +8 -0      ports/deskutils/gtimer/pkg-plist (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
