Added support for gssapi and krb5 authentication as options

6 files changed, 54 insertions, 16 deletions

diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 7411af27350..08c0c681c61 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/01/22 20:12:11 adam Exp $
 
 PKGNAME=	postgresql82-server-${BASE_VERS}
 PKGREVISION=	1
@@ -46,7 +46,7 @@ DL_LIBS+=	-lltdl
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql82-server
-PKG_SUPPORTED_OPTIONS=	pam ldap
+PKG_SUPPORTED_OPTIONS=	krb5 pam ldap
 .include "../../databases/postgresql82/options.mk"
 
 # PGUSER	username of the database administrator
@@ -92,6 +92,6 @@ pre-build:
 		../../src/include/utils/fmgroids.h
 	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/port &&					\
-       	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql82/options.mk b/databases/postgresql82/options.mk
index 047fc88e519..4473be865b4 100644
--- a/databases/postgresql82/options.mk
+++ b/databases/postgresql82/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.2 2008/02/04 15:29:28 ghen Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/22 20:12:11 adam Exp $
 
 PKG_SUPPORTED_OPTIONS+=		# empty
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### PAM authentication for the PostgreSQL backend.
+### Kerberos5 authentication for the PostgreSQL backend.
 ###
-.if !empty(PKG_OPTIONS:Mpam)
-.  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam
+.if !empty(PKG_OPTIONS:Mkrb5)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-krb5
 .endif
 
 ###
@@ -19,3 +19,11 @@ CONFIGURE_ARGS+=	--with-pam
 .  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldap
 .endif
+
+###
+### PAM authentication for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam
+.endif
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 5fcdd530391..b139ca9cce9 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/01/21 12:45:28 adam Exp $
+# $NetBSD: Makefile,v 1.10 2010/01/22 20:12:11 adam Exp $
 
 PKGNAME=	postgresql83-server-${BASE_VERS}
 PKGREVISION=	2
@@ -47,7 +47,7 @@ DL_LIBS+=	-lltdl
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql83-server
-PKG_SUPPORTED_OPTIONS=	ldap pam
+PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam
 .include "../../databases/postgresql83/options.mk"
 
 # PGUSER	username of the database administrator
@@ -93,6 +93,6 @@ pre-build:
 		../../src/include/utils/fmgroids.h
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/port &&					\
-       	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql83/options.mk b/databases/postgresql83/options.mk
index 63e9278a5f7..78fbdb4ed92 100644
--- a/databases/postgresql83/options.mk
+++ b/databases/postgresql83/options.mk
@@ -1,10 +1,25 @@
-# $NetBSD: options.mk,v 1.2 2010/01/16 09:30:31 adam Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/22 20:12:11 adam Exp $
 
 PKG_SUPPORTED_OPTIONS+=		# empty
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### GSSAPI authentication for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mgssapi)
+CONFIGURE_ARGS+=	--with-gssapi
+.endif
+
+###
+### Kerberos5 authentication for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mkrb5)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-krb5
+.endif
+
+###
 ### LDAP authentication for the PostgreSQL backend.
 ###
 .if !empty(PKG_OPTIONS:Mldap)
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 477d3bae35a..1270c33e968 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/22 20:12:11 adam Exp $
 
 PKGNAME=	postgresql84-server-${BASE_VERS}
 PKGREVISION=	1
@@ -47,7 +47,7 @@ DL_LIBS+=	-lltdl
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql84-server
-PKG_SUPPORTED_OPTIONS=	ldap pam
+PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam
 .include "../../databases/postgresql84/options.mk"
 
 # PGUSER	username of the database administrator
@@ -87,6 +87,6 @@ post-wrapper:
 pre-build:
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/port &&					\
-       	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql84/options.mk b/databases/postgresql84/options.mk
index b30f68551f6..78fbdb4ed92 100644
--- a/databases/postgresql84/options.mk
+++ b/databases/postgresql84/options.mk
@@ -1,10 +1,25 @@
-# $NetBSD: options.mk,v 1.2 2010/01/16 09:16:12 adam Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/22 20:12:11 adam Exp $
 
 PKG_SUPPORTED_OPTIONS+=		# empty
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### GSSAPI authentication for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mgssapi)
+CONFIGURE_ARGS+=	--with-gssapi
+.endif
+
+###
+### Kerberos5 authentication for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mkrb5)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-krb5
+.endif
+
+###
 ### LDAP authentication for the PostgreSQL backend.
 ###
 .if !empty(PKG_OPTIONS:Mldap)