[Midnightbsd-cvs] mports [17386] trunk/sysutils/upower: fix man page install

[laffer1 at midnightbsd.org]

Revision: 17386
          http://svnweb.midnightbsd.org/mports/?rev=17386
Author:   laffer1
Date:     2014-09-19 20:51:49 -0400 (Fri, 19 Sep 2014)
Log Message:
-----------
fix man page install

Modified Paths:
--------------
    trunk/sysutils/upower/Makefile
    trunk/sysutils/upower/pkg-plist

Added Paths:
-----------
    trunk/sysutils/upower/files/patch-src_freebsd_up-devd.c

Modified: trunk/sysutils/upower/Makefile
===================================================================
--- trunk/sysutils/upower/Makefile	2014-09-20 00:45:53 UTC (rev 17385)
+++ trunk/sysutils/upower/Makefile	2014-09-20 00:51:49 UTC (rev 17386)
@@ -2,24 +2,32 @@
 
 PORTNAME=	upower
 PORTVERSION=	0.9.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	D-Bus daemon for simplifying power management tasks
+
 LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
-    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=	gettext
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack ltverhack glib20
-USE_AUTOTOOLS=	libtool
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=MANPAGES
+OPTIONS_SUB=	yes
+MANPAGES_CONFIGURE_ENABLE=	man-pages
+MANPAGES_BUILD_DEPENDS= \
+	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+    	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml \
+    	xsltproc:${PORTSDIR}/textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USE_GNOME=	intlhack glib20 introspection:build,run
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
@@ -28,17 +36,6 @@
 CONFIGURE_ENV=	GTKDOC="false"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
-.if defined(NO_INSTALL_MANPAGES)
-CONFIGURE_ARGS+=--disable-man-pages
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \
-    		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \
-    		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-MAN1=		upower.1
-MAN7=		UPower.7
-MAN8=		upowerd.8
-.endif
-
 .include <bsd.port.mk>

Added: trunk/sysutils/upower/files/patch-src_freebsd_up-devd.c
===================================================================
--- trunk/sysutils/upower/files/patch-src_freebsd_up-devd.c	                        (rev 0)
+++ trunk/sysutils/upower/files/patch-src_freebsd_up-devd.c	2014-09-20 00:51:49 UTC (rev 17386)
@@ -0,0 +1,11 @@
+--- src/freebsd/up-devd.c.orig	2013-09-15 13:08:35.000000000 -0400
++++ src/freebsd/up-devd.c	2013-09-15 13:10:13.000000000 -0400
+@@ -195,7 +195,7 @@ up_devd_event_cb (GIOChannel *source, GI
+ 		event[terminator] = 0;
+ 		up_devd_process_event(event, user_data);
+ 		g_free(event);
+-	} else if (status == G_IO_STATUS_AGAIN) {
++	} else {
+ 		up_devd_init (UP_BACKEND(user_data));
+ 		if (up_devd_inited) {
+ 			int fd;


Property changes on: trunk/sysutils/upower/files/patch-src_freebsd_up-devd.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/sysutils/upower/pkg-plist
===================================================================
--- trunk/sysutils/upower/pkg-plist	2014-09-20 00:45:53 UTC (rev 17385)
+++ trunk/sysutils/upower/pkg-plist	2014-09-20 00:51:49 UTC (rev 17386)
@@ -20,6 +20,9 @@
 libdata/pkgconfig/upower-glib.pc
 libexec/devkit-power-daemon
 libexec/upowerd
+%%MANPAGES%%man/man1/upower.1.gz
+%%MANPAGES%%man/man7/UPower.7.gz
+%%MANPAGES%%man/man8/upowerd.8.gz
 share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml
@@ -33,9 +36,8 @@
 share/locale/sv/LC_MESSAGES/upower.mo
 share/polkit-1/actions/org.freedesktop.upower.policy
 share/polkit-1/actions/org.freedesktop.upower.qos.policy
- at exec mkdir -p /var/lib/DeviceKit-power
+ at exec mkdir -p /var/lib/upower
 @dirrm include/libupower-glib
 @dirrm etc/UPower
- at unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true
 @unexec rmdir /var/lib/upower 2>/dev/null || true
 @unexec rmdir /var/lib 2>/dev/null || true