6 files changed, 27 insertions, 38 deletions
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index d9583873b92e..0b945c89a650 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -5,40 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=	up-imapproxy
-PORTVERSION=	1.2.3
+PORTNAME=	imapproxy
+PORTVERSION=	1.2.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.imapproxy.org/downloads/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX=	up-
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	A caching IMAP proxy server
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
-USE_RC_SUBR=	YES
-
-SAMPLE_EXT=	sample
-
-.include <bsd.port.pre.mk>
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
-		RC_SUBR=${RC_SUBR}
+USE_RC_SUBR=	imapproxyd.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-lc_r|${PTHREAD_LIBS}|g; s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
 
 post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/imapproxyd.conf > ${WRKSRC}/imapproxyd.conf ;
-	${INSTALL} -m 644 -c ${WRKSRC}/imapproxyd.conf ${PREFIX}/etc/imapproxyd.conf.default ;
-	@if [ ! -f ${PREFIX}/etc/imapproxyd.conf ]; then \
-		${INSTALL} -m 644 -c ${WRKSRC}/imapproxyd.conf ${PREFIX}/etc/imapproxyd.conf ; \
-	fi
-	${INSTALL} -m 644 -c ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf.${SAMPLE_EXT} ;
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/imapproxyd.sh > ${WRKSRC}/imapproxyd.sh
-	${INSTALL_SCRIPT} -m 755 ${WRKSRC}/imapproxyd.sh ${PREFIX}/etc/rc.d/imapproxyd.sh
+	${INSTALL} -m 644 -c ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf.default
+.	if !exists(${PREFIX}/etc/imapproxyd.conf)
+		${INSTALL} -m 644 -c ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf
+.	endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/up-imapproxy/distinfo b/mail/up-imapproxy/distinfo
index 7aef2860b403..3713de599851 100644
--- a/mail/up-imapproxy/distinfo
+++ b/mail/up-imapproxy/distinfo
@@ -1,2 +1,2 @@
-MD5 (up-imapproxy-1.2.3.tar.gz) = ad4dafd1417903feb1e09ec569ff1ad5
-SIZE (up-imapproxy-1.2.3.tar.gz) = 122991
+MD5 (up-imapproxy-1.2.4.tar.gz) = ad68dd2258255ac6ef87165f518390e9
+SIZE (up-imapproxy-1.2.4.tar.gz) = 131331
diff --git a/mail/up-imapproxy/files/imapproxyd.conf b/mail/up-imapproxy/files/imapproxyd.conf
deleted file mode 100644
index 859666943b67..000000000000
--- a/mail/up-imapproxy/files/imapproxyd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-server_hostname yourserver.host.com
-cache_size 10000
-listen_port 10143
-server_port 143
-cache_expiration_time 60
-proc_username nobody
-proc_groupname nogroup
-stat_filename /var/run/pimpstats
-protocol_log_filename /var/log/imapproxy_protocol.log
-syslog_facility LOG_MAIL
-send_tcp_keepalives no
diff --git a/mail/up-imapproxy/files/imapproxyd.sh b/mail/up-imapproxy/files/imapproxyd.sh.in
index 82aac33ffc04..82aac33ffc04 100644
--- a/mail/up-imapproxy/files/imapproxyd.sh
+++ b/mail/up-imapproxy/files/imapproxyd.sh.in
diff --git a/mail/up-imapproxy/files/patch-config.h.in b/mail/up-imapproxy/files/patch-config.h.in
new file mode 100644
index 000000000000..1520d0bb8b97
--- /dev/null
+++ b/mail/up-imapproxy/files/patch-config.h.in
@@ -0,0 +1,13 @@
+--- config.h.in.orig	Wed Sep 28 10:39:59 2005
++++ config.h.in	Wed Sep 28 10:40:09 2005
+@@ -89,6 +89,10 @@
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++
+ #if HAVE_SYS_MMAN_H
+ #include <sys/mman.h>
+ #endif
diff --git a/mail/up-imapproxy/pkg-plist b/mail/up-imapproxy/pkg-plist
index 83ecf05c9d64..94a603414c46 100644
--- a/mail/up-imapproxy/pkg-plist
+++ b/mail/up-imapproxy/pkg-plist
@@ -1,5 +1,4 @@
+@unexec if cmp -s %D/etc/imapproxyd.conf.default %D/etc/imapproxyd.conf; then rm -f %D/etc/imapproxyd.conf; fi
+etc/imapproxyd.conf.default
 sbin/pimpstat
 sbin/in.imapproxyd
-etc/rc.d/imapproxyd.sh
-etc/imapproxyd.conf.default
-etc/imapproxyd.conf.sample