Import of pkgsrc-2015Q1

net/freeradius/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2014/02/12 23:18:20 tron Exp $
+# $NetBSD: Makefile,v 1.85 2014/11/02 05:53:48 obache Exp $
 
 DISTNAME=	freeradius-${RADVER}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/
 
@@ -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

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