From d28ffbc4c65d9f49033b575f42ecd375355d5ca5 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 30 Aug 2012 08:00:12 +0000 Subject: [PATCH] Unbreak by updating to deja-dup-23.90. --- sysutils/deja-dup/Makefile | 29 ++++--- sysutils/deja-dup/distinfo | 7 +- .../deja-dup/patches/patch-data_Makefile_in | 8 +- sysutils/deja-dup/pkg/PLIST | 84 ++++++++++++++++++- 4 files changed, 105 insertions(+), 23 deletions(-) diff --git a/sysutils/deja-dup/Makefile b/sysutils/deja-dup/Makefile index 02d6c239a85..cf82fe6a1f1 100755 --- a/sysutils/deja-dup/Makefile +++ b/sysutils/deja-dup/Makefile @@ -1,14 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2012/08/29 14:10:18 jasper Exp $ - -BROKEN= needs fixing for vala 0.18 +# $OpenBSD: Makefile,v 1.12 2012/08/30 08:00:12 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= simple encrypted backup tool for GNOME -GNOME_VERSION= 22.1 +GNOME_VERSION= 23.90 GNOME_PROJECT= deja-dup -REVISION= 0 CATEGORIES= sysutils x11/gnome @@ -25,28 +22,34 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo WANTLIB += cairo-gobject dbus-1 drm expat ffi fontconfig freetype -WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gnome-keyring gobject-2.0 gpg-error gthread-2.0 gtk-3 -WANTLIB += m nautilus-extension notify pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs -WANTLIB += xcb xcb-render xcb-shm z stdc++ +WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0 +WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error +WANTLIB += gthread-2.0 gtk-3 m nautilus-extension notify pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre peas-1.0 pixman-1 +WANTLIB += png pthread pthread-stubs stdc++ xcb xcb-render xcb-shm +WANTLIB += z -MASTER_SITES= https://launchpad.net/deja-dup/${GNOME_VERSION:C/^([0-9]+).*/\1/}/${GNOME_VERSION}/+download/ +# XXX devel release +#MASTER_SITES= https://launchpad.net/deja-dup/${GNOME_VERSION:C/^([0-9]+).*/\1/}/${GNOME_VERSION}/+download/ +MASTER_SITES= https://launchpad.net/deja-dup/24/23.90/+download/ MODULES= devel/dconf \ devel/gettext \ x11/gnome \ lang/python -MODGNOME_TOOLS= vala yelp +MODGNOME_TOOLS= yelp MODGNOME_DESKTOP_FILE= Yes MODGNOME_ICON_CACHE= Yes LIBTOOL_FLAGS= --tag=disable-static +BUILD_DEPENDS= lang/vala>=0.17.5 + RUN_DEPENDS= sysutils/duplicity>=0.6.15 -LIB_DEPENDS= x11/gnome/nautilus +LIB_DEPENDS= devel/libpeas \ + x11/gnome/nautilus CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --disable-static \ diff --git a/sysutils/deja-dup/distinfo b/sysutils/deja-dup/distinfo index 024aaef8b44..a0ec267b4c1 100644 --- a/sysutils/deja-dup/distinfo +++ b/sysutils/deja-dup/distinfo @@ -1,5 +1,2 @@ -MD5 (deja-dup-22.1.tar.xz) = y/evbwOSq57zVaOut0yKeQ== -RMD160 (deja-dup-22.1.tar.xz) = 2FrIVDaFHzhDpHImUyP8j2R2xmo= -SHA1 (deja-dup-22.1.tar.xz) = vmubuUx4Rhw6MkJIJYUKCyvEAd0= -SHA256 (deja-dup-22.1.tar.xz) = RMuPzUV5mjacjaJxd5Kofj4YPuyhsH+o8qrIZk8Ayl4= -SIZE (deja-dup-22.1.tar.xz) = 777248 +SHA256 (deja-dup-23.90.tar.xz) = hiL+mCIF2EMUnl7ZprCrVKLBHzFdU95KdoCcF7St7SA= +SIZE (deja-dup-23.90.tar.xz) = 857800 diff --git a/sysutils/deja-dup/patches/patch-data_Makefile_in b/sysutils/deja-dup/patches/patch-data_Makefile_in index cdae104d343..19d4a9bf89c 100644 --- a/sysutils/deja-dup/patches/patch-data_Makefile_in +++ b/sysutils/deja-dup/patches/patch-data_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-data_Makefile_in,v 1.2 2012/03/23 11:38:05 ajacoutot Exp $ ---- data/Makefile.in.orig Thu Mar 22 13:03:37 2012 -+++ data/Makefile.in Fri Mar 23 12:13:36 2012 -@@ -626,7 +626,7 @@ uninstall-am: uninstall-autostartDATA uninstall-deskto +$OpenBSD: patch-data_Makefile_in,v 1.3 2012/08/30 08:00:12 ajacoutot Exp $ +--- data/Makefile.in.orig Tue Aug 21 21:20:33 2012 ++++ data/Makefile.in Thu Aug 30 09:08:44 2012 +@@ -661,7 +661,7 @@ uninstall-am: uninstall-autostartDATA uninstall-deskto deja-dup-preferences.desktop.in: deja-dup-preferences.desktop.in.in $(install_sh_DATA) $^ $@ diff --git a/sysutils/deja-dup/pkg/PLIST b/sysutils/deja-dup/pkg/PLIST index ead0cd4c529..5eb018c4993 100644 --- a/sysutils/deja-dup/pkg/PLIST +++ b/sysutils/deja-dup/pkg/PLIST @@ -1,10 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.9 2012/06/15 08:32:17 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.10 2012/08/30 08:00:12 ajacoutot Exp $ @bin bin/deja-dup @bin bin/deja-dup-preferences +lib/deja-dup/ +@comment lib/deja-dup/libcommon.la +lib/deja-dup/libcommon.so +@comment lib/deja-dup/libwidgets.la +lib/deja-dup/libwidgets.so @comment lib/nautilus/extensions-3.0/libdeja-dup.la lib/nautilus/extensions-3.0/libdeja-dup.so libexec/deja-dup/ @bin libexec/deja-dup/deja-dup-monitor +libexec/deja-dup/tools/ +libexec/deja-dup/tools/duplicity.plugin +@comment libexec/deja-dup/tools/libduplicity.la +libexec/deja-dup/tools/libduplicity.so man/ar/ man/ar/man1/ @man man/ar/man1/deja-dup-preferences.1 @@ -105,6 +114,10 @@ man/fy/ man/fy/man1/ @man man/fy/man1/deja-dup-preferences.1 @man man/fy/man1/deja-dup.1 +man/gd/ +man/gd/man1/ +@man man/gd/man1/deja-dup-preferences.1 +@man man/gd/man1/deja-dup.1 man/gl/ man/gl/man1/ @man man/gl/man1/deja-dup-preferences.1 @@ -175,6 +188,10 @@ man/ms/ man/ms/man1/ @man man/ms/man1/deja-dup-preferences.1 @man man/ms/man1/deja-dup.1 +man/my/ +man/my/man1/ +@man man/my/man1/deja-dup-preferences.1 +@man man/my/man1/deja-dup.1 man/nb/ man/nb/man1/ @man man/nb/man1/deja-dup-preferences.1 @@ -223,6 +240,10 @@ man/shn/ man/shn/man1/ @man man/shn/man1/deja-dup-preferences.1 @man man/shn/man1/deja-dup.1 +man/si/ +man/si/man1/ +@man man/si/man1/deja-dup-preferences.1 +@man man/si/man1/deja-dup.1 man/sk/ man/sk/man1/ @man man/sk/man1/deja-dup-preferences.1 @@ -330,6 +351,34 @@ share/help/ar/deja-dup/restore-lost.page share/help/ar/deja-dup/restore-revert.page share/help/ar/deja-dup/restore-worst-case.page share/help/ar/deja-dup/support.page +share/help/bg/ +share/help/bg/deja-dup/ +share/help/bg/deja-dup/backup-auto.page +share/help/bg/deja-dup/backup-first.page +share/help/bg/deja-dup/contribute.page +share/help/bg/deja-dup/credits.page +share/help/bg/deja-dup/index.page +share/help/bg/deja-dup/license.page +share/help/bg/deja-dup/prefs.page +share/help/bg/deja-dup/restore-full.page +share/help/bg/deja-dup/restore-lost.page +share/help/bg/deja-dup/restore-revert.page +share/help/bg/deja-dup/restore-worst-case.page +share/help/bg/deja-dup/support.page +share/help/bs/ +share/help/bs/deja-dup/ +share/help/bs/deja-dup/backup-auto.page +share/help/bs/deja-dup/backup-first.page +share/help/bs/deja-dup/contribute.page +share/help/bs/deja-dup/credits.page +share/help/bs/deja-dup/index.page +share/help/bs/deja-dup/license.page +share/help/bs/deja-dup/prefs.page +share/help/bs/deja-dup/restore-full.page +share/help/bs/deja-dup/restore-lost.page +share/help/bs/deja-dup/restore-revert.page +share/help/bs/deja-dup/restore-worst-case.page +share/help/bs/deja-dup/support.page share/help/ca/ share/help/ca/deja-dup/ share/help/ca/deja-dup/backup-auto.page @@ -610,6 +659,20 @@ share/help/lt/deja-dup/restore-lost.page share/help/lt/deja-dup/restore-revert.page share/help/lt/deja-dup/restore-worst-case.page share/help/lt/deja-dup/support.page +share/help/my/ +share/help/my/deja-dup/ +share/help/my/deja-dup/backup-auto.page +share/help/my/deja-dup/backup-first.page +share/help/my/deja-dup/contribute.page +share/help/my/deja-dup/credits.page +share/help/my/deja-dup/index.page +share/help/my/deja-dup/license.page +share/help/my/deja-dup/prefs.page +share/help/my/deja-dup/restore-full.page +share/help/my/deja-dup/restore-lost.page +share/help/my/deja-dup/restore-revert.page +share/help/my/deja-dup/restore-worst-case.page +share/help/my/deja-dup/support.page share/help/nb/ share/help/nb/deja-dup/ share/help/nb/deja-dup/backup-auto.page @@ -638,6 +701,20 @@ share/help/nl/deja-dup/restore-lost.page share/help/nl/deja-dup/restore-revert.page share/help/nl/deja-dup/restore-worst-case.page share/help/nl/deja-dup/support.page +share/help/oc/ +share/help/oc/deja-dup/ +share/help/oc/deja-dup/backup-auto.page +share/help/oc/deja-dup/backup-first.page +share/help/oc/deja-dup/contribute.page +share/help/oc/deja-dup/credits.page +share/help/oc/deja-dup/index.page +share/help/oc/deja-dup/license.page +share/help/oc/deja-dup/prefs.page +share/help/oc/deja-dup/restore-full.page +share/help/oc/deja-dup/restore-lost.page +share/help/oc/deja-dup/restore-revert.page +share/help/oc/deja-dup/restore-worst-case.page +share/help/oc/deja-dup/support.page share/help/pa/ share/help/pa/deja-dup/ share/help/pa/deja-dup/backup-auto.page @@ -867,6 +944,9 @@ share/locale/fi/LC_MESSAGES/deja-dup.mo share/locale/fo/LC_MESSAGES/deja-dup.mo share/locale/fr/LC_MESSAGES/deja-dup.mo share/locale/fy/LC_MESSAGES/deja-dup.mo +share/locale/gd/ +share/locale/gd/LC_MESSAGES/ +share/locale/gd/LC_MESSAGES/deja-dup.mo share/locale/gl/LC_MESSAGES/deja-dup.mo share/locale/he/LC_MESSAGES/deja-dup.mo share/locale/hi/LC_MESSAGES/deja-dup.mo @@ -884,6 +964,7 @@ share/locale/lt/LC_MESSAGES/deja-dup.mo share/locale/lv/LC_MESSAGES/deja-dup.mo share/locale/ml/LC_MESSAGES/deja-dup.mo share/locale/ms/LC_MESSAGES/deja-dup.mo +share/locale/my/LC_MESSAGES/deja-dup.mo share/locale/nb/LC_MESSAGES/deja-dup.mo share/locale/nl/LC_MESSAGES/deja-dup.mo share/locale/nn/LC_MESSAGES/deja-dup.mo @@ -898,6 +979,7 @@ share/locale/ru/LC_MESSAGES/deja-dup.mo share/locale/shn/ share/locale/shn/LC_MESSAGES/ share/locale/shn/LC_MESSAGES/deja-dup.mo +share/locale/si/LC_MESSAGES/deja-dup.mo share/locale/sk/LC_MESSAGES/deja-dup.mo share/locale/sl/LC_MESSAGES/deja-dup.mo share/locale/sq/LC_MESSAGES/deja-dup.mo