From nobody@FreeBSD.org  Sun Jul  7 12:43:31 2013
Return-Path: <nobody@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 9CDB7181
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  7 Jul 2013 12:43:31 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 74C121313
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  7 Jul 2013 12:43:31 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r67ChUZh037381
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 7 Jul 2013 12:43:30 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r67ChUit037376;
	Sun, 7 Jul 2013 12:43:30 GMT
	(envelope-from nobody)
Message-Id: <201307071243.r67ChUit037376@oldred.freebsd.org>
Date: Sun, 7 Jul 2013 12:43:30 GMT
From: Panagiotis Christias <p.christias@noc.ntua.gr>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] mail/cyrus-imapd24: add Cyrus man pages to manpath
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180363
>Category:       ports
>Synopsis:       [patch] mail/cyrus-imapd24: add Cyrus man pages to manpath
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ume
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 07 12:50:00 UTC 2013
>Closed-Date:    Mon Jul 15 19:48:03 UTC 2013
>Last-Modified:  Mon Jul 15 19:50:00 UTC 2013
>Originator:     Panagiotis Christias
>Release:        9.1
>Organization:
NTUA NOC
>Environment:
FreeBSD builder9-amd64.noc.ntua.gr 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Tue Jun  4 00:49:39 EEST 2013     root@gaia.noc.ntua.gr:/usr/obj/usr/src/sys/NTUA  amd64
>Description:
FreeBSD 9.0 and newer use /usr/local/etc/man.d for local configuration files, see man(1). It can be used to easily add Cyrus man pages to manpath.
>How-To-Repeat:

>Fix:
See attached patch file (based on lang/perl5.14 port).

Patch attached with submission follows:

diff -ruN cyrus-imapd24.orig/Makefile cyrus-imapd24/Makefile
--- cyrus-imapd24.orig/Makefile	2013-06-12 16:26:53.000000000 +0300
+++ cyrus-imapd24/Makefile	2013-07-07 15:14:38.000000000 +0300
@@ -159,6 +159,12 @@
 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,8 @@
 			${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
@@ -282,5 +290,8 @@
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
+.if ${OSVERSION} >= 900022
+		@${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf ${PREFIX}/etc/man.d/cyrus-imapd.conf
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN cyrus-imapd24.orig/files/cyrus-imapd-man.conf cyrus-imapd24/files/cyrus-imapd-man.conf
--- cyrus-imapd24.orig/files/cyrus-imapd-man.conf	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd24/files/cyrus-imapd-man.conf	2013-07-07 14:26:26.000000000 +0300
@@ -0,0 +1 @@
+MANPATH %%PREFIX%%/cyrus/man
diff -ruN cyrus-imapd24.orig/pkg-plist cyrus-imapd24/pkg-plist
--- cyrus-imapd24.orig/pkg-plist	2012-07-14 16:54:48.000000000 +0300
+++ cyrus-imapd24/pkg-plist	2013-07-07 15:05:55.000000000 +0300
@@ -108,6 +108,7 @@
 %%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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ume 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 7 12:50:13 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180363 
State-Changed-From-To: open->closed 
State-Changed-By: ume 
State-Changed-When: Mon Jul 15 19:47:31 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180363 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180363: commit references a PR
Date: Mon, 15 Jul 2013 19:45:47 +0000 (UTC)

 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 <p.christias__at__noc.ntua.gr>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
