pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix Darwin install



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Thu Apr 7 15:07:01 2016 +0200
Changeset:	99d087c18161a194061b1c0d7d9d02642db3a420

Modified Files:
	mate-applets/Makefile
	mate-applets/PLIST
	mate-applets/distinfo
Removed Files:
	mate-applets/patches/patch-battstat_power-management.c

Log Message:
Fix Darwin install

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=99d087c18161a194061b1c0d7d9d02642db3a420

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mate-applets/Makefile                              |  10 +
 mate-applets/PLIST                                 | 280 ++++++++++-----------
 mate-applets/distinfo                              |   1 -
 .../patches/patch-battstat_power-management.c      |  30 ---
 4 files changed, 150 insertions(+), 171 deletions(-)

diffs:
diff --git a/mate-applets/Makefile b/mate-applets/Makefile
index 3cbd8f8..fd86cc9 100644
--- a/mate-applets/Makefile
+++ b/mate-applets/Makefile
@@ -25,8 +25,18 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/mate-applets
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/sound/events
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
 CONF_FILES+=	${PREFIX}/share/examples/mate-applets/sound/events/mate-battstat_applet.soundlist \
 		${PKG_SYSCONFDIR}/sound/events/mate-battstat_applet.soundlist
+.endif
+
+PLIST_VARS=	batt
+.if ${OPSYS} != "Darwin"
+PLIST.batt=	yes
+.endif
 
 .include "options.mk"
 
diff --git a/mate-applets/PLIST b/mate-applets/PLIST
index 604a4cd..f7824a6 100644
--- a/mate-applets/PLIST
+++ b/mate-applets/PLIST
@@ -34,7 +34,7 @@ ${PYSITELIB}/mate_invest/widgets.py
 ${PYSITELIB}/mate_invest/widgets.pyc
 ${PYSITELIB}/mate_invest/widgets.pyo
 libexec/accessx-status-applet
-libexec/battstat-applet
+${PLIST.batt}libexec/battstat-applet
 libexec/command-applet
 libexec/invest-applet
 libexec/mate-charpick-applet
@@ -54,7 +54,7 @@ man/man1/mate-multiload-applet.1
 man/man1/mateweather.1
 share/MateConf/gsettings/stickynotes-applet.convert
 share/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service
-share/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
+${PLIST.batt}share/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.CommandAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.DriveMountAppletFactory.service
@@ -65,8 +65,8 @@ share/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.StickyNotesAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.TimerAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.TrashAppletFactory.service
-share/examples/mate-applets/sound/events/mate-battstat_applet.soundlist
-share/glib-2.0/schemas/org.mate.panel.applet.battstat.gschema.xml
+${PLIST.batt}share/examples/mate-applets/sound/events/mate-battstat_applet.soundlist
+${PLIST.batt}share/glib-2.0/schemas/org.mate.panel.applet.battstat.gschema.xml
 share/glib-2.0/schemas/org.mate.panel.applet.charpick.gschema.xml
 share/glib-2.0/schemas/org.mate.panel.applet.command.gschema.xml
 share/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml
@@ -86,13 +86,13 @@ share/help/C/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/C/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/C/mate-accessx-status/index.docbook
 share/help/C/mate-accessx-status/legal.xml
-share/help/C/mate-battstat/figures/battstat-applet-expanded.png
-share/help/C/mate-battstat/figures/battstat-applet.png
-share/help/C/mate-battstat/figures/battstat-credits-hal.png
-share/help/C/mate-battstat/figures/battstat-preferences.png
-share/help/C/mate-battstat/figures/context-menu.png
-share/help/C/mate-battstat/index.docbook
-share/help/C/mate-battstat/legal.xml
+${PLIST.batt}share/help/C/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/C/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/C/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/C/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/C/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/C/mate-battstat/index.docbook
+${PLIST.batt}share/help/C/mate-battstat/legal.xml
 share/help/C/mate-char-palette/figures/charpalette_applet.png
 share/help/C/mate-char-palette/figures/charpalette_chargroup.png
 share/help/C/mate-char-palette/figures/charpick-preferences.png
