security/cyrus-sasl2{,-saslauthd}: Move manpages to ${PREFIX}/share

5 files changed, 53 insertions, 51 deletions

diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index e9b3c9318ef6..da27f93957f9 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -1,3 +1,4 @@
+PORTREVISION=	1
 PKGNAMESUFFIX=	-saslauthd
 
 COMMENT=	SASL authentication server for cyrus-sasl2
diff --git a/security/cyrus-sasl2-saslauthd/pkg-plist b/security/cyrus-sasl2-saslauthd/pkg-plist
index 4ea4bf02d6c3..4714e4dc8ecf 100644
--- a/security/cyrus-sasl2-saslauthd/pkg-plist
+++ b/security/cyrus-sasl2-saslauthd/pkg-plist
@@ -1,5 +1,5 @@
-man/man8/saslauthd.8.gz
-man/man8/testsaslauthd.8.gz
+share/man/man8/saslauthd.8.gz
+share/man/man8/testsaslauthd.8.gz
 sbin/saslauthd
 sbin/saslcache
 sbin/testsaslauthd
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 84846850b570..878b355ac8a8 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 WWW=		https://www.cyrusimap.org/sasl/
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 4295be597e48..96f8da2e87e6 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -11,9 +11,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES+=		gmake
 USE_LDCONFIG=	yes
 USES+=		ssl
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \
+CONFIGURE_ARGS+=--mandir=${PREFIX}/share/man \
+		--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${SASLDB_DIR}/sasldb2 \
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index bb5d4ceb8808..b9a51a32d4b0 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -56,52 +56,52 @@ lib/libsasl2.so.3.0.0
 %%SASLDB%%lib/sasl2/libsasldb.so.3
 %%SASLDB%%lib/sasl2/libsasldb.so.3.0.0
 libdata/pkgconfig/libsasl2.pc
-man/man3/sasl.3.gz
-man/man3/sasl_authorize_t.3.gz
-man/man3/sasl_auxprop.3.gz
-man/man3/sasl_auxprop_getctx.3.gz
-man/man3/sasl_auxprop_request.3.gz
-man/man3/sasl_callbacks.3.gz
-man/man3/sasl_canon_user_t.3.gz
-man/man3/sasl_chalprompt_t.3.gz
-man/man3/sasl_checkapop.3.gz
-man/man3/sasl_checkpass.3.gz
-man/man3/sasl_client_init.3.gz
-man/man3/sasl_client_new.3.gz
-man/man3/sasl_client_start.3.gz
-man/man3/sasl_client_step.3.gz
-man/man3/sasl_decode.3.gz
-man/man3/sasl_dispose.3.gz
-man/man3/sasl_done.3.gz
-man/man3/sasl_encode.3.gz
-man/man3/sasl_encodev.3.gz
-man/man3/sasl_errdetail.3.gz
-man/man3/sasl_errors.3.gz
-man/man3/sasl_errstring.3.gz
-man/man3/sasl_getconfpath_t.3.gz
-man/man3/sasl_getopt_t.3.gz
-man/man3/sasl_getpath_t.3.gz
-man/man3/sasl_getprop.3.gz
-man/man3/sasl_getrealm_t.3.gz
-man/man3/sasl_getsecret_t.3.gz
-man/man3/sasl_getsimple_t.3.gz
-man/man3/sasl_global_listmech.3.gz
-man/man3/sasl_idle.3.gz
-man/man3/sasl_listmech.3.gz
-man/man3/sasl_log_t.3.gz
-man/man3/sasl_server_init.3.gz
-man/man3/sasl_server_new.3.gz
-man/man3/sasl_server_start.3.gz
-man/man3/sasl_server_step.3.gz
-man/man3/sasl_server_userdb_checkpass_t.3.gz
-man/man3/sasl_server_userdb_setpass_t.3.gz
-man/man3/sasl_setpass.3.gz
-man/man3/sasl_setprop.3.gz
-man/man3/sasl_user_exists.3.gz
-man/man3/sasl_verifyfile_t.3.gz
-man/man8/pluginviewer.8.gz
-%%SASLDB%%man/man8/sasldblistusers2.8.gz
-%%SASLDB%%man/man8/saslpasswd2.8.gz
+share/man/man3/sasl.3.gz
+share/man/man3/sasl_authorize_t.3.gz
+share/man/man3/sasl_auxprop.3.gz
+share/man/man3/sasl_auxprop_getctx.3.gz
+share/man/man3/sasl_auxprop_request.3.gz
+share/man/man3/sasl_callbacks.3.gz
+share/man/man3/sasl_canon_user_t.3.gz
+share/man/man3/sasl_chalprompt_t.3.gz
+share/man/man3/sasl_checkapop.3.gz
+share/man/man3/sasl_checkpass.3.gz
+share/man/man3/sasl_client_init.3.gz
+share/man/man3/sasl_client_new.3.gz
+share/man/man3/sasl_client_start.3.gz
+share/man/man3/sasl_client_step.3.gz
+share/man/man3/sasl_decode.3.gz
+share/man/man3/sasl_dispose.3.gz
+share/man/man3/sasl_done.3.gz
+share/man/man3/sasl_encode.3.gz
+share/man/man3/sasl_encodev.3.gz
+share/man/man3/sasl_errdetail.3.gz
+share/man/man3/sasl_errors.3.gz
+share/man/man3/sasl_errstring.3.gz
+share/man/man3/sasl_getconfpath_t.3.gz
+share/man/man3/sasl_getopt_t.3.gz
+share/man/man3/sasl_getpath_t.3.gz
+share/man/man3/sasl_getprop.3.gz
+share/man/man3/sasl_getrealm_t.3.gz
+share/man/man3/sasl_getsecret_t.3.gz
+share/man/man3/sasl_getsimple_t.3.gz
+share/man/man3/sasl_global_listmech.3.gz
+share/man/man3/sasl_idle.3.gz
+share/man/man3/sasl_listmech.3.gz
+share/man/man3/sasl_log_t.3.gz
+share/man/man3/sasl_server_init.3.gz
+share/man/man3/sasl_server_new.3.gz
+share/man/man3/sasl_server_start.3.gz
+share/man/man3/sasl_server_step.3.gz
+share/man/man3/sasl_server_userdb_checkpass_t.3.gz
+share/man/man3/sasl_server_userdb_setpass_t.3.gz
+share/man/man3/sasl_setpass.3.gz
+share/man/man3/sasl_setprop.3.gz
+share/man/man3/sasl_user_exists.3.gz
+share/man/man3/sasl_verifyfile_t.3.gz
+share/man/man8/pluginviewer.8.gz
+%%SASLDB%%share/man/man8/sasldblistusers2.8.gz
+%%SASLDB%%share/man/man8/saslpasswd2.8.gz
 sbin/pluginviewer
 %%SASLDB%%sbin/sasldblistusers2
 %%SASLDB%%sbin/saslpasswd2