head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.44
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.42
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.40
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.38
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.36
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.34
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.32
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.30
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.28
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.26
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.24
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.22
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.20
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.18
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.16
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.14
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.12
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.10
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.8
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.6
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.4
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.2
	pkgsrc-2020Q4-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2020.11.26.20.17.56;	author nia;	state Exp;
branches;
next	;
commitid	Gvgt420uVRHA7rxC;


desc
@@


1.1
log
@imapfilter: Update to 2.7.4 - via snow flurry in wip, thx!

    IMAPFilter 2.7.4 - 18 Nov 2020
      - Bug fix; incorrect argument to regular expression compile function.

    IMAPFilter 2.7.3 - 14 Nov 2020
      - Bug fix; incorrect free of compiled pattern.
      - Unexpected network errors and IMAP BYE are now logged.

    IMAPFilter 2.7.2 - 10 Nov 2020
      - Makefile is back to being Lua version agnostic.

    IMAPFilter 2.7.1 - 9 Nov 2020
      - Makefile now builds with Lua 5.4 and PCRE2.

    IMAPFilter 2.7 - 8 Nov 2020
      - Lua 5.4 compatibility (the codebase can still be compiled with versions
        5.3, 5.2 and 5.1).
      - PCRE2 compatibility (version 10.00 and later)
      - New error code is returned if certificate verify fails.
      - Bug fix; add missing truststore option from brief usage message.

    IMAPFilter 2.6.16 - 23 Nov 2019
      - Bug fix; escape the double-quote character in passwords.

    IMAPFilter 2.6.15 - 14 Nov 2019
      - Bug fix; try to setup both a CA file and path for SSL validations.

    IMAPFilter 2.6.14 - 1 Nov 2019
      - Bug fix; OpenSSL version mess up for SSL hostname validation.

    IMAPFilter 2.6.13 - 17 Sep 2019
      - Support for SSL hostname validation.

    IMAPFilter 2.6.12 - 3 Oct 2018
      - Support for Server Name Indication (SNI).
      - The searching methods return values are described in the config man page.
      - Example of using the enter_idle() function in the sample extend file.

    IMAPFilter 2.6.11 - 19 Nov 2017
      - Support for interrupting IDLE mode with SIGUSR1/SIGUSR2.
      - New "persist" option to try to recover a connection indefinitely.
      - New "range" option to limit messages included in a range.
      - Bug fix; always close selected mailbox before check_status().
      - Bug fix; closing of selected mailbox twice with fetch_message().
@
text
@$NetBSD$

Use pkgsrc layout/flags.

--- src/Makefile.orig	2020-11-18 21:30:58.000000000 +0000
+++ src/Makefile
@@@@ -2,7 +2,7 @@@@ DESTDIR ?=
 PREFIX ?= /usr/local
 BINDIR = $(PREFIX)/bin
 SHAREDIR = $(PREFIX)/share/imapfilter
-MANDIR = $(PREFIX)/man
+MANDIR = $(PREFIX)/$(PKGMANDIR)
 
 SSLCAPATH = /etc/ssl/certs
 SSLCAFILE = /etc/ssl/cert.pem
@@@@ -19,13 +19,13 @@@@ LIBPCRE = -lpcre2-8
 LIBSSL = -lssl
 LIBCRYPTO = -lcrypto
 
-CFLAGS = -Wall -Wextra -O \
+CFLAGS += -Wall -Wextra -O \
 	 -DCONFIG_SHAREDIR='"$(SHAREDIR)"' \
 	 -DCONFIG_SSL_CAPATH='"$(SSLCAPATH)"' \
 	 -DCONFIG_SSL_CAFILE='"$(SSLCAFILE)"' \
 	 $(INCDIRS) $(MYCFLAGS)
-LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
-LIBS = -lm -ldl $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
+LDFLAGS += $(LIBDIRS) $(MYLDFLAGS)
+LIBS += -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
 
 MAN1 = imapfilter.1
 MAN5 = imapfilter_config.5
@@@@ -41,7 +41,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: buffer.h 
@@@@ -59,18 +59,14 @@@@ session.o: list.h session.h
 socket.o: session.h
 
 install: $(BIN)
-	mkdir -p $(DESTDIR)$(BINDIR) && \
-	cp -f $(BIN) $(DESTDIR)$(BINDIR) && \
-	chmod 0755 $(DESTDIR)$(BINDIR)/$(BIN)
-	mkdir -p $(DESTDIR)$(SHAREDIR) && \
-	cp -f $(LUA) $(DESTDIR)$(SHAREDIR) && \
-	chmod 0644 $(DESTDIR)$(SHAREDIR)/$(LUA)
-	mkdir -p $(DESTDIR)$(MANDIR)/man1 && \
-	cp -f ../doc/$(MAN1) $(DESTDIR)$(MANDIR)/man1 && \
-	chmod 0644 $(DESTDIR)$(MANDIR)/man1/$(MAN1)
-	mkdir -p $(DESTDIR)$(MANDIR)/man5 && \
-	cp -f ../doc/$(MAN5) $(DESTDIR)$(MANDIR)/man5 && \
-	chmod 0644 $(DESTDIR)$(MANDIR)/man5/$(MAN5)
+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
+	$(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)/$(BIN)
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(SHAREDIR)
+	$(BSD_INSTALL_DATA) $(LUA) $(DESTDIR)$(SHAREDIR)/
+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
+	$(BSD_INSTALL_MAN) ../doc/$(MAN1) $(DESTDIR)$(MANDIR)/man1/$(MAN1)
+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man5
+	$(BSD_INSTALL_MAN) ../doc/$(MAN5) $(DESTDIR)$(MANDIR)/man5/$(MAN5)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
@