@@ -175,13 +175,13 @@ share/help/bg/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/bg/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/bg/mate-accessx-status/index.docbook
 share/help/bg/mate-accessx-status/legal.xml
-share/help/bg/mate-battstat/figures/battstat-applet-expanded.png
-share/help/bg/mate-battstat/figures/battstat-applet.png
-share/help/bg/mate-battstat/figures/battstat-credits-hal.png
-share/help/bg/mate-battstat/figures/battstat-preferences.png
-share/help/bg/mate-battstat/figures/context-menu.png
-share/help/bg/mate-battstat/index.docbook
-share/help/bg/mate-battstat/legal.xml
+${PLIST.batt}share/help/bg/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/bg/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/bg/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/bg/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/bg/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/bg/mate-battstat/index.docbook
+${PLIST.batt}share/help/bg/mate-battstat/legal.xml
 share/help/bg/mate-char-palette/figures/charpalette_applet.png
 share/help/bg/mate-char-palette/figures/charpalette_chargroup.png
 share/help/bg/mate-char-palette/figures/charpick-preferences.png
@@ -204,13 +204,13 @@ share/help/ca/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/ca/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/ca/mate-accessx-status/index.docbook
 share/help/ca/mate-accessx-status/legal.xml
-share/help/ca/mate-battstat/figures/battstat-applet-expanded.png
-share/help/ca/mate-battstat/figures/battstat-applet.png
-share/help/ca/mate-battstat/figures/battstat-credits-hal.png
-share/help/ca/mate-battstat/figures/battstat-preferences.png
-share/help/ca/mate-battstat/figures/context-menu.png
-share/help/ca/mate-battstat/index.docbook
-share/help/ca/mate-battstat/legal.xml
+${PLIST.batt}share/help/ca/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/ca/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/ca/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/ca/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/ca/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/ca/mate-battstat/index.docbook
+${PLIST.batt}share/help/ca/mate-battstat/legal.xml
 share/help/ca/mate-char-palette/figures/charpalette_applet.png
 share/help/ca/mate-char-palette/figures/charpalette_chargroup.png
 share/help/ca/mate-char-palette/figures/charpick-preferences.png
@@ -274,13 +274,13 @@ share/help/cs/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/cs/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/cs/mate-accessx-status/index.docbook
 share/help/cs/mate-accessx-status/legal.xml
-share/help/cs/mate-battstat/figures/battstat-applet-expanded.png
-share/help/cs/mate-battstat/figures/battstat-applet.png
-share/help/cs/mate-battstat/figures/battstat-credits-hal.png
-share/help/cs/mate-battstat/figures/battstat-preferences.png
-share/help/cs/mate-battstat/figures/context-menu.png
-share/help/cs/mate-battstat/index.docbook
-share/help/cs/mate-battstat/legal.xml
+${PLIST.batt}share/help/cs/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/cs/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/cs/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/cs/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/cs/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/cs/mate-battstat/index.docbook
+${PLIST.batt}share/help/cs/mate-battstat/legal.xml
 share/help/cs/mate-char-palette/figures/charpalette_applet.png
 share/help/cs/mate-char-palette/figures/charpalette_chargroup.png
 share/help/cs/mate-char-palette/figures/charpick-preferences.png
@@ -328,13 +328,13 @@ share/help/cs/mateweather/figures/stock_weather-storm.png
 share/help/cs/mateweather/figures/stock_weather-sunny.png
 share/help/cs/mateweather/index.docbook
 share/help/cs/mateweather/legal.xml
-share/help/da/mate-battstat/figures/battstat-applet-expanded.png
-share/help/da/mate-battstat/figures/battstat-applet.png
-share/help/da/mate-battstat/figures/battstat-credits-hal.png
-share/help/da/mate-battstat/figures/battstat-preferences.png
-share/help/da/mate-battstat/figures/context-menu.png
-share/help/da/mate-battstat/index.docbook
-share/help/da/mate-battstat/legal.xml
+${PLIST.batt}share/help/da/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/da/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/da/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/da/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/da/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/da/mate-battstat/index.docbook
+${PLIST.batt}share/help/da/mate-battstat/legal.xml
 share/help/da/mate-drivemount/figures/drivemount-applet_eject.png
 share/help/da/mate-drivemount/figures/drivemount-applet_example.png
 share/help/da/mate-drivemount/figures/drivemount-applet_mount.png
