Rename option PAM to pam (so all options are lower case). Backwards

compatibility provided via PKG_OPTIONS_LEGACY_OPTS.

17 files changed, 53 insertions, 51 deletions

diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index a95a5341294..6d6d5f2ef6b 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2005/05/31 10:01:36 dillo Exp $
+# $NetBSD: options.mk,v 1.9 2005/05/31 11:24:32 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd2
-PKG_SUPPORTED_OPTIONS=	db mysql pgsql ldap PAM
+PKG_SUPPORTED_OPTIONS=	db mysql pgsql ldap pam
 PKG_SUGGESTED_OPTIONS=	mysql
 
 .include "../../mk/bsd.options.mk"
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=        --enable-ldap
 .  include "../../databases/openldap/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=        --enable-pam
 .  include "../../mk/pam.buildlink3.mk"
 .endif
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 8869f2b8ef8..7c8655b988b 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/16 01:15:30 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/31 11:24:32 dillo Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -26,10 +26,10 @@ BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 #.include "../../mk/dlopen.buildlink3.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql73-server
-PKG_SUPPORTED_OPTIONS=	PAM
+PKG_SUPPORTED_OPTIONS=	pam
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index d093ca836da..5196268ed9a 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/31 11:24:32 dillo Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -26,10 +26,10 @@ BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 #.include "../../mk/dlopen.buildlink3.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql74-server
-PKG_SUPPORTED_OPTIONS=	PAM
+PKG_SUPPORTED_OPTIONS=	pam
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 113f01969d7..1b3ea933104 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 20:34:44 recht Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/31 11:24:32 dillo Exp $
 
 PKGNAME=		postgresql80-server-${BASE_VERS}
 COMMENT=		PostgreSQL database server programs
@@ -20,10 +20,10 @@ BUILD_DIRS+=		${WRKSRC}/src/timezone
 BUILD_DIRS+=		${WRKSRC}/src/pl
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql80-server
-PKG_SUPPORTED_OPTIONS=	PAM
+PKG_SUPPORTED_OPTIONS=	pam
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index 3d8eb9ef999..b9b5286ac0e 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.7 2005/05/31 10:01:40 dillo Exp $
+# $NetBSD: obsolete.mk,v 1.8 2005/05/31 11:24:33 dillo Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -53,3 +53,5 @@ PKG_OPTIONS_LEGACY_VARS+=	USE_SJ3:sj3
 PKG_OPTIONS_LEGACY_VARS+=	USE_SSL:ssl
 PKG_OPTIONS_LEGACY_VARS+=	USE_WNN4:wnn4
 PKG_OPTIONS_LEGACY_VARS+=	USE_XFACE:xface
+
+PKG_OPTIONS_LEGACY_OPTS+=	PAM:pam
diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk
index e864655ca6b..5b61a27e42e 100644
--- a/net/ja-samba/options.mk
+++ b/net/ja-samba/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.2 2005/05/03 15:40:30 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 11:24:32 dillo Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ja-samba
-PKG_SUPPORTED_OPTIONS=	PAM cups ldap
+PKG_SUPPORTED_OPTIONS=	pam cups ldap
 .include "../../mk/bsd.options.mk"
 
 ###
 ### Support PAM authentication.
 ###
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 506dc43495f..3d58e222d53 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/25 22:09:39 gendalia Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/31 11:24:32 dillo Exp $
 
 DISTNAME=	openafs-1.3.82-src
 PKGNAME=	${DISTNAME:C/-src//}
@@ -20,11 +20,11 @@ USE_GNU_CONFIGURE_HOST= no
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
-PKG_SUPPORTED_OPTIONS = PAM
+PKG_SUPPORTED_OPTIONS = pam
 PKG_OPTIONS_VAR       = PKG_OPTIONS.openafs
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=        --enable-pam
 .include "../../mk/pam.buildlink3.mk"
 PLIST_SRC+=		${.CURDIR}/PLIST.pam
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index c61409173fe..689b40a344c 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/31 11:24:32 dillo Exp $
 
 DISTNAME=	proftpd-1.2.10
 PKGREVISION=	1
@@ -29,7 +29,7 @@ RCD_SCRIPTS=	proftpd
 CONF_FILES=	${PREFIX}/share/examples/proftpd/basic.conf \
 		${PKG_SYSCONFDIR}/proftpd.conf
 
-PKG_SUPPORTED_OPTIONS = PAM wrap quota pgsql
+PKG_SUPPORTED_OPTIONS = pam wrap quota pgsql
 PKG_OPTIONS_VAR       = PKG_OPTIONS.proftpd
 
 # This (or something like this must be in mk/bsd.options.mk) to allow 
@@ -38,7 +38,7 @@ PKG_OPTIONS_VAR       = PKG_OPTIONS.proftpd
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=	--enable-auth-pam
 .include "../../mk/pam.buildlink3.mk"
 .endif
diff --git a/net/samba/options.mk b/net/samba/options.mk
index b27199b7237..2018ee42f25 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.5 2004/11/17 19:56:49 xtraeme Exp $
+# $NetBSD: options.mk,v 1.6 2005/05/31 11:24:32 dillo Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba
-PKG_SUPPORTED_OPTIONS=	PAM ads cups ldap ldap-compat
+PKG_SUPPORTED_OPTIONS=	pam ads cups ldap ldap-compat
 .include "../../mk/bsd.options.mk"
 
 ###
 ### Support PAM authentication and build smbpass and winbind PAM modules.
 ###
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../security/PAM/module.mk"
 CONFIGURE_ARGS+=	--with-pam
 CONFIGURE_ARGS+=	--with-pam_smbpass
diff --git a/net/samba2/options.mk b/net/samba2/options.mk
index 3d8ebcb8081..0697c907db3 100644
--- a/net/samba2/options.mk
+++ b/net/samba2/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 11:24:32 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba2
-PKG_SUPPORTED_OPTIONS=	PAM cups ldap-compat
+PKG_SUPPORTED_OPTIONS=	pam cups ldap-compat
 PKG_OPTIONS_LEGACY_VARS+=	USE_OPENLDAP:ldap-compat
 
 .include "../../mk/bsd.options.mk"
@@ -9,7 +9,7 @@ PKG_OPTIONS_LEGACY_VARS+=	USE_OPENLDAP:ldap-compat
 ###
 ### Support PAM authentication.
 ###
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
diff --git a/print/cups/Makefile b/print/cups/Makefile
index d485ae53450..c0753c3e24f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2005/05/22 20:08:27 jlam Exp $
+# $NetBSD: Makefile,v 1.93 2005/05/31 11:24:32 dillo Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -54,10 +54,10 @@ CONFIGURE_ENV+=		DSOFLAGS="${LDFLAGS}"
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
-PKG_SUPPORTED_OPTIONS=	PAM
+PKG_SUPPORTED_OPTIONS=	pam
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-pam
 MESSAGE_SRC=		${PKGDIR}/MESSAGE
@@ -135,7 +135,7 @@ post-install:
 			;;						\
 		esac;							\
 	done
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR}
 .endif
 
diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk
index 52be7c1d4d8..27ab8a77984 100644
--- a/security/courier-authlib/options.mk
+++ b/security/courier-authlib/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:39 dillo Exp $
+# $NetBSD: options.mk,v 1.5 2005/05/31 11:24:32 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authlib
-PKG_SUPPORTED_OPTIONS=	PAM bdb ldap mysql pgsql
+PKG_SUPPORTED_OPTIONS=	pam bdb ldap mysql pgsql
 PKG_SUGGESTED_OPTIONS=	bdb
 
 .include "../../mk/bsd.options.mk"
@@ -15,7 +15,7 @@ AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthshadow.la
 ###
 ### PAM authentication
 ###
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-authpam
 AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthpam.la
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 184603aafe5..09802b75bfd 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.5 2005/01/14 05:15:40 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2005/05/31 11:24:33 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
-PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap gssapi
+PKG_SUPPORTED_OPTIONS=	pam kerberos ldap gssapi
 .include "../../mk/bsd.options.mk"
 
 ###
 ### PAM (Pluggable Authentication Mechanism)
 ###
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
 .endif
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 70d0c5ca6c6..5fdb5e049e4 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/28 14:11:13 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/31 11:24:33 dillo Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -74,10 +74,10 @@ CPPFLAGS+=		-I/usr/include/krb5 -I/usr/include/kerberosIV
 # XXX: why yet.  For the moment, disable PAM authentication.
 #
 #PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh+gssapi
-#PKG_SUPPORTED_OPTIONS=	PAM
+#PKG_SUPPORTED_OPTIONS=	pam
 #.include "../../mk/bsd.options.mk"
 #
-#.if !empty(PKG_OPTIONS:MPAM)
+#.if !empty(PKG_OPTIONS:Mpam)
 #.  include "../../mk/pam.buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-pam
 #PLIST_SRC+=		${.CURDIR}/PLIST.pam
@@ -154,7 +154,7 @@ post-install:
 	cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do			\
 		${INSTALL_DATA} $${file}.out ${EGDIR}/$${file};		\
 	done
-#.if defined(USE_PAM)
+#.if !empty(PKT_OPTIONS:Mpam)
 #	${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.freebsd ${EGDIR}/sshd.pam
 #.endif
 
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index 3d39929061d..14625acacca 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/01/14 05:15:40 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 11:24:33 dillo Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh
 PKG_SUPPORTED_OPTIONS=	kerberos hpn-patch
 
 .if !empty(OPSYS:MLinux)
-PKG_SUPPORTED_OPTIONS+= PAM
+PKG_SUPPORTED_OPTIONS+= pam
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -22,7 +22,7 @@ PATCH_SITES=		http://www.psc.edu/networking/projects/hpn-ssh/
 PATCH_DIST_STRIP=	-p1
 .endif
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 # XXX: PAM authentication causes memory faults, and haven't tracked down
 # XXX: why yet.  For the moment, disable PAM authentication for non-Linux.
 .include "../../mk/pam.buildlink3.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 48cfff0f670..aa72e73ee62 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2005/04/26 20:20:32 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2005/05/31 11:24:33 dillo Exp $
 #
 
 DISTNAME=	gdm-2.6.0.9
@@ -27,7 +27,7 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm
-PKG_SUPPORTED_OPTIONS=	inet6 PAM
+PKG_SUPPORTED_OPTIONS=	inet6 pam
 .include "../../mk/bsd.options.mk"
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	X_SERVER_ARGS="vt05"
 .endif
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-authentication-scheme=pam
 .  if ${PAM_TYPE} == "linux-pam"
diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile
index cc267ee9dbe..11018b9cde6 100644
--- a/x11/gdm1/Makefile
+++ b/x11/gdm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:06 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/31 11:24:33 dillo Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	7
@@ -61,10 +61,10 @@ GDMGRP=		daemon
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm1
-PKG_SUPPORTED_OPTIONS=	PAM
+PKG_SUPPORTED_OPTIONS=	pam
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 .else
 SUBST_CLASSES+=		pam