Remove a leftover directory, and correct the spelling of "girepository".

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13665 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 27 insertions, 3 deletions

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 6b3765c44..01e276883 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/upower/Makefile,v 1.7 2010/01/23 16:40:05 marcus Exp $
+#   $MCom: ports/sysutils/upower/Makefile,v 1.8 2010/02/13 19:21:35 marcus Exp $
 #
 
 PORTNAME=	UPower
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
diff --git a/sysutils/upower/files/patch-devkit-power-gobject_Makefile.in b/sysutils/upower/files/patch-devkit-power-gobject_Makefile.in
new file mode 100644
index 000000000..e208040fb
--- /dev/null
+++ b/sysutils/upower/files/patch-devkit-power-gobject_Makefile.in
@@ -0,0 +1,11 @@
+--- devkit-power-gobject/Makefile.in.orig	2010-02-21 20:24:59.000000000 -0500
++++ devkit-power-gobject/Makefile.in	2010-02-21 20:25:03.000000000 -0500
+@@ -387,7 +387,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__appe
+ @HAVE_INTROSPECTION_TRUE@DeviceKitPowerGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+ @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+ @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
+-@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepositry-1.0
++@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
+ @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ all: all-am
+ 
diff --git a/sysutils/upower/files/patch-libupower-glib_Makefile.in b/sysutils/upower/files/patch-libupower-glib_Makefile.in
new file mode 100644
index 000000000..9e3877fb4
--- /dev/null
+++ b/sysutils/upower/files/patch-libupower-glib_Makefile.in
@@ -0,0 +1,11 @@
+--- libupower-glib/Makefile.in.orig	2010-02-21 20:24:00.000000000 -0500
++++ libupower-glib/Makefile.in	2010-02-21 20:24:10.000000000 -0500
+@@ -364,7 +364,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__appe
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+ @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+ @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
+-@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepositry-1.0
++@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
+ @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ all: all-am
+ 
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index 95a4a3d8b..2d955fe17 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -20,8 +20,8 @@ include/upower-glib/up-types.h
 include/upower-glib/up-version.h
 include/upower-glib/up-wakeup-item.h
 include/upower-glib/upower.h
-lib/girepositry-1.0/DeviceKitPowerGlib-1.0.typelib
-lib/girepositry-1.0/UPowerGlib-1.0.typelib
+lib/girepository-1.0/DeviceKitPowerGlib-1.0.typelib
+lib/girepository-1.0/UPowerGlib-1.0.typelib
 lib/libdevkit-power-gobject.a
 lib/libdevkit-power-gobject.la
 lib/libdevkit-power-gobject.so
@@ -49,5 +49,6 @@ share/polkit-1/actions/org.freedesktop.upower.qos.policy
 @exec mkdir -p /var/lib/DeviceKit-power
 @dirrm include/DeviceKit-power/devkit-power-gobject
 @dirrm include/DeviceKit-power
+@dirrm include/upower-glib
 @unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true
 @unexec rmdir /var/lib 2>/dev/null || true