Date: Sun, 7 Jul 2013 12:44:08 GMT From: Panagiotis Christias <p.christias@noc.ntua.gr> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180362: [patch] mail/cyrus-imapd23: add Cyrus man pages to manpath Message-ID: <201307071244.r67Ci8oj041791@oldred.freebsd.org> Resent-Message-ID: <201307071250.r67Co04Q088332@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180362 >Category: ports >Synopsis: [patch] mail/cyrus-imapd23: add Cyrus man pages to manpath >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jul 07 12:50:00 UTC 2013 >Closed-Date: >Last-Modified: >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-imapd23.orig/Makefile cyrus-imapd23/Makefile --- cyrus-imapd23.orig/Makefile 2013-06-12 16:00:55.000000000 +0300 +++ cyrus-imapd23/Makefile 2013-07-07 14:48:40.000000000 +0300 @@ -171,6 +171,12 @@ PLIST_SUB+= LDAP_PTLOADER="@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 @@ -230,6 +236,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 @@ -289,5 +297,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-imapd23.orig/files/cyrus-imapd-man.conf cyrus-imapd23/files/cyrus-imapd-man.conf --- cyrus-imapd23.orig/files/cyrus-imapd-man.conf 1970-01-01 02:00:00.000000000 +0200 +++ cyrus-imapd23/files/cyrus-imapd-man.conf 2013-07-07 14:26:26.000000000 +0300 @@ -0,0 +1 @@ +MANPATH %%PREFIX%%/cyrus/man diff -ruN cyrus-imapd23.orig/pkg-plist cyrus-imapd23/pkg-plist --- cyrus-imapd23.orig/pkg-plist 2012-07-14 16:54:48.000000000 +0300 +++ cyrus-imapd23/pkg-plist 2013-07-07 14:48:13.000000000 +0300 @@ -107,6 +107,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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307071244.r67Ci8oj041791>