Date: Sun, 7 Jul 2013 12:43:30 GMT From: Panagiotis Christias <p.christias@noc.ntua.gr> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180363: [patch] mail/cyrus-imapd24: add Cyrus man pages to manpath Message-ID: <201307071243.r67ChUit037376@oldred.freebsd.org> Resent-Message-ID: <201307071250.r67Co0j7088396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180363
>Category: ports
>Synopsis: [patch] mail/cyrus-imapd24: 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-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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307071243.r67ChUit037376>