pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/p11 Fix the PLIST to handle platforms that h...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4edf193c3b40
branches:  trunk
changeset: 514695:4edf193c3b40
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 16 16:15:42 2006 +0000

description:
Fix the PLIST to handle platforms that have any of BPF, TUN, or TAP
devices.

diffstat:

 emulators/p11/Makefile |  27 ++++++++++++++++++++++-----
 emulators/p11/PLIST    |   8 ++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r 0046ddd19e66 -r 4edf193c3b40 emulators/p11/Makefile
--- a/emulators/p11/Makefile    Fri Jun 16 15:53:17 2006 +0000
+++ b/emulators/p11/Makefile    Fri Jun 16 16:15:42 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/04/12 19:49:26 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/16 16:15:42 jlam Exp $
 #
 
 DISTNAME=      p11-2.10a
@@ -16,11 +16,28 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+# bfp, tap, and tun tests taken from p11 configure script
+.if exists(/dev/bpf0)
+PLIST_SUBST+=          BPF=
+.else
+PLIST_SUBST+=          BPF="@comment "
+.endif
+.if exists(/dev/tap0) || exists(/dev/net/tun)
+PLIST_SUBST+=          TAP=
+.elif ${OPSYS} == "DragonFly"
+PLIST_SUBST+=          TAP=            # DragonFly has TAP
+.else
+PLIST_SUBST+=          TAP="@comment "
+.endif
+.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun)
+PLIST_SUBST+=          TUN=
+.else
+PLIST_SUBST+=          TUN="@comment "
+.endif
+
+# Force the bpf, tun, and tap epp backends to be built on DragonFly.
 .if ${OPSYS} == "DragonFly"
-PLIST_SUBST+=          HAS_TAP=
-CONFIGURE_ENV+=        ac_cv_epp_bpf=yes ac_cv_epp_tun=yes ac_cv_epp_tap=yes
-.else
-PLIST_SUBST+=          HAS_TAP="@comment "
+CONFIGURE_ENV+=                ac_cv_epp_bpf=yes ac_cv_epp_tun=yes ac_cv_epp_tap=yes
 .endif
 
 # override MAKEFLAGS in the build and install stages
diff -r 0046ddd19e66 -r 4edf193c3b40 emulators/p11/PLIST
--- a/emulators/p11/PLIST       Fri Jun 16 15:53:17 2006 +0000
+++ b/emulators/p11/PLIST       Fri Jun 16 16:15:42 2006 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/12 19:49:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/06/16 16:15:42 jlam Exp $
 bin/p11
-libexec/p11/epp_bpf
+${BPF}libexec/p11/epp_bpf
 libexec/p11/epp_fifo
-${HAS_TAP}libexec/p11/epp_tap
-libexec/p11/epp_tun
+${TAP}libexec/p11/epp_tap
+${TUN}libexec/p11/epp_tun
 libexec/p11/fmt
 libexec/p11/lp_file
 libexec/p11/tty_fifo



Home | Main Index | Thread Index | Old Index