Date: Tue, 30 Jan 2024 17:27:28 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f139e51116d4 - main - *: Move manpages to share/man Message-ID: <202401301727.40UHRSrH016876@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f139e51116d4b6b17d6641d39ad8650309322840 commit f139e51116d4b6b17d6641d39ad8650309322840 Author: Helge Oldach <freebsd@oldach.net> AuthorDate: 2024-01-30 17:21:33 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-01-30 17:26:53 +0000 *: Move manpages to share/man Approved by: portmgr (blanket) --- mail/metamail/Makefile | 3 +++ mail/metamail/pkg-plist | 40 ++++++++++++++++++++-------------------- mail/milter-greylist/Makefile | 6 ++++-- mail/milter-greylist/pkg-plist | 4 ++-- mail/procmail/Makefile | 4 ++-- mail/procmail/pkg-plist | 12 ++++++------ net-mgmt/flowd/Makefile | 3 ++- net-mgmt/flowd/pkg-plist | 6 +++--- security/openvpn-devel/Makefile | 3 ++- security/openvpn-devel/pkg-plist | 4 ++-- security/openvpn/Makefile | 3 ++- security/openvpn/pkg-plist | 4 ++-- 12 files changed, 50 insertions(+), 42 deletions(-) diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index d0132de24200..e649421c1482 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -32,6 +32,9 @@ X11_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile-nox11 post-patch-X11-off: @${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile +post-patch: + @${REINPLACE_CMD} -e '/^MAN.DIR/s,/man,/share/man,' ${WRKSRC}/Makefile + post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/mailcap \ ${STAGEDIR}${PREFIX}/etc/mailcap.sample diff --git a/mail/metamail/pkg-plist b/mail/metamail/pkg-plist index abeebead1c9e..163ba8737fb2 100644 --- a/mail/metamail/pkg-plist +++ b/mail/metamail/pkg-plist @@ -30,23 +30,23 @@ bin/sun2mime %%X11%%lib/metamail/fonts/fonts.dir %%X11%%lib/metamail/fonts/fonts.alias @sample etc/mailcap.sample -man/man1/audiocompose.1.gz -man/man1/audiosend.1.gz -man/man1/extcompose.1.gz -man/man1/getfilename.1.gz -man/man1/mailto-hebrew.1.gz -man/man1/mailto.1.gz -man/man1/metamail.1.gz -man/man1/metasend.1.gz -man/man1/mime.1.gz -man/man1/mimencode.1.gz -man/man1/mmencode.1.gz -man/man1/patch-metamail.1.gz -man/man1/richtext.1.gz -man/man1/showaudio.1.gz -man/man1/showexternal.1.gz -man/man1/shownonascii.1.gz -man/man1/showpartial.1.gz -man/man1/showpicture.1.gz -man/man1/splitmail.1.gz -man/man4/mailcap.4.gz +share/man/man1/audiocompose.1.gz +share/man/man1/audiosend.1.gz +share/man/man1/extcompose.1.gz +share/man/man1/getfilename.1.gz +share/man/man1/mailto-hebrew.1.gz +share/man/man1/mailto.1.gz +share/man/man1/metamail.1.gz +share/man/man1/metasend.1.gz +share/man/man1/mime.1.gz +share/man/man1/mimencode.1.gz +share/man/man1/mmencode.1.gz +share/man/man1/patch-metamail.1.gz +share/man/man1/richtext.1.gz +share/man/man1/showaudio.1.gz +share/man/man1/showexternal.1.gz +share/man/man1/shownonascii.1.gz +share/man/man1/showpartial.1.gz +share/man/man1/showpicture.1.gz +share/man/man1/splitmail.1.gz +share/man/man4/mailcap.4.gz diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 314bd92b18d3..cc9196e8decc 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -1,5 +1,6 @@ PORTNAME= milter-greylist PORTVERSION= 4.6.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \ http://fossies.org/unix/privat/ @@ -63,6 +64,7 @@ LDAP_USES= ldap LIBS+= -lpthread GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --with-user=mailnull \ --with-libmilter=${MILTERBASE} \ --enable-dnsrbl \ @@ -78,9 +80,9 @@ PORTEXAMPLES= greylist.conf do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail ${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 \ - ${STAGEDIR}${PREFIX}/man/man5/ + ${STAGEDIR}${PREFIX}/share/man/man5/ ${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 \ - ${STAGEDIR}${PREFIX}/man/man8/ + ${STAGEDIR}${PREFIX}/share/man/man8/ ${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist \ ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_DATA} ${WRKSRC}/greylist.conf \ diff --git a/mail/milter-greylist/pkg-plist b/mail/milter-greylist/pkg-plist index cad49829bfb5..8191ebbcc60f 100644 --- a/mail/milter-greylist/pkg-plist +++ b/mail/milter-greylist/pkg-plist @@ -1,5 +1,5 @@ libexec/milter-greylist -man/man5/greylist.conf.5.gz -man/man8/milter-greylist.8.gz +share/man/man5/greylist.conf.5.gz +share/man/man8/milter-greylist.8.gz @sample etc/mail/greylist.conf.sample @dir(mailnull,mailnull,) /var/milter-greylist diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 13d7a1c50cd8..84e5196e2d53 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= procmail PORTVERSION= 3.22 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= mail MASTER_SITES= ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \ ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \ @@ -34,7 +34,7 @@ PORTEXAMPLES= 1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config.h ${WRKSRC}/src/autoconf # Allow parallel builds (-jX) to work - @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|' + @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E -e 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|' -e '/^MANDIR/s|/man|/share/man|' post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${EXAMPLESDIR}/ diff --git a/mail/procmail/pkg-plist b/mail/procmail/pkg-plist index ea5728893183..7c8a5f9c3e2c 100644 --- a/mail/procmail/pkg-plist +++ b/mail/procmail/pkg-plist @@ -2,9 +2,9 @@ bin/formail @(,mail,2755) bin/lockfile bin/mailstat @(,mail,6755) bin/procmail -man/man1/formail.1.gz -man/man1/lockfile.1.gz -man/man1/procmail.1.gz -man/man5/procmailex.5.gz -man/man5/procmailrc.5.gz -man/man5/procmailsc.5.gz +share/man/man1/formail.1.gz +share/man/man1/lockfile.1.gz +share/man/man1/procmail.1.gz +share/man/man5/procmailex.5.gz +share/man/man5/procmailrc.5.gz +share/man/man5/procmailsc.5.gz diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index f24a74f87fcd..408ba8a61a1e 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -1,6 +1,6 @@ PORTNAME= flowd PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= http://mindrot.org/files/flowd/ @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake shebangfix SHEBANG_FILES= tools/*.pl GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --localstatedir=/var USE_RC_SUBR= flowd PORTDOCS= README INSTALL diff --git a/net-mgmt/flowd/pkg-plist b/net-mgmt/flowd/pkg-plist index 8a5765dede69..cd3b2009b4c4 100644 --- a/net-mgmt/flowd/pkg-plist +++ b/net-mgmt/flowd/pkg-plist @@ -11,9 +11,9 @@ lib/libflowd.a %%PERL%%%%PERL5_MAN3%%/Flowd.3.gz %%PERL%%%%SITE_ARCH%%/Flowd.pm %%PERL%%%%SITE_ARCH%%/auto/Flowd/Flowd.so -man/man5/flowd.conf.5.gz -man/man8/flowd-reader.8.gz -man/man8/flowd.8.gz +share/man/man5/flowd.conf.5.gz +share/man/man8/flowd-reader.8.gz +share/man/man8/flowd.8.gz sbin/flowd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.tools %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowinsert.pl diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index ac8f7cbb130d..3badb46a3ec5 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= openvpn DISTVERSION= g20231109 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security net net-vpn PKGNAMESUFFIX= -devel @@ -30,6 +30,7 @@ SHEBANG_FILES= sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/verify-cn GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" diff --git a/security/openvpn-devel/pkg-plist b/security/openvpn-devel/pkg-plist index d989a73fcc38..0f61a65b38a2 100644 --- a/security/openvpn-devel/pkg-plist +++ b/security/openvpn-devel/pkg-plist @@ -2,8 +2,8 @@ include/openvpn-msg.h include/openvpn-plugin.h lib/openvpn/plugins/openvpn-plugin-auth-pam.so lib/openvpn/plugins/openvpn-plugin-down-root.so -man/man5/openvpn-examples.5.gz -man/man8/openvpn.8.gz +share/man/man5/openvpn-examples.5.gz +share/man/man8/openvpn.8.gz sbin/openvpn libexec/openvpn-client.down libexec/openvpn-client.up diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index e05870b5b11c..3179ddf1be34 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -1,6 +1,6 @@ PORTNAME= openvpn DISTVERSION= 2.6.8 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ \ @@ -25,6 +25,7 @@ SHEBANG_FILES= sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/verify-cn GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --enable-strict --with-crypto-library=openssl # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist index d247b39c1eed..a91ef85f2ee3 100644 --- a/security/openvpn/pkg-plist +++ b/security/openvpn/pkg-plist @@ -4,7 +4,7 @@ lib/openvpn/plugins/openvpn-plugin-auth-pam.so lib/openvpn/plugins/openvpn-plugin-down-root.so libexec/openvpn-client.down libexec/openvpn-client.up -man/man5/openvpn-examples.5.gz -man/man8/openvpn.8.gz +share/man/man5/openvpn-examples.5.gz +share/man/man8/openvpn.8.gz sbin/openvpn sbin/openvpn-client
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401301727.40UHRSrH016876>