a3b9424f92
While here add PKGMANDIR support. Changes since last packaged version (1.0.1): Version 1.1.1 - 11 November 2005 -------------------------------- - Bug fix; minor memory leak. - Bug fix; on some systems, failure resulted while disconnecting from all the servers, during the shutdown phase just before exiting. Version 1.1 - 24 August 2005 ---------------------------- - Addition of the list() and lsub() commands, that make it possible to get a list of the available mailboxes or only of those that are subscribed. Implementation of the IMAP LIST/LSUB commands, with additional support for the IMAP CHILDREN (RFC 3348) and IMAP NAMESPACE (RFC 2342) extensions. - New program option to execute a string from the command line, without loading a configuration file. - New program option to enter interactive mode after executing the configuration file or the command line. - Servers that reply with multiple SEARCH responses are taken into consideration. - Bug fix; failure to parse the response to fetchfast() that some mail servers sent. - Bug fix; in some systems and when in debug mode, an empty namespace caused program fault.
66 lines
2.2 KiB
Text
66 lines
2.2 KiB
Text
$NetBSD: patch-aa,v 1.6 2006/01/15 14:28:07 seb Exp $
|
|
|
|
--- Makefile.orig 2005-11-10 23:21:55.000000000 +0000
|
|
+++ Makefile
|
|
@@ -1,18 +1,11 @@
|
|
-DESTDIR = /usr/local
|
|
-BINDIR = /usr/local/bin
|
|
-SHAREDIR = /usr/local/share/imapfilter
|
|
-MANDIR = /usr/local/man
|
|
-
|
|
-INCDIRS = -I/usr/local/include
|
|
-LIBDIRS = -L/usr/local/lib
|
|
-
|
|
-MYCFLAGS = -Wall -O
|
|
-MYLDFLAGS =
|
|
+DESTDIR = $(PREFIX)
|
|
+BINDIR = $(PREFIX)/bin
|
|
+SHAREDIR = $(PREFIX)/share/imapfilter
|
|
+MANDIR = $(PREFIX)/$(PKGMANDIR)
|
|
|
|
DEFS = -DMAKEFILE_SHAREDIR='"$(SHAREDIR)"'
|
|
|
|
-CFLAGS = $(MYCFLAGS) $(DEFS) $(INCDIRS)
|
|
-LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
|
|
+CFLAGS+= $(DEFS)
|
|
|
|
LIBS = -lm -llua -llualib -lssl -lcrypto
|
|
|
|
@@ -30,7 +23,7 @@ OBJ = auth.o buffer.o cert.o core.o file
|
|
all: $(BIN)
|
|
|
|
$(BIN): $(OBJ)
|
|
- $(CC) -o $(BIN) $(LDFLAGS) $(OBJ) $(LIBS)
|
|
+ $(CC) -o $(BIN) $(LDFLAGS) $(CFLAGS) $(OBJ) $(LIBS)
|
|
|
|
$(OBJ): imapfilter.h
|
|
buffer.o imap.o imapfilter.o namespace.o request.o response.o: buffer.h
|
|
@@ -42,19 +35,15 @@ auth.o cert.o imap.o imapfilter.o log.o
|
|
imapfilter.o: version.h
|
|
|
|
install: $(BIN)
|
|
- if test ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
|
|
- cp -f $(BIN) $(BINDIR) && chmod 0755 $(BINDIR)/$(BIN)
|
|
- if test ! -d $(SHAREDIR); then mkdir -p $(SHAREDIR); fi
|
|
- cp -f $(INTERFACE_LUA) $(SHAREDIR) && \
|
|
- chmod 0644 $(SHAREDIR)/$(INTERFACE_LUA)
|
|
- cp -f $(AUXILIARY_LUA) $(SHAREDIR) && \
|
|
- chmod 0644 $(SHAREDIR)/$(AUXILIARY_LUA)
|
|
- if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi
|
|
- cp -f $(MAN_BIN) $(MANDIR)/man1 && \
|
|
- chmod 0644 $(MANDIR)/man1/$(MAN_BIN)
|
|
- if test ! -d $(MANDIR)/man5; then mkdir -p $(MANDIR)/man5; fi
|
|
- cp -f $(MAN_CONFIG) $(MANDIR)/man5 && \
|
|
- chmod 0644 $(MANDIR)/man5/$(MAN_CONFIG)
|
|
+ $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
|
|
+ $(BSD_INSTALL_PROGRAM) $(BIN) $(BINDIR)/$(BIN)
|
|
+ $(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
|
|
+ $(BSD_INSTALL_DATA) $(INTERFACE_LUA) $(SHAREDIR)/$(INTERFACE_LUA)
|
|
+ $(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(AUXILIARY_LUA)
|
|
+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1
|
|
+ $(BSD_INSTALL_MAN) $(MAN_BIN) $(MANDIR)/man1/$(MAN_BIN)
|
|
+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man5
|
|
+ $(BSD_INSTALL_MAN) $(MAN_CONFIG) $(MANDIR)/man5/$(MAN_CONFIG)
|
|
|
|
deinstall:
|
|
rm -f $(BINDIR)/$(BIN) $(SHAREDIR)/$(INTERFACE_LUA) \
|