5 files changed, 42 insertions, 52 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 5e087f421aee..b10c09069941 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -6,21 +6,44 @@
 #
 
 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)
+BUILD_DEPENDS=	${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
+RUN_DEPENDS=	${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
+.endif
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LIBS=		-L${LOCALBASE}/lib
+.if !defined(WITH_PILOT)
 CONFIGURE_ARGS=	--without-pisock --disable-pilotlinktest
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/pilot/include
+LIBS+=		-L${LOCALBASE}/pilot/lib
+.endif
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LIBS="${LIBS}"
+
+pre-extract:
+	@${ECHO_MSG}
+.if defined(WITH_PILOT)
+	@${ECHO_MSG} "Palm Pilot support enabled. You will be able to syncronize"
+	@${ECHO_MSG} "your palm with gnomecard and gnomecal."
+.else
+	@${ECHO_MSG} "You can enable Palm Pilot support by defining WITH_PILOT"
+.endif
+	@${ECHO_MSG}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo
index 6daa3d5c1631..627eb416d6f7 100644
--- a/deskutils/gnome-pim/distinfo
+++ b/deskutils/gnome-pim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-1.4.0.tar.gz) = 177daf8b1e15be906fb41dca94a00e76
+MD5 (gnome-pim-1.4.3.tar.gz) = 71e1cf0114de88c688c4865c141c742a
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index 9471fee3c802..24ba3da002b9 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,23 +1,14 @@
---- gncal/Makefile.in.orig	Tue Feb 27 16:56:32 2001
-+++ gncal/Makefile.in	Tue Feb 27 16:56:49 2001
-@@ -139,3 +139,3 @@
+
+$FreeBSD$
+
+--- gncal/Makefile.in.orig	Thu Dec  6 11:29:15 2001
++++ gncal/Makefile.in	Thu Dec  6 11:29:15 2001
+@@ -138,7 +138,7 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = gnomecal.gnorba
  
 -help_base = $(datadir)/help/cal
 +help_base = $(datadir)/help/gnomecal
  
-@@ -170,3 +170,3 @@
+ bin_PROGRAMS = gnomecal
  
--libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir)
-+libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir) -avoid-version
- 
---- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
-+++ gnomecard/Makefile.in	Fri Jun  2 12:42:28 2000
-@@ -206,7 +206,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- LIBS = @LIBS@
--libaddress_conduit_la_LDFLAGS = 
-+libaddress_conduit_la_LDFLAGS =  -avoid-version
- libaddress_conduit_la_DEPENDENCIES =  ../libversit/libversit.la
- libaddress_conduit_la_OBJECTS =  card.lo my.lo address-conduit.lo
- PROGRAMS =  $(bin_PROGRAMS)
diff --git a/deskutils/gnome-pim/files/patch-ae b/deskutils/gnome-pim/files/patch-ae
deleted file mode 100644
index d717eba3f5d7..000000000000
--- a/deskutils/gnome-pim/files/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Mon Feb 26 00:15:55 2001
-+++ configure	Tue Feb 27 16:58:50 2001
-@@ -3632,23 +3632,5 @@
- 
--	echo $ac_n "checking for gnome-pilot environment""... $ac_c" 1>&6
--echo "configure:3635: checking for gnome-pilot environment" >&5
--if eval "test \"`echo '$''{'gnome_cv_pilot_found'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  
--		if test "x$GNOME_CONFIG" = "xno"; then
-+	echo "ignoring gnome-pilot environment""... $ac_c" 1>&6
-+echo "configure:3635: ignoring gnome-pilot environment" >&5
- 			gnome_cv_pilot_found=no
--		else
--			# gnome-config doesn't return a useful error status,
--			# so we check if it outputs anything to stderr
--			if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
--				gnome_cv_pilot_found=yes
--			else
--				gnome_cv_pilot_found=no
--			fi
--		fi
--	
--fi
--
--echo "$ac_t""$gnome_cv_pilot_found" 1>&6
- 	
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 13b989f665b7..3feea3b8651a 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -10,6 +10,7 @@ share/gnome/help/gnomecal/C/images/calmonth.gif
 share/gnome/help/gnomecal/C/images/calweek.gif
 share/gnome/help/gnomecal/C/images/calyear.gif
 share/gnome/help/gnomecal/C/topic.dat
+share/gnome/help/gnomecard/C/topic.dat
 share/gnome/idl/GnomeCal.idl
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
@@ -38,6 +39,7 @@ share/locale/ko/LC_MESSAGES/gnome-pim.mo
 share/locale/kw/LC_MESSAGES/gnome-pim.mo
 share/locale/lt/LC_MESSAGES/gnome-pim.mo
 share/locale/nl/LC_MESSAGES/gnome-pim.mo
+share/locale/nn/LC_MESSAGES/gnome-pim.mo
 share/locale/no/LC_MESSAGES/gnome-pim.mo
 share/locale/pl/LC_MESSAGES/gnome-pim.mo
 share/locale/pt/LC_MESSAGES/gnome-pim.mo
@@ -50,7 +52,9 @@ share/locale/tr/LC_MESSAGES/gnome-pim.mo
 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.Big5/LC_MESSAGES/gnome-pim.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@dirrm share/gnome/help/gnomecard/C
+@dirrm share/gnome/help/gnomecard
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal