Add optional gnomepilot support (WITH_GNOMEPILOT directive)

The default is OFF, even if you have gnomepilot installed already.

Problem reported by:	Heath Nielson <heath@cs.byu.edu>

8 files changed, 240 insertions, 26 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index abd97571117e..97587191e04a 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -16,15 +16,34 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
+.if defined(WITH_GNOMEPILOT)
+LIB_DEPENDS+=	gpilotd.0:${PORTSDIR}/palm/gnomepilot
+PILOTINC=	"-I${LOCALBASE}/pilot/include"
+PILOTLIB=	"-L${LOCALBASE}/pilot/lib"
+.else
+PILOTARGS=	--without-pisock --disable-pilotlinktest
+EXTRA_PATCHES=	${FILESDIR}/patch.nopilot
+.endif
+
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		--datadir=${PREFIX}/share/gnome ${PILOTARGS}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PILOTINC}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib ${PILOTLIB}"
+
+.if !defined(WITH_GNOMEPILOT)
+pre-extract:
+	@${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT"
+.endif
+
+.if defined(WITH_GNOMEPILOT)
+post-install:
+	@${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-pim/files/extra-patch-nopilot b/deskutils/gnome-pim/files/extra-patch-nopilot
new file mode 100644
index 000000000000..546fad85c5a5
--- /dev/null
+++ b/deskutils/gnome-pim/files/extra-patch-nopilot
@@ -0,0 +1,26 @@
+--- configure.orig	Fri Jun  2 12:19:04 2000
++++ configure	Fri Jun  2 12:19:38 2000
+@@ -3629,23 +3629,7 @@
+ 
+ 	echo $ac_n "checking for gnome-pilot environment""... $ac_c" 1>&6
+ echo "configure:3632: 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
+ 			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/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index 285308eaeea3..a90fec35121a 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,28 +1,52 @@
 --- gncal/Makefile.in.orig	Sat May 20 20:52:50 2000
-+++ gncal/Makefile.in	Tue May 30 14:34:37 2000
-@@ -143,3 +143,3 @@
++++ gncal/Makefile.in	Fri Jun  2 12:41:34 2000
+@@ -141,12 +141,12 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = gnomecal.gnorba
  
 -help_base = $(datadir)/gnome/help/cal
 +help_base = $(datadir)/help/gnomecal
  
-@@ -148,3 +148,3 @@
+ @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		calendar-conduit-control-applet			calendar-pilot-sync
+ bin_PROGRAMS = gnomecal $(extra_pilot_bins)
  
 -INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 +INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
-@@ -223,3 +223,3 @@
+ 
+ GNOMECAL_CORBA_GENERATED =  	GnomeCal.h			GnomeCal.c			GnomeCal-common.c		GnomeCal-skels.c		GnomeCal-stubs.c
+@@ -172,7 +172,7 @@
+ libcalendar_conduit_la_SOURCES =  	GnomeCal-common.c		GnomeCal-stubs.c		calendar-conduit.c		calobj.c 			alarm.c				calendar.c 			timeutil.c
+ 
+ 
+-libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir)
++libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir) -avoid-version
+ 
+ 
+ libcalendar_conduit_la_LIBADD =  	../libversit/libversit.la 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 	$(GNOME_LIBDIR) 	$(GNOME_LIBS)
+@@ -221,7 +221,7 @@
+ @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop 
  
 -@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
 +@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
  @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
-@@ -235,3 +235,3 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -233,7 +233,7 @@
+ appicondir = $(datadir)/pixmaps
+ appicon_DATA = gnome-calendar-conduit.png
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
+ Productivity_DATA = gncal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
-+++ gnomecard/Makefile.in	Tue May 30 14:35:44 2000
-@@ -137,5 +137,5 @@
++++ gnomecard/Makefile.in	Fri Jun  2 12:42:28 2000
+@@ -135,9 +135,9 @@
+ 
+ nSUBDIRS = help
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/cal
@@ -30,13 +54,32 @@
 -INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
 +INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
  
-@@ -185,3 +185,3 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		address-conduit-capplet	
+@@ -183,7 +183,7 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = 	address-conduit-capplet.desktop 
  
 -@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
 +@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
  @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
