From 1867f1355f899aa04a43ce50cc968afbaf6df085 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Thu, 19 Jun 2008 07:52:45 +0000 Subject: [PATCH] Don't install rtelnet when sgtty is not available anymore. rtelnet cannot easily be ported to the termios interface without performing very thorough tests. We'd better not risk it and disconnect rtelnet from the build when sgtty is not available. We can always restore it when someone offers a patch. PR: 124473 Approved by: philip (mentor) --- net-mgmt/annextools/Makefile | 14 ++++++++++++-- net-mgmt/annextools/files/patch-Makefile | 4 +++- net-mgmt/annextools/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-mgmt/annextools/Makefile b/net-mgmt/annextools/Makefile index d048a1dd6971..dbf85b498ad5 100644 --- a/net-mgmt/annextools/Makefile +++ b/net-mgmt/annextools/Makefile @@ -7,7 +7,7 @@ PORTNAME= annextools PORTVERSION= 10.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://www142.nortelnetworks.com/pub/swcode/remacc/microannex_xl/ DISTNAME= R10.0B-R2.3 @@ -21,6 +21,14 @@ WRKSRC= ${WRKDIR}/src EXTRACT_AFTER_ARGS= | ${TAR} -xf - src +.include + +.if ${OSVERSION} < 800039 +PLIST_SUB+= RTELNET="" +.else +PLIST_SUB+= RTELNET="@comment " +.endif + post-extract: ${FIND} ${WRKDIR}/src -type d -exec ${CHMOD} u+w \{\} \; @@ -33,7 +41,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/erpcd/tms_convert ${PREFIX}/annex/sbin ${INSTALL_PROGRAM} ${WRKSRC}/erpcd/tms_dbm ${PREFIX}/annex/sbin ${INSTALL_PROGRAM} ${WRKSRC}/na/na ${PREFIX}/annex/sbin +.if ${OSVERSION} < 800039 ${INSTALL_PROGRAM} ${WRKSRC}/rtelnet/rtelnet ${PREFIX}/annex/sbin +.endif ${INSTALL_DATA} ${WRKSRC}/snmp/xylo-anx.mib ${PREFIX}/annex/snmp ${INSTALL_DATA} ${WRKSRC}/snmp/xylo-callmgmt.mib ${PREFIX}/annex/snmp ${INSTALL_DATA} ${WRKSRC}/snmp/xylo-modem.mib ${PREFIX}/annex/snmp @@ -54,4 +64,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/examples/misc/rotary ${PREFIX}/annex/examples ${INSTALL_DATA} ${WRKSRC}/examples/misc/termcap ${PREFIX}/annex/examples -.include +.include diff --git a/net-mgmt/annextools/files/patch-Makefile b/net-mgmt/annextools/files/patch-Makefile index 95857646d432..01da8e244b0f 100644 --- a/net-mgmt/annextools/files/patch-Makefile +++ b/net-mgmt/annextools/files/patch-Makefile @@ -1,10 +1,12 @@ --- Makefile.orig Thu Sep 18 20:10:32 2003 +++ Makefile Thu Sep 18 20:10:32 2003 -@@ -0,0 +1,7 @@ +@@ -0,0 +1,9 @@ +SUBDIR= libannex +SUBDIR+= netadm +SUBDIR+= erpcd +SUBDIR+= na ++.if ${OSVERSION} < 800039 +SUBDIR+= rtelnet ++.endif + +.include diff --git a/net-mgmt/annextools/pkg-plist b/net-mgmt/annextools/pkg-plist index 03f74f17e7e3..b6995390c6c1 100644 --- a/net-mgmt/annextools/pkg-plist +++ b/net-mgmt/annextools/pkg-plist @@ -5,7 +5,7 @@ annex/sbin/spy annex/sbin/tms_convert annex/sbin/tms_dbm annex/sbin/na -annex/sbin/rtelnet +%%RTELNET%%annex/sbin/rtelnet @dirrm annex/sbin annex/snmp/xylo-anx.mib annex/snmp/xylo-callmgmt.mib