Sun Feb 17 06:02:54 2019 UTC ()
mate-applets: tidy up Makefile, NFCI


(gutteridge)
diff -r1.22 -r1.23 pkgsrc/x11/mate-applets/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/x11/mate-applets/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/mate-applets/Makefile 2019/01/23 15:25:36 1.22
+++ pkgsrc/x11/mate-applets/Makefile 2019/02/17 06:02:54 1.23
@@ -1,48 +1,45 @@ @@ -1,48 +1,45 @@
1# $NetBSD: Makefile,v 1.22 2019/01/23 15:25:36 youri Exp $ 1# $NetBSD: Makefile,v 1.23 2019/02/17 06:02:54 gutteridge Exp $
2 2
3PYTHON_VERSIONS_ACCEPTED= 27 3PYTHON_VERSIONS_ACCEPTED= 27
4.include "../../meta-pkgs/mate/Makefile.common" 4.include "../../meta-pkgs/mate/Makefile.common"
5 5
6DISTNAME= mate-applets-${VERSION:R}.1 6DISTNAME= mate-applets-${VERSION:R}.1
7CATEGORIES= x11 7CATEGORIES= x11
8 8
9COMMENT= MATE panel applets 9COMMENT= MATE panel applets
10 10
11DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 11DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
12TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 12TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
13TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint 13TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
14 14
15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
16CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/mate-applets 16CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/mate-applets
17 17
 18.include "../../mk/bsd.prefs.mk"
 19
18PLIST_VARS= batt cpufreq 20PLIST_VARS= batt cpufreq
19.if ${OPSYS} == "NetBSD" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") 21.if ${OPSYS} == "NetBSD" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
20CONFIGURE_ARGS+= --enable-cpufreq=yes 22CONFIGURE_ARGS+= --enable-cpufreq=yes
21PLIST.cpufreq= yes 23PLIST.cpufreq= yes
22.endif 24.endif
23 25
24INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/mate-applets 26INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/mate-applets
25 27
26MAKE_DIRS+= ${PKG_SYSCONFDIR}/sound/events 28MAKE_DIRS+= ${PKG_SYSCONFDIR}/sound/events
27 29
28.include "../../mk/bsd.prefs.mk" 
29 
30.if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" 30.if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS"
31CONF_FILES+= ${PREFIX}/share/examples/mate-applets/sound/events/mate-battstat_applet.soundlist \ 31CONF_FILES+= ${PREFIX}/share/examples/mate-applets/sound/events/mate-battstat_applet.soundlist \
32 ${PKG_SYSCONFDIR}/sound/events/mate-battstat_applet.soundlist 32 ${PKG_SYSCONFDIR}/sound/events/mate-battstat_applet.soundlist
33.endif 
34 
35.if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" 
36PLIST.batt= yes 33PLIST.batt= yes
37.endif 34.endif
38 35
39.include "options.mk" 36.include "options.mk"
40 37
41.include "../../devel/glib2/schemas.mk" 38.include "../../devel/glib2/schemas.mk"
42 39
43.include "../../x11/mate-panel/buildlink3.mk" 40.include "../../x11/mate-panel/buildlink3.mk"
44.include "../../x11/mate-desktop/buildlink3.mk" 41.include "../../x11/mate-desktop/buildlink3.mk"
45.include "../../x11/mate-settings-daemon/buildlink3.mk" 42.include "../../x11/mate-settings-daemon/buildlink3.mk"
46.include "../../misc/libmateweather/buildlink3.mk" 43.include "../../misc/libmateweather/buildlink3.mk"
47.include "../../devel/glib2/buildlink3.mk" 44.include "../../devel/glib2/buildlink3.mk"
48.include "../../devel/libglade/buildlink3.mk" 45.include "../../devel/libglade/buildlink3.mk"