wmbattery: Minor cleanup

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Sep 10 13:15:16 2020 +0200
Changeset:	51e911a690a8f7698935019e43755dc231df308f

Modified Files:
	wmbattery/Makefile
	wmbattery/options.mk

Log Message:
wmbattery: Minor cleanup

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

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

diffstat:
 wmbattery/Makefile   | 12 +++++++-----
 wmbattery/options.mk |  6 ------
 2 files changed, 7 insertions(+), 11 deletions(-)

diffs:
diff --git a/wmbattery/Makefile b/wmbattery/Makefile
index 6c66dd7387..173c8a8383 100644
--- a/wmbattery/Makefile
+++ b/wmbattery/Makefile
@@ -9,14 +9,15 @@ HOMEPAGE=	https://www.dockapps.net/
 COMMENT=	Dockapp that shows battery status
 LICENSE=	gnu-gpl-v2
 
-PATCHDIR=	${.CURDIR}/../../wip/wmbattery/patches
-FILESDIR=	${.CURDIR}/../../wip/wmbattery/files
-
-.include "options.mk"
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	autoreconf autoconf automake gmake pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=	--enable-envsys
+.endif
+
 pre-configure:
 	${CP} \
 	    ${FILESDIR}/envsys.c \
@@ -25,5 +26,6 @@ pre-configure:
 
 	cd ${WRKSRC} && autoreconf -fi
 
+.include "options.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wmbattery/options.mk b/wmbattery/options.mk
index c7abee993c..ef5e7a00af 100644
--- a/wmbattery/options.mk
+++ b/wmbattery/options.mk
@@ -3,12 +3,6 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wmbattery
 PKG_SUPPORTED_OPTIONS=	hal upower
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--enable-envsys
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 #