[Pkg-wmaker-commits] [wmbiff] 02/04: Makefile fixes from Simon L. Nielsen, which help building wmbiff in FreeBSD. Fixed the previous IMAP regex patch.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:00:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_3_7
in repository wmbiff.

commit 6adfacdcedb05c4a48bd4e9e50ac4d22f549fe25
Author: jordi <jordi>
Date:   Sat Feb 2 18:04:18 2002 +0000

    Makefile fixes from Simon L. Nielsen, which help building wmbiff in FreeBSD.
    Fixed the previous IMAP regex patch.
---
 NEWS                 |   4 +-
 wmbiff/Client.h      |   3 +-
 wmbiff/Imap4Client.c |   5 +--
 wmbiff/Makefile      | 121 ++++++++++++++++++++++++++++++++++++---------------
 wmbiff/Pop3Client.c  |   3 +-
 wmbiff/charutil.h    |   6 ++-
 6 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/NEWS b/NEWS
index 7c5e70c..4931296 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ Release 0.3.6 - Sun, 27 Jan 2002 20:49:52 +0100
 
   * Added a new syntax for IMAP, which allows using a "@" in
     the password field. See wmbiffrc(5) for details.
-  * Fix for a correct usage of the auth list in IMAP.
+  * Better FreeBSD support. You can now use an external regex lib.
 
 Release 0.3.5 - Mon, 14 Jan 2002 02:43:23 +0100
 
@@ -264,4 +264,4 @@ Release 0.1 - Wed, 17 Nov 1999 00:00:00 +0000
   * Initial release by Gennady Belyakov <gb at ccat.elect.ru>.
 
 