@@ -361,13 +361,13 @@ share/help/de/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/de/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/de/mate-accessx-status/index.docbook
 share/help/de/mate-accessx-status/legal.xml
-share/help/de/mate-battstat/figures/battstat-applet-expanded.png
-share/help/de/mate-battstat/figures/battstat-applet.png
-share/help/de/mate-battstat/figures/battstat-credits-hal.png
-share/help/de/mate-battstat/figures/battstat-preferences.png
-share/help/de/mate-battstat/figures/context-menu.png
-share/help/de/mate-battstat/index.docbook
-share/help/de/mate-battstat/legal.xml
+${PLIST.batt}share/help/de/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/de/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/de/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/de/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/de/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/de/mate-battstat/index.docbook
+${PLIST.batt}share/help/de/mate-battstat/legal.xml
 share/help/de/mate-char-palette/figures/charpalette_applet.png
 share/help/de/mate-char-palette/figures/charpalette_chargroup.png
 share/help/de/mate-char-palette/figures/charpick-preferences.png
@@ -431,13 +431,13 @@ share/help/el/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/el/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/el/mate-accessx-status/index.docbook
 share/help/el/mate-accessx-status/legal.xml
-share/help/el/mate-battstat/figures/battstat-applet-expanded.png
-share/help/el/mate-battstat/figures/battstat-applet.png
-share/help/el/mate-battstat/figures/battstat-credits-hal.png
-share/help/el/mate-battstat/figures/battstat-preferences.png
-share/help/el/mate-battstat/figures/context-menu.png
-share/help/el/mate-battstat/index.docbook
-share/help/el/mate-battstat/legal.xml
+${PLIST.batt}share/help/el/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/el/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/el/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/el/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/el/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/el/mate-battstat/index.docbook
+${PLIST.batt}share/help/el/mate-battstat/legal.xml
 share/help/el/mate-char-palette/figures/charpalette_applet.png
 share/help/el/mate-char-palette/figures/charpalette_chargroup.png
 share/help/el/mate-char-palette/figures/charpick-preferences.png
@@ -501,13 +501,13 @@ share/help/en_GB/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/en_GB/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/en_GB/mate-accessx-status/index.docbook
 share/help/en_GB/mate-accessx-status/legal.xml
-share/help/en_GB/mate-battstat/figures/battstat-applet-expanded.png
-share/help/en_GB/mate-battstat/figures/battstat-applet.png
-share/help/en_GB/mate-battstat/figures/battstat-credits-hal.png
-share/help/en_GB/mate-battstat/figures/battstat-preferences.png
-share/help/en_GB/mate-battstat/figures/context-menu.png
-share/help/en_GB/mate-battstat/index.docbook
-share/help/en_GB/mate-battstat/legal.xml
+${PLIST.batt}share/help/en_GB/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/en_GB/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/en_GB/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/en_GB/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/en_GB/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/en_GB/mate-battstat/index.docbook
+${PLIST.batt}share/help/en_GB/mate-battstat/legal.xml
 share/help/en_GB/mate-char-palette/figures/charpalette_applet.png
 share/help/en_GB/mate-char-palette/figures/charpalette_chargroup.png
 share/help/en_GB/mate-char-palette/figures/charpick-preferences.png
@@ -571,13 +571,13 @@ share/help/es/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/es/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/es/mate-accessx-status/index.docbook
 share/help/es/mate-accessx-status/legal.xml
