Fix for NetBSD

2 files changed, 95 insertions, 99 deletions

diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 84395431d6a..dcb0d4b8f87 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -3,7 +3,8 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/23 22:21:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/11/23 22:26:53 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp
 #
 
 DISTNAME=	scotty-2.1.6
@@ -15,8 +16,8 @@ MAINTAINER=	phk@freebsd.org
 LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --with-tcl-config=/usr/local/lib/tcl8.0 \
-		--with-tk-config=/usr/local/lib/tk8.0
+CONFIGURE_ARGS= --with-tcl-config=${PREFIX}/lib/tcl8.0 \
+		--with-tk-config=${PREFIX}/lib/tk8.0
 
 WRKSRC=${WRKDIR}/${DISTNAME}/unix
 MAN1=		tkined.1 scotty.1
@@ -29,13 +30,8 @@ PLIST=		${PKGDIR}/PLIST.tmp
 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
+	@sed "s,@NETBSD_VERSION@,$$(uname -m)-$$(uname)-$$(uname -r)," ${PKGDIR}/PLIST >${PLIST}.tmp
+PLIST_SRC=${PLIST}.tmp
 
 pre-clean:
 	@${RM} -f pkg/PLIST.tmp
diff --git a/net/scotty/pkg/PLIST b/net/scotty/pkg/PLIST
index 5fc0247308b..9ffe5204793 100644
--- a/net/scotty/pkg/PLIST
+++ b/net/scotty/pkg/PLIST
@@ -92,73 +92,73 @@ lib/tnm2.1.6/library/monitor.tcl
 lib/tnm2.1.6/library/obsolete.tcl
 lib/tnm2.1.6/library/init.tcl
 lib/tnm2.1.6/library/tclIndex
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1155.smi.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1902.smi.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1903.tc.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/compat.tc.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1906.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1907.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1213.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1910.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1269.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1238.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1757.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1315.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1354.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1381.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1382.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1406.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1407.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1414.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1461.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1471.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1472.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1473.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1474.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1493.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1512.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1513.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1514.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1515.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1516.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1525.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1559.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1565.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1566.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1567.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1573.smi.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1573.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1595.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1604.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1611.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1612.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1628.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1643.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1650.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1657.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1658.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1659.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1660.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1666.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1694.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1695.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1696.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1697.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1724.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1742.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1747.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1748.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1749.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1759.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1792.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc1850.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/rfc2020.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/tubs-tnm.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/tubs-nfs.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/tubs-proc.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/tubs-mlm.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/xxx.mib.idy
-lib/tnm2.1.6/@FREEBSD_VERSION@/dvmrp.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1155.smi.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1902.smi.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1903.tc.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/compat.tc.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1906.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1907.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1213.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1910.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1269.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1238.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1757.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1315.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1354.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1381.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1382.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1406.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1407.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1414.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1461.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1471.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1472.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1473.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1474.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1493.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1512.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1513.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1514.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1515.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1516.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1525.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1559.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1565.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1566.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1567.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1573.smi.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1573.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1595.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1604.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1611.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1612.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1628.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1643.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1650.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1657.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1658.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1659.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1660.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1666.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1694.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1695.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1696.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1697.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1724.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1742.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1747.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1748.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1749.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1759.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1792.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc1850.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/rfc2020.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/tubs-tnm.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/tubs-nfs.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/tubs-proc.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/tubs-mlm.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/xxx.mib.idy
+lib/tnm2.1.6/@NETBSD_VERSION@/dvmrp.mib.idy
 lib/tnm2.1.6/agents/snmpd
 lib/tnm2.1.6/agents/snmpd-tnm.tcl
 lib/tnm2.1.6/agents/snmpd-mlm.tcl
@@ -367,28 +367,28 @@ lib/tkined1.4.6.so
 @dirrm lib/tkined1.4.6
 @dirrm lib/tnm2.1.6/mibs
 @dirrm lib/tnm2.1.6/library
-@dirrm lib/tnm2.1.6/@FREEBSD_VERSION@
+@dirrm lib/tnm2.1.6/@NETBSD_VERSION@
 @dirrm lib/tnm2.1.6/examples
 @dirrm lib/tnm2.1.6/agents
 @dirrm lib/tnm2.1.6
-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@
+man/man1/scotty.1.gz
+man/man1/tkined.1.gz
+man/man8/straps.8.gz
+man/man8/ntping.8.gz
+man/mann/dns.n.gz
+man/mann/gdmo.n.gz
+man/mann/http.n.gz
+man/mann/icmp.n.gz
+man/mann/job.n.gz
+man/mann/mib.n.gz
+man/mann/msqltcl.n.gz
+man/mann/netdb.n.gz
+man/mann/rpc.n.gz
+man/mann/snmp.n.gz
+man/mann/sunrpc.n.gz
+man/mann/syslog.n.gz
+man/mann/udp.n.gz
+man/mann/Tnm.n.gz
+man/mann/cmip.n.gz
+man/mann/ined.n.gz
+man/mann/ntp.n.gz