diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /emulators/p11 | |
| parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
| download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'emulators/p11')
| -rw-r--r-- | emulators/p11/Makefile | 22 | ||||
| -rw-r--r-- | emulators/p11/PLIST | 8 |
2 files changed, 13 insertions, 17 deletions
diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile index 2092c731e9e..676ac7d4764 100644 --- a/emulators/p11/Makefile +++ b/emulators/p11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/01/27 12:02:16 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $ # DISTNAME= p11-2.10i @@ -16,27 +16,23 @@ USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= bpf tap tun + # bfp, tap, and tun tests taken from p11 configure script .if exists(/dev/bpf0) -PLIST_SUBST+= BPF= -.else -PLIST_SUBST+= BPF="@comment " +PLIST.bpf= yes .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 " +PLIST.tap= yes .endif -.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun) || ${OPSYS} == "DragonFly" -PLIST_SUBST+= TUN= -.else -PLIST_SUBST+= TUN="@comment " +.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun) +PLIST.tun= yes .endif # Force the bpf, tun, and tap epp backends to be built on DragonFly. .if ${OPSYS} == "DragonFly" +PLIST.tap= yes +PLIST.tun= yes CONFIGURE_ENV+= ac_cv_epp_bpf=yes ac_cv_epp_tun=yes ac_cv_epp_tap=yes .endif diff --git a/emulators/p11/PLIST b/emulators/p11/PLIST index 626502a0085..4cb3dfb5755 100644 --- a/emulators/p11/PLIST +++ b/emulators/p11/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2006/06/16 16:15:42 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:00 jlam Exp $ bin/p11 -${BPF}libexec/p11/epp_bpf +${PLIST.bpf}libexec/p11/epp_bpf libexec/p11/epp_fifo -${TAP}libexec/p11/epp_tap -${TUN}libexec/p11/epp_tun +${PLIST.tap}libexec/p11/epp_tap +${PLIST.tun}libexec/p11/epp_tun libexec/p11/fmt libexec/p11/lp_file libexec/p11/tty_fifo |