ports/185287: [patch] sysutils/upower: pkg-plist fix, MANPAGES option, staging

[Tijl Coosemans]

The following reply was made to PR ports/185287; it has been noted by GNATS.

From: Tijl Coosemans <tijl at FreeBSD.org>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/185287: [patch] sysutils/upower: pkg-plist fix, MANPAGES
 option, staging
Date: Fri, 30 May 2014 18:33:58 +0200

 --MP_/EwEc7sqM_l.w/AsbI=y.a2v
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Updated patch.
 --MP_/EwEc7sqM_l.w/AsbI=y.a2v
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=upower.patch
 
 Index: sysutils/upower/Makefile
 ===================================================================
 --- sysutils/upower/Makefile	(revision 355602)
 +++ sysutils/upower/Makefile	(working copy)
 @@ -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 at 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>
 Index: sysutils/upower/pkg-plist
 ===================================================================
 --- sysutils/upower/pkg-plist	(revision 355602)
 +++ sysutils/upower/pkg-plist	(working copy)
 @@ -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
 - 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
 
 --MP_/EwEc7sqM_l.w/AsbI=y.a2v--