2 files changed, 71 insertions, 101 deletions

diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 90efa3faa706..a959515a934f 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.27 1998/04/14 02:10:05 asami Exp $
+# $Id: Makefile,v 1.28 1998/08/07 23:56:44 asami Exp $
 #
 
 DISTNAME=	scotty-2.1.8
@@ -25,20 +25,11 @@ MAN8=		ntping.8 straps.8
 MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
 		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
 		syslog.n udp.n
-PLIST=		${PKGDIR}/PLIST.tmp
+PLIST_SUB=	FREEBSD_VERSION=${FREEBSD_VERSION}
+FREEBSD_VERSION!=	echo `uname -m`-`uname`-`uname -r`
 
 pre-install:
 	@cd ${WRKSRC};make sinstall
 	@${CP} ${WRKSRC}/../tnm/ntping/ntping.8 ${WRKSRC}/../doc
-	@sed "s,@FREEBSD_VERSION@,$$(uname -m)-$$(uname)-$$(uname -r)," pkg/PLIST >/tmp/PLIST
-.if defined(NOMANCOMPRESS)
-	@sed "s,@GZIP@,," /tmp/PLIST >pkg/PLIST.tmp
-.else
-	@sed "s,@GZIP@,.gz," /tmp/PLIST >pkg/PLIST.tmp
-.endif
-	@${RM} /tmp/PLIST
-
-pre-clean:
-	@${RM} -f pkg/PLIST.tmp
 
 .include <bsd.port.mk>
diff --git a/net/scotty/pkg-plist b/net/scotty/pkg-plist
index 97fafdf43d34..58ee845b0888 100644
--- a/net/scotty/pkg-plist
+++ b/net/scotty/pkg-plist
@@ -92,73 +92,73 @@ lib/tnm2.1.8/library/monitor.tcl
 lib/tnm2.1.8/library/obsolete.tcl
 lib/tnm2.1.8/library/init.tcl
 lib/tnm2.1.8/library/tclIndex
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1155.smi.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1902.smi.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1903.tc.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/compat.tc.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1906.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1907.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1213.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1910.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1269.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1238.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1757.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1315.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1354.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1381.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1382.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1406.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1407.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1414.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1461.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1471.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1472.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1473.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1474.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1493.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1512.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1513.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1514.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1515.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1516.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1525.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1559.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1565.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1566.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1567.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1573.smi.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1573.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1595.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1604.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1611.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1612.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1628.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1643.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1650.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1657.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1658.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1659.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1660.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1666.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1694.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1695.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1696.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1697.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1724.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1742.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1747.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1748.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1749.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1759.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1792.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc1850.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/rfc2020.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/tubs-tnm.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/tubs-nfs.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/tubs-proc.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/tubs-mlm.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/xxx.mib.idy
-lib/tnm2.1.8/@FREEBSD_VERSION@/dvmrp.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1155.smi.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1902.smi.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1903.tc.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/compat.tc.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1906.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1907.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1213.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1910.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1269.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1238.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1757.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1315.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1354.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1381.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1382.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1406.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1407.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1414.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1461.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1471.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1472.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1473.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1474.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1493.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1512.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1513.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1514.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1515.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1516.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1525.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1559.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1565.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1566.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1567.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1573.smi.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1573.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1595.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1604.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1611.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1612.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1628.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1643.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1650.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1657.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1658.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1659.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1660.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1666.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1694.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1695.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1696.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1697.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1724.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1742.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1747.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1748.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1749.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1759.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1792.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc1850.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/rfc2020.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/tubs-tnm.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/tubs-nfs.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/tubs-proc.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/tubs-mlm.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/xxx.mib.idy
+lib/tnm2.1.8/%%FREEBSD_VERSION%%/dvmrp.mib.idy
 lib/tnm2.1.8/agents/snmpd
 lib/tnm2.1.8/agents/snmpd-tnm.tcl
 lib/tnm2.1.8/agents/snmpd-mlm.tcl
@@ -367,28 +367,7 @@ lib/tkined1.4.8.so
 @dirrm lib/tkined1.4.8
 @dirrm lib/tnm2.1.8/mibs
 @dirrm lib/tnm2.1.8/library
-@dirrm lib/tnm2.1.8/@FREEBSD_VERSION@
+@dirrm lib/tnm2.1.8/%%FREEBSD_VERSION%%
 @dirrm lib/tnm2.1.8/examples
 @dirrm lib/tnm2.1.8/agents
 @dirrm lib/tnm2.1.8
-man/man1/scotty.1@GZIP@
-man/man1/tkined.1@GZIP@
-man/man8/straps.8@GZIP@
-man/man8/ntping.8@GZIP@
-man/mann/dns.n@GZIP@
-man/mann/gdmo.n@GZIP@
-man/mann/http.n@GZIP@
-man/mann/icmp.n@GZIP@
-man/mann/job.n@GZIP@
-man/mann/mib.n@GZIP@
-man/mann/msqltcl.n@GZIP@
-man/mann/netdb.n@GZIP@
-man/mann/rpc.n@GZIP@
-man/mann/snmp.n@GZIP@
-man/mann/sunrpc.n@GZIP@
-man/mann/syslog.n@GZIP@
-man/mann/udp.n@GZIP@
-man/mann/Tnm.n@GZIP@
-man/mann/cmip.n@GZIP@
-man/mann/ined.n@GZIP@
-man/mann/ntp.n@GZIP@