-share/help/es/mate-battstat/figures/battstat-applet-expanded.png
-share/help/es/mate-battstat/figures/battstat-applet.png
-share/help/es/mate-battstat/figures/battstat-credits-hal.png
-share/help/es/mate-battstat/figures/battstat-preferences.png
-share/help/es/mate-battstat/figures/context-menu.png
-share/help/es/mate-battstat/index.docbook
-share/help/es/mate-battstat/legal.xml
+${PLIST.batt}share/help/es/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/es/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/es/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/es/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/es/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/es/mate-battstat/index.docbook
+${PLIST.batt}share/help/es/mate-battstat/legal.xml
 share/help/es/mate-char-palette/figures/charpalette_applet.png
 share/help/es/mate-char-palette/figures/charpalette_chargroup.png
 share/help/es/mate-char-palette/figures/charpick-preferences.png
@@ -641,13 +641,13 @@ share/help/eu/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/eu/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/eu/mate-accessx-status/index.docbook
 share/help/eu/mate-accessx-status/legal.xml
-share/help/eu/mate-battstat/figures/battstat-applet-expanded.png
-share/help/eu/mate-battstat/figures/battstat-applet.png
-share/help/eu/mate-battstat/figures/battstat-credits-hal.png
-share/help/eu/mate-battstat/figures/battstat-preferences.png
-share/help/eu/mate-battstat/figures/context-menu.png
-share/help/eu/mate-battstat/index.docbook
-share/help/eu/mate-battstat/legal.xml
+${PLIST.batt}share/help/eu/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/eu/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/eu/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/eu/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/eu/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/eu/mate-battstat/index.docbook
+${PLIST.batt}share/help/eu/mate-battstat/legal.xml
 share/help/eu/mate-char-palette/figures/charpalette_applet.png
 share/help/eu/mate-char-palette/figures/charpalette_chargroup.png
 share/help/eu/mate-char-palette/figures/charpick-preferences.png
@@ -708,13 +708,13 @@ share/help/fi/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/fi/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/fi/mate-accessx-status/index.docbook
 share/help/fi/mate-accessx-status/legal.xml
-share/help/fi/mate-battstat/figures/battstat-applet-expanded.png
-share/help/fi/mate-battstat/figures/battstat-applet.png
-share/help/fi/mate-battstat/figures/battstat-credits-hal.png
-share/help/fi/mate-battstat/figures/battstat-preferences.png
-share/help/fi/mate-battstat/figures/context-menu.png
-share/help/fi/mate-battstat/index.docbook
-share/help/fi/mate-battstat/legal.xml
+${PLIST.batt}share/help/fi/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/fi/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/fi/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/fi/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/fi/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/fi/mate-battstat/index.docbook
+${PLIST.batt}share/help/fi/mate-battstat/legal.xml
 share/help/fi/mate-char-palette/figures/charpalette_applet.png
 share/help/fi/mate-char-palette/figures/charpalette_chargroup.png
 share/help/fi/mate-char-palette/figures/charpick-preferences.png
@@ -778,13 +778,13 @@ share/help/fr/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/fr/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/fr/mate-accessx-status/index.docbook
 share/help/fr/mate-accessx-status/legal.xml
-share/help/fr/mate-battstat/figures/battstat-applet-expanded.png
-share/help/fr/mate-battstat/figures/battstat-applet.png
-share/help/fr/mate-battstat/figures/battstat-credits-hal.png
-share/help/fr/mate-battstat/figures/battstat-preferences.png
-share/help/fr/mate-battstat/figures/context-menu.png
-share/help/fr/mate-battstat/index.docbook
-share/help/fr/mate-battstat/legal.xml
+${PLIST.batt}share/help/fr/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/fr/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/fr/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/fr/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/fr/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/fr/mate-battstat/index.docbook
+${PLIST.batt}share/help/fr/mate-battstat/legal.xml
 share/help/fr/mate-char-palette/figures/charpalette_applet.png
 share/help/fr/mate-char-palette/figures/charpalette_chargroup.png
 share/help/fr/mate-char-palette/figures/charpick-preferences.png
@@ -893,13 +893,13 @@ share/help/ko/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/ko/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/ko/mate-accessx-status/index.docbook
 share/help/ko/mate-accessx-status/legal.xml
