diff options
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/multisync-backup/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/multisync-evolution/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/multisync-syncml/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/multisync/Makefile | 3 | ||||
| -rw-r--r-- | deskutils/multisync/distinfo | 4 | ||||
| -rw-r--r-- | deskutils/multisync/files/patch-src-syncengine.c | 19 | ||||
| -rw-r--r-- | deskutils/multisync/pkg-plist | 2 |
7 files changed, 30 insertions, 4 deletions
diff --git a/deskutils/multisync-backup/Makefile b/deskutils/multisync-backup/Makefile index bbc484c2864d..04c82ec51177 100644 --- a/deskutils/multisync-backup/Makefile +++ b/deskutils/multisync-backup/Makefile @@ -12,6 +12,8 @@ COMMENT= Multisync backup plugin RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync MD5_FILE= ${MASTERDIR}/distinfo +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist WRKSRC= ${WRKDIR}/multisync-${PORTVERSION}/plugins/backup_plugin diff --git a/deskutils/multisync-evolution/Makefile b/deskutils/multisync-evolution/Makefile index e4a8f05bf716..5bbbf7f1904c 100644 --- a/deskutils/multisync-evolution/Makefile +++ b/deskutils/multisync-evolution/Makefile @@ -9,11 +9,13 @@ PORTNAME= multisync-evolution MAINTAINER= pav@FreeBSD.org COMMENT= Evolution synchronization plugin for Multisync +BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync \ evolution:${PORTSDIR}/mail/evolution MD5_FILE= ${MASTERDIR}/distinfo PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist WRKSRC= ${WRKDIR}/multisync-${PORTVERSION}/plugins/evolution_sync diff --git a/deskutils/multisync-syncml/Makefile b/deskutils/multisync-syncml/Makefile index 2c8b8f2ca360..c5f1deae9912 100644 --- a/deskutils/multisync-syncml/Makefile +++ b/deskutils/multisync-syncml/Makefile @@ -12,6 +12,8 @@ COMMENT= Multisync plugin for SyncML targets RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync MD5_FILE= ${MASTERDIR}/distinfo +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist WRKSRC= ${WRKDIR}/multisync-${PORTVERSION}/plugins/syncml_plugin diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile index f32ea5dc189f..2a0d1f0908c7 100644 --- a/deskutils/multisync/Makefile +++ b/deskutils/multisync/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME?= multisync -PORTVERSION= 0.81 -PORTREVISION= 2 +PORTVERSION= 0.82 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= multisync diff --git a/deskutils/multisync/distinfo b/deskutils/multisync/distinfo index 2bfb88caccb4..c6f9107dc972 100644 --- a/deskutils/multisync/distinfo +++ b/deskutils/multisync/distinfo @@ -1,2 +1,2 @@ -MD5 (multisync-0.81.tar.bz2) = e9091a2a1a364f2afb71149928a26c78 -SIZE (multisync-0.81.tar.bz2) = 1727892 +MD5 (multisync-0.82.tar.bz2) = 499aaa3d41e33276ab162db1d1912a16 +SIZE (multisync-0.82.tar.bz2) = 1432473 diff --git a/deskutils/multisync/files/patch-src-syncengine.c b/deskutils/multisync/files/patch-src-syncengine.c new file mode 100644 index 000000000000..3941daa32f98 --- /dev/null +++ b/deskutils/multisync/files/patch-src-syncengine.c @@ -0,0 +1,19 @@ +--- src/syncengine.c.orig Mon Apr 12 06:23:21 2004 ++++ src/syncengine.c Thu Apr 29 00:11:08 2004 +@@ -1097,6 +1097,7 @@ + for (n = 0; n < g_list_length(remotechanges); n++) { + changed_object *robj, *lobj; + char *luid, *uid; ++ sync_compare_result compare; + + robj = g_list_nth_data(remotechanges, n); + lobj = g_list_nth_data(localchanges, t); +@@ -1135,7 +1136,7 @@ + if (!uid) {*/ + // None of the two objects has a UID connection + // If they are equal, just connect them +- sync_compare_result compare = ++ compare = + sync_compare_objects(robj->comp, lobj->comp, lobj->object_type); + if (compare == SYNC_COMPARE_EQUAL) { + sync_insert_idpair(lobj->uid, robj->uid, diff --git a/deskutils/multisync/pkg-plist b/deskutils/multisync/pkg-plist index 0fa97a0e51ba..c6ee139db8e5 100644 --- a/deskutils/multisync/pkg-plist +++ b/deskutils/multisync/pkg-plist @@ -1,9 +1,11 @@ bin/multisync include/multisync/multisync.h +share/gnome/applications/multisync.desktop share/gnome/multisync/pixmaps/multisync.png share/gnome/multisync/pixmaps/multisync.xpm share/gnome/multisync/pixmaps/multisync-16.png share/gnome/multisync/pixmaps/multisync_small.png share/gnome/multisync/pixmaps/resync_small.png @dirrm share/gnome/multisync/pixmaps +@dirrm share/gnome/multisync @dirrm include/multisync |