From bd7fb23f74bce16f1b027d2347e6dc82917fb8d1 Mon Sep 17 00:00:00 2001 From: alek Date: Wed, 18 Oct 2006 10:03:50 +0000 Subject: [PATCH] NO_REGRESS; honour SYSCONFDIR --- mail/imapproxy/Makefile | 10 ++++++++-- mail/imapproxy/patches/patch-imapproxy_h | 13 +++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile index 70b25ebbfed..6c8c8c20def 100644 --- a/mail/imapproxy/Makefile +++ b/mail/imapproxy/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2005/05/08 14:29:07 alek Exp $ +# $OpenBSD: Makefile,v 1.3 2006/10/18 10:03:50 alek Exp $ COMMENT= "caching IMAP proxy to be used with webmail clients" DISTNAME= up-imapproxy-1.2.3 -PKGNAME= imapproxy-1.2.3 +PKGNAME= ${DISTNAME:S/^up-//}p0 CATEGORIES= mail HOMEPAGE= http://www.imapproxy.org/ @@ -22,6 +22,12 @@ WANTLIB= curses c ssl crypto pthread CONFIGURE_STYLE=gnu +NO_REGRESS= Yes + +pre-build: + @perl -pi -e "s,!!SYSCONFDIR!!,${SYSCONFDIR}," \ + ${WRKSRC}/include/imapproxy.h + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/imapproxy ${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf \ diff --git a/mail/imapproxy/patches/patch-imapproxy_h b/mail/imapproxy/patches/patch-imapproxy_h index dc22fc0e000..831bf9d0666 100644 --- a/mail/imapproxy/patches/patch-imapproxy_h +++ b/mail/imapproxy/patches/patch-imapproxy_h @@ -1,5 +1,5 @@ ---- include/imapproxy.h.orig Wed Feb 9 01:30:49 2005 -+++ include/imapproxy.h Wed Feb 9 01:31:09 2005 +--- include/imapproxy.h.orig Mon Feb 21 20:14:51 2005 ++++ include/imapproxy.h Wed Oct 18 11:47:02 2006 @@ -141,7 +141,7 @@ /* * Common definitions @@ -9,3 +9,12 @@ #define IMAP_UNTAGGED_OK "* OK " /* untagged OK response */ #define IMAP_TAGGED_OK "1 OK " /* tagged OK response */ #define BUFSIZE 4096 /* default buffer size */ +@@ -159,7 +159,7 @@ + #define SELECT_STATUS_BUF_SIZE 256 /* size of select status */ + + #ifndef DEFAULT_CONFIG_FILE +-#define DEFAULT_CONFIG_FILE "/etc/imapproxy.conf" ++#define DEFAULT_CONFIG_FILE "!!SYSCONFDIR!!/imapproxy.conf" + #endif + + #define LITERAL_PASSWORD 1