- Pull in COMMENT

Submitted by MAINTAINER:
- Update to 0.2p (follows new development branch, adds man pages).
- Update DESCR.
This commit is contained in:
naddy 2001-03-25 12:40:57 +00:00
parent 6a3f241abc
commit 0c3370a419
8 changed files with 94 additions and 64 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2001/02/15 18:51:30 naddy Exp $ # $OpenBSD: Makefile,v 1.6 2001/03/25 12:40:57 naddy Exp $
DISTNAME= wmbiff-0.2 COMMENT= "xbiff-like Window Maker dock app"
DISTNAME= wmbiff-0.2p
CATEGORIES= mail x11 x11/windowmaker CATEGORIES= mail x11 x11/windowmaker
NEED_VERSION= 1.352 NEED_VERSION= 1.363
MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/jim/ \ HOMEPAGE= http://tinuviel.mizi.com/~tolkien/wmaker/
ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jim/
MAINTAINER= Cameron Lerch <opcode@skylab.saturn5.yi.org> MAINTAINER= Cameron Lerch <opcode@skylab.saturn5.yi.org>
@ -13,6 +13,15 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WRKBUILD= ${WRKSRC}/wmbiff MASTER_SITES= ${HOMEPAGE}
WRKDIST= ${WRKDIR}/wmbiff
WRKBUILD= ${WRKDIST}/wmbiff
post-build:
@mv ${WRKBUILD}/wmbiff.1 ${WRKBUILD}/wmbiff.1.orig
@sed -e 's%/usr/share/doc/wmbiff/examples/sample.wmbiffrc%${PREFIX}/share/examples/wmbiff/dot.wmbiffrc%g' ${WRKBUILD}/wmbiff.1.orig > ${WRKBUILD}/wmbiff.1
@mv ${WRKBUILD}/wmbiffrc.5 ${WRKBUILD}/wmbiffrc.5.orig
@sed -e 's%/usr/share/doc/wmbiff/examples/sample.wmbiffrc%${PREFIX}/share/examples/wmbiff/dot.wmbiffrc%g' ${WRKBUILD}/wmbiffrc.5.orig > ${WRKBUILD}/wmbiffrc.5
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (wmbiff-0.2.tar.gz) = 3e90281551ed00fa4cbac764e6e345fb MD5 (wmbiff-0.2p.tar.gz) = 4e45aadbdea9abc1554d7e8c8e1674e0
RMD160 (wmbiff-0.2.tar.gz) = d01074674d66e6a7a9a77b385e3ae483e4bb7a2f RMD160 (wmbiff-0.2p.tar.gz) = 39a689bcb198b2b0f3c59f8252268db5177c4b10
SHA1 (wmbiff-0.2.tar.gz) = 826465eb5afa38511c3925de08d5801f29f64b7b SHA1 (wmbiff-0.2p.tar.gz) = 3b4bfe36294b87191f6cce47f14c2ea7d4f5c77d

View File