-share/help/ko/mate-battstat/figures/battstat-applet-expanded.png
-share/help/ko/mate-battstat/figures/battstat-applet.png
-share/help/ko/mate-battstat/figures/battstat-credits-hal.png
-share/help/ko/mate-battstat/figures/battstat-preferences.png
-share/help/ko/mate-battstat/figures/context-menu.png
-share/help/ko/mate-battstat/index.docbook
-share/help/ko/mate-battstat/legal.xml
+${PLIST.batt}share/help/ko/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/ko/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/ko/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/ko/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/ko/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/ko/mate-battstat/index.docbook
+${PLIST.batt}share/help/ko/mate-battstat/legal.xml
 share/help/ko/mate-char-palette/figures/charpalette_applet.png
 share/help/ko/mate-char-palette/figures/charpalette_chargroup.png
 share/help/ko/mate-char-palette/figures/charpick-preferences.png
@@ -995,13 +995,13 @@ share/help/oc/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/oc/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/oc/mate-accessx-status/index.docbook
 share/help/oc/mate-accessx-status/legal.xml
-share/help/oc/mate-battstat/figures/battstat-applet-expanded.png
-share/help/oc/mate-battstat/figures/battstat-applet.png
-share/help/oc/mate-battstat/figures/battstat-credits-hal.png
-share/help/oc/mate-battstat/figures/battstat-preferences.png
-share/help/oc/mate-battstat/figures/context-menu.png
-share/help/oc/mate-battstat/index.docbook
-share/help/oc/mate-battstat/legal.xml
+${PLIST.batt}share/help/oc/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/oc/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/oc/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/oc/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/oc/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/oc/mate-battstat/index.docbook
+${PLIST.batt}share/help/oc/mate-battstat/legal.xml
 share/help/oc/mate-char-palette/figures/charpalette_applet.png
 share/help/oc/mate-char-palette/figures/charpalette_chargroup.png
 share/help/oc/mate-char-palette/figures/charpick-preferences.png
@@ -1049,13 +1049,13 @@ share/help/oc/mateweather/figures/stock_weather-storm.png
 share/help/oc/mateweather/figures/stock_weather-sunny.png
 share/help/oc/mateweather/index.docbook
 share/help/oc/mateweather/legal.xml
-share/help/pa/mate-battstat/figures/battstat-applet-expanded.png
-share/help/pa/mate-battstat/figures/battstat-applet.png
-share/help/pa/mate-battstat/figures/battstat-credits-hal.png
-share/help/pa/mate-battstat/figures/battstat-preferences.png
-share/help/pa/mate-battstat/figures/context-menu.png
-share/help/pa/mate-battstat/index.docbook
-share/help/pa/mate-battstat/legal.xml
+${PLIST.batt}share/help/pa/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/pa/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/pa/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/pa/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/pa/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/pa/mate-battstat/index.docbook
+${PLIST.batt}share/help/pa/mate-battstat/legal.xml
 share/help/pa/mate-drivemount/figures/drivemount-applet_eject.png
 share/help/pa/mate-drivemount/figures/drivemount-applet_example.png
 share/help/pa/mate-drivemount/figures/drivemount-applet_mount.png
@@ -1094,13 +1094,13 @@ share/help/pa/mateweather/figures/stock_weather-storm.png
 share/help/pa/mateweather/figures/stock_weather-sunny.png
 share/help/pa/mateweather/index.docbook
 share/help/pa/mateweather/legal.xml
-share/help/pt_BR/mate-battstat/figures/battstat-applet-expanded.png
-share/help/pt_BR/mate-battstat/figures/battstat-applet.png
-share/help/pt_BR/mate-battstat/figures/battstat-credits-hal.png
-share/help/pt_BR/mate-battstat/figures/battstat-preferences.png
-share/help/pt_BR/mate-battstat/figures/context-menu.png
-share/help/pt_BR/mate-battstat/index.docbook
-share/help/pt_BR/mate-battstat/legal.xml
+${PLIST.batt}share/help/pt_BR/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/pt_BR/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/pt_BR/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/pt_BR/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/pt_BR/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/pt_BR/mate-battstat/index.docbook
+${PLIST.batt}share/help/pt_BR/mate-battstat/legal.xml
 share/help/pt_BR/mate-char-palette/figures/charpalette_applet.png
 share/help/pt_BR/mate-char-palette/figures/charpalette_chargroup.png
 share/help/pt_BR/mate-char-palette/figures/charpick-preferences.png
