diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-05-30 03:07:25 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-05-30 03:07:25 +0000 |
commit | 5cc2d360c5830c180c6163719a00ef0fdbd9385a (patch) | |
tree | d75132562630d61864be2cd45b4837461868eb39 /sysutils/wmbattery | |
parent | remove unnecessary %D/ (diff) |
- give maintainership to submitter
- update port to version 1.18
- add NOPORTDOCS support to PLIST
- be more minimalistic about patching, move some of the responsability
to CONFIGURE_ARGS
Submitted by: Patrick Li <pat@databits.net>
Notes
Notes:
svn path=/head/; revision=43297
Diffstat (limited to 'sysutils/wmbattery')
-rw-r--r-- | sysutils/wmbattery/Makefile | 15 | ||||
-rw-r--r-- | sysutils/wmbattery/distinfo | 2 | ||||
-rw-r--r-- | sysutils/wmbattery/files/patch-aa | 35 | ||||
-rw-r--r-- | sysutils/wmbattery/files/patch-autoconf::makeinfo.in | 24 | ||||
-rw-r--r-- | sysutils/wmbattery/pkg-plist | 6 |
5 files changed, 38 insertions, 44 deletions
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile index b7eec49f788b..485c166dedcd 100644 --- a/sysutils/wmbattery/Makefile +++ b/sysutils/wmbattery/Makefile @@ -6,24 +6,29 @@ # PORTNAME= wmbattery -PORTVERSION= 1.13 +PORTVERSION= 1.18 CATEGORIES= sysutils windowmaker MASTER_SITES= http://kitenet.net/programs/code/wmbattery/ DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pat@databits.net WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes USE_XPM= yes -ALL_TARGET= wmbattery +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib \ + --x-includes=${X11BASE}/include + MAN1= wmbattery.1 post-install: + @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \ + ${PREFIX}/share/doc/${PORTNAME} .if !defined(NOPORTDOCS) -.for i in INSTALL README TODO - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/wmbattery +.for i in README TODO + @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME} .endfor .endif diff --git a/sysutils/wmbattery/distinfo b/sysutils/wmbattery/distinfo index 86bc5d10c8e6..dd6363f1117e 100644 --- a/sysutils/wmbattery/distinfo +++ b/sysutils/wmbattery/distinfo @@ -1 +1 @@ -MD5 (wmbattery_1.13.tar.gz) = 1ef23fad426c72b0cbaf30db41144488 +MD5 (wmbattery_1.18.tar.gz) = a08c42ce64a3b76c7f062c82af766965 diff --git a/sysutils/wmbattery/files/patch-aa b/sysutils/wmbattery/files/patch-aa deleted file mode 100644 index e53612edc9a7..000000000000 --- a/sysutils/wmbattery/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig Thu Apr 6 23:18:13 2000 -+++ Makefile Fri May 19 14:45:14 2000 -@@ -1,10 +1,11 @@ --ICONDIR = /usr/share/icons/wmbattery --BINDIR = /usr/X11R6/bin --MANDIR = /usr/X11R6/man/man1 --INCDIR = -I/usr/X11R6/include --LIBDIR = -L/usr/X11R6/lib -+PREFIX ?= /usr/X11R6 -+ICONDIR = $(PREFIX)/share/wmbattery/icons -+BINDIR = $(PREFIX)/bin -+MANDIR = $(PREFIX)/man/man1 -+INCDIR = -I$(PREFIX)/include -+LIBDIR = -L$(PREFIX)/lib - LIBS = -lXpm -lXext --CFLAGS = $(INCDIR) -g -DICONDIR=\"$(ICONDIR)\" -O2 -Wall -+CFLAGS += $(INCDIR) -DICONDIR=\"$(ICONDIR)\" - - wmbattery: wmbattery.c wmbattery.h - $(CC) $(CFLAGS) $(LIBDIR) $(LIBS) wmbattery.c -o wmbattery -@@ -13,10 +14,10 @@ - rm -f wmbattery - - install: wmbattery -- install -c -d $(PREFIX)$(ICONDIR) $(PREFIX)$(BINDIR) $(PREFIX)$(MANDIR) -- install -c -s wmbattery $(PREFIX)$(BINDIR) -- install -c -m 644 wmbattery.1x $(PREFIX)$(MANDIR)/wmbattery.1 -- install -c -m 644 *.xpm $(PREFIX)$(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/files/patch-autoconf::makeinfo.in b/sysutils/wmbattery/files/patch-autoconf::makeinfo.in new file mode 100644 index 000000000000..4a656c9be7b9 --- /dev/null +++ b/sysutils/wmbattery/files/patch-autoconf::makeinfo.in @@ -0,0 +1,24 @@ +--- autoconf/makeinfo.in.orig Wed Mar 7 13:04:40 2001 ++++ autoconf/makeinfo.in Tue May 29 14:11:06 2001 +@@ -1,6 +1,6 @@ + bindir=@bindir@ + exec_prefix=@exec_prefix@ +-icondir=@datadir@/icons/wmbattery ++icondir=@datadir@/wmbattery/icons + man1dir=@mandir@/man1 + prefix=@prefix@ + srcdir=@srcdir@ +@@ -33,7 +33,7 @@ + install: all + $(INSTALL) -d $(bindir) $(man1dir) $(icondir) + $(INSTALL_PROGRAM) wmbattery $(bindir) +- $(INSTALL_DATA) $(srcdir)/wmbattery.1x $(man1dir)/wmbattery.1x ++ $(INSTALL_DATA) $(srcdir)/wmbattery.1x $(man1dir)/wmbattery.1 + $(INSTALL_DATA) $(srcdir)/*.xpm $(icondir) + + uninstall: +@@ -43,3 +43,4 @@ + $(CC) $(LDFLAGS) $(LIBS) wmbattery.o -o wmbattery + + wmbattery.o: wmbattery.c wmbattery.h ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< diff --git a/sysutils/wmbattery/pkg-plist b/sysutils/wmbattery/pkg-plist index f773cc816199..4f4317446b39 100644 --- a/sysutils/wmbattery/pkg-plist +++ b/sysutils/wmbattery/pkg-plist @@ -11,9 +11,9 @@ share/wmbattery/icons/smallfont.xpm share/wmbattery/icons/unplugged.xpm share/wmbattery/icons/plugged.xpm share/wmbattery/icons/bigfont.xpm -share/wmbattery/INSTALL -share/wmbattery/README -share/wmbattery/TODO +%%PORTDOCS%%share/doc/wmbattery/README +%%PORTDOCS%%share/doc/wmbattery/TODO @dirrm share/wmbattery/icons @dirrm share/wmbattery +%%PORTDOCS%%@dirrm share/doc/wmbattery bin/wmbattery |