[pkgsrc/trunk]: pkgsrc/net/tcl-scotty It turns out that scotty installs the p...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f801365a9c90
branches:  trunk
changeset: 610805:f801365a9c90
user:      he <he%pkgsrc.org@localhost>
date:      Wed Nov 07 12:54:30 2012 +0000

description:
It turns out that scotty installs the pre-parsed MIBs into a sub-
directory named ${MACHINE}-${OPSYS} not ${MACHINE_ARCH}-${OPSYS},
which the PLIST specifies.  Adapt the PLIST accordingly, so that
this builds on amd64 as well, where MACHINE and MACHINE_ARCH is
different...

No pkgrevision bump, since this is merely a build fix, and the
contents of the package does not change for those where it
built already.

diffstat:

 net/tcl-scotty/Makefile |    4 +-
 net/tcl-scotty/PLIST    |  136 ++++++++++++++++++++++++------------------------
 2 files changed, 71 insertions(+), 69 deletions(-)

diffs (168 lines):

diff -r a3198acb209c -r f801365a9c90 net/tcl-scotty/Makefile
--- a/net/tcl-scotty/Makefile   Wed Nov 07 12:24:39 2012 +0000
+++ b/net/tcl-scotty/Makefile   Wed Nov 07 12:54:30 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/08/22 22:18:23 marino Exp $
+# $NetBSD: Makefile,v 1.28 2012/11/07 12:54:30 he Exp $
 #
 
 DISTNAME=      scotty-${DIST_VERS}
@@ -30,6 +30,8 @@
 USE_LIBTOOL=   yes
 USE_TOOLS+=    lex yacc
 
+PLIST_SUBST+=  MACHINE="${MACHINE}"
+
 INSTALL_TARGET= tnm-install install-man sinstall
 
 post-extract:
diff -r a3198acb209c -r f801365a9c90 net/tcl-scotty/PLIST
--- a/net/tcl-scotty/PLIST      Wed Nov 07 12:24:39 2012 +0000
+++ b/net/tcl-scotty/PLIST      Wed Nov 07 12:54:30 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/11/07 12:54:30 he Exp $
 bin/scotty2.1.11
 bin/scotty
 bin/ntping
@@ -91,73 +91,73 @@
 lib/tcl/tnm2.1.11/mibs/X721.gdmo
 lib/tcl/tnm2.1.11/mibs/X722.gdmo
 lib/tcl/tnm2.1.11/mibs/X739.gdmo
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1155.smi.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1902.smi.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1903.tc.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/compat.tc.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1906.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1907.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1213.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1910.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1269.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1238.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1757.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1315.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1354.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1381.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1382.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1406.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1407.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1414.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1461.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1471.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1472.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1473.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1474.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1493.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1512.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1513.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1514.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1515.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1516.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1525.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1559.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1565.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1566.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1567.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1573.smi.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1573.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1595.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1604.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1611.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1612.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1628.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1643.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1650.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1657.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1658.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1659.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1660.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1666.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1694.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1695.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1696.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1697.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1724.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1742.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1747.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1748.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1749.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1759.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1792.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc1850.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/rfc2020.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/tubs-tnm.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/tubs-nfs.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/tubs-proc.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/tubs-mlm.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/xxx.mib.idy
-lib/tcl/tnm2.1.11/${MACHINE_ARCH}-${OPSYS}/dvmrp.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1155.smi.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1902.smi.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1903.tc.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/compat.tc.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1906.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1907.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1213.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1910.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1269.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1238.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1757.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1315.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1354.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1381.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1382.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1406.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1407.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1414.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1461.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1471.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1472.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1473.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1474.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1493.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1512.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1513.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1514.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1515.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1516.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1525.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1559.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1565.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1566.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1567.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1573.smi.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1573.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1595.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1604.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1611.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1612.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1628.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1643.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1650.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1657.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1658.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1659.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1660.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1666.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1694.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1695.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1696.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1697.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1724.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1742.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1747.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1748.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1749.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1759.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1792.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc1850.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/rfc2020.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/tubs-tnm.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/tubs-nfs.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/tubs-proc.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/tubs-mlm.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/xxx.mib.idy
+lib/tcl/tnm2.1.11/${MACHINE}-${OPSYS}/dvmrp.mib.idy
 lib/tcl/tnm2.1.11/agents/snmpd
 lib/tcl/tnm2.1.11/agents/snmpd-tnm.tcl
 lib/tcl/tnm2.1.11/agents/snmpd-mlm.tcl