@@ -1201,13 +1201,13 @@ share/help/sv/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/sv/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/sv/mate-accessx-status/index.docbook
 share/help/sv/mate-accessx-status/legal.xml
-share/help/sv/mate-battstat/figures/battstat-applet-expanded.png
-share/help/sv/mate-battstat/figures/battstat-applet.png
-share/help/sv/mate-battstat/figures/battstat-credits-hal.png
-share/help/sv/mate-battstat/figures/battstat-preferences.png
-share/help/sv/mate-battstat/figures/context-menu.png
-share/help/sv/mate-battstat/index.docbook
-share/help/sv/mate-battstat/legal.xml
+${PLIST.batt}share/help/sv/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/sv/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/sv/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/sv/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/sv/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/sv/mate-battstat/index.docbook
+${PLIST.batt}share/help/sv/mate-battstat/legal.xml
 share/help/sv/mate-char-palette/figures/charpalette_applet.png
 share/help/sv/mate-char-palette/figures/charpalette_chargroup.png
 share/help/sv/mate-char-palette/figures/charpick-preferences.png
@@ -1271,13 +1271,13 @@ share/help/uk/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/uk/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/uk/mate-accessx-status/index.docbook
 share/help/uk/mate-accessx-status/legal.xml
-share/help/uk/mate-battstat/figures/battstat-applet-expanded.png
-share/help/uk/mate-battstat/figures/battstat-applet.png
-share/help/uk/mate-battstat/figures/battstat-credits-hal.png
-share/help/uk/mate-battstat/figures/battstat-preferences.png
-share/help/uk/mate-battstat/figures/context-menu.png
-share/help/uk/mate-battstat/index.docbook
-share/help/uk/mate-battstat/legal.xml
+${PLIST.batt}share/help/uk/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/uk/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/uk/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/uk/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/uk/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/uk/mate-battstat/index.docbook
+${PLIST.batt}share/help/uk/mate-battstat/legal.xml
 share/help/uk/mate-char-palette/figures/charpalette_applet.png
 share/help/uk/mate-char-palette/figures/charpalette_chargroup.png
 share/help/uk/mate-char-palette/figures/charpick-preferences.png
@@ -1338,13 +1338,13 @@ share/help/zh_CN/mate-accessx-status/figures/accessx_sticky-shift-key.png
 share/help/zh_CN/mate-accessx-status/figures/accessx_sticky-windows-key.png
 share/help/zh_CN/mate-accessx-status/index.docbook
 share/help/zh_CN/mate-accessx-status/legal.xml
-share/help/zh_CN/mate-battstat/figures/battstat-applet-expanded.png
-share/help/zh_CN/mate-battstat/figures/battstat-applet.png
-share/help/zh_CN/mate-battstat/figures/battstat-credits-hal.png
-share/help/zh_CN/mate-battstat/figures/battstat-preferences.png
-share/help/zh_CN/mate-battstat/figures/context-menu.png
-share/help/zh_CN/mate-battstat/index.docbook
-share/help/zh_CN/mate-battstat/legal.xml
+${PLIST.batt}share/help/zh_CN/mate-battstat/figures/battstat-applet-expanded.png
+${PLIST.batt}share/help/zh_CN/mate-battstat/figures/battstat-applet.png
+${PLIST.batt}share/help/zh_CN/mate-battstat/figures/battstat-credits-hal.png
+${PLIST.batt}share/help/zh_CN/mate-battstat/figures/battstat-preferences.png
+${PLIST.batt}share/help/zh_CN/mate-battstat/figures/context-menu.png
+${PLIST.batt}share/help/zh_CN/mate-battstat/index.docbook
+${PLIST.batt}share/help/zh_CN/mate-battstat/legal.xml
 share/help/zh_CN/mate-char-palette/figures/charpalette_applet.png
 share/help/zh_CN/mate-char-palette/figures/charpalette_chargroup.png
 share/help/zh_CN/mate-char-palette/figures/charpick-preferences.png
