Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jun 2014 20:54:21 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356250 - head/sysutils/upower
Message-ID:  <201406022054.s52KsLV7020582@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Mon Jun  2 20:54:21 2014
New Revision: 356250
URL: http://svnweb.freebsd.org/changeset/ports/356250
QAT: https://qat.redports.org/buildarchive/r356250/

Log:
  Move LICENSE to please portlint.
  Replace NO_INSTALL_MANPAGES with a MANPAGES option.
  Remove /var/lib/DeviceKit-power from pkg-plist.  This directory
    was only created when installing from packages and isn't referenced anywhere.
  Create /var/lib/upower with @exec to support old pkg_install.
  
  PR:		185287
  Submitted by:	tijl@

Modified:
  head/sysutils/upower/Makefile
  head/sysutils/upower/pkg-plist

Modified: head/sysutils/upower/Makefile
==============================================================================
--- head/sysutils/upower/Makefile	Mon Jun  2 20:42:44 2014	(r356249)
+++ head/sysutils/upower/Makefile	Mon Jun  2 20:54:21 2014	(r356250)
@@ -4,18 +4,29 @@
 
 PORTNAME=	upower
 PORTVERSION=	0.9.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	D-Bus daemon for simplifying power management tasks
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+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
@@ -29,12 +40,4 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-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
-
-post-install:
-	@${MKDIR} ${STAGEDIR}/var/lib/DeviceKit-power
-
 .include <bsd.port.mk>

Modified: head/sysutils/upower/pkg-plist
==============================================================================
--- head/sysutils/upower/pkg-plist	Mon Jun  2 20:42:44 2014	(r356249)
+++ head/sysutils/upower/pkg-plist	Mon Jun  2 20:54:21 2014	(r356250)
@@ -21,9 +21,9 @@ lib/libupower-glib.so.1.0.1
 libdata/pkgconfig/upower-glib.pc
 libexec/devkit-power-daemon
 libexec/upowerd
-man/man1/upower.1.gz
-man/man7/UPower.7.gz
-man/man8/upowerd.8.gz
+%%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
@@ -37,9 +37,8 @@ share/locale/pl/LC_MESSAGES/upower.mo
 share/locale/sv/LC_MESSAGES/upower.mo
 share/polkit-1/actions/org.freedesktop.upower.policy
 share/polkit-1/actions/org.freedesktop.upower.qos.policy
-@exec mkdir -p /var/lib/DeviceKit-power
+@exec mkdir -p /var/lib/upower
 @dirrm include/libupower-glib
 @dirrm etc/UPower
-@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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406022054.s52KsLV7020582>