Tue Aug 22 12:10:42 2017 UTC ()
Make sure the configure script picks up the correct copy of libintl.

PR# pkg/51239
PR# pkg/51246


(jmcneill)
diff -r1.7 -r1.8 pkgsrc/sysutils/upower/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/upower/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/upower/Makefile 2016/03/12 11:50:08 1.7
+++ pkgsrc/sysutils/upower/Makefile 2017/08/22 12:10:42 1.8
@@ -1,43 +1,46 @@ @@ -1,43 +1,46 @@
1# $NetBSD: Makefile,v 1.7 2016/03/12 11:50:08 ryoon Exp $ 1# $NetBSD: Makefile,v 1.8 2017/08/22 12:10:42 jmcneill Exp $
2 2
3DISTNAME= upower-0.99.4 3DISTNAME= upower-0.99.4
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5MASTER_SITES= http://upower.freedesktop.org/releases/ 6MASTER_SITES= http://upower.freedesktop.org/releases/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://upower.freedesktop.org 10HOMEPAGE= http://upower.freedesktop.org
10COMMENT= Power management system message bus service 11COMMENT= Power management system message bus service
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14USE_TOOLS+= gmake pkg-config intltool xgettext msgmerge msgfmt 15USE_TOOLS+= gmake pkg-config intltool xgettext msgmerge msgfmt
15 16
16BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 17BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
17 18
18CONFIGURE_ARGS+= --localstatedir=${VARBASE} 19CONFIGURE_ARGS+= --localstatedir=${VARBASE}
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 21CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
20 22
21PKG_SYSCONFSUBDIR= UPower 23PKG_SYSCONFSUBDIR= UPower
22INSTALL_MAKE_FLAGS+= configdir=${EGDIR} dbusconfdir=${EGDIR} 24INSTALL_MAKE_FLAGS+= configdir=${EGDIR} dbusconfdir=${EGDIR}
23EGDIR= ${PREFIX}/share/examples/upower 25EGDIR= ${PREFIX}/share/examples/upower
24CONF_FILES+= ${EGDIR}/UPower.conf ${PKG_SYSCONFDIR}/UPower.conf 26CONF_FILES+= ${EGDIR}/UPower.conf ${PKG_SYSCONFDIR}/UPower.conf
25CONF_FILES+= ${EGDIR}/org.freedesktop.UPower.conf \ 27CONF_FILES+= ${EGDIR}/org.freedesktop.UPower.conf \
26 ${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.UPower.conf 28 ${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.UPower.conf
27 29
28PKGCONFIG_OVERRIDE+= upower-glib.pc.in 30PKGCONFIG_OVERRIDE+= upower-glib.pc.in
29USE_PKGLOCALEDIR= yes 31USE_PKGLOCALEDIR= yes
30 32
31BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--no-as-needed:-Wl,-zrecord 33BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--no-as-needed:-Wl,-zrecord
32BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore 34BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore
33 35
34TEST_TARGET= check 36TEST_TARGET= check
35 37
36# with --nonet, xsltproc needs a helping hand finding some dtds 38# with --nonet, xsltproc needs a helping hand finding some dtds
37XSLTPROC_PATH+= ${LOCALBASE}/share/doc/dbus 39XSLTPROC_PATH+= ${LOCALBASE}/share/doc/dbus
38 40
 41.include "../../devel/gettext-lib/buildlink3.mk"
39.include "../../devel/glib2/buildlink3.mk" 42.include "../../devel/glib2/buildlink3.mk"
40.include "../../sysutils/dbus/buildlink3.mk" 43.include "../../sysutils/dbus/buildlink3.mk"
41.include "../../sysutils/dbus-glib/buildlink3.mk" 44.include "../../sysutils/dbus-glib/buildlink3.mk"
42.include "../../textproc/libxslt/xsltproc-nonet.mk" 45.include "../../textproc/libxslt/xsltproc-nonet.mk"
43.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"