3 files changed, 93 insertions, 6 deletions

diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index cd388d464d75..ecd9b42c5dd0 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	synce-gvfs
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.3
 CATEGORIES=	palm
-MASTER_SITES=	SF/synce/SynCE-GNOME/0.13
+MASTER_SITES=	SF/synce/SynCE-GNOME/0.14
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	GVFS module for access Windows Mobile devices
 
+EXTRACT_DEPENDS=${NONEXISTENT}:${GVFS_PORTDIR}:patch
 LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 MAKE_JOBS_SAFE=	yes
@@ -25,5 +25,16 @@ USE_GNOME=	gnomeprefix gnomehack gvfs
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+
+GVFS_PORTDIR=	${PORTSDIR}/devel/gvfs
+GVFS_WRKSRC_CMD=cd ${GVFS_PORTDIR} && ${MAKE} -V WRKSRC
+
+
+post-extract:
+.for dir in common daemon
+	${CP} `${GVFS_WRKSRC_CMD}`/${dir}/*.[ch] ${WRKSRC}/gvfs/${dir}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/palm/synce-gvfs/distinfo b/palm/synce-gvfs/distinfo
index 73729d357019..611a78a0e1de 100644
--- a/palm/synce-gvfs/distinfo
+++ b/palm/synce-gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-gvfs-0.2.2.tar.gz) = a0318fdcab581677253975ef244f7366
-SHA256 (synce-gvfs-0.2.2.tar.gz) = 651a6dd572a28d75be5a7b11f28d4818a90146d3dc8b7d12a2829a7100c7f18a
-SIZE (synce-gvfs-0.2.2.tar.gz) = 400825
+MD5 (synce-gvfs-0.3.tar.gz) = bdc7cae57e0de95d18ebb087ca58dbac
+SHA256 (synce-gvfs-0.3.tar.gz) = 317c13fa8f7ec2bfe4dbc2b6969436513fe6c69f9c520a4b7c0ce23b84c9abe3
+SIZE (synce-gvfs-0.3.tar.gz) = 348954
diff --git a/palm/synce-gvfs/files/patch-daemon_Makefile.in b/palm/synce-gvfs/files/patch-daemon_Makefile.in
new file mode 100644
index 000000000000..e522ae1b82a8
--- /dev/null
+++ b/palm/synce-gvfs/files/patch-daemon_Makefile.in
@@ -0,0 +1,76 @@
+--- daemon/Makefile.in.orig	2009-10-05 00:59:38.000000000 +1000
++++ daemon/Makefile.in	2009-10-05 00:57:58.000000000 +1000
+@@ -84,6 +84,12 @@
+ 	$(gvfs_src_dir)/daemon/gvfsjobmountmountable.h \
+ 	$(gvfs_src_dir)/daemon/gvfsjobunmountmountable.c \
+ 	$(gvfs_src_dir)/daemon/gvfsjobunmountmountable.h \
++	$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c \
++	$(gvfs_src_dir)/daemon/gvfsjobstartmountable.h \
++	$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c \
++	$(gvfs_src_dir)/daemon/gvfsjobstopmountable.h \
++	$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c \
++	$(gvfs_src_dir)/daemon/gvfsjobpollmountable.h \
+ 	$(gvfs_src_dir)/daemon/gvfsjobopenforread.c \
+ 	$(gvfs_src_dir)/daemon/gvfsjobopenforread.h \
+ 	$(gvfs_src_dir)/daemon/gvfsjobread.c \
+@@ -147,7 +153,8 @@
+ 	gvfsreadchannel.lo gvfswritechannel.lo gvfsmonitor.lo \
+ 	gvfsdaemonutils.lo gvfsjob.lo gvfsjobsource.lo gvfsjobdbus.lo \
+ 	gvfsjobmount.lo gvfsjobunmount.lo gvfsjobmountmountable.lo \
+-	gvfsjobunmountmountable.lo gvfsjobopenforread.lo \
++	gvfsjobunmountmountable.lo gvfsjobstartmountable.lo \
++	gvfsjobstopmountable.lo gvfsjobpollmountable.lo gvfsjobopenforread.lo \
+ 	gvfsjobread.lo gvfsjobseekread.lo gvfsjobcloseread.lo \
+ 	gvfsjobopenforwrite.lo gvfsjobwrite.lo gvfsjobseekwrite.lo \
+ 	gvfsjobclosewrite.lo gvfsjobpush.lo gvfsjobpull.lo \
+@@ -382,6 +389,12 @@
+ 	$(gvfs_src_dir)/daemon/gvfsjobmountmountable.h \
+ 	$(gvfs_src_dir)/daemon/gvfsjobunmountmountable.c \
+ 	$(gvfs_src_dir)/daemon/gvfsjobunmountmountable.h \
++	$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c \
++	$(gvfs_src_dir)/daemon/gvfsjobstartmountable.h \
++	$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c \
++	$(gvfs_src_dir)/daemon/gvfsjobstopmountable.h \
++	$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c \
++	$(gvfs_src_dir)/daemon/gvfsjobpollmountable.h \
+ 	$(gvfs_src_dir)/daemon/gvfsjobopenforread.c \
+ 	$(gvfs_src_dir)/daemon/gvfsjobopenforread.h \
+ 	$(gvfs_src_dir)/daemon/gvfsjobread.c \
+@@ -571,6 +584,9 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobtrash.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobunmount.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobunmountmountable.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobstartmountable.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobstopmountable.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobpollmountable.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsjobwrite.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfskeyring.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsmonitor.Plo@am__quote@
+@@ -696,6 +712,27 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gvfsjobunmountmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobunmountmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobunmountmountable.c
+ 
++gvfsjobstartmountable.lo: $(gvfs_src_dir)/daemon/gvfsjobstartmountable.c
++@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gvfsjobstartmountable.lo -MD -MP -MF $(DEPDIR)/gvfsjobstartmountable.Tpo -c -o gvfsjobstartmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gvfsjobstartmountable.Tpo $(DEPDIR)/gvfsjobstartmountable.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c' object='gvfsjobstartmountable.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gvfsjobstartmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobstartmountable.c
++
++gvfsjobstopmountable.lo: $(gvfs_src_dir)/daemon/gvfsjobstopmountable.c
++@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gvfsjobstopmountable.lo -MD -MP -MF $(DEPDIR)/gvfsjobstopmountable.Tpo -c -o gvfsjobstopmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gvfsjobstopmountable.Tpo $(DEPDIR)/gvfsjobstopmountable.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c' object='gvfsjobstopmountable.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gvfsjobstopmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobstopmountable.c
++
++gvfsjobpollmountable.lo: $(gvfs_src_dir)/daemon/gvfsjobpollmountable.c
++@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gvfsjobpollmountable.lo -MD -MP -MF $(DEPDIR)/gvfsjobpollmountable.Tpo -c -o gvfsjobpollmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gvfsjobpollmountable.Tpo $(DEPDIR)/gvfsjobpollmountable.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c' object='gvfsjobpollmountable.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gvfsjobpollmountable.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobpollmountable.c
++
+ gvfsjobopenforread.lo: $(gvfs_src_dir)/daemon/gvfsjobopenforread.c
+ @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gvfsjobopenforread.lo -MD -MP -MF $(DEPDIR)/gvfsjobopenforread.Tpo -c -o gvfsjobopenforread.lo `test -f '$(gvfs_src_dir)/daemon/gvfsjobopenforread.c' || echo '$(srcdir)/'`$(gvfs_src_dir)/daemon/gvfsjobopenforread.c
+ @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gvfsjobopenforread.Tpo $(DEPDIR)/gvfsjobopenforread.Plo