- Install saslauthd.mdoc to ${PREFIX}/man/man8/saslauthd.8.

- Use ${BDB_LIB_DIR}.

PR:		ports/127809
Submitted by:	"Scot W. Hetzel" <swhetzel__at__gmail.com>

4 files changed, 11 insertions, 8 deletions

diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index babbca15e653..54e2f52300d9 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	saslauthd
 PORTVERSION=	2.1.22
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
@@ -27,6 +27,8 @@ PATCHDIR=	${CYRUS_SASL2_DIR}/files
 INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/saslauthd
 DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
+MAN8=		saslauthd.8
+
 USE_RC_SUBR=	saslauthd.sh
 
 USE_OPENSSL=	yes
@@ -50,7 +52,9 @@ OPTIONS=	BDB		"Use Berkeley DB"			off \
 
 .if defined(WITH_BDB)
 USE_BDB=	yes
-CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
+INVALID_BDB_VER=2
+CONFIGURE_ARGS+=--with-dblib=berkeley \
+		--with-bdb-libdir=${BDB_LIB_DIR} \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 .else
@@ -118,7 +122,6 @@ PLIST_SUB=	PREFIX=${PREFIX} \
 SUB_LIST+=	SASLAUTHD_RUNPATH=${SASLAUTHD_RUNPATH}
 
 do-build:
-	@${RM} -f ${WRKSRC}/saslauthd/saslauthd.8
 	cd ${WRKSRC}/include && ${MAKE}
 	cd ${WRKSRC}/sasldb && ${MAKE}
 	cd ${WRKSRC}/saslauthd && ${MAKE}
@@ -130,11 +133,10 @@ post-install:
 		${PREFIX}/sbin/saslcache
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \
 		${PREFIX}/sbin/testsaslauthd
-	${GZIP_CMD} ${MAN8PREFIX}/man/cat8/saslauthd.8
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "SASLAUTHD_RUNPATH was specified."
-	@${ECHO_MSG} "Make sure to have ${SASLAUTHD_RUNPATH} by yourself."
+	@${ECHO_MSG} "Make sure you create ${SASLAUTHD_RUNPATH}."
 	@${ECHO_MSG} ""
 .else
 	${MKDIR} -m 770 ${SASLAUTHD_RUNPATH}
diff --git a/security/cyrus-sasl2-saslauthd/pkg-plist b/security/cyrus-sasl2-saslauthd/pkg-plist
index 76348f502181..146a07ef8676 100644
--- a/security/cyrus-sasl2-saslauthd/pkg-plist
+++ b/security/cyrus-sasl2-saslauthd/pkg-plist
@@ -1,4 +1,3 @@
-man/cat8/saslauthd.8.gz
 sbin/saslauthd
 sbin/saslcache
 sbin/testsaslauthd
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index ad0ec9b9bd7c..0be78af297bd 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -73,7 +73,9 @@ OPTIONS=	BDB		"Use Berkeley DB"			off \
 
 .if defined(WITH_BDB)
 USE_BDB=	yes
-CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
+INVALID_BDB_VER=2
+CONFIGURE_ARGS+=--with-dblib=berkeley \
+		--with-bdb-libdir=${BDB_LIB_DIR} \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 SASLDB_NAME=	sasldb2
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
index 9ae3cebc9b68..2195348b60ff 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
+++ b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
@@ -7,7 +7,7 @@ diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
  install-data-local: saslauthd.8
  	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
 -	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
++	$(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT: