Date: Tue, 4 Dec 2001 12:45:09 -0800 (PST) From: Hendrik Scholz <hendrik@scholz.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/32511: port update deskutils/gnomepim to 1.4.3 Message-ID: <200112042045.fB4Kj9M39317@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 32511
>Category: ports
>Synopsis: port update deskutils/gnomepim to 1.4.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 04 12:50:01 PST 2001
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112042045.fB4Kj9M39317>