From db5c8adb259c23c22805e601b44fc43efa601058 Mon Sep 17 00:00:00 2001 From: Marcus Alves Grando Date: Wed, 28 Sep 2005 16:28:31 +0000 Subject: Update to 1.2.4 PR: 86043 Approved by: mbr (maintainer timeout, 15 days), pav (mentor) --- mail/up-imapproxy/Makefile | 32 ++++++++++--------------------- mail/up-imapproxy/distinfo | 4 ++-- mail/up-imapproxy/files/imapproxyd.conf | 11 ----------- mail/up-imapproxy/files/imapproxyd.sh | 25 ------------------------ mail/up-imapproxy/files/imapproxyd.sh.in | 25 ++++++++++++++++++++++++ mail/up-imapproxy/files/patch-config.h.in | 13 +++++++++++++ mail/up-imapproxy/pkg-plist | 5 ++--- 7 files changed, 52 insertions(+), 63 deletions(-) delete mode 100644 mail/up-imapproxy/files/imapproxyd.conf delete mode 100644 mail/up-imapproxy/files/imapproxyd.sh create mode 100644 mail/up-imapproxy/files/imapproxyd.sh.in create mode 100644 mail/up-imapproxy/files/patch-config.h.in (limited to 'mail/up-imapproxy') 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 - -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 +.include 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 deleted file mode 100644 index 82aac33ffc04..000000000000 --- a/mail/up-imapproxy/files/imapproxyd.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: imapproxyd -# REQUIRE: LOGIN -# BEFORE: mail -# KEYWORD: FreeBSD shutdown - -# -# Add the following line to /etc/rc.conf to enable imapproxyd: -# -#imapproxyd_enable="YES" -# - -. %%RC_SUBR%% - -name=imapproxyd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/in.imapproxyd - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/up-imapproxy/files/imapproxyd.sh.in b/mail/up-imapproxy/files/imapproxyd.sh.in new file mode 100644 index 000000000000..82aac33ffc04 --- /dev/null +++ b/mail/up-imapproxy/files/imapproxyd.sh.in @@ -0,0 +1,25 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: imapproxyd +# REQUIRE: LOGIN +# BEFORE: mail +# KEYWORD: FreeBSD shutdown + +# +# Add the following line to /etc/rc.conf to enable imapproxyd: +# +#imapproxyd_enable="YES" +# + +. %%RC_SUBR%% + +name=imapproxyd +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/in.imapproxyd + +load_rc_config $name +run_rc_command "$1" 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 ++#endif ++ + #if HAVE_SYS_MMAN_H + #include + #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 -- cgit v1.2.3