diff options
author | Jim Mock <jim@FreeBSD.org> | 2001-11-12 01:49:35 +0000 |
---|---|---|
committer | Jim Mock <jim@FreeBSD.org> | 2001-11-12 01:49:35 +0000 |
commit | c51e73872f50e9e132c27bb2382f06b0cd80f50f (patch) | |
tree | a768ebfe3eb46bc591549f717297a2289cf7a322 /mail | |
parent | o Use sgml-mode for *.html files instead of html-mode. (diff) |
Update to version 0.3.3.
Submitted by: Simon L. Neilsen <simon@nitro.dk>
Notes
Notes:
svn path=/head/; revision=49950
Diffstat (limited to 'mail')
-rw-r--r-- | mail/wmbiff/Makefile | 20 | ||||
-rw-r--r-- | mail/wmbiff/distinfo | 2 | ||||
-rw-r--r-- | mail/wmbiff/files/patch-aa | 94 | ||||
-rw-r--r-- | mail/wmbiff/files/patch-ab | 10 | ||||
-rw-r--r-- | mail/wmbiff/files/patch-ac | 11 | ||||
-rw-r--r-- | mail/wmbiff/pkg-descr | 2 | ||||
-rw-r--r-- | mail/wmbiff/pkg-message | 4 | ||||
-rw-r--r-- | mail/wmbiff/pkg-plist | 4 |
8 files changed, 105 insertions, 42 deletions
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index 6d5dc5b8e7f4..e167c4a46cf5 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -6,11 +6,10 @@ # PORTNAME= wmbiff -PORTVERSION= 0.2 +PORTVERSION= 0.3.3 CATEGORIES= mail windowmaker afterstep -MASTER_SITES= http://ccat.elect.ru:8100/wmbiff/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= jim +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jim@FreeBSD.org @@ -19,14 +18,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/wmbiff USE_X_PREFIX= yes USE_XPM= yes -pre-build: - @(cd ${WRKSRC} && ${GMAKE} clean) +MAN1= wmbiff.1 +MAN5= wmbiffrc.5 post-install: - @${ECHO} "===> Installing sample.wmbiffrc to ${PREFIX}/share/examples/wmbiff" + @${ECHO} "===> Installing sample.wmbiffrc to ${PREFIX}/share/wmbiff" @${ECHO} "===> Modify it to suit your needs and copy to ~/.wmbiffrc" - @${MKDIR} ${PREFIX}/share/examples/wmbiff && ${CHMOD} a+rx ${PREFIX}/share/examples/wmbiff - @${INSTALL_DATA} ${WRKSRC}/sample.wmbiffrc ${PREFIX}/share/examples/wmbiff - @${CHMOD} 644 ${PREFIX}/share/examples/wmbiff/sample.wmbiffrc + @${MKDIR} ${PREFIX}/share/wmbiff && ${CHMOD} a+rx ${PREFIX}/share/wmbiff + @${INSTALL_DATA} ${WRKSRC}/sample.wmbiffrc ${PREFIX}/share/wmbiff + @${CHMOD} 644 ${PREFIX}/share/wmbiff/sample.wmbiffrc + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo index 357d8e9bda24..e670db76d809 100644 --- a/mail/wmbiff/distinfo +++ b/mail/wmbiff/distinfo @@ -1 +1 @@ -MD5 (wmbiff-0.2.tar.gz) = 3e90281551ed00fa4cbac764e6e345fb +MD5 (wmbiff-0.3.3.tar.gz) = 8e187fd6c79100d0308b36b289041640 diff --git a/mail/wmbiff/files/patch-aa b/mail/wmbiff/files/patch-aa index 441f9f4ec003..c7d0c33c5963 100644 --- a/mail/wmbiff/files/patch-aa +++ b/mail/wmbiff/files/patch-aa @@ -1,39 +1,77 @@ ---- Makefile.orig Tue Feb 1 17:39:53 2000 -+++ Makefile Tue Feb 1 17:44:42 2000 -@@ -1,9 +1,9 @@ --prefix= --BIN=/usr/X11R6/bin +--- Makefile.orig Mon Oct 29 14:59:12 2001 ++++ Makefile Mon Nov 12 00:58:11 2001 +@@ -3,22 +3,21 @@ + WMBIFF_VERSION = "0.3.3" + + DESTDIR= +-prefix=/usr/local ++prefix=${PREFIX} + bindir=${prefix}/bin +-mandir=${prefix}/share/man -CONF=/etc ++mandir=${prefix}/man ++CONF=${PREFIX}/etc + +-CC = gcc -LIBDIR = -L/usr/X11R6/lib -+CC ?= gcc -+CFLAGS = -c -Wall -+CONF = ${X11BASE}/etc ++CC ?= gcc +LIBDIR = -L${X11BASE}/lib +INCLUDES = -I${X11BASE}/include - LIBS = -lXpm -lXext -lX11 --CFLAGS = -O2 -Wall - OBJS = wmbiff.o Pop3Client.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ -@@ -11,11 +11,11 @@ + LIBS = -lXpm -lXext -lX11 +-CFLAGS = -O2 -Wall -Wpointer-arith ++#CFLAGS = -O2 -Wall -Wpointer-arith + #CFLAGS = -g -Wall -pedantic + +-EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)' ++LIBS+= -lgnuregex + +-# Comment these out if you don't want cryto support. +-EXTRAFLAGS += -DWITH_TLS -DWITH_GCRYPT +-LIBS += -lgnutls -lgcrypt ++EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)' + #EXTRAFLAGS += -DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \ + # -DDEBUG_MBOX -DDEBUG_MAILDIR -DDEBUG -DDEBUG_MAIL_COUNT \ +@@ -35,24 +34,19 @@ + ../wmgeneral/list.o \ + charutil.o + +-INSTALL = /usr/bin/install +-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 +-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +- + all: wmbiff-master.xpm wmbiff + + Imap4Client.o: Imap4Client.c Client.h Makefile .c.o: -- cc -I/usr/X11R6/share/include $(CFLAGS) -c -Wall $< -o $*.o -+ ${CC} ${INCLUDES} ${CFLAGS} $< -o $*.o +- $(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o ++ $(CC) ${INCLUDES} $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o + + + wmbiff-master.xpm: + ln -s wmbiff-master-led.xpm wmbiff-master.xpm - wmbiff: $(OBJS) -- cc $(CFLAGS) -o wmbiff $^ $(LIBDIR) $(LIBS) -- strip wmbiff -+ ${CC} -o wmbiff $^ ${LIBDIR} ${LIBS} -+ @/usr/bin/strip wmbiff + wmbiff: $(OBJS) +- $(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 $^ $(LIBDIR) $(LIBS) - all:: wmbiff + clean: + for i in $(OBJS) ; do \ +@@ -63,12 +57,9 @@ + distclean: clean -@@ -26,5 +26,4 @@ - rm -f wmbiff *~ tags + install: wmbiff +- $(INSTALL_DIR) $(DESTDIR)$(bindir) +- $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 +- $(INSTALL_DIR) $(DESTDIR)$(mandir)/man5 +- $(INSTALL_PROGRAM) wmbiff $(DESTDIR)$(bindir) +- $(INSTALL_FILE) wmbiff.1 $(DESTDIR)$(mandir)/man1 +- $(INSTALL_FILE) wmbiffrc.5 $(DESTDIR)$(mandir)/man5 ++ ${BSD_INSTALL_PROGRAM} wmbiff ${PREFIX}/bin/wmbiff ++ $(BSD_INSTALL_MAN) wmbiff.1 ${PREFIX}/man/man1 ++ $(BSD_INSTALL_MAN) wmbiffrc.5 ${PREFIX}/man/man5 - install:: wmbiff -- cp -f wmbiff $(prefix)$(BIN)/ -- chmod 755 $(prefix)$(BIN)/wmbiff -+ @/usr/bin/install -c -o 0 -g 0 -s -m 755 wmbiff ${X11BASE}/bin/wmbiff + # CODING STYLE AND INDENTATION [2001-Mar-12]: + # diff --git a/mail/wmbiff/files/patch-ab b/mail/wmbiff/files/patch-ab new file mode 100644 index 000000000000..c00b0606c57b --- /dev/null +++ b/mail/wmbiff/files/patch-ab @@ -0,0 +1,10 @@ +--- Client.h.orig Sat Nov 3 04:09:00 2001 ++++ Client.h Sat Nov 3 04:09:10 2001 +@@ -15,6 +15,7 @@ + #include <string.h> + #include <stdio.h> + #include <stdlib.h> ++#include <sys/time.h> + + #ifdef WITH_GCRYPT + #include <gcrypt.h> diff --git a/mail/wmbiff/files/patch-ac b/mail/wmbiff/files/patch-ac new file mode 100644 index 000000000000..6069a826d620 --- /dev/null +++ b/mail/wmbiff/files/patch-ac @@ -0,0 +1,11 @@ +--- Imap4Client.c.orig Sat Nov 3 14:35:32 2001 ++++ Imap4Client.c Sat Nov 3 14:35:41 2001 +@@ -15,7 +15,7 @@ + #include "tlsComm.h" + + #include <sys/types.h> +-#include <regex.h> ++#include <gnuregex.h> + #include <stdio.h> + #include <assert.h> + #include <unistd.h> diff --git a/mail/wmbiff/pkg-descr b/mail/wmbiff/pkg-descr index 8e0a51fc313c..17fc8d33fd2c 100644 --- a/mail/wmbiff/pkg-descr +++ b/mail/wmbiff/pkg-descr @@ -3,6 +3,6 @@ number of unread messages in different mailboxes. It supports up to 5 mailboxes. It is also possible to execute user-defined commands on new mail arrival (for example, play a .wav file). -WWW: http://ccat.elect.ru:8100/wmbiff/ +WWW: http://wmbiff.sourceforge.net/ - Jim <jim@FreeBSD.org> diff --git a/mail/wmbiff/pkg-message b/mail/wmbiff/pkg-message new file mode 100644 index 000000000000..74188cc5d2c9 --- /dev/null +++ b/mail/wmbiff/pkg-message @@ -0,0 +1,4 @@ + +IMAP-SSL, APOP and CRAM-MD5 are not supported in this FreeBSD port +because GNUtls and gcrypt are not available as FreeBSD ports. + diff --git a/mail/wmbiff/pkg-plist b/mail/wmbiff/pkg-plist index 6286e7337a2d..b0ccc4fa05f2 100644 --- a/mail/wmbiff/pkg-plist +++ b/mail/wmbiff/pkg-plist @@ -1,3 +1,3 @@ bin/wmbiff -share/examples/wmbiff/sample.wmbiffrc -@dirrm share/examples/wmbiff +share/wmbiff/sample.wmbiffrc +@dirrm share/wmbiff |