Date: Fri, 11 Aug 2000 16:53:20 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20548: Update port: sysutils/wmbattery Message-ID: <20000811235320.0F43F37B828@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20548
>Category: ports
>Synopsis: Update port: sysutils/wmbattery
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 11 17:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CFLAGS properly
- Remove USE_GMAKE
- Exclude GPL doc from package
- WindowMaker -> Window Maker
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/sysutils/wmbattery/Makefile sysutils/wmbattery/Makefile
--- /usr/ports/sysutils/wmbattery/Makefile Thu Aug 3 21:31:12 2000
+++ sysutils/wmbattery/Makefile Sat Aug 12 00:08:40 2000
@@ -17,17 +17,13 @@
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 -urN /usr/ports/sysutils/wmbattery/patches/patch-aa sysutils/wmbattery/patches/patch-aa
--- /usr/ports/sysutils/wmbattery/patches/patch-aa Fri May 19 23:20:22 2000
+++ sysutils/wmbattery/patches/patch-aa Sat Aug 12 00:12:07 2000
@@ -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 -urN /usr/ports/sysutils/wmbattery/pkg/COMMENT sysutils/wmbattery/pkg/COMMENT
--- /usr/ports/sysutils/wmbattery/pkg/COMMENT Thu Oct 21 13:29:02 1999
+++ sysutils/wmbattery/pkg/COMMENT Sat Aug 12 00:12:17 2000
@@ -1 +1 @@
-WindowMaker dockapp that displays info about your battery
+Window Maker dockapp that displays info about your battery
diff -urN /usr/ports/sysutils/wmbattery/pkg/PLIST sysutils/wmbattery/pkg/PLIST
--- /usr/ports/sysutils/wmbattery/pkg/PLIST Thu Oct 21 13:29:02 1999
+++ sysutils/wmbattery/pkg/PLIST Sat Aug 12 00:23:09 2000
@@ -11,7 +11,6 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000811235320.0F43F37B828>