Date: Mon, 30 Dec 2013 11:47:38 +0100 (CET) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185287: [patch] sysutils/upower: pkg-plist fix, MANPAGES option, staging Message-ID: <201312301047.rBUAlcVr010322@kalimero.tijl.coosemans.org> Resent-Message-ID: <201312301050.rBUAo0N4052953@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185287 >Category: ports >Synopsis: [patch] sysutils/upower: pkg-plist fix, MANPAGES option, staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 30 10:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 11.0-CURRENT i386 >Organization: >Environment: >Description: - Move LICENSE to please portlint. - New LIB_DEPENDS syntax. - Replace NO_INSTALL_MANPAGES with a MANPAGES option. - Staging. - 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. >How-To-Repeat: >Fix: --- upower.patch begins here --- Index: sysutils/upower/Makefile =================================================================== --- sysutils/upower/Makefile (revision 337955) +++ sysutils/upower/Makefile (working copy) @@ -4,26 +4,37 @@ PORTNAME= upower PORTVERSION= 0.9.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://upower.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= D-Bus daemon for simplifying power management tasks +LICENSE= GPLv2 + 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 +LIB_DEPENDS= libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection -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/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 + USES= gettext gmake pkgconfig USE_BZIP2= yes USE_GNOME= gnomehack intlhack ltverhack glib20 USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_PYTHON= yes + CONFIGURE_ARGS= --disable-gtk-doc \ --with-backend=freebsd \ --localstatedir=/var @@ -31,17 +42,4 @@ CONFIGURE_ENV= GTKDOC="false" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.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 - -NO_STAGE= yes .include <bsd.port.mk> Index: sysutils/upower/pkg-plist =================================================================== --- sysutils/upower/pkg-plist (revision 337955) +++ sysutils/upower/pkg-plist (working copy) @@ -20,6 +20,9 @@ lib/libupower-glib.so.1 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/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 --- upower.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312301047.rBUAlcVr010322>