@ -1,38 +1,55 @@
$OpenBSD: patch-wmbiff_Makefile,v 1.1 2001/02/15 18:51:31 naddy Exp $ $OpenBSD: patch-wmbiff_Makefile,v 1.2 2001/03/25 12:40:58 naddy Exp $
--- wmbiff/Makefile.orig Fri Nov 26 13:19:05 1999 --- wmbiff/Makefile.orig Tue Mar 13 08:08:09 2001
+++ wmbiff/Makefile Sat Jan 27 02:01:15 2001 +++ wmbiff/Makefile Sun Mar 25 14:30:44 2001
@@ -1,9 +1,6 @@ @@ -1,11 +1,8 @@
WMBIFF_VERSION="0.2p"
-prefix= -prefix=
-BIN=/usr/X11R6/bin -BIN=/usr/local/bin
-MAN=/usr/local/man
-CONF=/etc -CONF=/etc
-LIBDIR = -L/usr/X11R6/lib -LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L${X11BASE}/lib +LIBDIR = -L$(X11BASE)/lib
+INCLUDEDIR= -I$(X11BASE)/include
LIBS = -lXpm -lXext -lX11 LIBS = -lXpm -lXext -lX11
-CFLAGS = -O2 -Wall -CFLAGS = -O2 -Wall -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
+CFLAGS += -I${X11BASE}/include +CFLAGS+= -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
OBJS = wmbiff.o Pop3Client.o \ #CFLAGS = -g -Wall -pedantic -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
../wmgeneral/wmgeneral.o \ OBJS = wmbiff.o socket.o \
Pop3Client.o Imap4Client.o LicqClient.o mboxClient.o \
@@ -14,10 +11,8 @@ OBJS = wmbiff.o socket.o \
../wmgeneral/misc.o \ ../wmgeneral/misc.o \
@@ -11,10 +8,10 @@ OBJS = wmbiff.o Pop3Client.o \ ../wmgeneral/list.o
-INSTALL = /usr/bin/install -p
-
.c.o: .c.o:
- cc -I/usr/X11R6/share/include $(CFLAGS) -c -Wall $< -o $*.o - gcc $(CFLAGS) -c -Wall $< -o $*.o
+ cc $(CFLAGS) -c $< -o $*.o + $(CC) $(CFLAGS) -c $< $(INCLUDEDIR) -o $@
wmbiff: $(OBJS) all: wmbiff-master.xpm wmbiff
- cc $(CFLAGS) -o wmbiff $^ $(LIBDIR) $(LIBS)
+ cc $(CFLAGS) -o wmbiff $(OBJS) $(LIBDIR) $(LIBS)
strip wmbiff
all:: wmbiff @@ -25,7 +20,7 @@ wmbiff-master.xpm:
@@ -26,5 +23,7 @@ clean:: ln -s wmbiff-master-led.xpm wmbiff-master.xpm
rm -f wmbiff *~ tags
install:: wmbiff wmbiff: $(OBJS)
- cp -f wmbiff $(prefix)$(BIN)/ - gcc $(CFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
- chmod 755 $(prefix)$(BIN)/wmbiff + $(CC) $(CFLAGS) -o wmbiff -lX11 $(OBJS) $(LIBDIR) $(LIBS)
clean: indent
for i in $(OBJS) ; do \
@@ -34,9 +29,12 @@ clean: indent
rm -f wmbiff *~ tags core
install: wmbiff
- $(INSTALL) -m 755 wmbiff $(prefix)$(BIN)
- $(INSTALL) -m 755 wmbiff.1 $(prefix)$(MAN)/man1/
- $(INSTALL) -m 755 wmbiffrc.5 $(prefix)$(MAN)/man5
+ ${BSD_INSTALL_PROGRAM} wmbiff ${PREFIX}/bin/wmbiff + ${BSD_INSTALL_PROGRAM} wmbiff ${PREFIX}/bin/wmbiff
+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmbiff + ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmbiff
+ ${BSD_INSTALL_MAN} wmbiff.1 ${PREFIX}/man/man1/wmbiff.1
+ ${BSD_INSTALL_MAN} wmbiffrc.5 ${PREFIX}/man/man5/wmbiffrc.5
+ ${BSD_INSTALL_DATA} sample.wmbiffrc \ + ${BSD_INSTALL_DATA} sample.wmbiffrc \
+ ${PREFIX}/share/examples/wmbiff/dot.wmbiffrc + ${PREFIX}/share/examples/wmbiff/dot.wmbiffrc
# strip $(prefix)$(BIN)/wmbiff
# chmod 755 $(prefix)$(BIN)/wmbiff

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-wmbiff_sample_wmbiffrc,v 1.1 2001/03/25 12:40:59 naddy Exp $
--- wmbiff/sample.wmbiffrc.orig Mon Mar 12 23:08:09 2001
+++ wmbiff/sample.wmbiffrc Tue Mar 20 00:55:29 2001
@@ -9,7 +9,7 @@ label.0=Spool
# Path to mailbox for UNIX-style mailboxes,
# or pop3:user:password@mailserver[:port] for POP3 accounts
# port are optional, default - 110
-path.0=/var/spool/mail/gb
+path.0=/var/mail/gb
# Command, which executed on new mail arrival, or special keyword 'beep'
#notify.0=beep

View File

@ -1,25 +1,12 @@
$OpenBSD: patch-wmbiff_wmbiff_c,v 1.1 2001/02/15 18:51:31 naddy Exp $ $OpenBSD: patch-wmbiff_wmbiff_c,v 1.2 2001/03/25 12:40:59 naddy Exp $
--- wmbiff/wmbiff.c.orig Fri Nov 26 13:03:15 1999 --- wmbiff/wmbiff.c.orig Mon Mar 12 23:08:09 2001
+++ wmbiff/wmbiff.c Tue Jan 30 21:43:13 2001 +++ wmbiff/wmbiff.c Mon Mar 19 23:59:18 2001
@@ -113,7 +113,7 @@ void init_biff(int argc, char **argv) @@ -88,7 +88,7 @@ void init_biff(int argc, char **argv)
strcpy(mbox[0].path, m); if ((m = getenv("MAIL")) != NULL) {
} strcpy(mbox[0].path, m);
else if( (m=getenv("USER")) != NULL ) { } else if ((m = getenv("USER")) != NULL) {
- strcpy(mbox[0].path, "/var/spool/mail/"); - strcpy(mbox[0].path, "/var/spool/mail/");
+ strcpy(mbox[0].path, "/var/mail/"); + strcpy(mbox[0].path, "/var/mail/");
strcat(mbox[0].path, m); strcat(mbox[0].path, m);
} }
mbox[0].notify[0]=0; mbox[0].notify[0] = 0;
@@ -150,9 +150,9 @@ void init_biff(int argc, char **argv)
/* Make labels looks correctly */
for(i=0; i<5; i++) {
if(mbox[i].label[0] != 0) {
- for(j=0; j<5; j++)
- if(mbox[i].label[j] == 0)
- mbox[i].label[j] = ' ';
+ j = strlen(mbox[i].label);
+ if (j < 5)
+ memset(mbox[i].label + j, ' ', 5 - j);
mbox[i].label[5]=':';
mbox[i].label[6]=0;
}

View File

@ -1 +0,0 @@
xbiff-like Window Maker dock app

View File

@ -1,4 +1,8 @@
wmbiff is a dock app that displays the total number of messages or the WMbiff displays the status of up to five mailboxes. It gives information
number of unread messages in different mailboxes. It supports up to 5 about new mail, if any, or total number of messages. It also has mail retrieval
mailboxes. It is also possible to execute user-defined commands on new capabilies, and can be configured to do this automatically. At the moment,
mail arrival (for example, play a .wav file). UNIX-style, POP3 and IMAP4 mailboxes are supported. WMbiff also supports Licq
history files, displaying the number of new messages in your running Licq
session, as if they were mail.
WWW: ${HOMEPAGE}

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2001/02/15 18:51:31 naddy Exp $ @comment $OpenBSD: PLIST,v 1.3 2001/03/25 12:40:59 naddy Exp $
bin/wmbiff bin/wmbiff
man/man1/wmbiff.1
man/man5/wmbiffrc.5
share/examples/wmbiff/dot.wmbiffrc share/examples/wmbiff/dot.wmbiffrc
@dirrm share/examples/wmbiff @dirrm share/examples/wmbiff