From nobody@FreeBSD.org  Tue Dec  4 12:45:13 2001
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id A6C2337B419
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  4 Dec 2001 12:45:09 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id fB4Kj9M39317;
	Tue, 4 Dec 2001 12:45:09 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200112042045.fB4Kj9M39317@freefall.freebsd.org>
Date: Tue, 4 Dec 2001 12:45:09 -0800 (PST)
From: Hendrik Scholz <hendrik@scholz.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: port update deskutils/gnomepim to 1.4.3
X-Send-Pr-Version: www-1.0

>Number:         32511
>Category:       ports
>Synopsis:       port update deskutils/gnomepim to 1.4.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 04 12:50:01 PST 2001
>Closed-Date:    Thu Dec 6 02:15:52 PST 2001
>Last-Modified:  Thu Dec 06 02:17:55 PST 2001
>Originator:     Hendrik Scholz
>Release:        4.4-STABLE
>Organization:
NetUSE AG
>Environment:
FreeBSD dionysus.lan.raisdorf.net 4.4-STABLE FreeBSD 4.4-STABLE #1: Sat Nov 24 19:21:05 CET 2001     hscholz@dionysus.lan.raisdorf.net:/usr/src/sys/compile/DIONYSUS  i386

>Description:
Upgrade of gnomepim to 1.4.3
Introducing the WITH_PILOT switch to build with optional Palm Pilot support.

>How-To-Repeat:

>Fix:
--- Makefile.old	Tue Dec  4 12:44:57 2001
+++ Makefile	Tue Dec  4 21:39:40 2001
@@ -6,21 +6,38 @@
 #
 
 PORTNAME=	gnomepim
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.3
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	http://www.eskil.org/gnome-pilot/download/tarballs/ \
+      ${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-pim
 DISTNAME=	gnome-pim-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
+.if defined(WITH_PILOT)
+CONFIGURE_ARGS=
+.else
+CONFIGURE_ARGS=   --without-pisock --disable-pilotlinktest
+.endif
+
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-pisock --disable-pilotlinktest
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include"\
+		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
+
+pre-extract:
+.if defined(WITH_PILOT)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Palm Pilot support enabled. You will be able to syncronize"
+	@${ECHO_MSG} "your palm with gnomecard and gnomecal."
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable Palm Pilot support by defining WITH_PILOT"
+.endif
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
--- pkg-plist	Tue Dec  4 21:25:52 2001
+++ pkg-plist.old	Tue Dec  4 21:24:13 2001
@@ -50,7 +50,7 @@
 share/locale/uk/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal

Remove the file from the files directory and add this one:
--- gnomecard/address-conduit.c.orig	Tue Dec  4 12:55:27 2001
+++ gnomecard/address-conduit.c	Tue Dec  4 12:57:28 2001
@@ -296,8 +296,16 @@
 {
 	if (card->rev.prop.used) {
 		time_t syncTime, revTime;
+#ifdef __FreeBSD__
+      struct tm *tmptm;
+#endif
 		syncTime = GET_CONDUIT_DATA(abs)->dbi->pu->lastSyncDate;
-		revTime = mktime(&card->rev.tm)-timezone;
+#ifdef __FreeBSD__
+      tmptm = localtime(&syncTime);
+      revTime = mktime(&card->rev.tm) - tmptm->tm_gmtoff;
+#else
+      revTime = mktime(&card->rev.tm)-timezone;
+#endif
 		LOG("Comparing rev time %lu with sync time %lu",revTime,syncTime);
 		if (revTime > syncTime) return TRUE;
 	}

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->gnome 
Responsible-Changed-By: petef 
Responsible-Changed-When: Tue Dec 4 16:59:39 PST 2001 
Responsible-Changed-Why:  
Over to maintainers 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=32511 
State-Changed-From-To: open->closed 
State-Changed-By: sobomax 
State-Changed-When: Thu Dec 6 02:15:52 PST 2001 
State-Changed-Why:  
Update committed, thank you! I was unable to find any differencies between 
patch attached in the PR and patch-ad, please verify and let me know if I 
am wrong. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=32511 
>Unformatted:
