From c882dd7d137b752f429e8eaf279d000ce263aaa5 Mon Sep 17 00:00:00 2001
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Sat, 12 Aug 2000 08:17:43 +0000
Subject: - Support CFLAGS properly - Remove USE_GMAKE - Exclude GPL doc from
 package - WindowMaker -> Window Maker

PR: 20548
Submitted by: Ports Fury
---
 sysutils/wmbattery/files/patch-aa | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sysutils/wmbattery/files')

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
-- 
cgit v1.2.3