cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from glib upstream 136e705e8383ff8848e425ac01278102d7badc52

Browse Source 
install-gsettings-schemas has been rewritten in a portable way
This commit is contained in:
ajacoutot 2010-10-04 06:49:33 +00:00
parent 1fc8789f34
commit 94ef42a3da
11 changed files with 134 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/telepathy/telepathy-logger/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2010/10/02 07:23:34 jasper Exp $
# $OpenBSD: Makefile,v 1.12 2010/10/04 06:49:34 ajacoutot Exp $
COMMENT= flexible communications framework, logger component
DISTNAME= telepathy-logger-0.1.5
REVISION= 0
REVISION= 1
SHARED_LIBS += telepathy-logger 1.0 # 1.0

33
net/telepathy/telepathy-logger/patches/patch-configure
View File

@ -1,17 +1,32 @@
$OpenBSD: patch-configure,v 1.1 2010/09/30 07:37:25 jasper Exp $
$OpenBSD: patch-configure,v 1.2 2010/10/04 06:49:34 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
--- configure.orig Tue Sep 28 20:54:02 2010
+++ configure Tue Sep 28 20:54:37 2010
@@ -13281,8 +13281,8 @@ install-data-am: install-gsettings-schemas
--- configure.orig Mon Oct 4 08:45:17 2010
+++ configure Mon Oct 4 08:45:45 2010
@@ -13280,22 +13280,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:

4
x11/gnome/gcalctool/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.32 2010/10/02 07:24:22 jasper Exp $
# $OpenBSD: Makefile,v 1.33 2010/10/04 06:49:33 ajacoutot Exp $
COMMENT= GTK2 desktop calculator
GNOME_PROJECT= gcalctool
GNOME_VERSION= 5.32.0
REVISION= 0
REVISION= 1
CATEGORIES= math

33
x11/gnome/gcalctool/patches/patch-configure
View File

@ -1,17 +1,32 @@
$OpenBSD: patch-configure,v 1.1 2010/09/30 07:39:48 jasper Exp $
$OpenBSD: patch-configure,v 1.2 2010/10/04 06:49:33 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
--- configure.orig Tue Sep 28 17:50:45 2010
+++ configure Tue Sep 28 17:51:01 2010
@@ -5576,8 +5576,8 @@ install-data-am: install-gsettings-schemas
--- configure.orig Mon Sep 27 13:11:32 2010
+++ configure Mon Oct 4 08:32:41 2010
@@ -5575,22 +5575,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:

4
x11/gnome/gcalctool/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2010/09/30 07:39:48 jasper Exp $
@comment $OpenBSD: PLIST,v 1.15 2010/10/04 06:49:33 ajacoutot Exp $
@bin bin/gcalccmd
@bin bin/gcalctool
bin/gnome-calculator
@ -699,8 +699,6 @@ share/locale/id/LC_MESSAGES/gcalctool.mo
share/locale/it/LC_MESSAGES/gcalctool.mo
share/locale/ja/LC_MESSAGES/gcalctool.mo
share/locale/ka/LC_MESSAGES/gcalctool.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/gcalctool.mo
share/locale/kn/LC_MESSAGES/gcalctool.mo
share/locale/ko/LC_MESSAGES/gcalctool.mo

4
x11/gnome/keyring/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.45 2010/09/30 07:34:39 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.46 2010/10/04 06:49:33 ajacoutot Exp $
COMMENT= password agent for the GNOME project
GNOME_PROJECT= gnome-keyring
GNOME_VERSION= 2.32.0
REVISION= 0
SHARED_LIBS += gp11 1.0 # .0.0
SHARED_LIBS += gcr 1.0 # .0.0

33
x11/gnome/keyring/patches/patch-configure
View File

@ -1,17 +1,32 @@
$OpenBSD: patch-configure,v 1.1 2010/09/30 07:34:39 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.2 2010/10/04 06:49:33 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
--- configure.orig Tue Sep 28 11:13:57 2010
+++ configure Tue Sep 28 11:14:08 2010
@@ -14454,8 +14454,8 @@ install-data-am: install-gsettings-schemas
--- configure.orig Mon Sep 27 22:56:55 2010
+++ configure Mon Oct 4 08:41:39 2010
@@ -14453,22 +14453,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:

4
x11/gnome/nautilus-sendto/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2010/09/30 10:41:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2010/10/04 06:49:33 ajacoutot Exp $
SHARED_ONLY= Yes
@ -7,6 +7,8 @@ COMMENT= applications integration into Nautilus
GNOME_PROJECT= nautilus-sendto
GNOME_VERSION= 2.32.0
REVISION= 0
CATEGORIES= misc net
# GPLv2

33
x11/gnome/nautilus-sendto/patches/patch-configure
View File

@ -1,17 +1,32 @@
$OpenBSD: patch-configure,v 1.1 2010/09/30 10:41:38 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.2 2010/10/04 06:49:33 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
--- configure.orig Thu Sep 30 12:28:43 2010
+++ configure Thu Sep 30 12:28:55 2010
@@ -11041,8 +11041,8 @@ install-data-am: install-gsettings-schemas
--- configure.orig Mon Oct 4 08:36:35 2010
+++ configure Mon Oct 4 08:37:24 2010
@@ -11040,22 +11040,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:

4
x11/gnome/system-tools/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.3 2010/09/30 07:38:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2010/10/04 06:49:33 ajacoutot Exp $
COMMENT= sytem configuration GUI for desktops
GNOME_PROJECT= gnome-system-tools
GNOME_VERSION= 2.32.0
REVISION= 0
CATEGORIES= sysutils
HOMEPAGE= http://projects.gnome.org/gst/

33
x11/gnome/system-tools/patches/patch-configure
View File

@ -1,17 +1,32 @@
$OpenBSD: patch-configure,v 1.1 2010/09/30 07:38:53 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.2 2010/10/04 06:49:34 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
--- configure.orig Tue Sep 28 17:22:36 2010
+++ configure Tue Sep 28 17:23:00 2010
@@ -13173,8 +13173,8 @@ install-data-am: install-gsettings-schemas
--- configure.orig Mon Oct 4 08:42:05 2010
+++ configure Mon Oct 4 08:42:58 2010
@@ -13172,22 +13172,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas: