- Support CFLAGS properly

- Remove USE_GMAKE
- Exclude GPL doc from package
- WindowMaker -> Window Maker

PR: 20548
Submitted by: Ports Fury

4 files changed, 10 insertions, 15 deletions

diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index 83bcb4f7d167..9f37bb846293 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -17,17 +17,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
 ALL_TARGET=	wmbattery
 MAN1=		wmbattery.1
 
-# install additional docs
-.if !defined(NOPORTDOCS)
 post-install:
-.for i in COPYING INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/wmbattery
+.if !defined(NOPORTDOCS)
+.for i in INSTALL README TODO
+	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/wmbattery
 .endfor
 .endif
 
diff --git a/sysutils/wmbattery/files/patch-aa b/sysutils/wmbattery/files/patch-aa
index 129df5befe15..e53612edc9a7 100644
--- a/sysutils/wmbattery/files/patch-aa
+++ b/sysutils/wmbattery/files/patch-aa
@@ -6,7 +6,7 @@
 -MANDIR  = /usr/X11R6/man/man1
 -INCDIR  = -I/usr/X11R6/include
 -LIBDIR  = -L/usr/X11R6/lib
-+PREFIX	= /usr/X11R6
++PREFIX	?= /usr/X11R6
 +ICONDIR = $(PREFIX)/share/wmbattery/icons
 +BINDIR  = $(PREFIX)/bin
 +MANDIR  = $(PREFIX)/man/man1
@@ -14,7 +14,7 @@
 +LIBDIR  = -L$(PREFIX)/lib
  LIBS    = -lXpm -lXext
 -CFLAGS  = $(INCDIR) -g -DICONDIR=\"$(ICONDIR)\" -O2 -Wall
-+CFLAGS += $(INCDIR) -g -DICONDIR=\"$(ICONDIR)\"
++CFLAGS += $(INCDIR) -DICONDIR=\"$(ICONDIR)\"
  
  wmbattery: wmbattery.c wmbattery.h
  	$(CC) $(CFLAGS) $(LIBDIR) $(LIBS) wmbattery.c -o wmbattery
@@ -26,10 +26,10 @@
 -	install -c -s wmbattery $(PREFIX)$(BINDIR)
 -	install -c -m 644 wmbattery.1x $(PREFIX)$(MANDIR)/wmbattery.1
 -	install -c -m 644 *.xpm $(PREFIX)$(ICONDIR)
-+	install -c -d $(ICONDIR) $(BINDIR) $(MANDIR)
-+	$(INSTALL_PROGRAM) wmbattery $(BINDIR)
-+	$(INSTALL_MAN) wmbattery.1x $(MANDIR)/wmbattery.1
-+	$(INSTALL_DATA) *.xpm $(ICONDIR)
++	-mkdir -p $(ICONDIR) $(BINDIR) $(MANDIR)
++	${BSD_INSTALL_PROGRAM} wmbattery $(BINDIR)
++	${BSD_INSTALL_MAN} wmbattery.1x $(MANDIR)/wmbattery.1
++	${BSD_INSTALL_DATA} *.xpm $(ICONDIR)
  
  test: wmbattery
  	./wmbattery
diff --git a/sysutils/wmbattery/pkg-comment b/sysutils/wmbattery/pkg-comment
index c953f88661e7..bd0e14fec38a 100644
--- a/sysutils/wmbattery/pkg-comment
+++ b/sysutils/wmbattery/pkg-comment
@@ -1 +1 @@
-WindowMaker dockapp that displays info about your battery
+Window Maker dockapp that displays info about your battery
diff --git a/sysutils/wmbattery/pkg-plist b/sysutils/wmbattery/pkg-plist
index 091a90a51bdd..f773cc816199 100644
--- a/sysutils/wmbattery/pkg-plist
+++ b/sysutils/wmbattery/pkg-plist
@@ -11,7 +11,6 @@ share/wmbattery/icons/smallfont.xpm
 share/wmbattery/icons/unplugged.xpm
 share/wmbattery/icons/plugged.xpm
 share/wmbattery/icons/bigfont.xpm
-share/wmbattery/COPYING
 share/wmbattery/INSTALL
 share/wmbattery/README
 share/wmbattery/TODO