summaryrefslogtreecommitdiff
path: root/net/freeradius
diff options
context:
space:
mode:
Diffstat (limited to 'net/freeradius')
-rw-r--r--net/freeradius/Makefile14
-rw-r--r--net/freeradius/options.mk4
2 files changed, 9 insertions, 9 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 47a8ed9abcc..782d5c847b6 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/02/17 18:36:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.57 2007/02/22 19:26:52 wiz Exp $
DISTNAME= freeradius-${RADVER}
CATEGORIES= net
@@ -51,8 +51,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
CONFIGURE_ARGS+= --disable-ltdl-install
CONFIGURE_ARGS+= --with-ltdl-lib=${PREFIX}/lib
CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include
-CONFIGURE_ARGS+= --without-rlm_ippool
-CONFIGURE_ARGS+= --without-rlm_smb
+CONFIGURE_ARGS+= --without-rlm_ippool
+CONFIGURE_ARGS+= --without-rlm_smb
CONFIGURE_ARGS+= --without-rlm_sql_iodbc
CONFIGURE_ARGS+= --without-rlm_sql_oracle
CONFIGURE_ARGS+= --without-rlm_sql_unixodbc
@@ -68,7 +68,7 @@ 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
-SUBST_SED.make= -e "s|RLM_LDFLAGS =|RLM_LDFLAGS = \
+SUBST_SED.make= -e "s|RLM_LDFLAGS =|RLM_LDFLAGS = \
-L../../../src/lib/.libs/ -lradius|g"
SUBST_SED.make+= -e "s|RLM_SQL_LIBS =|RLM_SQL_LIBS = \
-L${PREFIX}/lib|g"
@@ -98,7 +98,7 @@ EGFILES= acct_users attrs certs/demoCA/index.txt.old \
otp.conf sqlippool.conf
.for f in ${EGFILES}
-CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
+CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${RADIUS_USER} ${RADIUS_GROUP} 0640
.endfor
@@ -112,12 +112,12 @@ CONFIGURE_ARGS+= --without-threads
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
.include "../../devel/pthread-sem/buildlink3.mk"
-SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
+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@ \
+SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g'
.endif
diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk
index ab4de326af6..547038ac18a 100644
--- a/net/freeradius/options.mk
+++ b/net/freeradius/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2006/08/11 16:22:04 adrianp Exp $
+# $NetBSD: options.mk,v 1.13 2007/02/22 19:26:53 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+= --without-snmp
###
.if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-rlm_krb5
+CONFIGURE_ARGS+= --with-rlm_krb5
. if defined(KRB5_TYPE) && ${KRB5_TYPE} == "heimdal"
CONFIGURE_ARGS+= --enable-heimdal-krb5
. endif