diff options
| -rw-r--r-- | mail/imapfilter/Makefile | 4 | ||||
| -rw-r--r-- | mail/imapfilter/PLIST | 10 | ||||
| -rw-r--r-- | mail/imapfilter/distinfo | 10 | ||||
| -rw-r--r-- | mail/imapfilter/patches/patch-aa | 52 |
4 files changed, 49 insertions, 27 deletions
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile index 0dde3e90a60..f3fe16a2c75 100644 --- a/mail/imapfilter/Makefile +++ b/mail/imapfilter/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2007/06/10 21:55:39 tonio Exp $ +# $NetBSD: Makefile,v 1.26 2007/08/15 21:22:54 seb Exp $ -DISTNAME= imapfilter-1.3 +DISTNAME= imapfilter-2.0.3 CATEGORIES= mail MASTER_SITES= http://imapfilter.hellug.gr/source/ EXTRACT_SUFX= .tar.bz2 diff --git a/mail/imapfilter/PLIST b/mail/imapfilter/PLIST index 9245ce6ff65..c779dbcd6a6 100644 --- a/mail/imapfilter/PLIST +++ b/mail/imapfilter/PLIST @@ -1,11 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 2007/06/10 21:55:39 tonio Exp $ +@comment $NetBSD: PLIST,v 1.4 2007/08/15 21:22:54 seb Exp $ bin/imapfilter man/man1/imapfilter.1 man/man5/imapfilter_config.5 share/examples/imapfilter/sample.config.lua share/examples/imapfilter/sample.extend.lua +share/imapfilter/account.lua share/imapfilter/auxiliary.lua -share/imapfilter/interface.lua +share/imapfilter/common.lua +share/imapfilter/deprecated.lua +share/imapfilter/mailbox.lua +share/imapfilter/message.lua +share/imapfilter/options.lua share/imapfilter/regex.lua +share/imapfilter/set.lua @dirrm share/imapfilter @dirrm share/examples/imapfilter diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo index 48bfefc6930..a72fb2ea42b 100644 --- a/mail/imapfilter/distinfo +++ b/mail/imapfilter/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.16 2007/06/10 21:55:39 tonio Exp $ +$NetBSD: distinfo,v 1.17 2007/08/15 21:22:54 seb Exp $ -SHA1 (imapfilter-1.3.tar.bz2) = 3b3e92537408a05740a4502b256a23af1ac43c92 -RMD160 (imapfilter-1.3.tar.bz2) = f5f76630ac930a504ef9800b26b2cc40b30577dd -Size (imapfilter-1.3.tar.bz2) = 34174 bytes -SHA1 (patch-aa) = 459d380643938afdcfd3999cfb88d6dfcf1a3467 +SHA1 (imapfilter-2.0.3.tar.bz2) = 525189444c96051456ed5c409e2688072e0f0346 +RMD160 (imapfilter-2.0.3.tar.bz2) = b925b35d1180f84c08ff06c1c600c699193b2033 +Size (imapfilter-2.0.3.tar.bz2) = 37929 bytes +SHA1 (patch-aa) = 9e60555564697a3c870bc3008a30bebcd7c878de diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa index 613e01054d5..8f77495cb61 100644 --- a/mail/imapfilter/patches/patch-aa +++ b/mail/imapfilter/patches/patch-aa @@ -1,32 +1,30 @@ -$NetBSD: patch-aa,v 1.8 2007/06/10 21:55:39 tonio Exp $ +$NetBSD: patch-aa,v 1.9 2007/08/15 21:22:55 seb Exp $ ---- Makefile.orig 2007-02-14 02:08:35.000000000 +0100 +--- Makefile.orig 2007-06-30 20:38:47.000000000 +0000 +++ Makefile -@@ -1,18 +1,11 @@ +@@ -1,7 +1,7 @@ -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 -g --MYLDFLAGS = +DESTDIR = $(PREFIX) +BINDIR = $(PREFIX)/bin +SHAREDIR = $(PREFIX)/share/imapfilter +MANDIR = $(PREFIX)/$(PKGMANDIR) + INCDIRS = -I/usr/local/include + LIBDIRS = -L/usr/local/lib +@@ -11,8 +11,7 @@ MYLDFLAGS = + DEFS = -DMAKEFILE_SHAREDIR='"$(SHAREDIR)"' -CFLAGS = $(MYCFLAGS) $(DEFS) $(INCDIRS) -LDFLAGS = $(MYLDFLAGS) $(LIBDIRS) +CFLAGS+= $(DEFS) - LIBS = -lm -llua -lssl -lcrypto -lpcre + LIBS = -lm -llua -lpcre -lssl -lcrypto -@@ -31,7 +24,7 @@ OBJ = auth.o buffer.o cert.o core.o file +@@ -37,7 +36,7 @@ OBJ = auth.o buffer.o cert.o core.o file all: $(BIN) $(BIN): $(OBJ) @@ -35,19 +33,31 @@ $NetBSD: patch-aa,v 1.8 2007/06/10 21:55:39 tonio Exp $ $(OBJ): imapfilter.h buffer.o imap.o imapfilter.o namespace.o request.o response.o: buffer.h -@@ -43,21 +36,16 @@ auth.o cert.o imap.o imapfilter.o log.o +@@ -49,33 +48,22 @@ 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) +- cp -f $(COMMON_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(COMMON_LUA) +- cp -f $(SET_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(SET_LUA) - cp -f $(REGEX_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(REGEX_LUA) +- cp -f $(ACCOUNT_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(ACCOUNT_LUA) +- cp -f $(MAILBOX_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(MAILBOX_LUA) +- cp -f $(MESSAGE_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(MESSAGE_LUA) +- cp -f $(OPTIONS_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(OPTIONS_LUA) +- cp -f $(AUXILIARY_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(AUXILIARY_LUA) +- cp -f $(DEPRECATED_LUA) $(SHAREDIR) && \ +- chmod 0644 $(SHAREDIR)/$(DEPRECATED_LUA) - if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi - cp -f $(MAN_BIN) $(MANDIR)/man1 && \ - chmod 0644 $(MANDIR)/man1/$(MAN_BIN) @@ -57,9 +67,15 @@ $NetBSD: patch-aa,v 1.8 2007/06/10 21:55:39 tonio Exp $ + $(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) $(COMMON_LUA) $(SHAREDIR)/$(COMMON_LUA) ++ $(BSD_INSTALL_DATA) $(SET_LUA) $(SHAREDIR)/$(SET_LUA) ++ $(BSD_INSTALL_DATA) $(REGEX_LUA) $(SHAREDIR)/$(REGEX_LUA) ++ $(BSD_INSTALL_DATA) $(ACCOUNT_LUA) $(SHAREDIR)/$(ACCOUNT_LUA) ++ $(BSD_INSTALL_DATA) $(MAILBOX_LUA) $(SHAREDIR)/$(MAILBOX_LUA) ++ $(BSD_INSTALL_DATA) $(MESSAGE_LUA) $(SHAREDIR)/$(MESSAGE_LUA) ++ $(BSD_INSTALL_DATA) $(OPTIONS_LUA) $(SHAREDIR)/$(OPTIONS_LUA) + $(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(AUXILIARY_LUA) -+ $(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(REGEX_LUA) ++ $(BSD_INSTALL_DATA) $(DEPRECATED_LUA) $(SHAREDIR)/$(DEPRECATED_LUA) + $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1 + $(BSD_INSTALL_MAN) $(MAN_BIN) $(MANDIR)/man1/$(MAN_BIN) + $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man5 |