Instantly deprecate USE_PAM from pkgsrc as its value is being set from

within NetBSD-current's bsd.own.mk, which conflicts with its usage in
pkgsrc.  The package that use USE_PAM have been converted to use the
bsd.options.mk framework.  This should fix PR pkg/29257.

17 files changed, 153 insertions, 91 deletions

diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index fc001fc2d3e..bedd10561f1 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/02/05 14:49:03 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2005/02/07 11:35:41 jlam Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -25,7 +25,11 @@ BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 # XXX this breaks PostgreSQL server - see PR pkg/28729
 #.include "../../mk/dlopen.buildlink3.mk"
 
-.if defined(USE_PAM)
+PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql73-server
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.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 5b80718bf57..7a5897ab652 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/02/05 14:31:20 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2005/02/07 11:35:41 jlam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -24,7 +24,11 @@ BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 # XXX this breaks PostgreSQL server - see PR pkg/28729
 #.include "../../mk/dlopen.buildlink3.mk"
 
-.if defined(USE_PAM)
+PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql74-server
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.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 459a6044624..5802240ba01 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/02/06 13:21:45 taca Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/07 11:35:42 jlam Exp $
 
 PKGNAME=		postgresql80-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -19,8 +19,12 @@ CONFIGURE_ARGS+=	--with-openssl
 BUILD_DIRS=		${WRKSRC}/src/backend
 BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 
-.if defined(USE_PAM)
-.  include "../../security/PAM/buildlink3.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql80-server
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
+.  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
 
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index c3fe66dd2a4..7b95de832b5 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:44 reed Exp $
+# $NetBSD: Makefile,v 1.18 2005/02/07 11:35:42 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION=	1
@@ -15,6 +15,8 @@ USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
+PKG_OPTION_VAR=		PKG_OPTIONS.courier-auth
+
 .include "../courier-auth/Makefile.authdaemond"
 
 WRKSRC_FILES+=		imap/system-auth.authpam
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index 8beab8aef08..f81f8ea0522 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.authdaemond,v 1.14 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.15 2005/02/07 11:35:42 jlam Exp $
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
@@ -44,7 +44,10 @@ PATCHDIR=		${.CURDIR}/../courier-auth/patches
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 
 .include "../../mk/bdb.buildlink3.mk"
-.if defined(USE_PAM)
-BUILD_DEFS+=		USE_PAM
+
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
 .  include "../../mk/pam.buildlink3.mk"
 .endif
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index ed6a69ab6fe..b5953fb900d 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/02/07 11:35:44 jlam Exp $
 
 PKGNAME=	courier-authldap-${BASE_VERS}
 PKGREVISION=	1
@@ -8,6 +8,8 @@ CONFLICTS=	courier-imap-ldap-[0-9]*
 
 DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
 
+PKG_OPTION_VAR=	PKG_OPTIONS.courier-authldap
+
 .include "../courier-auth/Makefile.authdaemond"
 
 USE_PKGINSTALL=		yes
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index 91994ced090..8ed562c65bd 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/29 05:59:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2005/02/07 11:35:44 jlam Exp $
 
 PKGNAME=	courier-authmysql-${BASE_VERS}
 PKGREVISION=	1
@@ -6,6 +6,8 @@ COMMENT=	Courier MySQL authentication module
 
 DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
 
+PKG_OPTION_VAR=	PKG_OPTIONS.courier-authmysql
+
 .include "../courier-auth/Makefile.authdaemond"
 
 USE_PKGINSTALL=		yes
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index bc78b8f4593..cb28a42f618 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/07 11:35:44 jlam Exp $
 
 PKGNAME=	courier-authpgsql-${BASE_VERS}
 COMMENT=	Courier PostgreSQL authentication module
 
 DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
 
+PKG_OPTION_VAR=	PKG_OPTIONS.courier-authpgsql
+
 .include "../courier-auth/Makefile.authdaemond"
 
 USE_PKGINSTALL=		yes
diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index bda76ba6655..32c30dbdbc2 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.2 2004/11/17 23:28:12 jlam Exp $
+# $NetBSD: obsolete.mk,v 1.3 2005/02/07 11:35:41 jlam 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
@@ -54,9 +54,6 @@ PKG_DEFAULT_OPTIONS+=	ldap
 .if defined(USE_OSS)
 PKG_DEFAULT_OPTIONS+=	oss
 .endif
