diff options
Diffstat (limited to 'mail/openwebmail')
-rw-r--r-- | mail/openwebmail/Makefile | 11 | ||||
-rw-r--r-- | mail/openwebmail/distinfo | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index f5090c58b723..473b6a71c811 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openwebmail -PORTVERSION= 2.20 +PORTVERSION= 2.21 CATEGORIES= mail MASTER_SITES= http://openwebmail.com/openwebmail/download/ \ http://turtle.ee.ncku.edu.tw/openwebmail/download/ @@ -30,8 +30,9 @@ OWDATADIR= ${PREFIX}/www/data/openwebmail PATCH_WRKSRC= ${WRKSRC}/cgi-bin/openwebmail PATCH_STRIP= -p1 PLIST= ${WRKDIR}/.PLIST.${PKGNAME} +_SUIDPERL_ENABLED!= ${PERL5} -V | ${GREP} d_dosuid | wc -l -.if ${PERL_LEVEL} > 500800 +.if ${PERL_LEVEL} > 500800 && !defined(_SUIDPERL_ENABLED) WITHOUT_SPEEDYCGI=yes .endif @@ -113,7 +114,8 @@ post-patch: pre-install: @${FIND} ${WRKSRC}/*/openwebmail \( -name "*.bak" -or -name "*.orig" \) -delete .if !exists(${PLIST}) - @${FIND} ${WRKSRC}/*/openwebmail -type f -o -type l | ${SED} -e 's,${WRKSRC},www,g' | sort -u > ${PLIST} + @${ECHO} "@unexec if cmp -s %D/www/cgi-bin/openwebmail/etc/openwebmail.conf %D/www/cgi-bin/openwebmail/etc/openwebmail.conf-dist; then rm -f %D/www/cgi-bin/openwebmail/etc/openwebmail.conf; fi" > ${PLIST} + @${FIND} ${WRKSRC}/*/openwebmail -type f -o -type l | ${SED} -e 's,${WRKSRC},www,g' | sort -u >> ${PLIST} .for f in b2g g2b lunar @${ECHO} "www/cgi-bin/openwebmail/etc/${f}.db" >> ${PLIST} .endfor @@ -130,6 +132,9 @@ do-install: @${MKDIR} ${OWCGIDIR} ${OWDATADIR} @cd ${WRKSRC}/cgi-bin/openwebmail && ${FIND} . | cpio -dpum -R ${BINOWN}:mail ${OWCGIDIR} @cd ${WRKSRC}/data/openwebmail && ${FIND} . | cpio -dpum -R ${SHAREOWN}:${SHAREGRP} ${OWDATADIR} +.if !exists(${OWCGIDIR}/etc/openwebmail.conf) + @${CP} ${OWCGIDIR}/etc/openwebmail.conf-dist ${OWCGIDIR}/etc/openwebmail.conf +.endif @${CHMOD} 0770 ${OWCGIDIR}/etc/sessions ${OWCGIDIR}/etc/users @${CHMOD} 4755 ${OWCGIDIR}/openwebmail*pl .if defined(WITHOUT_SPEEDYCGI) diff --git a/mail/openwebmail/distinfo b/mail/openwebmail/distinfo index a7b5a5279652..5639e53c0f10 100644 --- a/mail/openwebmail/distinfo +++ b/mail/openwebmail/distinfo @@ -1 +1 @@ -MD5 (openwebmail-2.20.tgz) = f4eed705f0055ce8269590ce4122ee29 +MD5 (openwebmail-2.21.tgz) = a7bf580b0e6a2f1cd896a4ca6a55355c |