From 1822c29a1c4282b823f2954bb5e5a3043db63207 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sat, 12 Aug 2000 16:54:44 +0000
Subject: Use the system PPP daemon on NetBSD 1.5 or newer and the "ppp"
 package otherwise. This should fix problems with system were "pppd" is not
 configured.

---
 net/rp-pppoe/Makefile | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'net/rp-pppoe')

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 4189c9d16f1..620da9bbd69 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/31 19:31:03 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/12 16:54:44 tron Exp $
 
 DISTNAME=	rp-pppoe-2.2
 CATEGORIES=	net
@@ -7,10 +7,6 @@ MASTER_SITES=	http://www.roaringpenguin.com/pppoe/
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://home.sprynet.com/~minaret/pppoe/
 
-.if !defined(CHECK_PPPD_DEPENDS)
-DEPENDS!=	${MAKE} CHECK_PPPD_DEPENDS=1 ${MAKEFLAGS} pppd-depend
-.endif
-
 CONFLICTS+=	mouse_pppoe-*
 
 GNU_CONFIGURE=	yes
@@ -19,21 +15,14 @@ CONFIGURE_ENV+=	PPPD=${PPPD}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pppoe.conf ${PREFIX}/share/doc/rp-pppoe
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.prefs.mk"
 
-BASE_PPPD=	/usr/sbin/pppd
-PPPD_VERSION!=	${BASE_PPPD} --version 2>&1 | \
-		${SED} -e 's/ patch level /\./' -e 's/.* //' | \
-		${AWK} -F. '{printf("%d\n",$$1*1000000+$$2*1000+$$3)}'
+.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M1.[0-4]*} != ""
+DEPENDS+=	ppp>=2.3.10:../ppp
 
-.if ${PPPD_VERSION} < 2003010
 PPPD=		${LOCALBASE}/sbin/pppd
-
-pppd-depend:
-		@${ECHO} "ppp>=2.3.10:../ppp"
 .else
-PPPD=		${BASE_PPPD}
-
-pppd-depend:
-		@${ECHO} ""
+PPPD=		/usr/sbin/pppd
 .endif
+
+.include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3