-.if defined(USE_PAM)
-PKG_DEFAULT_OPTIONS+=	PAM
-.endif
 .if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
 PKG_DEFAULT_OPTIONS+=	rsaref
 .endif
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 732d6ff92b3..1a04b1dbfd8 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/02/07 11:35:45 jlam Exp $
 
 .include "Makefile.common"
 
@@ -30,29 +30,8 @@ CFLAGS+=		-I${SSLBASE}/include/openssl	# ssl.h, err.h
 #
 CONFIGURE_ARGS+=	--with-included-gettext
 
-.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.  include "../../print/cups/buildlink3.mk"
-BUILD_DEFS+=		USE_CUPS
-CONFIGURE_ARGS+=	--enable-cups
-.endif
-
-.if defined(USE_PAM)
-.  include "../../mk/pam.buildlink3.mk"
-BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam
-.endif
-
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES"
-.  include "../../databases/openldap/buildlink3.mk"
-BUILD_DEFS+=		USE_OPENLDAP
-CONFIGURE_ARGS+=	--with-ldapsam
-PLIST_SUBST+=		SAMBA_LDAP=""
-.else
-PLIST_SUBST+=		SAMBA_LDAP="@comment "
-MESSAGE_SRC=		${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE.smbpasswd
-SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
-			${ROOT_USER} ${ROOT_GROUP} 0600
-.endif
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 # Microsoft DFS support
 CONFIGURE_ARGS+=	--with-msdfs
@@ -89,6 +68,9 @@ FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
 REPLACE_PERL=		script/findsmb.in
 
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
 # Remove irrelevant files for this package.
 post-extract:
 	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print |	\
@@ -127,7 +109,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
 		${PREFIX}/sbin/mksmbpasswd
 
-.include "../../devel/readline/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk
new file mode 100644
index 00000000000..afb0c3d7bf5
--- /dev/null
+++ b/net/ja-samba/options.mk
@@ -0,0 +1,38 @@
+# $NetBSD: options.mk,v 1.1 2005/02/07 11:35:45 jlam Exp $
+
+# Global and legacy options
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ja-samba
+PKG_SUPPORTED_OPTIONS=	PAM cups ldap
+.include "../../mk/bsd.options.mk"
+
+###
+### Support PAM authentication.
+###
+.if !empty(PKG_OPTIONS:MPAM)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam
+.endif
+
+###
+### Native CUPS support for printing
+###
+.if !empty(PKG_OPTIONS:Mcups)
+.  include "../../print/cups/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cups
+.endif
+
+###
+### Support Samba-2.x LDAP password and account databases.
+###
+.if !empty(PKG_OPTIONS:Mldap-compat)
+.  include "../../databases/openldap/buildlink3.mk"
+BUILD_DEFS+=		USE_OPENLDAP
+CONFIGURE_ARGS+=	--with-ldapsam
+PLIST_SUBST+=		SAMBA_LDAP=""
+.else   
+PLIST_SUBST+=		SAMBA_LDAP="@comment "
+MESSAGE_SRC=		${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE.smbpasswd
+SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endif
diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index 07e6cc34aa5..a2da6aa98ae 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/02/07 11:35:45 jlam Exp $
 
 .include "Makefile.common"
 PKGREVISION=		# empty1
@@ -21,29 +21,7 @@ CFLAGS+=		-I${SSLBASE}/include/openssl	# ssl.h, err.h
 
 REPLACE_PERL+=		script/findsmb.in
 
-.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink3.mk"
-BUILD_DEFS+=		USE_CUPS
-CONFIGURE_ARGS+=	--enable-cups
-.endif
-
-.if defined(USE_PAM)
-.include "../../mk/pam.buildlink3.mk"
-BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam
-.endif
-
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES"
-.include "../../databases/openldap/buildlink3.mk"
-BUILD_DEFS+=		USE_OPENLDAP
-CONFIGURE_ARGS+=	--with-ldapsam
-PLIST_SUBST+=		SAMBA_LDAP=""
-.else
-PLIST_SUBST+=		SAMBA_LDAP="@comment "
-MESSAGE_SRC=		${.CURDIR}/MESSAGE.smbpasswd
-SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
-			${ROOT_USER} ${ROOT_GROUP} 0600
-.endif
+.include "options.mk"
 
 # Microsoft DFS support
 CONFIGURE_ARGS+=	--with-msdfs
@@ -78,6 +56,9 @@ MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
 # Remove irrelevant files for this package.
 post-extract:
 	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print |	\
@@ -115,7 +96,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
 		${PREFIX}/sbin/mksmbpasswd
 
-.include "../../devel/readline/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba2/options.mk b/net/samba2/options.mk
new file mode 100644
index 00000000000..a23560c3c17
--- /dev/null
+++ b/net/samba2/options.mk
@@ -0,0 +1,40 @@
+# $NetBSD: options.mk,v 1.1 2005/02/07 11:35:46 jlam Exp $
+
+# Global and legacy options
+.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ldap-compat
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.samba2
+PKG_SUPPORTED_OPTIONS=	PAM cups ldap-compat
+.include "../../mk/bsd.options.mk"
+
+###
+### Support PAM authentication.
+###
+.if !empty(PKG_OPTIONS:MPAM)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam
+.endif
+
+###
+### Native CUPS support for printing
+###
+.if !empty(PKG_OPTIONS:Mcups)
+.  include "../../print/cups/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cups
+.endif
+
+###
+### Support Samba-2.x LDAP password and account databases.
+###
+.if !empty(PKG_OPTIONS:Mldap-compat)
+.  include "../../databases/openldap/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ldapsam
+PLIST_SUBST+=		SAMBA_LDAP=""
+.else   
+PLIST_SUBST+=		SAMBA_LDAP="@comment "
+MESSAGE_SRC=		${.CURDIR}/MESSAGE.smbpasswd
+SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endif
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 3e2c73cc1f2..aaf5e33bac5 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2005/01/19 11:03:23 drochner Exp $
+# $NetBSD: Makefile,v 1.89 2005/02/07 11:35:46 jlam 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,6 @@ CONFIGURE_ENV+=		DSOFLAGS="${LDFLAGS}"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_PAM)
-PKG_DEFAULT_OPTIONS+=	PAM
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
 PKG_SUPPORTED_OPTIONS=	PAM
 .include "../../mk/bsd.options.mk"
diff --git a/security/cy-login/Makefile b/security/cy-login/Makefile
index 2c6d2885b49..e7902239233 100644
--- a/security/cy-login/Makefile
+++ b/security/cy-login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/02/07 11:35:47 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy-login/}
 PKGREVISION=	1
@@ -12,9 +12,13 @@ SASL_PLUGIN=	YES
 #
 CONFIGURE_ARGS+=	--enable-login		# LOGIN
 CONFIGURE_ARGS+=	--enable-plain		# PLAIN
-.if defined(USE_PAM)
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cy-login
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
 .  include "../../mk/pam.buildlink3.mk"
-BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
 .endif
 
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 305ca52ed63..c6a6956e813 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/01/14 05:15:40 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/02/07 11:35:47 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -73,8 +73,12 @@ CPPFLAGS+=		-I/usr/include/krb5 -I/usr/include/kerberosIV
 # XXX: PAM authentication causes memory faults, and I haven't tracked down
 # XXX: why yet.  For the moment, disable PAM authentication.
 #
-#.if defined(USE_PAM)
-#.include "../../mk/pam.buildlink3.mk"
+#PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh+gssapi
+#PKG_SUPPORTED_OPTIONS=	PAM
+#.include "../../mk/bsd.options.mk"
+#
+#.if !empty(PKG_OPTIONS:MPAM)
+#.  include "../../mk/pam.buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-pam
 #PLIST_SRC+=		${.CURDIR}/PLIST.pam
 #MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile
index 7ced5c2cf47..1650602d173 100644
--- a/x11/gdm1/Makefile
+++ b/x11/gdm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:29 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/02/07 11:35:47 jlam Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	7
@@ -61,10 +61,13 @@ GDMOWN=		daemon
 GDMGRP=		daemon
 .endif
 
-.if defined(USE_PAM)
-DEPENDS+=	PAM-[0-9]*:../../security/PAM
-.else
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm1
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:MPAM)
+.  include "../../mk/pam.buildlink3.mk"
+.else
 SUBST_CLASSES+=		pam
 SUBST_MESSAGE.pam=	"Disabling PAM support."
 SUBST_STAGE.pam=	pre-configure
@@ -72,6 +75,10 @@ SUBST_FILES.pam=	configure
 SUBST_SED.pam=		-e 's:security/pam_appl.h:nopam:g'
 .endif
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
 post-build:
 	cd ${WRKSRC}/config;						\
 	for f in Default PostSession PreSession; do			\
@@ -118,8 +125,4 @@ post-install:
 	${LN} -fs Gnome ${GDMCFGDIR}/Sessions/Default
 	${INSTALL_SCRIPT} ${WRKDIR}/gdm ${PREFIX}/etc/rc.d/
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"