diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-10-25 17:44:29 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-10-25 17:44:29 +0800 |
| commit | 732218badd44b329e4b2686f07245efb1a3fe252 (patch) | |
| tree | db107dfdc7bfabf2753251e470bd72e34313226b | |
| parent | bc06751f9fe7ec87d7a134fe5af6a4da3510bc30 (diff) | |
| download | marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.tar marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.tar.gz marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.tar.bz2 marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.tar.lz marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.tar.xz marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.tar.zst marcuscom-ports-732218badd44b329e4b2686f07245efb1a3fe252.zip | |
Instead of using a pre-install: target, fix configure instead. To install
the Glib gschema.xml files.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14834 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/gnome-system-tools/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/gnome-system-tools/files/patch-configure | 13 |
2 files changed, 15 insertions, 7 deletions
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 4c6f3b6f0..3be313b26 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,11 +3,12 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.101 2010/09/22 07:38:30 kwm Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.102 2010/09/27 17:55:43 kwm Exp $ # PORTNAME= gnome-system-tools PORTVERSION= 2.32.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -33,10 +34,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GLIB_SCHEMAS= org.gnome.system-tools.gschema.xml -# can't use post-install: already in use by GLIB_SCHEMAS -pre-install: - @${MKDIR} ${PREFIX}/share/glib-2.0/schemas - @${INSTALL_DATA} ${WRKSRC}/org.gnome.system-tools.gschema.xml \ - ${PREFIX}/share/glib-2.0/schemas - .include <bsd.port.mk> diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure new file mode 100644 index 000000000..ae9d19daa --- /dev/null +++ b/sysutils/gnome-system-tools/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2010-10-25 11:36:00.000000000 +0200 ++++ configure 2010-10-25 11:36:25.000000000 +0200 +@@ -13173,8 +13173,8 @@ + .SECONDARY: $(gsettings_SCHEMAS) + + 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) + @$(NORMAL_INSTALL) |