From owner-svn-ports-all@freebsd.org Wed Jan 6 16:48:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB80CA651DB; Wed, 6 Jan 2016 16:48:14 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C726217AC; Wed, 6 Jan 2016 16:48:14 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u06GmDJP023887; Wed, 6 Jan 2016 16:48:13 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u06GmDpm023886; Wed, 6 Jan 2016 16:48:13 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601061648.u06GmDpm023886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Wed, 6 Jan 2016 16:48:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405368 - head/mail/openwebmail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2016 16:48:15 -0000 Author: pawel Date: Wed Jan 6 16:48:13 2016 New Revision: 405368 URL: https://svnweb.freebsd.org/changeset/ports/405368 Log: - Remove usage of deprecated @dirrm - Switch to options helpers PR: 205957 Submitted by: myself Approved by: maintainer Modified: head/mail/openwebmail/Makefile Modified: head/mail/openwebmail/Makefile ============================================================================== --- head/mail/openwebmail/Makefile Wed Jan 6 16:46:28 2016 (r405367) +++ head/mail/openwebmail/Makefile Wed Jan 6 16:48:13 2016 (r405368) @@ -24,24 +24,48 @@ PATCH_STRIP= -p1 PLIST= ${WRKDIR}/.PLIST.${PKGNAME} SUB_FILES= pkg-install +PLIST_DIRS= www/cgi-bin/openwebmail/etc/addressbooks \ + www/cgi-bin/openwebmail/etc/sessions \ + www/cgi-bin/openwebmail/etc/users \ + www/data/openwebmail/help/zh_CN.GB2312/images/_notes \ + www/data/openwebmail/help/zh_CN.GB2312/templates_and_data/_notes + OPTIONS_DEFINE= ANTIWORD MAGICK ISPELL LEARNSPAM LSOF PAM POP3_OVER_SSL QUOTA \ SPAMCHECK SPAMCHECK_ALL SPEEDYCGI TNEF VIRUSCHECK VIRUSCHECK_ALL \ WGET ANTIWORD_DESC= AntiWord +ANTIWORD_RUN_DEPENDS= antiword:${PORTSDIR}/textproc/antiword ISPELL_DESC= ISpell +ISPELL_RUN_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell LEARNSPAM_DESC= Learn HAM/SPAM +LEARNSPAM_IMPLIES= SPAMCHECK LSOF_DESC= lsof +LSOF_RUN_DEPENDS= ${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof +MAGICK_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick PAM_DESC= PAM +PAM_RUN_DEPENDS= p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM POP3_OVER_SSL_DESC= POP3 Over SSL +POP3_OVER_SSL_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL QUOTA_DESC= Quota +QUOTA_RUN_DEPENDS= p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota SPAMCHECK_DESC= Spam check (Mail::SpamAssassin) +SPAMCHECK_RUN_DEPENDS= spamassassin>=0:${PORTSDIR}/mail/spamassassin SPAMCHECK_ALL_DESC= Spam check for all (default: pop3) +SPAMCHECK_ALL_IMPLIES= SPAMCHECK SPEEDYCGI_DESC= SpeedyCGI +SPEEDYCGI_RUN_DEPENDS= speedy_suidperl:${PORTSDIR}/www/p5-CGI-SpeedyCGI +SPEEDYCGI_SUB_LIST= WITHOUT_SPEEDYCGI="@comment " +SPEEDYCGI_SUB_LIST_OFF= WITHOUT_SPEEDYCGI="" +SPEEDYCGI_EXTRA_PATCHES= ${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.notmp.patch TNEF_DESC= tnef +TNEF_RUN_DEPENDS= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef VIRUSCHECK_DESC= Virus check (Clam AntiVirus) +VIRUSCHECK_RUN_DEPENDS= clamdscan:${PORTSDIR}/security/clamav VIRUSCHECK_ALL_DESC= Virus check for all (default: pop3) +VIRUSCHECK_ALL_IMPLIES= VIRUSCHECK WGET_DESC= wget +WGET_RUN_DEPENDS= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget .include @@ -58,66 +82,6 @@ PERL_V!= ${PERL} -V .endif # exists(${PERL}) .endif # SPEEDYCGI -.if ${PORT_OPTIONS:MLEARNSPAM} || !empty(PORT_OPTIONS:MSPAMCHECK_ALL) -PORT_OPTIONS+= SPAMCHECK -.endif - -.if ${PORT_OPTIONS:MVIRUSCHECK_ALL} -PORT_OPTIONS+= VIRUSCHECK -.endif - -.if ${PORT_OPTIONS:MANTIWORD} -RUN_DEPENDS+= antiword:${PORTSDIR}/textproc/antiword -.endif - -.if ${PORT_OPTIONS:MMAGICK} -RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.endif - -.if ${PORT_OPTIONS:MISPELL} -RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/aspell-ispell -.endif - -.if ${PORT_OPTIONS:MLSOF} -RUN_DEPENDS+ ${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof -.endif - -.if ${PORT_OPTIONS:MPAM} -RUN_DEPENDS+= p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM -.endif - -.if ${PORT_OPTIONS:MPOP3_OVER_SSL} -RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL -.endif - -.if ${PORT_OPTIONS:MQUOTA} -RUN_DEPENDS+= p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota -.endif - -.if ${PORT_OPTIONS:MTNEF} -RUN_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef -.endif - -.if ${PORT_OPTIONS:MSPAMCHECK} -RUN_DEPENDS+= spamassassin>=0:${PORTSDIR}/mail/spamassassin -.endif - -.if ${PORT_OPTIONS:MSPEEDYCGI} -RUN_DEPENDS+= speedy_suidperl:${PORTSDIR}/www/p5-CGI-SpeedyCGI -SUB_LIST+= WITHOUT_SPEEDYCGI="@comment " -EXTRA_PATCHES+= ${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.notmp.patch -.else -SUB_LIST+= WITHOUT_SPEEDYCGI="" -.endif - -.if ${PORT_OPTIONS:MVIRUSCHECK} -RUN_DEPENDS+= clamdscan:${PORTSDIR}/security/clamav -.endif - -.if ${PORT_OPTIONS:MWGET} -RUN_DEPENDS+= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -.endif - post-extract: .for x in addressbooks/global calendar.book @${RM} ${WRKSRC}/cgi-bin/openwebmail/etc/${x} @@ -138,27 +102,28 @@ post-patch: @${MV} ${PATCH_WRKSRC}/etc/openwebmail.conf ${PATCH_WRKSRC}/etc/openwebmail.conf.sample @${PERL} -pi.bak -e 's,${LOCALBASE}/www/cgi-bin/openwebmail,${OWCGIDIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf.sample @${PERL} -pi.bak -e 's,${LOCALBASE}/www/data/openwebmail,${OWDATADIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.if ${PORT_OPTIONS:MLEARNSPAM} + +post-patch-LEARNSPAM-on: @${PERL} -pi.bak -e 's,enable_learnspam no,enable_learnspam yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.endif -.if ${PORT_OPTIONS:MSPAMCHECK} + +post-patch-SPAMCHECK-on: @${PERL} -pi.bak -e 's,enable_spamcheck no,enable_spamcheck yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf.sample @${ECHO} "enable_saprefs yes" >> ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.endif -.if ${PORT_OPTIONS:MSPAMCHECK_ALL} + +post-patch-SPAMCHECK_ALL-on: @${ECHO} "spamcheck_source_allowed all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.endif -.if ${PORT_OPTIONS:MVIRUSCHECK} + +post-patch-VIRUSCHECK-on: @${PERL} -pi.bak -e 's,enable_viruscheck no,enable_viruscheck yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.endif -.if ${PORT_OPTIONS:MVIRUSCHECK_ALL} + +post-patch-VIRUSCHECK_ALL-on: @${ECHO} "viruscheck_source_allowed all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.endif -.if ${PORT_OPTIONS:MSPEEDYCGI} + +post-patch-SPEEDYCGI-on: @${ECHO} "has_savedsuid_support no" >> ${PATCH_WRKSRC}/etc/openwebmail.conf.sample -.else + +post-patch-SPEEDYCGI-off: @${PERL} -pi.bak -e 's,/usr/bin/suidperl,${PERL},g' ${PATCH_WRKSRC}/openwebmail*pl -.endif pre-install: @: > ${PLIST} @@ -171,20 +136,12 @@ pre-install: @${PRINTF} "%s\n%s\n" "@owner" "@group" >> ${PLIST} @${FIND} ${WRKSRC}/data/openwebmail \( -type f -o -type l \) -and -not -name openwebmail.conf.sample | \ ${SED} -e 's,^${WRKSRC},www,' | ${SORT} -u >> ${PLIST} -.if empty(PORT_OPTIONS:MSPEEDYCGI) + +pre-install-SPEEDYCGI-off: @${FIND} ${WRKSRC}/*/openwebmail -name "openwebmail*pl" | \ ${SED} -e 's,^${WRKSRC},www,' \ -e 's,openwebmail/openwebmail,openwebmail/.openwebmail,g' \ >> ${TMPPLIST} -.endif - @${FIND} ${WRKSRC}/*/openwebmail -type d | ${SORT} -ur | \ - ${GREP} -v UTF-8 | \ - ${SED} -e 's,^${WRKSRC},@dirrm www,' >> ${PLIST} - @${FIND} ${WRKSRC}/*/openwebmail -type d | ${SORT} -ur | \ - ${GREP} UTF-8 | \ - ${SED} -e 's,^${WRKSRC},@dirrmtry www,' >> ${PLIST} - @${ECHO_CMD} "@dirrmtry www/cgi-bin" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry www/data" >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${OWCGIDIR} ${STAGEDIR}${OWDATADIR}