-@@ -194,3 +194,3 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
+ EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnome-card.xpm  	gnomecard.desktop 	address-conduit-capplet.desktop 	gnomecard.conduit 	gnome-gnomecard.png 	gnomecard.gnorba 	ChangeLog 	BUGS
+ 
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
+ Productivity_DATA = gnomecard.desktop
+ 
+@@ -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-ad b/deskutils/gnome-pim/files/patch-ad
new file mode 100644
index 000000000000..7a5f6345a27e
--- /dev/null
+++ b/deskutils/gnome-pim/files/patch-ad
@@ -0,0 +1,19 @@
+--- gnomecard/address-conduit.c.orig	Tue Mar 14 01:39:27 2000
++++ gnomecard/address-conduit.c	Fri Jun  2 12:36:08 2000
+@@ -241,8 +241,16 @@
+ {
+ 	if (card->rev.prop.used) {
+ 		time_t syncTime, revTime;
++#ifdef __FreeBSD__
++		struct tm *tmptm;
++#endif
+ 		syncTime = GET_CONDUIT_DATA(abs)->dbi->pu->lastSyncDate;
++#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;
+ 	}
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index abd97571117e..97587191e04a 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -16,15 +16,34 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
+.if defined(WITH_GNOMEPILOT)
+LIB_DEPENDS+=	gpilotd.0:${PORTSDIR}/palm/gnomepilot
+PILOTINC=	"-I${LOCALBASE}/pilot/include"
+PILOTLIB=	"-L${LOCALBASE}/pilot/lib"
+.else
+PILOTARGS=	--without-pisock --disable-pilotlinktest
+EXTRA_PATCHES=	${FILESDIR}/patch.nopilot
+.endif
+
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		--datadir=${PREFIX}/share/gnome ${PILOTARGS}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PILOTINC}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib ${PILOTLIB}"
+
+.if !defined(WITH_GNOMEPILOT)
+pre-extract:
+	@${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT"
+.endif
+
+.if defined(WITH_GNOMEPILOT)
+post-install:
+	@${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnomepim/files/extra-patch-nopilot b/deskutils/gnomepim/files/extra-patch-nopilot
new file mode 100644
index 000000000000..546fad85c5a5
--- /dev/null
+++ b/deskutils/gnomepim/files/extra-patch-nopilot
@@ -0,0 +1,26 @@
+--- configure.orig	Fri Jun  2 12:19:04 2000
++++ configure	Fri Jun  2 12:19:38 2000
+@@ -3629,23 +3629,7 @@
+ 
+ 	echo $ac_n "checking for gnome-pilot environment""... $ac_c" 1>&6
+ echo "configure:3632: 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
+ 			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/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab
index 285308eaeea3..a90fec35121a 100644
--- a/deskutils/gnomepim/files/patch-ab
+++ b/deskutils/gnomepim/files/patch-ab
@@ -1,28 +1,52 @@
 --- gncal/Makefile.in.orig	Sat May 20 20:52:50 2000
-+++ gncal/Makefile.in	Tue May 30 14:34:37 2000
-@@ -143,3 +143,3 @@
++++ gncal/Makefile.in	Fri Jun  2 12:41:34 2000
+@@ -141,12 +141,12 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = gnomecal.gnorba
  
 -help_base = $(datadir)/gnome/help/cal
 +help_base = $(datadir)/help/gnomecal
  
-@@ -148,3 +148,3 @@
+ @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		calendar-conduit-control-applet			calendar-pilot-sync
+ bin_PROGRAMS = gnomecal $(extra_pilot_bins)
  
 -INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 +INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
-@@ -223,3 +223,3 @@
+ 
+ GNOMECAL_CORBA_GENERATED =  	GnomeCal.h			GnomeCal.c			GnomeCal-common.c		GnomeCal-skels.c		GnomeCal-stubs.c
+@@ -172,7 +172,7 @@
+ libcalendar_conduit_la_SOURCES =  	GnomeCal-common.c		GnomeCal-stubs.c		calendar-conduit.c		calobj.c 			alarm.c				calendar.c 			timeutil.c
+ 
+ 
+-libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir)
++libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir) -avoid-version
+ 
+ 
+ libcalendar_conduit_la_LIBADD =  	../libversit/libversit.la 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 	$(GNOME_LIBDIR) 	$(GNOME_LIBS)
+@@ -221,7 +221,7 @@
+ @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop 
  
 -@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
 +@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
  @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
-@@ -235,3 +235,3 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -233,7 +233,7 @@
+ appicondir = $(datadir)/pixmaps
+ appicon_DATA = gnome-calendar-conduit.png
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
+ Productivity_DATA = gncal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
-+++ gnomecard/Makefile.in	Tue May 30 14:35:44 2000
-@@ -137,5 +137,5 @@
++++ gnomecard/Makefile.in	Fri Jun  2 12:42:28 2000
+@@ -135,9 +135,9 @@
+ 
+ nSUBDIRS = help
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/cal
@@ -30,13 +54,32 @@
 -INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
 +INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
  
-@@ -185,3 +185,3 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		address-conduit-capplet	
+@@ -183,7 +183,7 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = 	address-conduit-capplet.desktop 
  
 -@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
 +@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
  @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
-@@ -194,3 +194,3 @@
+ 
+ @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
+ EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnome-card.xpm  	gnomecard.desktop 	address-conduit-capplet.desktop 	gnomecard.conduit 	gnome-gnomecard.png 	gnomecard.gnorba 	ChangeLog 	BUGS
+ 
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
+ Productivity_DATA = gnomecard.desktop
+ 
+@@ -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/gnomepim/files/patch-ad b/deskutils/gnomepim/files/patch-ad
new file mode 100644
index 000000000000..7a5f6345a27e
--- /dev/null
+++ b/deskutils/gnomepim/files/patch-ad
@@ -0,0 +1,19 @@
+--- gnomecard/address-conduit.c.orig	Tue Mar 14 01:39:27 2000
++++ gnomecard/address-conduit.c	Fri Jun  2 12:36:08 2000
+@@ -241,8 +241,16 @@
+ {
+ 	if (card->rev.prop.used) {
+ 		time_t syncTime, revTime;
++#ifdef __FreeBSD__
++		struct tm *tmptm;
++#endif
+ 		syncTime = GET_CONDUIT_DATA(abs)->dbi->pu->lastSyncDate;
++#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;
+ 	}