diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index b98e449ad7e..b70e8bd81bf 100755 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.65 2015/03/27 08:46:21 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.66 2015/04/03 08:43:30 ajacoutot Exp $ # -fvisibility NOT_FOR_ARCHS= ${GCC3_ARCHS} @@ -6,16 +6,11 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS} SHARED_ONLY= Yes COMMENT-main= configuration backend system -COMMENT-editor= graphical dconf(1) editor GNOME_PROJECT= dconf -GNOME_VERSION= 0.22.0 +GNOME_VERSION= 0.24.0 PKGNAME-main= ${DISTNAME} -PKGNAME-editor= dconf-editor-${GNOME_VERSION} - -REVISION-main= 2 -REVISION-editor= 1 SHARED_LIBS += dconf 1.0 # 1.0.0 SHARED_LIBS += dconf-dbus-1 1.0 # 1.0.0 @@ -28,50 +23,29 @@ MAINTAINER= Jasper Lievisse Adriaanse , \ # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 pthread +WANTLIB += c dbus-1 gio-2.0 glib-2.0 gobject-2.0 pthread -WANTLIB-main += ${WANTLIB} dbus-1 +MULTI_PACKAGES= -main -WANTLIB-editor += ${WANTLIB} -WANTLIB-editor += atk-1.0 cairo cairo-gobject dconf fontconfig freetype -WANTLIB-editor += gdk-3 gdk_pixbuf-2.0 gmodule-2.0 gtk-3 m pango-1.0 -WANTLIB-editor += pangocairo-1.0 pangoft2-1.0 xml2 z - -MULTI_PACKAGES= -main -editor - -PSEUDO_FLAVORS= no_editor bootstrap -FLAVOR?= - -MODULES= devel/dconf \ - devel/gettext \ +MODULES= devel/gettext \ x11/gnome -MODGNOME_TOOLS= desktop-file-utils docbook gtk-update-icon-cache vala +MODGNOME_TOOLS= docbook vala -RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} -LIB_DEPENDS-main= ${LIB_DEPENDS} \ - devel/glib2 \ +LIB_DEPENDS= devel/glib2 \ x11/dbus -RUN_DEPENDS-editor= ${RUN_DEPENDS} -LIB_DEPENDS-editor= ${LIB_DEPENDS} \ - ${BASE_PKGPATH},-main=${GNOME_VERSION} \ - x11/gtk+3 - CONFIGURE_STYLE= gnu -.include - -.if ${BUILD_PACKAGES:M-editor} -CONFIGURE_ARGS += --enable-editor -.else -CONFIGURE_ARGS += --disable-editor -.endif - pre-configure: - ${SUBST_CMD} ${WRKSRC}/{bin,client,editor}/Makefile.in \ - ${WRKSRC}/dbus-1/Makefile.in + ${SUBST_CMD} ${WRKSRC}/{bin,client,dbus-1}/Makefile.in perl -pi -e 's,/etc/dconf,${SYSCONFDIR}/dconf,g' \ - ${WRKSRC}/{engine/dconf-engine,bin/dconf-update}.c + ${WRKSRC}/engine/dconf-engine-source-system.c \ + ${WRKSRC}/engine/dconf-engine-profile.c \ + ${WRKSRC}/docs/dconf-overview.xml \ + ${WRKSRC}/docs/html/dconf-overview.html \ + ${WRKSRC}/bin/dconf-update.vala \ + ${WRKSRC}/bin/dconf-update.c \ + ${WRKSRC}/tests/engine.c .include diff --git a/devel/dconf/dconf.port.mk b/devel/dconf/dconf.port.mk index 533e1aa194f..409ece13fc9 100644 --- a/devel/dconf/dconf.port.mk +++ b/devel/dconf/dconf.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: dconf.port.mk,v 1.5 2014/07/09 16:49:41 ajacoutot Exp $ +# $OpenBSD: dconf.port.mk,v 1.6 2015/04/03 08:43:30 ajacoutot Exp $ # This module is used by ports installing gsettings schemas under # PREFIX/share/glib-2.0/schemas/ @@ -7,10 +7,9 @@ # @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null # @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null -# use the "no_editor" FLAVOR to prevent a cyclic dependency MODDCONF_BUILD_DEPENDS= devel/glib2 MODDCONF_RUN_DEPENDS= devel/glib2 \ - devel/dconf,no_editor,bootstrap + devel/dconf BUILD_DEPENDS += ${MODDCONF_BUILD_DEPENDS} RUN_DEPENDS += ${MODDCONF_RUN_DEPENDS} diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo index c63a4899268..2497a690ec1 100644 --- a/devel/dconf/distinfo +++ b/devel/dconf/distinfo @@ -1,2 +1,2 @@ -SHA256 (dconf-0.22.0.tar.xz) = Cid8sMPwnnfZQTxamzV3/CtdbpQbWbRJQDkuAkoiS44= -SIZE (dconf-0.22.0.tar.xz) = 393260 +SHA256 (dconf-0.24.0.tar.xz) = Q3PgztH019aNUYA4eWwHNpYoDiKVe6uyn+sCZ8Yw/sI= +SIZE (dconf-0.24.0.tar.xz) = 218512 diff --git a/devel/dconf/patches/patch-bin_Makefile_in b/devel/dconf/patches/patch-bin_Makefile_in index 873bada372b..a7f1d391b19 100644 --- a/devel/dconf/patches/patch-bin_Makefile_in +++ b/devel/dconf/patches/patch-bin_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-bin_Makefile_in,v 1.12 2014/03/27 08:02:49 ajacoutot Exp $ ---- bin/Makefile.in.orig Mon Mar 24 20:24:40 2014 -+++ bin/Makefile.in Wed Mar 26 17:10:17 2014 +$OpenBSD: patch-bin_Makefile_in,v 1.13 2015/04/03 08:43:30 ajacoutot Exp $ +--- bin/Makefile.in.orig Mon Mar 23 18:08:53 2015 ++++ bin/Makefile.in Thu Apr 2 20:30:41 2015 @@ -98,7 +98,7 @@ am_dconf_OBJECTS = dconf-gvdb-builder.$(OBJEXT) \ dconf-dconf.$(OBJEXT) dconf_OBJECTS = $(am_dconf_OBJECTS) @@ -10,7 +10,7 @@ $OpenBSD: patch-bin_Makefile_in,v 1.12 2014/03/27 08:02:49 ajacoutot Exp $ dconf_LINK = $(CCLD) $(dconf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) -@@ -354,7 +354,7 @@ dconf_CFLAGS = \ +@@ -317,7 +317,7 @@ dconf_CFLAGS = \ -w dconf_LDADD = \ diff --git a/devel/dconf/patches/patch-client_Makefile_in b/devel/dconf/patches/patch-client_Makefile_in index 15291ac6755..b6f7942531f 100644 --- a/devel/dconf/patches/patch-client_Makefile_in +++ b/devel/dconf/patches/patch-client_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-client_Makefile_in,v 1.14 2014/03/27 08:02:49 ajacoutot Exp $ ---- client/Makefile.in.orig Mon Mar 24 20:24:40 2014 -+++ client/Makefile.in Wed Mar 26 17:10:17 2014 +$OpenBSD: patch-client_Makefile_in,v 1.15 2015/04/03 08:43:30 ajacoutot Exp $ +--- client/Makefile.in.orig Mon Mar 23 18:08:53 2015 ++++ client/Makefile.in Thu Apr 2 20:30:41 2015 @@ -83,7 +83,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir) $(srcdir)/Makefile.am $(srcdir)/dconf.pc.in \ - $(top_srcdir)/aux/depcomp $(dconfclientinclude_HEADERS) \ + $(top_srcdir)/build-aux/depcomp $(dconfclientinclude_HEADERS) \ $(dconfinclude_HEADERS) -shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT) +shlib_PROGRAMS = libdconf.so.${LIBdconf_VERSION}$(EXEEXT) subdir = client ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ -@@ -365,7 +365,7 @@ top_srcdir = @top_srcdir@ +@@ -328,7 +328,7 @@ top_srcdir = @top_srcdir@ # initialize variables for unconditional += appending TEST_PROGS = shlibdir = $(libdir) @@ -19,7 +19,7 @@ $OpenBSD: patch-client_Makefile_in,v 1.14 2014/03/27 08:02:49 ajacoutot Exp $ noinst_LIBRARIES = libdconf-client.a dconfinclude_HEADERS = dconf.h dconfclientinclude_HEADERS = dconf-client.h -@@ -383,7 +383,7 @@ libdconf_so_1_0_0_LDADD = \ +@@ -346,7 +346,7 @@ libdconf_so_1_0_0_LDADD = \ ../shm/libdconf-shm-shared.a \ $(gio_LIBS) @@ -28,7 +28,7 @@ $OpenBSD: patch-client_Makefile_in,v 1.14 2014/03/27 08:02:49 ajacoutot Exp $ libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES) EXTRA_DIST = dconf.vapi dconf.deps vapi_DATA = dconf.vapi dconf.deps -@@ -479,8 +479,8 @@ uninstall-shlibPROGRAMS: +@@ -442,8 +442,8 @@ uninstall-shlibPROGRAMS: clean-shlibPROGRAMS: -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) @@ -39,7 +39,7 @@ $OpenBSD: patch-client_Makefile_in,v 1.14 2014/03/27 08:02:49 ajacoutot Exp $ $(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS) mostlyclean-compile: -@@ -901,13 +901,6 @@ test-report perf-report full-report: ${TEST_PROGS} +@@ -864,13 +864,6 @@ test-report perf-report full-report: ${TEST_PROGS} # run tests in cwd as part of make check check-local: test-nonrecursive diff --git a/devel/dconf/patches/patch-dbus-1_Makefile_in b/devel/dconf/patches/patch-dbus-1_Makefile_in index dc2c5fd433b..07c1d983c5f 100644 --- a/devel/dconf/patches/patch-dbus-1_Makefile_in +++ b/devel/dconf/patches/patch-dbus-1_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-dbus-1_Makefile_in,v 1.13 2014/03/27 08:02:49 ajacoutot Exp $ ---- dbus-1/Makefile.in.orig Mon Mar 24 20:24:40 2014 -+++ dbus-1/Makefile.in Wed Mar 26 17:10:17 2014 +$OpenBSD: patch-dbus-1_Makefile_in,v 1.14 2015/04/03 08:43:30 ajacoutot Exp $ +--- dbus-1/Makefile.in.orig Mon Mar 23 18:08:53 2015 ++++ dbus-1/Makefile.in Thu Apr 2 20:55:35 2015 @@ -82,7 +82,7 @@ POST_UNINSTALL = : DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(srcdir)/dconf-dbus-1.pc.in \ - $(top_srcdir)/aux/depcomp $(dconf_dbus_1include_HEADERS) + $(top_srcdir)/build-aux/depcomp $(dconf_dbus_1include_HEADERS) -shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT) +shlib_PROGRAMS = libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}$(EXEEXT) subdir = dbus-1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ -@@ -397,9 +397,9 @@ libdconf_dbus_1_so_0_0_0_LDADD = \ +@@ -360,9 +360,9 @@ libdconf_dbus_1_so_0_0_0_LDADD = \ $(dbus_LIBS) \ $(glib_LIBS) @@ -22,7 +22,7 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.13 2014/03/27 08:02:49 ajacoutot Exp $ CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so all: all-am -@@ -494,8 +494,8 @@ uninstall-shlibPROGRAMS: +@@ -457,8 +457,8 @@ uninstall-shlibPROGRAMS: clean-shlibPROGRAMS: -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) @@ -33,7 +33,7 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.13 2014/03/27 08:02:49 ajacoutot Exp $ $(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS) mostlyclean-compile: -@@ -884,13 +884,6 @@ test-report perf-report full-report: ${TEST_PROGS} +@@ -847,13 +847,6 @@ test-report perf-report full-report: ${TEST_PROGS} # run tests in cwd as part of make check check-local: test-nonrecursive diff --git a/devel/dconf/patches/patch-editor_Makefile_in b/devel/dconf/patches/patch-editor_Makefile_in deleted file mode 100644 index 88c2089c348..00000000000 --- a/devel/dconf/patches/patch-editor_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-editor_Makefile_in,v 1.12 2014/09/20 06:34:53 ajacoutot Exp $ ---- editor/Makefile.in.orig Fri Sep 19 18:25:24 2014 -+++ editor/Makefile.in Sat Sep 20 08:11:00 2014 -@@ -106,7 +106,7 @@ nodist_dconf_editor_OBJECTS = dconf_editor-resources.$ - dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \ - $(nodist_dconf_editor_OBJECTS) - am__DEPENDENCIES_1 = --dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \ -+dconf_editor_DEPENDENCIES = ../client/libdconf.so.${LIBdconf_VERSION} \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \ -@@ -361,7 +361,7 @@ TEST_PROGS = - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client - dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf - dconf_editor_LDADD = \ -- ../client/libdconf.so.1 \ -+ ../client/libdconf.so.${LIBdconf_VERSION} \ - $(gtk_LIBS) \ - $(gee_LIBS) \ - $(gmodule_LIBS) \ diff --git a/devel/dconf/pkg/DESCR-editor b/devel/dconf/pkg/DESCR-editor deleted file mode 100755 index 2fd0c23166f..00000000000 --- a/devel/dconf/pkg/DESCR-editor +++ /dev/null @@ -1 +0,0 @@ -Editor for the dconf configuration storage system. diff --git a/devel/dconf/pkg/PLIST-editor b/devel/dconf/pkg/PLIST-editor deleted file mode 100644 index c3af536c6ef..00000000000 --- a/devel/dconf/pkg/PLIST-editor +++ /dev/null @@ -1,43 +0,0 @@ -@comment $OpenBSD: PLIST-editor,v 1.13 2014/09/20 06:34:53 ajacoutot Exp $ -@conflict dconf-<0.22.0 -@bin bin/dconf-editor -@man man/man1/dconf-editor.1 -share/appdata/ -share/appdata/ca.desrt.dconf-editor.appdata.xml -share/applications/ca.desrt.dconf-editor.desktop -share/dbus-1/services/ca.desrt.dconf-editor.service -share/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml -share/icons/HighContrast/ -share/icons/HighContrast/16x16/ -share/icons/HighContrast/16x16/apps/ -share/icons/HighContrast/16x16/apps/dconf-editor.png -share/icons/HighContrast/22x22/ -share/icons/HighContrast/22x22/apps/ -share/icons/HighContrast/22x22/apps/dconf-editor.png -share/icons/HighContrast/24x24/ -share/icons/HighContrast/24x24/apps/ -share/icons/HighContrast/24x24/apps/dconf-editor.png -share/icons/HighContrast/256x256/ -share/icons/HighContrast/256x256/apps/ -share/icons/HighContrast/256x256/apps/dconf-editor.png -share/icons/HighContrast/32x32/ -share/icons/HighContrast/32x32/apps/ -share/icons/HighContrast/32x32/apps/dconf-editor.png -share/icons/HighContrast/48x48/ -share/icons/HighContrast/48x48/apps/ -share/icons/HighContrast/48x48/apps/dconf-editor.png -share/icons/hicolor/16x16/apps/dconf-editor.png -share/icons/hicolor/22x22/apps/dconf-editor.png -share/icons/hicolor/24x24/apps/dconf-editor.png -share/icons/hicolor/256x256/apps/dconf-editor.png -share/icons/hicolor/32x32/apps/dconf-editor.png -share/icons/hicolor/48x48/apps/dconf-editor.png -share/icons/hicolor/64x64/apps/dconf-editor.png -@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null -@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null -@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor -@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor -@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/HighContrast -@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/HighContrast -@exec %D/bin/update-desktop-database -@unexec-delete %D/bin/update-desktop-database diff --git a/devel/dconf/pkg/PLIST-main b/devel/dconf/pkg/PLIST-main index 6a4a7689b43..f69ac4f7d64 100644 --- a/devel/dconf/pkg/PLIST-main +++ b/devel/dconf/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.14 2014/10/09 07:14:43 landry Exp $ +@comment $OpenBSD: PLIST-main,v 1.15 2015/04/03 08:43:30 ajacoutot Exp $ @conflict vala-<0.10 @pkgpath devel/dconf @extraunexec rm -rf ${SYSCONFDIR}/dconf/db/* @@ -33,7 +33,6 @@ share/gtk-doc/html/dconf/ch01.html share/gtk-doc/html/dconf/dconf-DConfChangeset.html share/gtk-doc/html/dconf/dconf-DConfError.html share/gtk-doc/html/dconf/dconf-dconf-Paths.html -share/gtk-doc/html/dconf/dconf-editor.html share/gtk-doc/html/dconf/dconf-overview.html share/gtk-doc/html/dconf/dconf-service.html share/gtk-doc/html/dconf/dconf-tool.html @@ -50,64 +49,6 @@ share/gtk-doc/html/dconf/right.png share/gtk-doc/html/dconf/style.css share/gtk-doc/html/dconf/up-insensitive.png share/gtk-doc/html/dconf/up.png -share/locale/an/LC_MESSAGES/dconf.mo -share/locale/ar/LC_MESSAGES/dconf.mo -share/locale/as/LC_MESSAGES/dconf.mo -share/locale/be/LC_MESSAGES/dconf.mo -share/locale/bg/LC_MESSAGES/dconf.mo -share/locale/bn_IN/LC_MESSAGES/dconf.mo -share/locale/ca/LC_MESSAGES/dconf.mo -share/locale/ca@valencia/LC_MESSAGES/dconf.mo -share/locale/cs/LC_MESSAGES/dconf.mo -share/locale/da/LC_MESSAGES/dconf.mo -share/locale/de/LC_MESSAGES/dconf.mo -share/locale/el/LC_MESSAGES/dconf.mo -share/locale/en_GB/LC_MESSAGES/dconf.mo -share/locale/eo/LC_MESSAGES/dconf.mo -share/locale/es/LC_MESSAGES/dconf.mo -share/locale/et/LC_MESSAGES/dconf.mo -share/locale/eu/LC_MESSAGES/dconf.mo -share/locale/fa/LC_MESSAGES/dconf.mo -share/locale/fi/LC_MESSAGES/dconf.mo -share/locale/fr/LC_MESSAGES/dconf.mo -share/locale/fur/ -share/locale/fur/LC_MESSAGES/ -share/locale/fur/LC_MESSAGES/dconf.mo -share/locale/gl/LC_MESSAGES/dconf.mo -share/locale/he/LC_MESSAGES/dconf.mo -share/locale/hi/LC_MESSAGES/dconf.mo -share/locale/hu/LC_MESSAGES/dconf.mo -share/locale/id/LC_MESSAGES/dconf.mo -share/locale/it/LC_MESSAGES/dconf.mo -share/locale/ja/LC_MESSAGES/dconf.mo -share/locale/ko/LC_MESSAGES/dconf.mo -share/locale/lt/LC_MESSAGES/dconf.mo -share/locale/lv/LC_MESSAGES/dconf.mo -share/locale/ml/LC_MESSAGES/dconf.mo -share/locale/mr/LC_MESSAGES/dconf.mo -share/locale/nb/LC_MESSAGES/dconf.mo -share/locale/nl/LC_MESSAGES/dconf.mo -share/locale/pa/LC_MESSAGES/dconf.mo -share/locale/pl/LC_MESSAGES/dconf.mo -share/locale/pt/LC_MESSAGES/dconf.mo -share/locale/pt_BR/LC_MESSAGES/dconf.mo -share/locale/ru/LC_MESSAGES/dconf.mo -share/locale/sk/LC_MESSAGES/dconf.mo -share/locale/sl/LC_MESSAGES/dconf.mo -share/locale/sr/LC_MESSAGES/dconf.mo -share/locale/sr@latin/LC_MESSAGES/dconf.mo -share/locale/sv/LC_MESSAGES/dconf.mo -share/locale/ta/LC_MESSAGES/dconf.mo -share/locale/te/LC_MESSAGES/dconf.mo -share/locale/tg/LC_MESSAGES/dconf.mo -share/locale/th/LC_MESSAGES/dconf.mo -share/locale/tr/LC_MESSAGES/dconf.mo -share/locale/ug/LC_MESSAGES/dconf.mo -share/locale/uk/LC_MESSAGES/dconf.mo -share/locale/vi/LC_MESSAGES/dconf.mo -share/locale/zh_CN/LC_MESSAGES/dconf.mo -share/locale/zh_HK/LC_MESSAGES/dconf.mo -share/locale/zh_TW/LC_MESSAGES/dconf.mo share/vala/ share/vala/vapi/ share/vala/vapi/dconf.deps