pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/imapfilter Update to version 1.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/b37de7bbd672
branches: trunk
changeset: 475703:b37de7bbd672
user: seb <seb%pkgsrc.org@localhost>
date: Sun May 23 20:52:09 2004 +0000
description:
Update to version 1.0.
Lots of changes! The main one being that imapfilter is now
configurable and extensible with the Lua language. The configuration
file itself is a Lua script so your old configuration files must
be rewritten.
While here claim stewardship.
diffstat:
mail/imapfilter/Makefile | 14 ++++----
mail/imapfilter/PLIST | 10 ++++-
mail/imapfilter/distinfo | 8 ++--
mail/imapfilter/patches/patch-aa | 64 +++++++++++++++++++++++++--------------
4 files changed, 59 insertions(+), 37 deletions(-)
diffs (156 lines):
diff -r 5601b63b526a -r b37de7bbd672 mail/imapfilter/Makefile
--- a/mail/imapfilter/Makefile Sun May 23 18:31:27 2004 +0000
+++ b/mail/imapfilter/Makefile Sun May 23 20:52:09 2004 +0000
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.13 2004/04/18 05:01:43 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/23 20:52:09 seb Exp $
-DISTNAME= imapfilter-0.9.5
-PKGREVISION= 1
+DISTNAME= imapfilter-1.0
CATEGORIES= mail
MASTER_SITES= http://imapfilter.hellug.gr/source/
-MAINTAINER= tech-pkg%NetBSD.org@localhost
+MAINTAINER= seb%NetBSD.org@localhost
HOMEPAGE= http://imapfilter.hellug.gr/
COMMENT= Mail filtering utility for the IMAP
USE_BUILDLINK3= yes
-CFLAGS+= -I${BUILDLINK_PREFIX.openssl}/include
-LDFLAGS+= -L${BUILDLINK_PREFIX.openssl}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
LDFLAGS.SunOS+= -lsocket -lnsl
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/imapfilter
- ${INSTALL_DATA} ${WRKSRC}/sample.imapfilterrc \
+.for f in sample.config.lua sample.extend.lua
+ ${INSTALL_DATA} ${WRKSRC}/${f} \
${PREFIX}/share/examples/imapfilter
+.endfor
+.include "../../lang/lua/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5601b63b526a -r b37de7bbd672 mail/imapfilter/PLIST
--- a/mail/imapfilter/PLIST Sun May 23 18:31:27 2004 +0000
+++ b/mail/imapfilter/PLIST Sun May 23 20:52:09 2004 +0000
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/04 00:03:29 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/23 20:52:09 seb Exp $
bin/imapfilter
man/man1/imapfilter.1
-man/man5/imapfilterrc.5
-share/examples/imapfilter/sample.imapfilterrc
+man/man5/imapfilter_config.5
+share/examples/imapfilter/sample.config.lua
+share/examples/imapfilter/sample.extend.lua
+share/imapfilter/auxiliary.lua
+share/imapfilter/interface.lua
+@dirrm share/imapfilter
@dirrm share/examples/imapfilter
diff -r 5601b63b526a -r b37de7bbd672 mail/imapfilter/distinfo
--- a/mail/imapfilter/distinfo Sun May 23 18:31:27 2004 +0000
+++ b/mail/imapfilter/distinfo Sun May 23 20:52:09 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/12/11 23:05:16 seb Exp $
+$NetBSD: distinfo,v 1.9 2004/05/23 20:52:09 seb Exp $
-SHA1 (imapfilter-0.9.5.tar.gz) = b07a85da3cf9cb81e831c0399eb1e26b6901c184
-Size (imapfilter-0.9.5.tar.gz) = 45488 bytes
-SHA1 (patch-aa) = d3c30e01d4490e7bb54efad1b8e941c17be322f3
+SHA1 (imapfilter-1.0.tar.gz) = dd67e40215bee2cfdfa75c89a16170e145982c8a
+Size (imapfilter-1.0.tar.gz) = 30979 bytes
+SHA1 (patch-aa) = b592fe42ede943dafda19b9ef2282b0804419e5b
diff -r 5601b63b526a -r b37de7bbd672 mail/imapfilter/patches/patch-aa
--- a/mail/imapfilter/patches/patch-aa Sun May 23 18:31:27 2004 +0000
+++ b/mail/imapfilter/patches/patch-aa Sun May 23 20:52:09 2004 +0000
@@ -1,46 +1,64 @@
-$NetBSD: patch-aa,v 1.4 2003/08/23 20:52:58 seb Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/23 20:52:09 seb Exp $
---- Makefile.orig 2003-08-08 12:55:55.000000000 +0000
+--- Makefile.orig 2004-05-22 23:31:09.000000000 +0000
+++ Makefile
-@@ -1,10 +1,6 @@
--CC = cc
--CFLAGS = -O
--LDFLAGS =
--
+@@ -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)/man
- MAN_BIN = imapfilter.1
- MAN_RC = imapfilterrc.5
-@@ -19,7 +15,7 @@ LIBS = -lssl -lcrypto
- all: imapfilter
+ DEFS = -DMAKEFILE_SHAREDIR='"$(SHAREDIR)"'
+
+-CFLAGS = $(MYCFLAGS) $(DEFS) $(INCDIRS)
+-LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
++CFLAGS+= $(DEFS)
+
+ LIBS = -lm -llua -llualib -lssl -lcrypto
- imapfilter: $(OBJ)
-- $(CC) $(LIBS) $(LDFLAGS) -o $(BIN) $(OBJ)
-+ $(CC) $(LDFLAGS) $(LIBS) $(CFLAGS) -o $(BIN) $(OBJ)
+@@ -30,7 +23,7 @@ OBJ = auth.o buffer.o cert.o core.o file
+ all: $(BIN)
- account.o action.o auth.o buffer.o cert.o destroy.o file.o filter.o imap.o \
- imapfilter.o lock.o log.o match.o memory.o parse.o passwd.o \
-@@ -32,12 +28,12 @@ cert.o file.o lock.o parse.o: pathnames.
+ $(BIN): $(OBJ)
+- $(CC) -o $(BIN) $(LDFLAGS) $(OBJ) $(LIBS)
++ $(CC) -o $(BIN) $(LDFLAGS) $(CFLAGS) $(OBJ) $(LIBS)
+
+ $(OBJ): imapfilter.h
+ buffer.o imap.o imapfilter.o request.o response.o: buffer.h
+@@ -41,17 +34,15 @@ auth.o cert.o imap.o imapfilter.o log.o
imapfilter.o: version.h
- install: imapfilter
+ 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_RC) $(MANDIR)/man5 && chmod 0644 $(MANDIR)/man5/$(MAN_RC)
+- cp -f $(MAN_CONFIG) $(MANDIR)/man5 && chmod 0644 $(MANDIR)/man5/$(MAN_CONFIG)
+ $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
-+ $(BSD_INSTALL_PROGRAM) $(BIN) $(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
++ $(BSD_INSTALL_MAN) $(MAN_BIN) $(MANDIR)/man1/$(MAN_BIN)
+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man5
-+ $(BSD_INSTALL_MAN) $(MAN_RC) $(MANDIR)/man5
++ $(BSD_INSTALL_MAN) $(MAN_CONFIG) $(MANDIR)/man5/$(MAN_CONFIG)
deinstall:
- rm -f $(BINDIR)/$(BIN) $(MANDIR)/man1/$(MAN_BIN) $(MANDIR)/man5/$(MAN_RC)
+ rm -f $(BINDIR)/$(BIN) $(SHAREDIR)/$(INTERFACE_LUA) \
Home |
Main Index |
Thread Index |
Old Index