-$Id: NEWS,v 1.13 2002/01/27 19:59:01 jordi Exp $
+$Id: NEWS,v 1.14 2002/02/02 18:04:18 jordi Exp $
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index f8c9d12..f7d1973 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,4 +1,4 @@
-/* $Id: Client.h,v 1.6 2001/11/16 01:13:36 bluehal Exp $ */
+/* $Id: Client.h,v 1.7 2002/02/02 18:04:18 jordi Exp $ */
 /* Author : Scott Holden ( scotth at thezone.net )
    Modified : Yong-iL Joh ( tolkien at mizi.com )
    Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
@@ -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/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index f672f87..1cccf99 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -15,7 +15,6 @@
 #include "tlsComm.h"
 
 #include <sys/types.h>
-#include <regex.h>
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
@@ -296,8 +295,8 @@ int imap4Create(Pop3 pc, const char *const str)
 	struct re_registers regs;
 	int i, matchedchars;
 	const char *regexes[] = {
-		".*imaps?:([^: ]{1,32}):([^@]{1,32})@([^/: ]+)(/[^: ]+)?(:[0-9]+)? (.+)? *",
-		".*imaps?:([^: ]{1,32}) ([^ ]{1,32}) ([^/: ]+)(/[^: ]+)?( [0-9]+)? (.+)? *",
+		".*imaps?:([^: ]{1,32}):([^@]{1,32})@([^/: ]+)(/[^: ]+)?(:[0-9]+)? *",
+		".*imaps?:([^: ]{1,32}) ([^ ]{1,32}) ([^/: ]+)(/[^: ]+)?( [0-9]+)? *",
 		NULL
 	};
 
diff --git a/wmbiff/Makefile b/wmbiff/Makefile
index 01d9194..ba8bda6 100644
--- a/wmbiff/Makefile
+++ b/wmbiff/Makefile
@@ -1,34 +1,86 @@
-# $Id: Makefile,v 1.20 2002/01/27 19:52:52 jordi Exp $
+# Makefile for wmbiff
+#
+# $Id: Makefile,v 1.21 2002/02/02 18:04:19 jordi Exp $
 
-WMBIFF_VERSION = "0.3.6"
+# Disable gnutls crypto?
+#WITHOUT_CRYPTO=	1
 
-DESTDIR=
-prefix=/usr/local
-bindir=${prefix}/bin
-mandir=${prefix}/share/man
-CONF=/etc
+# If using v0.2.x of gnutls change the variabel below to 2
+GNUTLS_MINOR_VERSION=3
 
-CC     = gcc
-LIBDIR = -L/usr/X11R6/lib
-LIBS   = -lXpm -lXext -lX11 
-CFLAGS = -O2 -Wall -Wpointer-arith 
-#CFLAGS = -g -Wall -Wpointer-arith -Wwrite-strings -pedantic
-#-W -Wmissing-noreturn -Wtraditional
+# Use external GNU regexp lib?
+#EXT_GNU_REGEX_LIB=1
+
+# Use debugging?
+#DEBUG=		1
+
+PREFIX?=	/usr/local
+BINDIR?=	$(PREFIX)/bin
+MANDIR?=	$(PREFIX)/share/man
+
+CC?=		gcc
+LIBDIR?=	-L/usr/X11R6/lib
+LIBS=		-lXpm -lXext -lX11
+CFLAGS?=	-O2 -Wall -Wpointer-arith
+
+###########################################################
+# Nothing below here should need to be changed
+###########################################################
 
-EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)' 
+WMBIFF_VERSION=	"0.3.6"
+EXTRAFLAGS=	-DWMBIFF_VERSION='$(WMBIFF_VERSION)' 
 
-# Comment these out if you don't want cryto support.
-EXTRAFLAGS += -DWITH_TLS -DWITH_GCRYPT 
-LIBS   += -lgnutls -lgcrypt
-# if using v0.2.x of gnutls comment out the following:
-EXTRAFLAGS += -DGNUTLS_VER=3 
+# Default linux owners
+INSTALL_USER=	root
+INSTALL_GROUP=	root
 
-#EXTRAFLAGS += -DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \
+# Debugging
+ifdef DEBUG
+CFLAGS=		-g -Wall -Wpointer-arith -Wwrite-strings -pedantic
+#-W -Wmissing-noreturn -Wtraditional
+endif
+
+# FreeBSD overrides
+ifeq ($(OSTYPE),FreeBSD)
+INSTALL_GROUP=	wheel
+EXT_GNU_REGEX_LIB=1
+CFLAGS+=	-I/usr/X11R6/include/
+endif
+
+# External GNU RegExp lib... needed on FreeBSD
+ifdef EXT_GNU_REGEX_LIB
+LIBS+=		-lgnuregex
+CFLAGS+=	-DEXT_GNU_REGEX_LIB
+endif
+
+# Crypto support
+ifndef WITHOUT_CRYPTO
+EXTRAFLAGS+=	-DWITH_TLS -DWITH_GCRYPT
+LIBS+=		-lgnutls -lgcrypt
+endif
+ifeq ($(GNUTLS_MINOR_VERSION),3)
+EXTRAFLAGS+=	-DGNUTLS_VER=3 
+endif
+
+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_FILE?=	$(INSTALL) -p -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 644
+
+
+# Misc debug stuff :
+#EXTRAFLAGS+=	-DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \
 #	-DDEBUG_MBOX -DDEBUG_MAILDIR -DDEBUG -DDEBUG_MAIL_COUNT \
 #	-DDEBUG_COMM
 
-#CFLAGS += -DUSE_DMALLOC
-#LIBS   += -ldmalloc
+# For malloc debug :
+#CFLAGS	+= -DUSE_DMALLOC
+#LIBS	+= -ldmalloc
+
+
+###########################################################
+# Real make stuff begins :
+###########################################################
 
 OBJS =	wmbiff.o socket.o \
 	Pop3Client.o LicqClient.o mboxClient.o \
@@ -38,23 +90,20 @@ OBJS =	wmbiff.o socket.o \
 	../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
+all: wmbiff
 
 Imap4Client.o: Imap4Client.c Client.h Makefile
 
+wmbiff.o: wmbiff-master.xpm wmbiff.c
+
 .c.o:
 	$(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
 
 wmbiff-master.xpm:
 	ln -s wmbiff-master-led.xpm wmbiff-master.xpm
 
-wmbiff:	$(OBJS)
-	$(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
+wmbiff: $(OBJS)
+	$(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff $^ $(LIBDIR) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
@@ -65,12 +114,12 @@ clean:
 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
+	$(INSTALL_DIR) $(BINDIR)
+	$(INSTALL_DIR) $(MANDIR)/man1
+	$(INSTALL_DIR) $(MANDIR)/man5
+	$(INSTALL_PROGRAM) wmbiff $(BINDIR)
+	$(INSTALL_FILE) wmbiff.1 $(MANDIR)/man1
+	$(INSTALL_FILE) wmbiffrc.5 $(MANDIR)/man5
 
 # CODING STYLE AND INDENTATION [2001-Mar-12]:
 #
diff --git a/wmbiff/Pop3Client.c b/wmbiff/Pop3Client.c
index 2162fc6..d8a79af 100644
--- a/wmbiff/Pop3Client.c
+++ b/wmbiff/Pop3Client.c
@@ -1,4 +1,4 @@
-/* $Id: Pop3Client.c,v 1.5 2001/11/16 07:11:04 bluehal Exp $ */
+/* $Id: Pop3Client.c,v 1.6 2002/02/02 18:04:19 jordi Exp $ */
 /* Author : Scott Holden ( scotth at thezone.net )
    Modified : Yong-iL Joh ( tolkien at mizi.com )
    Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
@@ -13,7 +13,6 @@
 
 #include "Client.h"
 #include "charutil.h"
-#include <regex.h>
 
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
diff --git a/wmbiff/charutil.h b/wmbiff/charutil.h
index a1be278..6e5ac62 100644
--- a/wmbiff/charutil.h
+++ b/wmbiff/charutil.h
@@ -1,4 +1,4 @@
-/* $Id: charutil.h,v 1.4 2001/11/16 00:40:52 bluehal Exp $ */
+/* $Id: charutil.h,v 1.5 2002/02/02 18:04:19 jordi Exp $ */
 /* Author: Mark Hurley  (debian4tux at telocity.com)
  *
  * Character / string manipulation utilities. 
@@ -8,7 +8,11 @@
 #ifndef CHARUTIL
 #define CHARUTIL
 
+#ifdef EXT_GNU_REGEX_LIB
+#include <gnuregex.h>
+#else
 #include <regex.h>
+#endif
 
 int FullTrim(char *psValue);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git



More information about the Pkg-wmaker-commits mailing list