pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/freeradius pkglintification
details: https://anonhg.NetBSD.org/pkgsrc/rev/8e8608392386
branches: trunk
changeset: 516095:8e8608392386
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Thu Jul 13 22:20:35 2006 +0000
description:
pkglintification
Add kerberos support - Patch from Kevin Sullivan in PR #33732
Bump to nb4
diffstat:
net/freeradius/Makefile | 23 +++++++++++------------
net/freeradius/PLIST.kerberos | 3 +++
net/freeradius/options.mk | 20 +++++++++++++++++---
3 files changed, 31 insertions(+), 15 deletions(-)
diffs (127 lines):
diff -r fe66dded8723 -r 8e8608392386 net/freeradius/Makefile
--- a/net/freeradius/Makefile Thu Jul 13 21:37:30 2006 +0000
+++ b/net/freeradius/Makefile Thu Jul 13 22:20:35 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2006/07/07 15:49:33 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2006/07/13 22:20:35 adrianp Exp $
DISTNAME= freeradius-1.1.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.Awfulhak.org/pub/radius/
@@ -12,7 +12,7 @@
.include "../../mk/bsd.prefs.mk"
-CONFLICTS+= radiusd-cistron*
+CONFLICTS+= radiusd-cistron-[0-9]*
USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= YES
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
@@ -32,7 +32,6 @@
CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include
CONFIGURE_ARGS+= --without-rlm_ippool
CONFIGURE_ARGS+= --without-rlm_smb
-CONFIGURE_ARGS+= --without-rlm_krb5
CONFIGURE_ARGS+= --without-rlm_pam
CONFIGURE_ARGS+= --without-rlm_sql_iodbc
CONFIGURE_ARGS+= --without-rlm_sql_oracle
@@ -44,7 +43,7 @@
REPLACE_PERL= scripts/radsqlrelay
-SUBST_CLASSES+= make
+SUBST_CLASSES= make
SUBST_STAGE.make= post-patch
SUBST_FILES.make= src/modules/rlm_mschap/Makefile \
src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
@@ -92,13 +91,13 @@
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
.include "../../devel/pthread-sem/buildlink3.mk"
-SUBST_SED.make+= -e "s|@ldap_ldflags@|@ldap_ldflags@ \
- ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lsemaphore|g"
+SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
+ ${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q} -lsemaphore|g'
.endif
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-SUBST_SED.make+= -e "s|@ldap_ldflags@|@ldap_ldflags@ \
- ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g"
+SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
+ ${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g'
.endif
.if ${OPSYS} == "DragonFly"
@@ -109,7 +108,7 @@
.endif
post-build:
- @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+ ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
@@ -119,7 +118,7 @@
${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f}
.endfor
${INSTALL_SCRIPT} ${WRKSRC}/src/modules/rlm_perl/example.pl ${EGDIR}
- @${MKDIR} ${PKG_SYSCONFDIR}/certs
- @${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA
+ ${MKDIR} ${PKG_SYSCONFDIR}/certs
+ ${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA
.include "../../mk/bsd.pkg.mk"
diff -r fe66dded8723 -r 8e8608392386 net/freeradius/PLIST.kerberos
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.kerberos Thu Jul 13 22:20:35 2006 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.kerberos,v 1.1 2006/07/13 22:20:35 adrianp Exp $
+lib/rlm_krb5-${PKGVERSION}.la
+lib/rlm_krb5.la
diff -r fe66dded8723 -r 8e8608392386 net/freeradius/options.mk
--- a/net/freeradius/options.mk Thu Jul 13 21:37:30 2006 +0000
+++ b/net/freeradius/options.mk Thu Jul 13 22:20:35 2006 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.8 2006/05/31 18:22:24 ghen Exp $
+# $NetBSD: options.mk,v 1.9 2006/07/13 22:20:35 adrianp Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius
PKG_OPTIONS_OPTIONAL_GROUPS= dbm
PKG_OPTIONS_GROUP.dbm= bdb gdbm
-PKG_SUPPORTED_OPTIONS= ldap mysql pgsql snmp
+PKG_SUPPORTED_OPTIONS= ldap mysql pgsql snmp kerberos
PKG_SUGGESTED_OPTIONS= gdbm
.include "../../mk/bsd.options.mk"
@@ -52,7 +52,7 @@
### Use MySQL for storing user details
###
.if !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
+. include "../../mk/mysql.buildlink3.mk"
CONFIGURE_ARGS+= --with-rlm_sql_mysql
PLIST_SRC+= ${PKGDIR}/PLIST.mysql
.else
@@ -74,3 +74,17 @@
.else
CONFIGURE_ARGS+= --without-snmp
.endif
+
+###
+### Use kerberos 5
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+. include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+= --with-rlm_krb5
+. if defined(KRB5_TYPE) && ${KRB5_TYPE} == "heimdal"
+CONFIGURE_ARGS+= --enable-heimdal-krb5
+. endif
+PLIST_SRC+= ${PKGDIR}/PLIST.kerberos
+.else
+CONFIGURE_ARGS+= --without-rlm_krb5
+.endif
Home |
Main Index |
Thread Index |
Old Index