diff options
| author | obache <obache@pkgsrc.org> | 2014-11-02 05:55:43 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-11-02 05:55:43 +0000 |
| commit | 5d42459e6a31776fe04fa6b4c70ed5bb6bf2997a (patch) | |
| tree | 199e2a48f68555ea35a9cca5041c6acf0b9d7b9d /net/freeradius2 | |
| parent | a32cd26a25ae57c08a758a6278e85aa6a78b7fb7 (diff) | |
| download | pkgsrc-5d42459e6a31776fe04fa6b4c70ed5bb6bf2997a.tar.gz | |
Fixes unusual usage of MESSAGE_SRC.
Diffstat (limited to 'net/freeradius2')
| -rw-r--r-- | net/freeradius2/Makefile | 10 | ||||
| -rw-r--r-- | net/freeradius2/options.mk | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index ae5fd6b078c..2b10d10f037 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2014/05/29 23:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2014/11/02 05:55:43 obache Exp $ DISTNAME= freeradius-server-${RADVER} PKGNAME= ${DISTNAME:S/-server//} @@ -25,7 +25,7 @@ BUILD_DEFS+= VARBASE FILES_SUBST+= RADIUS_USER=${RADIUS_USER} FILES_SUBST+= RADIUS_GROUP=${RADIUS_GROUP} PLIST_SUBST+= RADVER=${RADVER} -MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC +MESSAGE_SRC+= ${PKGDIR}/MESSAGE MESSAGE_SUBST+= CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} VARBASE=${VARBASE} MESSAGE_SUBST+= RADIUS_USER=${RADIUS_USER} XARGS=${XARGS:Q} MESSAGE_SUBST+= RADIUS_GROUP=${RADIUS_GROUP} FIND=${FIND:Q} @@ -157,12 +157,6 @@ SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \ ${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q}|g' .endif -post-build: - ${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC -.if !empty(PKG_OPTIONS:Mpam) - ${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam -.endif - post-install: .for f in ${EGFILES} ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${DESTDIR}${EGDIR}/${f} diff --git a/net/freeradius2/options.mk b/net/freeradius2/options.mk index 7ffabc7ab61..67b85496e02 100644 --- a/net/freeradius2/options.mk +++ b/net/freeradius2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/05/23 17:28:44 tron Exp $ +# $NetBSD: options.mk,v 1.5 2014/11/02 05:55:43 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius PKG_SUPPORTED_OPTIONS= freeradius-simul-use kerberos ldap mysql @@ -140,7 +140,7 @@ CONFIGURE_ENV+= ac_cv_path_SNMPWALK="" ### .if !empty(PKG_OPTIONS:Mpam) CONFIGURE_ARGS+= --with-rlm_pam -MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC.pam +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam PLIST.pam= yes .else CONFIGURE_ARGS+= --without-rlm_pam |