diff options
| -rw-r--r-- | net/freeradius/Makefile | 13 | ||||
| -rw-r--r-- | net/freeradius/options.mk | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index c4f5d4de795..a09c917eb93 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2014/05/29 23:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.85 2014/11/02 05:53:48 obache Exp $ DISTNAME= freeradius-${RADVER} PKGREVISION= 10 @@ -22,11 +22,11 @@ USE_LIBTOOL= YES USE_OLD_DES_API= YES BUILD_DEFS+= VARBASE -PLIST_SRC= ${WRKDIR}/.PLIST_SRC +PLIST_SRC= ${PKGDIR}/PLIST 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} @@ -131,13 +131,6 @@ SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \ CFLAGS+= -fPIC .endif -post-build: - ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC - ${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC -.if !empty(PKG_OPTIONS:Mpam) - ${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam -.endif - INSTALLATION_DIRS+= ${EGDIR}/certs/demoCA INSTALL_ENV+= R=${DESTDIR} MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/certs ${RADIUS_USER} ${RADIUS_GROUP} 0750 diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk index 547038ac18a..403f537df0b 100644 --- a/net/freeradius/options.mk +++ b/net/freeradius/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2007/02/22 19:26:53 wiz Exp $ +# $NetBSD: options.mk,v 1.14 2014/11/02 05:53:48 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius @@ -106,7 +106,7 @@ CONFIGURE_ENV+= ac_cv_path_SNMPWALK="" .if !empty(PKG_OPTIONS:Mpam) CONFIGURE_ARGS+= --with-rlm_pam PLIST_SRC+= ${PKGDIR}/PLIST.pam -MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC.pam +MESSAGE_SRC+= MESSAGE.pam .else CONFIGURE_ARGS+= --without-rlm_pam .endif |