From owner-svn-ports-head@FreeBSD.ORG Mon Jul 15 19:45:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 358588B1; Mon, 15 Jul 2013 19:45:39 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 183DD67E; Mon, 15 Jul 2013 19:45:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6FJjcTe024153; Mon, 15 Jul 2013 19:45:38 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6FJjc9W024150; Mon, 15 Jul 2013 19:45:38 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201307151945.r6FJjc9W024150@svn.freebsd.org> From: Hajimu UMEMOTO Date: Mon, 15 Jul 2013 19:45:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323075 - in head/mail/cyrus-imapd24: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2013 19:45:39 -0000 Author: ume Date: Mon Jul 15 19:45:38 2013 New Revision: 323075 URL: http://svnweb.freebsd.org/changeset/ports/323075 Log: Add Cyrus man pages to manpath. PR: ports/180363 Submitted by: Panagiotis Christias Added: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf (contents, props changed) Modified: head/mail/cyrus-imapd24/Makefile head/mail/cyrus-imapd24/pkg-plist Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Mon Jul 15 19:44:20 2013 (r323074) +++ head/mail/cyrus-imapd24/Makefile Mon Jul 15 19:45:38 2013 (r323075) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.4.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ @@ -159,6 +159,12 @@ PLIST_SUB+= LDAP="" PLIST_SUB+= LDAP="@comment " .endif +.if ${OSVERSION} >= 900022 +PLIST_SUB+= MANCONF="" +.else +PLIST_SUB+= MANCONF="@comment " +.endif + .if !exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+=--disable-gssapi .endif @@ -223,6 +229,9 @@ post-patch: ${WRKSRC}/tools/masssievec @${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \ ${WRKSRC}/imap/Makefile.in + @${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \ + ${FILESDIR}/cyrus-imapd-man.conf \ + > ${WRKDIR}/cyrus-imapd-man.conf .if ${PORT_OPTIONS:MDRAC} @${RM} -rf ${WRKSRC}/autom4te.cache .endif @@ -230,8 +239,7 @@ post-patch: post-install: .for f in ${CYRUS_MAN3} @${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f} - @${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \ - >>${TMPPLIST} + @${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz >>${TMPPLIST} .endfor .for f in ${CYRUS_MAN8} @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f} @@ -279,6 +287,10 @@ post-install: ${PREFIX}/cyrus/bin/mkimap @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${PREFIX}/cyrus/bin/masssievec +.if ${OSVERSION} >= 900022 + @${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ + ${PREFIX}/etc/man.d/cyrus-imapd.conf +.endif @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL @${CAT} ${PKGMESSAGE} Added: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf Mon Jul 15 19:45:38 2013 (r323075) @@ -0,0 +1 @@ +MANPATH %%PREFIX%%/cyrus/man Modified: head/mail/cyrus-imapd24/pkg-plist ============================================================================== --- head/mail/cyrus-imapd24/pkg-plist Mon Jul 15 19:44:20 2013 (r323074) +++ head/mail/cyrus-imapd24/pkg-plist Mon Jul 15 19:45:38 2013 (r323075) @@ -108,6 +108,7 @@ lib/libcyrus.a %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so %%EXAMPLESDIR%%/imapd.conf +%%MANCONF%%etc/man.d/cyrus-imapd.conf @dirrm cyrus/bin @dirrm include/cyrus @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP