Update to version 0.3.7.

PR:		35210
Submitted by:	yoichi
This commit is contained in:
Jim Mock 2002-02-26 22:04:27 +00:00
parent 455ad347e2
commit 784803f052
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=55278
5 changed files with 13 additions and 97 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= wmbiff
PORTVERSION= 0.3.3
PORTVERSION= 0.3.7
CATEGORIES= mail windowmaker afterstep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -21,6 +21,9 @@ USE_XPM= yes
MAN1= wmbiff.1
MAN5= wmbiffrc.5
MAKE_ARGS= OSTYPE="FreeBSD" MANDIR=${PREFIX}/man \
WITHOUT_CRYPTO=yes LIBDIR="-L${X11BASE}/lib" \
INSTALL_USER=${BINOWN} INSTALL_GROUP=${BINGRP}
post-install:
@${ECHO} "===> Installing sample.wmbiffrc to ${PREFIX}/share/wmbiff"
@${ECHO} "===> Modify it to suit your needs and copy to ~/.wmbiffrc"

View file

@ -1 +1 @@
MD5 (wmbiff-0.3.3.tar.gz) = 8e187fd6c79100d0308b36b289041640
MD5 (wmbiff-0.3.7.tar.gz) = 797fcbd1725408954e25fcd7e5e9fd4b

View file

@ -1,77 +1,11 @@
--- 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"
--- Makefile.orig Mon Feb 4 07:48:59 2002
+++ Makefile Sat Feb 23 00:39:56 2002
@@ -64,7 +64,7 @@
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
+LIBDIR = -L${X11BASE}/lib
+INCLUDES = -I${X11BASE}/include
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) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
+ $(CC) ${INCLUDES} $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
INSTALL?= /usr/bin/install
INSTALL_DIR?= $(INSTALL) -d -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 755
-INSTALL_PRG?= $(INSTALL) -p -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 755 -s
+INSTALL_PROGRAM?= $(INSTALL) -p -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 755 -s
INSTALL_FILE?= $(INSTALL) -p -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 644
wmbiff-master.xpm:
ln -s wmbiff-master-led.xpm wmbiff-master.xpm
wmbiff: $(OBJS)
- $(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
+ $(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 $^ $(LIBDIR) $(LIBS)
clean:
for i in $(OBJS) ; do \
@@ -63,12 +57,9 @@
distclean: clean
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
# CODING STYLE AND INDENTATION [2001-Mar-12]:
#

View file

@ -1,10 +0,0 @@
--- 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>

View file

@ -1,11 +0,0 @@
--- 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>