pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Instantly deprecate USE_PAM from pkgsrc as its value i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ff5005a29668
branches: trunk
changeset: 488712:ff5005a29668
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Feb 07 11:35:41 2005 +0000
description:
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.
diffstat:
databases/postgresql73-server/Makefile | 8 +++++-
databases/postgresql74-server/Makefile | 8 +++++-
databases/postgresql80-server/Makefile | 10 +++++--
mail/courier-auth/Makefile | 4 ++-
mail/courier-auth/Makefile.authdaemond | 9 +++++--
mail/courier-authldap/Makefile | 4 ++-
mail/courier-authmysql/Makefile | 4 ++-
mail/courier-authpgsql/Makefile | 4 ++-
mk/defaults/obsolete.mk | 5 +---
net/ja-samba/Makefile | 33 +++++----------------------
net/ja-samba/options.mk | 38 ++++++++++++++++++++++++++++++++
net/samba2/Makefile | 32 ++++----------------------
net/samba2/options.mk | 40 ++++++++++++++++++++++++++++++++++
print/cups/Makefile | 6 +----
security/cy-login/Makefile | 10 +++++--
security/openssh+gssapi/Makefile | 10 +++++--
x11/gdm1/Makefile | 19 +++++++++------
17 files changed, 153 insertions(+), 91 deletions(-)
diffs (truncated from 498 to 300 lines):
diff -r 675a9747b4ad -r ff5005a29668 databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/databases/postgresql73-server/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
# 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 -r 675a9747b4ad -r ff5005a29668 databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/databases/postgresql74-server/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
# 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 -r 675a9747b4ad -r ff5005a29668 databases/postgresql80-server/Makefile
--- a/databases/postgresql80-server/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/databases/postgresql80-server/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
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 -r 675a9747b4ad -r ff5005a29668 mail/courier-auth/Makefile
--- a/mail/courier-auth/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/mail/courier-auth/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
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 -r 675a9747b4ad -r ff5005a29668 mail/courier-auth/Makefile.authdaemond
--- a/mail/courier-auth/Makefile.authdaemond Mon Feb 07 09:20:28 2005 +0000
+++ b/mail/courier-auth/Makefile.authdaemond Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
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 -r 675a9747b4ad -r ff5005a29668 mail/courier-authldap/Makefile
--- a/mail/courier-authldap/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/mail/courier-authldap/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
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 -r 675a9747b4ad -r ff5005a29668 mail/courier-authmysql/Makefile
--- a/mail/courier-authmysql/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/mail/courier-authmysql/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
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 -r 675a9747b4ad -r ff5005a29668 mail/courier-authpgsql/Makefile
--- a/mail/courier-authpgsql/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/mail/courier-authpgsql/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 -r 675a9747b4ad -r ff5005a29668 mk/defaults/obsolete.mk
--- a/mk/defaults/obsolete.mk Mon Feb 07 09:20:28 2005 +0000
+++ b/mk/defaults/obsolete.mk Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
.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 -r 675a9747b4ad -r ff5005a29668 net/ja-samba/Makefile
--- a/net/ja-samba/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/net/ja-samba/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
#
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 @@
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 @@
${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 -r 675a9747b4ad -r ff5005a29668 net/ja-samba/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ja-samba/options.mk Mon Feb 07 11:35:41 2005 +0000
@@ -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 -r 675a9747b4ad -r ff5005a29668 net/samba2/Makefile
--- a/net/samba2/Makefile Mon Feb 07 09:20:28 2005 +0000
+++ b/net/samba2/Makefile Mon Feb 07 11:35:41 2005 +0000
@@ -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 @@
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
-
Home |
Main Index |
Thread Index |
Old Index