Avoid possibly linking everything against -lintl when PostgreSQL

support is built into courier-authlib -- -lintl is only needed by the
authpgsql authentication module.  This avoids problems when linking
clients with -lcourierauth and the linker thinks -lintl is needed when
it really doesn't.  Bump the PKGREVISION to 3.

4 files changed, 23 insertions, 8 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 659808e9a47..a30aa2fd13f 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/02/26 22:14:01 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/18 20:20:48 jlam Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	courier-authlib-0.54
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index f3f5e6ba268..0270727c0f7 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:05 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/18 20:20:48 jlam Exp $
 
 SHA1 (courier-authlib-0.54.tar.bz2) = a13765f0eaaf93cb937dcd371ed65045f4c3bc44
 RMD160 (courier-authlib-0.54.tar.bz2) = d90509f68f4be6201542ef7e30b2870da779d9f5
 Size (courier-authlib-0.54.tar.bz2) = 1966155 bytes
 SHA1 (patch-aa) = ef333fefd1331d577d9fdad50d7dcc6e28283d58
-SHA1 (patch-ab) = 9a7d3901ce0628e34e2b69ddc77fb613653e0c2a
+SHA1 (patch-ab) = 350254052c0ad63b75cf81e1dab752a78ae3843f
diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk
index da50bd96df5..be704f3978e 100644
--- a/security/courier-authlib/options.mk
+++ b/security/courier-authlib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/02/26 22:14:01 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/03/18 20:20:48 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS=	PAM bdb ldap mysql pgsql
@@ -87,11 +87,17 @@ CONFIGURE_ARGS+=	--without-authmysql
 ### PostgreSQL authentication
 ###
 .if !empty(PKG_OPTIONS:Mpgsql)
+#
+# Prevent auto-adding gettext libraries to LIBS -- we only want them
+# used when we link with -lpq.
+#
+BROKEN_GETTEXT_DETECTION=	no
 .  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-authpgsql
+CONFIGURE_ENV+=		PGSQL_LIBS="${BUILDLINK_LDADD.${PGSQL_TYPE}}"
 AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthpgsql.la
 AUTHLIB_PLIST+=		${AUTHEXAMPLEDIR}/authpgsqlrc.dist
-AUTHLIB_PLIST+=		${AUTHDOCDIR}/authpostgres.html
+AUTHLIB_PLIST+=		${AUTHDOCDIR}/README.authpostgres.html
 GEN_FILES+=		authpgsqlrc
 POST_INSTALL_TARGETS+=	post-install-pgsql
 
diff --git a/security/courier-authlib/patches/patch-ab b/security/courier-authlib/patches/patch-ab
index f0da31f905f..200bdc88ed6 100644
--- a/security/courier-authlib/patches/patch-ab
+++ b/security/courier-authlib/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2005/02/18 22:12:43 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/18 20:20:48 jlam Exp $
 
---- configure.orig	2005-02-13 06:26:31.000000000 -0500
+--- configure.orig	2005-02-13 11:26:31.000000000 +0000
 +++ configure
+@@ -23766,7 +23766,7 @@ done
+ test -n "$PG_CONFIG" || PG_CONFIG="pg_config"
+ 
+ 
+-PGSQL_LIBS="-lpq"
++test -z "$PGSQL_LIBS" && PGSQL_LIBS="-lpq"
+ 
+ # Check whether --with-pgsql-libs or --without-pgsql-libs was given.
+ if test "${with_pgsql_libs+set}" = set; then
 @@ -25547,7 +25547,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
  
  result=""