@@ -1549,7 +1549,7 @@ share/locale/zh_CN/LC_MESSAGES/mate-applets.mo
 share/locale/zh_HK/LC_MESSAGES/mate-applets.mo
 share/locale/zh_TW/LC_MESSAGES/mate-applets.mo
 share/mate-applets/Invest_Applet.xml
-share/mate-applets/builder/battstat_applet.ui
+${PLIST.batt}share/mate-applets/builder/battstat_applet.ui
 share/mate-applets/builder/financialchart.ui
 share/mate-applets/builder/prefs-dialog.ui
 share/mate-applets/builder/stickynotes.ui
@@ -1580,7 +1580,7 @@ share/mate-applets/invest-applet/invest_down.svg
 share/mate-applets/invest-applet/invest_neutral.svg
 share/mate-applets/invest-applet/invest_up.svg
 share/mate-panel/applets/org.mate.applets.AccessxStatusApplet.mate-panel-applet
-share/mate-panel/applets/org.mate.applets.BattstatApplet.mate-panel-applet
+${PLIST.batt}share/mate-panel/applets/org.mate.applets.BattstatApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.CommandApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.DriveMountApplet.mate-panel-applet
@@ -1592,7 +1592,7 @@ share/mate-panel/applets/org.mate.applets.StickyNotesApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.TimerApplet.mate-panel-applet
 share/mate-panel/applets/org.mate.applets.TrashApplet.mate-panel-applet
 share/mate/ui/accessx-status-applet-menu.xml
-share/mate/ui/battstat-applet-menu.xml
+${PLIST.batt}share/mate/ui/battstat-applet-menu.xml
 share/mate/ui/charpick-applet-menu.xml
 share/mate/ui/drivemount-applet-menu.xml
 share/mate/ui/geyes-applet-menu.xml
diff --git a/mate-applets/distinfo b/mate-applets/distinfo
index c23fb9e..6cf62e8 100644
--- a/mate-applets/distinfo
+++ b/mate-applets/distinfo
@@ -4,4 +4,3 @@ SHA1 (mate-applets-1.12.1.tar.xz) = 1275d9922e8c0abde0256d086d3e7bceb9bcf2c9
 RMD160 (mate-applets-1.12.1.tar.xz) = 0227041fd94790ede52c8fdcdd1e81211750f540
 SHA512 (mate-applets-1.12.1.tar.xz) = c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
 Size (mate-applets-1.12.1.tar.xz) = 6816716 bytes
-#SHA1 (patch-battstat_power-management.c) = 2931dda3c1941126848cb3862d48549732df98b4
diff --git a/mate-applets/patches/patch-battstat_power-management.c b/mate-applets/patches/patch-battstat_power-management.c
deleted file mode 100644
index a365379..0000000
--- a/mate-applets/patches/patch-battstat_power-management.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-battstat_power-management.c,v 1.4 2015/04/10 12:03:19 krytarowski Exp $
-
-* NetBSD support
-
---- battstat/power-management.c.orig	2014-04-19 21:25:24.000000000 +0000
-+++ battstat/power-management.c
-@@ -240,7 +240,11 @@ apm_readinfo (BatteryStatus *status)
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- 
- #include <sys/param.h>
-+#if defined(__NetBSD__)
-+#include <dev/apm/apmio.h>
-+#else /* __OpenBSD__ */
- #include <machine/apmvar.h>
-+#endif
- 
- #define APMDEVICE "/dev/apm"
- 
-@@ -250,7 +254,11 @@ apm_readinfo (BatteryStatus *status)
-   /* Code for OpenBSD by Joe Ammond <jra%twinight.org@localhost>. Using the same
-      procedure as for FreeBSD.
-   */
-+#if defined(__NetBSD__)
-+  struct apm_power_info apminfo;
-+#else /* __OpenBSD__ */
-   struct apm_info apminfo;
-+#endif
-   int fd;
- 
- #if defined(__NetBSD__)


Home | Main Index | Thread Index | Old Index