aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/Makefile136
-rw-r--r--net/NeTraMet/distinfo14
-rw-r--r--net/NeTraMet/files/patch-ab13
-rw-r--r--net/NeTraMet/files/patch-ac13
-rw-r--r--net/NeTraMet/pkg-descr9
-rw-r--r--net/NeTraMet/pkg-plist57
-rw-r--r--net/aggregate/distinfo1
-rw-r--r--net/aggregate/files/patch-Makefile.in10
-rw-r--r--net/aggregate/pkg-descr16
-rw-r--r--net/aggregate/pkg-plist2
-rw-r--r--net/aguri/distinfo1
-rw-r--r--net/aguri/files/extra-patch-Makefile15
-rw-r--r--net/aguri/pkg-descr22
-rw-r--r--net/aguri/pkg-plist11
-rw-r--r--net/airport/distinfo10
-rw-r--r--net/airport/files/airport26
-rw-r--r--net/airport/pkg-descr13
-rw-r--r--net/airport/pkg-plist17
-rw-r--r--net/angst/distinfo2
-rw-r--r--net/angst/pkg-descr5
-rw-r--r--net/annextools/distinfo1
-rw-r--r--net/annextools/files/patch-Makefile10
-rw-r--r--net/annextools/files/patch-erpcd::Makefile96
-rw-r--r--net/annextools/files/patch-erpcd::acp.c13
-rw-r--r--net/annextools/files/patch-erpcd::acp_lib.c11
-rw-r--r--net/annextools/files/patch-erpcd::acp_lib.h11
-rw-r--r--net/annextools/files/patch-erpcd::env_parser.c11
-rw-r--r--net/annextools/files/patch-erpcd::erpcd.c14
-rw-r--r--net/annextools/files/patch-erpcd::session_dbunx.c26
-rw-r--r--net/annextools/files/patch-erpcd::spy.c13
-rw-r--r--net/annextools/files/patch-inc::na::cmd.h17
-rw-r--r--net/annextools/files/patch-inc::na::help.h18
-rw-r--r--net/annextools/files/patch-inc::slip::slip_user.h11
-rw-r--r--net/annextools/files/patch-libannex::Makefile13
-rw-r--r--net/annextools/files/patch-libannex::api_if.c13
-rw-r--r--net/annextools/files/patch-libannex::ip_layer.c11
-rw-r--r--net/annextools/files/patch-libannex::slip_layer.c23
-rw-r--r--net/annextools/files/patch-libannex::socket_layer.c38
-rw-r--r--net/annextools/files/patch-libannex::udp_layer.c12
-rw-r--r--net/annextools/files/patch-make.config5
-rw-r--r--net/annextools/files/patch-na::Makefile20
-rw-r--r--net/annextools/files/patch-netadm::Makefile19
-rw-r--r--net/annextools/pkg-descr8
-rw-r--r--net/annextools/pkg-plist30
-rw-r--r--net/ap-utils/distinfo1
-rw-r--r--net/ap-utils/pkg-descr10
-rw-r--r--net/ap-utils/pkg-plist11
-rw-r--r--net/argus/distinfo2
-rw-r--r--net/argus/files/patch-aa57
-rw-r--r--net/argus/files/patch-ab17
-rw-r--r--net/argus/files/patch-configure11
-rw-r--r--net/argus/pkg-descr12
-rw-r--r--net/argus/pkg-plist61
-rw-r--r--net/arpwatch/distinfo2
-rw-r--r--net/arpwatch/files/arpwatch.sh53
-rw-r--r--net/arpwatch/files/patch-ab22
-rw-r--r--net/arpwatch/files/patch-ae20
-rw-r--r--net/arpwatch/files/patch-af17
-rw-r--r--net/arpwatch/files/patch-ag39
-rw-r--r--net/arpwatch/files/patch-ah55
-rw-r--r--net/arpwatch/files/patch-ai39
-rw-r--r--net/arpwatch/files/patch-aj25
-rw-r--r--net/arpwatch/files/patch-ak25
-rw-r--r--net/arpwatch/pkg-descr21
-rw-r--r--net/arpwatch/pkg-plist11
-rw-r--r--net/arts++/distinfo1
-rw-r--r--net/arts++/files/patch-apps::artsasagg::artsasagg.cc28
-rw-r--r--net/arts++/files/patch-apps::artsintfms::artsintfms.cc27
-rw-r--r--net/arts++/files/patch-apps::artsnetagg::artsnetagg.cc24
-rw-r--r--net/arts++/files/patch-apps::artsnets::artsnets.cc37
-rw-r--r--net/arts++/files/patch-apps::artsnexthopagg::artsnexthopagg.cc27
-rw-r--r--net/arts++/files/patch-apps::artsnexthops::artsnexthops.cc45
-rw-r--r--net/arts++/files/patch-apps::artsportagg::artsportagg.cc25
-rw-r--r--net/arts++/files/patch-apps::artsportms::artsportms.cc27
-rw-r--r--net/arts++/files/patch-apps::artsprotoagg::artsprotoagg.cc24
-rw-r--r--net/arts++/files/patch-apps::artsprotos::artsprotos.cc37
-rw-r--r--net/arts++/files/patch-apps::artstoc::artstoc.cc25
-rw-r--r--net/arts++/files/patch-apps::artstos::artstos.cc43
-rw-r--r--net/arts++/files/patch-classes::include::ArtsAsMatrixData.hh15
-rw-r--r--net/arts++/files/patch-classes::include::ArtsAsMatrixEntry.hh16
-rw-r--r--net/arts++/files/patch-classes::include::ArtsAttribute.hh25
-rw-r--r--net/arts++/files/patch-classes::include::ArtsAttributeVector.hh10
-rw-r--r--net/arts++/files/patch-classes::include::ArtsCflowdCustomData.hh17
-rw-r--r--net/arts++/files/patch-classes::include::ArtsFileUtil.hh20
-rw-r--r--net/arts++/files/patch-classes::include::ArtsHeader.hh20
-rw-r--r--net/arts++/files/patch-classes::include::ArtsInterfaceMatrixData.hh22
-rw-r--r--net/arts++/files/patch-classes::include::ArtsIpPathEntry.hh10
-rw-r--r--net/arts++/files/patch-classes::include::ArtsNetMatrixData.hh24
-rw-r--r--net/arts++/files/patch-classes::include::ArtsNetMatrixEntry.hh15
-rw-r--r--net/arts++/files/patch-classes::include::ArtsPackageVersion.hh10
-rw-r--r--net/arts++/files/patch-classes::include::ArtsPortMatrixEntry.hh23
-rw-r--r--net/arts++/files/patch-classes::include::ArtsPrimitive.hh23
-rw-r--r--net/arts++/files/patch-classes::include::ArtsRttTimeSeriesTableData.hh18
-rw-r--r--net/arts++/files/patch-classes::include::ArtsSelectionSet.hh19
-rw-r--r--net/arts++/files/patch-classes::include::Ipv4Network.hh70
-rw-r--r--net/arts++/files/patch-classes::include::Ipv4PrefixPatricia.hh.in181
-rw-r--r--net/arts++/files/patch-classes::include::artslocal.h.in13
-rw-r--r--net/arts++/files/patch-classes::src::ArtsAsMatrixAggregatorMap.cc16
-rw-r--r--net/arts++/files/patch-classes::src::ArtsAsMatrixData.cc47
-rw-r--r--net/arts++/files/patch-classes::src::ArtsAsMatrixEntry.cc63
-rw-r--r--net/arts++/files/patch-classes::src::ArtsAttribute.cc134
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4AggregatorAttribute.cc55
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4AsPathAttribute.cc60
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4AsPathSegment.cc62
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4Attribute.cc107
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4DPAttribute.cc38
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4Prefix.cc11
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4RouteEntry.cc47
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBgp4RouteTableData.cc47
-rw-r--r--net/arts++/files/patch-classes::src::ArtsBitString.cc11
-rw-r--r--net/arts++/files/patch-classes::src::ArtsFileUtil.cc19
-rw-r--r--net/arts++/files/patch-classes::src::ArtsHeader.cc75
-rw-r--r--net/arts++/files/patch-classes::src::ArtsIfIndexSelectionSet.lex10
-rw-r--r--net/arts++/files/patch-classes::src::ArtsInterfaceMatrixAggregatorMap.cc13
-rw-r--r--net/arts++/files/patch-classes::src::ArtsInterfaceMatrixData.cc47
-rw-r--r--net/arts++/files/patch-classes::src::ArtsInterfaceMatrixEntry.cc57
-rw-r--r--net/arts++/files/patch-classes::src::ArtsIpPathData.cc107
-rw-r--r--net/arts++/files/patch-classes::src::ArtsIpPathEntry.cc66
-rw-r--r--net/arts++/files/patch-classes::src::ArtsNetMatrixAggregatorMap.cc16
-rw-r--r--net/arts++/files/patch-classes::src::ArtsNetMatrixData.cc47
-rw-r--r--net/arts++/files/patch-classes::src::ArtsNetMatrixEntry.cc65
-rw-r--r--net/arts++/files/patch-classes::src::ArtsNextHopTableAggregatorMap.cc16
-rw-r--r--net/arts++/files/patch-classes::src::ArtsNextHopTableData.cc56
-rw-r--r--net/arts++/files/patch-classes::src::ArtsNextHopTableEntry.cc67
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortChoice.cc20
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortChooser.lex11
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortMatrixAggregator.cc11
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortMatrixAggregatorMap.cc16
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortMatrixData.cc52
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortMatrixEntry.cc68
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortTableData.cc56
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPortTableEntry.cc65
-rw-r--r--net/arts++/files/patch-classes::src::ArtsPrimitive.cc203
-rw-r--r--net/arts++/files/patch-classes::src::ArtsProtocolTableAggregatorMap.cc16
-rw-r--r--net/arts++/files/patch-classes::src::ArtsProtocolTableData.cc60
-rw-r--r--net/arts++/files/patch-classes::src::ArtsProtocolTableEntry.cc67
-rw-r--r--net/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc124
-rw-r--r--net/arts++/files/patch-classes::src::ArtsSelectedPortTableData.cc56
-rw-r--r--net/arts++/files/patch-classes::src::ArtsTosTableAggregatorMap.cc16
-rw-r--r--net/arts++/files/patch-classes::src::ArtsTosTableData.cc121
-rw-r--r--net/arts++/files/patch-configure.in10
-rw-r--r--net/arts++/pkg-descr9
-rw-r--r--net/arts++/pkg-plist96
-rw-r--r--net/aspathtree/distinfo1
-rw-r--r--net/aspathtree/files/patch-etc::ASpath-tree.config63
-rw-r--r--net/aspathtree/files/patch-lib::getbgptable.pl66
-rw-r--r--net/aspathtree/files/patch-readme.txt99
-rw-r--r--net/aspathtree/files/patch-update-rtree153
-rw-r--r--net/aspathtree/pkg-descr24
-rw-r--r--net/aspathtree/pkg-message6
-rw-r--r--net/aspathtree/pkg-plist44
-rw-r--r--net/bandwidthd/distinfo2
-rw-r--r--net/bandwidthd/files/bandwidthd.sh22
-rw-r--r--net/bandwidthd/files/patch-Makefile35
-rw-r--r--net/bandwidthd/pkg-descr6
-rw-r--r--net/bandwidthd/pkg-plist9
-rw-r--r--net/bgpq/distinfo1
-rw-r--r--net/bgpq/files/patch-ro.c27
-rw-r--r--net/bgpq/pkg-descr9
-rw-r--r--net/bpft/distinfo1
-rw-r--r--net/bpft/files/patch-Makefile11
-rw-r--r--net/bpft/pkg-descr8
-rw-r--r--net/bpft/pkg-install4
-rw-r--r--net/bpft/pkg-plist15
-rw-r--r--net/braa/distinfo2
-rw-r--r--net/braa/pkg-descr10
-rw-r--r--net/braa/pkg-plist3
-rw-r--r--net/bsd-airtools/distinfo1
-rw-r--r--net/bsd-airtools/pkg-descr12
-rw-r--r--net/bsd-airtools/pkg-plist13
-rw-r--r--net/cacti/Makefile2
-rw-r--r--net/cdpd/distinfo1
-rw-r--r--net/cdpd/files/cdpd.patch11
-rw-r--r--net/cdpd/pkg-descr2
-rw-r--r--net/cdpd/pkg-plist2
-rw-r--r--net/cdpr/distinfo1
-rw-r--r--net/cdpr/files/patch-aa36
-rw-r--r--net/cdpr/pkg-descr12
-rw-r--r--net/cdpr/pkg-plist8
-rw-r--r--net/cfgstoragemk/distinfo2
-rw-r--r--net/cfgstoragemk/files/patch-Config.mk.in11
-rw-r--r--net/cfgstoragemk/files/patch-cfgstoragemaker17
-rw-r--r--net/cfgstoragemk/files/patch-cfgstoragemaker.115
-rw-r--r--net/cfgstoragemk/pkg-descr1
-rw-r--r--net/cfgstoragemk/pkg-plist4
-rw-r--r--net/cflowd/distinfo2
-rw-r--r--net/cflowd/files/cflowd.sh36
-rw-r--r--net/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh10
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdCisco.hh11
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdCollectorMap.hh10
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdFlowFilter.hh10
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdFlowPortList.hh10
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh26
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh11
-rw-r--r--net/cflowd/files/patch-classes::include::CflowdVersion.hh10
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdCisco.cc31
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc19
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdCiscoMap.cc19
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdCollector.cc10
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdNextHopTable.cc31
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdPacketQueue.cc28
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc28
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdRawFlow.cc200
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc10
-rw-r--r--net/cflowd/files/patch-classes::src::CflowdTosTable.cc28
-rw-r--r--net/cflowd/files/patch-classes::src::FlowFilter.y10
-rw-r--r--net/cflowd/files/patch-classes::src::Signal.cc10
-rw-r--r--net/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h10
-rw-r--r--net/cflowd/pkg-descr16
-rw-r--r--net/cflowd/pkg-plist92
-rw-r--r--net/choparp/distinfo2
-rw-r--r--net/choparp/files/patch-ab11
-rw-r--r--net/choparp/files/patch-choparp.852
-rw-r--r--net/choparp/files/patch-choparp.c12
-rw-r--r--net/choparp/pkg-descr7
-rw-r--r--net/cidr/distinfo1
-rw-r--r--net/cidr/files/patch-aa29
-rw-r--r--net/cidr/pkg-descr8
-rw-r--r--net/cisco_conf/distinfo1
-rw-r--r--net/cisco_conf/pkg-descr13
-rw-r--r--net/cisco_conf/pkg-plist9
-rw-r--r--net/ciscoconf/distinfo1
-rw-r--r--net/ciscoconf/pkg-descr7
-rw-r--r--net/ciscoconf/pkg-plist4
-rw-r--r--net/clog/distinfo1
-rw-r--r--net/clog/files/patch-clog.c15
-rw-r--r--net/clog/pkg-descr8
-rw-r--r--net/clog/pkg-plist2
-rw-r--r--net/confregdecode/distinfo1
-rw-r--r--net/confregdecode/files/confregdecode14
-rw-r--r--net/confregdecode/files/patch-ab25
-rw-r--r--net/confregdecode/pkg-descr9
-rw-r--r--net/confregdecode/pkg-plist5
-rw-r--r--net/cricket/distinfo2
-rw-r--r--net/cricket/files/patch-cricket-conf.pl.sample19
-rw-r--r--net/cricket/files/patch-sample-config::news-server::Defaults19
-rw-r--r--net/cricket/files/pkg-message.in7
-rw-r--r--net/cricket/pkg-descr7
-rw-r--r--net/cricket/pkg-install24
-rw-r--r--net/cricket/pkg-plist165
-rw-r--r--net/darkstat/distinfo1
-rw-r--r--net/darkstat/pkg-descr9
-rw-r--r--net/darkstat/pkg-plist26
-rw-r--r--net/dhcpconf/distinfo1
-rw-r--r--net/dhcpconf/files/patch-aa34
-rw-r--r--net/dhcpconf/pkg-descr9
-rw-r--r--net/dhcpconf/pkg-plist3
-rw-r--r--net/disco/distinfo2
-rw-r--r--net/disco/pkg-descr9
-rw-r--r--net/disco/pkg-plist4
-rw-r--r--net/docsis/distinfo1
-rw-r--r--net/docsis/files/patch-Makefile24
-rw-r--r--net/docsis/files/patch-docsis_decode.c11
-rw-r--r--net/docsis/files/patch-docsis_main.c18
-rw-r--r--net/docsis/files/patch-docsis_snmp.c13
-rw-r--r--net/docsis/files/patch-docsis_yy.y13
-rw-r--r--net/docsis/files/patch-ethermac.h13
-rw-r--r--net/docsis/pkg-descr6
-rw-r--r--net/docsis/pkg-plist22
-rw-r--r--net/driftnet/distinfo1
-rw-r--r--net/driftnet/files/patch-Makefile51
-rw-r--r--net/driftnet/files/patch-driftnet.c22
-rw-r--r--net/driftnet/pkg-descr14
-rw-r--r--net/echolot/distinfo2
-rw-r--r--net/echolot/pkg-descr6
-rw-r--r--net/echolot/pkg-plist10
-rw-r--r--net/ehnt/distinfo2
-rw-r--r--net/ehnt/files/ehntserv.sh.sample25
-rw-r--r--net/ehnt/files/patch-Makefile55
-rw-r--r--net/ehnt/files/patch-ProcessASN.pl128
-rw-r--r--net/ehnt/files/patch-config-h18
-rw-r--r--net/ehnt/files/patch-ehnt-lookup11
-rw-r--r--net/ehnt/files/patch-ehnt__client.c14
-rw-r--r--net/ehnt/files/patch-ehnt__processflow.c14
-rw-r--r--net/ehnt/files/patch-ehntserv.c176
-rw-r--r--net/ehnt/pkg-descr10
-rw-r--r--net/ehnt/pkg-plist7
-rw-r--r--net/entitymib/Makefile2
-rw-r--r--net/etherape/distinfo1
-rw-r--r--net/etherape/files/patch-src::Makefile.in13
-rw-r--r--net/etherape/pkg-descr8
-rw-r--r--net/etherape/pkg-plist20
-rw-r--r--net/ethereal/Makefile2
-rw-r--r--net/ettercap/distinfo2
-rw-r--r--net/ettercap/files/patch-aa46
-rw-r--r--net/ettercap/files/patch-ab120
-rw-r--r--net/ettercap/files/patch-plugins::H03_hydra1::Makefile.in11
-rw-r--r--net/ettercap/files/patch-plugins::Makefile.in11
-rw-r--r--net/ettercap/pkg-descr17
-rw-r--r--net/ettercap/pkg-plist67
-rw-r--r--net/flow-extract/distinfo2
-rw-r--r--net/flow-extract/files/patch-Makefile25
-rw-r--r--net/flow-extract/files/patch-includes70
-rw-r--r--net/flow-extract/files/patch-proto12
-rw-r--r--net/flow-extract/pkg-descr19
-rw-r--r--net/flow-tools/distinfo1
-rw-r--r--net/flow-tools/files/patch-configs_Makefile26
-rw-r--r--net/flow-tools/files/patch-configure17
-rw-r--r--net/flow-tools/files/patch-ftpaths.h58
-rw-r--r--net/flow-tools/files/patch-src_flow-dscan_c12
-rw-r--r--net/flow-tools/pkg-descr4
-rw-r--r--net/flow-tools/pkg-plist39
-rw-r--r--net/flowscan/distinfo1
-rw-r--r--net/flowscan/files/cflowd.sh37
-rw-r--r--net/flowscan/files/flowscan.sh39
-rw-r--r--net/flowscan/pkg-descr9
-rw-r--r--net/flowscan/pkg-message35
-rw-r--r--net/flowscan/pkg-plist31
-rw-r--r--net/fprobe/distinfo2
-rw-r--r--net/fprobe/pkg-descr5
-rw-r--r--net/fprobe/pkg-plist4
-rw-r--r--net/gkrellm_snmp/Makefile2
-rw-r--r--net/gps/distinfo2
-rw-r--r--net/gps/pkg-descr13
-rw-r--r--net/gps/pkg-plist6
-rw-r--r--net/hawk/Makefile2
-rw-r--r--net/icmpmonitor/distinfo1
-rw-r--r--net/icmpmonitor/files/patch-aa20
-rw-r--r--net/icmpmonitor/pkg-descr5
-rw-r--r--net/icmpquery/distinfo1
-rw-r--r--net/icmpquery/files/Makefile9
-rw-r--r--net/icmpquery/pkg-descr3
-rw-r--r--net/ifgraph/distinfo1
-rw-r--r--net/ifgraph/files/crontab.in3
-rw-r--r--net/ifgraph/files/patch-find-if.pl22
-rw-r--r--net/ifgraph/files/patch-ifgraph.conf17
-rw-r--r--net/ifgraph/files/patch-ifgraph.pl29
-rw-r--r--net/ifgraph/files/patch-makegraph.pl27
-rw-r--r--net/ifgraph/pkg-deinstall38
-rw-r--r--net/ifgraph/pkg-descr12
-rw-r--r--net/ifgraph/pkg-install51
-rw-r--r--net/ifgraph/pkg-message32
-rw-r--r--net/ifgraph/pkg-plist33
-rw-r--r--net/ifstat/Makefile2
-rw-r--r--net/iftop/distinfo2
-rw-r--r--net/iftop/files/patch-cfgfile.c10
-rw-r--r--net/iftop/pkg-descr4
-rw-r--r--net/iftop/pkg-plist3
-rw-r--r--net/iog/distinfo1
-rw-r--r--net/iog/pkg-descr12
-rw-r--r--net/iog/pkg-install24
-rw-r--r--net/iog/pkg-plist15
-rw-r--r--net/ipacctd/distinfo1
-rw-r--r--net/ipacctd/files/ipacctd.sh.sample72
-rw-r--r--net/ipacctd/pkg-descr8
-rw-r--r--net/ipacctd/pkg-plist5
-rw-r--r--net/ipaudit/distinfo1
-rw-r--r--net/ipaudit/files/patch-Makefile15
-rw-r--r--net/ipaudit/files/patch-src::Makefile50
-rw-r--r--net/ipaudit/files/patch-src::hash.h11
-rw-r--r--net/ipaudit/pkg-descr21
-rw-r--r--net/ipaudit/pkg-message11
-rw-r--r--net/ipaudit/pkg-plist6
-rw-r--r--net/ipcad/distinfo1
-rw-r--r--net/ipcad/files/ipcad.sh.tmpl19
-rw-r--r--net/ipcad/pkg-descr12
-rw-r--r--net/ipcad/pkg-message7
-rw-r--r--net/ipcad/pkg-plist3
-rw-r--r--net/ipcalc/distinfo1
-rw-r--r--net/ipcalc/pkg-descr12
-rw-r--r--net/ipfm/distinfo1
-rw-r--r--net/ipfm/pkg-descr9
-rw-r--r--net/ipfm/pkg-plist4
-rw-r--r--net/ipv6calc/distinfo1
-rw-r--r--net/ipv6calc/pkg-descr7
-rw-r--r--net/ipv6calc/pkg-plist2
-rw-r--r--net/irrtoolset/distinfo1
-rw-r--r--net/irrtoolset/pkg-descr23
-rw-r--r--net/irrtoolset/pkg-plist8
-rw-r--r--net/isic/distinfo1
-rw-r--r--net/isic/pkg-descr14
-rw-r--r--net/isic/pkg-plist5
-rw-r--r--net/junipoll/distinfo1
-rw-r--r--net/junipoll/pkg-descr10
-rw-r--r--net/junipoll/pkg-plist3
-rw-r--r--net/knowlan/distinfo1
-rw-r--r--net/knowlan/files/patch-configure44
-rw-r--r--net/knowlan/pkg-descr8
-rw-r--r--net/knowlan/pkg-plist2
-rw-r--r--net/libsmi/distinfo1
-rw-r--r--net/libsmi/pkg-descr11
-rw-r--r--net/libsmi/pkg-plist248
-rw-r--r--net/mbrowse/distinfo1
-rw-r--r--net/mbrowse/pkg-descr3
-rw-r--r--net/mrtg-ping-probe/Makefile2
-rw-r--r--net/mrtg/distinfo1
-rw-r--r--net/mrtg/files/patch-configure120
-rw-r--r--net/mrtg/pkg-descr12
-rw-r--r--net/mrtg/pkg-plist79
-rw-r--r--net/nagios-plugins/distinfo1
-rw-r--r--net/nagios-plugins/files/patch-check_breeze.pl23
-rw-r--r--net/nagios-plugins/files/patch-check_by_ssh.c20
-rw-r--r--net/nagios-plugins/files/patch-check_ifoperstatus.pl11
-rw-r--r--net/nagios-plugins/files/patch-check_ifstatus.pl11
-rw-r--r--net/nagios-plugins/files/patch-configure.in120
-rw-r--r--net/nagios-plugins/files/patch-subst.in36
-rw-r--r--net/nagios-plugins/files/patch-utils.sh.in15
-rw-r--r--net/nagios-plugins/pkg-descr15
-rw-r--r--net/nagios-plugins/pkg-plist57
-rw-r--r--net/nagios-plugins/scripts/configure119
-rw-r--r--net/nagios/distinfo1
-rw-r--r--net/nagios/files/DEINSTALL.tmpl23
-rw-r--r--net/nagios/files/INSTALL.tmpl67
-rw-r--r--net/nagios/files/MESSAGE.tmpl15
-rw-r--r--net/nagios/files/nagios.sh.tmpl55
-rw-r--r--net/nagios/files/patch-aa37
-rw-r--r--net/nagios/files/patch-ab10
-rw-r--r--net/nagios/files/patch-ad69
-rw-r--r--net/nagios/files/patch-ae11
-rw-r--r--net/nagios/files/patch-ag31
-rw-r--r--net/nagios/files/patch-ai25
-rw-r--r--net/nagios/files/patch-xcddb.c11
-rw-r--r--net/nagios/files/patch-xdddb.c11
-rw-r--r--net/nagios/files/patch-xeddb.c11
-rw-r--r--net/nagios/files/patch-xrddb.c11
-rw-r--r--net/nagios/files/patch-xsddb.c11
-rw-r--r--net/nagios/pkg-descr12
-rw-r--r--net/nagios/pkg-plist314
-rw-r--r--net/nat/distinfo1
-rw-r--r--net/nat/pkg-descr2
-rw-r--r--net/nat/pkg-plist4
-rw-r--r--net/nbtscan/distinfo2
-rw-r--r--net/nbtscan/pkg-descr7
-rw-r--r--net/nbtscan/pkg-plist3
-rw-r--r--net/nefu/distinfo2
-rw-r--r--net/nefu/pkg-descr6
-rw-r--r--net/net-snmp-tkmib/distinfo1
-rw-r--r--net/net-snmp-tkmib/files/patch-tkmib7
-rw-r--r--net/net-snmp-tkmib/pkg-descr12
-rw-r--r--net/net-snmp/distinfo1
-rw-r--r--net/net-snmp/files/extra-patch-snmplib::mib.c136
-rw-r--r--net/net-snmp/files/patch-Makefile.in11
-rw-r--r--net/net-snmp/files/patch-Makefile.top11
-rw-r--r--net/net-snmp/files/patch-aa13
-rw-r--r--net/net-snmp/files/patch-aclocal.m448
-rw-r--r--net/net-snmp/files/patch-configure.in19
-rw-r--r--net/net-snmp/files/patch-diskio.c56
-rw-r--r--net/net-snmp/files/patch-file.c24
-rw-r--r--net/net-snmp/files/patch-freebsd5.h22
-rw-r--r--net/net-snmp/files/patch-hr_storage.c52
-rw-r--r--net/net-snmp/files/patch-hr_swrun.c86
-rw-r--r--net/net-snmp/files/patch-hr_system.c23
-rw-r--r--net/net-snmp/files/patch-interfaces.c16
-rw-r--r--net/net-snmp/files/patch-ipv6.c113
-rw-r--r--net/net-snmp/files/patch-local:Makefile.in11
-rw-r--r--net/net-snmp/files/patch-memory_freebsd2.c35
-rw-r--r--net/net-snmp/files/patch-snmpTCPIPv6Domain.c30
-rw-r--r--net/net-snmp/files/patch-snmpUCDIPv6Domain.c30
-rw-r--r--net/net-snmp/files/patch-snmpd.8.def13
-rw-r--r--net/net-snmp/files/patch-tcpTable.c26
-rw-r--r--net/net-snmp/files/patch-udpTable.c25
-rw-r--r--net/net-snmp/files/patch-vmstat_freebsd2.c14
-rw-r--r--net/net-snmp/files/snmpd.sh.sample35
-rw-r--r--net/net-snmp/pkg-descr12
-rw-r--r--net/net-snmp/pkg-message23
-rw-r--r--net/net-snmp/pkg-plist309
-rw-r--r--net/net-snmp4/distinfo1
-rw-r--r--net/net-snmp4/files/patch-Makefile.top11
-rw-r--r--net/net-snmp4/files/patch-aa13
-rw-r--r--net/net-snmp4/files/patch-aclocal.m448
-rw-r--r--net/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c96
-rw-r--r--net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c59
-rw-r--r--net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c17
-rw-r--r--net/net-snmp4/files/patch-ak21
-rw-r--r--net/net-snmp4/files/patch-al29
-rw-r--r--net/net-snmp4/files/patch-auto_nlist.c18
-rw-r--r--net/net-snmp4/files/patch-disk.c32
-rw-r--r--net/net-snmp4/files/patch-hr_disk.c11
-rw-r--r--net/net-snmp4/files/patch-hr_storage.c61
-rw-r--r--net/net-snmp4/files/patch-hr_swrun.c84
-rw-r--r--net/net-snmp4/files/patch-local:Makefile.in11
-rw-r--r--net/net-snmp4/files/patch-memory_freebsd2.c21
-rw-r--r--net/net-snmp4/files/snmpd.sh.sample20
-rw-r--r--net/net-snmp4/pkg-descr12
-rw-r--r--net/net-snmp4/pkg-plist146
-rw-r--r--net/netams/distinfo1
-rw-r--r--net/netams/files/netams.sh26
-rw-r--r--net/netams/files/patch-Makefile55
-rw-r--r--net/netams/pkg-descr9
-rw-r--r--net/netams/pkg-message15
-rw-r--r--net/netams/pkg-plist33
-rw-r--r--net/netams/scripts/configure.netams150
-rw-r--r--net/netmask/distinfo1
-rw-r--r--net/netmask/files/patch-aa21
-rw-r--r--net/netmask/files/patch-ab14
-rw-r--r--net/netmask/pkg-descr5
-rw-r--r--net/netqc/distinfo1
-rw-r--r--net/netqc/pkg-descr5
-rw-r--r--net/netqc/pkg-plist5
-rw-r--r--net/netsaint-plugins/distinfo2
-rw-r--r--net/netsaint-plugins/files/patch-ab284
-rw-r--r--net/netsaint-plugins/files/patch-ac12
-rw-r--r--net/netsaint-plugins/files/patch-check_by_ssh.c29
-rw-r--r--net/netsaint-plugins/files/patch-check_ntp.pl76
-rw-r--r--net/netsaint-plugins/files/patch-check_snmp.c20
-rw-r--r--net/netsaint-plugins/files/patch-check_ssh.c20
-rw-r--r--net/netsaint-plugins/files/patch-subst.in11
-rw-r--r--net/netsaint-plugins/pkg-descr16
-rw-r--r--net/netsaint-plugins/pkg-plist52
-rw-r--r--net/netsaint-plugins/scripts/configure109
-rw-r--r--net/netsaint/distinfo4
-rw-r--r--net/netsaint/files/patch-aa39
-rw-r--r--net/netsaint/files/patch-ab10
-rw-r--r--net/netsaint/files/patch-ad23
-rw-r--r--net/netsaint/files/patch-ae11
-rw-r--r--net/netsaint/files/patch-ag31
-rw-r--r--net/netsaint/files/patch-ai27
-rw-r--r--net/netsaint/files/patch-aj11
-rw-r--r--net/netsaint/files/patch-ak11
-rw-r--r--net/netsaint/files/patch-ba20
-rw-r--r--net/netsaint/pkg-descr12
-rw-r--r--net/netsaint/pkg-install68
-rw-r--r--net/netsaint/pkg-plist297
-rw-r--r--net/netsaint/scripts/checkps10
-rw-r--r--net/netspoc/distinfo2
-rw-r--r--net/netspoc/pkg-descr15
-rw-r--r--net/netspoc/pkg-plist9
-rw-r--r--net/nitpicker/distinfo1
-rw-r--r--net/nitpicker/files/patch-aa20
-rw-r--r--net/nitpicker/files/patch-ab11
-rw-r--r--net/nitpicker/files/patch-ac10
-rw-r--r--net/nitpicker/files/patch-ad20
-rw-r--r--net/nitpicker/files/patch-ae9
-rw-r--r--net/nitpicker/pkg-descr13
-rw-r--r--net/nitpicker/pkg-plist3
-rw-r--r--net/nocol/distinfo1
-rw-r--r--net/nocol/files/patch-aa21
-rw-r--r--net/nocol/files/patch-ab37
-rw-r--r--net/nocol/pkg-descr12
-rw-r--r--net/nocol/pkg-plist107
-rw-r--r--net/nrpe/distinfo1
-rw-r--r--net/nrpe/pkg-descr9
-rw-r--r--net/nrpe/pkg-install68
-rw-r--r--net/nrpe/pkg-plist4
-rw-r--r--net/nrpep/distinfo1
-rw-r--r--net/nrpep/files/patch-aa113
-rw-r--r--net/nrpep/files/patch-ab99
-rw-r--r--net/nrpep/files/patch-ac11
-rw-r--r--net/nrpep/pkg-descr10
-rw-r--r--net/nrpep/pkg-message17
-rw-r--r--net/nrpep/pkg-plist8
-rw-r--r--net/nsc/distinfo1
-rw-r--r--net/nsc/files/patch-aa21
-rw-r--r--net/nsc/pkg-descr5
-rw-r--r--net/nsca/distinfo1
-rw-r--r--net/nsca/pkg-descr7
-rw-r--r--net/nsca/pkg-plist12
-rw-r--r--net/nstreams/distinfo1
-rw-r--r--net/nstreams/pkg-descr15
-rw-r--r--net/nstreams/pkg-plist3
-rw-r--r--net/openvmps/distinfo2
-rw-r--r--net/openvmps/files/vmps.db49
-rw-r--r--net/openvmps/files/vmpsd.sh34
-rw-r--r--net/openvmps/pkg-descr5
-rw-r--r--net/openvmps/pkg-plist4
-rw-r--r--net/oproute/distinfo2
-rw-r--r--net/oproute/files/patch-Makefile17
-rw-r--r--net/oproute/files/patch-oproute.cpp28
-rw-r--r--net/oproute/files/patch-oproute.h12
-rw-r--r--net/oproute/pkg-descr18
-rw-r--r--net/p0f/distinfo3
-rw-r--r--net/p0f/files/patch-FreeBSD16
-rw-r--r--net/p0f/files/patch-mtu.h14
-rw-r--r--net/p0f/files/patch-p0f.c43
-rw-r--r--net/p0f/files/patch-test_p0fq.c12
-rw-r--r--net/p0f/pkg-descr23
-rw-r--r--net/p5-Altoids/distinfo1
-rw-r--r--net/p5-Altoids/pkg-descr8
-rw-r--r--net/p5-Altoids/pkg-plist29
-rw-r--r--net/p5-Cflow/distinfo2
-rw-r--r--net/p5-Cflow/pkg-descr4
-rw-r--r--net/p5-Cflow/pkg-plist7
-rw-r--r--net/p5-JUNOScript/distinfo1
-rw-r--r--net/p5-JUNOScript/pkg-descr6
-rw-r--r--net/p5-JUNOScript/pkg-plist21
-rw-r--r--net/p5-Mon/distinfo1
-rw-r--r--net/p5-Mon/pkg-descr8
-rw-r--r--net/p5-Mon/pkg-plist6
-rw-r--r--net/p5-Net-CIDR/distinfo2
-rw-r--r--net/p5-Net-CIDR/pkg-descr5
-rw-r--r--net/p5-Net-CIDR/pkg-plist5
-rw-r--r--net/p5-Net-IP/distinfo1
-rw-r--r--net/p5-Net-IP/files/patch-Makefile.PL7
-rw-r--r--net/p5-Net-IP/pkg-descr8
-rw-r--r--net/p5-Net-IP/pkg-plist7
-rw-r--r--net/p5-Net-IPv4Addr/distinfo1
-rw-r--r--net/p5-Net-IPv4Addr/pkg-descr10
-rw-r--r--net/p5-Net-IPv4Addr/pkg-plist9
-rw-r--r--net/p5-Net-IPv6Addr/distinfo1
-rw-r--r--net/p5-Net-IPv6Addr/pkg-descr11
-rw-r--r--net/p5-Net-IPv6Addr/pkg-plist5
-rw-r--r--net/p5-Net-Netmask/distinfo2
-rw-r--r--net/p5-Net-Netmask/pkg-descr5
-rw-r--r--net/p5-Net-Netmask/pkg-plist6
-rw-r--r--net/p5-Net-SNMP/distinfo1
-rw-r--r--net/p5-Net-SNMP/pkg-descr8
-rw-r--r--net/p5-Net-SNMP/pkg-plist17
-rw-r--r--net/p5-Net-SNMP3/distinfo1
-rw-r--r--net/p5-Net-SNMP3/pkg-descr8
-rw-r--r--net/p5-Net-SNMP3/pkg-plist6
-rw-r--r--net/p5-NetAddr-IP-Count/Makefile4
-rw-r--r--net/p5-NetAddr-IP/distinfo1
-rw-r--r--net/p5-NetAddr-IP/pkg-descr9
-rw-r--r--net/p5-NetAddr-IP/pkg-plist5
-rw-r--r--net/p5-SNMP-MIB-Compiler/distinfo1
-rw-r--r--net/p5-SNMP-MIB-Compiler/pkg-descr6
-rw-r--r--net/p5-SNMP-MIB-Compiler/pkg-plist13
-rw-r--r--net/p5-SNMP-Util/distinfo1
-rw-r--r--net/p5-SNMP-Util/files/patch-aa24
-rw-r--r--net/p5-SNMP-Util/pkg-descr3
-rw-r--r--net/p5-SNMP-Util/pkg-plist5
-rw-r--r--net/p5-SNMP/distinfo2
-rw-r--r--net/p5-SNMP/files/patch-Makefile.PL11
-rw-r--r--net/p5-SNMP/pkg-descr13
-rw-r--r--net/p5-SNMP/pkg-plist7
-rw-r--r--net/p5-SNMP_Session/distinfo1
-rw-r--r--net/p5-SNMP_Session/pkg-descr17
-rw-r--r--net/p5-SNMP_Session/pkg-plist9
-rw-r--r--net/p5-Telnet-Cisco/distinfo1
-rw-r--r--net/p5-Telnet-Cisco/pkg-descr7
-rw-r--r--net/p5-Telnet-Cisco/pkg-plist11
-rw-r--r--net/p5-Tie-NetAddr-IP/distinfo1
-rw-r--r--net/p5-Tie-NetAddr-IP/pkg-descr11
-rw-r--r--net/p5-Tie-NetAddr-IP/pkg-plist7
-rw-r--r--net/packit/distinfo2
-rw-r--r--net/packit/pkg-descr9
-rw-r--r--net/pancho/distinfo1
-rw-r--r--net/pancho/files/patch-MANIFEST11
-rw-r--r--net/pancho/files/patch-Makefile.PL92
-rw-r--r--net/pancho/pkg-descr17
-rw-r--r--net/pancho/pkg-message6
-rw-r--r--net/pancho/pkg-plist19
-rw-r--r--net/pixilate/distinfo2
-rw-r--r--net/pixilate/pkg-descr11
-rw-r--r--net/pixilate/pkg-plist3
-rw-r--r--net/pmacct/distinfo2
-rw-r--r--net/pmacct/pkg-descr13
-rw-r--r--net/pmacct/pkg-plist9
-rw-r--r--net/portmon/distinfo2
-rw-r--r--net/portmon/files/patch-extras::portmon.810
-rw-r--r--net/portmon/pkg-descr7
-rw-r--r--net/portmon/pkg-plist4
-rw-r--r--net/py-ipy/distinfo1
-rw-r--r--net/py-ipy/pkg-descr6
-rw-r--r--net/py-ipy/pkg-plist3
-rw-r--r--net/py-snmp/distinfo1
-rw-r--r--net/py-snmp/pkg-descr5
-rw-r--r--net/py-snmp/pkg-plist318
-rw-r--r--net/rancid/distinfo1
-rw-r--r--net/rancid/files/patch-etc::Makefile.am29
-rw-r--r--net/rancid/files/patch-etc::Makefile.in29
-rw-r--r--net/rancid/pkg-descr16
-rw-r--r--net/rancid/pkg-message11
-rw-r--r--net/rancid/pkg-plist72
-rw-r--r--net/rate/distinfo1
-rw-r--r--net/rate/pkg-descr15
-rw-r--r--net/remarp/distinfo1
-rw-r--r--net/remarp/pkg-descr10
-rw-r--r--net/remarp/pkg-plist5
-rw-r--r--net/rtg/Makefile2
-rw-r--r--net/ruby-snmp/distinfo1
-rw-r--r--net/ruby-snmp/files/patch-aa45
-rw-r--r--net/ruby-snmp/files/patch-mib.c9
-rw-r--r--net/ruby-snmp/files/patch-snmp.c9
-rw-r--r--net/ruby-snmp/pkg-descr6
-rw-r--r--net/ruby-snmp/pkg-plist8
-rw-r--r--net/satellite/distinfo1
-rw-r--r--net/satellite/pkg-descr9
-rw-r--r--net/satellite/pkg-install17
-rw-r--r--net/satellite/pkg-message18
-rw-r--r--net/satellite/pkg-plist4
-rw-r--r--net/scdp/distinfo1
-rw-r--r--net/scdp/pkg-descr5
-rw-r--r--net/scli/distinfo1
-rw-r--r--net/scli/files/patch-ab991
-rw-r--r--net/scli/files/patch-ac13
-rw-r--r--net/scli/pkg-descr7
-rw-r--r--net/scotty3/distinfo2
-rw-r--r--net/scotty3/files/patch-aa12
-rw-r--r--net/scotty3/files/patch-ab15
-rw-r--r--net/scotty3/files/patch-ac46
-rw-r--r--net/scotty3/files/patch-ad71
-rw-r--r--net/scotty3/files/patch-ae8
-rw-r--r--net/scotty3/files/patch-af20
-rw-r--r--net/scotty3/files/patch-fixes38
-rw-r--r--net/scotty3/files/patch-unix:nmicmpd.c17
-rw-r--r--net/scotty3/files/scotty.c27
-rw-r--r--net/scotty3/pkg-descr6
-rw-r--r--net/scotty3/pkg-plist375
-rw-r--r--net/sendip/distinfo1
-rw-r--r--net/sendip/files/patch-Makefile33
-rw-r--r--net/sendip/files/patch-gnugetopt.c10
-rw-r--r--net/sendip/pkg-descr7
-rw-r--r--net/sendip/pkg-plist11
-rw-r--r--net/sing/distinfo1
-rw-r--r--net/sing/files/patch-Makefile.in45
-rw-r--r--net/sing/files/patch-configure53
-rw-r--r--net/sing/pkg-descr20
-rw-r--r--net/sipcalc/distinfo1
-rw-r--r--net/sipcalc/pkg-descr24
-rw-r--r--net/sipcalc/pkg-plist3
-rw-r--r--net/smokeping/Makefile2
-rw-r--r--net/sting/distinfo2
-rw-r--r--net/sting/files/patch-aa19
-rw-r--r--net/sting/files/patch-ab11
-rw-r--r--net/sting/files/patch-ac11
-rw-r--r--net/sting/pkg-descr10
-rw-r--r--net/sting/pkg-plist2
-rw-r--r--net/subcalc/distinfo1
-rw-r--r--net/subcalc/pkg-descr8
-rw-r--r--net/sysmon/distinfo1
-rw-r--r--net/sysmon/pkg-descr12
-rw-r--r--net/sysmon/pkg-plist14
-rw-r--r--net/tas/distinfo1
-rw-r--r--net/tas/pkg-descr24
-rw-r--r--net/tas/pkg-plist27
-rw-r--r--net/tcpreplay/distinfo1
-rw-r--r--net/tcpreplay/pkg-descr14
-rw-r--r--net/tcpreplay/pkg-plist4
-rw-r--r--net/trafd/distinfo1
-rw-r--r--net/trafd/files/patch-aa71
-rw-r--r--net/trafd/files/patch-ab7
-rw-r--r--net/trafd/files/patch-ac7
-rw-r--r--net/trafd/files/patch-ad7
-rw-r--r--net/trafd/files/patch-ae7
-rw-r--r--net/trafd/files/patch-ah39
-rw-r--r--net/trafd/files/trafd.sh.sample54
-rw-r--r--net/trafd/pkg-descr21
-rw-r--r--net/trafd/pkg-plist18
-rw-r--r--net/whatmask/distinfo2
-rw-r--r--net/whatmask/pkg-descr12
-rw-r--r--net/whatmask/pkg-plist6
-rw-r--r--net/wide-dhcp/distinfo2
-rw-r--r--net/wide-dhcp/files/patch-aa22
-rw-r--r--net/wide-dhcp/files/patch-ac53
-rw-r--r--net/wide-dhcp/files/patch-ae18
-rw-r--r--net/wide-dhcp/files/patch-ag18
-rw-r--r--net/wide-dhcp/files/patch-aq19
-rw-r--r--net/wide-dhcp/files/patch-as319
-rw-r--r--net/wide-dhcp/files/patch-aw20
-rw-r--r--net/wide-dhcp/files/patch-az53
-rw-r--r--net/wide-dhcp/files/patch-ba11
-rw-r--r--net/wide-dhcp/files/patch-database.c30
-rw-r--r--net/wide-dhcp/files/wide-dhcps.sh.sample30
-rw-r--r--net/wide-dhcp/pkg-descr66
-rw-r--r--net/wide-dhcp/pkg-plist16
-rw-r--r--net/wide-dhcp/pkg-req11
-rw-r--r--net/wireshark/Makefile2
-rw-r--r--net/xbone/Makefile4
-rw-r--r--net/zabbix-agent/Makefile2
-rw-r--r--net/zabbix/distinfo1
-rw-r--r--net/zabbix/files/patch-src-zabbix_sucker-Makefile.in12
-rw-r--r--net/zabbix/files/patch-src-zabbix_sucker-zabbix_sucker.c11
-rw-r--r--net/zabbix/pkg-descr8
-rw-r--r--net/zabbix/pkg-install45
-rw-r--r--net/zabbix/pkg-message8
-rw-r--r--net/zabbix/pkg-plist196
-rw-r--r--net/zabbix/pkg-plist.agent8
-rw-r--r--net/zabbix/scripts/dbsetup.sh6
-rw-r--r--net/zabbix/scripts/zabbix-agent.sh.sample14
-rw-r--r--net/zabbix/scripts/zabbix.sh.sample14
761 files changed, 16 insertions, 19646 deletions
diff --git a/net/Makefile b/net/Makefile
index a082ee3d713b..4e72b67c1aa9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -8,72 +8,48 @@
SUBDIR += AquaGatekeeper
SUBDIR += DarwinStreamingServer
SUBDIR += GeoIP
- SUBDIR += NeTraMet
SUBDIR += SSLtelnet
SUBDIR += adasockets
SUBDIR += aget
- SUBDIR += aggregate
- SUBDIR += aguri
SUBDIR += aim
- SUBDIR += airport
SUBDIR += amsn
- SUBDIR += angst
- SUBDIR += annextools
- SUBDIR += ap-utils
SUBDIR += apache-soap
SUBDIR += apinger
SUBDIR += archie
SUBDIR += archie.el
- SUBDIR += argus
SUBDIR += ari-yahoo
SUBDIR += arla
SUBDIR += arpd
SUBDIR += arping
SUBDIR += arprelease
- SUBDIR += arpwatch
+#XXX move to net-mgmt
SUBDIR += arpwatch-devel
- SUBDIR += arts++
SUBDIR += asfrecorder
SUBDIR += aslookup
- SUBDIR += aspathtree
SUBDIR += asterisk
SUBDIR += atmsupport
SUBDIR += ayttm
SUBDIR += b2bua
SUBDIR += balance
- SUBDIR += bandwidthd
SUBDIR += bbsnet
SUBDIR += beacon-server
SUBDIR += bfilter
- SUBDIR += bgpq
SUBDIR += bing
SUBDIR += binkd
SUBDIR += bmon
SUBDIR += bnbt
SUBDIR += boclient
SUBDIR += bounce
- SUBDIR += bpft
- SUBDIR += braa
- SUBDIR += bsd-airtools
SUBDIR += bsdproxy
SUBDIR += cacti
SUBDIR += callgen
SUBDIR += cap
SUBDIR += ccmsn
SUBDIR += cdonkey
- SUBDIR += cdpd
- SUBDIR += cdpr
SUBDIR += centericq
- SUBDIR += cfgstoragemk
- SUBDIR += cflowd
- SUBDIR += choparp
- SUBDIR += cidr
- SUBDIR += cisco_conf
- SUBDIR += ciscoconf
SUBDIR += citadel
SUBDIR += citrix_ica
SUBDIR += click
- SUBDIR += clog
SUBDIR += clusterit
SUBDIR += cnet
SUBDIR += coda5_client
@@ -83,11 +59,9 @@
SUBDIR += coda6_server
SUBDIR += coda_doc
SUBDIR += coda_intro
- SUBDIR += confregdecode
SUBDIR += corkscrew
SUBDIR += cphone
SUBDIR += crescendo
- SUBDIR += cricket
SUBDIR += cryptcat
SUBDIR += ct
SUBDIR += ctorrent
@@ -98,7 +72,6 @@
SUBDIR += cvsync
SUBDIR += danamics
SUBDIR += dante
- SUBDIR += darkstat
SUBDIR += datapipe
SUBDIR += dcgui
SUBDIR += dclib
@@ -112,43 +85,31 @@
SUBDIR += dgd-lpmud
SUBDIR += dgd-net
SUBDIR += dhcp-agent
- SUBDIR += dhcpconf
SUBDIR += dhcpdump
SUBDIR += dhcping
SUBDIR += dictd
SUBDIR += dictd-database
SUBDIR += diradmin
- SUBDIR += disco
SUBDIR += doc
- SUBDIR += docsis
- SUBDIR += driftnet
SUBDIR += dtcp
SUBDIR += dtcpclient
SUBDIR += easysoap
SUBDIR += echat
- SUBDIR += echolot
SUBDIR += echoping
SUBDIR += edonkey-gui-gtk
SUBDIR += edonkey-gui-gtk-urlslave
SUBDIR += edonkey-gui-java
- SUBDIR += ehnt
SUBDIR += entitymib
SUBDIR += erlang_xmlrpc
- SUBDIR += etherape
SUBDIR += etherboot
SUBDIR += ethereal
- SUBDIR += ettercap
SUBDIR += eudc-emacs20
SUBDIR += fcptools
SUBDIR += fidelio
SUBDIR += firetalk
- SUBDIR += flow-extract
- SUBDIR += flow-tools
- SUBDIR += flowscan
SUBDIR += forg
SUBDIR += fpc-inet
SUBDIR += fping
- SUBDIR += fprobe
SUBDIR += freebsd-uucp
SUBDIR += freenet
SUBDIR += freenet6
@@ -207,7 +168,6 @@
SUBDIR += googolplex
SUBDIR += gopher
SUBDIR += gossip
- SUBDIR += gps
SUBDIR += gq
SUBDIR += gsk
SUBDIR += gspoof
@@ -232,41 +192,28 @@
SUBDIR += ickle
SUBDIR += icmpchat
SUBDIR += icmpinfo
- SUBDIR += icmpmonitor
- SUBDIR += icmpquery
SUBDIR += icpld
SUBDIR += icqlib
SUBDIR += icqlib0
SUBDIR += icqnix
- SUBDIR += ifgraph
SUBDIR += ifstat
- SUBDIR += iftop
SUBDIR += imapproxy
SUBDIR += imcom
- SUBDIR += iog
SUBDIR += ip6_int
- SUBDIR += ipacctd
- SUBDIR += ipaudit
- SUBDIR += ipcad
- SUBDIR += ipcalc
SUBDIR += iperf
SUBDIR += ipex
- SUBDIR += ipfm
SUBDIR += ipfw-graph
SUBDIR += ipgrab
SUBDIR += iplog
SUBDIR += ipsorc
SUBDIR += ipsumdump
SUBDIR += ipsvd
- SUBDIR += ipv6calc
SUBDIR += ipv6socket_scrub
SUBDIR += ipw
- SUBDIR += irrtoolset
SUBDIR += isc-dhcp3-client
SUBDIR += isc-dhcp3-devel
SUBDIR += isc-dhcp3-relay
SUBDIR += isc-dhcp3-server
- SUBDIR += isic
SUBDIR += jabber
SUBDIR += jabber-aim
SUBDIR += jabber-conference
@@ -281,13 +228,11 @@
SUBDIR += javadc
SUBDIR += jffnms
SUBDIR += jumpgate
- SUBDIR += junipoll
SUBDIR += jwhois
SUBDIR += kdenetwork3
SUBDIR += kmerlin
SUBDIR += kmess
SUBDIR += kmldonkey
- SUBDIR += knowlan
SUBDIR += konverse
SUBDIR += kopete
SUBDIR += kpopup
@@ -315,7 +260,6 @@
SUBDIR += libosip2
SUBDIR += libpcap
SUBDIR += librsync
- SUBDIR += libsmi
SUBDIR += libsocket++
SUBDIR += libsocketcpp
SUBDIR += libunp
@@ -332,7 +276,6 @@
SUBDIR += linc
SUBDIR += linphone
SUBDIR += linpopup
- SUBDIR += linux-agsatellite
SUBDIR += linux-edonkey-core
SUBDIR += linux-edonkey-gui-gtk
SUBDIR += linux-edonkey-server
@@ -348,7 +291,6 @@
SUBDIR += mad_fcl
SUBDIR += magictun
SUBDIR += mars_nwe
- SUBDIR += mbrowse
SUBDIR += memcached
SUBDIR += merlinmon
SUBDIR += micq
@@ -364,8 +306,6 @@
SUBDIR += mpd
SUBDIR += mpich
SUBDIR += mrt
- SUBDIR += mrtg
- SUBDIR += mrtg-ping-probe
SUBDIR += msend
SUBDIR += msntp
SUBDIR += mtr
@@ -374,41 +314,27 @@
SUBDIR += mute-net-gui
SUBDIR += mute-net-text
SUBDIR += mutella
- SUBDIR += nagios
- SUBDIR += nagios-plugins
SUBDIR += naim
SUBDIR += nakenchat
SUBDIR += nam
SUBDIR += napshare
SUBDIR += nast
- SUBDIR += nat
SUBDIR += nbd-server
- SUBDIR += nbtscan
SUBDIR += nc
SUBDIR += nc6
SUBDIR += ncp
SUBDIR += ncplib
- SUBDIR += nefu
SUBDIR += nemesis
SUBDIR += net-http
- SUBDIR += net-snmp
- SUBDIR += net-snmp-tkmib
- SUBDIR += net-snmp4
- SUBDIR += netams
SUBDIR += netatalk
SUBDIR += netboot
SUBDIR += netcat
SUBDIR += netdude
SUBDIR += netmap
- SUBDIR += netmask
SUBDIR += netpipes
- SUBDIR += netqc
- SUBDIR += netsaint
- SUBDIR += netsaint-plugins
SUBDIR += netscript
SUBDIR += netsed
SUBDIR += netspeed_applet
- SUBDIR += netspoc
SUBDIR += netstrain
SUBDIR += nettest
SUBDIR += ng_netflow
@@ -417,19 +343,12 @@
SUBDIR += nic
SUBDIR += nicmond
SUBDIR += nicotine
- SUBDIR += nitpicker
SUBDIR += nload
SUBDIR += nocatauth-gateway
SUBDIR += nocatauth-server
SUBDIR += nocatsplash
- SUBDIR += nocol
- SUBDIR += nrpe
- SUBDIR += nrpep
SUBDIR += ns
- SUBDIR += nsc
- SUBDIR += nsca
SUBDIR += nss_ldap
- SUBDIR += nstreams
SUBDIR += ntalk
SUBDIR += ntop
SUBDIR += ntp
@@ -456,15 +375,10 @@
SUBDIR += openreg
SUBDIR += openslp
SUBDIR += openverse
- SUBDIR += openvmps
- SUBDIR += oproute
SUBDIR += ortp
SUBDIR += osrtspproxy
SUBDIR += ossp-sa
- SUBDIR += p0f
- SUBDIR += p5-Altoids
SUBDIR += p5-Archie
- SUBDIR += p5-Cflow
SUBDIR += p5-EasyTCP
SUBDIR += p5-File-Rsync
SUBDIR += p5-File-RsyncP
@@ -475,16 +389,12 @@
SUBDIR += p5-IO-INET6
SUBDIR += p5-IO-Interface
SUBDIR += p5-IO-Socket-Multicast
- SUBDIR += p5-JUNOScript
SUBDIR += p5-Jabber-Connection
- SUBDIR += p5-Mon
SUBDIR += p5-Net
SUBDIR += p5-Net-AIM
SUBDIR += p5-Net-AOLIM
SUBDIR += p5-Net-Amazon
SUBDIR += p5-Net-BGP
- SUBDIR += p5-Net-CIDR
- SUBDIR += p5-Net-CIDR-Lite
SUBDIR += p5-Net-DLookup
SUBDIR += p5-Net-Daemon
SUBDIR += p5-Net-Dict
@@ -492,13 +402,9 @@
SUBDIR += p5-Net-Finger
SUBDIR += p5-Net-Google
SUBDIR += p5-Net-ICQ2000
- SUBDIR += p5-Net-IP
- SUBDIR += p5-Net-IPv4Addr
- SUBDIR += p5-Net-IPv6Addr
SUBDIR += p5-Net-Ident
SUBDIR += p5-Net-Jabber
SUBDIR += p5-Net-MovableType
- SUBDIR += p5-Net-Netmask
SUBDIR += p5-Net-ParseWhois
SUBDIR += p5-Net-Patricia
SUBDIR += p5-Net-Pcap
@@ -508,8 +414,6 @@
SUBDIR += p5-Net-SCP
SUBDIR += p5-Net-SFTP
SUBDIR += p5-Net-SMPP
- SUBDIR += p5-Net-SNMP
- SUBDIR += p5-Net-SNMP3
SUBDIR += p5-Net-SNPP
SUBDIR += p5-Net-SSH
SUBDIR += p5-Net-SSH-Perl
@@ -527,8 +431,6 @@
SUBDIR += p5-Net-Z3950
SUBDIR += p5-Net-Z3950-SimpleServer
SUBDIR += p5-Net-ext
- SUBDIR += p5-NetAddr-IP
- SUBDIR += p5-NetAddr-IP-Count
SUBDIR += p5-NetPacket
SUBDIR += p5-OAI-Harvester
SUBDIR += p5-POE-Component-RRDTool
@@ -538,25 +440,17 @@
SUBDIR += p5-RPC-XML
SUBDIR += p5-ResourcePool-Resource-Net-LDAP
SUBDIR += p5-ResourcePool-Resource-SOAP-Lite
- SUBDIR += p5-SNMP
- SUBDIR += p5-SNMP-MIB-Compiler
- SUBDIR += p5-SNMP-Util
- SUBDIR += p5-SNMP_Session
SUBDIR += p5-SOAP
SUBDIR += p5-SOAP-Data-Builder
SUBDIR += p5-SOAP-Lite
SUBDIR += p5-Socket6
SUBDIR += p5-Socks
SUBDIR += p5-Spread-Session
- SUBDIR += p5-Telnet-Cisco
- SUBDIR += p5-Tie-NetAddr-IP
SUBDIR += p5-URI
SUBDIR += p5-Validate-Net
SUBDIR += p5-X500-DN
SUBDIR += p5-XPC
SUBDIR += p5-perl-ldap
- SUBDIR += packit
- SUBDIR += pancho
SUBDIR += papaya
SUBDIR += partysip
SUBDIR += passlogd
@@ -575,15 +469,12 @@
SUBDIR += pim6dd
SUBDIR += pim6sd
SUBDIR += pipsecd
- SUBDIR += pixilate
SUBDIR += plb
- SUBDIR += pmacct
SUBDIR += pmf
SUBDIR += poink
SUBDIR += poptop
SUBDIR += pork
SUBDIR += portfwd
- SUBDIR += portmon
SUBDIR += pppload
SUBDIR += pppoa
SUBDIR += ppptraf
@@ -600,7 +491,6 @@
SUBDIR += py-bittorrent-core
SUBDIR += py-fngrab
SUBDIR += py-google
- SUBDIR += py-ipy
SUBDIR += py-jabber
SUBDIR += py-ldap1
SUBDIR += py-ldap2
@@ -612,7 +502,6 @@
SUBDIR += py-rrdtool_lgpl
SUBDIR += py-rt
SUBDIR += py-smb
- SUBDIR += py-snmp
SUBDIR += py-soapy
SUBDIR += py-spreadmodule
SUBDIR += py-xmlrpc
@@ -630,14 +519,11 @@
SUBDIR += radreport
SUBDIR += radvd
SUBDIR += raggle
- SUBDIR += rancid
- SUBDIR += rate
SUBDIR += rboot
SUBDIR += rdesktop
SUBDIR += rdist6
SUBDIR += redir
SUBDIR += relay
- SUBDIR += remarp
SUBDIR += rexx-sock
SUBDIR += rfbproxy
SUBDIR += rinetd
@@ -656,7 +542,6 @@
SUBDIR += ruby-pcap
SUBDIR += ruby-radius
SUBDIR += ruby-romp
- SUBDIR += ruby-snmp
SUBDIR += ruby-spread
SUBDIR += ruby-tcpsocketpipe
SUBDIR += ruby-tserver
@@ -667,15 +552,9 @@
SUBDIR += samba-libsmbclient
SUBDIR += sambasentinel
SUBDIR += samplicator
- SUBDIR += satellite
SUBDIR += scand
- SUBDIR += scdp
- SUBDIR += scli
- SUBDIR += scotty3
- SUBDIR += scr_ipfm
SUBDIR += sdl_net
SUBDIR += sendfile
- SUBDIR += sendip
SUBDIR += ser
SUBDIR += serveez
SUBDIR += sharity-light
@@ -683,8 +562,6 @@
SUBDIR += silc-server
SUBDIR += silky
SUBDIR += simicq
- SUBDIR += sing
- SUBDIR += sipcalc
SUBDIR += sipsak
SUBDIR += slirp
SUBDIR += slurm
@@ -702,18 +579,14 @@
SUBDIR += ssldump
SUBDIR += ssltunnel-client
SUBDIR += ssltunnel-server
- SUBDIR += sting
SUBDIR += stone
SUBDIR += straw
- SUBDIR += subcalc
SUBDIR += suckblow
SUBDIR += sup
SUBDIR += svnc
- SUBDIR += sysmon
SUBDIR += tac_plus-libradius
SUBDIR += tac_plus4
SUBDIR += tacshell
- SUBDIR += tas
SUBDIR += tcpcat
SUBDIR += tcpdstat
SUBDIR += tcpdump
@@ -722,7 +595,6 @@
SUBDIR += tcping
SUBDIR += tcpmssd
SUBDIR += tcpreen
- SUBDIR += tcpreplay
SUBDIR += tcpsg
SUBDIR += tcpshow
SUBDIR += tcpslice
@@ -746,7 +618,6 @@
SUBDIR += torrentsniff
SUBDIR += tptest
SUBDIR += traceroute
- SUBDIR += trafd
SUBDIR += trafshow
SUBDIR += tramp
SUBDIR += tramp-emacs20
@@ -776,9 +647,7 @@
SUBDIR += vtun
SUBDIR += wais
SUBDIR += wakeonlan
- SUBDIR += whatmask
SUBDIR += whois
- SUBDIR += wide-dhcp
SUBDIR += widentd
SUBDIR += wistumbler2
SUBDIR += wmlj
@@ -805,7 +674,6 @@
SUBDIR += xmule
SUBDIR += xnap
SUBDIR += xprobe
- SUBDIR += xsmbrowser
SUBDIR += xtraceroute
SUBDIR += xwhois
SUBDIR += yaph
@@ -815,8 +683,6 @@
SUBDIR += yptransitd
SUBDIR += ysm
SUBDIR += ytalk
- SUBDIR += zabbix
- SUBDIR += zabbix-agent
SUBDIR += zebra
SUBDIR += zebra-devel
SUBDIR += zebra-server
diff --git a/net/NeTraMet/distinfo b/net/NeTraMet/distinfo
deleted file mode 100644
index 045d31cc3b4b..000000000000
--- a/net/NeTraMet/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-MD5 (netramet/NeTraMet44.tar.gz) = 22a883ac1e6ba83b0392c3b40f84b464
-SIZE (netramet/NeTraMet44.tar.gz) = 634714
-MD5 (netramet/usguide.pdf) = ad100f2a4cc5d6ba7886a65c78fdcfcf
-SIZE (netramet/usguide.pdf) = 43270
-MD5 (netramet/srlguide.pdf) = ee266612af69ee64651baa02503e92b7
-SIZE (netramet/srlguide.pdf) = 54268
-MD5 (netramet/ntmref.pdf) = 3fac8d138def55128c4c8fa3b21e394f
-SIZE (netramet/ntmref.pdf) = 156258
-MD5 (netramet/nm_rc.pdf) = 8acc4dd5cb06459e1f3b4548ce39d511
-SIZE (netramet/nm_rc.pdf) = 25181
-MD5 (netramet/nifty.pdf) = 69a7cd99a1a6c6073cadbab8c335dd0c
-SIZE (netramet/nifty.pdf) = 46605
-MD5 (netramet/fdutil.pdf) = dbb2146c27a7b2c87ef98c1b528bce30
-SIZE (netramet/fdutil.pdf) = 25881
diff --git a/net/NeTraMet/files/patch-ab b/net/NeTraMet/files/patch-ab
deleted file mode 100644
index 7e4937b77152..000000000000
--- a/net/NeTraMet/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/bgp/integrat/readbgp.c.orig Sun Mar 23 17:40:57 2003
-+++ src/bgp/integrat/readbgp.c Sun Mar 23 17:41:06 2003
-@@ -119,7 +119,6 @@
- #ifdef __unix__
- #define min(a,b) (((a) < (b)) ? (a) : (b))
- #define _sys_errlist sys_errlist
--int sys_nerr;
- #if !defined(ALPHA) && !defined(IRIX) && !defined(NETBSD)
- extern const char *const sys_errlist[];
- #endif
diff --git a/net/NeTraMet/files/patch-ac b/net/NeTraMet/files/patch-ac
deleted file mode 100644
index 3f1dbf05a5fd..000000000000
--- a/net/NeTraMet/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/bgp/types/types.h.orig Sun Mar 23 17:41:15 2003
-+++ src/bgp/types/types.h Sun Mar 23 17:41:23 2003
-@@ -395,7 +395,6 @@
- * under UNIX
- */
- #define _sys_errlist sys_errlist
--extern int sys_nerr;
- #if !defined(ALPHA) && !defined(IRIX) && !defined(NETBSD)
- extern const char *const sys_errlist[];
- #endif
diff --git a/net/NeTraMet/pkg-descr b/net/NeTraMet/pkg-descr
deleted file mode 100644
index 4be646512a07..000000000000
--- a/net/NeTraMet/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The first implementation of the Internet Accounting Architecture (RFC 2063
-and RFC 2064).
-
-The NeTraMet distribution file contains everything you need to build
-NeTraMet (an RTFM meter) and NeMaC (a combined RTFM manager and meter
-reader), as well as nifty (Nevil's X-Windows flow analyser) and srl (an
-optimising compiler for SRL, the Simple Ruleset Language).
-
-WWW: http://www.auckland.ac.nz/net/Accounting/
diff --git a/net/NeTraMet/pkg-plist b/net/NeTraMet/pkg-plist
deleted file mode 100644
index 31aa1952267f..000000000000
--- a/net/NeTraMet/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-bin/LfapMet
-bin/NeMaC
-bin/NeTraMet
-bin/NetFlowMet
-bin/NetFwd
-bin/fd_extract
-bin/fd_filter
-%%MOTIF%%bin/nifty
-bin/nm_rc
-bin/nm_rr
-bin/nm_st
-bin/srl
-%%DATADIR%%/examples/2ip8.srl
-%%DATADIR%%/examples/broadcast.srl
-%%DATADIR%%/examples/cs2.srl
-%%DATADIR%%/examples/icmp.srl
-%%DATADIR%%/examples/k1.srl
-%%DATADIR%%/examples/k8.srl
-%%DATADIR%%/examples/n-ports.srl
-%%DATADIR%%/examples/nifty.srl
-%%DATADIR%%/examples/non-srl/rules.broadcast
-%%DATADIR%%/examples/non-srl/rules.default
-%%DATADIR%%/examples/non-srl/rules.gateway
-%%DATADIR%%/examples/non-srl/rules.ipport
-%%DATADIR%%/examples/non-srl/rules.lan
-%%DATADIR%%/examples/non-srl/rules.manage
-%%DATADIR%%/examples/non-srl/rules.nifty
-%%DATADIR%%/examples/non-srl/rules.other
-%%DATADIR%%/examples/non-srl/rules.rc.ip
-%%DATADIR%%/examples/non-srl/rules.rc.ip.new
-%%DATADIR%%/examples/non-srl/rules.rc.ipx
-%%DATADIR%%/examples/non-srl/rules.rc.ports
-%%DATADIR%%/examples/non-srl/rules.rc.ports.new
-%%DATADIR%%/examples/non-srl/rules.sample
-%%DATADIR%%/examples/non-srl/rules.two-adj-routers
-%%DATADIR%%/examples/non-srl/rules.two-ip-groups
-%%DATADIR%%/examples/non-srl/rules.x_ip
-%%DATADIR%%/examples/other.srl
-%%DATADIR%%/examples/pr+bc.srl
-%%DATADIR%%/mibs/meter-mib-31.txt
-%%DATADIR%%/mibs/meter-mib-32.txt
-%%DATADIR%%/mibs/mib-1.txt
-%%DATADIR%%/mibs/mib-41.txt
-%%DATADIR%%/mibs/mib.auckland
-%%DATADIR%%/mibs/mib.txt
-%%DATADIR%%/mibs/rtm-text.txt
-%%PORTDOCS%%%%DOCSDIR%%/fdutil.pdf
-%%PORTDOCS%%%%DOCSDIR%%/nifty.pdf
-%%PORTDOCS%%%%DOCSDIR%%/nm_rc.pdf
-%%PORTDOCS%%%%DOCSDIR%%/ntmref.pdf
-%%PORTDOCS%%%%DOCSDIR%%/srlguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/usguide.pdf
-@dirrm %%DATADIR%%/mibs
-@dirrm %%DATADIR%%/examples/non-srl
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/aggregate/distinfo b/net/aggregate/distinfo
deleted file mode 100644
index 74deb9b3b735..000000000000
--- a/net/aggregate/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (aggregate-1.6.tar.gz) = 6fcc515388bf2c5b0c8f9f733bfee7e1
diff --git a/net/aggregate/files/patch-Makefile.in b/net/aggregate/files/patch-Makefile.in
deleted file mode 100644
index 6befa62f5f17..000000000000
--- a/net/aggregate/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig Fri Nov 2 10:49:52 2001
-+++ Makefile.in Fri Nov 2 12:04:11 2001
-@@ -25,7 +25,6 @@
- INSTALL = @INSTALL@
- DEFS = @DEFS@
- LIBS = @LIBS@
--CFLAGS = -O
- LDFLAGS = -s
- prefix = @prefix@
-
diff --git a/net/aggregate/pkg-descr b/net/aggregate/pkg-descr
deleted file mode 100644
index fffa7334612b..000000000000
--- a/net/aggregate/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Takes a list of prefixes in conventional format on stdin,
-and performs two optimisations to attempt to reduce the
-length of the prefix list.
-
-The first optimisation is to remove any supplied prefixes
-which are supurfluous because they are already included in
-another supplied prefix. For example, 203.97.2.0/24 would
-be removed if 203.97.0.0/17 was also supplied.
-
-The second optimisation identifies adjacent prefixes that
-can be combined under a single, shorter-length prefix. For
-example, 203.97.2.0/24 and 203.97.3.0/24 can be combined
-into the single prefix 203.97.2.0/23.
-
-
-jabley@automagic.org
diff --git a/net/aggregate/pkg-plist b/net/aggregate/pkg-plist
deleted file mode 100644
index c64c92d4a007..000000000000
--- a/net/aggregate/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/aggregate
-bin/aggregate-ios
diff --git a/net/aguri/distinfo b/net/aguri/distinfo
deleted file mode 100644
index 0a7c65a1276a..000000000000
--- a/net/aguri/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (aguri-0.7.tar.gz) = b15586e62763a5d5a2295f115c42df29
diff --git a/net/aguri/files/extra-patch-Makefile b/net/aguri/files/extra-patch-Makefile
deleted file mode 100644
index 11180c8fc7ac..000000000000
--- a/net/aguri/files/extra-patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.aguri.orig Thu Mar 27 11:53:26 2003
-+++ Makefile Thu Mar 27 13:43:46 2003
-@@ -11,9 +11,9 @@
- scripts/makeimages.pl scripts/density.pl
-
- CFLAGS= -O2 -Wall -DNDEBUG
--DEFINES= -DINET6 -DAGURI_STATS $(SYS_DEFINES) # -DXTREE
--INCLUDES= -I. $(COMPAT_INCLUDES) $(SYS_INCLUDES) # -I/usr/X11R6/include
--LIBS= $(SYS_LIBS) -lpcap # -R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
-+DEFINES= -DINET6 -DAGURI_STATS $(SYS_DEFINES) -DXTREE
-+INCLUDES= -I. $(COMPAT_INCLUDES) $(SYS_INCLUDES) -I/usr/X11R6/include
-+LIBS= $(SYS_LIBS) -lpcap -R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
-
- all: $(PROG)
-
diff --git a/net/aguri/pkg-descr b/net/aguri/pkg-descr
deleted file mode 100644
index 8202186ca18d..000000000000
--- a/net/aguri/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Aguri is an aggregation-based traffic profiler targeted for near real-time,
-long-term, and wide-area traffic monitoring. Aguri adapts itself to spatial
-traffic distribution by aggregating small volume flows into aggregates, and
-achieves temporal aggregation by creating a summary of summaries applying the
-same algorithm to its outputs. A set of scripts are used for archiving and
-visualizing summaries in different time scales. Aguri does not need a
-predefined rule set and is capable of detecting an unexpected increase of
-unknown protocols or DoS attacks, which considerably simplifies the task of
-network monitoring.
-
-Aguri produces four separate profiles for source addresses, destination
-addresses, source protocols and destination protocols. IP addresses are
-designed to be hierarchical and aggregatable so that it is natural to apply
-aggregation. Both IPv4 and IPv6 are supported in address profiles. Although
-protocol numbers are not hierarchical, the same technique can be used to
-identify port ranges. We concatenate the IP version, the protocol number and
-the TCP/UDP port number to create a 32-bit key for a protocol profile.
-
-WWW: http://www.csl.sony.co.jp/person/kjc/software.html
-
-- Yann
-yb@sainte-barbe.org
diff --git a/net/aguri/pkg-plist b/net/aguri/pkg-plist
deleted file mode 100644
index 514144ed9c7a..000000000000
--- a/net/aguri/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/aguri
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/README
-%%DATADIR%%/agurify.pl
-%%DATADIR%%/density.pl
-%%DATADIR%%/makeimages.pl
-%%DATADIR%%/makeplot.pl
-@dirrm %%DATADIR%%
diff --git a/net/airport/distinfo b/net/airport/distinfo
deleted file mode 100644
index 3485c0937bda..000000000000
--- a/net/airport/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (configurator_201.zip) = 766b687e041001ced655a11fd368d7e9
-SIZE (configurator_201.zip) = 155307
-MD5 (configurator_152.zip) = 1abe6dc50d85dfbca51101dd689e6fea
-SIZE (configurator_152.zip) = 156282
-MD5 (link_monitor_11.zip) = e6837268e0edcdfd1566dec35b09deb7
-SIZE (link_monitor_11.zip) = 32853
-MD5 (host_monitor_10.zip) = 8f413a9a283c28d3e7ba461b79da1b45
-SIZE (host_monitor_10.zip) = 32356
-MD5 (airportmodemutility_20.zip) = 502cb25bddd0ba95c2d5c746a6b47844
-SIZE (airportmodemutility_20.zip) = 16316
diff --git a/net/airport/files/airport b/net/airport/files/airport
deleted file mode 100644
index b5cd960bcc44..000000000000
--- a/net/airport/files/airport
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-case $0 in
- *airport)
- file=AirportBaseStationConfig
- ;;
- *airport2)
- file=Airport2BaseStationConfig
- ;;
- *hostmon)
- file=HostMonitor
- ;;
- *linkmon)
- file=LinkMonitor
- ;;
- *airmodem)
- file=AirportModemUtility
- ;;
- *)
- echo "Unknown command"
- exit 1
-esac
-
-exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/${file}.jar
-
-exit 1
diff --git a/net/airport/pkg-descr b/net/airport/pkg-descr
deleted file mode 100644
index ba91bee62d9d..000000000000
--- a/net/airport/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a configuration program for the Apple Airport and Lucent RG-1000
-in Java.
-
-The Airport and Lucent RG-1000 are the same, except for one detail:
-On the RG-1000 the net name cannot be changed and is overridden by
-the hex number on the label on the bottom.
-
-This port also installs the Link Monitor and Host Monitor utilities
-and the Modem utility.
-The Configurator for the new "Snow" Basestation is started with "airport2".
-
-Author: Jon Sevy <jsevy@mcs.drexel.edu>
-WWW: http://edge.mcs.drexel.edu/GICL/people/sevy/airport/index.html
diff --git a/net/airport/pkg-plist b/net/airport/pkg-plist
deleted file mode 100644
index a12f95c4e5c5..000000000000
--- a/net/airport/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/airport
-bin/airport2
-bin/hostmon
-bin/linkmon
-bin/airmodem
-share/java/Airport2BaseStationConfig.jar
-share/java/AirportBaseStationConfig.jar
-share/java/HostMonitor.jar
-share/java/LinkMonitor.jar
-share/java/AirportModemUtility.jar
-share/doc/airport/AUTHORS
-share/doc/airport/COPYING
-share/doc/airport/helpdocs/ReadMe.txt
-share/doc/airport/helpdocs/mainscreen.jpg
-share/doc/airport/helpdocs/manual.html
-@dirrm share/doc/airport/helpdocs
-@dirrm share/doc/airport
diff --git a/net/angst/distinfo b/net/angst/distinfo
deleted file mode 100644
index b9bac0c06ce4..000000000000
--- a/net/angst/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (angst-0.4b.tar.gz) = 21643cd776bf478c6fbe4ddabb826be8
-SIZE (angst-0.4b.tar.gz) = 13903
diff --git a/net/angst/pkg-descr b/net/angst/pkg-descr
deleted file mode 100644
index 261e0a1b3cbb..000000000000
--- a/net/angst/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Angst is an active sniffer, based on libpcap and libnet. Dumps into a file
-the payload of all the TCP packets received on the specified ports. Also,
-it implements methods for active sniffing of networks with switches.
-
-WWW: http://angst.sourceforge.net/
diff --git a/net/annextools/distinfo b/net/annextools/distinfo
deleted file mode 100644
index 5652d7ec0c66..000000000000
--- a/net/annextools/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (microannex_xl/R10.0B-R2.3.tar.Z) = 60e08b649c964282d412d449e80f9c92
diff --git a/net/annextools/files/patch-Makefile b/net/annextools/files/patch-Makefile
deleted file mode 100644
index 95857646d432..000000000000
--- a/net/annextools/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig Thu Sep 18 20:10:32 2003
-+++ Makefile Thu Sep 18 20:10:32 2003
-@@ -0,0 +1,7 @@
-+SUBDIR= libannex
-+SUBDIR+= netadm
-+SUBDIR+= erpcd
-+SUBDIR+= na
-+SUBDIR+= rtelnet
-+
-+.include <bsd.subdir.mk>
diff --git a/net/annextools/files/patch-erpcd::Makefile b/net/annextools/files/patch-erpcd::Makefile
deleted file mode 100644
index 523512e5583e..000000000000
--- a/net/annextools/files/patch-erpcd::Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
---- erpcd/Makefile.orig Wed Jun 24 17:23:53 1998
-+++ erpcd/Makefile Sun Sep 28 00:23:28 2003
-@@ -227,6 +227,9 @@
- CDBCFILES = acp_dbm_lib.c
- CDBOFILES = acp_dbm_lib.o
-
-+CFLAGS += -I../inc
-+LIBFLAG = -lcrypt
-+
- CFILES = ${ERPCFILES} ch_passwd.c convert.c ${COMCFILES} ${STUBCFILES}\
- ${CDBCFILES} ${SECURIDCFILES} ${ENIGMACFILES} acp_dbm.c \
- tms_dbm.c tms_convert.c spy.c
-@@ -262,58 +265,58 @@
- erpcd: ${ERPOFILES} ${COMOFILES} ../libannex/libannex.a ../netadm/netadm.a \
- ${ENIGMAFILES} ${SECURIDFILES} ${KERBEROSLIB} ${STUBLFILES}\
- ${CDBOFILES} ${SECURIDOFILES} ${ENIGMAOFILES}
-- @/bin/echo "*** Building erpcd utility ***" > /dev/tty
-+ @/bin/echo "*** Building erpcd utility ***"
- ${CC} ${BUILD_CORRECTION} ${CFLAGS} -o erpcd \
- ${ERPOFILES} ${SECURIDOFILES} ${COMOFILES} \
- ${ENIGMAOFILES} ${CDBOFILES}\
- ../libannex/libannex.a ../netadm/netadm.a \
- ${SECURIDFILES} ${KERBEROSLIB} ${ENIGMAFILES} \
- ${STUBLINKING} ${LIBFLAG}
-- @/bin/echo "*** Done building erpcd utility ***" > /dev/tty
-+ @/bin/echo "*** Done building erpcd utility ***"
-
- ch_passwd: ch_passwd.o ${COMOFILES} ${CDBOFILES} ../libannex/libannex.a
-- @/bin/echo "*** Building ch_passwd utility ***" > /dev/tty
-+ @/bin/echo "*** Building ch_passwd utility ***"
- ${CC} ${CFLAGS} -o ch_passwd ch_passwd.o ${COMOFILES} \
- ${CDBOFILES} ../libannex/libannex.a ${LIBFLAG}
-- @/bin/echo "*** Done building ch_passwd utility ***" > /dev/tty
-+ @/bin/echo "*** Done building ch_passwd utility ***"
-
- convert: convert.o ${COMOFILES} ../libannex/libannex.a
-- @/bin/echo "*** Building convert utility ***" > /dev/tty
-+ @/bin/echo "*** Building convert utility ***"
- ${CC} ${CFLAGS} -o convert convert.o ${COMOFILES} \
- ../libannex/libannex.a ${LIBFLAG}
-- @/bin/echo "*** Done building convert utility ***" > /dev/tty
-+ @/bin/echo "*** Done building convert utility ***"
-
- acp_dbm: acp_dbm.o ${CDBOFILES} ../libannex/libannex.a
-- @/bin/echo "*** Building acp_dbm utility ***" > /dev/tty
-+ @/bin/echo "*** Building acp_dbm utility ***"
- ${CC} ${CFLAGS} -o acp_dbm acp_dbm.o ${CDBOFILES} \
- ../libannex/libannex.a ${LIBFLAG}
-- @/bin/echo "*** Done building acp_dbm utility ***" > /dev/tty
-+ @/bin/echo "*** Done building acp_dbm utility ***"
-
- tms_dbm: tms_dbm.o tms_lib.o ../libannex/libannex.a ../netadm/netadm.a
-- @/bin/echo "*** Building tms_dbm utility ***" > /dev/tty
-+ @/bin/echo "*** Building tms_dbm utility ***"
- ${CC} ${CFLAGS} -o tms_dbm tms_dbm.o tms_lib.o \
- ../libannex/libannex.a ../netadm/netadm.a ${LIBFLAG}
-- @/bin/echo "*** Done building tms_dbm utility ***" > /dev/tty
-+ @/bin/echo "*** Done building tms_dbm utility ***"
-
- tms_convert: tms_convert.o tms_lib.o ../libannex/libannex.a \
- ../netadm/netadm.a
-- @/bin/echo "*** Building tms_convert utility ***" > /dev/tty
-+ @/bin/echo "*** Building tms_convert utility ***"
- ${CC} ${CFLAGS} -o tms_convert tms_convert.o tms_lib.o \
- ../libannex/libannex.a ../netadm/netadm.a ${LIBFLAG}
-- @/bin/echo "*** Done building tms_convert utility ***" > /dev/tty
-+ @/bin/echo "*** Done building tms_convert utility ***"
-
- spy: spy.o ../libannex/erpc_subr.o ../libannex/libannex.a \
- ../netadm/netadm.a
-- @/bin/echo "*** Building spy utility ***" > /dev/tty
-+ @/bin/echo "*** Building spy utility ***"
- ${CC} ${CFLAGS} -o spy spy.o ../libannex/erpc_subr.o \
- ../libannex/libannex.a ../netadm/netadm.a ${LIBFLAG}
-- @/bin/echo "*** Done building spy utility ***" > /dev/tty
-+ @/bin/echo "*** Done building spy utility ***"
-
- acplint: acplint.o getacpuser.o getacpstubs.o env_parser.o time_parser.o
-- @/bin/echo "*** Building acplint utility ***" > /dev/tty
-+ @/bin/echo "*** Building acplint utility ***"
- ${CC} ${CFLAGS} -g -o acplint acplint.o getacpuser.o getacpstubs.o \
- env_parser.o time_parser.o ../libannex/libannex.a ${LIBFLAG}
-- @/bin/echo "*** Done building acplint utility ***" > /dev/tty
-+ @/bin/echo "*** Done building acplint utility ***"
-
- lintup:
- lint ${ALLFLAGS} ${ERPCFILES} ${COMCFILES} ${CDBCFILES}
-@@ -346,7 +349,7 @@
- STOPPREFIX = /etc/rc0.d/K09
-
- install-initd:
-- @echo "*** Installing init.d start and stop script ***" > /dev/tty
-+ @echo "*** Installing init.d start and stop script ***"
- $(INSTALL) sysexec $(INITD) $(ANNEXINIT)
- $(RM) -f /etc/rc[20].d/[SK][0-9][0-9]$(ANNEXINIT)
- ln $(INITD)/$(ANNEXINIT) $(STARTPREFIX)$(ANNEXINIT)
diff --git a/net/annextools/files/patch-erpcd::acp.c b/net/annextools/files/patch-erpcd::acp.c
deleted file mode 100644
index 08ec79704808..000000000000
--- a/net/annextools/files/patch-erpcd::acp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- erpcd/acp.c.orig Tue Dec 2 14:49:05 1997
-+++ erpcd/acp.c Thu Sep 18 20:10:32 2003
-@@ -40,10 +40,6 @@
- #include <signal.h>
- #include <errno.h>
-
--#ifndef _WIN32
--extern int sys_nerr;
--#endif /* not _WIN32 */
--
- #include "../libannex/api_if.h"
- #include "../libannex/srpc.h"
- #include "../inc/courier/courier.h"
diff --git a/net/annextools/files/patch-erpcd::acp_lib.c b/net/annextools/files/patch-erpcd::acp_lib.c
deleted file mode 100644
index 7f0f63beb618..000000000000
--- a/net/annextools/files/patch-erpcd::acp_lib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- erpcd/acp_lib.c.orig Thu Feb 5 15:14:00 1998
-+++ erpcd/acp_lib.c Thu Sep 18 20:10:32 2003
-@@ -2437,7 +2437,7 @@
- int acp_annex_status_return(msg)
- struct annex_status_return *msg;
- {
--if (msg->errno == ESUCCESS)return(TRUE);
-+if (msg->xerrno == ESUCCESS)return(TRUE);
- else return(FALSE);
-
- }
diff --git a/net/annextools/files/patch-erpcd::acp_lib.h b/net/annextools/files/patch-erpcd::acp_lib.h
deleted file mode 100644
index fd328e5b1b5a..000000000000
--- a/net/annextools/files/patch-erpcd::acp_lib.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- erpcd/acp_lib.h.orig Tue Jan 27 17:46:14 1998
-+++ erpcd/acp_lib.h Thu Sep 18 20:10:32 2003
-@@ -9,7 +9,7 @@
-
- #ifndef _WIN32 /* is this needed at all? */
- struct annex_status_return {
-- int errno;
-+ int xerrno;
- };
- #endif /* not _WIN32 */
-
diff --git a/net/annextools/files/patch-erpcd::env_parser.c b/net/annextools/files/patch-erpcd::env_parser.c
deleted file mode 100644
index a19c80690c25..000000000000
--- a/net/annextools/files/patch-erpcd::env_parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- erpcd/env_parser.c.orig Fri Apr 3 15:36:47 1998
-+++ erpcd/env_parser.c Thu Sep 18 20:10:32 2003
-@@ -29,6 +29,8 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <net/if.h>
-+#include <net/if_var.h>
-+#include <netinet/in.h>
- #include <netinet/in_var.h>
- #include <netinet/if_ether.h>
- #include <syslog.h>
diff --git a/net/annextools/files/patch-erpcd::erpcd.c b/net/annextools/files/patch-erpcd::erpcd.c
deleted file mode 100644
index a46f707a89b3..000000000000
--- a/net/annextools/files/patch-erpcd::erpcd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- erpcd/erpcd.c.orig Sat Jan 31 17:38:06 1998
-+++ erpcd/erpcd.c Thu Sep 18 20:10:32 2003
-@@ -2108,11 +2108,7 @@
- {
- int savederrno = errno;
- int i,j;
--#ifdef SYS_V
- int status;
--#else
-- union wait status;
--#endif
-
- #ifdef SYS_V
- /* decrement child_count for each status successfully returned */
diff --git a/net/annextools/files/patch-erpcd::session_dbunx.c b/net/annextools/files/patch-erpcd::session_dbunx.c
deleted file mode 100644
index 03a1b2e26636..000000000000
--- a/net/annextools/files/patch-erpcd::session_dbunx.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- erpcd/session_dbunx.c.orig Wed Oct 15 13:50:46 1997
-+++ erpcd/session_dbunx.c Thu Sep 18 20:10:32 2003
-@@ -117,7 +117,11 @@
- key_t sem_key = 0; /* semaphore key */
- int Asemid; /* Access semaphore id */
-
-+#if defined(__FreeBSD__)
-+int ctlinit;
-+#else
- union semun ctlinit; /* arg struct for semctl */
-+#endif
- /* sembuf elements: index, op, flag */
- struct sembuf sopwait = {0,-1, SEM_UNDO}; /* wait for semaphore */
- struct sembuf soppost = {0, 1, SEM_UNDO}; /* set value to available */
-@@ -290,7 +294,11 @@
- return errno;
- }
- }
-+#if defined(__FreeBSD__)
-+ ctlinit = 1;
-+#else
- ctlinit.val = 1;
-+#endif
- if (semctl(Asemid, 0, SETVAL, ctlinit) == -1) {
- #ifdef USE_SYSLOG
- syslog(LOG_CRIT, "%s: Set semaphore, semctl error %d. No database access.", appname, errno);
diff --git a/net/annextools/files/patch-erpcd::spy.c b/net/annextools/files/patch-erpcd::spy.c
deleted file mode 100644
index 1083a10a912a..000000000000
--- a/net/annextools/files/patch-erpcd::spy.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- erpcd/spy.c.orig Mon May 5 16:09:35 1997
-+++ erpcd/spy.c Thu Sep 18 20:10:32 2003
-@@ -34,8 +34,10 @@
-
- int debug = 0;
-
-+#if !defined(__FreeBSD__)
- extern int errno;
- extern char *sys_errlist[]; /* errno strings */
-+#endif
-
- static void timeout();
-
diff --git a/net/annextools/files/patch-inc::na::cmd.h b/net/annextools/files/patch-inc::na::cmd.h
deleted file mode 100644
index 0b539124758e..000000000000
--- a/net/annextools/files/patch-inc::na::cmd.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- inc/na/cmd.h.orig Tue Aug 18 18:39:14 1998
-+++ inc/na/cmd.h Thu Sep 18 20:10:32 2003
-@@ -1881,13 +1881,12 @@
- , { 0, 0, 0, V_BIG_BIRD_N, V_BIG_BIRD_N, 0, V_BIG_BIRD_N, V_PRIMATE_N }
- #endif
- },
--#ifndef NA
-+/* XXXCDC: was ifndef NA, need this or indexs off by 1! */
- {ARPT_TTKILLC, DFE_CAT, DFE_ARPT_TTKILLC , B_GENERIC_CAT, CARDINAL_P, CNV_BYTE
- #ifdef NA
- , { 0, 0, 0, 0, 0, 0, 0, 0 }
- #endif
- },
--#endif
- {FAIL_TO_CONNECT, DFE_CAT, DFE_FAIL_TO_CONNECT, B_GENERIC_CAT, CARDINAL_P, CNV_INT
- #ifdef NA
- , { 0, 0, 0, V_14_0_N, V_14_0_N, 0, 0, V_14_0_N }
diff --git a/net/annextools/files/patch-inc::na::help.h b/net/annextools/files/patch-inc::na::help.h
deleted file mode 100644
index 32740dbee04a..000000000000
--- a/net/annextools/files/patch-inc::na::help.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- inc/na/help.h.orig Tue Aug 18 18:40:40 1998
-+++ inc/na/help.h Thu Sep 18 20:10:32 2003
-@@ -298,14 +298,13 @@
- , "Show the AppleTalk subset of port parameters"
- #endif /* NA */
- },
--#ifndef NA
-+/* XXXCDC: was ifndef NA, need this or annex_params[26] is null! */
- {"arpt_kill_timer", BOX_PARAM, ARPT_TTKILLC
- #ifdef NA
- , "Time for a temporary created entry in an ARP Table to remain active.\n\t\
- Value in minutes: range 1 to 255, default value is 20 minutes."
- #endif /* NA */
- },
--#endif
- {"arap_v42bis", PORT_PARAM, P_ARAP_V42BIS
- #ifdef NA
- , "Allow the enabling of V.42bis compression\n\t\
diff --git a/net/annextools/files/patch-inc::slip::slip_user.h b/net/annextools/files/patch-inc::slip::slip_user.h
deleted file mode 100644
index fba7295c37d3..000000000000
--- a/net/annextools/files/patch-inc::slip::slip_user.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/slip/slip_user.h.orig Wed Apr 5 19:48:20 1989
-+++ inc/slip/slip_user.h Thu Sep 18 20:10:32 2003
-@@ -46,7 +46,7 @@
- * *
- *****************************************************************************/
-
--#define CFGFILE INSTALL_DIR/slipcfg"
-+#define CFGFILE INSTALL_DIR "/slipcfg"
- #define SLIPDATA "/usr/spool/slipd/D.%d"
- #define OUTPIPE "/usr/spool/slipd/outpipe"
- #define PORTLOCK "/usr/spool/slipd/portlock"
diff --git a/net/annextools/files/patch-libannex::Makefile b/net/annextools/files/patch-libannex::Makefile
deleted file mode 100644
index 17ed05f31acb..000000000000
--- a/net/annextools/files/patch-libannex::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- libannex/Makefile.orig Tue Oct 1 12:46:00 1996
-+++ libannex/Makefile Thu Sep 18 20:10:32 2003
-@@ -29,6 +29,10 @@
- # REVISION: $Revision: 1.12 $
- #
-
-+CFLAGS += -I../inc
-+
-+LIBANX_O = bcopy.o dup2.o erpc_subr.o srpc.o hostname.o in_cksum.o inet.o ip_layer.o sendrecv.o slip_layer.o socket_layer.o udp_layer.o api_if.o asn1.o conv.o proctitle.o random.o servname.o
-+
- LIBANX_OT = ${LIBANX_O} .
-
- GFLG =
diff --git a/net/annextools/files/patch-libannex::api_if.c b/net/annextools/files/patch-libannex::api_if.c
deleted file mode 100644
index 146fb7cf2f2e..000000000000
--- a/net/annextools/files/patch-libannex::api_if.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libannex/api_if.c.orig Mon Oct 13 01:49:30 2003
-+++ libannex/api_if.c Mon Oct 13 01:49:51 2003
-@@ -180,8 +180,10 @@
- #define recvmsg_func recvmsg
- #endif
-
-+#ifndef __FreeBSD__
- extern int sendmsg_func();
- extern int recvmsg_func();
-+#endif
-
- #ifdef _WIN32
- #define XylogicsWSAGetLastError() \
diff --git a/net/annextools/files/patch-libannex::ip_layer.c b/net/annextools/files/patch-libannex::ip_layer.c
deleted file mode 100644
index f76d070caac7..000000000000
--- a/net/annextools/files/patch-libannex::ip_layer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libannex/ip_layer.c.orig Thu Aug 4 15:57:47 1994
-+++ libannex/ip_layer.c Thu Sep 18 20:18:15 2003
-@@ -63,6 +63,8 @@
- *****************************************************************************/
-
- #include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdio.h>
- #include "../inc/config.h"
- #include "port/port.h"
diff --git a/net/annextools/files/patch-libannex::slip_layer.c b/net/annextools/files/patch-libannex::slip_layer.c
deleted file mode 100644
index 1a9056d6b998..000000000000
--- a/net/annextools/files/patch-libannex::slip_layer.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- libannex/slip_layer.c.orig Thu Aug 4 15:58:46 1994
-+++ libannex/slip_layer.c Thu Sep 18 20:18:34 2003
-@@ -70,6 +70,8 @@
- #include "port/port.h"
- #include <sys/stat.h>
- #include <sys/fcntl.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdio.h>
- #include <errno.h>
- #include "../inc/slip/slip_user.h"
-@@ -101,10 +103,7 @@
- *****************************************************************************/
-
- extern int debug;
--extern errno_t errno;
--
--extern UINT32 inet_addr();
--
-+extern int errno;
-
- /*****************************************************************************
- * *
diff --git a/net/annextools/files/patch-libannex::socket_layer.c b/net/annextools/files/patch-libannex::socket_layer.c
deleted file mode 100644
index 58f62727d159..000000000000
--- a/net/annextools/files/patch-libannex::socket_layer.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- libannex/socket_layer.c.orig Thu Aug 4 15:58:59 1994
-+++ libannex/socket_layer.c Thu Sep 18 20:10:32 2003
-@@ -74,6 +74,8 @@
- #include <ctype.h>
- #include <errno.h>
- #include <signal.h>
-+#include <netdb.h>
-+#include <netinet/in.h>
- #include "../inc/config.h"
- #include "../inc/slip/slip_user.h"
-
-@@ -189,7 +191,7 @@
- int protocol; /* IPPROTO_UDP only */
- {
- struct sockinf *s;
-- errno_t error;
-+ int error;
- int i;
-
- /* Check arguments */
-@@ -260,7 +262,7 @@
- {
- struct sockinf *t, *u;
- int port;
-- errno_t error;
-+ int error;
-
- if(!(t = sockinf_bynumber(s, FALSE))) {
- errno = EBADF;
-@@ -300,7 +302,7 @@
- {
- struct sockinf *t, *u;
- int port;
-- errno_t error;
-+ int error;
-
- if(!(t = sockinf_bynumber(s, FALSE))) {
- errno = EBADF;
diff --git a/net/annextools/files/patch-libannex::udp_layer.c b/net/annextools/files/patch-libannex::udp_layer.c
deleted file mode 100644
index 3376b80d0c22..000000000000
--- a/net/annextools/files/patch-libannex::udp_layer.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libannex/udp_layer.c.orig Thu Aug 4 15:59:14 1994
-+++ libannex/udp_layer.c Thu Sep 18 20:10:32 2003
-@@ -63,7 +63,9 @@
- *****************************************************************************/
-
- #include <stdio.h>
-+#include <errno.h>
- #include <sys/types.h>
-+#include <netinet/in.h>
- #include "../inc/config.h"
- #include "port/port.h"
- #include "../inc/slip/slip_user.h"
diff --git a/net/annextools/files/patch-make.config b/net/annextools/files/patch-make.config
deleted file mode 100644
index 988713f3fdb8..000000000000
--- a/net/annextools/files/patch-make.config
+++ /dev/null
@@ -1,5 +0,0 @@
---- make.config.orig Thu Sep 18 20:10:32 2003
-+++ make.config Thu Sep 18 20:10:32 2003
-@@ -0,0 +1,2 @@
-+
-+CFLAGS += -D_NFILE=65536 -DHAS_CTRL_NOT_ACC=1 -DINSTALL_DIR=\"/usr/local/annex\" -DMIN_SLIP_ERR=10 -DMAX_SLIP_ERR=10 -DFREEBSD=1
diff --git a/net/annextools/files/patch-na::Makefile b/net/annextools/files/patch-na::Makefile
deleted file mode 100644
index 9812f8f692f3..000000000000
--- a/net/annextools/files/patch-na::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- na/Makefile.orig Mon Jun 3 15:45:07 1996
-+++ na/Makefile Thu Sep 18 20:10:32 2003
-@@ -50,7 +50,7 @@
-
- OFILES = main.o cmd.o parse.o do.o sub.o conv.o conv2.o pager.o
- CFILES = main.c cmd.c parse.c do.c sub.c conv.c conv2.c pager.c
--AFILES = ../netadm/netadm.a ../libannex/libannex.a
-+AFILES = ../libannex/libannex.a ../netadm/netadm.a
- EFILES = na
-
- all:
-@@ -72,7 +72,7 @@
- ${RM} -f ${OFILES} ${EFILES}
-
- na: ${OFILES} ${AFILES}
-- ${CC} ${NACFLAGS} -o na ${OFILES} ${AFILES} ${LIBFLAG}
-+ ${CC} ${NACFLAGS} -o na ${OFILES} -L../libannex -L../netadm -lnetadm -lannex
-
- ../libannex/libannex.a:
- cd ../libannex; $(MAKE)
diff --git a/net/annextools/files/patch-netadm::Makefile b/net/annextools/files/patch-netadm::Makefile
deleted file mode 100644
index 31330ffae6de..000000000000
--- a/net/annextools/files/patch-netadm::Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- netadm/Makefile.orig Wed May 15 15:37:44 1996
-+++ netadm/Makefile Thu Sep 18 20:10:32 2003
-@@ -28,6 +28,8 @@
- # REVISION: $Revision: 1.24 $
- #
-
-+CFLAGS += -I../inc
-+
- OFILES = boot.o reset_all.o reset_line.o set_inet_add.o \
- read_memory.o get_da_param.o set_da_param.o get_ln_param.o \
- set_ln_param.o broadcast.o get_anx_rev.o get_anx_opt.o \
-@@ -73,6 +75,7 @@
- netadm.a: ${OFILES}
- ${AR} ${ARFLAGS} netadm.a $(OFILES)
- ${RANLIB} netadm.a
-+ cp netadm.a libnetadm.a
-
- install: all
-
diff --git a/net/annextools/pkg-descr b/net/annextools/pkg-descr
deleted file mode 100644
index e195895f8a72..000000000000
--- a/net/annextools/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This port will install the original management tools from Nortel
-Networks (formerly Bay Networks, formerly Xylogics) for the popular
-Annex range of terminal servers.
-
-WWW: http://www25.nortelnetworks.com/library/tpubs/nav/remote/ra51.htm
-
-Bruce
-bms@spc.org
diff --git a/net/annextools/pkg-plist b/net/annextools/pkg-plist
deleted file mode 100644
index 03f74f17e7e3..000000000000
--- a/net/annextools/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-annex/sbin/acplint
-annex/sbin/ch_passwd
-annex/sbin/erpcd
-annex/sbin/spy
-annex/sbin/tms_convert
-annex/sbin/tms_dbm
-annex/sbin/na
-annex/sbin/rtelnet
-@dirrm annex/sbin
-annex/snmp/xylo-anx.mib
-annex/snmp/xylo-callmgmt.mib
-annex/snmp/xylo-modem.mib
-annex/snmp/xylo-ports.mib
-annex/snmp/xylo-protocol.mib
-annex/snmp/xylo-trpobj.mib
-annex/snmp/xylo-wan.mib
-annex/snmp/xylo.cap
-annex/snmp/xylo.smi
-annex/snmp/xylo.trp
-@dirrm annex/snmp
-annex/examples/laser
-annex/examples/lprinterface
-annex/examples/macro1
-annex/examples/macro2
-annex/examples/map3270
-annex/examples/modem.configs
-annex/examples/rotary
-annex/examples/termcap
-@dirrm annex/examples
-@dirrm annex
diff --git a/net/ap-utils/distinfo b/net/ap-utils/distinfo
deleted file mode 100644
index bd54c3812e40..000000000000
--- a/net/ap-utils/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ap-utils-1.3.3.tar.bz2) = 5adfcbec9b0de14832c93da9c1d4c1b1
diff --git a/net/ap-utils/pkg-descr b/net/ap-utils/pkg-descr
deleted file mode 100644
index 4328230240a2..000000000000
--- a/net/ap-utils/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-A set of utilities to configure and monitor several popular
-wireless access points using SNMP. Among other things, they
-allow access restrictions, MAC authorization and WEP encryption
-for access points and "wireless gateways" by Linksys, Netgear,
-SMC, and D-Link.
-
-WWW: http://ap-utils.polesye.net/
-
- -- Dan Pelleg
-daniel+aputils@pelleg.org
diff --git a/net/ap-utils/pkg-plist b/net/ap-utils/pkg-plist
deleted file mode 100644
index c037cbf3e2d1..000000000000
--- a/net/ap-utils/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/ap-config
-bin/ap-mrtg
-sbin/ap-trapd
-share/locale/fr/LC_MESSAGES/ap-utils.mo
-share/locale/nl/LC_MESSAGES/ap-utils.mo
-share/locale/pl/LC_MESSAGES/ap-utils.mo
-share/locale/ro/LC_MESSAGES/ap-utils.mo
-share/locale/uk/LC_MESSAGES/ap-utils.mo
-%%PORTDOCS%%share/doc/ap-utils/FAQ
-%%PORTDOCS%%share/doc/ap-utils/Ovislink-HOWTO.html
-%%PORTDOCS%%@dirrm share/doc/ap-utils
diff --git a/net/argus/distinfo b/net/argus/distinfo
deleted file mode 100644
index baea3d01c8d5..000000000000
--- a/net/argus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (argus-2.0.5.tar.gz) = 76ae6e86a59af2e7f61e746ad2df3e54
-SIZE (argus-2.0.5.tar.gz) = 495234
diff --git a/net/argus/files/patch-aa b/net/argus/files/patch-aa
deleted file mode 100644
index e73cf4818cee..000000000000
--- a/net/argus/files/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
---- Makefile.in.orig Mon Nov 26 21:42:32 2001
-+++ Makefile.in Thu Jan 17 23:18:54 2002
-@@ -63,28 +63,6 @@
- .PHONY: all
-
- install: force
-- make installdirs
-- [ -d @prefix@ ] || \
-- (mkdir -p @prefix@; chmod 755 @prefix@)
--
-- [ -d @sbindir@ ] || \
-- (mkdir -p @sbindir@; chmod 755 @sbindir@)
--
-- [ -d $(exec_prefix)/argus ] || \
-- (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
--
-- [ -d $(exec_prefix)/argus/archive ] || \
-- (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive)
--
-- [ -d $(docdir) ] || \
-- (mkdir -p $(docdir); chmod 755 $(docdir))
--
-- [ -d $(docdir)/html ] || \
-- (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html)
--
-- [ -d $(docdir)/html/man ] || \
-- (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man)
--
- @for i in $(DIRS) ; do \
- if [ -d $$i ] ; then \
- echo "making in $$i"; \
-@@ -94,25 +72,10 @@
- fi; \
- done
-
-- $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir)
-- $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir)
-- $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man
--
- $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus
-- $(INSTALL) -m 0644 $(srcdir)/README $(docdir)
- $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
-- $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
--
- $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
-
-- [ -d @mandir@ ] || \
-- (mkdir -p @mandir@; chmod 755 @mandir@)
-- [ -d @mandir@/man1 ] || \
-- (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
-- [ -d @mandir@/man5 ] || \
-- (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
-- [ -d @mandir@/man8 ] || \
-- (mkdir -p @mandir@/man8; chmod 755 @mandir@/man8)
- $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5
- $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5
- $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
diff --git a/net/argus/files/patch-ab b/net/argus/files/patch-ab
deleted file mode 100644
index 3c8be2610584..000000000000
--- a/net/argus/files/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
---- include/argus_filter.h~ Fri May 31 14:11:34 2002
-+++ include/argus_filter.h Wed Dec 25 22:13:46 2002
-@@ -216,7 +216,13 @@
- extern void *ArgusCalloc (int, int);
- extern void ArgusFree (void *);
-
--extern void error(va_list);
-+/*extern void error(va_list);*/
-+#if defined(__STDC__)
-+void error(const char *fmt, ...);
-+#else
-+void error(const char *fmt, va_dcl);
-+#endif
-+
- extern void warning(va_list);
-
- extern char *savestr(const char *);
diff --git a/net/argus/files/patch-configure b/net/argus/files/patch-configure
deleted file mode 100644
index 2176dbc37cdc..000000000000
--- a/net/argus/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Thu May 30 21:30:19 2002
-+++ configure Tue Jul 9 10:50:46 2002
-@@ -1644,7 +1644,7 @@
-
- if test -d ${with_sasl}; then
- ac_cv_sasl_where_lib=${with_sasl}/lib
-- ac_cv_sasl_where_inc=${with_sasl}/include
-+ ac_cv_sasl_where_inc=${with_sasl}/include/sasl
-
- SASLFLAGS="-I$ac_cv_sasl_where_inc"
- LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/net/argus/pkg-descr b/net/argus/pkg-descr
deleted file mode 100644
index afc582b1d8f7..000000000000
--- a/net/argus/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Argus is a generic IP network transaction auditing tool that has been used
-by thousands of sites to perform a number of powerful network management
-tasks that are currently not possible using commercial network management
-tools.
-
-Argus runs as an application level daemon, promiscuously reading network
-datagrams from a specified interface, and generates network traffic audit
-records for the network activity that it encounters. It is the way that
-Argus categorizes and reports on network activity that makes this tool
-unique and powerful.
-
-WWW: http://www.qosient.com/argus/
diff --git a/net/argus/pkg-plist b/net/argus/pkg-plist
deleted file mode 100644
index 2805056538de..000000000000
--- a/net/argus/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-argus/COPYING
-argus/README
-bin/argusbug
-bin/ra
-bin/racount
-bin/ragator
-bin/ramon
-bin/rapath
-bin/rasort
-bin/raxml
-include/cons_def.h
-include/cons_out.h
-lib/argus_common.a
-lib/argus_parse.a
-sbin/argus
-%%PORTDOCS%%share/doc/argus-2.0/CHANGES
-%%PORTDOCS%%share/doc/argus-2.0/COPYING
-%%PORTDOCS%%share/doc/argus-2.0/CREDITS
-%%PORTDOCS%%share/doc/argus-2.0/FAQ
-%%PORTDOCS%%share/doc/argus-2.0/HOW-TO
-%%PORTDOCS%%share/doc/argus-2.0/README
-%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.5.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.8.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.conf.5.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/ra.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/racount.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/ragator.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/ramon.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/rarc.5.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/rasort.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/raxml.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/tcpdump.1.html
-share/examples/argus-2.0/Archive/argusarchive
-share/examples/argus-2.0/Config/argus.conf
-share/examples/argus-2.0/Config/excel.rc
-share/examples/argus-2.0/Config/fmodel.conf
-share/examples/argus-2.0/Config/rarc
-share/examples/argus-2.0/Deployment/sample
-share/examples/argus-2.0/README
-share/examples/argus-2.0/Startup/README
-share/examples/argus-2.0/Startup/argus
-share/examples/argus-2.0/System/crontab
-share/examples/argus-2.0/System/magic
-share/examples/argus-2.0/Xml/ArgusRecord.biz
-share/examples/argus-2.0/Xml/ArgusRecord.dtd
-share/examples/argus-2.0/Xml/ArgusRecord.sox
-share/examples/argus-2.0/Xml/ArgusRecord.xdr
-share/examples/argus-2.0/Xml/ArgusRecord.xsd
-share/examples/argus-2.0/Xml/ArgusRecordSample.xml
-share/examples/argus-2.0/Xml/README
-@dirrm share/examples/argus-2.0/Xml
-@dirrm share/examples/argus-2.0/System
-@dirrm share/examples/argus-2.0/Startup
-@dirrm share/examples/argus-2.0/Deployment
-@dirrm share/examples/argus-2.0/Config
-@dirrm share/examples/argus-2.0/Archive
-@dirrm share/examples/argus-2.0
-%%PORTDOCS%%@dirrm share/doc/argus-2.0/html/man
-%%PORTDOCS%%@dirrm share/doc/argus-2.0/html
-%%PORTDOCS%%@dirrm share/doc/argus-2.0
-@unexec rmdir %D/argus/archive %D/argus >/dev/null 2>&1 || true
diff --git a/net/arpwatch/distinfo b/net/arpwatch/distinfo
deleted file mode 100644
index 1d669d253065..000000000000
--- a/net/arpwatch/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (arpwatch-2.1a11.tar.gz) = 9ecd00db892737431b0e524f3e52e19e
-SIZE (arpwatch-2.1a11.tar.gz) = 126550
diff --git a/net/arpwatch/files/arpwatch.sh b/net/arpwatch/files/arpwatch.sh
deleted file mode 100644
index 92035b9eb274..000000000000
--- a/net/arpwatch/files/arpwatch.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-if [ -r /etc/defaults/rc.conf ]; then
- . /etc/defaults/rc.conf
- source_rc_confs
-elif [ -r /etc/rc.conf ]; then
- . /etc/rc.conf
-fi
-
-prog=$(realpath $0) || exit 1
-dir=${prog%/*}
-PREFIX=${dir%/etc/rc.d}
-
-if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
-then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case $1 in
-start)
- if [ ! -e "$PREFIX"/arpwatch/arp.dat ]; then
- if [ -e "$PREFIX"/arpwatch/arp.dat- ]; then
- cp "$PREFIX"/arpwatch/arp.dat- "$PREFIX"/arpwatch/arp.dat
- else
- touch "$PREFIX"/arpwatch/arp.dat
- fi
- fi
-
- case ${arpwatch_interfaces} in
- '')
- if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
- "$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
- fi
- ;;
- *)
- for interface in ${arpwatch_interfaces}; do
- touch "$PREFIX"/arpwatch/arp.${interface}.dat
- "$PREFIX"/sbin/arpwatch -i "${interface}" -f arp.${interface}.dat && echo -n " arpwatch(${interface})"
- done
- ;;
- esac
- ;;
-stop)
- killall arpwatch && echo -n ' arpwatch'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- exit 64
- ;;
-esac
-
-exit 0
diff --git a/net/arpwatch/files/patch-ab b/net/arpwatch/files/patch-ab
deleted file mode 100644
index 76cbc814dfaf..000000000000
--- a/net/arpwatch/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig Wed Jul 29 06:16:45 1998
-+++ Makefile.in Fri Aug 21 10:57:51 1998
-@@ -44,7 +44,7 @@
- CC = @CC@
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-@@ -109,8 +109,8 @@
- $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
-
- install: force
-- $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
-- $(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
-+ $(INSTALL) -s -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
-+ $(INSTALL) -s -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
-
- install-man: force
- $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \
diff --git a/net/arpwatch/files/patch-ae b/net/arpwatch/files/patch-ae
deleted file mode 100644
index 3fe876affcc2..000000000000
--- a/net/arpwatch/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Thu Jun 15 01:37:53 2000
-+++ configure Tue Sep 5 02:57:33 2000
-@@ -649,7 +649,7 @@
- :
- fi
-
-- V_CCOPT="-O"
-+# V_CCOPT="-O"
- V_INCLS=""
- if test "${srcdir}" != "." ; then
- V_INCLS="-I\$\(srcdir\)"
-@@ -2599,7 +2599,7 @@
- fi
- V_CCOPT="$V_CCOPT -Wall"
- if test $ac_cv_lbl_gcc_vers -gt 1 ; then
-- V_CCOPT="$V_CCOPT -Wmissing-prototypes -Wstrict-prototypes"
-+# V_CCOPT="$V_CCOPT -Wmissing-prototypes -Wstrict-prototypes"
- fi
- fi
- else
diff --git a/net/arpwatch/files/patch-af b/net/arpwatch/files/patch-af
deleted file mode 100644
index 0145483d51e2..000000000000
--- a/net/arpwatch/files/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
---- ethercodes.dat.orig Thu May 3 21:59:10 2001
-+++ ethercodes.dat Tue Nov 11 10:59:56 2003
-@@ -4419,7 +4419,7 @@
- 0:d0:b4 KATSUJIMA CO., LTD.
- 0:d0:b5 DOTCOM
- 0:d0:b6 CRESCENT NETWORKS, INC.
--0:d0:b7 INTEL CORPOTATION
-+0:d0:b7 INTEL CORPORATION
- 0:d0:b8 IOMEGA CORP.
- 0:d0:b9 MICROTEK INTERNATIONAL, INC.
- 0:d0:ba CISCO SYSTEMS, INC.
-@@ -4964,3 +4964,5 @@
- c0:0:0 Western Digital (may be reversed 00 00 C0?)
- e2:c:f Kingston Technologies
- ec:10:0 Enance Source Co., Ltd. PC clones(?)
-+0:bd:11 VMWare Inc
-+0:bd:fb VMWare Inc
diff --git a/net/arpwatch/files/patch-ag b/net/arpwatch/files/patch-ag
deleted file mode 100644
index bbd68993bc74..000000000000
--- a/net/arpwatch/files/patch-ag
+++ /dev/null
@@ -1,39 +0,0 @@
---- arpwatch.c.orig Thu Feb 22 22:47:29 2001
-+++ arpwatch.c Thu Feb 22 22:47:29 2001
-@@ -107,6 +107,8 @@
-
- char *prog;
-
-+char *Watcher = NULL;
-+
- int can_checkpoint;
- int swapped;
- int nobogons;
-@@ -170,7 +172,7 @@
- interface = NULL;
- rfilename = NULL;
- pd = NULL;
-- while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
-+ while ((op = getopt(argc, argv, "df:i:m:n:Nr:")) != EOF)
- switch (op) {
-
- case 'd':
-@@ -202,6 +204,10 @@
- rfilename = optarg;
- break;
-
-+ case 'm':
-+ Watcher = optarg;
-+ break;
-+
- default:
- usage();
- }
-@@ -751,6 +757,6 @@
-
- (void)fprintf(stderr, "Version %s\n", version);
- (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
-- " [-n net[/width]] [-r file]\n", prog);
-+ " [-m email] [-n net[/width]] [-r file]\n", prog);
- exit(1);
- }
diff --git a/net/arpwatch/files/patch-ah b/net/arpwatch/files/patch-ah
deleted file mode 100644
index b292b25116d0..000000000000
--- a/net/arpwatch/files/patch-ah
+++ /dev/null
@@ -1,55 +0,0 @@
---- report.c.orig Sun Oct 1 00:41:10 2000
-+++ report.c Thu May 16 11:34:33 2002
-@@ -45,6 +45,8 @@
-
- #include <ctype.h>
- #include <errno.h>
-+#include <fcntl.h>
-+#include <paths.h>
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -70,6 +72,8 @@
-
- #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
-
-+extern char *Watcher;
-+
- static int cdepth; /* number of outstanding children */
-
- static char *fmtdate(time_t);
-@@ -240,7 +244,7 @@
- register FILE *f;
- char tempfile[64], cpu[64], os[64];
- char *fmt = "%20s: %s\n";
-- char *watcher = WATCHER;
-+ char *watcher = Watcher ? Watcher : WATCHER;
- char *watchee = WATCHEE;
- char *sendmail = PATH_SENDMAIL;
- char *unknown = "<unknown>";
-@@ -344,6 +348,25 @@
- exit(1);
- }
- /* XXX Need to freopen()? */
-+
-+ /*
-+ * Open /dev/null as stdout and stderr so that sendmail 8.12.1 (and
-+ * above ?) won't complain about missing file descriptors.
-+ */
-+ if ((fd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
-+ syslog(LOG_ERR, "Cannot open %s: %m", _PATH_DEVNULL);
-+ exit(1);
-+ }
-+ if (dup2(fd, STDOUT_FILENO) == -1) {
-+ syslog(LOG_ERR, "Cannot dup2 %s to stdout: %m", _PATH_DEVNULL);
-+ exit(1);
-+ }
-+ if (dup2(fd, STDERR_FILENO) == -1) {
-+ syslog(LOG_ERR, "Cannot dup2 %s to stderr: %m", _PATH_DEVNULL);
-+ exit(1);
-+ }
-+ close(fd);
-+
- /* Always Deliver interactively (pause when child depth gets large) */
- execl(sendmail, "sendmail", "-odi", watcher, NULL);
- syslog(LOG_ERR, "execl: %s: %m", sendmail);
diff --git a/net/arpwatch/files/patch-ai b/net/arpwatch/files/patch-ai
deleted file mode 100644
index ef251223d844..000000000000
--- a/net/arpwatch/files/patch-ai
+++ /dev/null
@@ -1,39 +0,0 @@
---- arpsnmp.c.orig Mon Jan 18 01:47:40 1999
-+++ arpsnmp.c Thu Feb 22 22:47:29 2001
-@@ -68,6 +68,8 @@
-
- char *prog;
-
-+char *Watcher;
-+
- extern int optind;
- extern int opterr;
- extern char *optarg;
-@@ -90,7 +92,7 @@
- }
-
- opterr = 0;
-- while ((op = getopt(argc, argv, "df:")) != EOF)
-+ while ((op = getopt(argc, argv, "df:m:")) != EOF)
- switch (op) {
-
- case 'd':
-@@ -105,6 +107,10 @@
- arpfile = optarg;
- break;
-
-+ case 'm':
-+ Watcher = optarg;
-+ break;
-+
- default:
- usage();
- }
-@@ -184,6 +190,6 @@
-
- (void)fprintf(stderr, "Version %s\n", version);
- (void)fprintf(stderr,
-- "usage: %s [-d] [-f datafile] file [...]\n", prog);
-+ "usage: %s [-d] [-f datafile] [-m email] file [...]\n", prog);
- exit(1);
- }
diff --git a/net/arpwatch/files/patch-aj b/net/arpwatch/files/patch-aj
deleted file mode 100644
index 85e34bf47345..000000000000
--- a/net/arpwatch/files/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
---- arpwatch.8.orig Sun Oct 8 21:31:28 2000
-+++ arpwatch.8 Thu Feb 22 22:47:29 2001
-@@ -38,6 +38,9 @@
- .br
- .ti +8
- [
-+.B -m
-+.I email
-+] [
- .B -n
- .IR net [/ width
- ]] [
-@@ -69,6 +72,12 @@
- The
- .B -i
- flag is used to override the default interface.
-+.LP
-+The
-+.B -m
-+flag specifies the address that will receive the emails.
-+The default is
-+.IR root .
- .LP
- The
- .B -n
diff --git a/net/arpwatch/files/patch-ak b/net/arpwatch/files/patch-ak
deleted file mode 100644
index 50b504b27435..000000000000
--- a/net/arpwatch/files/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
---- arpsnmp.8.orig Sun Sep 17 21:34:48 2000
-+++ arpsnmp.8 Thu Feb 22 22:47:29 2001
-@@ -30,6 +30,9 @@
- ] [
- .B -f
- .I datafile
-+] [
-+.B -m
-+.I email
- ]
- .I file
- [
-@@ -54,6 +57,12 @@
- flag is used to set the ethernet/ip address database filename.
- The default is
- .IR arp.dat .
-+.LP
-+The
-+.B -m
-+flag specifies the address that will receive the emails.
-+The default is
-+.IR root .
- .LP
- Note that an empty
- .I arp.dat
diff --git a/net/arpwatch/pkg-descr b/net/arpwatch/pkg-descr
deleted file mode 100644
index 1e2e8138080c..000000000000
--- a/net/arpwatch/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-ARPWATCH 2.0
-Lawrence Berkeley National Laboratory
-Network Research Group
-arpwatch@ee.lbl.gov
-ftp://ftp.ee.lbl.gov/arpwatch.tar.Z
-
-This directory contains source code for arpwatch and arpsnmp, tools
-that monitors ethernet activity and maintain a database of ethernet/ip
-address pairings. It also reports certain changes via email.
-
-Arpsnmp has the same database features of arpwatch but relies on an
-external agent to collect the arp data. This distribution contains a
-script, arpfetch, that uses snmpwalk from the CMU SNMP package. This
-package is available from:
-
- ftp://ftp.net.cmu.edu/pub/snmp-dist/cmu-snmp*.tar.Z
-
-It should be trivial to adaptive the output of any snmp query program
-for use with arpsnmp.
-
-Please send bugs and comments to arpwatch@ee.lbl.gov.
diff --git a/net/arpwatch/pkg-plist b/net/arpwatch/pkg-plist
deleted file mode 100644
index 107115d3caf9..000000000000
--- a/net/arpwatch/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-sbin/arpwatch
-sbin/arpsnmp
-arpwatch/arp2ethers
-arpwatch/ethercodes.dat
-arpwatch/d.awk
-arpwatch/e.awk
-arpwatch/p.awk
-etc/rc.d/arpwatch.sh.sample
-@unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
-@exec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat
-@dirrm arpwatch
diff --git a/net/arts++/distinfo b/net/arts++/distinfo
deleted file mode 100644
index 1f03497106f1..000000000000
--- a/net/arts++/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (arts++-1-1-a8.tar.gz) = 3527ba0fa7ab6fb579573969967d1059
diff --git a/net/arts++/files/patch-apps::artsasagg::artsasagg.cc b/net/arts++/files/patch-apps::artsasagg::artsasagg.cc
deleted file mode 100644
index ae2e9d321b25..000000000000
--- a/net/arts++/files/patch-apps::artsasagg::artsasagg.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./apps/artsasagg/artsasagg.cc.orig Mon Oct 2 13:05:10 2000
-+++ ./apps/artsasagg/artsasagg.cc Wed Sep 25 16:38:09 2002
-@@ -50,15 +50,21 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--#include <map>
--
- #include "ArtsFileUtil.hh"
- #include "ArtsPackageVersion.hh"
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
- #endif
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+#include <string>
-+#include <map>
-
- extern int errno;
-
diff --git a/net/arts++/files/patch-apps::artsintfms::artsintfms.cc b/net/arts++/files/patch-apps::artsintfms::artsintfms.cc
deleted file mode 100644
index 93b3ce5e0df1..000000000000
--- a/net/arts++/files/patch-apps::artsintfms::artsintfms.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./apps/artsintfms/artsintfms.cc.orig Mon Oct 2 13:05:11 2000
-+++ ./apps/artsintfms/artsintfms.cc Wed Sep 25 16:38:09 2002
-@@ -51,13 +51,21 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsInterfaceMatrix.hh"
- #include "ArtsIfIndexSelectionSet.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+
-+#include <string>
-+
-
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
diff --git a/net/arts++/files/patch-apps::artsnetagg::artsnetagg.cc b/net/arts++/files/patch-apps::artsnetagg::artsnetagg.cc
deleted file mode 100644
index 59867d94b72e..000000000000
--- a/net/arts++/files/patch-apps::artsnetagg::artsnetagg.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./apps/artsnetagg/artsnetagg.cc.orig Mon Oct 2 13:05:11 2000
-+++ ./apps/artsnetagg/artsnetagg.cc Wed Sep 25 16:38:09 2002
-@@ -50,13 +50,18 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsFileUtil.hh"
- #include "ArtsPackageVersion.hh"
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
-+#endif
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
- #endif
-
- extern int errno;
diff --git a/net/arts++/files/patch-apps::artsnets::artsnets.cc b/net/arts++/files/patch-apps::artsnets::artsnets.cc
deleted file mode 100644
index 608a96112328..000000000000
--- a/net/arts++/files/patch-apps::artsnets::artsnets.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./apps/artsnets/artsnets.cc.orig Mon Oct 2 13:05:12 2000
-+++ ./apps/artsnets/artsnets.cc Wed Sep 25 16:38:09 2002
-@@ -51,14 +51,22 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsNetMatrix.hh"
- #include "ArtsIfIndexSelectionSet.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
-
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+
-+#include <string>
-+
-+
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
- #endif
-@@ -160,7 +168,7 @@
- }
- }
-
-- if (hostAttribute) {
-+ if (hostAttribute != arts.Attributes().end() ) {
- inAddr.s_addr = hostAttribute->Host();
- cout << "router: " << inet_ntoa(inAddr) << endl;
- }
diff --git a/net/arts++/files/patch-apps::artsnexthopagg::artsnexthopagg.cc b/net/arts++/files/patch-apps::artsnexthopagg::artsnexthopagg.cc
deleted file mode 100644
index 6c96236154a0..000000000000
--- a/net/arts++/files/patch-apps::artsnexthopagg::artsnexthopagg.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./apps/artsnexthopagg/artsnexthopagg.cc.orig Mon Oct 2 13:05:12 2000
-+++ ./apps/artsnexthopagg/artsnexthopagg.cc Wed Sep 25 16:38:09 2002
-@@ -50,14 +50,21 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsFileUtil.hh"
- #include "ArtsPackageVersion.hh"
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
- #endif
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+
-+#include <string>
-
- extern char *tzname[2];
- extern int errno;
diff --git a/net/arts++/files/patch-apps::artsnexthops::artsnexthops.cc b/net/arts++/files/patch-apps::artsnexthops::artsnexthops.cc
deleted file mode 100644
index 17497387cb21..000000000000
--- a/net/arts++/files/patch-apps::artsnexthops::artsnexthops.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./apps/artsnexthops/artsnexthops.cc.orig Mon Oct 2 13:05:12 2000
-+++ ./apps/artsnexthops/artsnexthops.cc Wed Sep 25 16:38:09 2002
-@@ -51,14 +51,21 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsNextHopTable.hh"
- #include "ArtsIfIndexSelectionSet.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
-
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+
-+#include <string>
-+
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
- #endif
-@@ -116,7 +123,7 @@
- }
- }
-
-- if (hostAttribute) {
-+ if (hostAttribute != arts.Attributes().end()) {
- inAddr.s_addr = hostAttribute->Host();
- cout << "router: " << inet_ntoa(inAddr) << endl;
- }
-@@ -135,7 +142,7 @@
- cout << endl;
-
- periodAttribute = arts.FindPeriodAttribute();
-- if (periodAttribute) {
-+ if (periodAttribute != arts.Attributes().end() ) {
- periodTimes[0] = periodAttribute->Period()[0];
- periodTimes[1] = periodAttribute->Period()[1];
- localTm = localtime(&(periodTimes[0]));
diff --git a/net/arts++/files/patch-apps::artsportagg::artsportagg.cc b/net/arts++/files/patch-apps::artsportagg::artsportagg.cc
deleted file mode 100644
index 6c37fc981a2a..000000000000
--- a/net/arts++/files/patch-apps::artsportagg::artsportagg.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./apps/artsportagg/artsportagg.cc.orig Mon Oct 2 13:05:12 2000
-+++ ./apps/artsportagg/artsportagg.cc Wed Sep 25 16:38:09 2002
-@@ -50,14 +50,19 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsPortTableAggregator.hh"
- #include "Arts.hh"
- #include "ArtsPortTableAggregatorMapKey.hh"
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
-+#endif
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
- #endif
-
- extern char *tzname[2];
diff --git a/net/arts++/files/patch-apps::artsportms::artsportms.cc b/net/arts++/files/patch-apps::artsportms::artsportms.cc
deleted file mode 100644
index 5dc183cb9242..000000000000
--- a/net/arts++/files/patch-apps::artsportms::artsportms.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./apps/artsportms/artsportms.cc.orig Mon Oct 2 13:05:12 2000
-+++ ./apps/artsportms/artsportms.cc Wed Sep 25 16:38:09 2002
-@@ -51,13 +51,21 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsPortMatrix.hh"
- #include "ArtsIfIndexSelectionSet.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+
-+#include <string>
-+
-
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
diff --git a/net/arts++/files/patch-apps::artsprotoagg::artsprotoagg.cc b/net/arts++/files/patch-apps::artsprotoagg::artsprotoagg.cc
deleted file mode 100644
index fe83fd071a72..000000000000
--- a/net/arts++/files/patch-apps::artsprotoagg::artsprotoagg.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./apps/artsprotoagg/artsprotoagg.cc.orig Mon Oct 2 13:05:13 2000
-+++ ./apps/artsprotoagg/artsprotoagg.cc Wed Sep 25 16:38:09 2002
-@@ -50,13 +50,18 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsFileUtil.hh"
- #include "ArtsPackageVersion.hh"
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
-+#endif
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
- #endif
-
- extern char *tzname[2];
diff --git a/net/arts++/files/patch-apps::artsprotos::artsprotos.cc b/net/arts++/files/patch-apps::artsprotos::artsprotos.cc
deleted file mode 100644
index 4e35a312a821..000000000000
--- a/net/arts++/files/patch-apps::artsprotos::artsprotos.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./apps/artsprotos/artsprotos.cc.orig Mon Oct 2 13:05:13 2000
-+++ ./apps/artsprotos/artsprotos.cc Wed Sep 25 16:38:09 2002
-@@ -52,14 +52,22 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsProtocolTable.hh"
- #include "ArtsIfIndexSelectionSet.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
-
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+#else
-+# include <fstream.h>
-+#endif
-+
-+#include <string>
-+using namespace std;
-+
-+
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
- #endif
-@@ -118,7 +126,7 @@
- }
- }
-
-- if (hostAttribute) {
-+ if (hostAttribute != arts.Attributes().end() ) {
- inAddr.s_addr = hostAttribute->Host();
- cout << "router: " << inet_ntoa(inAddr) << endl;
- }
diff --git a/net/arts++/files/patch-apps::artstoc::artstoc.cc b/net/arts++/files/patch-apps::artstoc::artstoc.cc
deleted file mode 100644
index 77cdbb46dc86..000000000000
--- a/net/arts++/files/patch-apps::artstoc::artstoc.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./apps/artstoc/artstoc.cc.orig Mon Oct 2 13:05:13 2000
-+++ ./apps/artstoc/artstoc.cc Wed Sep 25 16:38:09 2002
-@@ -49,14 +49,19 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "Arts.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
-+#endif
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
- #endif
-
- extern char *tzname[2];
diff --git a/net/arts++/files/patch-apps::artstos::artstos.cc b/net/arts++/files/patch-apps::artstos::artstos.cc
deleted file mode 100644
index a8223a7cb5a0..000000000000
--- a/net/arts++/files/patch-apps::artstos::artstos.cc
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./apps/artstos/artstos.cc.orig Mon Oct 2 13:05:13 2000
-+++ ./apps/artstos/artstos.cc Wed Sep 25 16:38:09 2002
-@@ -52,14 +52,19 @@
- #include <errno.h>
- }
-
--#include <fstream.h>
--#include <string>
--
- #include "ArtsTosTable.hh"
- #include "ArtsIfIndexSelectionSet.hh"
- #include "ArtsTimeIntervalSelectionSet.hh"
- #include "ArtsPackageVersion.hh"
-
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
-+#else
-+# include <fstream.h>
-+#endif
-+
- #ifndef NDEBUG
- #include "ArtsDebug.hh"
- #endif
-@@ -108,7 +113,7 @@
- }
- }
-
-- if (hostAttribute) {
-+ if (hostAttribute != arts.Attributes().end()) {
- inAddr.s_addr = hostAttribute->Host();
- cout << "router: " << inet_ntoa(inAddr) << endl;
- }
-@@ -126,7 +131,7 @@
- }
- cout << endl;
-
-- if (periodAttribute) {
-+ if (periodAttribute != arts.Attributes().end() ) {
- periodTimes[0] = periodAttribute->Period()[0];
- periodTimes[1] = periodAttribute->Period()[1];
- localTm = localtime(&(periodTimes[0]));
diff --git a/net/arts++/files/patch-classes::include::ArtsAsMatrixData.hh b/net/arts++/files/patch-classes::include::ArtsAsMatrixData.hh
deleted file mode 100644
index 8f6569fa5651..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsAsMatrixData.hh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./classes/include/ArtsAsMatrixData.hh.orig Mon Oct 2 13:05:14 2000
-+++ ./classes/include/ArtsAsMatrixData.hh Wed Sep 25 16:38:10 2002
-@@ -52,11 +52,10 @@
-
- #ifdef HAVE_IOSTREAM
- #include <iostream>
-+ using namespace std;
- #else
- #include <iostream.h>
- #endif
--// #include <istream.h>
--// #include <ostream.h>
- #include <algorithm>
-
- #include "ArtsAsMatrixEntry.hh"
diff --git a/net/arts++/files/patch-classes::include::ArtsAsMatrixEntry.hh b/net/arts++/files/patch-classes::include::ArtsAsMatrixEntry.hh
deleted file mode 100644
index ac57c748e3a9..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsAsMatrixEntry.hh
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/include/ArtsAsMatrixEntry.hh.orig Mon Oct 2 13:05:14 2000
-+++ ./classes/include/ArtsAsMatrixEntry.hh Wed Sep 25 16:38:10 2002
-@@ -50,7 +50,12 @@
- #include "caida_t.h"
- }
-
--#include <ostream.h>
-+#ifdef HAVE_IOSTREAM
-+# include <iostream>
-+ using namespace std;
-+#else
-+# include <iostream.h>
-+#endif
-
- #ifdef HAVE_IOMANIP
- #include <iomanip>
diff --git a/net/arts++/files/patch-classes::include::ArtsAttribute.hh b/net/arts++/files/patch-classes::include::ArtsAttribute.hh
deleted file mode 100644
index db2248da3ed9..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsAttribute.hh
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./classes/include/ArtsAttribute.hh.orig Mon Oct 2 13:05:14 2000
-+++ ./classes/include/ArtsAttribute.hh Wed Sep 25 16:38:10 2002
-@@ -44,6 +44,7 @@
- #define _ARTSATTRIBUTE_HH_
-
- extern "C" {
-+#include "artslocal.h"
- #include <sys/types.h>
- #include <assert.h>
-
-@@ -51,7 +52,13 @@
- }
-
- #include <string>
--#include <istream.h>
-+
-+#ifdef HAVE_IOSTREAM
-+# include <iostream>
-+using namespace std;
-+#else
-+# include <istream.h>
-+#endif
-
- //---------------------------------------------------------------------------
- // Object Attribute Identifiers
diff --git a/net/arts++/files/patch-classes::include::ArtsAttributeVector.hh b/net/arts++/files/patch-classes::include::ArtsAttributeVector.hh
deleted file mode 100644
index 3be6b4307463..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsAttributeVector.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./classes/include/ArtsAttributeVector.hh.orig Mon Oct 2 13:05:14 2000
-+++ ./classes/include/ArtsAttributeVector.hh Wed Sep 25 16:38:09 2002
-@@ -44,6 +44,7 @@
- #define _ARTSATTRIBUTEVECTOR_HH_
-
- #include <vector>
-+using namespace std;
-
- #include "ArtsAttribute.hh"
-
diff --git a/net/arts++/files/patch-classes::include::ArtsCflowdCustomData.hh b/net/arts++/files/patch-classes::include::ArtsCflowdCustomData.hh
deleted file mode 100644
index b5ea0df4c56d..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsCflowdCustomData.hh
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./classes/include/ArtsCflowdCustomData.hh.orig Tue Nov 9 05:39:42 1999
-+++ ./classes/include/ArtsCflowdCustomData.hh Wed Sep 25 16:38:10 2002
-@@ -20,6 +20,7 @@
- }
-
- #include <map>
-+using namespace std;
-
- //----------------------------------------------------------------------------
- // class ArtsCflowdCustomDataKey
-@@ -145,4 +146,5 @@
- };
-
-
--#endif // _ARTSCFLOWDCUSTOMDATA_HH_
-+#endif /* _ARTSCFLOWDCUSTOMDATA_HH_ */
-+
diff --git a/net/arts++/files/patch-classes::include::ArtsFileUtil.hh b/net/arts++/files/patch-classes::include::ArtsFileUtil.hh
deleted file mode 100644
index 77f3ff6a66e9..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsFileUtil.hh
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./classes/include/ArtsFileUtil.hh.orig Mon Oct 2 13:05:15 2000
-+++ ./classes/include/ArtsFileUtil.hh Wed Sep 25 16:38:10 2002
-@@ -43,9 +43,16 @@
- #ifndef _ARTSFILEUTIL_HH_
- #define _ARTSFILEUTIL_HH_
-
-+#include "artslocal.h"
-+
- #include <string>
- #include <vector>
--#include <fstream.h>
-+
-+#ifdef HAVE_FSTREAM
-+# include <fstream>
-+#else
-+# include <fstream.h>
-+#endif
-
- #include "ArtsProtocolTableAggregatorMap.hh"
- #include "ArtsInterfaceMatrixAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::include::ArtsHeader.hh b/net/arts++/files/patch-classes::include::ArtsHeader.hh
deleted file mode 100644
index 29cedac68c2f..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsHeader.hh
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./classes/include/ArtsHeader.hh.orig Mon Oct 2 13:05:15 2000
-+++ ./classes/include/ArtsHeader.hh Wed Sep 25 16:46:54 2002
-@@ -50,11 +50,13 @@
- #include "caida_t.h"
- }
-
--#include <ostream.h>
--#ifdef HAVE_IOMANIP
-- #include <iomanip>
-+#ifdef HAVE_OSTREAM
-+# include <ostream>
-+# include <iomanip>
-+ using namespace std;
- #else
-- #include <iomanip.h>
-+# include <ostream.h>
-+# include <iomanip.h>
- #endif
-
- //---------------------------------------------------------------------------
diff --git a/net/arts++/files/patch-classes::include::ArtsInterfaceMatrixData.hh b/net/arts++/files/patch-classes::include::ArtsInterfaceMatrixData.hh
deleted file mode 100644
index 732173383372..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsInterfaceMatrixData.hh
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./classes/include/ArtsInterfaceMatrixData.hh.orig Mon Oct 2 13:05:16 2000
-+++ ./classes/include/ArtsInterfaceMatrixData.hh Wed Sep 25 16:38:10 2002
-@@ -44,15 +44,17 @@
- #define ARTSINTERFACEMATRIXDATA_HH_
-
- extern "C" {
-+#include "artslocal.h"
- #include "caida_t.h"
- }
-
- #include <vector>
-
- #ifdef HAVE_IOSTREAM
-- #include <iostream>
-+# include <iostream>
-+ using namespace std;
- #else
-- #include <iostream.h>
-+# include <iostream.h>
- #endif
- #include <algorithm>
-
diff --git a/net/arts++/files/patch-classes::include::ArtsIpPathEntry.hh b/net/arts++/files/patch-classes::include::ArtsIpPathEntry.hh
deleted file mode 100644
index 2d506876f502..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsIpPathEntry.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./classes/include/ArtsIpPathEntry.hh.orig Mon Oct 2 13:05:16 2000
-+++ ./classes/include/ArtsIpPathEntry.hh Wed Sep 25 16:38:10 2002
-@@ -54,6 +54,7 @@
-
- #ifdef HAVE_IOSTREAM
- #include <iostream>
-+ using namespace std;
- #else
- #include <iostream.h>
- #endif
diff --git a/net/arts++/files/patch-classes::include::ArtsNetMatrixData.hh b/net/arts++/files/patch-classes::include::ArtsNetMatrixData.hh
deleted file mode 100644
index 4dc3f0abfd89..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsNetMatrixData.hh
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./classes/include/ArtsNetMatrixData.hh.orig Mon Oct 2 13:05:17 2000
-+++ ./classes/include/ArtsNetMatrixData.hh Wed Sep 25 16:38:10 2002
-@@ -44,12 +44,19 @@
- #define ARTSNETMATRIXDATA_HH_
-
- extern "C" {
-+#include "artslocal.h"
- #include "caida_t.h"
- }
-
- #include <vector>
--#include <istream.h>
--#include <ostream.h>
-+
-+#ifdef HAVE_IOSTREAM
-+# include <iostream>
-+using namespace std;
-+#else
-+# include <istream.h>
-+# include <ostream.h>
-+#endif
-
- #include "ArtsNetMatrixEntry.hh"
-
diff --git a/net/arts++/files/patch-classes::include::ArtsNetMatrixEntry.hh b/net/arts++/files/patch-classes::include::ArtsNetMatrixEntry.hh
deleted file mode 100644
index 6bc783ffca8d..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsNetMatrixEntry.hh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./classes/include/ArtsNetMatrixEntry.hh.orig Mon Oct 2 13:05:17 2000
-+++ ./classes/include/ArtsNetMatrixEntry.hh Wed Sep 25 16:38:10 2002
-@@ -51,9 +51,10 @@
- }
-
- #ifdef HAVE_IOSTREAM
-- #include <iostream>
-+# include <iostream>
-+ using namespace std;
- #else
-- #include <iostream.h>
-+# include <iostream.h>
- #endif
-
- #ifdef HAVE_IOMANIP
diff --git a/net/arts++/files/patch-classes::include::ArtsPackageVersion.hh b/net/arts++/files/patch-classes::include::ArtsPackageVersion.hh
deleted file mode 100644
index bb844ba191d8..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsPackageVersion.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./classes/include/ArtsPackageVersion.hh.orig Mon Oct 2 13:05:18 2000
-+++ ./classes/include/ArtsPackageVersion.hh Wed Sep 25 16:38:10 2002
-@@ -44,6 +44,7 @@
- #define _ARTSPACKAGEVERSION_HH_
-
- #include <string>
-+using namespace std;
-
- //---------------------------------------------------------------------------
- // class ArtsPackageVersion
diff --git a/net/arts++/files/patch-classes::include::ArtsPortMatrixEntry.hh b/net/arts++/files/patch-classes::include::ArtsPortMatrixEntry.hh
deleted file mode 100644
index d099e0d46687..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsPortMatrixEntry.hh
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./classes/include/ArtsPortMatrixEntry.hh.orig Mon Oct 2 13:05:18 2000
-+++ ./classes/include/ArtsPortMatrixEntry.hh Wed Sep 25 16:38:10 2002
-@@ -50,15 +50,16 @@
- }
-
- #ifdef HAVE_IOSTREAM
-- #include <iostream>
-+# include <iostream>
-+ using namespace std;
- #else
-- #include <iostream.h>
-+# include <iostream.h>
- #endif
-
- #ifdef HAVE_IOMANIP
-- #include <iomanip>
-+# include <iomanip>
- #else
-- #include <iomanip.h>
-+# include <iomanip.h>
- #endif
-
- //---------------------------------------------------------------------------
diff --git a/net/arts++/files/patch-classes::include::ArtsPrimitive.hh b/net/arts++/files/patch-classes::include::ArtsPrimitive.hh
deleted file mode 100644
index 5556ff8521e1..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsPrimitive.hh
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./classes/include/ArtsPrimitive.hh.orig Mon Oct 2 13:05:19 2000
-+++ ./classes/include/ArtsPrimitive.hh Wed Sep 25 16:38:10 2002
-@@ -43,13 +43,19 @@
- #ifndef _ARTSPRIMITIVE_HH_
- #define _ARTSPRIMITIVE_HH_
-
--#include <iostream.h>
-
- extern "C" {
-+#include "artslocal.h"
- #include "caida_t.h"
- #include <unistd.h>
- }
-
-+#ifdef HAVE_IOSTREAM
-+# include <iostream>
-+ using namespace std;
-+#else
-+# include <iostream.h>
-+#endif
- //---------------------------------------------------------------------------
- // class ArtsPrimitive
- //---------------------------------------------------------------------------
diff --git a/net/arts++/files/patch-classes::include::ArtsRttTimeSeriesTableData.hh b/net/arts++/files/patch-classes::include::ArtsRttTimeSeriesTableData.hh
deleted file mode 100644
index 36ca49d7b4c6..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsRttTimeSeriesTableData.hh
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./classes/include/ArtsRttTimeSeriesTableData.hh.orig Thu Oct 19 19:37:14 2000
-+++ ./classes/include/ArtsRttTimeSeriesTableData.hh Wed Sep 25 16:38:10 2002
-@@ -47,7 +47,15 @@
- #include <sys/time.h>
-
- #include "caida_t.h"
-+#include "artslocal.h"
- }
-+
-+#ifdef HAVE_IOSTREAM
-+# include <iostream>
-+ using namespace std;
-+#else
-+# include <iostream.h>
-+#endif
-
- #include <vector>
-
diff --git a/net/arts++/files/patch-classes::include::ArtsSelectionSet.hh b/net/arts++/files/patch-classes::include::ArtsSelectionSet.hh
deleted file mode 100644
index 8208edb4bcdb..000000000000
--- a/net/arts++/files/patch-classes::include::ArtsSelectionSet.hh
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./classes/include/ArtsSelectionSet.hh.orig Mon Oct 2 13:05:20 2000
-+++ ./classes/include/ArtsSelectionSet.hh Wed Sep 25 16:38:10 2002
-@@ -49,6 +49,7 @@
-
- #include <vector>
- #include <algorithm>
-+using namespace std;
-
- #include "ArtsSelection.hh"
-
-@@ -96,7 +97,7 @@
- //-------------------------------------------------------------------------
- bool Matches(const Type & value) const
- {
-- const_iterator selectionIter;
-+ typename ArtsSelectionSet<Type>::const_iterator selectionIter;
- bool rc = false;
-
- for (selectionIter = this->begin(); selectionIter != this->end();
diff --git a/net/arts++/files/patch-classes::include::Ipv4Network.hh b/net/arts++/files/patch-classes::include::Ipv4Network.hh
deleted file mode 100644
index ecb290f907e6..000000000000
--- a/net/arts++/files/patch-classes::include::Ipv4Network.hh
+++ /dev/null
@@ -1,70 +0,0 @@
---- ./classes/include/Ipv4Network.hh.orig Tue Sep 12 14:26:26 2000
-+++ ./classes/include/Ipv4Network.hh Wed Sep 25 16:38:10 2002
-@@ -20,7 +20,8 @@
- }
-
- #ifdef HAVE_IOSTREAM
-- #include <iostream.h>
-+ #include <iostream>
-+ using namespace std;
- #else
- #include <iostream.h>
- #endif
-@@ -39,7 +40,7 @@
- {
- public:
- ipv4addr_t net;
-- uint8_t maskLen;
-+ char maskLen;
-
- //--------------------------------------------------------------------------
- // Ipv4Network()
-@@ -181,10 +182,10 @@
- istream & read(istream & is)
- {
- is.read(&this->maskLen,sizeof(this->maskLen));
-- uint8_t octet1 = 0;
-- uint8_t octet2 = 0;
-- uint8_t octet3 = 0;
-- uint8_t netSize = (this->maskLen + 7) / 8;
-+ char octet1 = 0;
-+ char octet2 = 0;
-+ char octet3 = 0;
-+ char netSize = (this->maskLen + 7) / 8;
-
- switch (netSize) {
- case 1:
-@@ -206,7 +207,7 @@
- ((ipv4addr_t)octet3 << 8));
- break;
- case 4:
-- is.read(&this->net,sizeof(this->net));
-+ is.read((char *)&this->net,sizeof(this->net));
- break;
- default:
- break;
-@@ -295,11 +296,11 @@
- // first we write the netmask length
- os.write(&this->maskLen,sizeof(this->maskLen));
-
-- uint8_t octet1 = 0;
-- uint8_t octet2 = 0;
-- uint8_t octet3 = 0;
-+ char octet1 = 0;
-+ char octet2 = 0;
-+ char octet3 = 0;
- ipv4addr_t netaddr;
-- uint8_t netSize = (this->maskLen + 7) / 8;
-+ char netSize = (this->maskLen + 7) / 8;
-
- // and then write the network prefix
- switch (netSize) {
-@@ -324,7 +325,7 @@
- os.write(&octet3,sizeof(octet3));
- break;
- case 4:
-- os.write(&this->net,sizeof(this->net));
-+ os.write((char *)&this->net,sizeof(this->net));
- break;
- default:
- break;
diff --git a/net/arts++/files/patch-classes::include::Ipv4PrefixPatricia.hh.in b/net/arts++/files/patch-classes::include::Ipv4PrefixPatricia.hh.in
deleted file mode 100644
index 2d4be55c04d2..000000000000
--- a/net/arts++/files/patch-classes::include::Ipv4PrefixPatricia.hh.in
+++ /dev/null
@@ -1,181 +0,0 @@
---- ./classes/include/Ipv4PrefixPatricia.hh.in.orig Fri Jan 21 07:21:59 2000
-+++ ./classes/include/Ipv4PrefixPatricia.hh.in Wed Sep 25 16:38:10 2002
-@@ -80,6 +80,9 @@
- * December 1998
- */
- //----------------------------------------------------------------------------
-+
-+template <class Type> class Ipv4PrefixPatricia;
-+
- template <class Type>
- class Ipv4PrefixPatricia
- {
-@@ -215,7 +218,7 @@
- // class variables
- //------------------------------------------------------------------------
- Ipv4PrefixPatricia<Type> *nodePtr;
-- vector<VlsmListEntry>::iterator vlsmIter;
-+ typename vector<VlsmListEntry>::iterator vlsmIter;
- bool wentLeft;
- bool wentRight;
-
-@@ -227,7 +230,7 @@
- StackEntry()
- {
- this->nodePtr = (Ipv4PrefixPatricia<Type> *)0;
-- this->vlsmIter = (vector<VlsmListEntry>::iterator)0;
-+ this->vlsmIter = (typename vector<VlsmListEntry>::iterator)0;
- this->wentLeft = false;
- this->wentRight = false;
- }
-@@ -253,7 +256,7 @@
- ~StackEntry()
- {
- this->nodePtr = (Ipv4PrefixPatricia<Type> *)0;
-- this->vlsmIter = (vector<VlsmListEntry>::iterator)0;
-+ this->vlsmIter = (typename vector<VlsmListEntry>::iterator)0;
- }
-
- //-------------------------------------------------------------------------
-@@ -297,7 +300,7 @@
- vector<StackEntry> nodeStack;
- Ipv4PrefixPatricia<Type> *nodePtr;
- bool end;
-- VlsmList::iterator vlsmIter;
-+ typename VlsmList::iterator vlsmIter;
-
- //------------------------------------------------------------------------
- // iterator()
-@@ -366,7 +369,7 @@
- //------------------------------------------------------------------------
- iterator & operator ++ (int foo)
- {
-- vector<StackEntry>::iterator stackIter;
-+ typename vector<StackEntry>::iterator stackIter;
- uint32_t bitNum;
- Ipv4PrefixPatricia<Type> *leftNode;
- Ipv4PrefixPatricia<Type> *rightNode;
-@@ -501,7 +504,7 @@
- public:
- vector<StackEntry> nodeStack;
- Ipv4PrefixPatricia<Type> *nodePtr;
-- VlsmList::reverse_iterator vlsmIter;
-+ typename VlsmList::reverse_iterator vlsmIter;
- bool end;
-
- //------------------------------------------------------------------------
-@@ -556,7 +559,7 @@
- //------------------------------------------------------------------------
- reverse_iterator & operator ++ (int foo)
- {
-- vector<StackEntry>::iterator stackIter;
-+ typename vector<StackEntry>::iterator stackIter;
- uint32_t bitNum;
- Ipv4PrefixPatricia<Type> *leftNode;
- Ipv4PrefixPatricia<Type> *rightNode;
-@@ -721,7 +724,7 @@
- {
- StackEntry stackEntry;
- iterator retIter;
-- vector<StackEntry>::iterator stackIter;
-+ typename vector<StackEntry>::iterator stackIter;
- Ipv4PrefixPatricia<Type> *leftNode;
- Ipv4PrefixPatricia<Type> *rightNode;
- uint32_t bitNum;
-@@ -799,7 +802,7 @@
- {
- StackEntry stackEntry;
- reverse_iterator retIter;
-- vector<StackEntry>::iterator stackIter;
-+ typename vector<StackEntry>::iterator stackIter;
- Ipv4PrefixPatricia<Type> *leftNode;
- Ipv4PrefixPatricia<Type> *rightNode;
- uint32_t bitNum;
-@@ -912,7 +915,7 @@
- {
- iterator retIter;
- Ipv4PrefixPatricia<Type> *treeNode, *nextNode;
-- vector<VlsmListEntry>::iterator vlsmIter;
-+ typename vector<VlsmListEntry>::iterator vlsmIter;
-
- treeNode = this;
- nextNode = treeNode->lft;
-@@ -955,7 +958,7 @@
- {
- iterator retIter;
- Ipv4PrefixPatricia<Type> *treeNode, *nextNode;
-- vector<VlsmListEntry>::iterator vlsmIter;
-+ typename vector<VlsmListEntry>::iterator vlsmIter;
-
- treeNode = this;
- nextNode = treeNode->lft;
-@@ -1026,7 +1029,7 @@
- //--------------------------------------------------------------------------
- pair<iterator,bool> & insert(const value_type & value)
- {
-- static pair<Ipv4PrefixPatricia<Type>::iterator,bool> retVal;
-+ static pair<typename Ipv4PrefixPatricia<Type>::iterator,bool> retVal;
-
- retVal = _insert(value);
- if (retVal.second) {
-@@ -1043,7 +1046,7 @@
- //
- //--------------------------------------------------------------------------
- inline void
-- visit(void (*visitFunc)(VlsmList::iterator & value, void *),
-+ visit(void (*visitFunc)(typename VlsmList::iterator & value, void *),
- void *other)
- {
- _visit(this->lft,visitFunc,other,33);
-@@ -1078,7 +1081,7 @@
- }
-
- bool foundVlsmEntry = false;
-- VlsmList::iterator vlsmDeleteIter;
-+ typename VlsmList::iterator vlsmDeleteIter;
-
- for (vlsmDeleteIter = dnode->vlsmVect.begin();
- vlsmDeleteIter != dnode->vlsmVect.end(); vlsmDeleteIter++) {
-@@ -1231,7 +1234,7 @@
- }
-
- bool foundVlsmEntry = false;
-- VlsmList::iterator vlsmDeleteIter;
-+ typename VlsmList::iterator vlsmDeleteIter;
-
- for (vlsmDeleteIter = dnode->vlsmVect.begin();
- vlsmDeleteIter != dnode->vlsmVect.end(); vlsmDeleteIter++) {
-@@ -1361,7 +1364,7 @@
- uint32_t erase(const iterator & start, const iterator & finish)
- {
- vector<key_type> keyVector;
-- vector<key_type>::iterator keyVectorIter;
-+ typename vector<key_type>::iterator keyVectorIter;
- iterator iter;
- uint32_t numErased = 0;
-
-@@ -1455,7 +1458,7 @@
- {
- Ipv4PrefixPatricia<Type> *p, *t, *x;
- uint32_t i = 32;
-- VlsmList::iterator vlsmIter;
-+ typename VlsmList::iterator vlsmIter;
-
- p = this;
- t = lft;
-@@ -1553,13 +1556,13 @@
- //--------------------------------------------------------------------------
- inline void
- _visit(Ipv4PrefixPatricia<Type> *head,
-- void (*visitFunc)(VlsmList::iterator & value, void *),
-+ void (*visitFunc)(typename VlsmList::iterator & value, void *),
- void *other, uint32_t bitNum)
- {
- Ipv4PrefixPatricia<Type> *p;
- Ipv4PrefixPatricia<Type> *leftNode;
- Ipv4PrefixPatricia<Type> *rightNode;
-- VlsmList::iterator vlsmIter;
-+ typename VlsmList::iterator vlsmIter;
-
- p = head;
- leftNode = head->lft;
diff --git a/net/arts++/files/patch-classes::include::artslocal.h.in b/net/arts++/files/patch-classes::include::artslocal.h.in
deleted file mode 100644
index 2b7b551a07ad..000000000000
--- a/net/arts++/files/patch-classes::include::artslocal.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./classes/include/artslocal.h.in.orig Wed Sep 25 16:48:31 2002
-+++ ./classes/include/artslocal.h.in Wed Sep 25 16:49:06 2002
-@@ -90,4 +90,10 @@
- //---------------------------------------------------------------------------
- #undef HAVE_STRSTREAM
-
-+//---------------------------------------------------------------------------
-+// If <ostream> exists, HAVE_OSTREAM should be non-zero. Else
-+// HAVE_OSTREAM should be zero and our source will use <ostream.h>
-+//---------------------------------------------------------------------------
-+#undef HAVE_OSTREAM
-+
-
diff --git a/net/arts++/files/patch-classes::src::ArtsAsMatrixAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsAsMatrixAggregatorMap.cc
deleted file mode 100644
index 643c350f2da1..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsAsMatrixAggregatorMap.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/src/ArtsAsMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:22 2000
-+++ ./classes/src/ArtsAsMatrixAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,9 +46,11 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
-- #include <fstream.h>
-+# include <fstream.h>
- #endif
-
- #include "ArtsAsMatrixAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::src::ArtsAsMatrixData.cc b/net/arts++/files/patch-classes::src::ArtsAsMatrixData.cc
deleted file mode 100644
index b7bf7fde20bf..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsAsMatrixData.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./classes/src/ArtsAsMatrixData.cc.orig Mon Oct 2 13:05:22 2000
-+++ ./classes/src/ArtsAsMatrixData.cc Wed Sep 25 16:38:10 2002
-@@ -81,7 +81,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream & ArtsAsMatrixData::read(istream& is, uint8_t version = 0)
-+istream & ArtsAsMatrixData::read(istream& is, uint8_t version)
- {
- uint32_t entryNum;
- ArtsAsMatrixEntry asEntry;
-@@ -106,7 +106,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsAsMatrixData::read(int fd, uint8_t version = 0)
-+int ArtsAsMatrixData::read(int fd, uint8_t version)
- {
- uint32_t entryNum;
- ArtsAsMatrixEntry asEntry;
-@@ -161,7 +161,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--ostream & ArtsAsMatrixData::write(ostream& os, uint8_t version = 0)
-+ostream & ArtsAsMatrixData::write(ostream& os, uint8_t version)
- {
- uint32_t entryNum;
-
-@@ -183,7 +183,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsAsMatrixData::write(int fd, uint8_t version = 0)
-+int ArtsAsMatrixData::write(int fd, uint8_t version)
- {
- uint32_t entryNum;
- int rc;
-@@ -235,7 +235,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsAsMatrixData::Length(uint8_t version = 0) const
-+uint32_t ArtsAsMatrixData::Length(uint8_t version) const
- {
- uint32_t length = 0;
-
diff --git a/net/arts++/files/patch-classes::src::ArtsAsMatrixEntry.cc b/net/arts++/files/patch-classes::src::ArtsAsMatrixEntry.cc
deleted file mode 100644
index b58a152e26cf..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsAsMatrixEntry.cc
+++ /dev/null
@@ -1,63 +0,0 @@
---- ./classes/src/ArtsAsMatrixEntry.cc.orig Mon Oct 2 13:05:22 2000
-+++ ./classes/src/ArtsAsMatrixEntry.cc Wed Sep 25 16:38:10 2002
-@@ -180,7 +180,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsAsMatrixEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsAsMatrixEntry::Length(uint8_t version) const
- {
- uint32_t length;
-
-@@ -197,14 +197,14 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsAsMatrixEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsAsMatrixEntry::read(istream& is, uint8_t version)
- {
- uint8_t bytesize,
- pktsize,
- srcsize,
- dstsize;
-
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- srcsize = (this->_descriptor & 0x01) + 1;
- dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
-@@ -224,7 +224,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsAsMatrixEntry::read(int fd, uint8_t version = 0)
-+int ArtsAsMatrixEntry::read(int fd, uint8_t version)
- {
- uint8_t bytesize,
- pktsize,
-@@ -277,14 +277,14 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--ostream & ArtsAsMatrixEntry::write(ostream & os, uint8_t version = 0) const
-+ostream & ArtsAsMatrixEntry::write(ostream & os, uint8_t version) const
- {
- uint8_t bytesize,
- pktsize,
- srcsize,
- dstsize;
-
-- os.write(&this->_descriptor,sizeof(this->_descriptor));
-+ os.write((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- srcsize = (this->_descriptor & 0x01) + 1;
- dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
-@@ -304,7 +304,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsAsMatrixEntry::write(int fd, uint8_t version = 0) const
-+int ArtsAsMatrixEntry::write(int fd, uint8_t version) const
- {
- uint8_t bytesize,
- pktsize,
diff --git a/net/arts++/files/patch-classes::src::ArtsAttribute.cc b/net/arts++/files/patch-classes::src::ArtsAttribute.cc
deleted file mode 100644
index b03b56a70d00..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsAttribute.cc
+++ /dev/null
@@ -1,134 +0,0 @@
---- ./classes/src/ArtsAttribute.cc.orig Mon Oct 2 13:05:22 2000
-+++ ./classes/src/ArtsAttribute.cc Wed Sep 25 16:38:10 2002
-@@ -41,6 +41,7 @@
- //===========================================================================
-
- extern "C" {
-+#include "artslocal.h"
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -51,7 +52,12 @@
- }
-
- #include <string>
--#include <iomanip.h>
-+#if HAVE_IOMANIP
-+# include <iomanip>
-+ using namespace std;
-+#else
-+# include <iomanip.h>
-+#endif
-
- #include "ArtsAttribute.hh"
- #include "ArtsPrimitive.hh"
-@@ -487,10 +493,10 @@
-
- idAndFormat = (this->_identifier << 8) | this->_format;
- uIntDatum = htonl(idAndFormat);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
-
- uIntDatum = htonl(this->_length);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
-
- switch (this->_identifier) {
- case artsC_ATTR_COMMENT:
-@@ -499,16 +505,16 @@
- break;
- case artsC_ATTR_CREATION:
- uIntDatum = htonl(this->_value.creation);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
- break;
- case artsC_ATTR_PERIOD:
- uIntDatum = htonl(this->_value.period[0]);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
- uIntDatum = htonl(this->_value.period[1]);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
- break;
- case artsC_ATTR_HOST:
-- os.write(&this->_value.host,sizeof(this->_value.host));
-+ os.write((char *)&this->_value.host,sizeof(this->_value.host));
- break;
- case artsC_ATTR_IFDESCR:
- ptr = this->_value.ifDescr->c_str();
-@@ -516,14 +522,14 @@
- break;
- case artsC_ATTR_IFINDEX:
- uShortDatum = htons(this->_value.ifIndex);
-- os.write(&uShortDatum,sizeof(uShortDatum));
-+ os.write((char *)&uShortDatum,sizeof(uShortDatum));
- break;
- case artsC_ATTR_IFIPADDR:
-- os.write(&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
-+ os.write((char *)&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
- break;
- case artsC_ATTR_HOSTPAIR:
-- os.write(&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
-- os.write(&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
-+ os.write((char *)&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
-+ os.write((char *)&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
- break;
- default:
- break;
-@@ -675,12 +681,12 @@
- break;
- }
-
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- idAndFormat = ntohl(uIntDatum);
- this->_identifier = idAndFormat >> 8;
- this->_format = idAndFormat & 0xff;
-
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- this->_length = ntohl(uIntDatum);
-
- switch (this->_identifier) {
-@@ -693,17 +699,17 @@
- free(ptr);
- break;
- case artsC_ATTR_CREATION:
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- this->_value.creation = ntohl(uIntDatum);
- break;
- case artsC_ATTR_PERIOD:
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- this->_value.period[0] = htonl(uIntDatum);
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- this->_value.period[1] = htonl(uIntDatum);
- break;
- case artsC_ATTR_HOST:
-- is.read(&this->_value.host,sizeof(this->_value.host));
-+ is.read((char *)&this->_value.host,sizeof(this->_value.host));
- break;
- case artsC_ATTR_IFDESCR:
- ptr = (char *)malloc(this->_length - (sizeof(uint32_t) * 2));
-@@ -714,15 +720,15 @@
- free(ptr);
- break;
- case artsC_ATTR_IFINDEX:
-- is.read(&this->_value.ifIndex,sizeof(this->_value.ifIndex));
-+ is.read((char *)&this->_value.ifIndex,sizeof(this->_value.ifIndex));
- this->_value.ifIndex = ntohs(this->_value.ifIndex);
- break;
- case artsC_ATTR_IFIPADDR:
-- is.read(&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
-+ is.read((char *)&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
- break;
- case artsC_ATTR_HOSTPAIR:
-- is.read(&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
-- is.read(&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
-+ is.read((char *)&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
-+ is.read((char *)&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
- break;
- default:
- break;
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4AggregatorAttribute.cc b/net/arts++/files/patch-classes::src::ArtsBgp4AggregatorAttribute.cc
deleted file mode 100644
index 8d9d0d54bda1..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4AggregatorAttribute.cc
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./classes/src/ArtsBgp4AggregatorAttribute.cc.orig Mon Oct 2 13:05:22 2000
-+++ ./classes/src/ArtsBgp4AggregatorAttribute.cc Wed Sep 25 16:38:10 2002
-@@ -154,10 +154,10 @@
- //
- //----------------------------------------------------------------------------
- istream & ArtsBgp4AggregatorAttribute::read(istream & is,
-- uint8_t version = 0)
-+ uint8_t version)
- {
- g_ArtsLibInternal_Primitive.ReadUint16(is,this->_AS,sizeof(this->_AS));
-- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
-+ is.read((char *)&this->_ipAddr,sizeof(this->_ipAddr));
- return(is);
- }
-
-@@ -166,7 +166,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4AggregatorAttribute::read(int fd, uint8_t version = 0)
-+int ArtsBgp4AggregatorAttribute::read(int fd, uint8_t version)
- {
- int rc;
- int bytesRead = 0;
-@@ -190,10 +190,10 @@
- //
- //----------------------------------------------------------------------------
- ostream & ArtsBgp4AggregatorAttribute::write(ostream & os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- g_ArtsLibInternal_Primitive.WriteUint16(os,this->_AS,sizeof(this->_AS));
-- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
-+ os.write((char *)&this->_ipAddr,sizeof(this->_ipAddr));
- return(os);
- }
-
-@@ -202,7 +202,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4AggregatorAttribute::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4AggregatorAttribute::write(int fd, uint8_t version) const
- {
- int rc;
- int bytesWritten = 0;
-@@ -225,7 +225,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsBgp4AggregatorAttribute::Length(uint8_t version = 0) const
-+uint32_t ArtsBgp4AggregatorAttribute::Length(uint8_t version) const
- {
- return(sizeof(this->_AS) + sizeof(this->_ipAddr));
- }
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4AsPathAttribute.cc b/net/arts++/files/patch-classes::src::ArtsBgp4AsPathAttribute.cc
deleted file mode 100644
index 8c9d3352c789..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4AsPathAttribute.cc
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./classes/src/ArtsBgp4AsPathAttribute.cc.orig Mon Oct 2 13:05:22 2000
-+++ ./classes/src/ArtsBgp4AsPathAttribute.cc Wed Sep 25 16:38:10 2002
-@@ -117,7 +117,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsBgp4AsPathAttribute::read(istream & is, uint8_t version = 0)
-+istream & ArtsBgp4AsPathAttribute::read(istream & is, uint8_t version)
- {
- ArtsBgp4AsPathSegment asPathSegment;
- uint8_t numSegments;
-@@ -125,7 +125,7 @@
- if (this->_segments.size() > 0)
- this->_segments.erase(this->_segments.begin(),this->_segments.end());
-
-- is.read(&numSegments,sizeof(numSegments));
-+ is.read((char *)&numSegments,sizeof(numSegments));
- if (numSegments > 0) {
- this->_segments.reserve(numSegments);
- for (uint8_t segmentNum = 0; segmentNum < numSegments; segmentNum++) {
-@@ -144,7 +144,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4AsPathAttribute::read(int fd, uint8_t version = 0)
-+int ArtsBgp4AsPathAttribute::read(int fd, uint8_t version)
- {
- int rc;
- int bytesRead = 0;
-@@ -175,10 +175,10 @@
- //
- //----------------------------------------------------------------------------
- ostream & ArtsBgp4AsPathAttribute::write(ostream & os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t numSegments = this->_segments.size();
-- os.write(&numSegments,sizeof(numSegments));
-+ os.write((char *)&numSegments,sizeof(numSegments));
- for (uint8_t segmentNum = 0; segmentNum < numSegments; segmentNum++) {
- this->_segments[segmentNum].write(os,version);
- }
-@@ -190,7 +190,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4AsPathAttribute::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4AsPathAttribute::write(int fd, uint8_t version) const
- {
- int rc;
- int bytesWritten = 0;
-@@ -232,7 +232,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsBgp4AsPathAttribute::Length(uint8_t version = 0) const
-+uint32_t ArtsBgp4AsPathAttribute::Length(uint8_t version) const
- {
- uint32_t length = sizeof(uint8_t);
-
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4AsPathSegment.cc b/net/arts++/files/patch-classes::src::ArtsBgp4AsPathSegment.cc
deleted file mode 100644
index e0d2c687dd9f..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4AsPathSegment.cc
+++ /dev/null
@@ -1,62 +0,0 @@
---- ./classes/src/ArtsBgp4AsPathSegment.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBgp4AsPathSegment.cc Wed Sep 25 16:38:10 2002
-@@ -137,13 +137,13 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsBgp4AsPathSegment::read(istream & is, uint8_t version = 0)
-+istream & ArtsBgp4AsPathSegment::read(istream & is, uint8_t version)
- {
- uint8_t numAses;
- uint16_t as;
-
-- is.read(&this->_type,sizeof(this->_type));
-- is.read(&numAses,sizeof(numAses));
-+ is.read((char *)&this->_type,sizeof(this->_type));
-+ is.read((char *)&numAses,sizeof(numAses));
- if (numAses > 0) {
- this->_AS.reserve(numAses);
- for (int asNum = 0; asNum < numAses; asNum++) {
-@@ -160,7 +160,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4AsPathSegment::read(int fd, uint8_t version = 0)
-+int ArtsBgp4AsPathSegment::read(int fd, uint8_t version)
- {
- int rc;
- uint8_t numAses;
-@@ -196,12 +196,12 @@
- //
- //----------------------------------------------------------------------------
- ostream & ArtsBgp4AsPathSegment::write(ostream & os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
-- os.write(&this->_type,sizeof(this->_type));
-+ os.write((char *)&this->_type,sizeof(this->_type));
-
- uint8_t numAses = this->_AS.size();
-- os.write(&numAses,sizeof(numAses));
-+ os.write((char *)&numAses,sizeof(numAses));
-
- for (int asNum = 0; asNum < numAses; asNum++) {
- g_ArtsLibInternal_Primitive.WriteUint16(os,this->_AS[asNum],
-@@ -215,7 +215,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4AsPathSegment::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4AsPathSegment::write(int fd, uint8_t version) const
- {
- int rc;
- uint8_t numAses;
-@@ -246,7 +246,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsBgp4AsPathSegment::Length(uint8_t version = 0) const
-+uint32_t ArtsBgp4AsPathSegment::Length(uint8_t version) const
- {
- return(sizeof(this->_type) + sizeof(uint8_t) +
- (sizeof(uint16_t) * this->_AS.size()));
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4Attribute.cc b/net/arts++/files/patch-classes::src::ArtsBgp4Attribute.cc
deleted file mode 100644
index de2d61543d58..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4Attribute.cc
+++ /dev/null
@@ -1,107 +0,0 @@
---- ./classes/src/ArtsBgp4Attribute.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBgp4Attribute.cc Wed Sep 25 16:38:10 2002
-@@ -444,26 +444,26 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsBgp4Attribute::read(istream & is, uint8_t version = 0)
-+istream & ArtsBgp4Attribute::read(istream & is, uint8_t version)
- {
- uint8_t numCommunities;
- uint32_t community;
-
- this->DeleteValue();
-
-- is.read(&this->_flags,sizeof(this->_flags));
-- is.read(&this->_type,sizeof(this->_type));
-+ is.read((char *)&this->_flags,sizeof(this->_flags));
-+ is.read((char *)&this->_type,sizeof(this->_type));
-
- switch (this->_type) {
- case Bgp4_Attribute_Origin:
-- is.read(&this->_value._origin,sizeof(this->_value._origin));
-+ is.read((char *)&this->_value._origin,sizeof(this->_value._origin));
- break;
- case Bgp4_Attribute_AsPath:
- this->_value._asPath = new ArtsBgp4AsPathAttribute;
- this->_value._asPath->read(is,version);
- break;
- case Bgp4_Attribute_NextHop:
-- is.read(&this->_value._nextHop,sizeof(this->_value._nextHop));
-+ is.read((char *)&this->_value._nextHop,sizeof(this->_value._nextHop));
- break;
- case Bgp4_Attribute_MultiExitDisc:
- g_ArtsLibInternal_Primitive.ReadUint32(is,this->_value._MED,
-@@ -480,7 +480,7 @@
- this->_value._aggregator->read(is,version);
- break;
- case Bgp4_Attribute_Community:
-- is.read(&numCommunities,sizeof(numCommunities));
-+ is.read((char *)&numCommunities,sizeof(numCommunities));
- this->_value._community = new vector<uint32_t>;
- this->_value._community->reserve((int)numCommunities);
- for (int commNum = 0; commNum < numCommunities; commNum++) {
-@@ -507,7 +507,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4Attribute::read(int fd, uint8_t version = 0)
-+int ArtsBgp4Attribute::read(int fd, uint8_t version)
- {
- uint8_t numCommunities;
- uint32_t community;
-@@ -622,22 +622,22 @@
- //
- //----------------------------------------------------------------------------
- ostream & ArtsBgp4Attribute::write(ostream & os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t numCommunities;
-
-- os.write(&this->_flags,sizeof(this->_flags));
-- os.write(&this->_type,sizeof(this->_type));
-+ os.write((char *)&this->_flags,sizeof(this->_flags));
-+ os.write((char *)&this->_type,sizeof(this->_type));
-
- switch (this->_type) {
- case Bgp4_Attribute_Origin:
-- os.write(&this->_value._origin,sizeof(this->_value._origin));
-+ os.write((char *)&this->_value._origin,sizeof(this->_value._origin));
- break;
- case Bgp4_Attribute_AsPath:
- this->_value._asPath->write(os,version);
- break;
- case Bgp4_Attribute_NextHop:
-- os.write(&this->_value._nextHop,sizeof(this->_value._nextHop));
-+ os.write((char *)&this->_value._nextHop,sizeof(this->_value._nextHop));
- break;
- case Bgp4_Attribute_MultiExitDisc:
- g_ArtsLibInternal_Primitive.WriteUint32(os,this->_value._MED,
-@@ -654,7 +654,7 @@
- break;
- case Bgp4_Attribute_Community:
- numCommunities = this->_value._community->size();
-- os.write(&numCommunities,sizeof(numCommunities));
-+ os.write((char *)&numCommunities,sizeof(numCommunities));
- for (int commNum = 0; commNum < numCommunities; commNum++) {
- g_ArtsLibInternal_Primitive.WriteUint32(os,
- (*(this->_value._community))[commNum],
-@@ -680,7 +680,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4Attribute::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4Attribute::write(int fd, uint8_t version) const
- {
- uint8_t numCommunities;
- int rc;
-@@ -855,7 +855,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint16_t ArtsBgp4Attribute::Length(uint8_t version = 0) const
-+uint16_t ArtsBgp4Attribute::Length(uint8_t version) const
- {
- uint16_t length = sizeof(this->_flags) + sizeof(this->_type);
- switch (this->_type) {
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4DPAttribute.cc b/net/arts++/files/patch-classes::src::ArtsBgp4DPAttribute.cc
deleted file mode 100644
index 6a93ef18ba54..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4DPAttribute.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./classes/src/ArtsBgp4DPAttribute.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBgp4DPAttribute.cc Wed Sep 25 16:38:10 2002
-@@ -132,7 +132,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsBgp4DPAttribute::read(istream & is, uint8_t version = 0)
-+istream & ArtsBgp4DPAttribute::read(istream & is, uint8_t version)
- {
- g_ArtsLibInternal_Primitive.ReadUint16(is,this->_as,sizeof(this->_as));
- g_ArtsLibInternal_Primitive.ReadUint32(is,this->_value,
-@@ -145,7 +145,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4DPAttribute::read(int fd, uint8_t version = 0)
-+int ArtsBgp4DPAttribute::read(int fd, uint8_t version)
- {
- int rc;
- int bytesRead = 0;
-@@ -169,7 +169,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--ostream & ArtsBgp4DPAttribute::write(ostream & os, uint8_t version = 0) const
-+ostream & ArtsBgp4DPAttribute::write(ostream & os, uint8_t version) const
- {
- g_ArtsLibInternal_Primitive.WriteUint16(os,this->_as,sizeof(this->_as));
- g_ArtsLibInternal_Primitive.WriteUint32(os,this->_value,
-@@ -182,7 +182,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4DPAttribute::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4DPAttribute::write(int fd, uint8_t version) const
- {
- int rc;
- int bytesWritten = 0;
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4Prefix.cc b/net/arts++/files/patch-classes::src::ArtsBgp4Prefix.cc
deleted file mode 100644
index c65bcf3e4c17..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4Prefix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./classes/src/ArtsBgp4Prefix.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBgp4Prefix.cc Wed Sep 25 16:38:10 2002
-@@ -48,7 +48,7 @@
-
- #include "ArtsBgp4Prefix.hh"
-
--static const string rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBgp4Prefix.cc,v 1.4 2000/10/02 17:05:23 dwm Exp $";
-+static const char *rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBgp4Prefix.cc,v 1.4 2000/10/02 17:05:23 dwm Exp $";
-
- //-------------------------------------------------------------------------
- // uint8_t ArtsBgp4Prefix::AddressFamily() const
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4RouteEntry.cc b/net/arts++/files/patch-classes::src::ArtsBgp4RouteEntry.cc
deleted file mode 100644
index 6623ddc7ffe9..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4RouteEntry.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./classes/src/ArtsBgp4RouteEntry.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBgp4RouteEntry.cc Wed Sep 25 16:38:10 2002
-@@ -122,7 +122,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsBgp4RouteEntry::read(istream & is, uint8_t version = 0)
-+istream & ArtsBgp4RouteEntry::read(istream & is, uint8_t version)
- {
- ArtsBgp4Attribute bgp4Attribute;
-
-@@ -186,7 +186,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4RouteEntry::read(int fd, uint8_t version = 0)
-+int ArtsBgp4RouteEntry::read(int fd, uint8_t version)
- {
- int rc;
- ArtsBgp4Attribute bgp4Attribute;
-@@ -291,7 +291,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--ostream & ArtsBgp4RouteEntry::write(ostream & os, uint8_t version = 0) const
-+ostream & ArtsBgp4RouteEntry::write(ostream & os, uint8_t version) const
- {
- g_ArtsLibInternal_Primitive.WriteUint32(os,this->_attrIndex,
- sizeof(this->_attrIndex));
-@@ -309,7 +309,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4RouteEntry::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4RouteEntry::write(int fd, uint8_t version) const
- {
- int rc;
- int bytesWritten = 0;
-@@ -337,7 +337,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsBgp4RouteEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsBgp4RouteEntry::Length(uint8_t version) const
- {
- uint32_t length = sizeof(this->_attrIndex);
- vector<ArtsBgp4Attribute>::const_iterator bgp4AttrIter;
diff --git a/net/arts++/files/patch-classes::src::ArtsBgp4RouteTableData.cc b/net/arts++/files/patch-classes::src::ArtsBgp4RouteTableData.cc
deleted file mode 100644
index 663a1cdb4673..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBgp4RouteTableData.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./classes/src/ArtsBgp4RouteTableData.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBgp4RouteTableData.cc Wed Sep 25 16:38:10 2002
-@@ -114,7 +114,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsBgp4RouteTableData::read(istream & is, uint8_t version = 0)
-+istream & ArtsBgp4RouteTableData::read(istream & is, uint8_t version)
- {
- uint32_t numRoutes;
- ArtsBgp4RouteEntry routeEntry;
-@@ -134,7 +134,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4RouteTableData::read(int fd, uint8_t version = 0)
-+int ArtsBgp4RouteTableData::read(int fd, uint8_t version)
- {
- uint32_t numRoutes;
- ArtsBgp4RouteEntry routeEntry;
-@@ -165,7 +165,7 @@
- //
- //----------------------------------------------------------------------------
- ostream & ArtsBgp4RouteTableData::write(ostream & os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
-
-@@ -185,7 +185,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsBgp4RouteTableData::write(int fd, uint8_t version = 0) const
-+int ArtsBgp4RouteTableData::write(int fd, uint8_t version) const
- {
- Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
- int rc;
-@@ -216,7 +216,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsBgp4RouteTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsBgp4RouteTableData::Length(uint8_t version) const
- {
- uint32_t length = sizeof(uint32_t);
- Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
diff --git a/net/arts++/files/patch-classes::src::ArtsBitString.cc b/net/arts++/files/patch-classes::src::ArtsBitString.cc
deleted file mode 100644
index d6446b6fa508..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsBitString.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./classes/src/ArtsBitString.cc.orig Mon Oct 2 13:05:23 2000
-+++ ./classes/src/ArtsBitString.cc Wed Sep 25 16:38:10 2002
-@@ -48,7 +48,7 @@
-
- #include "ArtsBitString.hh"
-
--static const string rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBitString.cc,v 1.7 2000/10/02 17:05:23 dwm Exp $";
-+static const char *rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBitString.cc,v 1.7 2000/10/02 17:05:23 dwm Exp $";
-
- //-------------------------------------------------------------------------
- // ArtsBitString::ArtsBitString(uint32_t numBits)
diff --git a/net/arts++/files/patch-classes::src::ArtsFileUtil.cc b/net/arts++/files/patch-classes::src::ArtsFileUtil.cc
deleted file mode 100644
index 780a56829b32..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsFileUtil.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./classes/src/ArtsFileUtil.cc.orig Mon Oct 2 13:05:24 2000
-+++ ./classes/src/ArtsFileUtil.cc Wed Sep 25 16:38:10 2002
-@@ -53,6 +53,7 @@
-
- #ifdef HAVE_FSTREAM
- #include <fstream>
-+ #include <iterator>
- #else
- #include <fstream.h>
- #endif
-@@ -69,7 +70,7 @@
- extern char *tzname[2];
- extern int errno;
-
--const string rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsFileUtil.cc,v 1.14 2000/10/02 17:05:24 dwm Exp $";
-+const char *rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsFileUtil.cc,v 1.14 2000/10/02 17:05:24 dwm Exp $";
- static const ArtsPackageVersion k_artsVersion = ArtsPackageVersion(rcsid);
-
- //----------------------------------------------------------------------------
diff --git a/net/arts++/files/patch-classes::src::ArtsHeader.cc b/net/arts++/files/patch-classes::src::ArtsHeader.cc
deleted file mode 100644
index 155239bdc69e..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsHeader.cc
+++ /dev/null
@@ -1,75 +0,0 @@
---- ./classes/src/ArtsHeader.cc.orig Mon Oct 2 13:05:24 2000
-+++ ./classes/src/ArtsHeader.cc Wed Sep 25 16:38:10 2002
-@@ -135,23 +135,23 @@
- uint32_t uIntDatum, idAndVersion;
-
- uShortDatum = htons(this->_magic);
-- os.write(&uShortDatum,sizeof(uShortDatum));
-+ os.write((char *)&uShortDatum,sizeof(uShortDatum));
-
- idAndVersion = (this->_identifier << 4) | this->_version;
- uIntDatum = htonl(idAndVersion);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
-
- uIntDatum = htonl(this->_flags);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
-
- uShortDatum = htons(this->_numAttributes);
-- os.write(&uShortDatum,sizeof(uShortDatum));
-+ os.write((char *)&uShortDatum,sizeof(uShortDatum));
-
- uIntDatum = htonl(this->_attrLength);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
-
- uIntDatum = htonl(this->_dataLength);
-- os.write(&uIntDatum,sizeof(uIntDatum));
-+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
-
- return(os);
- }
-@@ -225,13 +225,13 @@
- uint32_t uIntDatum;
- uint32_t idAndVersion;
-
-- is.read(&uShortDatum,sizeof(uShortDatum));
-+ is.read((char *)&uShortDatum,sizeof(uShortDatum));
- if (is.eof())
- return(is);
-
- this->_magic = ntohs(uShortDatum);
-
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- if (is.eof())
- return(is);
-
-@@ -239,22 +239,22 @@
- this->_identifier = idAndVersion >> 4;
- this->_version = idAndVersion & 0x0f;
-
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- if (is.eof())
- return(is);
- this->_flags = ntohl(uIntDatum);
-
-- is.read(&uShortDatum,sizeof(uShortDatum));
-+ is.read((char *)&uShortDatum,sizeof(uShortDatum));
- if (is.eof())
- return(is);
- this->_numAttributes = ntohs(uShortDatum);
-
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- if (is.eof())
- return(is);
- this->_attrLength = ntohl(uIntDatum);
-
-- is.read(&uIntDatum,sizeof(uIntDatum));
-+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
- if (is.eof())
- return(is);
- this->_dataLength = ntohl(uIntDatum);
diff --git a/net/arts++/files/patch-classes::src::ArtsIfIndexSelectionSet.lex b/net/arts++/files/patch-classes::src::ArtsIfIndexSelectionSet.lex
deleted file mode 100644
index 3a6732b238eb..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsIfIndexSelectionSet.lex
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./classes/src/ArtsIfIndexSelectionSet.lex.orig Mon Oct 2 13:05:24 2000
-+++ ./classes/src/ArtsIfIndexSelectionSet.lex Wed Sep 25 16:38:10 2002
-@@ -48,6 +48,7 @@
- }
-
- #include <string>
-+using namespace std;
-
- #ifdef HAVE_STRSTREAM
- #include <strstream>
diff --git a/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixAggregatorMap.cc
deleted file mode 100644
index d597ad1c8d80..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixAggregatorMap.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./classes/src/ArtsInterfaceMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:24 2000
-+++ ./classes/src/ArtsInterfaceMatrixAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,7 +46,9 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
- #include <fstream.h>
- #endif
diff --git a/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixData.cc b/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixData.cc
deleted file mode 100644
index 18c54ffeaad7..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixData.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./classes/src/ArtsInterfaceMatrixData.cc.orig Mon Oct 2 13:05:24 2000
-+++ ./classes/src/ArtsInterfaceMatrixData.cc Wed Sep 25 16:38:10 2002
-@@ -81,7 +81,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream & ArtsInterfaceMatrixData::read(istream& is, uint8_t version = 0)
-+istream & ArtsInterfaceMatrixData::read(istream& is, uint8_t version)
- {
- uint32_t entryNum;
- ArtsInterfaceMatrixEntry interfaceEntry;
-@@ -106,7 +106,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsInterfaceMatrixData::read(int fd, uint8_t version = 0)
-+int ArtsInterfaceMatrixData::read(int fd, uint8_t version)
- {
- uint32_t entryNum;
- // ArtsPrimitive ioHelper;
-@@ -163,7 +163,7 @@
- //
- //-------------------------------------------------------------------------
- ostream & ArtsInterfaceMatrixData::write(ostream& os,
-- uint8_t version = 0)
-+ uint8_t version)
- {
- uint32_t entryNum;
-
-@@ -185,7 +185,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsInterfaceMatrixData::write(int fd, uint8_t version = 0)
-+int ArtsInterfaceMatrixData::write(int fd, uint8_t version)
- {
- uint32_t entryNum;
- int rc;
-@@ -237,7 +237,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsInterfaceMatrixData::Length(uint8_t version = 0) const
-+uint32_t ArtsInterfaceMatrixData::Length(uint8_t version) const
- {
- uint32_t length = 0;
-
diff --git a/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixEntry.cc b/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixEntry.cc
deleted file mode 100644
index 30ad2898c67f..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsInterfaceMatrixEntry.cc
+++ /dev/null
@@ -1,57 +0,0 @@
---- ./classes/src/ArtsInterfaceMatrixEntry.cc.orig Mon Oct 2 13:05:25 2000
-+++ ./classes/src/ArtsInterfaceMatrixEntry.cc Wed Sep 25 16:38:10 2002
-@@ -214,7 +214,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsInterfaceMatrixEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsInterfaceMatrixEntry::Length(uint8_t version) const
- {
- uint32_t length;
- length = (sizeof(this->_descriptor) +
-@@ -231,11 +231,11 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream & ArtsInterfaceMatrixEntry::read(istream& is, uint8_t version = 0)
-+istream & ArtsInterfaceMatrixEntry::read(istream& is, uint8_t version)
- {
- uint8_t bytesize, pktsize, srcsize, dstsize;
-
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- srcsize = (this->_descriptor & 0x01) + 1;
- dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
-@@ -255,7 +255,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsInterfaceMatrixEntry::read(int fd, uint8_t version = 0)
-+int ArtsInterfaceMatrixEntry::read(int fd, uint8_t version)
- {
- uint8_t bytesize, pktsize, srcsize, dstsize;
- int rc;
-@@ -307,11 +307,11 @@
- //
- //-------------------------------------------------------------------------
- ostream & ArtsInterfaceMatrixEntry::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t bytesize, pktsize, srcsize, dstsize;
-
-- os.write(&this->_descriptor,sizeof(this->_descriptor));
-+ os.write((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- srcsize = (this->_descriptor & 0x01) + 1;
- dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
-@@ -331,7 +331,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsInterfaceMatrixEntry::write(int fd, uint8_t version = 0) const
-+int ArtsInterfaceMatrixEntry::write(int fd, uint8_t version) const
- {
- uint8_t bytesize, pktsize, srcsize, dstsize;
- int rc;
diff --git a/net/arts++/files/patch-classes::src::ArtsIpPathData.cc b/net/arts++/files/patch-classes::src::ArtsIpPathData.cc
deleted file mode 100644
index fc13c606649e..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsIpPathData.cc
+++ /dev/null
@@ -1,107 +0,0 @@
---- ./classes/src/ArtsIpPathData.cc.orig Mon Oct 2 13:05:25 2000
-+++ ./classes/src/ArtsIpPathData.cc Wed Sep 25 16:38:10 2002
-@@ -187,7 +187,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsIpPathData::Length(uint8_t version = 0) const
-+uint32_t ArtsIpPathData::Length(uint8_t version) const
- {
- uint32_t len = sizeof(this->_src) + sizeof(this->_dst) +
- sizeof(this->_rtt) + sizeof(this->_hopDistance) + sizeof(this->_numHops);
-@@ -209,28 +209,28 @@
- //------------------------------------------------------------------------
- // ostream& ArtsIpPathData::write(ostream& os, uint8_t version = 0)
- //------------------------------------------------------------------------
--ostream& ArtsIpPathData::write(ostream& os, uint8_t version = 0)
-+ostream& ArtsIpPathData::write(ostream& os, uint8_t version)
- {
- uint32_t timeDatum;
- uint8_t completeAndNumHops;
-
-- os.write(&this->_src,sizeof(this->_src));
-- os.write(&this->_dst,sizeof(this->_dst));
-+ os.write((char *)&this->_src,sizeof(this->_src));
-+ os.write((char *)&this->_dst,sizeof(this->_dst));
-
- timeDatum = htonl(this->_rtt.tv_sec);
-- os.write(&timeDatum,sizeof(timeDatum));
-+ os.write((char *)&timeDatum,sizeof(timeDatum));
- timeDatum = htonl(this->_rtt.tv_usec);
-- os.write(&timeDatum,sizeof(timeDatum));
-+ os.write((char *)&timeDatum,sizeof(timeDatum));
-
-- os.write(&this->_hopDistance,sizeof(this->_hopDistance));
-+ os.write((char *)&this->_hopDistance,sizeof(this->_hopDistance));
-
- completeAndNumHops = (this->_isComplete << 7) | this->_numHops;
-- os.write(&completeAndNumHops,sizeof(completeAndNumHops));
-+ os.write((char *)&completeAndNumHops,sizeof(completeAndNumHops));
-
- if (version == 1) {
- if (! this->_isComplete) {
-- os.write(&this->_incompleteReason,sizeof(this->_incompleteReason));
-- os.write(&this->_incompleteFlags,sizeof(this->_incompleteFlags));
-+ os.write((char *)&this->_incompleteReason,sizeof(this->_incompleteReason));
-+ os.write((char *)&this->_incompleteFlags,sizeof(this->_incompleteFlags));
- }
- }
-
-@@ -251,7 +251,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsIpPathData::write(int fd, uint8_t version = 0)
-+int ArtsIpPathData::write(int fd, uint8_t version)
- {
- uint32_t timeDatum;
- uint8_t completeAndNumHops;
-@@ -334,30 +334,30 @@
- //------------------------------------------------------------------------
- // istream& ArtsIpPathData::read(istream& is, uint8_t version = 0)
- //------------------------------------------------------------------------
--istream& ArtsIpPathData::read(istream& is, uint8_t version = 0)
-+istream& ArtsIpPathData::read(istream& is, uint8_t version)
- {
- uint32_t timeDatum;
- uint8_t completeAndNumHops;
- size_t hopNum;
-
-- is.read(&this->_src,sizeof(this->_src));
-- is.read(&this->_dst,sizeof(this->_dst));
-+ is.read((char *)&this->_src,sizeof(this->_src));
-+ is.read((char *)&this->_dst,sizeof(this->_dst));
-
-- is.read(&timeDatum,sizeof(timeDatum));
-+ is.read((char *)&timeDatum,sizeof(timeDatum));
- this->_rtt.tv_sec = ntohl(timeDatum);
-- is.read(&timeDatum,sizeof(timeDatum));
-+ is.read((char *)&timeDatum,sizeof(timeDatum));
- this->_rtt.tv_usec = ntohl(timeDatum);
-
-- is.read(&this->_hopDistance,sizeof(this->_hopDistance));
-+ is.read((char *)&this->_hopDistance,sizeof(this->_hopDistance));
-
-- is.read(&completeAndNumHops,sizeof(completeAndNumHops));
-+ is.read((char *)&completeAndNumHops,sizeof(completeAndNumHops));
- this->_isComplete = completeAndNumHops >> 7;
- this->_numHops = completeAndNumHops & 0x7f;
-
- if (version == 1) {
- if (! this->_isComplete) {
-- is.read(&this->_incompleteReason,sizeof(this->_incompleteReason));
-- is.read(&this->_incompleteFlags,sizeof(this->_incompleteFlags));
-+ is.read((char *)&this->_incompleteReason,sizeof(this->_incompleteReason));
-+ is.read((char *)&this->_incompleteFlags,sizeof(this->_incompleteFlags));
- }
- }
-
-@@ -384,7 +384,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsIpPathData::read(int fd, uint8_t version = 0)
-+int ArtsIpPathData::read(int fd, uint8_t version)
- {
- uint32_t timeDatum;
- uint8_t completeAndNumHops;
diff --git a/net/arts++/files/patch-classes::src::ArtsIpPathEntry.cc b/net/arts++/files/patch-classes::src::ArtsIpPathEntry.cc
deleted file mode 100644
index 143f9787139b..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsIpPathEntry.cc
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./classes/src/ArtsIpPathEntry.cc.orig Mon Oct 2 13:05:25 2000
-+++ ./classes/src/ArtsIpPathEntry.cc Wed Sep 25 16:38:10 2002
-@@ -111,13 +111,13 @@
- //------------------------------------------------------------------------
- // istream& ArtsIpPathEntry::read(istream& is, uint8_t version = 0)
- //------------------------------------------------------------------------
--istream& ArtsIpPathEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsIpPathEntry::read(istream& is, uint8_t version)
- {
-- is.read(&this->_hopNum,sizeof(this->_hopNum));
-+ is.read((char *)&this->_hopNum,sizeof(this->_hopNum));
- if (! is)
- return(is);
-
-- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
-+ is.read((char *)&this->_ipAddr,sizeof(this->_ipAddr));
- if (! is)
- return(is);
-
-@@ -130,7 +130,7 @@
- this->_rtt.tv_sec = fourBytes / 1000000;
- this->_rtt.tv_usec = fourBytes % 1000000;
-
-- is.read(&this->_numTries,sizeof(this->_numTries));
-+ is.read((char *)&this->_numTries,sizeof(this->_numTries));
- }
-
- return(is);
-@@ -141,7 +141,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsIpPathEntry::read(int fd, uint8_t version = 0)
-+int ArtsIpPathEntry::read(int fd, uint8_t version)
- {
- int rc;
- int bytesRead = 0;
-@@ -182,15 +182,15 @@
- //------------------------------------------------------------------------
- // ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version = 0) const
- //------------------------------------------------------------------------
--ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version = 0) const
-+ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version) const
- {
-- os.write(&this->_hopNum,sizeof(this->_hopNum));
-- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
-+ os.write((char *)&this->_hopNum,sizeof(this->_hopNum));
-+ os.write((char *)&this->_ipAddr,sizeof(this->_ipAddr));
-
- if (version == 1) {
- uint32_t fourBytes = (this->_rtt.tv_sec * 1000000) + this->_rtt.tv_usec;
- g_ArtsLibInternal_Primitive.WriteUint32(os,fourBytes,4);
-- os.write(&this->_numTries,sizeof(this->_numTries));
-+ os.write((char *)&this->_numTries,sizeof(this->_numTries));
- }
-
- return(os);
-@@ -201,7 +201,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsIpPathEntry::write(int fd, uint8_t version = 0) const
-+int ArtsIpPathEntry::write(int fd, uint8_t version) const
- {
- int rc;
- int bytesWritten = 0;
diff --git a/net/arts++/files/patch-classes::src::ArtsNetMatrixAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsNetMatrixAggregatorMap.cc
deleted file mode 100644
index 59f3ea0e1880..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsNetMatrixAggregatorMap.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/src/ArtsNetMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:25 2000
-+++ ./classes/src/ArtsNetMatrixAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,9 +46,11 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
-- #include <fstream.h>
-+# include <fstream.h>
- #endif
-
- #include "ArtsNetMatrixAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::src::ArtsNetMatrixData.cc b/net/arts++/files/patch-classes::src::ArtsNetMatrixData.cc
deleted file mode 100644
index 730923eb3f84..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsNetMatrixData.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./classes/src/ArtsNetMatrixData.cc.orig Mon Oct 2 13:05:25 2000
-+++ ./classes/src/ArtsNetMatrixData.cc Wed Sep 25 16:38:10 2002
-@@ -83,7 +83,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream & ArtsNetMatrixData::read(istream& is, uint8_t version = 2)
-+istream & ArtsNetMatrixData::read(istream& is, uint8_t version)
- {
- uint32_t entryNum;
- ArtsNetMatrixEntry netEntry;
-@@ -108,7 +108,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsNetMatrixData::read(int fd, uint8_t version = 2)
-+int ArtsNetMatrixData::read(int fd, uint8_t version)
- {
- uint32_t entryNum;
- ArtsNetMatrixEntry netEntry;
-@@ -163,7 +163,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--ostream & ArtsNetMatrixData::write(ostream& os, uint8_t version = 2)
-+ostream & ArtsNetMatrixData::write(ostream& os, uint8_t version)
- {
- uint32_t entryNum;
-
-@@ -185,7 +185,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsNetMatrixData::write(int fd, uint8_t version = 2)
-+int ArtsNetMatrixData::write(int fd, uint8_t version)
- {
- uint32_t entryNum;
- int rc;
-@@ -237,7 +237,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsNetMatrixData::Length(uint8_t version = 2) const
-+uint32_t ArtsNetMatrixData::Length(uint8_t version) const
- {
- uint32_t length = 0;
-
diff --git a/net/arts++/files/patch-classes::src::ArtsNetMatrixEntry.cc b/net/arts++/files/patch-classes::src::ArtsNetMatrixEntry.cc
deleted file mode 100644
index 062bfa095692..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsNetMatrixEntry.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- ./classes/src/ArtsNetMatrixEntry.cc.orig Mon Oct 2 13:05:25 2000
-+++ ./classes/src/ArtsNetMatrixEntry.cc Wed Sep 25 16:38:10 2002
-@@ -186,7 +186,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsNetMatrixEntry::Length(uint8_t version = 2) const
-+uint32_t ArtsNetMatrixEntry::Length(uint8_t version) const
- {
- uint32_t length;
-
-@@ -203,7 +203,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsNetMatrixEntry::read(istream& is, uint8_t version = 2)
-+istream& ArtsNetMatrixEntry::read(istream& is, uint8_t version)
- {
- uint8_t bytesize,
- pktsize,
-@@ -212,7 +212,7 @@
- dstsize,
- dstmasklen;
-
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
- this->_descriptor = ntohs(this->_descriptor);
-
- srcmasklen = ((this->_descriptor >> 5) & 0x1f) + 1;
-@@ -237,7 +237,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsNetMatrixEntry::read(int fd, uint8_t version = 2)
-+int ArtsNetMatrixEntry::read(int fd, uint8_t version)
- {
- uint8_t bytesize,
- pktsize,
-@@ -298,7 +298,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--ostream & ArtsNetMatrixEntry::write(ostream & os, uint8_t version = 2) const
-+ostream & ArtsNetMatrixEntry::write(ostream & os, uint8_t version) const
- {
- uint8_t bytesize,
- pktsize,
-@@ -309,7 +309,7 @@
- uint16_t tmpDescriptor;
-
- tmpDescriptor = htons(this->_descriptor);
-- os.write(&tmpDescriptor,sizeof(tmpDescriptor));
-+ os.write((char *)&tmpDescriptor,sizeof(tmpDescriptor));
-
- srcmasklen = ((this->_descriptor >> 5) & 0x1f) + 1;
- srcsize = (srcmasklen + 7) / 8;
-@@ -333,7 +333,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsNetMatrixEntry::write(int fd, uint8_t version = 2) const
-+int ArtsNetMatrixEntry::write(int fd, uint8_t version) const
- {
- uint8_t bytesize,
- pktsize,
diff --git a/net/arts++/files/patch-classes::src::ArtsNextHopTableAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsNextHopTableAggregatorMap.cc
deleted file mode 100644
index b5415ec220d9..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsNextHopTableAggregatorMap.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/src/ArtsNextHopTableAggregatorMap.cc.orig Mon Oct 2 13:05:26 2000
-+++ ./classes/src/ArtsNextHopTableAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,9 +46,11 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
-- #include <fstream.h>
-+# include <fstream.h>
- #endif
-
- #include "ArtsNextHopTableAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::src::ArtsNextHopTableData.cc b/net/arts++/files/patch-classes::src::ArtsNextHopTableData.cc
deleted file mode 100644
index d68296e73cfb..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsNextHopTableData.cc
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./classes/src/ArtsNextHopTableData.cc.orig Mon Oct 2 13:05:26 2000
-+++ ./classes/src/ArtsNextHopTableData.cc Wed Sep 25 16:38:10 2002
-@@ -182,7 +182,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsNextHopTableData::ComputeLength(uint8_t version = 0) const
-+uint32_t ArtsNextHopTableData::ComputeLength(uint8_t version) const
- {
- this->_length = 0;
-
-@@ -205,7 +205,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsNextHopTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsNextHopTableData::Length(uint8_t version) const
- {
- this->ComputeLength(version);
- return(this->_length);
-@@ -216,7 +216,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsNextHopTableData::read(istream& is, uint8_t version = 0)
-+istream& ArtsNextHopTableData::read(istream& is, uint8_t version)
- {
- uint32_t numNextHops;
- uint32_t NextHopNum;
-@@ -239,7 +239,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsNextHopTableData::read(int fd, uint8_t version = 0)
-+int ArtsNextHopTableData::read(int fd, uint8_t version)
- {
- uint32_t numNextHops;
- uint32_t NextHopNum;
-@@ -281,7 +281,7 @@
- //
- //-------------------------------------------------------------------------
- ostream& ArtsNextHopTableData::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t numNextHops;
-
-@@ -306,7 +306,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsNextHopTableData::write(int fd, uint8_t version = 0) const
-+int ArtsNextHopTableData::write(int fd, uint8_t version) const
- {
- uint32_t numNextHops;
- int rc;
diff --git a/net/arts++/files/patch-classes::src::ArtsNextHopTableEntry.cc b/net/arts++/files/patch-classes::src::ArtsNextHopTableEntry.cc
deleted file mode 100644
index fe8fcc589a78..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsNextHopTableEntry.cc
+++ /dev/null
@@ -1,67 +0,0 @@
---- ./classes/src/ArtsNextHopTableEntry.cc.orig Mon Oct 2 13:05:26 2000
-+++ ./classes/src/ArtsNextHopTableEntry.cc Wed Sep 25 16:38:10 2002
-@@ -192,7 +192,7 @@
- //-------------------------------------------------------------------------
- // uint32_t ArtsNextHopTableEntry::Length(uint8_t version = 0) const
- //-------------------------------------------------------------------------
--uint32_t ArtsNextHopTableEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsNextHopTableEntry::Length(uint8_t version) const
- {
- uint32_t len = 0;
-
-@@ -207,15 +207,15 @@
- //-------------------------------------------------------------------------
- // istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version = 0)
- //-------------------------------------------------------------------------
--istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version)
- {
- uint8_t fieldLen;
-
- // IP address
-- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
-+ is.read((char *)&this->_ipAddr,sizeof(this->_ipAddr));
-
- // descriptor
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- // pkts
- fieldLen = (this->_descriptor >> 3) + 1;
-@@ -231,7 +231,7 @@
- //-------------------------------------------------------------------------
- // int ArtsNextHopTableEntry::read(int fd, uint8_t version = 0)
- //-------------------------------------------------------------------------
--int ArtsNextHopTableEntry::read(int fd, uint8_t version = 0)
-+int ArtsNextHopTableEntry::read(int fd, uint8_t version)
- {
- uint8_t fieldLen;
- int rc = 0;
-@@ -262,15 +262,15 @@
- // uint8_t version = 0) const
- //-------------------------------------------------------------------------
- ostream& ArtsNextHopTableEntry::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t fieldLen;
-
- // IP address
-- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
-+ os.write((char *)&this->_ipAddr,sizeof(this->_ipAddr));
-
- // descriptor
-- os.write(&this->_descriptor,1);
-+ os.write((char *)&this->_descriptor,1);
-
- // pkts
- fieldLen = (this->_descriptor >> 3) + 1;
-@@ -286,7 +286,7 @@
- //-------------------------------------------------------------------------
- // int ArtsNextHopTableEntry::write(int fd, uint8_t version = 0) const
- //-------------------------------------------------------------------------
--int ArtsNextHopTableEntry::write(int fd, uint8_t version = 0) const
-+int ArtsNextHopTableEntry::write(int fd, uint8_t version) const
- {
- uint8_t fieldLen;
- int rc = 0;
diff --git a/net/arts++/files/patch-classes::src::ArtsPortChoice.cc b/net/arts++/files/patch-classes::src::ArtsPortChoice.cc
deleted file mode 100644
index 707266dcb61b..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortChoice.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./classes/src/ArtsPortChoice.cc.orig Mon Oct 2 13:05:26 2000
-+++ ./classes/src/ArtsPortChoice.cc Wed Sep 25 16:38:10 2002
-@@ -293,7 +293,7 @@
- {
- uint8_t portLength;
-
-- is.read(&this->_flags,sizeof(this->_flags));
-+ is.read((char *)&this->_flags,sizeof(this->_flags));
- if (!is)
- return(is);
-
-@@ -364,7 +364,7 @@
- {
- uint8_t portLength;
-
-- os.write(&this->_flags,sizeof(this->_flags));
-+ os.write((char *)&this->_flags,sizeof(this->_flags));
-
- portLength = 1;
- if (this->_flags & this->k_firstPortLengthMask)
diff --git a/net/arts++/files/patch-classes::src::ArtsPortChooser.lex b/net/arts++/files/patch-classes::src::ArtsPortChooser.lex
deleted file mode 100644
index c5407ed0b8cb..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortChooser.lex
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./classes/src/ArtsPortChooser.lex.orig Mon Oct 2 13:05:27 2000
-+++ ./classes/src/ArtsPortChooser.lex Wed Sep 25 16:38:10 2002
-@@ -233,7 +233,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsPortChooser::Length(uint8_t version = 0) const
-+uint32_t ArtsPortChooser::Length(uint8_t version) const
- {
- uint32_t length = 0;
- vector<ArtsPortChoice>::const_iterator choiceIter;
diff --git a/net/arts++/files/patch-classes::src::ArtsPortMatrixAggregator.cc b/net/arts++/files/patch-classes::src::ArtsPortMatrixAggregator.cc
deleted file mode 100644
index 29b303fb7f83..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortMatrixAggregator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./classes/src/ArtsPortMatrixAggregator.cc.orig Mon Oct 2 13:05:27 2000
-+++ ./classes/src/ArtsPortMatrixAggregator.cc Wed Sep 25 16:38:10 2002
-@@ -327,7 +327,7 @@
- //----------------------------------------------------------------------------
- ArtsSelectedPortTable *
- ArtsPortMatrixAggregator::
--ConvertToArtsSelectedPortTable(int numTopPorts, bool byPkts = false) const
-+ConvertToArtsSelectedPortTable(int numTopPorts, bool byPkts) const
- {
- ArtsPortTableEntry portEntry;
- map<ArtsPortMatrixKeyValue,counter_t,less<ArtsPortMatrixKeyValue> >::const_iterator portCounter;
diff --git a/net/arts++/files/patch-classes::src::ArtsPortMatrixAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsPortMatrixAggregatorMap.cc
deleted file mode 100644
index 13a3ddcd5547..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortMatrixAggregatorMap.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/src/ArtsPortMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:27 2000
-+++ ./classes/src/ArtsPortMatrixAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,9 +46,11 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
-- #include <fstream.h>
-+# include <fstream.h>
- #endif
-
- #include "ArtsPortMatrixAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::src::ArtsPortMatrixData.cc b/net/arts++/files/patch-classes::src::ArtsPortMatrixData.cc
deleted file mode 100644
index 81bb8038499b..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortMatrixData.cc
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./classes/src/ArtsPortMatrixData.cc.orig Mon Oct 2 13:05:27 2000
-+++ ./classes/src/ArtsPortMatrixData.cc Wed Sep 25 16:38:10 2002
-@@ -82,7 +82,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream & ArtsPortMatrixData::read(istream& is, uint8_t version = 0)
-+istream & ArtsPortMatrixData::read(istream& is, uint8_t version)
- {
- uint32_t entryNum;
- ArtsPortMatrixEntry portEntry;
-@@ -107,7 +107,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsPortMatrixData::read(int fd, uint8_t version = 0)
-+int ArtsPortMatrixData::read(int fd, uint8_t version)
- {
- uint32_t entryNum;
- ArtsPortMatrixEntry portEntry;
-@@ -162,7 +162,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--ostream & ArtsPortMatrixData::write(ostream& os, uint8_t version = 0)
-+ostream & ArtsPortMatrixData::write(ostream& os, uint8_t version)
- {
- uint32_t entryNum;
-
-@@ -180,11 +180,11 @@
- }
-
- //-------------------------------------------------------------------------
--// int ArtsPortMatrixData::write(int fd, uint8_t version = 0)
-+// int ArtsPortMatrixData::write(int fd, uint8_t version)
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsPortMatrixData::write(int fd, uint8_t version = 0)
-+int ArtsPortMatrixData::write(int fd, uint8_t version)
- {
- uint32_t entryNum;
- int rc;
-@@ -236,7 +236,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsPortMatrixData::Length(uint8_t version = 0) const
-+uint32_t ArtsPortMatrixData::Length(uint8_t version) const
- {
- uint32_t length = 0;
-
diff --git a/net/arts++/files/patch-classes::src::ArtsPortMatrixEntry.cc b/net/arts++/files/patch-classes::src::ArtsPortMatrixEntry.cc
deleted file mode 100644
index c5b44db0abf5..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortMatrixEntry.cc
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./classes/src/ArtsPortMatrixEntry.cc.orig Mon Oct 2 13:05:27 2000
-+++ ./classes/src/ArtsPortMatrixEntry.cc Wed Sep 25 16:38:10 2002
-@@ -176,7 +176,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsPortMatrixEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsPortMatrixEntry::Length(uint8_t version) const
- {
- uint32_t length;
-
-@@ -189,18 +189,18 @@
- }
-
- //-------------------------------------------------------------------------
--// istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version = 0)
-+// istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version)
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version)
- {
- uint8_t bytesize,
- pktsize,
- srcsize,
- dstsize;
-
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- srcsize = (this->_descriptor & 0x01) + 1;
- dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
-@@ -220,7 +220,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsPortMatrixEntry::read(int fd, uint8_t version = 0)
-+int ArtsPortMatrixEntry::read(int fd, uint8_t version)
- {
- uint8_t bytesize,
- pktsize,
-@@ -273,14 +273,14 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--ostream & ArtsPortMatrixEntry::write(ostream & os, uint8_t version = 0) const
-+ostream & ArtsPortMatrixEntry::write(ostream & os, uint8_t version) const
- {
- uint8_t bytesize,
- pktsize,
- srcsize,
- dstsize;
-
-- os.write(&this->_descriptor,sizeof(this->_descriptor));
-+ os.write((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- srcsize = (this->_descriptor & 0x01) + 1;
- dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
-@@ -300,7 +300,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsPortMatrixEntry::write(int fd, uint8_t version = 0) const
-+int ArtsPortMatrixEntry::write(int fd, uint8_t version) const
- {
- uint8_t bytesize,
- pktsize,
diff --git a/net/arts++/files/patch-classes::src::ArtsPortTableData.cc b/net/arts++/files/patch-classes::src::ArtsPortTableData.cc
deleted file mode 100644
index 52b84bd22665..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortTableData.cc
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./classes/src/ArtsPortTableData.cc.orig Mon Oct 2 13:05:28 2000
-+++ ./classes/src/ArtsPortTableData.cc Wed Sep 25 16:38:10 2002
-@@ -182,7 +182,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsPortTableData::ComputeLength(uint8_t version = 0) const
-+uint32_t ArtsPortTableData::ComputeLength(uint8_t version) const
- {
- this->_length = 0;
-
-@@ -205,7 +205,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsPortTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsPortTableData::Length(uint8_t version) const
- {
- this->ComputeLength(version);
- return(this->_length);
-@@ -216,7 +216,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsPortTableData::read(istream& is, uint8_t version = 0)
-+istream& ArtsPortTableData::read(istream& is, uint8_t version)
- {
- uint32_t numPorts;
- uint32_t portNum;
-@@ -239,7 +239,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsPortTableData::read(int fd, uint8_t version = 0)
-+int ArtsPortTableData::read(int fd, uint8_t version)
- {
- uint32_t numPorts;
- uint32_t portNum;
-@@ -281,7 +281,7 @@
- //
- //-------------------------------------------------------------------------
- ostream& ArtsPortTableData::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t numPorts;
- vector<ArtsPortTableEntry>::const_iterator portEntry;
-@@ -305,7 +305,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsPortTableData::write(int fd, uint8_t version = 0) const
-+int ArtsPortTableData::write(int fd, uint8_t version) const
- {
- uint32_t numPorts;
- int rc;
diff --git a/net/arts++/files/patch-classes::src::ArtsPortTableEntry.cc b/net/arts++/files/patch-classes::src::ArtsPortTableEntry.cc
deleted file mode 100644
index 4375c474c165..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPortTableEntry.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- ./classes/src/ArtsPortTableEntry.cc.orig Mon Oct 2 13:05:28 2000
-+++ ./classes/src/ArtsPortTableEntry.cc Wed Sep 25 16:38:10 2002
-@@ -332,7 +332,7 @@
- //-------------------------------------------------------------------------
- // uint32_t ArtsPortTableEntry::Length(uint8_t version = 0) const
- //-------------------------------------------------------------------------
--uint32_t ArtsPortTableEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsPortTableEntry::Length(uint8_t version) const
- {
- uint32_t len = 0;
-
-@@ -349,7 +349,7 @@
- //-------------------------------------------------------------------------
- // istream& ArtsPortTableEntry::read(istream& is, uint8_t version = 0)
- //-------------------------------------------------------------------------
--istream& ArtsPortTableEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsPortTableEntry::read(istream& is, uint8_t version)
- {
- uint8_t fieldLen;
-
-@@ -358,7 +358,7 @@
- sizeof(this->_portNum));
-
- // descriptor
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- // inPkts
- fieldLen = 1 << (this->_descriptor >> 6);
-@@ -382,7 +382,7 @@
- //-------------------------------------------------------------------------
- // int ArtsPortTableEntry::read(int fd, uint8_t version = 0)
- //-------------------------------------------------------------------------
--int ArtsPortTableEntry::read(int fd, uint8_t version = 0)
-+int ArtsPortTableEntry::read(int fd, uint8_t version)
- {
- uint8_t fieldLen;
- int rc = 0;
-@@ -421,7 +421,7 @@
- // uint8_t version = 0) const
- //-------------------------------------------------------------------------
- ostream& ArtsPortTableEntry::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t fieldLen;
-
-@@ -430,7 +430,7 @@
- sizeof(this->_portNum));
-
- // descriptor
-- os.write(&this->_descriptor,1);
-+ os.write((char *)&this->_descriptor,1);
-
- // inPkts
- fieldLen = 1 << (this->_descriptor >> 6);
-@@ -454,7 +454,7 @@
- //-------------------------------------------------------------------------
- // int ArtsPortTableEntry::write(int fd, uint8_t version = 0) const
- //-------------------------------------------------------------------------
--int ArtsPortTableEntry::write(int fd, uint8_t version = 0) const
-+int ArtsPortTableEntry::write(int fd, uint8_t version) const
- {
- uint8_t fieldLen;
- int rc = 0;
diff --git a/net/arts++/files/patch-classes::src::ArtsPrimitive.cc b/net/arts++/files/patch-classes::src::ArtsPrimitive.cc
deleted file mode 100644
index 8f95b4a00c19..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsPrimitive.cc
+++ /dev/null
@@ -1,203 +0,0 @@
---- ./classes/src/ArtsPrimitive.cc.orig Mon Oct 2 13:05:28 2000
-+++ ./classes/src/ArtsPrimitive.cc Wed Sep 25 16:38:10 2002
-@@ -150,11 +150,11 @@
- switch (len) {
- case 1:
- val8 = value;
-- os.write(&val8,sizeof(val8));
-+ os.write((char *)&val8,sizeof(val8));
- break;
- case 2:
- val16 = htons(value);
-- os.write(&val16,sizeof(val16));
-+ os.write((char *)&val16,sizeof(val16));
- break;
- default:
- #ifdef ARTS_DEBUG_DO_ASSERTIONS
-@@ -218,11 +218,11 @@
-
- switch (len) {
- case 1:
-- is.read(&val8,sizeof(val8));
-+ is.read((char *)&val8,sizeof(val8));
- value = val8;
- break;
- case 2:
-- is.read(&val16,sizeof(val16));
-+ is.read((char *)&val16,sizeof(val16));
- value = ntohs(val16);
- break;
- default:
-@@ -289,23 +289,23 @@
- switch (len) {
- case 1:
- val8 = value;
-- os.write(&val8,sizeof(val8));
-+ os.write((char *)&val8,sizeof(val8));
- break;
- case 2:
- val16 = value;
- val16 = htons(val16);
-- os.write(&val16,sizeof(val16));
-+ os.write((char *)&val16,sizeof(val16));
- break;
- case 3:
- val8 = (value >> 16);
-- os.write(&val8,sizeof(val8));
-+ os.write((char *)&val8,sizeof(val8));
- val16 = htons((value & 0x0000ffff));
-- os.write(&val16,sizeof(val16));
-+ os.write((char *)&val16,sizeof(val16));
- break;
- case 4:
- val32 = value;
- val32 = htonl(value);
-- os.write(&val32,sizeof(val32));
-+ os.write((char *)&val32,sizeof(val32));
- break;
- default:
- #ifdef ARTS_DEBUG_DO_ASSERTIONS
-@@ -384,21 +384,21 @@
-
- switch (len) {
- case 1:
-- is.read(&val8,sizeof(val8));
-+ is.read((char *)&val8,sizeof(val8));
- value = val8;
- break;
- case 2:
-- is.read(&val16,sizeof(val16));
-+ is.read((char *)&val16,sizeof(val16));
- value = ntohs(val16);
- break;
- case 3:
-- is.read(&val8,sizeof(val8));
-+ is.read((char *)&val8,sizeof(val8));
- value = ((uint32_t)val8) << 16;
-- is.read(&val16,sizeof(val16));
-+ is.read((char *)&val16,sizeof(val16));
- value |= ntohs(val16);
- break;
- case 4:
-- is.read(&val32,sizeof(val32));
-+ is.read((char *)&val32,sizeof(val32));
- value = ntohl(val32);
- break;
- default:
-@@ -483,22 +483,22 @@
- switch (len) {
- case 1:
- val8 = value;
-- os.write(&val8,sizeof(val8));
-+ os.write((char *)&val8,sizeof(val8));
- break;
- case 2:
- val16 = value;
- val16 = htons(val16);
-- os.write(&val16,sizeof(val16));
-+ os.write((char *)&val16,sizeof(val16));
- break;
- case 4:
- valuePart[0] = value;
- valuePart[0] = htonl(value);
-- os.write(&valuePart[0],sizeof(uint32_t));
-+ os.write((char *)&valuePart[0],sizeof(uint32_t));
- break;
- case 8:
- valuePart[0] = htonl(value >> 32);
- valuePart[1] = htonl(value & 0xffffffff);
-- os.write(valuePart,sizeof(valuePart));
-+ os.write((char *)valuePart,sizeof(valuePart));
- break;
- default:
- #ifdef ARTS_DEBUG_DO_ASSERTIONS
-@@ -575,19 +575,19 @@
-
- switch (len) {
- case 1:
-- is.read(&val8,sizeof(val8));
-+ is.read((char *)&val8,sizeof(val8));
- value = val8;
- break;
- case 2:
-- is.read(&val16,sizeof(val16));
-+ is.read((char *)&val16,sizeof(val16));
- value = ntohs(val16);
- break;
- case 4:
-- is.read(&valuePart[0],sizeof(uint32_t));
-+ is.read((char *)&valuePart[0],sizeof(uint32_t));
- value = ntohl(valuePart[0]);
- break;
- case 8:
-- is.read(valuePart,sizeof(valuePart));
-+ is.read((char *)valuePart,sizeof(valuePart));
- value = ((uint64_t)ntohl(valuePart[0])) << 32;
- value += ntohl(valuePart[1]);
- break;
-@@ -667,24 +667,24 @@
-
- switch (len) {
- case 1:
-- is.read(&octet1,sizeof(octet1));
-+ is.read((char *)&octet1,sizeof(octet1));
- value = htonl((ipv4addr_t)octet1 << 24);
- break;
- case 2:
-- is.read(&octet1,sizeof(octet1));
-- is.read(&octet2,sizeof(octet2));
-+ is.read((char *)&octet1,sizeof(octet1));
-+ is.read((char *)&octet2,sizeof(octet2));
- value = htonl(((ipv4addr_t)octet1 << 24) | ((ipv4addr_t)octet2 << 16));
- break;
- case 3:
-- is.read(&octet1,sizeof(octet1));
-- is.read(&octet2,sizeof(octet2));
-- is.read(&octet3,sizeof(octet3));
-+ is.read((char *)&octet1,sizeof(octet1));
-+ is.read((char *)&octet2,sizeof(octet2));
-+ is.read((char *)&octet3,sizeof(octet3));
- value = htonl(((ipv4addr_t)octet1 << 24) |
- ((ipv4addr_t)octet2 << 16) |
- ((ipv4addr_t)octet3 << 8));
- break;
- case 4:
-- is.read(&ipAddr,sizeof(ipAddr));
-+ is.read((char *)&ipAddr,sizeof(ipAddr));
- value = ipAddr;
- break;
- default:
-@@ -766,26 +766,26 @@
- switch (len) {
- case 1:
- octet1 = ntohl(value) >> 24;
-- os.write(&octet1,sizeof(octet1));
-+ os.write((char *)&octet1,sizeof(octet1));
- break;
- case 2:
- netaddr = ntohl(value);
- octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
- octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
-- os.write(&octet1,sizeof(octet1));
-- os.write(&octet2,sizeof(octet2));
-+ os.write((char *)&octet1,sizeof(octet1));
-+ os.write((char *)&octet2,sizeof(octet2));
- break;
- case 3:
- netaddr = ntohl(value);
- octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
- octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
- octet3 = (ipv4addr_t)(netaddr >> 8) & 0xff;
-- os.write(&octet1,sizeof(octet1));
-- os.write(&octet2,sizeof(octet2));
-- os.write(&octet3,sizeof(octet3));
-+ os.write((char *)&octet1,sizeof(octet1));
-+ os.write((char *)&octet2,sizeof(octet2));
-+ os.write((char *)&octet3,sizeof(octet3));
- break;
- case 4:
-- os.write(&value,4);
-+ os.write((char *)&value,4);
- break;
- default:
- #ifdef ARTS_DEBUG_DO_ASSERTIONS
diff --git a/net/arts++/files/patch-classes::src::ArtsProtocolTableAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsProtocolTableAggregatorMap.cc
deleted file mode 100644
index ef06ff345812..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsProtocolTableAggregatorMap.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/src/ArtsProtocolTableAggregatorMap.cc.orig Mon Oct 2 13:05:28 2000
-+++ ./classes/src/ArtsProtocolTableAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,9 +46,11 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
-- #include <fstream.h>
-+# include <fstream.h>
- #endif
-
- #include "ArtsProtocolTableAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::src::ArtsProtocolTableData.cc b/net/arts++/files/patch-classes::src::ArtsProtocolTableData.cc
deleted file mode 100644
index aa663de0f88e..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsProtocolTableData.cc
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./classes/src/ArtsProtocolTableData.cc.orig Mon Oct 2 13:05:28 2000
-+++ ./classes/src/ArtsProtocolTableData.cc Wed Sep 25 16:38:10 2002
-@@ -182,7 +182,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsProtocolTableData::ComputeLength(uint8_t version = 0) const
-+uint32_t ArtsProtocolTableData::ComputeLength(uint8_t version) const
- {
- this->_length = 0;
-
-@@ -205,18 +205,18 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsProtocolTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsProtocolTableData::Length(uint8_t version) const
- {
- this->ComputeLength(version);
- return(this->_length);
- }
-
- //-------------------------------------------------------------------------
--// istream& ArtsProtocolTableData::read(istream& is, uint8_t version = 0)
-+// istream& ArtsProtocolTableData::read(istream& is, uint8_t version)
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsProtocolTableData::read(istream& is, uint8_t version = 0)
-+istream& ArtsProtocolTableData::read(istream& is, uint8_t version)
- {
- uint32_t numProtocols;
- uint32_t protocolNum;
-@@ -239,7 +239,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsProtocolTableData::read(int fd, uint8_t version = 0)
-+int ArtsProtocolTableData::read(int fd, uint8_t version)
- {
- uint32_t numProtocols;
- uint32_t protocolNum;
-@@ -281,7 +281,7 @@
- //
- //-------------------------------------------------------------------------
- ostream& ArtsProtocolTableData::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t numProtocols;
-
-@@ -306,7 +306,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsProtocolTableData::write(int fd, uint8_t version = 0) const
-+int ArtsProtocolTableData::write(int fd, uint8_t version) const
- {
- uint32_t numProtocols;
- int rc;
diff --git a/net/arts++/files/patch-classes::src::ArtsProtocolTableEntry.cc b/net/arts++/files/patch-classes::src::ArtsProtocolTableEntry.cc
deleted file mode 100644
index 160e3714b725..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsProtocolTableEntry.cc
+++ /dev/null
@@ -1,67 +0,0 @@
---- ./classes/src/ArtsProtocolTableEntry.cc.orig Mon Oct 2 13:05:28 2000
-+++ ./classes/src/ArtsProtocolTableEntry.cc Wed Sep 25 16:38:10 2002
-@@ -189,7 +189,7 @@
- //-------------------------------------------------------------------------
- // uint32_t ArtsProtocolTableEntry::Length(uint8_t version = 0) const
- //-------------------------------------------------------------------------
--uint32_t ArtsProtocolTableEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsProtocolTableEntry::Length(uint8_t version) const
- {
- uint32_t len = 0;
-
-@@ -204,15 +204,15 @@
- //-------------------------------------------------------------------------
- // istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version = 0)
- //-------------------------------------------------------------------------
--istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version)
- {
- uint8_t fieldLen;
-
- // protocol number
-- is.read(&this->_protocolNum,sizeof(this->_protocolNum));
-+ is.read((char *)&this->_protocolNum,sizeof(this->_protocolNum));
-
- // descriptor
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- // pkts
- fieldLen = (this->_descriptor >> 3) + 1;
-@@ -228,7 +228,7 @@
- //-------------------------------------------------------------------------
- // int ArtsProtocolTableEntry::read(int fd, uint8_t version = 0)
- //-------------------------------------------------------------------------
--int ArtsProtocolTableEntry::read(int fd, uint8_t version = 0)
-+int ArtsProtocolTableEntry::read(int fd, uint8_t version)
- {
- uint8_t fieldLen;
- int rc = 0;
-@@ -259,15 +259,15 @@
- // uint8_t version = 0) const
- //-------------------------------------------------------------------------
- ostream& ArtsProtocolTableEntry::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t fieldLen;
-
- // protocol number
-- os.write(&this->_protocolNum,sizeof(this->_protocolNum));
-+ os.write((char *)&this->_protocolNum,sizeof(this->_protocolNum));
-
- // descriptor
-- os.write(&this->_descriptor,1);
-+ os.write((char *)&this->_descriptor,1);
-
- // pkts
- fieldLen = (this->_descriptor >> 3) + 1;
-@@ -283,7 +283,7 @@
- //-------------------------------------------------------------------------
- // int ArtsProtocolTableEntry::write(int fd, uint8_t version = 0) const
- //-------------------------------------------------------------------------
--int ArtsProtocolTableEntry::write(int fd, uint8_t version = 0) const
-+int ArtsProtocolTableEntry::write(int fd, uint8_t version) const
- {
- uint8_t fieldLen;
- int rc = 0;
diff --git a/net/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc b/net/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
deleted file mode 100644
index dd45bc91abac..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsRttTimeSeriesTableData.cc
+++ /dev/null
@@ -1,124 +0,0 @@
---- classes/src/ArtsRttTimeSeriesTableData.cc.orig Thu Oct 19 16:37:14 2000
-+++ classes/src/ArtsRttTimeSeriesTableData.cc Thu Jul 17 19:19:28 2003
-@@ -47,6 +47,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <time.h>
-+#include <assert.h>
- }
-
- #include <string>
-@@ -192,7 +193,7 @@
- ostream & ArtsRttTimeSeriesTableEntry::write(ostream & os,
- uint32_t timeBase,
- uint32_t prevSecsOffset,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t rleFlags = 0;
- uint8_t timestampSecsLength = 0;
-@@ -217,7 +218,7 @@
-
- timestampUsecsLength = BytesNeededForUint32(this->_timestamp.tv_usec);
- rleFlags |= (timestampUsecsLength - 1);
-- os.write(&rleFlags,sizeof(rleFlags));
-+ os.write((char *)&rleFlags,sizeof(rleFlags));
- if (rttLength > 0)
- g_ArtsLibInternal_Primitive.WriteUint32(os,this->_rtt,rttLength);
- if (timestampSecsLength > 0)
-@@ -232,14 +233,14 @@
- // int ArtsRttTimeSeriesTableEntry::write(int fd,
- // uint32_t timeBase,
- // uint32_t prevSecsOffset,
--// uint8_t version = 0) const
-+// uint8_t version) const
- //............................................................................
- //
- //----------------------------------------------------------------------------
- int ArtsRttTimeSeriesTableEntry::write(int fd,
- uint32_t timeBase,
- uint32_t prevSecsOffset,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t rleFlags = 0;
- uint8_t timestampSecsLength = 0;
-@@ -302,7 +303,7 @@
- //----------------------------------------------------------------------------
- uint32_t ArtsRttTimeSeriesTableEntry::Length(uint32_t timeBase,
- uint32_t prevSecsOffset,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t length = sizeof(uint8_t); // always have rleFlags
- if (this->_rtt != k_droppedPacketRtt) {
-@@ -330,13 +331,13 @@
- istream & ArtsRttTimeSeriesTableEntry::read(istream & is,
- uint32_t timeBase,
- uint32_t prevSecsOffset,
-- uint8_t version = 0)
-+ uint8_t version)
- {
- uint8_t rleFlags = 0;
- uint8_t timestampUsecsLength = 0;
- uint32_t timeVal;
-
-- is.read(&rleFlags,sizeof(rleFlags));
-+ is.read((char *)&rleFlags,sizeof(rleFlags));
-
- if (rleFlags & 0x80) {
- // it's a dropped packet; RTT length is 0
-@@ -374,7 +375,7 @@
- //----------------------------------------------------------------------------
- int ArtsRttTimeSeriesTableEntry::read(int fd, uint32_t timeBase,
- uint32_t prevSecsOffset,
-- uint8_t version = 0)
-+ uint8_t version)
- {
- uint8_t rleFlags = 0;
- uint8_t timestampUsecsLength = 0;
-@@ -594,7 +595,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--istream & ArtsRttTimeSeriesTableData::read(istream& is, uint8_t version = 0)
-+istream & ArtsRttTimeSeriesTableData::read(istream& is, uint8_t version)
- {
- uint32_t numRttEntries, rttEntryNum;
- ArtsRttTimeSeriesTableEntry rttEntry;
-@@ -623,7 +624,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsRttTimeSeriesTableData::read(int fd, uint8_t version = 0)
-+int ArtsRttTimeSeriesTableData::read(int fd, uint8_t version)
- {
- uint32_t numRttEntries, rttEntryNum;
- ArtsRttTimeSeriesTableEntry rttEntry;
-@@ -664,7 +665,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--uint32_t ArtsRttTimeSeriesTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsRttTimeSeriesTableData::Length(uint8_t version) const
- {
- uint32_t length = 0;
- uint32_t rttEntryNum, numRttEntries;
-@@ -693,7 +694,7 @@
- //
- //----------------------------------------------------------------------------
- ostream & ArtsRttTimeSeriesTableData::write(ostream & os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t numRttEntries, rttEntryNum;
- uint32_t rttUsecs;
-@@ -729,7 +730,7 @@
- //............................................................................
- //
- //----------------------------------------------------------------------------
--int ArtsRttTimeSeriesTableData::write(int fd, uint8_t version = 0) const
-+int ArtsRttTimeSeriesTableData::write(int fd, uint8_t version) const
- {
- uint32_t numRttEntries, rttEntryNum;
- uint32_t rttUsecs;
diff --git a/net/arts++/files/patch-classes::src::ArtsSelectedPortTableData.cc b/net/arts++/files/patch-classes::src::ArtsSelectedPortTableData.cc
deleted file mode 100644
index d5468cf366a8..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsSelectedPortTableData.cc
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./classes/src/ArtsSelectedPortTableData.cc.orig Mon Oct 2 13:05:29 2000
-+++ ./classes/src/ArtsSelectedPortTableData.cc Wed Sep 25 16:38:10 2002
-@@ -188,7 +188,7 @@
- //
- //-------------------------------------------------------------------------
- uint32_t
--ArtsSelectedPortTableData::ComputeLength(uint8_t version = 0) const
-+ArtsSelectedPortTableData::ComputeLength(uint8_t version) const
- {
- this->_length = 0;
-
-@@ -214,7 +214,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsSelectedPortTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsSelectedPortTableData::Length(uint8_t version) const
- {
- this->ComputeLength(version);
- return(this->_length);
-@@ -227,7 +227,7 @@
- //
- //-------------------------------------------------------------------------
- istream& ArtsSelectedPortTableData::read(istream& is,
-- uint8_t version = 0)
-+ uint8_t version)
- {
- uint32_t numPorts;
- uint32_t portNum;
-@@ -251,7 +251,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsSelectedPortTableData::read(int fd, uint8_t version = 0)
-+int ArtsSelectedPortTableData::read(int fd, uint8_t version)
- {
- uint32_t numPorts;
- uint32_t portNum;
-@@ -298,7 +298,7 @@
- //
- //-------------------------------------------------------------------------
- ostream& ArtsSelectedPortTableData::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t numPorts;
- vector<ArtsPortTableEntry>::const_iterator portEntry;
-@@ -323,7 +323,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsSelectedPortTableData::write(int fd, uint8_t version = 0) const
-+int ArtsSelectedPortTableData::write(int fd, uint8_t version) const
- {
- uint32_t numPorts;
- int rc;
diff --git a/net/arts++/files/patch-classes::src::ArtsTosTableAggregatorMap.cc b/net/arts++/files/patch-classes::src::ArtsTosTableAggregatorMap.cc
deleted file mode 100644
index 38559eaa2a34..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsTosTableAggregatorMap.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./classes/src/ArtsTosTableAggregatorMap.cc.orig Mon Oct 2 13:05:29 2000
-+++ ./classes/src/ArtsTosTableAggregatorMap.cc Wed Sep 25 16:38:10 2002
-@@ -46,9 +46,11 @@
-
- #include <string>
- #ifdef HAVE_FSTREAM
-- #include <fstream>
-+# include <fstream>
-+# include <iterator>
-+ using namespace std;
- #else
-- #include <fstream.h>
-+# include <fstream.h>
- #endif
-
- #include "ArtsTosTableAggregatorMap.hh"
diff --git a/net/arts++/files/patch-classes::src::ArtsTosTableData.cc b/net/arts++/files/patch-classes::src::ArtsTosTableData.cc
deleted file mode 100644
index fa7a323bdde0..000000000000
--- a/net/arts++/files/patch-classes::src::ArtsTosTableData.cc
+++ /dev/null
@@ -1,121 +0,0 @@
---- ./classes/src/ArtsTosTableData.cc.orig Mon Oct 2 13:05:29 2000
-+++ ./classes/src/ArtsTosTableData.cc Wed Sep 25 16:38:10 2002
-@@ -166,7 +166,7 @@
- //-------------------------------------------------------------------------
- // uint32_t ArtsTosTableEntry::Length(uint8_t version = 0) const
- //-------------------------------------------------------------------------
--uint32_t ArtsTosTableEntry::Length(uint8_t version = 0) const
-+uint32_t ArtsTosTableEntry::Length(uint8_t version) const
- {
- uint32_t len = 0;
-
-@@ -181,15 +181,15 @@
- //-------------------------------------------------------------------------
- // istream& ArtsTosTableEntry::read(istream& is, uint8_t version = 0)
- //-------------------------------------------------------------------------
--istream& ArtsTosTableEntry::read(istream& is, uint8_t version = 0)
-+istream& ArtsTosTableEntry::read(istream& is, uint8_t version)
- {
- uint8_t fieldLen;
-
- // tos number
-- is.read(&this->_tosNum,sizeof(this->_tosNum));
-+ is.read((char *)&this->_tosNum,sizeof(this->_tosNum));
-
- // descriptor
-- is.read(&this->_descriptor,sizeof(this->_descriptor));
-+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
-
- // pkts
- fieldLen = (this->_descriptor >> 3) + 1;
-@@ -205,7 +205,7 @@
- //-------------------------------------------------------------------------
- // int ArtsTosTableEntry::read(int fd, uint8_t version = 0)
- //-------------------------------------------------------------------------
--int ArtsTosTableEntry::read(int fd, uint8_t version = 0)
-+int ArtsTosTableEntry::read(int fd, uint8_t version)
- {
- uint8_t fieldLen;
- int rc = 0;
-@@ -236,15 +236,15 @@
- // uint8_t version = 0) const
- //-------------------------------------------------------------------------
- ostream& ArtsTosTableEntry::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint8_t fieldLen;
-
- // tos number
-- os.write(&this->_tosNum,sizeof(this->_tosNum));
-+ os.write((char *)&this->_tosNum,sizeof(this->_tosNum));
-
- // descriptor
-- os.write(&this->_descriptor,1);
-+ os.write((char *)&this->_descriptor,1);
-
- // pkts
- fieldLen = (this->_descriptor >> 3) + 1;
-@@ -260,7 +260,7 @@
- //-------------------------------------------------------------------------
- // int ArtsTosTableEntry::write(int fd, uint8_t version = 0) const
- //-------------------------------------------------------------------------
--int ArtsTosTableEntry::write(int fd, uint8_t version = 0) const
-+int ArtsTosTableEntry::write(int fd, uint8_t version) const
- {
- uint8_t fieldLen;
- int rc = 0;
-@@ -482,7 +482,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsTosTableData::ComputeLength(uint8_t version = 0) const
-+uint32_t ArtsTosTableData::ComputeLength(uint8_t version) const
- {
- this->_length = 0;
-
-@@ -505,7 +505,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--uint32_t ArtsTosTableData::Length(uint8_t version = 0) const
-+uint32_t ArtsTosTableData::Length(uint8_t version) const
- {
- this->ComputeLength(version);
- return(this->_length);
-@@ -516,7 +516,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--istream& ArtsTosTableData::read(istream& is, uint8_t version = 0)
-+istream& ArtsTosTableData::read(istream& is, uint8_t version)
- {
- uint32_t numToss;
- uint32_t tosNum;
-@@ -539,7 +539,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsTosTableData::read(int fd, uint8_t version = 0)
-+int ArtsTosTableData::read(int fd, uint8_t version)
- {
- uint32_t numToss;
- uint32_t tosNum;
-@@ -581,7 +581,7 @@
- //
- //-------------------------------------------------------------------------
- ostream& ArtsTosTableData::write(ostream& os,
-- uint8_t version = 0) const
-+ uint8_t version) const
- {
- uint32_t numToss;
-
-@@ -606,7 +606,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int ArtsTosTableData::write(int fd, uint8_t version = 0) const
-+int ArtsTosTableData::write(int fd, uint8_t version) const
- {
- uint32_t numToss;
- int rc;
diff --git a/net/arts++/files/patch-configure.in b/net/arts++/files/patch-configure.in
deleted file mode 100644
index ba79f0e9ce84..000000000000
--- a/net/arts++/files/patch-configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./configure.in.orig Wed Sep 25 16:45:26 2002
-+++ ./configure.in Wed Sep 25 16:45:55 2002
-@@ -240,6 +240,7 @@
- AC_TRY_CPP([#include <iostream>],AC_DEFINE(HAVE_IOSTREAM))
- AC_TRY_CPP([#include <iomanip>],AC_DEFINE(HAVE_IOMANIP))
- AC_TRY_CPP([#include <strstream>],AC_DEFINE(HAVE_STRSTREAM))
-+AC_TRY_CPP([#include <ostream>],AC_DEFINE(HAVE_OSTREAM))
-
- AC_CHECK_LIB(nsl, inet_ntoa)
- AC_CHECK_LIB(socket, socket)
diff --git a/net/arts++/pkg-descr b/net/arts++/pkg-descr
deleted file mode 100644
index dcfe77237170..000000000000
--- a/net/arts++/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-arts++ is a support package for CAIDA's cflowd and skitter.
-
-It provides a C++ class library and simple applications for handling
-data produced by cflowd and skitter.
-
-See: http://www.caida.org/tools/measurement/cflowd/
- http://www.caida.org/tools/measurement/skitter/
-
-WWW: http://www.caida.org/tools/utilities/arts/
diff --git a/net/arts++/pkg-plist b/net/arts++/pkg-plist
deleted file mode 100644
index a46e51300b9e..000000000000
--- a/net/arts++/pkg-plist
+++ /dev/null
@@ -1,96 +0,0 @@
-bin/artsagg
-bin/artsasagg
-bin/artsases
-bin/artsdump
-bin/artsintfmagg
-bin/artsintfms
-bin/artsnetagg
-bin/artsnets
-bin/artsnexthopagg
-bin/artsnexthops
-bin/artsportagg
-bin/artsportmagg
-bin/artsportms
-bin/artsports
-bin/artsprotoagg
-bin/artsprotos
-bin/artstoc
-bin/artstos
-include/Arts.hh
-include/ArtsAggregatorMapKey.hh
-include/ArtsAsMatrix.hh
-include/ArtsAsMatrixAggregator.hh
-include/ArtsAsMatrixAggregatorMap.hh
-include/ArtsAsMatrixData.hh
-include/ArtsAsMatrixEntry.hh
-include/ArtsAttribute.hh
-include/ArtsAttributeVector.hh
-include/ArtsBgp4AggregatorAttribute.hh
-include/ArtsBgp4AsPathAttribute.hh
-include/ArtsBgp4AsPathSegment.hh
-include/ArtsBgp4Attribute.hh
-include/ArtsBgp4DPAttribute.hh
-include/ArtsBgp4Prefix.hh
-include/ArtsBgp4RouteEntry.hh
-include/ArtsBgp4RouteTable.hh
-include/ArtsBgp4RouteTableData.hh
-include/ArtsBitString.hh
-include/ArtsDebug.hh
-include/ArtsFileUtil.hh
-include/ArtsHeader.hh
-include/ArtsIfIndexSelectionSet.hh
-include/ArtsInterfaceMatrix.hh
-include/ArtsInterfaceMatrixAggregator.hh
-include/ArtsInterfaceMatrixAggregatorMap.hh
-include/ArtsInterfaceMatrixData.hh
-include/ArtsInterfaceMatrixEntry.hh
-include/ArtsIpPath.hh
-include/ArtsIpPathData.hh
-include/ArtsIpPathEntry.hh
-include/ArtsNetMatrix.hh
-include/ArtsNetMatrixAggregator.hh
-include/ArtsNetMatrixAggregatorMap.hh
-include/ArtsNetMatrixData.hh
-include/ArtsNetMatrixEntry.hh
-include/ArtsNextHopTable.hh
-include/ArtsNextHopTableAggregator.hh
-include/ArtsNextHopTableAggregatorMap.hh
-include/ArtsNextHopTableData.hh
-include/ArtsNextHopTableEntry.hh
-include/ArtsObjectTypeSelectionSet.hh
-include/ArtsPackageVersion.hh
-include/ArtsPortChoice.hh
-include/ArtsPortChooser.hh
-include/ArtsPortMatrix.hh
-include/ArtsPortMatrixAggregator.hh
-include/ArtsPortMatrixAggregatorMap.hh
-include/ArtsPortMatrixData.hh
-include/ArtsPortMatrixEntry.hh
-include/ArtsPortTable.hh
-include/ArtsPortTableAggregator.hh
-include/ArtsPortTableData.hh
-include/ArtsPortTableEntry.hh
-include/ArtsPrimitive.hh
-include/ArtsProtocolTable.hh
-include/ArtsProtocolTableAggregator.hh
-include/ArtsProtocolTableAggregatorMap.hh
-include/ArtsProtocolTableData.hh
-include/ArtsProtocolTableEntry.hh
-include/ArtsRttTimeSeriesTable.hh
-include/ArtsRttTimeSeriesTableData.hh
-include/ArtsSelectedPortTable.hh
-include/ArtsSelectedPortTableData.hh
-include/ArtsTimeIntervalSelectionSet.hh
-include/ArtsTosTable.hh
-include/ArtsTosTableAggregator.hh
-include/ArtsTosTableAggregatorMap.hh
-include/ArtsTosTableData.hh
-include/ArtsTosTableEntry.hh
-include/Ipv4Network.hh
-include/Ipv4PrefixPatricia.hh
-include/artslocal.h
-include/caida_t.h
-lib/libArts.a
-lib/libArts.la
-lib/libArts.so
-lib/libArts.so.0
diff --git a/net/aspathtree/distinfo b/net/aspathtree/distinfo
deleted file mode 100644
index 4800d9684f44..000000000000
--- a/net/aspathtree/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ASpath-tree-v4.2.tar.gz) = d52992a73d21139442a2c242b9532f14
diff --git a/net/aspathtree/files/patch-etc::ASpath-tree.config b/net/aspathtree/files/patch-etc::ASpath-tree.config
deleted file mode 100644
index 299d9558287e..000000000000
--- a/net/aspathtree/files/patch-etc::ASpath-tree.config
+++ /dev/null
@@ -1,63 +0,0 @@
---- etc/ASpath-tree.config.orig Tue Dec 10 10:02:25 2002
-+++ etc/ASpath-tree.config Sat Mar 8 21:56:17 2003
-@@ -9,7 +9,7 @@
- # Full path to the directory where you have installed the ASpath-tree
- # scripts. It is the directory where the script create-bgp-pages is
- # located
--HOMEDIR = /usr/local/ASpath-tree-v4.2
-+HOMEDIR = %%PREFIX%%/var/aspathree/
-
- # Router you are using. Currently supported platforms include Cisco, Juniper
- # and Zebra routers. Allowed values are "CISCO", "JUNIPER" , "ZEBRA" and
-@@ -37,8 +37,14 @@
- # command:
- # ip rcmd remote-host
- # <router-user> <client-ip-address> <client-user>
-+# or the telnet user. See ROUTERUSERPASS also.
- ROUTERUSER = router
-
-+# The password of the telnet user which have been enabled on the cisco
-+# router to issue 'show bgp ipv6' command. Set up only if you want to
-+# use the telnet mode.
-+# ROUTERUSERPASS = router
-+
- # The full path to the directory where the generated html files have to be
- # placed. If you do not specify this option the html files are stored under
- # the htdocs/ directory which comes with the distribution
-@@ -46,15 +52,15 @@
- # HTMLDIR = /usr/local/httpd/htdocs/bgp
-
- # The contactname which is placed at the bottom of the generated html pages
--CONTACTNAME = IPv6 group
-+CONTACTNAME = Your IPv6 group
-
- # e-mail address of the contact person. It is placed at the bottom of the
- # generated html pages together with the contactname
-- CONTACTMAIL = me@myhost.com
-+ CONTACTMAIL = your@ipv6.mail
-
- # The name of your IPv6 site. It is used as the root of the BGP4+ routing
- # tree displayed by the generated html pages
--SITENAME = TILAB
-+SITENAME = Your IPv6 project
-
- # The name of the image file (for instance a graphical logo representing
- # your IPv6 site) to be placed at the beginning of the generated html
-@@ -71,7 +77,7 @@
- # WHOISLINK = http://whois.6bone.net/cgi-bin/whois
-
- # A flag to enable the display of the last changes on the tree. Set
--# CHANGESFLAG = 1
-+CHANGESFLAG = 1
- # to see the display as html pages accessible from a link within the tree pages
-
- # A flag to control which routes are filtered out from the output of
-@@ -83,7 +89,7 @@
- # installed on the same WS that hosts ASpath-tree
- # This parameter is needed only if you want to update via ASpath-tree the
- # useful information available on whois DBs connected to the Internet
--# RIPEWHOISCLIENT = /usr/local/bin/whois3
-+RIPEWHOISCLIENT = /usr/local/bin/ripewhois
-
- #### ASpath-tree v.4.2 - Released on Tue DEC 10 2002, h.10:02:25
- #### File: etc/ASpath-tree.config Last modified on Mon DEC 9 2002, h.15:52:30
diff --git a/net/aspathtree/files/patch-lib::getbgptable.pl b/net/aspathtree/files/patch-lib::getbgptable.pl
deleted file mode 100644
index d428d27200d6..000000000000
--- a/net/aspathtree/files/patch-lib::getbgptable.pl
+++ /dev/null
@@ -1,66 +0,0 @@
---- lib/getbgptable.pl.orig Thu Feb 6 11:25:26 2003
-+++ lib/getbgptable.pl Thu Feb 6 11:43:58 2003
-@@ -24,10 +24,55 @@
- # ASs (all the ASs in the router BGP table)
- # Finally this routine produces a text file containing the raw version of the router table
- # and if required log files of both the raw router table and the normalized table.
-+
-+
- sub get_bgp_table {
- my ($parser, $command, $line) = ('', '', '');
- my (@lines) = ();
-
-+ use Socket;
-+ use Net::Telnet;
-+
-+ if (defined($ROUTERUSERPASS)) {
-+
-+# TELNET module to get BGP4+ AS Path table
-+
-+ if ($ROUTER =~ /^JUNIPER$/i) {
-+ $parser = "juniper";
-+ $STATUSCODES = "*&gt; active";
-+ my $telnet_session = new Net::Telnet(
-+ prompt => '/[\w().-]*[\$#]\s*$/'
-+ );
-+
-+ $telnet_session->open($ROUTERADDR);
-+ $telnet_session->login($ROUTERUSER, $ROUTERUSERPASS);
-+ $telnet_session->cmd(String => "set cli screen-length 0", Timeout => 1800);
-+
-+ @lines = $telnet_session->cmd(String => "show route table inet6.0 all terse",
-+ Timeout => 1800);
-+ $telnet_session->close;
-+ } else {
-+ $ROUTER = "CISCO";
-+ $parser = "cisco";
-+ $STATUSCODES = "s suppressed, d damped, h history, * valid, &gt; best, r RIB-failure";
-+ my $telnet_session = new Net::Telnet(
-+ prompt => '/[\w().-]*[\$#]\s*$/'
-+ );
-+
-+ $telnet_session->open($ROUTERADDR);
-+ $telnet_session->login($ROUTERUSER, $ROUTERUSERPASS);
-+ $telnet_session->cmd(String => "terminal length 0", Timeout => 1800);
-+
-+ @lines = $telnet_session->cmd(String => "show bgp ipv6",
-+ Timeout => 1800);
-+ $telnet_session->close;
-+ }
-+# end TELNET module
-+
-+ } else {
-+
-+# RSH module to get BGP4+ AS Path table
-+
- if ($ROUTER =~ /^JUNIPER$/i) {
- $parser = "juniper";
- $STATUSCODES = "*&gt; active";
-@@ -58,6 +103,7 @@
- push(@lines, $_);
- }
- close(OUTPUT);
-+ }
- chomp(@lines);
- # Write log and for web files (raw table)
- open(TXTFILE,"> $BGPTABLEFILE");
diff --git a/net/aspathtree/files/patch-readme.txt b/net/aspathtree/files/patch-readme.txt
deleted file mode 100644
index e113481ef76a..000000000000
--- a/net/aspathtree/files/patch-readme.txt
+++ /dev/null
@@ -1,99 +0,0 @@
---- readme.txt.orig Thu Apr 17 15:58:12 2003
-+++ readme.txt Sun Apr 27 01:53:51 2003
-@@ -61,7 +61,7 @@
- without problems on any Unix platform (Linux, etc.) with
- Perl (version equal or greater than 5.0) installed.
-
--The IPv6 BGP tables of external routers are obtained using rsh
-+The IPv6 BGP tables of external routers are obtained using rsh or telnet
- commands. The current release works with cisco routers, zebra routers
- and juniper routers running IPv6 capable software versions.
-
-@@ -128,10 +128,16 @@
-
- CISCO
- -----
--The cisco router must be configured to accept rsh commands from the
--workstation which is running the ASpath-tree scripts. The
--administrator of the cisco router must perform the following
--configurations:
-+The cisco router must be configured to accept rsh commands or telnet
-+access from the workstation which is running the ASpath-tree
-+scripts. The administrator of the cisco router must perform the
-+following configurations:
-+
-+Option 1: rsh collection
-+------------------------
-+The router must be configured to accept rsh commands coming from the
-+remote workstation which is running the ASpath-tree scripts in the
-+following way:
-
- ip rcmd remote-host <router-username> <remote-ip-address> <remote-
- username>
-@@ -162,9 +168,28 @@
- scripts to collect the routing information available on the cisco
- router.
-
-+Option 2: telnet collection
-+---------------------------
-+The router must be configured to accept telnet commands coming from the
-+remote workstation which is running the ASpath-tree scripts.
-+
-+<router-username> is the name of the telnet user enabled to show the bgp
-+table on the cisco router.
-+
-+<router-username-password> is the corresponding password of the telnet user
-+enabled to show the bgp table on the cisco router.
-+
-+Consult the Cisco documentations, how to configure such a settings.
-+
-+If you configure ROUTERUSERPWD then the telnet option automatically selected.
-+
-+
- JUNIPER
- -------
-
-+Option 1: rsh collection
-+------------------------
-+
- The juniper router must be configured to accept rsh commands from the
- workstation which is running the ASpath-tree scripts. In the case of
- juniper, you have first to enable the rsh service on the router, then
-@@ -198,6 +223,13 @@
- This is exactly the rsh command used by the ASpath-tree scripts to
- collect the routing information available on the juniper router.
-
-+Option 2: telnet collection
-+---------------------------
-+
-+configure an user <router-username> with password <router-password on
-+the Juniper router with view permisssion. Consult your Juniper
-+documentation about that.
-+
- ZEBRA
- -----
- To use ASpath-tree with zebra routers, the "vtysh" CLI emulator must
-@@ -267,7 +299,12 @@
- router have IPv6 capable rsh implementations.
-
- ROUTERUSER is the username on the router that you have to use to
-- run remote rsh commands.
-+ run remote rsh commands or telnet.
-+
-+ROUTERUSERPASS
-+ is an optional parameter to use for telnet collection. If you
-+ configure this parameter telnet mode will be used automatically.
-+ DO NOT SPECIFY this parameter if you use RSH collection.
-
- HTMLDIR is the full path to the directory where the generated
- html files have to be placed. If you do not specify this
-@@ -794,6 +831,9 @@
- Raffaele D'Albenzio, Ivano Guardini and Paolo Fasano
- <ipv6@tilab.com>
- ----------------------------------------------------
-+ Telnet modul addition
-+ Janos Mohacsi <mohacsi@niif.hu> - 6NET project
-+ ----------------------------------------------------
-
- #### ASpath-tree v.4.2 - Released on Thu APR 17 2003, h.16:58:12
- #### File: readme.txt Last modified on Thu APR 17 2003, h.16:45:39
diff --git a/net/aspathtree/files/patch-update-rtree b/net/aspathtree/files/patch-update-rtree
deleted file mode 100644
index c0e9fe0c32bb..000000000000
--- a/net/aspathtree/files/patch-update-rtree
+++ /dev/null
@@ -1,153 +0,0 @@
---- update-rtree.orig Thu Apr 17 15:58:12 2003
-+++ update-rtree Sun Apr 27 02:01:49 2003
-@@ -1,13 +1,13 @@
--#!/usr/local/bin/perl
-+#!%%PATHPERLBIN%%
- #### ASpath-tree v.4.2 - Released on Thu APR 17 2003, h.16:58:12
- #### File: update-rtree Last modified on Tue MAR 18 2003, h.22:59:48
-
-
- # Configuration File
--my $CONFIGFILE = "/etc/ASpath-tree.config";
-+my $CONFIGFILE = "%%PREFIX%%/etc/ASpath-tree.config";
-
- # Global variables
--use vars qw ($HOMEDIR $RSHDIR $ROUTER $LOCAL $ROUTERADDR $ROUTERUSER $CONTACTNAME $CONTACTMAIL $SITENAME $SITEPICTURE $HTMLDIR
-+use vars qw ($HOMEDIR $RSHDIR $ROUTER $LOCAL $ROUTERADDR $ROUTERUSER $ROUTERUSERPASS $CONTACTNAME $CONTACTMAIL $SITENAME $SITEPICTURE $HTMLDIR
- $WHOISLINK $QUIET $DEBUG $FILTEROUT $RIPEWHOISCLIENT $MORETREES);
- use vars qw ($DATADIR $ROOTPICTURE $LIB $ICONS $WARNINGTIME $HISTORYPERIOD $FLAG_COLLECT $LONGDATE $CURRENTTIME $LASTRUN);
- use vars qw ($SIXBONEDB $IPV6PREFIXTABLE $PTLA_FILE $HISTORYFILE $LASTRUNFILE $OLDASPATHSFILE $OLDDATEFILE $OLDBBASPATHSFILE
-@@ -106,6 +106,7 @@
- if ($line =~ /^\s*LOCAL\s*=\s*(.*)/) {$LOCAL = $1}
- if ($line =~ /^\s*ROUTERADDR\s*=\s*(.*)/) {$ROUTERADDR = $1}
- if ($line =~ /^\s*ROUTERUSER\s*=\s*(.*)/) {$ROUTERUSER = $1}
-+ if ($line =~ /^\s*ROUTERUSERPASS\s*=\s*(.*)/) {$ROUTERUSERPASS = $1}
- if ($line =~ /^\s*CONTACTNAME\s*=\s*(.*)/) {$CONTACTNAME = $1}
- if ($line =~ /^\s*CONTACTMAIL\s*=\s*(.*)/) {$CONTACTMAIL = $1}
- if ($line =~ /^\s*SITENAME\s*=\s*(.*)/) {$SITENAME = $1}
-@@ -120,9 +121,9 @@
-
- # DEFAULT values setting...(if not explicitely declared) and ERROR checking ...
- die "ERROR in configuration file: parameter HOMEDIR not set!\n" unless ($HOMEDIR);
-- die "ERROR in configuration file: parameter HOMEDIR not correct!\n" unless (-e "$HOMEDIR/update-rtree");
-+ die "ERROR in configuration file: parameter HOMEDIR not correct!\n" unless (-d "$HOMEDIR");
-
-- $LOGDIR = "$HOMEDIR/log"; unless (-e "$LOGDIR") {mkdir("$LOGDIR", 0777)};
-+ $LOGDIR = "$HOMEDIR/log"; unless (-e "$LOGDIR") {mkdir("$LOGDIR", 0775)};
- if ($DEBUG) {open(LOGFILE, "> $LOGDIR/runlog.txt"); close(LOGFILE)}
- &log_it_and_die("ERROR in configuration file: parameter SITENAME not set!") unless ($SITENAME);
- &log_it_and_die("ERROR in configuration file: parameter ROUTER = \"$ROUTER\" not acceptable!") if ($ROUTER && !grep(/^$ROUTER$/, ("CISCO", "JUNIPER" , "ZEBRA", "ZEBRA93")));
-@@ -134,7 +135,7 @@
- }
- unless ($WHOISLINK) {$WHOISLINK = "http://whois.6bone.net/cgi-bin/whois"}
- unless ($DATADIR) {$DATADIR = "$HOMEDIR/data"}
-- unless ($LIB) {$LIB = "$HOMEDIR/lib"}
-+ unless ($LIB) {$LIB = "%%PREFIX%%/libexec/aspathtree"}
- unless ($FILTEROUT) {$FILTEROUT = 0}
- $ICONS = "./icons";
- $WARNINGTIME = 5;
-@@ -199,13 +200,13 @@
- $logtext .= " LASTRUNFILE = \"$LASTRUNFILE\"\n";
- $logtext .= " PTLASHISTORYDIR = \"$PTLASHISTORYDIR\" ";
- if (-e "$PTLASHISTORYDIR") {$logtext .= "(ok)\n"}
-- else {mkdir("$PTLASHISTORYDIR", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$PTLASHISTORYDIR", 0775); $logtext .= "(created)\n"}
- $logtext .= " OTHERHISTORYDIR = \"$OTHERHISTORYDIR\" ";
- if (-e "$OTHERHISTORYDIR") {$logtext .= "(ok)\n"}
-- else {mkdir("$OTHERHISTORYDIR", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$OTHERHISTORYDIR", 0775); $logtext .= "(created)\n"}
- $logtext .= " Complete tree dir = \"$HOMEDIR/history/completetree\" ";
- if (-e "$HOMEDIR/history/completetree") {$logtext .= "(ok)\n"}
-- else {mkdir("$HOMEDIR/history/completetree", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$HOMEDIR/history/completetree", 0775); $logtext .= "(created)\n"}
- $logtext .= " OLDASPATHSFILE = \"$OLDASPATHSFILE\"\n";
- $logtext .= " OLDDATEFILE = \"$OLDDATEFILE\"\n";
- if ($MORETREES) {
-@@ -215,12 +216,12 @@
- $OLDBBDATEFILE = "$HOMEDIR/history/bbtree/lastchangedate.txt";
- $logtext .= " BB tree dir = \"$HOMEDIR/history/bbtree\" ";
- if (-e "$HOMEDIR/history/bbtree") {$logtext .= "(ok)\n"}
-- else {mkdir("$HOMEDIR/history/bbtree", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$HOMEDIR/history/bbtree", 0775); $logtext .= "(created)\n"}
- $logtext .= " OLDBBASPATHSFILE = \"$OLDBBASPATHSFILE\"\n";
- $logtext .= " OLDBBDATEFILE = \"$OLDBBDATEFILE\"\n";
- $logtext .= " 2001 tree dir = \"$HOMEDIR/history/othertree\" ";
- if (-e "$HOMEDIR/history/othertree") {$logtext .= "(ok)\n"}
-- else {mkdir("$HOMEDIR/history/othertree", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$HOMEDIR/history/othertree", 0775); $logtext .= "(created)\n"}
- $logtext .= " OLDOTHASPATHSFILE = \"$OLDOTHASPATHSFILE\"\n";
- $logtext .= " OLDOTHDATEFILE = \"$OLDOTHDATEFILE\"\n";
- } else {
-@@ -246,7 +247,7 @@
- $CHANGESDIR = "$HTMLDIR_LOCAL/changes";
- $logtext .= " CHANGESDIR = \"$CHANGESDIR\" ";
- if (-e "$CHANGESDIR") {$logtext .= "(ok)\n"}
-- else {mkdir("$CHANGESDIR", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$CHANGESDIR", 0775); $logtext .= "(created)\n"}
- $OUTPUTCOMPLETECHANGES = "$CHANGESDIR/bgp-page-complete-changes.html";
- $logtext .= " OUTPUTCOMPLETECHANGES = \"$OUTPUTCOMPLETECHANGES\"\n";
- $OUTPUTBBCHANGES = "$CHANGESDIR/bgp-page-backbone-changes.html";
-@@ -260,19 +261,19 @@
- $DETAILDIRCO = "$DETAILDIR/complete";
- $logtext .= " DETAILDIR = \"$DETAILDIR\" ";
- if (-e "$DETAILDIR") {$logtext .= "(ok)\n"}
-- else {mkdir("$DETAILDIR", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$DETAILDIR", 0775); $logtext .= "(created)\n"}
- $logtext .= " DETAILDIRCO = \"$DETAILDIRCO\" ";
- if (-e "$DETAILDIRCO") {$logtext .= "(ok)\n"}
-- else {mkdir("$DETAILDIRCO", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$DETAILDIRCO", 0775); $logtext .= "(created)\n"}
- if ($MORETREES) {
- $DETAILDIRBB = "$DETAILDIR/backbone";
- $DETAILDIRIANA = "$DETAILDIR/otherIANA";
- $logtext .= " DETAILDIRBB = \"$DETAILDIRBB\" ";
- if (-e "$DETAILDIRBB") {$logtext .= "(ok)\n"}
-- else {mkdir("$DETAILDIRBB", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$DETAILDIRBB", 0775); $logtext .= "(created)\n"}
- $logtext .= " DETAILDIRIANA = \"$DETAILDIRIANA\" ";
- if (-e "$DETAILDIRIANA") {$logtext .= "(ok)\n"}
-- else {mkdir("$DETAILDIRIANA", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$DETAILDIRIANA", 0775); $logtext .= "(created)\n"}
- } else {
- if (-e "$DETAILDIRBB") {system "rm -rf $DETAILDIRBB"}
- if (-e "$DETAILDIRIANA") {system "rm -rf $DETAILDIRIANA"}
-@@ -280,30 +281,30 @@
- $HISTORYHTMLDIR = "$HTMLDIR_LOCAL/24h_history";
- $logtext .= " HISTORYHTMLDIR = \"$HISTORYHTMLDIR\" ";
- if (-e "$HISTORYHTMLDIR") {$logtext .= "(ok)\n"}
-- else {mkdir("$HISTORYHTMLDIR", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$HISTORYHTMLDIR", 0775); $logtext .= "(created)\n"}
- $ICONSDIR = "$HTMLDIR_LOCAL/icons";
- $logtext .= " ICONSDIR = \"$ICONSDIR\"\n";
- $logtext .= " Trash dir = \"$HTMLDIR_LOCAL/trash\" ";
- if (-e "$HTMLDIR_LOCAL/trash") {system "rm -rf $HTMLDIR_LOCAL/trash/*"; $logtext .= "(ok, empty)\n"}
-- else {mkdir("$HTMLDIR_LOCAL/trash", 0777); $logtext .= "(created)\n"}
-+ else {mkdir("$HTMLDIR_LOCAL/trash", 0775); $logtext .= "(created)\n"}
-
- $logtext .= "\n HTMLDIR = \"$HTMLDIR\"\n";
- if (-d $HTMLDIR) {
-- unless (-e "$HTMLDIR/details") {mkdir("$HTMLDIR/details", 0777); $logtext .= " $HTMLDIR/details created.\n"}
-- unless (-e "$HTMLDIR/details/complete") {mkdir("$HTMLDIR/details/complete", 0777); $logtext .= " $HTMLDIR/details/complete created.\n"}
-+ unless (-e "$HTMLDIR/details") {mkdir("$HTMLDIR/details", 0775); $logtext .= " $HTMLDIR/details created.\n"}
-+ unless (-e "$HTMLDIR/details/complete") {mkdir("$HTMLDIR/details/complete", 0775); $logtext .= " $HTMLDIR/details/complete created.\n"}
- if ($MORETREES) {
-- unless (-e "$HTMLDIR/details/backbone") {mkdir("$HTMLDIR/details/backbone", 0777); $logtext .= " $HTMLDIR/details/backbone created.\n"}
-- unless (-e "$HTMLDIR/details/otherIANA") {mkdir("$HTMLDIR/details/otherIANA", 0777); $logtext .= " $HTMLDIR/details/otherIANA created.\n"}
-+ unless (-e "$HTMLDIR/details/backbone") {mkdir("$HTMLDIR/details/backbone", 0775); $logtext .= " $HTMLDIR/details/backbone created.\n"}
-+ unless (-e "$HTMLDIR/details/otherIANA") {mkdir("$HTMLDIR/details/otherIANA", 0775); $logtext .= " $HTMLDIR/details/otherIANA created.\n"}
- } else {
- if (-e "$HTMLDIR/details/backbone") {system "rm -rf $HTMLDIR/details/backbone"}
- if (-e "$HTMLDIR/details/otherIANA") {system "rm -rf $HTMLDIR/details/otherIANA"}
- }
-- unless (-e "$HTMLDIR/24h_history") {mkdir("$HTMLDIR/24h_history", 0777); $logtext .= " $HTMLDIR/24h_history created.\n"}
-+ unless (-e "$HTMLDIR/24h_history") {mkdir("$HTMLDIR/24h_history", 0775); $logtext .= " $HTMLDIR/24h_history created.\n"}
- if ($CHANGESFLAG) {
-- unless (-e "$HTMLDIR/changes") {mkdir("$HTMLDIR/changes", 0777); $logtext .= " $HTMLDIR/changes created.\n"}
-+ unless (-e "$HTMLDIR/changes") {mkdir("$HTMLDIR/changes", 0775); $logtext .= " $HTMLDIR/changes created.\n"}
- }
- unless (-e "$HTMLDIR/icons") {
-- mkdir("$HTMLDIR/icons", 0777);
-+ mkdir("$HTMLDIR/icons", 0775);
- system("cp $ICONSDIR/* $HTMLDIR/icons");
- $logtext .= " $HTMLDIR/icons created and template icons copied.\n";
- }
diff --git a/net/aspathtree/pkg-descr b/net/aspathtree/pkg-descr
deleted file mode 100644
index 72ba4fa92978..000000000000
--- a/net/aspathtree/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-ASpath-tree program
-============================
-
-ASpath-tree is a tool designed to be used by an IPv6 site involved
-in the experimentation of the BGP4+ protocol inside the 6Bone network.
-It generates summary of:
-
- * the number of route entries (valid/total/suppressed/damped/history)
- * the number of AS in table (total, originating only, originating/transit,
- transit only, private and reserved)
- * the number of active AS paths
- * the number of active BGP neighbours (i.e. announcing routing information)
- * an analysis of the network size, in terms of AS distances
- * the number of circulating prefixes (total, 6Bone pTLAs, sTLAs, 6to4,
- others)
-
-The current version supports:
- * 6Bone pTLAs
- * RIR's assigned sTLAs
- * Juniper/Cisco/Zebra routers
-
-WWW: http://carmen.ipv6.cselt.it/ipv6/tools/ASpath-tree/index.html
-
-janos.mohacsi@bsd.hu
diff --git a/net/aspathtree/pkg-message b/net/aspathtree/pkg-message
deleted file mode 100644
index 1277ed90ff26..000000000000
--- a/net/aspathtree/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-For to configuration information please look at
-%%PREFIX%%/share/doc/aspathtree/readme.txt.
-
-Copy %%PREFIX%%/etc/ASpath-tree.config.dist to
-%%PREFIX%%/etc/ASpath-tree.config
-and modify accordingly to your environment.
diff --git a/net/aspathtree/pkg-plist b/net/aspathtree/pkg-plist
deleted file mode 100644
index ed9b677e0c80..000000000000
--- a/net/aspathtree/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-etc/ASpath-tree.config.dist
-var/aspathtree/htdocs/icons/bnew.gif
-var/aspathtree/htdocs/icons/bold.gif
-var/aspathtree/htdocs/icons/e.gif
-var/aspathtree/htdocs/icons/h.gif
-var/aspathtree/htdocs/icons/l.gif
-var/aspathtree/htdocs/icons/p.gif
-var/aspathtree/htdocs/icons/t.gif
-var/aspathtree/htdocs/icons/v.gif
-var/aspathtree/data/6bone.db
-var/aspathtree/data/force.as.name
-var/aspathtree/data/rirs.db
-libexec/aspathtree/bgp-tree-changes.pl
-libexec/aspathtree/bgp-tree.pl
-libexec/aspathtree/create-homepage.pl
-libexec/aspathtree/elaborate-aspaths.pl
-libexec/aspathtree/getbgptable.pl
-libexec/aspathtree/history.pl
-libexec/aspathtree/ipv6prefix.pl
-libexec/aspathtree/odd-as.pl
-libexec/aspathtree/odd-routes.pl
-libexec/aspathtree/route-stability.pl
-libexec/aspathtree/utility.pl
-libexec/aspathtree/ASmain.pl
-bin/update-rtree
-%%PORTDOCS%%share/doc/aspathtree/DISCLAIMER
-%%PORTDOCS%%share/doc/aspathtree/readme.txt
-%%PORTDOCS%%share/doc/aspathtree/changes.txt
-@dirrm var/aspathtree/htdocs/changes
-@dirrm var/aspathtree/htdocs/details
-@dirrm var/aspathtree/htdocs/icons
-@dirrm var/aspathtree/htdocs/trash
-@dirrm var/aspathtree/htdocs
-@dirrm var/aspathtree/history/bbtree
-@dirrm var/aspathtree/history/completetree
-@dirrm var/aspathtree/history/othertree
-@dirrm var/aspathtree/history/other
-@dirrm var/aspathtree/history/ptlas
-@dirrm var/aspathtree/history
-@dirrm var/aspathtree/data
-@dirrm var/aspathtree/log
-@dirrm var/aspathtree
-@dirrm libexec/aspathtree
-%%PORTDOCS%%@dirrm share/doc/aspathtree/
diff --git a/net/bandwidthd/distinfo b/net/bandwidthd/distinfo
deleted file mode 100644
index f4a772a6cbf4..000000000000
--- a/net/bandwidthd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (bandwidthd-1.2.0b.tgz) = 001e361f312dac69a2a5eec6ce52e550
-SIZE (bandwidthd-1.2.0b.tgz) = 53834
diff --git a/net/bandwidthd/files/bandwidthd.sh b/net/bandwidthd/files/bandwidthd.sh
deleted file mode 100644
index 7dd2836fdd73..000000000000
--- a/net/bandwidthd/files/bandwidthd.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
- start)
- [ -x ${PREFIX}/bandwidthd ] && \
- [ -r ${PREFIX}/bandwidthd/etc/bandwidthd.conf ] && \
- cd ${PREFIX}/bandwidthd && ./bandwidthd &&\
- echo -n ' bandwidthd'
-
- ;;
- stop)
- killall bandwidthd && echo -n ' bandwidthd'
- ;;
- *)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
diff --git a/net/bandwidthd/files/patch-Makefile b/net/bandwidthd/files/patch-Makefile
deleted file mode 100644
index e066326b0d40..000000000000
--- a/net/bandwidthd/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig Wed Jan 14 21:38:17 2004
-+++ Makefile Fri Jan 16 01:39:20 2004
-@@ -1,8 +1,8 @@
- #Possible optimizations -fomit-frame-pointer -ffast-math
- OBS= bandwidthd.o graph.o conf.tab.o conf.l.o
--LIBS= -L/usr/local/lib -lgd -lpng -lpcap
--CFLAGS= -I/usr/local/include -O3 -Wall
--NONWALLCFLAGS= -O3 #-g -DDEBUG
-+LIBS= -L${LOCALBASE}/lib -lgd -lpng -lpcap
-+CFLAGS+= -I${LOCALBASE}/include
-+#NONWALLCFLAGS= -O3 #-g -DDEBUG
-
- # Debugging stuff
- #CFLAGS= -O3 -Wall -pg -DPROFILE
-@@ -44,13 +44,13 @@
- rm -f *.o bandwidthd *~ conf.tab.c conf.tab.h conf.l.c DEADJOE
-
- install: all
-- if [ ! -d $(DESTDIR)/usr/local/bandwidthd/etc ] ; then mkdir -p $(DESTDIR)/usr/local/bandwidthd/etc ; fi
-- if [ ! -d $(DESTDIR)/usr/local/bandwidthd/htdocs ] ; then mkdir -p $(DESTDIR)/usr/local/bandwidthd/htdocs ; fi
-- cp bandwidthd $(DESTDIR)/usr/local/bandwidthd
-- if [ ! -f $(DESTDIR)/usr/local/bandwidthd/etc/bandwidthd.conf ] ; then cp etc/bandwidthd.conf $(DESTDIR)/usr/local/bandwidthd/etc/ ; fi
-- cp htdocs/legend.gif $(DESTDIR)/usr/local/bandwidthd/htdocs/
-- cp htdocs/logo.gif $(DESTDIR)/usr/local/bandwidthd/htdocs/
-+ mkdir -p $(DESTDIR)${PREFIX}/bandwidthd/etc
-+ mkdir -p $(DESTDIR)${PREFIX}/bandwidthd/htdocs
-+ ${BSD_INSTALL_PROGRAM} bandwidthd $(DESTDIR)${PREFIX}/bandwidthd
-+ ${BSD_INSTALL_DATA} etc/bandwidthd.conf $(DESTDIR)${PREFIX}/bandwidthd/etc/bandwidthd.conf-dist
-+ ${BSD_INSTALL_DATA} htdocs/legend.gif $(DESTDIR)${PREFIX}/bandwidthd/htdocs/
-+ ${BSD_INSTALL_DATA} htdocs/logo.gif $(DESTDIR)${PREFIX}/bandwidthd/htdocs/
-
- #**** Stuff where -WALL is turned off to reduce the noise in a compile so I can see my own errors *******************
- conf.l.o: conf.l.c
-- $(CC) $(NONWALLCFLAGS) -c -o conf.l.o conf.l.c
-+ $(CC) -c -o conf.l.o conf.l.c
diff --git a/net/bandwidthd/pkg-descr b/net/bandwidthd/pkg-descr
deleted file mode 100644
index bcb67c8ccc0b..000000000000
--- a/net/bandwidthd/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-bandwidthd tracks usage of TCP/IP network subnets and builds HTML files with
-graphs to display network utilization. Charts are built by individual IP. It
-color codes HTTP, TCP,UDP, ICMP, VPN, and P2P traffic. Unlike MRTG, it tracks
-each individual IP address, not the status of any particular link.
-
-WWW: http://bandwidthd.sourceforge.net/
diff --git a/net/bandwidthd/pkg-plist b/net/bandwidthd/pkg-plist
deleted file mode 100644
index ecacdc36a557..000000000000
--- a/net/bandwidthd/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD$
-bandwidthd/etc/bandwidthd.conf-dist
-bandwidthd/bandwidthd
-bandwidthd/htdocs/legend.gif
-bandwidthd/htdocs/logo.gif
-etc/rc.d/bandwidthd.sh.sample
-@unexec rmdir %D/bandwidthd/etc 2> /dev/null || true
-@unexec rmdir %D/bandwidthd/htdocs 2> /dev/null || true
-@unexec rmdir %D/bandwidthd 2> /dev/null || echo "If you do not plan on reinstalling bandwidthd, you can safely remove %D/bandwidthd"
diff --git a/net/bgpq/distinfo b/net/bgpq/distinfo
deleted file mode 100644
index 100856e65d5e..000000000000
--- a/net/bgpq/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (bgpq-1.0.7.6.tar.gz) = 40a08648480caba1de440659e89fed9d
diff --git a/net/bgpq/files/patch-ro.c b/net/bgpq/files/patch-ro.c
deleted file mode 100644
index 5563b4976daf..000000000000
--- a/net/bgpq/files/patch-ro.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ro.c.orig Wed Oct 15 06:07:13 2003
-+++ ro.c Wed Oct 15 06:07:38 2003
-@@ -471,18 +471,18 @@
- if(extrange) {
- if(retval<100 || (retval>199 && retval<2000) || retval>2699) {
- fprintf(f,"\
--!=============================================================================
--! WARNING ! %s is out of extended access-list ranges (100-199 and 2000-2699)
--!=============================================================================
-+!=============================================================================\n\
-+! WARNING ! %s is out of extended access-list ranges (100-199 and 2000-2699)\n\
-+!=============================================================================\n\
- ",string);
- exit(1);
- };
- } else {
- if((retval>100 && retval<1300) || retval>1999) {
- fprintf(f,"\
--!=============================================================================
--! WARNING ! %s is out of standard access-list ranges (1-99 and 1300-1999)
--!=============================================================================
-+!=============================================================================\n\
-+! WARNING ! %s is out of standard access-list ranges (1-99 and 1300-1999)\n\
-+!=============================================================================\n\
- ",string);
-
- exit(1);
diff --git a/net/bgpq/pkg-descr b/net/bgpq/pkg-descr
deleted file mode 100644
index d22b77ce4ecb..000000000000
--- a/net/bgpq/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-This program is a lightweight access- and prefix-list generator
-for Cisco routers and GateD/Zebra. Access lists are generated
-based on RADB/RIPE data.
-
-This tool is not so powerful as RAToolSet, but has some
-features missing in RAToolSet, such as optional filtering
-of more specific routes in the same AS or acl string aggregation;
-also, it does not requires Tcl/Tk to be installed.
diff --git a/net/bpft/distinfo b/net/bpft/distinfo
deleted file mode 100644
index ecba538d0686..000000000000
--- a/net/bpft/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (bpft4-latest.tgz) = 7607793dd686426976cb0aa99a3ae384
diff --git a/net/bpft/files/patch-Makefile b/net/bpft/files/patch-Makefile
deleted file mode 100644
index 0989d9f70e9d..000000000000
--- a/net/bpft/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig Sun Mar 30 17:45:30 2003
-+++ Makefile Sun Mar 30 17:46:23 2003
-@@ -31,7 +31,7 @@
- PATH_SBINDIR=${PREFIX}/sbin
-
- # Trailing slash directory, summary traffic log files will be put there.
--PATH_TOSAVE=${PREFIX}/var/trafd/
-+PATH_TOSAVE=${PREFIX}/var/bpft/
-
- # Full pathname where locate trafstat program.
- PATH_TRAFSTAT=${PREFIX}/bin/trafstat
diff --git a/net/bpft/pkg-descr b/net/bpft/pkg-descr
deleted file mode 100644
index ede6d3b56d20..000000000000
--- a/net/bpft/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The BPF Traffic collector
-
-Enhanced version of trafd (/usr/ports/net/trafd/)
-
-WWW: http://bpft.by.ru/
-
-- El Vampiro
-vampiro@rootshell.ru
diff --git a/net/bpft/pkg-install b/net/bpft/pkg-install
deleted file mode 100644
index 706e7e660786..000000000000
--- a/net/bpft/pkg-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-DBDIR=${PREFIX}/var/bpft
-mkdir -p $DBDIR
diff --git a/net/bpft/pkg-plist b/net/bpft/pkg-plist
deleted file mode 100644
index a39e75b53b62..000000000000
--- a/net/bpft/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-sbin/trafd
-sbin/trafstatd
-bin/trafdump
-bin/traflog
-bin/trafsave
-bin/trafstart
-bin/trafstat
-bin/trafstop
-etc/rc.d/trafd.sh
-etc/traflog.format
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
-@dirrm var/bpft
-@unexec rmdir %D/var 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/braa/distinfo b/net/braa/distinfo
deleted file mode 100644
index 1c87aad12786..000000000000
--- a/net/braa/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (braa-0.8.tar.gz) = 2d71d83817404343434c7996ed09f88a
-SIZE (braa-0.8.tar.gz) = 39532
diff --git a/net/braa/pkg-descr b/net/braa/pkg-descr
deleted file mode 100644
index 011c216dc824..000000000000
--- a/net/braa/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Braa is a tool for making SNMP queries. It is able to query
-hundreds or thousands of hosts simultaneously, while being
-completely single-threaded. It does not need any SNMP
-libraries, as it is equipped with its own SNMP engine. However,
-it's good to have a complete SNMP package including
-"snmptranslate" installed somewhere, because for speed reasons,
-there is no ASN.1 parser in Braa, and all the SNMP OIDs need to
-be specified numerically.
-
-WWW: http://s-tech.elsat.net.pl/braa/
diff --git a/net/braa/pkg-plist b/net/braa/pkg-plist
deleted file mode 100644
index eef16cb4e404..000000000000
--- a/net/braa/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/braa
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/bsd-airtools/distinfo b/net/bsd-airtools/distinfo
deleted file mode 100644
index c766cb347e5a..000000000000
--- a/net/bsd-airtools/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (bsd-airtools-v0.3.tgz) = c3c2546e3d930da01c6bff1528b6e369
diff --git a/net/bsd-airtools/pkg-descr b/net/bsd-airtools/pkg-descr
deleted file mode 100644
index 16ec2c547493..000000000000
--- a/net/bsd-airtools/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-bsd-airtools is a package that provides a complete toolset for
-wireless 802.11b auditing. Namely, it currently contains a bsd-based
-wep cracking application, called dweputils. It also contains a curses
-based ap detection application similar to netstumbler (dstumbler) that
-can be used to detect wireless access points and connected nodes, view
-signal to noise graphs, and interactively scroll through scanned ap's
-and view statistics for each. It also includes a couple other tools to
-provide a complete toolset for making use of all 14 of the prism2
-debug modes as well as do basic analysis of the hardware-based
-link-layer protocols provided by prism2's monitor debug mode.
-
-WWW: http://www.dachb0den.com/projects/bsd-airtools.html
diff --git a/net/bsd-airtools/pkg-plist b/net/bsd-airtools/pkg-plist
deleted file mode 100644
index 259153606c68..000000000000
--- a/net/bsd-airtools/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/dstumbler
-bin/dwepcrack
-bin/dwepdump
-bin/dwepkeygen
-bin/prism2ctl
-bin/prism2dump
-%%PORTDOCS%%share/doc/bsd-airtools/README.dstumbler
-%%PORTDOCS%%share/doc/bsd-airtools/README.dwepcrack
-%%PORTDOCS%%share/doc/bsd-airtools/README.dwepdump
-%%PORTDOCS%%share/doc/bsd-airtools/README.dwepkeygen
-%%PORTDOCS%%share/doc/bsd-airtools/README.prism2ctl
-%%PORTDOCS%%share/doc/bsd-airtools/README.prism2dump
-%%PORTDOCS%%@dirrm share/doc/bsd-airtools
diff --git a/net/cacti/Makefile b/net/cacti/Makefile
index 8aa1a8563dc0..fc9765d7e77f 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -15,7 +15,7 @@ COMMENT= Web-driven graphing interface for RRDTool
RUN_DEPENDS= php:${PORTSDIR}/lang/php4 \
rrdtool:${PORTSDIR}/net/rrdtool \
- net-snmp-config:${PORTSDIR}/net/net-snmp
+ net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp
USE_MYSQL= yes
NO_BUILD= yes
diff --git a/net/cdpd/distinfo b/net/cdpd/distinfo
deleted file mode 100644
index 2d63efed7769..000000000000
--- a/net/cdpd/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cdpd-1.0.2.tar.gz) = 14aacbaceb12413391b1d8ad226ce0bd
diff --git a/net/cdpd/files/cdpd.patch b/net/cdpd/files/cdpd.patch
deleted file mode 100644
index 497ff9f311fc..000000000000
--- a/net/cdpd/files/cdpd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdpd.sh.in.orig Fri Jul 25 07:28:15 2003
-+++ cdpd.sh.in Fri Jul 25 07:28:23 2003
-@@ -3,7 +3,7 @@
- case $1 in
- start)
- [ -x @prefix@@libexecdir@/cdpd ] && @prefix@@libexecdir@/cdpd -a;
-- echo ' cdpd';
-+ echo -n ' cdpd';
- ;;
- stop)
- killall cdpd
diff --git a/net/cdpd/pkg-descr b/net/cdpd/pkg-descr
deleted file mode 100644
index 21959e6eef6e..000000000000
--- a/net/cdpd/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-A simple program designed to send 'Cisco Discovery Protocol' packets
-on network.
diff --git a/net/cdpd/pkg-plist b/net/cdpd/pkg-plist
deleted file mode 100644
index 80c13c6fd10b..000000000000
--- a/net/cdpd/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-libexec/cdpd
-etc/rc.d/cdpd.sh
diff --git a/net/cdpr/distinfo b/net/cdpr/distinfo
deleted file mode 100644
index 184be0cf7098..000000000000
--- a/net/cdpr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cdpr-2.1.0.tar.gz) = a6fa309bd64d63d00658acaad63c3da0
diff --git a/net/cdpr/files/patch-aa b/net/cdpr/files/patch-aa
deleted file mode 100644
index 8c591de71e7e..000000000000
--- a/net/cdpr/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- cdpr.c.orig Wed Nov 19 17:53:13 2003
-+++ cdpr.c Wed Nov 19 17:54:06 2003
-@@ -639,7 +639,7 @@
- pcap_lookupnet(dev, &net, &mask, errbuf);
-
- /* Open the pcap device */
-- if((handle = pcap_open_live(dev, BUFSIZ, 1, 0, errbuf)) == NULL)
-+ if((handle = pcap_open_live(dev, BUFSIZ, 1, 1000, errbuf)) == NULL)
- {
- printf("Error opening device (%s)\n", errbuf);
- exit(1);
-@@ -656,11 +656,6 @@
- pcap_setfilter(handle, &filter);
- pcap_freecode(&filter);
-
-- /* Set non-blocking mode */
-- if(pcap_setnonblock(handle, 1, errbuf))
-- {
-- pcap_perror(handle, NULL);
-- }
-
- /* Get the next packet that comes in, we only need one */
- printf("Waiting for CDP advertisement:\n");
-@@ -671,11 +666,7 @@
- do
- {
- packet = pcap_next(handle, &header);
--#ifdef WIN32
-- Sleep(10000);
--#else
-- usleep(10000);
--#endif
-+
- } while ((!packet) && ( timeout=((start_time+seconds) > (unsigned int)time(NULL))) );
-
- /*
diff --git a/net/cdpr/pkg-descr b/net/cdpr/pkg-descr
deleted file mode 100644
index c32c8a1aae12..000000000000
--- a/net/cdpr/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-cdpr (Cisco Discovery Protocol Reporter) shows the switch and port that
-a machine is connected to, provided that the device supports CDP. It
-can also optionally decode the full CDP packet. cdpr was written to
-help network/system administrators find out about the equipment that i
-a machine is connected to. This is done by capturing and decoding a
-Cisco Discovery Protocol (CDP) packet.
-
-AUTHOR: Lance O'Connor <lance@monkeymental.com>
-WWW: http://www.monkeymental.com/nuke/
-
- - Michael L. Hostbaek
- mich@FreeBSD.org
diff --git a/net/cdpr/pkg-plist b/net/cdpr/pkg-plist
deleted file mode 100644
index 79cb7e201903..000000000000
--- a/net/cdpr/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/cdpr
-%%PORTDOCS%%%%DATADIR%%/cdprs.php
-%%PORTDOCS%%%%DATADIR%%/cdprs.cgi
-%%PORTDOCS%%%%DATADIR%%/cdpr.conf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.cdprs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%DATADIR%%
diff --git a/net/cfgstoragemk/distinfo b/net/cfgstoragemk/distinfo
deleted file mode 100644
index 05ea07596285..000000000000
--- a/net/cfgstoragemk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (cfgstoragemaker-1.0.tar.gz) = fd9ebd7b22595d824335e02bef60fbfc
-SIZE (cfgstoragemaker-1.0.tar.gz) = 18893
diff --git a/net/cfgstoragemk/files/patch-Config.mk.in b/net/cfgstoragemk/files/patch-Config.mk.in
deleted file mode 100644
index 8447118d3565..000000000000
--- a/net/cfgstoragemk/files/patch-Config.mk.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.mk.in.orig Thu Jul 4 14:29:59 2002
-+++ Config.mk.in Thu Jul 4 14:30:10 2002
-@@ -18,7 +18,7 @@
- # 02111-1307, USA.
-
- OWN = root
--GRP = root
-+GRP = wheel
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- mandir = @mandir@/man1
diff --git a/net/cfgstoragemk/files/patch-cfgstoragemaker b/net/cfgstoragemk/files/patch-cfgstoragemaker
deleted file mode 100644
index 39b076187cc8..000000000000
--- a/net/cfgstoragemk/files/patch-cfgstoragemaker
+++ /dev/null
@@ -1,17 +0,0 @@
---- cfgstoragemaker.orig Thu Jul 4 14:27:37 2002
-+++ cfgstoragemaker Thu Jul 4 14:28:21 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-
- # cfgstoragemaker: MRTG config generator for storage monitoring via SNMP
- # Copyright (C) 2001, 2002 LibertySurf Telecom, Cyril Bouthors
-@@ -29,7 +29,7 @@
- my $snmp_root = 'host.hrStorage.hrStorageTable.hrStorageEntry';
- my $debug=0; #1 for additional info
-
--my $tpl_dir = '/usr/share/cfgstoragemaker';
-+my $tpl_dir = '%%PREFIX%%/share/cfgstoragemaker';
- my $tpl_header = 'header.tpl';
- my $tpl_body = 'body.tpl';
-
diff --git a/net/cfgstoragemk/files/patch-cfgstoragemaker.1 b/net/cfgstoragemk/files/patch-cfgstoragemaker.1
deleted file mode 100644
index 069ff8e2110e..000000000000
--- a/net/cfgstoragemk/files/patch-cfgstoragemaker.1
+++ /dev/null
@@ -1,15 +0,0 @@
---- cfgstoragemaker.1.orig Thu Jul 4 14:32:22 2002
-+++ cfgstoragemaker.1 Thu Jul 4 14:32:59 2002
-@@ -24,10 +24,10 @@
- \fICfgstoragemaker\fR is written in Perl.
- .SH FILES
- .TP
--.I /usr/share/snmp/mibs/HOST-RESOURCES-MIB.txt
-+.I %%LOCALBASE%%/share/snmp/mibs/HOST-RESOURCES-MIB.txt
- SNMP MIB file provided by ucd-snmp
- .TP
--.I /usr/share/cfgstoragemaker/templates/header.tpl /usr/share/cfgstoragemaker/templates/body.tpl
-+.I %%PREFIX%%/share/cfgstoragemaker/templates/header.tpl %%PREFIX%%/share/cfgstoragemaker/templates/body.tpl
- templates files to build the config file
- .SH SEE ALSO
- \fIcfgmaker\fP(1), \fIindexmaker\fP(1), \fImrtg\fP(1), \fIsnmpd\fP(1)
diff --git a/net/cfgstoragemk/pkg-descr b/net/cfgstoragemk/pkg-descr
deleted file mode 100644
index 51432e9ed9e4..000000000000
--- a/net/cfgstoragemk/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-MRTG configuration file generator for storage monitoring via SNMP
diff --git a/net/cfgstoragemk/pkg-plist b/net/cfgstoragemk/pkg-plist
deleted file mode 100644
index eb349c97faa4..000000000000
--- a/net/cfgstoragemk/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/cfgstoragemaker
-share/cfgstoragemaker/body.tpl
-share/cfgstoragemaker/header.tpl
-@dirrm share/cfgstoragemaker
diff --git a/net/cflowd/distinfo b/net/cflowd/distinfo
deleted file mode 100644
index ce0058d33564..000000000000
--- a/net/cflowd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (cflowd-2-1-b1.tar.gz) = 6f0543390e9d46c4274f6b12b6517f62
-MD5 (cflowd-2-1-b1-djp.patch) = 77e96671521ff1870a51d0dc11161eae
diff --git a/net/cflowd/files/cflowd.sh b/net/cflowd/files/cflowd.sh
deleted file mode 100644
index e063398026d4..000000000000
--- a/net/cflowd/files/cflowd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-# rc script for cflowd
-# Andreas Klemm <andreas@FreeBSD.org>, So 25 Mär 2001 12:46:10 CEST
-# $FreeBSD$
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-'start')
- [ -x $PREFIX/sbin/cflowdmux -a -s $PREFIX/etc/cflowd.conf ] \
- && $PREFIX/sbin/cflowdmux $PREFIX/etc/cflowd.conf \
- && echo -n " cflowdmux"
- sleep 2
- [ -x $PREFIX/sbin/cflowd -a -s $PREFIX/etc/cflowd.conf ] \
- && $PREFIX/sbin/cflowd $PREFIX/etc/cflowd.conf \
- && echo -n " cflowd"
- sleep 2
- [ -x $PREFIX/sbin/cfdcollect -a -s $PREFIX/etc/cfdcollect.conf ] \
- && $PREFIX/sbin/cfdcollect $PREFIX/etc/cfdcollect.conf \
- && echo -n " cfdcollect"
- ;;
-
-'stop')
- for i in cfdcollect cflowd cflowdmux
- do
- sleep 2
- killall -15 $i && echo "graceful shutdown of $i"
- done
- ;;
-esac
-
-exit 0
diff --git a/net/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh b/net/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh
deleted file mode 100644
index 04944850c639..000000000000
--- a/net/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- apps/cflowdmux/CflowdRawFlowClientList.hh.orig Fri Aug 29 22:10:51 2003
-+++ apps/cflowdmux/CflowdRawFlowClientList.hh Fri Aug 29 22:11:03 2003
-@@ -51,6 +51,7 @@
- #include "caida_t.h"
- }
-
-+using namespace std;
- #include <list>
-
- //---------------------------------------------------------------------------
diff --git a/net/cflowd/files/patch-classes::include::CflowdCisco.hh b/net/cflowd/files/patch-classes::include::CflowdCisco.hh
deleted file mode 100644
index a3b7bafbcc18..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdCisco.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- classes/include/CflowdCisco.hh.orig Fri Aug 29 20:49:59 2003
-+++ classes/include/CflowdCisco.hh Fri Aug 29 20:53:49 2003
-@@ -48,6 +48,8 @@
- #include "caida_t.h"
- }
-
-+using namespace std;
-+
- #include "CflowdRawFlow.hh"
- #include "CflowdRawFlowLogger.hh"
- #include "CflowdCiscoFlowInterfaceMap.hh"
diff --git a/net/cflowd/files/patch-classes::include::CflowdCollectorMap.hh b/net/cflowd/files/patch-classes::include::CflowdCollectorMap.hh
deleted file mode 100644
index 81d2d1b497a8..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdCollectorMap.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdCollectorMap.hh.orig Fri Aug 29 21:48:40 2003
-+++ classes/include/CflowdCollectorMap.hh Fri Aug 29 21:49:10 2003
-@@ -47,6 +47,7 @@
- #include "caida_t.h"
- }
-
-+using namespace std;
- #include <map>
-
- #include "CflowdCollector.hh"
diff --git a/net/cflowd/files/patch-classes::include::CflowdFlowFilter.hh b/net/cflowd/files/patch-classes::include::CflowdFlowFilter.hh
deleted file mode 100644
index 73a5b121621e..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdFlowFilter.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdFlowFilter.hh.orig Fri Aug 29 22:06:03 2003
-+++ classes/include/CflowdFlowFilter.hh Fri Aug 29 22:06:16 2003
-@@ -42,6 +42,7 @@
- #ifndef _CFLOWDFLOWFILTER_HH_
- #define _CFLOWDFLOWFILTER_HH_
-
-+using namespace std;
- #include <string>
- #include <vector>
-
diff --git a/net/cflowd/files/patch-classes::include::CflowdFlowPortList.hh b/net/cflowd/files/patch-classes::include::CflowdFlowPortList.hh
deleted file mode 100644
index 301579739cc2..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdFlowPortList.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdFlowPortList.hh.orig Fri Aug 29 21:50:14 2003
-+++ classes/include/CflowdFlowPortList.hh Fri Aug 29 21:50:29 2003
-@@ -48,6 +48,7 @@
- #include "caida_t.h"
- }
-
-+using namespace std;
- #include <list>
-
- //---------------------------------------------------------------------------
diff --git a/net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh b/net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
deleted file mode 100644
index 3b3225191b57..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
+++ /dev/null
@@ -1,26 +0,0 @@
---- classes/include/CflowdNetMatrixKey.hh.orig Fri Aug 29 20:35:27 2003
-+++ classes/include/CflowdNetMatrixKey.hh Fri Aug 29 20:36:00 2003
-@@ -191,9 +191,9 @@
- inline istream & read(istream & is)
- {
- g_CfdArtsPrimitive.ReadIpv4Network(is,this->_src,sizeof(this->_src));
-- is.read(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
-+ is.read((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
- g_CfdArtsPrimitive.ReadIpv4Network(is,this->_dst,sizeof(this->_dst));
-- is.read(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-+ is.read((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-
- return(is);
- }
-@@ -263,9 +263,9 @@
- inline ostream & write(ostream & os) const
- {
- g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src));
-- os.write(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
-+ os.write((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
- g_CfdArtsPrimitive.WriteIpv4Network(os,this->_dst,sizeof(this->_dst));
-- os.write(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-+ os.write((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
- return(os);
- }
-
diff --git a/net/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh b/net/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh
deleted file mode 100644
index d3e1118f829d..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- classes/include/CflowdRawFlowLogger.hh.orig Fri Aug 29 21:59:45 2003
-+++ classes/include/CflowdRawFlowLogger.hh Fri Aug 29 22:00:04 2003
-@@ -42,6 +42,8 @@
- #ifndef _CFLOWDRAWFLOWLOGGER_HH_
- #define _CFLOWDRAWFLOWLOGGER_HH_
-
-+using namespace std;
-+
- //---------------------------------------------------------------------------
- // class CflowdRawFlowLogger
- //---------------------------------------------------------------------------
diff --git a/net/cflowd/files/patch-classes::include::CflowdVersion.hh b/net/cflowd/files/patch-classes::include::CflowdVersion.hh
deleted file mode 100644
index b5352ae38c19..000000000000
--- a/net/cflowd/files/patch-classes::include::CflowdVersion.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdVersion.hh.orig Fri Aug 29 22:04:44 2003
-+++ classes/include/CflowdVersion.hh Fri Aug 29 22:04:56 2003
-@@ -42,6 +42,7 @@
- #ifndef _CFLOWDVERSION_HH_
- #define _CFLOWDVERSION_HH_
-
-+using namespace std;
- #include <string>
-
- //---------------------------------------------------------------------------
diff --git a/net/cflowd/files/patch-classes::src::CflowdCisco.cc b/net/cflowd/files/patch-classes::src::CflowdCisco.cc
deleted file mode 100644
index ea5de5ca0d1f..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdCisco.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- classes/src/CflowdCisco.cc.orig Fri Aug 29 21:02:38 2003
-+++ classes/src/CflowdCisco.cc Fri Aug 29 21:12:30 2003
-@@ -699,22 +699,22 @@
- engineIter != this->FlowEngines().end(); engineIter++) {
- for (uint8_t aggMethod = 0; aggMethod <= k_CiscoV8FlowExportMaxAggType;
- aggMethod++) {
-- if ((*engineIter).second.MissedFlows(aggMethod) >
-+ if ((*engineIter).second.MissedFlows((char)aggMethod) >
- this->_missedFlowsThreshold) {
- struct in_addr addrIn;
- addrIn.s_addr = this->IpAddress();
-- uint64_t totalFlows = ((*engineIter).second.MissedFlows(aggMethod) +
-- (*engineIter).second.FlowsReceived(aggMethod));
-+ uint64_t totalFlows = ((*engineIter).second.MissedFlows((char)aggMethod) +
-+ (*engineIter).second.FlowsReceived((char)aggMethod));
- syslog(LOG_INFO,
- "[I] missed %u of %u flows from %s"
- " engine %d agg_method %d (%g%% loss)",
-- (*engineIter).second.MissedFlows(aggMethod),
-+ (*engineIter).second.MissedFlows((char)aggMethod),
- totalFlows,
- inet_ntoa(addrIn),
- (*engineIter).first,
- aggMethod,
-- ((*engineIter).second.MissedFlows(aggMethod) * 100.0) /
-- totalFlows);
-+ ((*engineIter).second.MissedFlows((char)(aggMethod) * 100.0) /
-+ totalFlows));
- }
- (*engineIter).second.MissedFlows(0,aggMethod);
- (*engineIter).second.FlowsReceived(0,aggMethod);
diff --git a/net/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc b/net/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc
deleted file mode 100644
index 06aa42814714..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- classes/src/CflowdCiscoFlowEngine.cc.orig Fri Aug 29 21:13:33 2003
-+++ classes/src/CflowdCiscoFlowEngine.cc Fri Aug 29 21:17:18 2003
-@@ -43,6 +43,7 @@
- #include "caida_t.h"
- }
-
-+using namespace std;
- #include <string>
-
- #include "CflowdCiscoFlowEngine.hh"
-@@ -58,7 +59,7 @@
- //-------------------------------------------------------------------------
- uint32_t CflowdCiscoFlowEngine::SequenceNumber(uint32_t seqNumber,
- uint16_t flowCount,
-- uint8_t aggMethod = 0)
-+ uint8_t aggMethod )
- {
- if (aggMethod > k_CiscoV8FlowExportMaxAggType) {
- syslog(LOG_ERR,
diff --git a/net/cflowd/files/patch-classes::src::CflowdCiscoMap.cc b/net/cflowd/files/patch-classes::src::CflowdCiscoMap.cc
deleted file mode 100644
index 33f4f19ba9d4..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdCiscoMap.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- classes/src/CflowdCiscoMap.cc.orig Fri Aug 29 21:26:58 2003
-+++ classes/src/CflowdCiscoMap.cc Fri Aug 29 21:28:13 2003
-@@ -39,6 +39,7 @@
- // info@caida.org
- //===========================================================================
-
-+using namespace std;
- #include <string>
- #include <vector>
-
-@@ -112,7 +113,7 @@
- }
-
- numCiscos = htonl(numCiscos);
-- os.write(&numCiscos,sizeof(numCiscos));
-+ os.write((char *)&numCiscos,sizeof(numCiscos));
-
- for (ciscomIter = (*this).begin(); ciscomIter != (*this).end();
- ciscomIter++) {
diff --git a/net/cflowd/files/patch-classes::src::CflowdCollector.cc b/net/cflowd/files/patch-classes::src::CflowdCollector.cc
deleted file mode 100644
index 736a89066122..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdCollector.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/CflowdCollector.cc.orig Fri Aug 29 21:47:25 2003
-+++ classes/src/CflowdCollector.cc Fri Aug 29 21:47:36 2003
-@@ -39,6 +39,7 @@
- // info@caida.org
- //===========================================================================
-
-+using namespace std;
- #include <string>
-
- #include "CflowdCollector.hh"
diff --git a/net/cflowd/files/patch-classes::src::CflowdNextHopTable.cc b/net/cflowd/files/patch-classes::src::CflowdNextHopTable.cc
deleted file mode 100644
index 87dce681b4f1..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdNextHopTable.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- classes/src/CflowdNextHopTable.cc.orig Fri Aug 29 21:52:18 2003
-+++ classes/src/CflowdNextHopTable.cc Fri Aug 29 21:53:26 2003
-@@ -82,11 +82,11 @@
- (*this).erase((*this).begin(),(*this).end());
- }
-
-- is.read(&numNextHops,sizeof(numNextHops));
-+ is.read((char *)&numNextHops,sizeof(numNextHops));
- numNextHops = ntohl(numNextHops);
-
- for (nextHopNum = 0; nextHopNum < numNextHops; nextHopNum++) {
-- is.read(&nextHop,sizeof(nextHop));
-+ is.read((char *)&nextHop,sizeof(nextHop));
- nextHopTraffic.read(is);
- (*this)[nextHop] = nextHopTraffic;
- }
-@@ -154,12 +154,12 @@
-
- numNextHops = (*this).size();
- numNextHops = htonl(numNextHops);
-- os.write(&numNextHops,sizeof(numNextHops));
-+ os.write((char *)&numNextHops,sizeof(numNextHops));
-
- for (nextHopIter = (*this).begin(); nextHopIter != (*this).end();
- nextHopIter++) {
- nextHop = (*nextHopIter).first;
-- os.write(&nextHop,sizeof(nextHop));
-+ os.write((char *)&nextHop,sizeof(nextHop));
- (*nextHopIter).second.write(os);
- }
- return(os);
diff --git a/net/cflowd/files/patch-classes::src::CflowdPacketQueue.cc b/net/cflowd/files/patch-classes::src::CflowdPacketQueue.cc
deleted file mode 100644
index d60c99e2a6b0..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdPacketQueue.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- classes/src/CflowdPacketQueue.cc.orig Fri Aug 29 21:54:26 2003
-+++ classes/src/CflowdPacketQueue.cc Fri Aug 29 21:58:48 2003
-@@ -54,6 +54,7 @@
- #include <syslog.h>
- #include <assert.h>
-
-+using namespace std;
- #include "caida_t.h"
- #include "CflowdFlowPdu.h"
-
-@@ -401,7 +402,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int CflowdPacketQueue::GetLock(uint8_t bufNum = 0xff)
-+int CflowdPacketQueue::GetLock(uint8_t bufNum)
- {
- if (bufNum == 0xff)
- bufNum = this->_currentBuffer;
-@@ -424,7 +425,7 @@
- //.........................................................................
- //
- //-------------------------------------------------------------------------
--int CflowdPacketQueue::ReleaseLock(uint8_t bufNum = 0xff)
-+int CflowdPacketQueue::ReleaseLock(uint8_t bufNum)
- {
- if (bufNum == 0xff)
- bufNum = this->_currentBuffer;
diff --git a/net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc b/net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc
deleted file mode 100644
index e9c91b97b5c6..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- classes/src/CflowdProtocolTable.cc.orig Fri Aug 29 20:37:48 2003
-+++ classes/src/CflowdProtocolTable.cc Fri Aug 29 20:39:55 2003
-@@ -82,9 +82,9 @@
- (*this).erase((*this).begin(),(*this).end());
- }
-
-- is.read(&numProtocols,sizeof(numProtocols));
-+ is.read((char *)&numProtocols,sizeof(numProtocols));
- for (protocolNum = 0; protocolNum < numProtocols; protocolNum++) {
-- is.read(&protocol,sizeof(protocol));
-+ is.read((char *)&protocol,sizeof(protocol));
- protoTraffic.read(is);
- (*this)[protocol] = protoTraffic;
- }
-@@ -151,11 +151,11 @@
- CflowdProtocolTable::const_iterator protoIter;
-
- numProtocols = (*this).size();
-- os.write(&numProtocols,sizeof(numProtocols));
-+ os.write((char *)&numProtocols,sizeof(numProtocols));
-
- for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
- protocol = (*protoIter).first;
-- os.write(&protocol,sizeof(protocol));
-+ os.write((const char *)&protocol,sizeof(protocol));
- (*protoIter).second.write(os);
- }
- return(os);
diff --git a/net/cflowd/files/patch-classes::src::CflowdRawFlow.cc b/net/cflowd/files/patch-classes::src::CflowdRawFlow.cc
deleted file mode 100644
index 85b4536529e8..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdRawFlow.cc
+++ /dev/null
@@ -1,200 +0,0 @@
---- classes/src/CflowdRawFlow.cc.orig Fri Aug 29 21:18:36 2003
-+++ classes/src/CflowdRawFlow.cc Fri Aug 29 21:22:55 2003
-@@ -44,6 +44,7 @@
- #include <string.h>
- }
-
-+using namespace std;
- #include <string>
-
- #include "CflowdRawFlow.hh"
-@@ -336,82 +337,82 @@
-
- this->data._isHostOrder = false;
-
-- is.read(&(this->data._index),sizeof(this->data._index));
-+ is.read((char *)&(this->data._index),sizeof(this->data._index));
- if (! is)
- return(is);
- flowIndex = ntohl(this->data._index);
-
- if (flowIndex & CflowdRawFlow::k_routerMask) {
-- is.read(&(this->data._router),sizeof(this->data._router));
-+ is.read((char *)&(this->data._router),sizeof(this->data._router));
- }
- if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) {
-- is.read(&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr));
-+ is.read((char *)&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr));
- }
- if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) {
-- is.read(&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr));
-+ is.read((char *)&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr));
- }
- if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) {
-- is.read(&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex));
-+ is.read((char *)&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex));
- }
- if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) {
-- is.read(&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex));
-+ is.read((char *)&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex));
- }
- if (flowIndex & CflowdRawFlow::k_srcPortMask) {
-- is.read(&(this->data._srcPort),sizeof(this->data._srcPort));
-+ is.read((char *)&(this->data._srcPort),sizeof(this->data._srcPort));
- }
- if (flowIndex & CflowdRawFlow::k_dstPortMask) {
-- is.read(&(this->data._dstPort),sizeof(this->data._dstPort));
-+ is.read((char *)&(this->data._dstPort),sizeof(this->data._dstPort));
- }
- if (flowIndex & CflowdRawFlow::k_pktsMask) {
-- is.read(&(this->data._pkts),sizeof(this->data._pkts));
-+ is.read((char *)&(this->data._pkts),sizeof(this->data._pkts));
- }
- if (flowIndex & CflowdRawFlow::k_bytesMask) {
-- is.read(&(this->data._bytes),sizeof(this->data._bytes));
-+ is.read((char *)&(this->data._bytes),sizeof(this->data._bytes));
- }
- if (flowIndex & CflowdRawFlow::k_ipNextHopMask) {
-- is.read(&(this->data._ipNextHop),sizeof(this->data._ipNextHop));
-+ is.read((char *)&(this->data._ipNextHop),sizeof(this->data._ipNextHop));
- }
- if (flowIndex & CflowdRawFlow::k_startTimeMask) {
-- is.read(&(this->data._startTime),sizeof(this->data._startTime));
-+ is.read((char *)&(this->data._startTime),sizeof(this->data._startTime));
- }
- if (flowIndex & CflowdRawFlow::k_endTimeMask) {
-- is.read(&(this->data._endTime),sizeof(this->data._endTime));
-+ is.read((char *)&(this->data._endTime),sizeof(this->data._endTime));
- }
- if (flowIndex & CflowdRawFlow::k_protocolMask) {
-- is.read(&(this->data._protocol),sizeof(this->data._protocol));
-+ is.read((char *)&(this->data._protocol),sizeof(this->data._protocol));
- }
- if (flowIndex & CflowdRawFlow::k_tosMask) {
-- is.read(&(this->data._tos),sizeof(this->data._tos));
-+ is.read((char *)&(this->data._tos),sizeof(this->data._tos));
- }
- if (flowIndex & CflowdRawFlow::k_srcAsMask) {
-- is.read(&(this->data._srcAs),sizeof(this->data._srcAs));
-+ is.read((char *)&(this->data._srcAs),sizeof(this->data._srcAs));
- }
- if (flowIndex & CflowdRawFlow::k_dstAsMask) {
-- is.read(&(this->data._dstAs),sizeof(this->data._dstAs));
-+ is.read((char *)&(this->data._dstAs),sizeof(this->data._dstAs));
- }
- if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) {
-- is.read(&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen));
-+ is.read((char *)&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen));
- }
- if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) {
-- is.read(&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen));
-+ is.read((char *)&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen));
- }
- if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) {
-- is.read(&(this->data._tcpFlags),sizeof(this->data._tcpFlags));
-+ is.read((char *)&(this->data._tcpFlags),sizeof(this->data._tcpFlags));
- }
- if (flowIndex & CflowdRawFlow::k_inputEncapMask) {
-- is.read(&(this->data._inputEncap),sizeof(this->data._inputEncap));
-+ is.read((char *)&(this->data._inputEncap),sizeof(this->data._inputEncap));
- }
- if (flowIndex & CflowdRawFlow::k_outputEncapMask) {
-- is.read(&(this->data._outputEncap),sizeof(this->data._outputEncap));
-+ is.read((char *)&(this->data._outputEncap),sizeof(this->data._outputEncap));
- }
- if (flowIndex & CflowdRawFlow::k_peerNextHopMask) {
-- is.read(&(this->data._peerNextHop),sizeof(this->data._peerNextHop));
-+ is.read((char *)&(this->data._peerNextHop),sizeof(this->data._peerNextHop));
- }
- if (flowIndex & CflowdRawFlow::k_engineTypeMask) {
-- is.read(&(this->data._engineType),sizeof(this->data._engineType));
-+ is.read((char *)&(this->data._engineType),sizeof(this->data._engineType));
- }
- if (flowIndex & CflowdRawFlow::k_engineIdMask) {
-- is.read(&(this->data._engineId),sizeof(this->data._engineId));
-+ is.read((char *)&(this->data._engineId),sizeof(this->data._engineId));
- }
-
- // convert to host byte order
-@@ -982,56 +983,56 @@
-
- rawFlow.ToNetworkByteOrder();
-
-- os.write(&(dataPtr->_index),sizeof(dataPtr->_index));
-+ os.write((char *)&(dataPtr->_index),sizeof(dataPtr->_index));
-
- if (flowIndex & CflowdRawFlow::k_routerMask)
-- os.write(&(dataPtr->_router),sizeof(dataPtr->_router));
-+ os.write((char *)&(dataPtr->_router),sizeof(dataPtr->_router));
- if (flowIndex & CflowdRawFlow::k_srcIpAddrMask)
-- os.write(&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr));
-+ os.write((char *)&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr));
- if (flowIndex & CflowdRawFlow::k_dstIpAddrMask)
-- os.write(&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr));
-+ os.write((char *)&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr));
- if (flowIndex & CflowdRawFlow::k_inputIfIndexMask)
-- os.write(&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex));
-+ os.write((char *)&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex));
- if (flowIndex & CflowdRawFlow::k_outputIfIndexMask)
-- os.write(&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex));
-+ os.write((char *)&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex));
- if (flowIndex & CflowdRawFlow::k_srcPortMask)
-- os.write(&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort));
-+ os.write((char *)&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort));
- if (flowIndex & CflowdRawFlow::k_dstPortMask)
-- os.write(&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort));
-+ os.write((char *)&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort));
- if (flowIndex & CflowdRawFlow::k_pktsMask)
-- os.write(&(dataPtr->_pkts),sizeof(dataPtr->_pkts));
-+ os.write((char *)&(dataPtr->_pkts),sizeof(dataPtr->_pkts));
- if (flowIndex & CflowdRawFlow::k_bytesMask)
-- os.write(&(dataPtr->_bytes),sizeof(dataPtr->_bytes));
-+ os.write((char *)&(dataPtr->_bytes),sizeof(dataPtr->_bytes));
- if (flowIndex & CflowdRawFlow::k_ipNextHopMask)
-- os.write(&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop));
-+ os.write((char *)&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop));
- if (flowIndex & CflowdRawFlow::k_startTimeMask)
-- os.write(&(dataPtr->_startTime),sizeof(dataPtr->_startTime));
-+ os.write((char *)&(dataPtr->_startTime),sizeof(dataPtr->_startTime));
- if (flowIndex & CflowdRawFlow::k_endTimeMask)
-- os.write(&(dataPtr->_endTime),sizeof(dataPtr->_endTime));
-+ os.write((char *)&(dataPtr->_endTime),sizeof(dataPtr->_endTime));
- if (flowIndex & CflowdRawFlow::k_protocolMask)
-- os.write(&(dataPtr->_protocol),sizeof(dataPtr->_protocol));
-+ os.write((char *)&(dataPtr->_protocol),sizeof(dataPtr->_protocol));
- if (flowIndex & CflowdRawFlow::k_tosMask)
-- os.write(&(dataPtr->_tos),sizeof(dataPtr->_tos));
-+ os.write((char *)&(dataPtr->_tos),sizeof(dataPtr->_tos));
- if (flowIndex & CflowdRawFlow::k_srcAsMask)
-- os.write(&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs));
-+ os.write((char *)&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs));
- if (flowIndex & CflowdRawFlow::k_dstAsMask)
-- os.write(&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs));
-+ os.write((char *)&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs));
- if (flowIndex & CflowdRawFlow::k_srcMaskLenMask)
-- os.write(&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen));
-+ os.write((char *)&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen));
- if (flowIndex & CflowdRawFlow::k_dstMaskLenMask)
-- os.write(&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen));
-+ os.write((char *)&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen));
- if (flowIndex & CflowdRawFlow::k_tcpFlagsMask)
-- os.write(&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags));
-+ os.write((char *)&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags));
- if (flowIndex & CflowdRawFlow::k_inputEncapMask)
-- os.write(&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap));
-+ os.write((char *)&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap));
- if (flowIndex & CflowdRawFlow::k_outputEncapMask)
-- os.write(&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap));
-+ os.write((char *)&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap));
- if (flowIndex & CflowdRawFlow::k_peerNextHopMask)
-- os.write(&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop));
-+ os.write((char *)&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop));
- if (flowIndex & CflowdRawFlow::k_engineTypeMask)
-- os.write(&(dataPtr->_engineType),sizeof(dataPtr->_engineType));
-+ os.write((char *)&(dataPtr->_engineType),sizeof(dataPtr->_engineType));
- if (flowIndex & CflowdRawFlow::k_engineIdMask)
-- os.write(&(dataPtr->_engineId),sizeof(dataPtr->_engineId));
-+ os.write((char *)&(dataPtr->_engineId),sizeof(dataPtr->_engineId));
-
- return(os);
- }
diff --git a/net/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc b/net/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc
deleted file mode 100644
index d9880ef1758e..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/CflowdRawFlowConverter.cc.orig Fri Aug 29 21:24:00 2003
-+++ classes/src/CflowdRawFlowConverter.cc Fri Aug 29 21:24:16 2003
-@@ -43,6 +43,7 @@
- #include <assert.h>
- }
-
-+using namespace std;
- #include <string>
-
- #include "CflowdRawFlowConverter.hh"
diff --git a/net/cflowd/files/patch-classes::src::CflowdTosTable.cc b/net/cflowd/files/patch-classes::src::CflowdTosTable.cc
deleted file mode 100644
index 4ac063a72e69..000000000000
--- a/net/cflowd/files/patch-classes::src::CflowdTosTable.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- classes/src/CflowdTosTable.cc.orig Fri Aug 29 22:01:28 2003
-+++ classes/src/CflowdTosTable.cc Fri Aug 29 22:01:52 2003
-@@ -82,9 +82,9 @@
- (*this).erase((*this).begin(),(*this).end());
- }
-
-- is.read(&numToss,sizeof(numToss));
-+ is.read((char *)&numToss,sizeof(numToss));
- for (tosNum = 0; tosNum < numToss; tosNum++) {
-- is.read(&tos,sizeof(tos));
-+ is.read((char *)&tos,sizeof(tos));
- protoTraffic.read(is);
- (*this)[tos] = protoTraffic;
- }
-@@ -151,11 +151,11 @@
- CflowdTosTable::const_iterator protoIter;
-
- numToss = (*this).size();
-- os.write(&numToss,sizeof(numToss));
-+ os.write((char *)&numToss,sizeof(numToss));
-
- for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
- tos = (*protoIter).first;
-- os.write(&tos,sizeof(tos));
-+ os.write((char *)&tos,sizeof(tos));
- (*protoIter).second.write(os);
- }
- return(os);
diff --git a/net/cflowd/files/patch-classes::src::FlowFilter.y b/net/cflowd/files/patch-classes::src::FlowFilter.y
deleted file mode 100644
index 19f5a595becd..000000000000
--- a/net/cflowd/files/patch-classes::src::FlowFilter.y
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/FlowFilter.y.orig Fri Aug 29 22:08:43 2003
-+++ classes/src/FlowFilter.y Fri Aug 29 22:08:51 2003
-@@ -42,6 +42,7 @@
-
- #include <math.h>
-
-+ using namespace std;
- #include <string>
-
- #include "CflowdRawFlow.hh"
diff --git a/net/cflowd/files/patch-classes::src::Signal.cc b/net/cflowd/files/patch-classes::src::Signal.cc
deleted file mode 100644
index aafc0dc77f59..000000000000
--- a/net/cflowd/files/patch-classes::src::Signal.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/Signal.cc.orig Fri Aug 29 21:25:46 2003
-+++ classes/src/Signal.cc Fri Aug 29 21:25:16 2003
-@@ -8,6 +8,7 @@
- #include <string.h>
- }
-
-+using namespace std;
- #include <string>
- #include "Signal.hh"
-
diff --git a/net/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h b/net/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h
deleted file mode 100644
index cabe6ec2fd5c..000000000000
--- a/net/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- snmp++/classes/include/snmp++/oid.h.orig Fri Aug 29 20:00:24 2003
-+++ snmp++/classes/include/snmp++/oid.h Fri Aug 29 20:00:41 2003
-@@ -57,6 +57,7 @@
- #include <string.h> // strlen, etc..
- }
-
-+using namespace std;
- #include <vector>
-
- #include "smival.h" // derived class for all values
diff --git a/net/cflowd/pkg-descr b/net/cflowd/pkg-descr
deleted file mode 100644
index 0d330ecd991a..000000000000
--- a/net/cflowd/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-cflowd is a flow analysis tool currently used for analyzing Cisco's
-NetFlow enabled switching method.
-
-The current release includes the collections, storage, and basic
-analysis modules for cflowd and for arts++ libraries.
-
-This analysis package permits data collection and analysis by ISPs
-and network engineers in support of capacity planning, trends analysis,
-and characterization of workloads in a network service provider environment.
-
-Other areas where cflowd may prove useful include usage tracking for Web
-hosting, accounting and billing, network planning and analysis, network
-monitoring, developing user profiles, data warehousing and mining,
-as well as security-related investigations.
-
-WWW: http://www.caida.org/tools/measurement/cflowd/
diff --git a/net/cflowd/pkg-plist b/net/cflowd/pkg-plist
deleted file mode 100644
index 60e4ad377a61..000000000000
--- a/net/cflowd/pkg-plist
+++ /dev/null
@@ -1,92 +0,0 @@
-bin/cfdases
-bin/cfdifmatrix
-bin/cfdnets
-bin/cfdnexthops
-bin/cfdportmatrix
-bin/cfdprotos
-bin/cfdtos
-bin/flowdump
-bin/flowwatch
-etc/cfdcollect.conf.example
-etc/cflowd.conf.example
-etc/rc.d/cflowd-base.sh.sample
-include/cflowd/CflowdAsMatrix.hh
-include/cflowd/CflowdAsMatrixKey.hh
-include/cflowd/CflowdAsMatrixTrafficCounter.hh
-include/cflowd/CflowdCisco.hh
-include/cflowd/CflowdCiscoFlowEngine.hh
-include/cflowd/CflowdCiscoFlowEngineMap.hh
-include/cflowd/CflowdCiscoFlowInterface.hh
-include/cflowd/CflowdCiscoFlowInterfaceMap.hh
-include/cflowd/CflowdCiscoMap.hh
-include/cflowd/CflowdCollector.hh
-include/cflowd/CflowdCollectorMap.hh
-include/cflowd/CflowdConfig.hh
-include/cflowd/CflowdConfigLex.hh
-include/cflowd/CflowdFlowFilter.hh
-include/cflowd/CflowdFlowPdu.h
-include/cflowd/CflowdFlowPortList.hh
-include/cflowd/CflowdInterfaceInfo.hh
-include/cflowd/CflowdInterfaceMatrix.hh
-include/cflowd/CflowdInterfaceMatrixKey.hh
-include/cflowd/CflowdInterfaceMatrixTrafficCounter.hh
-include/cflowd/CflowdNetMatrix.hh
-include/cflowd/CflowdNetMatrixKey.hh
-include/cflowd/CflowdNetMatrixTrafficCounter.hh
-include/cflowd/CflowdNextHopTable.hh
-include/cflowd/CflowdNextHopTableTrafficCounter.hh
-include/cflowd/CflowdPacketQueue.hh
-include/cflowd/CflowdPortMatrix.hh
-include/cflowd/CflowdPortMatrixKey.hh
-include/cflowd/CflowdPortMatrixTrafficCounter.hh
-include/cflowd/CflowdProtocolTable.hh
-include/cflowd/CflowdProtocolTableTrafficCounter.hh
-include/cflowd/CflowdRawFlow.hh
-include/cflowd/CflowdRawFlowConverter.hh
-include/cflowd/CflowdRawFlowLogger.hh
-include/cflowd/CflowdTableRequest.hh
-include/cflowd/CflowdTosTable.hh
-include/cflowd/CflowdUint16Uint16Key.hh
-include/cflowd/CflowdUint64TrafficCounter.hh
-include/cflowd/CflowdVersion.hh
-include/cflowd/snmp++/address.h
-include/cflowd/snmp++/asn1.h
-include/cflowd/snmp++/collect.h
-include/cflowd/snmp++/counter.h
-include/cflowd/snmp++/ctr64.h
-include/cflowd/snmp++/eventlist.h
-include/cflowd/snmp++/gauge.h
-include/cflowd/snmp++/integer.h
-include/cflowd/snmp++/msec.h
-include/cflowd/snmp++/msgqueue.h
-include/cflowd/snmp++/notifyqueue.h
-include/cflowd/snmp++/octet.h
-include/cflowd/snmp++/oid.h
-include/cflowd/snmp++/oid_def.h
-include/cflowd/snmp++/pdu.h
-include/cflowd/snmp++/smi.h
-include/cflowd/snmp++/smival.h
-include/cflowd/snmp++/snmp_pp.h
-include/cflowd/snmp++/snmperrs.h
-include/cflowd/snmp++/snmpmsg.h
-include/cflowd/snmp++/target.h
-include/cflowd/snmp++/timetick.h
-include/cflowd/snmp++/userdefined.h
-include/cflowd/snmp++/usertimeout.h
-include/cflowd/snmp++/vb.h
-lib/cflowd/libCfd.a
-lib/cflowd/libCfd.la
-lib/cflowd/libCfd.so
-lib/cflowd/libCfd.so.0
-lib/cflowd/libsnmp++.a
-lib/cflowd/libsnmp++.la
-lib/cflowd/libsnmp++.so
-lib/cflowd/libsnmp++.so.0
-sbin/cfdcollect
-sbin/cflowd
-sbin/cflowdmux
-@dirrm include/cflowd/snmp++
-@dirrm include/cflowd
-@dirrm lib/cflowd
-@unexec /usr/bin/env /sbin/ldconfig -R
-@exec /usr/bin/env /sbin/ldconfig -m %B
diff --git a/net/choparp/distinfo b/net/choparp/distinfo
deleted file mode 100644
index 49bd2d2d8ee6..000000000000
--- a/net/choparp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (choparp-20021107.tar.gz) = 0f8297f8b233554050e0ab00f3069a21
-SIZE (choparp-20021107.tar.gz) = 6687
diff --git a/net/choparp/files/patch-ab b/net/choparp/files/patch-ab
deleted file mode 100644
index 5cb299411e3b..000000000000
--- a/net/choparp/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- /dev/null Tue Oct 7 23:33:35 1997
-+++ Makefile Tue Oct 7 23:42:51 1997
-@@ -0,0 +1,8 @@
-+PROG= choparp
-+MAN8= choparp.8
-+
-+DESTDIR=${PREFIX}
-+BINDIR= /sbin
-+MANDIR= /man/man
-+
-+.include <bsd.prog.mk>
diff --git a/net/choparp/files/patch-choparp.8 b/net/choparp/files/patch-choparp.8
deleted file mode 100644
index f1b7ab7c10dd..000000000000
--- a/net/choparp/files/patch-choparp.8
+++ /dev/null
@@ -1,52 +0,0 @@
---- choparp.8.orig Fri Feb 13 20:28:33 2004
-+++ choparp.8 Fri Feb 13 20:30:23 2004
-@@ -34,7 +34,7 @@
- .Nm choparp
- .Nd cheap and omitted proxy ARP
- .Sh SYNOPSIS
--.Nm chpoarp
-+.Nm choparp
- .Ar if_name mac_addr
- .Oo Fl Oc Ns Ar net_addr Ns
- .Op / Ns Ar net_mask
-@@ -42,7 +42,7 @@
- .Sh DESCRIPTION
- .Pp
- .Nm choparp
--is a easy-to-use proxy ARP daemon.
-+is an easy-to-use proxy ARP daemon.
- It watches ARP request packets visible on the interface specified by argument
- .Ar if_name ,
- and sends proxy ARP reply to the sender if the ARP request queries the
-@@ -52,7 +52,7 @@
- .Ar net_addr Ns / Ar net_mask .
- .Pp
- .Ar mac_addr
--is th MAC address to be published for the specified hosts.
-+is the MAC address to be published for the specified hosts.
- It is normally the address of
- .Ar if_name .
- The format of
-@@ -72,7 +72,7 @@
- .Dq 0x
- .Pq for example Ad 0x858a0186 .
- .Ar net_mask
--can likewise be speficied as a dotted quad or hexadecimal value,
-+can likewise be specified as a dotted quad or hexadecimal value,
- or alternatively as a mask length. The following address specifications
- are therefore equivalent:
- .Bl -item -offset indent
-@@ -89,6 +89,13 @@
- .Em excluded
- by preceding them with
- .Fl
-+.Pp
-+.Nm choparp
-+uses the Berkeley Packet Filter
-+.Nm bpf(4)
-+and so the kernel must be compiled with support for the
-+.Nm bpf
-+device.
- .Sh EXAMPLES
- If you have network interface
- .Dq ne0
diff --git a/net/choparp/files/patch-choparp.c b/net/choparp/files/patch-choparp.c
deleted file mode 100644
index 7032650e038b..000000000000
--- a/net/choparp/files/patch-choparp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- choparp.c.orig Fri Feb 13 20:27:14 2004
-+++ choparp.c Fri Feb 13 20:27:51 2004
-@@ -437,6 +437,9 @@
- #endif
- if ((fd = openbpf(ifname, &buf, &buflen)) < 0)
- return(-1);
-+ #ifndef DEBUG
-+ daemon(0, 0);
-+ #endif
- loop(fd, buf, buflen);
- return(-1);
- }
diff --git a/net/choparp/pkg-descr b/net/choparp/pkg-descr
deleted file mode 100644
index ff7cecfd5b23..000000000000
--- a/net/choparp/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-choparp is a easy-to-use proxy arp daemon. It watches arp request pack-
-ets visible on the interface specified by argument if_name, and sends
-proxy arp reply to the sender if the arp request queries the MAC address
-(ethernet hardware address) for the network speicified by net_addr and
-net_mask.
-
-WWW: http://sourceforge.net/projects/choparp/
diff --git a/net/cidr/distinfo b/net/cidr/distinfo
deleted file mode 100644
index 00c902052a58..000000000000
--- a/net/cidr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cidr-current.tar.gz) = b349453a0196fddd3ffa0af5fbbacf54
diff --git a/net/cidr/files/patch-aa b/net/cidr/files/patch-aa
deleted file mode 100644
index 5434f36f13cb..000000000000
--- a/net/cidr/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig Fri Jul 20 11:11:34 2001
-+++ Makefile Sat May 18 04:21:47 2002
-@@ -1,9 +1,8 @@
- VERSION=2.3.2
- RELEASE=1
-
--CC=gcc
- STRIP=strip
--CCFLAGS=-Wall
-+CCFLAGS= $(CFLAGS)
-
- SOL7FLAGS=-lsocket -lnsl
- SOL8FLAGS=-lresolv -lnsl
-@@ -13,15 +12,12 @@
-
- all :
- $(CC) $(CCFLAGS) cidr.c -o cidr
-- $(STRIP) cidr
-
- solaris8:
- $(CC) $(CCFLAGS) $(SOL8FLAGS) cidr.c -o cidr
-- $(STRIP) cidr
-
- solaris7:
- $(CC) $(CCFLAGS) $(SOL7FLAGS) cidr.c -o cidr
-- $(STRIP) cidr
-
- clean:
- rm -f cidr cidr.o \
diff --git a/net/cidr/pkg-descr b/net/cidr/pkg-descr
deleted file mode 100644
index 24725bf475fe..000000000000
--- a/net/cidr/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-cidr is a tiny command-line tool for determining network and broadcast
-addresses a la RFC 1878. It takes an IP address and netmask and
-outputs the network address, broadcast address, and total number of
-addresses for the corresponding subnet. The IP can be in binary,
-decimal, hex, or dotted quad. The mask can be in binary, decimal, hex,
-dotted quad, or prefix.
-
-WWW: http://geeksoul.com/robert/cidr.html
diff --git a/net/cisco_conf/distinfo b/net/cisco_conf/distinfo
deleted file mode 100644
index 3d7728583465..000000000000
--- a/net/cisco_conf/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cisco_conf/ciscoconf-1.1.tar.gz) = 97c483282ac6afd88d3fc4334c5326fb
diff --git a/net/cisco_conf/pkg-descr b/net/cisco_conf/pkg-descr
deleted file mode 100644
index 1085061c57f9..000000000000
--- a/net/cisco_conf/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is an interactive configuration editor for Cisco devices. It is based on
-joe editor's macros that let you load either running or startup configuration
-from a Cisco router/switch/access server directly into the editor and commit
-it back after modification.
-
-The CiscoConf program maintains the database of previous versions of startup
-and running configurations for each router in /var/db/CiscoConf. The
-number of versions to keep is specified in its configuration file.
-
-It also provides locking to prevent concurrent editing of the same
-configuration by more than one person.
-
-WWW: http://rnoc.urc.ac.ru/~anton/projects/ciscoconf/CiscoConf.html
diff --git a/net/cisco_conf/pkg-plist b/net/cisco_conf/pkg-plist
deleted file mode 100644
index 9d83e02c6471..000000000000
--- a/net/cisco_conf/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/ciscoconf/.joerc
-etc/ciscoconf/CiscoConf.conf.sample
-etc/ciscoconf/toggle_no.sed
-sbin/CiscoConf
-share/doc/ciscoconf/CiscoConf.html
-@dirrm etc/ciscoconf
-@dirrm share/doc/ciscoconf
-@cwd /
-@dirrm var/db/ciscoconf
diff --git a/net/ciscoconf/distinfo b/net/ciscoconf/distinfo
deleted file mode 100644
index 21d6bf376786..000000000000
--- a/net/ciscoconf/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ciscoconf-1.1.tar.gz) = b6b598c31b92209fdab99d56cdde2555
diff --git a/net/ciscoconf/pkg-descr b/net/ciscoconf/pkg-descr
deleted file mode 100644
index 71e121b1c896..000000000000
--- a/net/ciscoconf/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Ciscoconf automagically fetches configuration from Cisco routers whenever
-syslog indicates that a change has been made, and stores them under RCS.
-
-MORE INFORMATION
-
-For more information, or to foward comments or details of problems, please
-contact Joe Abley <jabley@automagic.org>.
diff --git a/net/ciscoconf/pkg-plist b/net/ciscoconf/pkg-plist
deleted file mode 100644
index 5d53dfb8e418..000000000000
--- a/net/ciscoconf/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ciscoconfd
-bin/ciscoconfr
-@dirrm share/cisco/RCS
-@dirrm share/cisco
diff --git a/net/clog/distinfo b/net/clog/distinfo
deleted file mode 100644
index e8722397edba..000000000000
--- a/net/clog/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (clog-1.6.tar.gz) = f8732ed25def0e4c56d8d5b8007b6074
diff --git a/net/clog/files/patch-clog.c b/net/clog/files/patch-clog.c
deleted file mode 100644
index dc6b5fa58a20..000000000000
--- a/net/clog/files/patch-clog.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- clog.c.orig Thu Aug 7 21:56:32 1997
-+++ clog.c Sun Mar 24 02:33:49 2002
-@@ -63,5 +63,5 @@
- /* some global variables (ugh!) */
- pcap_t *ip_socket;
--FILE *logfile = stdout;
-+FILE *logfile;
- int resolve = 0;
- int dlt_len = 4;
-@@ -92,4 +92,5 @@
- int c;
-
-+ logfile = stdout;
- opterr = 0;
- /* parse arguments */
diff --git a/net/clog/pkg-descr b/net/clog/pkg-descr
deleted file mode 100644
index 294c3921f98c..000000000000
--- a/net/clog/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-clog is a program that logs all connections on your subnet. It uses the
-pcap(3) packet capture library to log any SYN packets to a logfile. The
-output format is designed to be very easily parsed by various text
-processing tools.
-
-
--- David
- (obrien@NUXI.com)
diff --git a/net/clog/pkg-plist b/net/clog/pkg-plist
deleted file mode 100644
index b6ec57722f90..000000000000
--- a/net/clog/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-sbin/clog
diff --git a/net/confregdecode/distinfo b/net/confregdecode/distinfo
deleted file mode 100644
index b26497ff30af..000000000000
--- a/net/confregdecode/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (confregdecode-src-1.2.1.tar.gz) = 42d8bf2ad132a26ed79e98cb8d39f89d
diff --git a/net/confregdecode/files/confregdecode b/net/confregdecode/files/confregdecode
deleted file mode 100644
index bc401781ca8a..000000000000
--- a/net/confregdecode/files/confregdecode
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c)2000-2001 by MarcusCom, Inc. All rights reserved.
-# $Id: confregdecode.sh,v 1.3 2001/05/24 20:22:44 jmarcus Exp $
-#
-
-# Change this to your path to jre
-JRE=%%LOCALBASE%%/bin/javavm
-# End changeable things
-
-CLASSPATH=%%PREFIX%%/share/java/confregdecode.jar:${CLASSPATH}
-
-exec ${JRE} -classpath ${CLASSPATH} com.marcuscom.confregdecode.ConfregDecode
diff --git a/net/confregdecode/files/patch-ab b/net/confregdecode/files/patch-ab
deleted file mode 100644
index 892247713a88..000000000000
--- a/net/confregdecode/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig Fri Nov 28 21:00:51 2003
-+++ Makefile Fri Dec 19 01:31:42 2003
-@@ -3,17 +3,17 @@
- # $Id: Makefile,v 1.3 2003/11/29 01:41:36 jmarcus Exp $
- #
-
--JAVAC= /usr/local/jdk1.4.2/bin/javac
--JAVAC_FLAGS= -O -g
--JAR= /usr/local/jdk1.4.2/bin/jar
-+JAVAC?= /usr/local/jdk1.4.2/bin/javac
-+JAVAC_FLAGS?= -O -g
-+JAR?= /usr/local/jdk1.4.2/bin/jar
- RM= /bin/rm
-
- all:
- $(JAVAC) $(JAVAC_FLAGS) com/marcuscom/confregdecode/ConfregDecode.java
-
- jar: all
-- $(JAR) -cvf cd.jar com/marcuscom/confregdecode/*.class
-+ $(JAR) -cvf confregdecode.jar com/marcuscom/confregdecode/*.class
-
- clean:
- $(RM) -f com/marcuscom/confregdecode/*.class
-- $(RM) -f cd.jar
-+ $(RM) -f confregdecode.jar
diff --git a/net/confregdecode/pkg-descr b/net/confregdecode/pkg-descr
deleted file mode 100644
index 4ea83254177a..000000000000
--- a/net/confregdecode/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This is a Java applet and application that can encode and decode a Cisco
-router's configuration register.
-
-It also shows some valuable notes for each router family that can help
-with disaster recovery.
-
-It is being released as part of the Cisco-centric Open Source Initiative.
-
-WWW: http://cosi-nms.sourceforge.net/
diff --git a/net/confregdecode/pkg-plist b/net/confregdecode/pkg-plist
deleted file mode 100644
index edd59f8ca670..000000000000
--- a/net/confregdecode/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/confregdecode
-share/java/confregdecode.jar
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/ConfregDecode.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/cricket/distinfo b/net/cricket/distinfo
deleted file mode 100644
index 7b0447e786c8..000000000000
--- a/net/cricket/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (cricket-1.0.4.tar.gz) = d5098c6c4a4cf4566535fab5cd7e3bd9
-SIZE (cricket-1.0.4.tar.gz) = 394658
diff --git a/net/cricket/files/patch-cricket-conf.pl.sample b/net/cricket/files/patch-cricket-conf.pl.sample
deleted file mode 100644
index fbf2999a1eec..000000000000
--- a/net/cricket/files/patch-cricket-conf.pl.sample
+++ /dev/null
@@ -1,19 +0,0 @@
-*** cricket-conf.pl.sample.orig Wed Apr 10 00:28:27 2002
---- cricket-conf.pl.sample Wed Jun 5 19:29:38 2002
-***************
-*** 13,19 ****
- # $Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
- package Common::global;
-
-! $gCricketHome = "/home/cricket";
- $gInstallRoot = "$gCricketHome/cricket";
- #$gConfigRoot = "$gCricketHome/cricket-config";
-
---- 13,19 ----
- # $Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
- package Common::global;
-
-! $gCricketHome = "%%PREFIX%%/cricket";
- $gInstallRoot = "$gCricketHome/cricket";
- #$gConfigRoot = "$gCricketHome/cricket-config";
-
diff --git a/net/cricket/files/patch-sample-config::news-server::Defaults b/net/cricket/files/patch-sample-config::news-server::Defaults
deleted file mode 100644
index fa97de2b827e..000000000000
--- a/net/cricket/files/patch-sample-config::news-server::Defaults
+++ /dev/null
@@ -1,19 +0,0 @@
-*** sample-config/news-server/Defaults.orig Thu Oct 25 00:27:29 2001
---- sample-config/news-server/Defaults Wed Jun 5 16:55:45 2002
-***************
-*** 11,17 ****
- # you'll probably want to change this... unless you
- # have Cricket in ~/cricket and your config tree in ~/config
- util-dir = %auto-base%/../cricket/util
-! remexec = "/usr/local/net/bin/ssh -l %user% %server%"
- user = news
- server = nntp-host
- target-type = news-server
---- 11,17 ----
- # you'll probably want to change this... unless you
- # have Cricket in ~/cricket and your config tree in ~/config
- util-dir = %auto-base%/../cricket/util
-! remexec = "/usr/bin/ssh -l %user% %server%"
- user = news
- server = nntp-host
- target-type = news-server
diff --git a/net/cricket/files/pkg-message.in b/net/cricket/files/pkg-message.in
deleted file mode 100644
index a06d9e8828a8..000000000000
--- a/net/cricket/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Sample config installed at:
- %%PREFIX%%/etc/cricket-conf.pl.dist
-
-Cricket has been installed in %%PREFIX%%/cricket. You'll find
-executables and configfiles there. Please take a look at
-http://cricket.sourceforge.net/. The documentation can be
-found in %%PREFIX%%/cricket/cricket/doc/ too.
diff --git a/net/cricket/pkg-descr b/net/cricket/pkg-descr
deleted file mode 100644
index 5cd78bf82833..000000000000
--- a/net/cricket/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Cricket is a high performance, extremely flexible system for monitoring
-trends in time-series data. Cricket was expressly developed to help network
-managers visualize and understand the traffic on their networks, but it can
-be used all kinds of other jobs, as well.
-It's similar to mrtg, but has a different approach.
-
-WWW: http://cricket.sourceforge.net/
diff --git a/net/cricket/pkg-install b/net/cricket/pkg-install
deleted file mode 100644
index 3543dceea194..000000000000
--- a/net/cricket/pkg-install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
- exit 0
-fi
-
-USER=cricket
-#group selected to be www since the webserver has to be able to serve it
-GROUP=www
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
- if pw useradd ${USER} -g ${GROUP} -h - \
- -s "/sbin/nologin" -d "${PREFIX}/cricket" \
- -c "Cricket Monitoring Owner"; \
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
-fi
-exit 0
diff --git a/net/cricket/pkg-plist b/net/cricket/pkg-plist
deleted file mode 100644
index e0b9119f3dbd..000000000000
--- a/net/cricket/pkg-plist
+++ /dev/null
@@ -1,165 +0,0 @@
-cricket/cricket
-cricket/cricket-%%VERSION%%/CHANGES
-cricket/cricket-%%VERSION%%/COPYING
-cricket/cricket-%%VERSION%%/DEV-INFO
-cricket/cricket-%%VERSION%%/README
-cricket/cricket-%%VERSION%%/THANKS
-cricket/cricket-%%VERSION%%/TODO
-cricket/cricket-%%VERSION%%/VERSION
-cricket/cricket-%%VERSION%%/collect-subtrees
-cricket/cricket-%%VERSION%%/collector
-cricket/cricket-%%VERSION%%/collector_th
-cricket/cricket-%%VERSION%%/compile
-cricket/cricket-%%VERSION%%/configure
-cricket/cricket-%%VERSION%%/cricket-conf.pl.sample
-cricket/cricket-%%VERSION%%/doc/beginner.html
-cricket/cricket-%%VERSION%%/doc/copytosql.html
-cricket/cricket-%%VERSION%%/doc/cricket.sql
-cricket/cricket-%%VERSION%%/doc/gpl.html
-cricket/cricket-%%VERSION%%/doc/history.html
-cricket/cricket-%%VERSION%%/doc/index.html
-cricket/cricket-%%VERSION%%/doc/inst-mapping.html
-cricket/cricket-%%VERSION%%/doc/intro.html
-cricket/cricket-%%VERSION%%/doc/modperl.html
-cricket/cricket-%%VERSION%%/doc/monitor-thresholds.html
-cricket/cricket-%%VERSION%%/doc/neta-paper/fig1.gif
-cricket/cricket-%%VERSION%%/doc/neta-paper/fig2.gif
-cricket/cricket-%%VERSION%%/doc/neta-paper/paper.html
-cricket/cricket-%%VERSION%%/doc/neta-paper/paper.ps.gz
-cricket/cricket-%%VERSION%%/doc/neta-paper/peer1.gif
-cricket/cricket-%%VERSION%%/doc/neta-paper/peer2.gif
-cricket/cricket-%%VERSION%%/doc/neta-paper/ss.gif
-cricket/cricket-%%VERSION%%/doc/new-devices.html
-cricket/cricket-%%VERSION%%/doc/perfmon.html
-cricket/cricket-%%VERSION%%/doc/reference.html
-cricket/cricket-%%VERSION%%/doc/tools.html
-cricket/cricket-%%VERSION%%/doc/win2kw1.gif
-cricket/cricket-%%VERSION%%/doc/win2kwmi.html
-cricket/cricket-%%VERSION%%/grapher.cgi
-cricket/cricket-%%VERSION%%/images/cricket-sm.gif
-cricket/cricket-%%VERSION%%/images/failed.gif
-cricket/cricket-%%VERSION%%/images/rrdtool.gif
-cricket/cricket-%%VERSION%%/lib/Bundle/CricketPrereq.pm
-cricket/cricket-%%VERSION%%/lib/Common/HandleTarget.pm
-cricket/cricket-%%VERSION%%/lib/Common/Log.pm
-cricket/cricket-%%VERSION%%/lib/Common/Map.pm
-cricket/cricket-%%VERSION%%/lib/Common/Options.pm
-cricket/cricket-%%VERSION%%/lib/Common/Util.pm
-cricket/cricket-%%VERSION%%/lib/Common/Version.pm
-cricket/cricket-%%VERSION%%/lib/Common/global.pm
-cricket/cricket-%%VERSION%%/lib/ConfigTree/Cache.pm
-cricket/cricket-%%VERSION%%/lib/ConfigTree/Node.pm
-cricket/cricket-%%VERSION%%/lib/Monitor.pm
-cricket/cricket-%%VERSION%%/lib/RPN.pm
-cricket/cricket-%%VERSION%%/lib/RRD/File.pm
-cricket/cricket-%%VERSION%%/lib/RRD/Format.pm
-cricket/cricket-%%VERSION%%/lib/alternate/RRD/File.pm
-cricket/cricket-%%VERSION%%/lib/alternate/net-snmp/snmpUtils.pm
-cricket/cricket-%%VERSION%%/lib/exec.pm
-cricket/cricket-%%VERSION%%/lib/field.pm
-cricket/cricket-%%VERSION%%/lib/file.pm
-cricket/cricket-%%VERSION%%/lib/func.pm
-cricket/cricket-%%VERSION%%/lib/perfmon.pm
-cricket/cricket-%%VERSION%%/lib/snmp.pm
-cricket/cricket-%%VERSION%%/lib/snmpUtils.pm
-cricket/cricket-%%VERSION%%/lib/sql.pm
-cricket/cricket-%%VERSION%%/lib/sqlUtils.pm
-cricket/cricket-%%VERSION%%/lib/wbem.pm
-cricket/cricket-%%VERSION%%/mini-graph.cgi
-cricket/cricket-%%VERSION%%/sample-config/Defaults
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/Defaults
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc/Defaults
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc/interfaces
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni/Defaults
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni/interfaces
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks/Defaults
-cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks/interfaces
-cricket/cricket-%%VERSION%%/sample-config/http-performance/Defaults
-cricket/cricket-%%VERSION%%/sample-config/http-performance/urls
-cricket/cricket-%%VERSION%%/sample-config/news-server/Defaults
-cricket/cricket-%%VERSION%%/sample-config/news-server/targets
-cricket/cricket-%%VERSION%%/sample-config/perfmon/Defaults
-cricket/cricket-%%VERSION%%/sample-config/perfmon/targets
-cricket/cricket-%%VERSION%%/sample-config/portmasters/Defaults
-cricket/cricket-%%VERSION%%/sample-config/portmasters/portmasters
-cricket/cricket-%%VERSION%%/sample-config/router-interfaces/Defaults
-cricket/cricket-%%VERSION%%/sample-config/router-interfaces/interfaces
-cricket/cricket-%%VERSION%%/sample-config/routers/Defaults
-cricket/cricket-%%VERSION%%/sample-config/routers/Targets
-cricket/cricket-%%VERSION%%/sample-config/routing/Defaults
-cricket/cricket-%%VERSION%%/sample-config/routing/Targets
-cricket/cricket-%%VERSION%%/sample-config/squid-proxy/Defaults
-cricket/cricket-%%VERSION%%/sample-config/subtree-times/Defaults
-cricket/cricket-%%VERSION%%/sample-config/subtree-times/targets
-cricket/cricket-%%VERSION%%/sample-config/switch-ports/Defaults
-cricket/cricket-%%VERSION%%/sample-config/switch-ports/switches
-cricket/cricket-%%VERSION%%/sample-config/switches/Defaults
-cricket/cricket-%%VERSION%%/sample-config/switches/switches
-cricket/cricket-%%VERSION%%/sample-config/systemperf/Defaults
-cricket/cricket-%%VERSION%%/sample-config/usr/Defaults
-cricket/cricket-%%VERSION%%/sample-config/usr/targets
-cricket/cricket-%%VERSION%%/sample-config/wbem/Defaults
-cricket/cricket-%%VERSION%%/sample-config/wbem/targets
-cricket/cricket-%%VERSION%%/subtree-sets
-cricket/cricket-%%VERSION%%/util/LeanODBC/LeanODBC.pm
-cricket/cricket-%%VERSION%%/util/LeanODBC/LeanODBC.xs
-cricket/cricket-%%VERSION%%/util/LeanODBC/Makefile.PL
-cricket/cricket-%%VERSION%%/util/LeanODBC/README
-cricket/cricket-%%VERSION%%/util/LeanODBC/stripsql.h
-cricket/cricket-%%VERSION%%/util/LeanODBC/test.pl
-cricket/cricket-%%VERSION%%/util/README
-cricket/cricket-%%VERSION%%/util/README.listInterfaces
-cricket/cricket-%%VERSION%%/util/convert-named-ds
-cricket/cricket-%%VERSION%%/util/dump-targets
-cricket/cricket-%%VERSION%%/util/generate-statics
-cricket/cricket-%%VERSION%%/util/get-collector-stats
-cricket/cricket-%%VERSION%%/util/getFormat.c
-cricket/cricket-%%VERSION%%/util/listInterfaces
-cricket/cricket-%%VERSION%%/util/newsstats
-cricket/cricket-%%VERSION%%/util/perfInfo.pl
-cricket/cricket-%%VERSION%%/util/pmlines.pl
-cricket/cricket-%%VERSION%%/util/relocate-perl
-cricket/cricket-%%VERSION%%/util/rrd-dump
-cricket/cricket-%%VERSION%%/util/rrd-tune
-cricket/cricket-%%VERSION%%/util/rrdTuneAberrant.cgi
-cricket/cricket-%%VERSION%%/util/run-subtree
-cricket/cricket-%%VERSION%%/util/run-subtree.old
-cricket/cricket-%%VERSION%%/util/systemPerfConf.pl
-cricket/cricket-%%VERSION%%/util/test-url
-cricket/cricket-%%VERSION%%/util/testwbem.pl
-cricket/cricket-%%VERSION%%/util/usrModemUsage
-etc/cricket-conf.pl.dist
-@dirrm cricket/cricket-%%VERSION%%/util/LeanODBC
-@dirrm cricket/cricket-%%VERSION%%/util
-@dirrm cricket/cricket-%%VERSION%%/sample-config/wbem
-@dirrm cricket/cricket-%%VERSION%%/sample-config/usr
-@dirrm cricket/cricket-%%VERSION%%/sample-config/systemperf
-@dirrm cricket/cricket-%%VERSION%%/sample-config/switches
-@dirrm cricket/cricket-%%VERSION%%/sample-config/switch-ports
-@dirrm cricket/cricket-%%VERSION%%/sample-config/subtree-times
-@dirrm cricket/cricket-%%VERSION%%/sample-config/squid-proxy
-@dirrm cricket/cricket-%%VERSION%%/sample-config/routing
-@dirrm cricket/cricket-%%VERSION%%/sample-config/routers
-@dirrm cricket/cricket-%%VERSION%%/sample-config/router-interfaces
-@dirrm cricket/cricket-%%VERSION%%/sample-config/portmasters
-@dirrm cricket/cricket-%%VERSION%%/sample-config/perfmon
-@dirrm cricket/cricket-%%VERSION%%/sample-config/news-server
-@dirrm cricket/cricket-%%VERSION%%/sample-config/http-performance
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces
-@dirrm cricket/cricket-%%VERSION%%/sample-config
-@dirrm cricket/cricket-%%VERSION%%/lib/alternate/net-snmp
-@dirrm cricket/cricket-%%VERSION%%/lib/alternate/RRD
-@dirrm cricket/cricket-%%VERSION%%/lib/alternate
-@dirrm cricket/cricket-%%VERSION%%/lib/RRD
-@dirrm cricket/cricket-%%VERSION%%/lib/ConfigTree
-@dirrm cricket/cricket-%%VERSION%%/lib/Common
-@dirrm cricket/cricket-%%VERSION%%/lib/Bundle
-@dirrm cricket/cricket-%%VERSION%%/lib
-@dirrm cricket/cricket-%%VERSION%%/images
-@dirrm cricket/cricket-%%VERSION%%/doc/neta-paper
-@dirrm cricket/cricket-%%VERSION%%/doc
-@dirrm cricket/cricket-%%VERSION%%
-@dirrm cricket/
diff --git a/net/darkstat/distinfo b/net/darkstat/distinfo
deleted file mode 100644
index 36e0fa775de6..000000000000
--- a/net/darkstat/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (darkstat-2.6.tar.gz) = 0a1a407acb6f9b35a46d64885c30d08d
diff --git a/net/darkstat/pkg-descr b/net/darkstat/pkg-descr
deleted file mode 100644
index 8ec204444eb3..000000000000
--- a/net/darkstat/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Darkstat is an ntop-workalike network statistics gatherer. Built to be faster
-and smaller than ntop, it uses libpcap to capture network traffic and serves up
-Web page reports of statistics such as data transferred by host, port, and
-protocol. It also has a neat bandwidth usage graph.
-
-WWW: http://purl.org/net/darkstat
-Author: Emil Mikulic <emikulic@optushome.com.au>
-
--- Anders Nordby <anders@FreeBSD.org>
diff --git a/net/darkstat/pkg-plist b/net/darkstat/pkg-plist
deleted file mode 100644
index 444354ad22f6..000000000000
--- a/net/darkstat/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $FreeBSD$
-sbin/darkstat
-%%NLS%%share/locale/bg/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/da/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/es/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/id/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/darkstat.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/darkstat.mo
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/ISSUES
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/dhcpconf/distinfo b/net/dhcpconf/distinfo
deleted file mode 100644
index 13265aee5744..000000000000
--- a/net/dhcpconf/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dhcp-conf.tgz) = fc33a5687461c7a99615da744cd8dd3f
diff --git a/net/dhcpconf/files/patch-aa b/net/dhcpconf/files/patch-aa
deleted file mode 100644
index b1f1467673d7..000000000000
--- a/net/dhcpconf/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile Wed Dec 15 12:45:24 1999
-+++ Makefile.new Wed Jan 26 23:15:10 2000
-@@ -1,23 +1,24 @@
- TARGET = dhcp-conf
--CC = gcc
--LIBS = -lgdbm -lnewt
-+CC ?= gcc
-+CFLAGS = $(PCFLAGS) -I$(PREFIX)/include
-+LIBS = -L$(PREFIX)/lib -lgdbm -lnewt
- OBJS = main.o screen.o help.o data.o
- #OPTS = -D__DEBUG__ -D__TRACE__
-
- $(TARGET) : $(OBJS)
-- $(CC) -o $(TARGET) $(LIBS) $(OBJS)
-+ $(CC) $(CFLAGS) -o $(TARGET) $(LIBS) $(OBJS)
-
- main.o : main.c includes.h main-proto.h screen-proto.h
-- $(CC) -c main.c $(OPTS)
-+ $(CC) $(CFLAGS) -c main.c $(OPTS)
-
- screen.o : screen.c includes.h screen-proto.h
-- $(CC) -c screen.c $(OPTS)
-+ $(CC) $(CFLAGS) -c screen.c $(OPTS)
-
- help.o : help.c includes.h help-proto.h
-- $(CC) -c help.c $(OPTS)
-+ $(CC) $(CFLAGS) -c help.c $(OPTS)
-
- data.o : data.c includes.h data-proto.h
-- $(CC) -c data.c $(OPTS)
-+ $(CC) $(CFLAGS) -c data.c $(OPTS)
-
- install : $(TARGET)
- chown root dhcp-conf
diff --git a/net/dhcpconf/pkg-descr b/net/dhcpconf/pkg-descr
deleted file mode 100644
index 94e22ace7031..000000000000
--- a/net/dhcpconf/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-dhcpconf is a neat configuration utility for the ISC DHCP server.
-It works by bringing up a couple dialog boxes that look strangely
-like they're created using ncurses but really newt - and then checking
-your options and generating a dhcpd.conf.
-
-WWW: http://dhcp-conf.sourceforge.net
-Author: Vee Schade <vschade@mindless.com>
-
---Will <andrews@technologist.com>
diff --git a/net/dhcpconf/pkg-plist b/net/dhcpconf/pkg-plist
deleted file mode 100644
index c68bedef941e..000000000000
--- a/net/dhcpconf/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-sbin/dhcpconf
-%%PORTDOCS%%share/doc/dhcpconf/README
-%%PORTDOCS%%@dirrm share/doc/dhcpconf
diff --git a/net/disco/distinfo b/net/disco/distinfo
deleted file mode 100644
index 6dbf192ed3dd..000000000000
--- a/net/disco/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (disco-1.2.tar.gz) = c5cd6e0c865550dc7f354ef132b2a7c5
-SIZE (disco-1.2.tar.gz) = 123485
diff --git a/net/disco/pkg-descr b/net/disco/pkg-descr
deleted file mode 100644
index 559d98301b7f..000000000000
--- a/net/disco/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Disco is a passive IP discovery and fingerprinting utility
-designed to sit on segments distributed throughout a network to
-discover unique IP's on the network. In addition to IP
-discovery disco has the ability to passively fingerprint TCP
-SYN packets. The intention is for disco to discover IP's on the
-network, fingerprint the packet if necessary, and load into the
-Gherkin Scan Manager database for targeted host scans.
-
-WWW: http://www.altmode.com/disco
diff --git a/net/disco/pkg-plist b/net/disco/pkg-plist
deleted file mode 100644
index eef894e808cc..000000000000
--- a/net/disco/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/disco
-bin/disco.fp
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/docsis/distinfo b/net/docsis/distinfo
deleted file mode 100644
index 1361ad6dc2ef..000000000000
--- a/net/docsis/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (docsis-0.8.2-RELEASE.tgz) = 595fbed678834bc9f60bc6d5bbe847d8
diff --git a/net/docsis/files/patch-Makefile b/net/docsis/files/patch-Makefile
deleted file mode 100644
index 986b74873507..000000000000
--- a/net/docsis/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig Tue Feb 11 15:36:39 2003
-+++ Makefile Thu Feb 27 19:16:03 2003
-@@ -1,6 +1,6 @@
- # Makefile for "docsis" program.
- #
--CC = gcc
-+#CC = gcc
- DEFS = -DYY_NO_UNPUT -DDEBUG
- #
- # We assume net-snmp is installed in /opt/net-snmp. If not, replace with
-@@ -8,8 +8,8 @@
- # -lnetsnmp is NET-SNMP
- # -lcrypto is OpenSSL.
- #
--CFLAGS = -g -Wall -I/opt/net-snmp/include
--LIBS = -L/opt/net-snmp/lib -lnetsnmp -lcrypto -lnsl -lfl -lm
-+CFLAGS += -I${PREFIX}/include -I${OPENSSLINC}
-+LIBS = -L${PREFIX}/lib -L${OPENSSLLIB} -lnetsnmp -lcrypto -lfl -lm
-
- # If you installed NET-SNMP in /usr/local, uncomment the following two lines:
- # CFLAGS = -g -Wall -I/usr/local/include
diff --git a/net/docsis/files/patch-docsis_decode.c b/net/docsis/files/patch-docsis_decode.c
deleted file mode 100644
index ea2184c0fa84..000000000000
--- a/net/docsis/files/patch-docsis_decode.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- docsis_decode.c.orig Fri Jul 5 14:54:11 2002
-+++ docsis_decode.c Fri Jul 5 14:55:31 2002
-@@ -47,7 +47,7 @@
- memset( &helper, 0,sizeof(unsigned int));
- memcpy( &helper, tlvbuf+2, sizeof(unsigned int));
-
-- printf ( "%s %u;\n", sym->sym_ident, ntohl(helper));
-+ printf ( "%s %u;\n", sym->sym_ident, (unsigned int)ntohl(helper));
- }
-
- void decode_ushort (unsigned char *tlvbuf, symbol_type *sym)
diff --git a/net/docsis/files/patch-docsis_main.c b/net/docsis/files/patch-docsis_main.c
deleted file mode 100644
index 85ff4b3f217a..000000000000
--- a/net/docsis/files/patch-docsis_main.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- docsis_main.c.orig Thu Feb 13 17:21:40 2003
-+++ docsis_main.c Sat Apr 5 10:18:46 2003
-@@ -180,10 +180,10 @@
- if (! netsnmp_ds_get_boolean (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_UCD_STYLE_OID)) {
- netsnmp_ds_toggle_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_UCD_STYLE_OID);
- } */
--
-+/*
- if (! netsnmp_ds_get_boolean (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PRINT_UNITS)) {
- netsnmp_ds_toggle_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PRINT_UNITS);
-- }
-+ } */
-
- netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT,
- NETSNMP_OID_OUTPUT_SUFFIX);
diff --git a/net/docsis/files/patch-docsis_snmp.c b/net/docsis/files/patch-docsis_snmp.c
deleted file mode 100644
index bbf8b1e8877b..000000000000
--- a/net/docsis/files/patch-docsis_snmp.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- docsis_snmp.c.orig Tue Feb 11 16:36:30 2003
-+++ docsis_snmp.c Thu Feb 27 19:17:23 2003
-@@ -206,6 +206,7 @@
- static char outbuf[1024];
- char *cp;
-
-+ badtype = 0;
- memset (outbuf, 0, 1024);
-
- vp = (struct variable_list *) malloc (sizeof (struct variable_list));
diff --git a/net/docsis/files/patch-docsis_yy.y b/net/docsis/files/patch-docsis_yy.y
deleted file mode 100644
index b3e1614f0025..000000000000
--- a/net/docsis/files/patch-docsis_yy.y
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- docsis_yy.y.orig Sun Feb 9 15:35:00 2003
-+++ docsis_yy.y Thu Feb 27 19:14:53 2003
-@@ -50,7 +50,6 @@
- %token <strval> T_ETHERMASK
- %token <strval> T_LABEL_OID
- %token <strval> T_IP
--%token <strval> T_MAC
- %token <strval> T_MAIN
- %token <strval> T_STRING
- %token <strval> T_HEX_STRING
diff --git a/net/docsis/files/patch-ethermac.h b/net/docsis/files/patch-ethermac.h
deleted file mode 100644
index 2219065fbf36..000000000000
--- a/net/docsis/files/patch-ethermac.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- ethermac.h.orig Wed Feb 13 14:09:52 2002
-+++ ethermac.h Thu Feb 27 19:14:53 2003
-@@ -22,6 +22,7 @@
-
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
-
- int ether_aton ( const char *macstr, unsigned char *outbuf ) ;
- char * ether_ntoa ( const unsigned char *mac);
diff --git a/net/docsis/pkg-descr b/net/docsis/pkg-descr
deleted file mode 100644
index 3493a2c9a21d..000000000000
--- a/net/docsis/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Docsis is a small program that can be used to generate binary
-configuration files for DOCSIS-compliant cable modems. DOCSIS stands
-for Data over Cable Service Interface Specification and is a standard
-developed by Cablelabs.
-
-WWW: http://docsis.sourceforge.net/
diff --git a/net/docsis/pkg-plist b/net/docsis/pkg-plist
deleted file mode 100644
index 7f8b2607a04a..000000000000
--- a/net/docsis/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-bin/docsis
-share/examples/docsis/docsis1.0_2class_non-rfc2669.cfg
-share/examples/docsis/docsis1.0_2class_rfc2669.cfg
-share/examples/docsis/docsis1.0_basic.cfg
-share/examples/docsis/docsis1.0_basic_bpi.cfg
-share/examples/docsis/docsis1.0_basic_upgrade.cfg
-share/examples/docsis/docsis1.0_example.cfg
-share/examples/docsis/docsis1.0_filters2_oidnum.cfg
-share/examples/docsis/docsis1.0_filters2_oidtext.cfg
-share/examples/docsis/docsis1.0_filters_NmAccess.cfg
-share/examples/docsis/docsis1.0_filters_oidnum.cfg
-share/examples/docsis/docsis1.0_filters_oidtext.cfg
-share/examples/docsis/docsis1.1_classifiers.cfg
-share/examples/docsis/docsis1.1_classifiers2.cfg
-share/examples/docsis/docsis1.1_simple.cfg
-share/examples/docsis/docsis1.1_stress_test.cfg
-share/examples/docsis/docsis20.cfg
-share/examples/docsis/docsis20_no_snmp.cfg
-share/examples/docsis/keyfile
-share/examples/docsis/packetcable_mta.cfg
-share/examples/docsis/testkey.key
-@dirrm share/examples/docsis
diff --git a/net/driftnet/distinfo b/net/driftnet/distinfo
deleted file mode 100644
index a9ef576a668f..000000000000
--- a/net/driftnet/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (driftnet-0.1.6.tar.gz) = 8e11d77770452f97bb3c23f510489815
diff --git a/net/driftnet/files/patch-Makefile b/net/driftnet/files/patch-Makefile
deleted file mode 100644
index 1701d03937cf..000000000000
--- a/net/driftnet/files/patch-Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
---- Makefile.orig Tue Jul 9 12:26:41 2002
-+++ Makefile Sat Sep 28 22:19:21 2002
-@@ -16,23 +16,23 @@
- #CC = gcc
-
- # Basic compiler, linker flags; should not need any changes.
--CFLAGS += -g -Wall
--LDFLAGS += -g
-+#CFLAGS += -g -Wall
-+#LDFLAGS += -g
-
- # You might need these if libpcap is installed somewhere random.
--CFLAGS += -I/usr/include/pcap
-+#CFLAGS += -I/usr/include/pcap
- #LDFLAGS += -L/path/to/libpcap.so
-
- # Required on Linux to get BSDish definitions of the TCP/IP structs.
--CFLAGS += -D_BSD_SOURCE
-+#CFLAGS += -D_BSD_SOURCE
-
- # We always need the pcap and pthread libraries.
--LDLIBS += -lpcap -lpthread
-+LDLIBS += -lpcap ${PTHREAD_LIBS}
-
- # Optional C compiler and linker flags. Typical driftnet builds have support
- # for displaying captured images in an X window, and need the following flags:
--CFLAGS += `gtk-config --cflags`
--LDLIBS += -ljpeg -lungif `gtk-config --libs`
-+CFLAGS += ${PTHREAD_CFLAGS} `${GTK_CONFIG} --cflags`
-+LDLIBS += -ljpeg -lungif `${GTK_CONFIG} --libs`
-
- # Alternatively, you can build a version of driftnet which can only be used
- # in `adjunct' mode as the back end for some other image-processing program. To
-@@ -43,7 +43,7 @@
- # On systems with a C99 compiler, driftnet will use <stdint.h> for the
- # definitions of types such as uint8_t. On other systems like Solaris, these
- # are in <sys/types.h>, and you should uncomment this line.
--#CFLAGS += -DUSE_SYS_TYPES_H
-+CFLAGS += -DUSE_SYS_TYPES_H
-
- # On Solaris, it is necessary to link against -lposix4 for the definition of
- # nanosleep; uncomment the below.
-@@ -51,7 +51,7 @@
-
- # added 20020604 edobbs
- # On BSD systems, may need to use /usr/local/include
--#CFLAGS += -I/usr/local/include
-+CFLAGS += -I/usr/local/include
-
-
- #
diff --git a/net/driftnet/files/patch-driftnet.c b/net/driftnet/files/patch-driftnet.c
deleted file mode 100644
index fce26e723f95..000000000000
--- a/net/driftnet/files/patch-driftnet.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- driftnet.c.orig Tue Jul 9 21:26:41 2002
-+++ driftnet.c Tue Aug 20 02:30:35 2002
-@@ -254,8 +254,8 @@
- "\n"
- " -h Display this help message.\n"
- " -v Verbose operation.\n"
--" -i interface Select the interface on which to listen (default: all\n"
--" interfaces).\n"
-+" -i interface Select the interface on which to listen (default: first\n"
-+" available interface).\n"
- " -p Do not put the listening interface into promiscuous mode.\n"" -a Adjunct mode: do not display images on screen, but save\n"
- " them to a temporary directory and announce their names on\n"
- " standard output.\n"
-@@ -313,7 +313,7 @@
- void setup_signals(void) {
- int *p;
- /* Signals to ignore. */
-- int ignore_signals[] = {SIGPIPE, 0};
-+ int ignore_signals[] = {SIGPIPE, SIGCONT, SIGHUP, 0};
- /* Signals which mean we should quit, killing the display child if
- * applicable. */
- int terminate_signals[] = {SIGTERM, SIGINT, /*SIGSEGV,*/ SIGBUS, SIGCHLD, 0};
diff --git a/net/driftnet/pkg-descr b/net/driftnet/pkg-descr
deleted file mode 100644
index 2b2e853684ca..000000000000
--- a/net/driftnet/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-EtherPEG was a program that sniffed for JPEGs passing by on the AirPort
-networks at MacHack, and showed them on the huge screen to shame people
-into a) turning the 802.11 encryption on, or b) reducing amount of pr0n
-they download at weirdo Mac conventions. DRIFTNET can do the same for
-*your* office, and make an attractive desktop accessory to boot. The
-program promiscuously sniffs and decodes any JPEG downloaded by anyone
-on your LAN, displaying it in an attractive, ever changing mosaic of
-fluffy kittens, oversized navigation buttons, and blurred images of Big
-Brother Elizabeth fiddling. It's UNIX only. Your sysadmin is undoubtedly
-running it already. So stop that. Now.
-
-WWW: http://www.ex-parrot.com/~chris/driftnet/
-
-- Simon 'corecode' Schubert
diff --git a/net/echolot/distinfo b/net/echolot/distinfo
deleted file mode 100644
index 7fb172b02b0b..000000000000
--- a/net/echolot/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (echolot-0.1.0.tar.gz) = 5c751c11dd741b5484e0c6f107645b3a
-SIZE (echolot-0.1.0.tar.gz) = 104533
diff --git a/net/echolot/pkg-descr b/net/echolot/pkg-descr
deleted file mode 100644
index e7819cdbcac0..000000000000
--- a/net/echolot/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-echolot implements a packet sniffer that grabs ARP packets on any ethernet
-devices. This empowers your box
- * to detect intruders (new mac in lan)
- * to find your boxes on foreign lans (known mac in lan)
-
-WWW: http://sourceforge.net/projects/echolot
diff --git a/net/echolot/pkg-plist b/net/echolot/pkg-plist
deleted file mode 100644
index 38e530519555..000000000000
--- a/net/echolot/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/echolot
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/PLATFORMS
-%%PORTDOCS%%%%DOCSDIR%%/rfc826.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ehnt/distinfo b/net/ehnt/distinfo
deleted file mode 100644
index ab4880cb73b7..000000000000
--- a/net/ehnt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ehnt-0.3.tar.gz) = 1477137f5207561cafb421864351562d
-MD5 (ehnt_data-0.3.tar.gz) = b861e0fb0092c45c71b9048e9a4b1679
diff --git a/net/ehnt/files/ehntserv.sh.sample b/net/ehnt/files/ehntserv.sh.sample
deleted file mode 100644
index a9db95ed60c9..000000000000
--- a/net/ehnt/files/ehntserv.sh.sample
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-start)
- if [ -x ${PREFIX}/sbin/ehntserv ]; then
- echo -n ' ehntserv'
- ${PREFIX}/sbin/ehntserv
- fi
- ;;
-stop)
- echo -n ' ehntserv'
- killall ehntserv
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- exit 2
- ;;
-esac
-
-exit 0
diff --git a/net/ehnt/files/patch-Makefile b/net/ehnt/files/patch-Makefile
deleted file mode 100644
index 5c0d61866bdb..000000000000
--- a/net/ehnt/files/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.orig Thu Oct 4 22:18:29 2001
-+++ Makefile Fri Oct 5 21:00:34 2001
-@@ -1,23 +1,14 @@
--PLATFORM = LINUX
-+#PLATFORM = LINUX
- #PLATFORM = SOLARIS
--#PLATFORM = FreeBSD
--CC = gcc
-+PLATFORM = FreeBSD
-+#CC = gcc
- #DEBUG = yes
- #CFLAGS = -g
- #CFLAGS = -O6
--STRIP = strip
-+#STRIP = strip
- #STRIP = gstrip
- LIBS = -lm
--CFLAGS = -I/usr/lib/glib/include
--
--ifeq ($(PLATFORM),SOLARIS)
-- LIBS += -lsocket -lnsl -lresolv
--endif
--
--ifeq ($(DEBUG),yes)
-- CFLAGS += -g
--endif
--
-+CFLAGS+= -DASNCDIR=\"${PREFIX}/share/ehnt\"
-
- all: ehntserv ehnt asnc.txt
- @echo
-@@ -40,11 +31,6 @@
-
- ehnt : ehnt_client.o ehnt_lookup.o ehnt_display.o ehnt_processflow.o ehnt_main.o
- $(CC) -o ehnt ehnt_client.o ehnt_lookup.o ehnt_display.o ehnt_processflow.o ehnt_main.o $(LIBS) $(CFLAGS)
--ifeq ($(DEBUG),yes)
-- @echo Debug mode - ehnt not stripped
--else
-- $(STRIP) ehnt
--endif
-
-
- ehntserv.o : ehntserv.c ehnt.h netflowv5.h config.h
-@@ -52,11 +38,6 @@
-
- ehntserv : ehntserv.o
- $(CC) $(CFLAGS) -o ehntserv ehntserv.o $(LIBS) $(CFLAGS)
--ifeq ($(DEBUG),yes)
-- @echo Debug mode - ehnt not stripped
--else
-- $(STRIP) ehntserv
--endif
-
- asnc.txt :
- perl ./ProcessASN.pl
diff --git a/net/ehnt/files/patch-ProcessASN.pl b/net/ehnt/files/patch-ProcessASN.pl
deleted file mode 100644
index 367b4766d102..000000000000
--- a/net/ehnt/files/patch-ProcessASN.pl
+++ /dev/null
@@ -1,128 +0,0 @@
-
-$FreeBSD$
-
---- ProcessASN.pl.orig Tue Oct 22 00:21:49 2002
-+++ ProcessASN.pl Tue Oct 22 00:21:53 2002
-@@ -4,7 +4,7 @@
-
- #ftp://ftp.arin.net/netinfo/asn.txt
- #ftp://ftp.apnic.net/pub/apnic/dbase/data/apnic.an.gz
--#ftp://ftp.ripe.net/ripe/dbase/split/ripe.db.an.gz
-+#ftp://ftp.ripe.net/ripe/dbase/split/ripe.db.aut-num.gz
-
- #and put them all in another file in a dumb format so they can
- #be processed by my dumb C program.
-@@ -51,28 +51,28 @@
- }
- }
-
--if (! -f "ripe.db.an" ) {
-- if (-f "ripe.db.an.gz") {
-- system "$gzip -d ripe.db.an.gz";
-+if (! -f "ripe.db.aut-num" ) {
-+ if (-f "ripe.db.aut-num.gz") {
-+ system "$gzip -d ripe.db.aut-num.gz";
- $r=$?;
- if ($r > 0) {
-- print "---> Retrieved ripe.db.an.gz, but could not run $gzip!\n";
-+ print "---> Retrieved ripe.db.aut-num.gz, but could not run $gzip!\n";
- print "---> Please get $gzip and try again\n";
- exit(1);
- }
- } else {
-- if ( RetrieveFile("ftp://ftp.ripe.net/ripe/dbase/split/ripe.db.an.gz","ripe.db.an.gz")) {
-- system "$gzip -d ripe.db.an.gz";
-+ if ( RetrieveFile("ftp://ftp.ripe.net/ripe/dbase/split/ripe.db.aut-num.gz","ripe.db.aut-num.gz")) {
-+ system "$gzip -d ripe.db.aut-num.gz";
- $r=$?;
- if ($r > 0) {
-- print "---> Retrieved ripe.db.an.gz, but could not run $gzip!\n";
-+ print "---> Retrieved ripe.db.aut-num.gz, but could not run $gzip!\n";
- print "---> Please get $gzip and try again\n";
- exit(1);
- }
- } else {
-- print "---> Cannot retrieve ripe.db.an.gz\n";
-+ print "---> Cannot retrieve ripe.db.aut-num.gz\n";
- print "---> Please download it from\n";
-- print "---> ftp://ftp.ripe.net/ripe/dbase/split/ripe.db.an.gz\n";
-+ print "---> ftp://ftp.ripe.net/ripe/dbase/split/ripe.db.aut-num.gz\n";
- $MissingFile=1;
- }
- }
-@@ -109,7 +109,7 @@
- print "Processed $c ASes from asn.txt\n";
-
- ProcessRipeDB("apnic.an");
--ProcessRipeDB("ripe.db.an");
-+ProcessRipeDB("ripe.db.aut-num");
-
- $c=0;
- open OUTPUT,">asnc.txt";
-@@ -124,7 +124,7 @@
- $c=0;
- open APNIC,"<$file";
- while (<APNIC>) {
-- if (/^\*an: AS(..*)/) {
-+ if (/^(\*an|aut-num):\s+AS(..*)/) {
- if ($an) {
- if ($aa) { $ASNs{$an}=$aa; $c++; }
- elsif ($mb) { $ASNs{$an}=$mb; $c++; }
-@@ -133,25 +133,25 @@
-
- undef $an; undef $aa; undef $mb; undef $de;
- }
-- $an=$1;
-+ $an=$2;
- }
-- if (/^\*aa: (..*)/) {
-+ if (/^(\*aa|as-name):\s+(..*)/) {
- if (! $aa) {
-- $aa=$1;
-+ $aa=$2;
- $aa=~ s/ /_/g;
- if ($aa eq 'UNSPECIFIED') {
- $aa="AS$an"; # 'an:' is always defined here
- }
- }
- }
-- if (/^\*mb: MAINT\-(..*)/) {
-+ if (/^(\*mb|mnt-by):\s+MAINT\-(..*)/) {
- if (! $mb) {
-- $mb=$1;
-+ $mb=$2;
- $mb=~ s/ /_/g;
- }
-- } elsif (/^\*mb: (..*)/) {
-+ } elsif (/^(\*mb|mnt-by):\s+(..*)/) {
- if (! $mb) {
-- $mb=$1;
-+ $mb=$2;
- $mb=~ s/ /_/g;
- }
- }
-@@ -176,20 +176,12 @@
-
- print "RetrieveFile: getting $location\n";
-
-- $wget="wget";
-- $ncftp="ncftp";
-- $curl="curl";
-- system "$wget -q $location";
-- $r=$?;
-- if ($r==0) { print "Got file with $wget.\n"; return 1; }
-+ $fetch="fetch";
-
-- system "$ncftp $location";
-+ system "$fetch $location";
- $r=$?;
-- if ($r==0) { print "Got file with $ncftp.\n"; return 1; }
-+ if ($r==0) { print "Got file with $fetch.\n"; return 1; }
-
-- system "$curl -o $filename $location";
-- $r=$?;
-- if ($r==0) { print "Got file with $curl\n"; return 1; }
-- if ($r > 0) { print "Could not get $filename with $curl, $wget or $ncftp.\n"; }
-+ if ($r > 0) { print "Could not get $filename with $fetch, $curl, $wget or $ncftp.\n"; }
- return 0;
- }
diff --git a/net/ehnt/files/patch-config-h b/net/ehnt/files/patch-config-h
deleted file mode 100644
index 0c7607a95b4f..000000000000
--- a/net/ehnt/files/patch-config-h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- config.h.orig Thu Oct 4 22:18:29 2001
-+++ config.h Thu Nov 14 22:20:47 2002
-@@ -32,4 +32,12 @@
- /* The default mode of the client. Can be either EM_REPORT or EM_DUMP.*/
- #define EM_DEFAULT EM_TOP
-
-+#ifndef ASNCDIR
-+#define ASNCDIR "."
-+#endif
-
-+/* Default size of socket buffer. FreeBSD default is Limited to 256k,
-+ + * but misteriously enough maximum space available for buf is 233016 */
-+#define DEFAULT_SOCKBUF (192*1024)
-+/* Reasonable minimum socket buffer size. I assume it's about 16k */
-+#define MIN_SOCKBUF (16*1024)
diff --git a/net/ehnt/files/patch-ehnt-lookup b/net/ehnt/files/patch-ehnt-lookup
deleted file mode 100644
index d6f6d655ef11..000000000000
--- a/net/ehnt/files/patch-ehnt-lookup
+++ /dev/null
@@ -1,11 +0,0 @@
---- ehnt_lookup.c.orig Wed Jul 18 00:47:37 2001
-+++ ehnt_lookup.c Fri Aug 3 19:54:34 2001
-@@ -36,7 +36,7 @@
-
- memset(ASNs,0,sizeof(ASNs));
-
-- if ( ! (f=fopen ("asnc.txt","r")) ) {
-+ if ( ! (f=fopen (ASNCDIR "/asnc.txt","r")) ) {
- perror("fopen");
- } else {
- for ( ; ; ) {
diff --git a/net/ehnt/files/patch-ehnt__client.c b/net/ehnt/files/patch-ehnt__client.c
deleted file mode 100644
index a518e52f5eca..000000000000
--- a/net/ehnt/files/patch-ehnt__client.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ehnt_client.c.orig Thu Oct 4 22:18:29 2001
-+++ ehnt_client.c Thu Nov 14 22:12:07 2002
-@@ -89,7 +89,7 @@
- if (FD_ISSET(sockfd,&read_fds)) {
- ehnt_client_processmessage(sockfd,routeraddr,my_ehnt_struct);
- }
-- if (FD_ISSET(STDIN_FILENO,&read_fds)) {
-+ if (e_cfg->mode != EM_COLONDUMP && FD_ISSET(STDIN_FILENO,&read_fds)) {
- char key;
- key=getkey();
- switch (key) {
diff --git a/net/ehnt/files/patch-ehnt__processflow.c b/net/ehnt/files/patch-ehnt__processflow.c
deleted file mode 100644
index 7441034b9ceb..000000000000
--- a/net/ehnt/files/patch-ehnt__processflow.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ehnt_processflow.c.orig Thu Oct 4 22:18:29 2001
-+++ ehnt_processflow.c Thu Nov 14 22:17:18 2002
-@@ -218,7 +218,7 @@
- dstip.s_addr=rec->dstaddr;
- nexthop.s_addr=rec->nexthop;
-
-- printf("%.0f:%s",local_flowcount,routeraddr_string);
-+ printf("%.0f:%s:",local_flowcount,routeraddr_string);
- printf("%d:%s:%d:",
- rec->input_index,
- inet_ntoa(srcip),
diff --git a/net/ehnt/files/patch-ehntserv.c b/net/ehnt/files/patch-ehntserv.c
deleted file mode 100644
index 71703c65150b..000000000000
--- a/net/ehnt/files/patch-ehntserv.c
+++ /dev/null
@@ -1,176 +0,0 @@
-
-$FreeBSD$
-
---- ehntserv.c.orig Thu Oct 4 22:18:29 2001
-+++ ehntserv.c Thu Nov 14 22:18:40 2002
-@@ -33,8 +33,8 @@
- #define MAXCLIENTS 256
- #define MAXPACKET 8192
-
--int SetUDPOpts(int);
--int SetTCPOpts(int);
-+int SetUDPOpts(int, int);
-+int SetTCPOpts(int, int);
-
- int debug;
- int use_syslog;
-@@ -54,6 +54,8 @@
- int packetcounter=0;
- extern char *optarg;
- int c_udpport, c_tcpport;
-+ int one = -1;
-+ int bufsize = DEFAULT_SOCKBUF;
-
- debug=0;
- use_syslog=0;
-@@ -61,7 +63,7 @@
- c_udpport=DEFAULT_UDP_PORT;
- c_tcpport=DEFAULT_TCP_PORT;
-
-- while( (c=getopt(argc,argv,"u:t:d")) != -1) {
-+ while( (c=getopt(argc,argv,"u:t:s:d")) != -1) {
-
- switch(c) {
- case 'u':
-@@ -70,6 +72,13 @@
- case 't':
- sscanf(optarg,"%d",&c_tcpport);
- break;
-+ case 's':
-+ sscanf(optarg,"%d",&bufsize);
-+ if (bufsize < MIN_SOCKBUF) {
-+ perror("too low buffer size or bad format: %s", optarg);
-+ exit(1);
-+ }
-+ break;
- case 'd':
- debug=1;
- break;
-@@ -77,6 +86,7 @@
- printf("Usage: %s [ -u <udpport> ] [ -t <tcpport> ]\n",argv[0]);
- printf(" -u <udpport> Listen on UDP port <udpport> for netflow packets. Default %d\n",DEFAULT_UDP_PORT);
- printf(" -t <tcpport> Listen on TCP port <tcpport> for client connections. Default %d\n",DEFAULT_TCP_PORT);
-+ printf(" -s <bufsize> Set tcp/udp buffer size. Default %d\n",DEFAULT_SOCKBUF);
- printf(" -d Debug. Don't become a daemon, displays all messages on stdout,");
- printf(" displays lots of extra information\n");
- exit(0);
-@@ -87,22 +97,22 @@
-
- /* set up the netflow udp socket */
- if ( (nf_fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-- { log_error("socket (udp) error"); exit(0); }
-+ { log_error("socket (udp) error"); exit(1); }
- memset(&nf_servaddr,0,sizeof(nf_servaddr));
- nf_servaddr.sin_family = AF_INET;
- nf_servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
- nf_servaddr.sin_port = htons(c_udpport);
- if ( bind(nf_fd, (struct sockaddr *) &nf_servaddr, sizeof(nf_servaddr)) < 0)
-- { log_error("bind UDP error"); exit(0); }
-+ { log_error("bind UDP error"); exit(1); }
-
-- SetUDPOpts(nf_fd);
-+ SetUDPOpts(nf_fd, bufsize);
-
- nf_clilen = (socklen_t) sizeof(nf_cliaddr);
- l_clilen = (socklen_t) sizeof(l_cliaddr);
-
- /* set up the listening tcp socket*/
- if ( (l_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-- { log_error("socket (tcp) error"); exit(0); }
-+ { log_error("socket (tcp) error"); exit(1); }
- memset(&l_servaddr,0,sizeof(l_servaddr));
- l_servaddr.sin_family = AF_INET;
- l_servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
-@@ -112,9 +122,9 @@
- setsockopt(l_fd, SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof(one));
- }
- if ( bind(l_fd,(struct sockaddr *) &l_servaddr, sizeof(l_servaddr)) < 0)
-- { log_error ("bind TCP error"); exit(0); }
-+ { log_error ("bind TCP error"); exit(1); }
- if ( listen(l_fd, 32) < 0)
-- { log_error("listen error"); exit(0); }
-+ { log_error("listen error"); exit(1); }
- printf("Listening on UDP port %d and TCP port %d (with a backlog of 32)\n",c_udpport,c_tcpport);
- memset(l_clients,0,sizeof(l_clients));
-
-@@ -157,7 +167,7 @@
- }
-
- if ( (c=select(maxfd+1,&read_fds,NULL,NULL,NULL)) < 0)
-- { log_error("select (read) error"); exit(0); }
-+ { log_error("select (read) error"); exit(1); }
-
- if (FD_ISSET(nf_fd,&read_fds)) { /*a netflow message is waiting*/
-
-@@ -168,7 +178,7 @@
- /* new packet */
- if ( (nf_rcount=recvfrom(nf_fd,(char *)(nf_packet + sizeof(nf_cliaddr.sin_addr.s_addr)),
- MAXPACKET,0,(struct sockaddr *)&nf_cliaddr,&nf_clilen)) < 0)
-- { log_error("recvfrom error"); exit(0); }
-+ { log_error("recvfrom error"); exit(1); }
-
- /* Here we use a non-blocking select to find out which tcp clients we
- can write to. This ensures the write won't block, which would of course
-@@ -189,7 +199,7 @@
- timeout.tv_sec=0;
- timeout.tv_usec=0;
- if ( (c=select(maxfd+1,NULL,&write_fds,NULL,&timeout)) < 0)
-- { log_error("select (write) error"); exit(0); }
-+ { log_error("select (write) error"); exit(1); }
- for (i=0; i<MAXCLIENTS; i++) {
- if (l_clients[i] > 0) {
- if (FD_ISSET(l_clients[i],&write_fds)) {
-@@ -220,9 +230,9 @@
- /* printf("incoming connection on tcp 4444\n");*/
- l_addrlen=sizeof(l_cliaddr);
- if ( (l_connfd = accept(l_fd,(struct sockaddr *) l_cliaddr, &l_addrlen)) < 0)
-- { log_error("accept error"); exit(0); }
-+ { log_error("accept error"); exit(1); }
-
-- SetTCPOpts(l_connfd);
-+ SetTCPOpts(l_connfd, bufsize);
-
- for (i=0; i<MAXCLIENTS; i++) {
- if (l_clients[i]==0) {
-@@ -268,25 +278,26 @@
- }
-
- /* Increase our receive buffer for nf_fd: */
--int SetUDPOpts(int fd){
-- int r,p,n;
-+int SetUDPOpts(int fd, int rcvsize){
-+ int r,p;
- socklen_t optlen;
-
-- n=512*1024;
- optlen = sizeof(p);
-
- if (debug) {
- r=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,&p,&optlen);
- printf("Before setsockopt, SO_RCVBUF is %d\n",p);
- }
-- r=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,&n,sizeof(n));
-+ if (setsockopt(fd,SOL_SOCKET,SO_RCVBUF,&rcvsize,sizeof(rcvsize)) < 0) {
-+ perror("setsockopt SO_RCVBUF:");
-+ }
- if (debug) {
- r=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,&p,&optlen);
- printf("After setsockopt, SO_RCVBUF is %d\n",p);
- }
- }
-
--int SetTCPOpts(int fd) {
-+int SetTCPOpts(int fd, int bufsize) {
- int r,p,n;
- socklen_t optlen;
-
-@@ -296,8 +307,7 @@
- r=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,&p,&optlen);
- printf("Before setsockopt, SO_SNDBUF is %d\n",p);
- }
-- n=512*1024;
-- r=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,&n,sizeof(n));
-+ r=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,&bufsize,sizeof(bufsize));
- if (r<0) { log_error("setsockopt SO_SNDBUF"); }
- if (debug) {
- r=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,&p,&optlen);
diff --git a/net/ehnt/pkg-descr b/net/ehnt/pkg-descr
deleted file mode 100644
index 1e2898290a60..000000000000
--- a/net/ehnt/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a lightweight but well-featured tool for collecting
-NetFlow version 5 packets from Cisco routers.
-
-The implementation includes a simple UDP-to-TCP converting server,
-which may be used to replicate NetFlow data to multiple clients.
-
-WWW: http://ehnt.sourceforge.net/
-
-- Dmitry Morozovsky
-marck@rinet.ru
diff --git a/net/ehnt/pkg-plist b/net/ehnt/pkg-plist
deleted file mode 100644
index 482ecee5ac30..000000000000
--- a/net/ehnt/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/ehnt
-etc/rc.d/ehntserv.sh.sample
-sbin/ehntserv
-%%PORTDOCS%%share/doc/ehnt/README
-share/ehnt/asnc.txt
-@dirrm share/ehnt
-%%PORTDOCS%%@dirrm share/doc/ehnt
diff --git a/net/entitymib/Makefile b/net/entitymib/Makefile
index 010518d16322..409484fafa47 100644
--- a/net/entitymib/Makefile
+++ b/net/entitymib/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= wollman@FreeBSD.org
COMMENT=Display the Entity MIB of an SNMP agent
RUN_DEPENDS= ${SITE_PERL}/Tree/DAG_Node.pm:${PORTSDIR}/devel/p5-Tree-DAG_Node \
- ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/net-snmp
+ ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/net-snmp
USE_PERL5_RUN= yes
MAN1= entitymib.1
diff --git a/net/etherape/distinfo b/net/etherape/distinfo
deleted file mode 100644
index c125d8bb7c6a..000000000000
--- a/net/etherape/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (etherape-0.9.0.tar.gz) = a712f4cb04897d1a02ce988cffbf254c
diff --git a/net/etherape/files/patch-src::Makefile.in b/net/etherape/files/patch-src::Makefile.in
deleted file mode 100644
index e75803879e4e..000000000000
--- a/net/etherape/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- src/Makefile.in.orig Mon Jun 16 21:46:20 2003
-+++ src/Makefile.in Mon Jun 16 21:46:32 2003
-@@ -170,7 +170,7 @@
-
- etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS)
- etherape_LDFLAGS =
--etherape_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-+etherape_LINK = libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/net/etherape/pkg-descr b/net/etherape/pkg-descr
deleted file mode 100644
index f26741ea2b51..000000000000
--- a/net/etherape/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-EtherApe is a graphical network monitor for Unix modeled after etherman.
-Featuring ether, ip and tcp modes, it displays network activity
-graphically. Hosts and links change in size with traffic. Color coded
-protocols display. It supports ethernet, fddi, ppp and slip devices.
-It can filter traffic to be shown, and can read traffic from a
-file as well as live from the network.
-
-WWW: http://etherape.sourceforge.net/
diff --git a/net/etherape/pkg-plist b/net/etherape/pkg-plist
deleted file mode 100644
index afb6a42dc4cb..000000000000
--- a/net/etherape/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-bin/etherape
-etc/etherape/services
-lib/locale/es/LC_MESSAGES/etherape.mo
-lib/locale/fr/LC_MESSAGES/etherape.mo
-lib/locale/nl/LC_MESSAGES/etherape.mo
-lib/locale/tr/LC_MESSAGES/etherape.mo
-share/etherape/glade/etherape.glade2
-share/etherape/glade/etherape.png
-share/etherape/glade/pause.xpm
-share/etherape/glade/play.xpm
-share/etherape/glade/stop.xpm
-share/gnome/apps/Applications/etherape.desktop
-share/pixmaps/etherape.png
-@dirrm share/etherape/glade
-@dirrm share/etherape
-@dirrm lib/locale/tr/LC_MESSAGES
-@dirrm lib/locale/nl/LC_MESSAGES
-@dirrm lib/locale/fr/LC_MESSAGES
-@dirrm lib/locale/es/LC_MESSAGES
-@dirrm etc/etherape
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 53233682ae1b..ceff626e905f 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= billf@FreeBSD.org
COMMENT= An X11/GTK network analyzer/capture tool
.if !defined(WITHOUT_SNMP)
-LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net/net-snmp
+LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
.endif
USE_BZIP2= yes
diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo
deleted file mode 100644
index 20ec79dbc71b..000000000000
--- a/net/ettercap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ettercap-0.6.b.tar.gz) = f665cf82347a91f216184537f8f2c4bd
-SIZE (ettercap-0.6.b.tar.gz) = 689038
diff --git a/net/ettercap/files/patch-aa b/net/ettercap/files/patch-aa
deleted file mode 100644
index c38436d908ad..000000000000
--- a/net/ettercap/files/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.in.orig Thu Jun 27 19:27:33 2002
-+++ Makefile.in Wed Jul 17 17:06:29 2002
-@@ -25,10 +25,10 @@
- DOC = COPYING README README.PLUGINS README.WIN32 CHANGELOG HISTORY \
- AUTHORS TODO TODO.WIN32 THANKS KNOWN-BUGS PORTINGS INSTALL \
- ./plugins/H01_zaratan/ZARATAN.HOWTO ./plugins/H09_roper/ROPER.HOWTO \
-- ./plugins/H03_hydra1/HYDRA.HOWTO
-+ ./plugins/H03_hydra1/HYDRA.HOWTO ./plugins/confusion/CONFUSION.HOWTO
-
- DEBUG = @DEBUG@
--CFLAG = @E_CFLAGS@
-+CFLAG = @CFLAGS@
- COPTS = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
-
- PROG = @PROG@
-@@ -74,12 +74,7 @@
- $(INSTALL) -m 644 ./etter.filter.ssh $(DESTDIR)$(DATADIR)
- $(INSTALL) -m 644 ./etter.passive.os.fp $(DESTDIR)$(DATADIR)
- $(INSTALL) -m 644 ./etter.ssl.crt $(DESTDIR)$(DATADIR)
-- $(INSTALL) -d $(DESTDIR)$(DOCDIR)
-- $(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
-- $(INSTALL) -m 644 ./THANKS $(DESTDIR)$(DATADIR)
-- $(INSTALL) -m 644 ./AUTHORS $(DESTDIR)$(DATADIR)
- -$(INSTALL) -m 644 ./share/[a-z]* $(DESTDIR)$(DATADIR)
-- -$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
- $(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
- $(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
- @echo
-@@ -88,6 +83,17 @@
- @echo "@SB@ $(PROG)@EB@ installed in @SB@$(DESTDIR)$(BINDIR) @EB@"
- @echo "@SB@ shared files@EB@ installed in @SB@$(DESTDIR)$(DATADIR) @EB@"
- @echo "@SB@ man pages@EB@ installed in @SB@$(DESTDIR)$(MANDIR)/man8/ @EB@"
-+ @echo
-+ @echo "=============================================================="
-+ @echo
-+
-+install-doc:
-+ $(INSTALL) -d $(DESTDIR)$(DOCDIR)
-+ $(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
-+ -$(INSTALL) -m 644 ./docs/development/[a-z]* $(DESTDIR)$(DOCDIR)
-+ @echo
-+ @echo "=============================================================="
-+ @echo
- @echo "@SB@ DOCS@EB@ installed in @SB@$(DESTDIR)$(DOCDIR) @EB@"
- @echo
- @echo "=============================================================="
diff --git a/net/ettercap/files/patch-ab b/net/ettercap/files/patch-ab
deleted file mode 100644
index 1d1b7a831774..000000000000
--- a/net/ettercap/files/patch-ab
+++ /dev/null
@@ -1,120 +0,0 @@
---- configure.orig Fri Jun 14 18:53:14 2002
-+++ configure Wed Jul 17 17:09:18 2002
-@@ -3924,27 +3924,27 @@
- if test "${ac_cv_path_WGET_PATH+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $WGET_PATH in
-- [\\/]* | ?:[\\/]*)
-+# case $WGET_PATH in
-+# [\\/]* | ?:[\\/]*)
- ac_cv_path_WGET_PATH="$WGET_PATH" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
-+# ;;
-+# *)
-+# as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+#for as_dir in $PATH
-+#do
-+# IFS=$as_save_IFS
-+# test -z "$as_dir" && as_dir=.
-+# for ac_exec_ext in '' $ac_executable_extensions; do
-+# if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+# ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
-+# echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+# break 2
-+# fi
-+#done
-+#done
-
-- ;;
--esac
-+# ;;
-+#esac
- fi
- WGET_PATH=$ac_cv_path_WGET_PATH
-
-@@ -6676,8 +6676,8 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_pthread_create" = no; then
-- for ac_lib in pthread; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+# for ac_lib in pthread; do
-+ LIBS="%%PTHREAD_LIBS%% $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -6713,7 +6713,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_pthread_create="-l$ac_lib"
-+ ac_cv_search_pthread_create="%%PTHREAD_LIBS%%"
- break
- else
- echo "$as_me: failed program was:" >&5
-@@ -6721,7 +6721,7 @@
-
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-- done
-+# done
- fi
- LIBS=$ac_func_search_save_LIBS
- fi
-@@ -9720,14 +9720,14 @@
- ;;
- no) echo "$as_me:$LINENO: result: no." >&5
- echo "${ECHO_T}no." >&6
-- E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+# E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
- ac_cv_ec_debug=no
- ;;
- esac
- else
- echo "$as_me:$LINENO: result: no. disabled by default." >&5
- echo "${ECHO_T}no. disabled by default." >&6
-- E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+# E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
- ac_cv_ec_debug=no
-
- fi;
-@@ -10149,6 +10149,8 @@
- if test $ac_cv_ec_ssh = "yes"; then
- CYGWINLIB="$CYGWINLIB cygcrypto.dll cygssl.dll"
- echo "Dissector_ssh" >> ./src/ec_add.def
-+ else
-+ PLUGINS_SOURCES=`echo $PLUGINS_SOURCES | sed 's/.\/plugins\/H03_hydra1\/H03_hydra1.c//g'`
- fi
-
-
-@@ -10302,9 +10304,15 @@
- if test "$ac_cv_ec_plugin" = "yes"; then
-
- PLUGINS=`ls ./plugins | grep -v Make | grep -v CVS | awk ' { printf "%s ", $1 } '`
-+ if test $ac_cv_ec_ssh = "no"; then
-+ PLUGINS=`echo $PLUGINS | sed 's/H03_hydra1//g'`
-+ fi
-
-
- makeplug=`ls ./plugins | grep -v Make | grep -v CVS | awk '{ printf("plugins/%s/Makefile ", $1) }'`
-+ if test $ac_cv_ec_ssh = "no"; then
-+ makeplug=`echo $makeplug | sed 's/plugins\/H03_hydra1\/Makefile//g'`
-+ fi
- makeplug="plugins/Makefile $makeplug"
- MAKEPLUG="1"
- else
diff --git a/net/ettercap/files/patch-plugins::H03_hydra1::Makefile.in b/net/ettercap/files/patch-plugins::H03_hydra1::Makefile.in
deleted file mode 100644
index fe888fe1146b..000000000000
--- a/net/ettercap/files/patch-plugins::H03_hydra1::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/H03_hydra1/Makefile.in.orig Sun May 4 18:58:02 2003
-+++ plugins/H03_hydra1/Makefile.in Sun May 4 18:58:37 2003
-@@ -3,7 +3,7 @@
- DEFS = @PICFLAG@ @DEFS@ -D@OS@
-
- CFLAG = @CFLAGS@
--COPTS = -I../..
-+COPTS = -I../.. @COPTS@
-
- PROG = H03_hydra1
-
diff --git a/net/ettercap/files/patch-plugins::Makefile.in b/net/ettercap/files/patch-plugins::Makefile.in
deleted file mode 100644
index efc2b4ff39dd..000000000000
--- a/net/ettercap/files/patch-plugins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/Makefile.in.orig Sun May 4 01:59:51 2003
-+++ plugins/Makefile.in Sun May 4 02:00:18 2003
-@@ -13,7 +13,7 @@
- make -C $$plug; \
- done
-
--install: plugins
-+install:
- for plug in $(PLUGINS); do \
- $(INSTALL) -d $(DESTDIR)$(PLUGDIR) ; \
- $(INSTALL) -m 700 ./$$plug/ec_$$plug.so $(DESTDIR)$(PLUGDIR) ; \
diff --git a/net/ettercap/pkg-descr b/net/ettercap/pkg-descr
deleted file mode 100644
index 1bf720a2f554..000000000000
--- a/net/ettercap/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Ettercap is a network sniffer/interceptor/logger for switched LAN.
-It uses ARP poisoning and the man-in-the-middle technique to sniff all
-the connections between two host.
-
-It's possible to sniff in three modes:
-
- + IP Based, the packets are filtered on IP source and dest
- + MAC Based, packets filtered on mac address, useful to sniff
- connections through gateway
- + ARP based, uses arp poisoning to sniff in switched lan.
-
-Ettercap also supports character injection and plugins.
-
-WWW: http://ettercap.sourceforge.net/
-
-- George Reid
-greid@ukug.uk.freebsd.org
diff --git a/net/ettercap/pkg-plist b/net/ettercap/pkg-plist
deleted file mode 100644
index 52567c8358cb..000000000000
--- a/net/ettercap/pkg-plist
+++ /dev/null
@@ -1,67 +0,0 @@
-bin/lc-converter
-lib/ettercap/ec_H00_lurker.so
-lib/ettercap/ec_H01_zaratan.so
-lib/ettercap/ec_H02_troll.so
-%%SSL%%lib/ettercap/ec_H03_hydra1.so
-lib/ettercap/ec_H04_hydra2.so
-lib/ettercap/ec_H05_hydra3.so
-lib/ettercap/ec_H06_hydra4.so
-lib/ettercap/ec_H07_hydra5.so
-lib/ettercap/ec_H08_hydra6.so
-lib/ettercap/ec_H09_roper.so
-lib/ettercap/ec_H10_phantom.so
-lib/ettercap/ec_H12_giant1.so
-lib/ettercap/ec_H13_giant2.so
-lib/ettercap/ec_H20_dwarf.so
-lib/ettercap/ec_H30_thief.so
-lib/ettercap/ec_H99_dummy.so
-lib/ettercap/ec_arpcop.so
-lib/ettercap/ec_banshee.so
-lib/ettercap/ec_basilisk.so
-lib/ettercap/ec_beholder.so
-lib/ettercap/ec_confusion.so
-lib/ettercap/ec_dummy.so
-lib/ettercap/ec_golem.so
-lib/ettercap/ec_hunter.so
-lib/ettercap/ec_imp.so
-lib/ettercap/ec_lamia.so
-lib/ettercap/ec_leech.so
-lib/ettercap/ec_ooze.so
-lib/ettercap/ec_phantom.so
-lib/ettercap/ec_shadow.so
-lib/ettercap/ec_spectre.so
-lib/ettercap/ec_triton.so
-@dirrm lib/ettercap
-sbin/ettercap
-%%DATADIR%%/etter.conf
-%%DATADIR%%/etter.dns
-%%DATADIR%%/etter.filter
-%%DATADIR%%/etter.filter.ssh
-%%DATADIR%%/etter.mime
-%%DATADIR%%/etter.passive.os.fp
-%%DATADIR%%/etter.ssl.crt
-%%DATADIR%%/mac-fingerprints
-%%DATADIR%%/nmap-os-fingerprints
-%%DATADIR%%/services
-@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/CONFUSION.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/HYDRA.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-BUGS
-%%PORTDOCS%%%%DOCSDIR%%/PORTINGS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS
-%%PORTDOCS%%%%DOCSDIR%%/README.WIN32
-%%PORTDOCS%%%%DOCSDIR%%/ROPER.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.WIN32
-%%PORTDOCS%%%%DOCSDIR%%/ZARATAN.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/debug.txt
-%%PORTDOCS%%%%DOCSDIR%%/errors.txt
-%%PORTDOCS%%%%DOCSDIR%%/threads.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/flow-extract/distinfo b/net/flow-extract/distinfo
deleted file mode 100644
index 3f38770137b9..000000000000
--- a/net/flow-extract/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (flowextract-2.4.cpio.gz) = b1fdb245df78a5804e42b47c18275aaa
-SIZE (flowextract-2.4.cpio.gz) = 138571
diff --git a/net/flow-extract/files/patch-Makefile b/net/flow-extract/files/patch-Makefile
deleted file mode 100644
index 66d25454ca67..000000000000
--- a/net/flow-extract/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.original Fri Mar 14 13:20:42 2003
-+++ Makefile Fri Mar 14 13:21:33 2003
-@@ -10,10 +10,9 @@
- #
- # For SunOS 5, use LIBS=-lsocket -lnsl
- #
--CC=gcc
--FLAGS=-ggdb3 -gstabs
--LIBS=-L/opt/lib -R/opt/lib /opt/lib/libft.a -lsocket -lnsl -lz
--INCLUDES=-I/opt/include
-+CC ?= cc
-+LIBS = -L%%PREFIX%%/lib -lft -lz
-+INCLUDES = -I%%PREFIX%%/include
- #
- # For Linux
- #
-@@ -30,7 +29,7 @@
-
- #CC = cc
- LIB=$(LIBS)
--CFLAGS=-O $(FLAGS) $(INCLUDES)
-+CFLAGS+=$(INCLUDES)
-
- all: flow-extract
-
diff --git a/net/flow-extract/files/patch-includes b/net/flow-extract/files/patch-includes
deleted file mode 100644
index b5145272ce2b..000000000000
--- a/net/flow-extract/files/patch-includes
+++ /dev/null
@@ -1,70 +0,0 @@
---- extract.c.orig Mon Jun 17 16:59:16 2002
-+++ extract.c Fri Mar 14 13:01:27 2003
-@@ -13,7 +13,6 @@
- #include <sys/stat.h>
- #include <netdb.h>
- #include <errno.h>
--#include <malloc.h>
- #include <unistd.h>
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
-@@ -22,7 +21,6 @@
-
-
- #include <ftlib.h>
--#include <fmt.h>
- #include "extract.h"
- #include "chario.h"
- #include "parser.h"
---- chario.c.orig Mon Jun 17 16:59:16 2002
-+++ chario.c Fri Mar 14 13:01:27 2003
-@@ -11,7 +11,7 @@
- #include <stdio.h>
- #include <sys/stat.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "stdunix.h"
-
- #include "chario.h"
---- grammar.y.orig Mon Jun 17 16:59:16 2002
-+++ grammar.y Fri Mar 14 13:01:27 2003
-@@ -13,7 +13,7 @@
- #include <netdb.h>
- #include <sys/types.h>
- #include <netinet/in.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "lex.h"
- #include "chario.h"
- #include "parser.h"
---- lex.c.orig Mon Jun 17 16:59:16 2002
-+++ lex.c Fri Mar 14 13:01:27 2003
-@@ -9,15 +9,13 @@
- */
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "y.tab.h"
- #include "lex.h"
- #include "chario.h"
-
- #define TRUE 1
- #define FALSE 0
--
--extern int atoi(char *);
-
- static int buflen = 0;
- static int bufptr = 0;
---- builder.c.orig Fri Mar 14 13:03:45 2003
-+++ builder.c Fri Mar 14 13:03:55 2003
-@@ -8,7 +8,7 @@
-
- */
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "stdunix.h"
-
- #include "parser.h"
diff --git a/net/flow-extract/files/patch-proto b/net/flow-extract/files/patch-proto
deleted file mode 100644
index 58af65f5d633..000000000000
--- a/net/flow-extract/files/patch-proto
+++ /dev/null
@@ -1,12 +0,0 @@
---- hosts.c.orig Fri Mar 14 13:06:31 2003
-+++ hosts.c Fri Mar 14 13:06:13 2003
-@@ -24,7 +24,8 @@
- static int hnc_init = 0;
- static unsigned long hit = 0, miss = 0, coll = 0;
-
--sigusr1()
-+void
-+sigusr1(int ignore)
- {
- printf("Hit/Miss: %lu/%lu, Collisions: %lu\n",
- hit, miss,coll);
diff --git a/net/flow-extract/pkg-descr b/net/flow-extract/pkg-descr
deleted file mode 100644
index 49bedaf10ba8..000000000000
--- a/net/flow-extract/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-A copy of this package can be found at:
-WWW: http://security.uchicago.edu/tools/net-forensics
-
-This package is a port of TAMU's extract program from NetLogger to look
-at flow data instead of netlogger data. Blame Larry for its faults, not
-TAMU. Blame me for the FreeBSD port, not Larry :-)
-
-If you don't already have a good guess what this program does and what
-data it is looking for, the odds are that it isn't going to be of much
-help to you. This program only works on Cisco flow data as captured
-with Mark Fullmer's flowtools package. If you don't have that, get that
-first, then look at this program.
-
-In order for this to compile you will need flowtools from Mark
-Fullmer's (net/flow-tools port).
-
----
-E. Larry Lidz, ellidz@uchicago.edu
-Brought to FreeBSD by Marcin Cieslak, saper@system.pl (email bounces now)
diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
deleted file mode 100644
index c1096dddffc4..000000000000
--- a/net/flow-tools/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (flow-tools-0.66.tar.gz) = a32f02be71b29f0d4fe65c0d196d0093
diff --git a/net/flow-tools/files/patch-configs_Makefile b/net/flow-tools/files/patch-configs_Makefile
deleted file mode 100644
index 74b70bc6dadb..000000000000
--- a/net/flow-tools/files/patch-configs_Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- configs/Makefile.am 2003/04/03 18:24:08
-+++ configs/Makefile.am 2003/04/03 18:42:23
-@@ -1,6 +1,6 @@
--ftsymdir=$(localstatedir)/sym
-+ftsymdir=$(localstatedir)/share/flow-tools
- ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
-
--ftcfgdir=$(localstatedir)/cfg
-+ftcfgdir=$(localstatedir)/etc/flow-tools
- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
-
---- configs/Makefile.in 2003/04/03 18:24:08
-+++ configs/Makefile.in 2003/04/03 18:38:09
-@@ -114,10 +114,10 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--ftsymdir = $(localstatedir)/sym
-+ftsymdir = $(localstatedir)/share/flow-tools
- ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
-
--ftcfgdir = $(localstatedir)/cfg
-+ftcfgdir = $(localstatedir)/etc/flow-tools
- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
- subdir = configs
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/net/flow-tools/files/patch-configure b/net/flow-tools/files/patch-configure
deleted file mode 100644
index 40f9f64fcad3..000000000000
--- a/net/flow-tools/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.in 2003/04/03 19:46:23
-+++ configure.in 2003/04/03 19:51:51
-@@ -1,12 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(lib/bit1024.c)
-
--AC_PREFIX_DEFAULT(/usr/local/netflow)
-+AC_PREFIX_DEFAULT(/usr/local)
-
- AM_INIT_AUTOMAKE(flow-tools, 0.66)
- AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in)
-
--CFLAGS="-g -Wall"
-+CFLAGS+="-g -Wall"
-
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/net/flow-tools/files/patch-ftpaths.h b/net/flow-tools/files/patch-ftpaths.h
deleted file mode 100644
index 185e3325dd80..000000000000
--- a/net/flow-tools/files/patch-ftpaths.h
+++ /dev/null
@@ -1,58 +0,0 @@
---- lib/ftpaths.h 2003/04/03 18:24:08
-+++ lib/ftpaths.h 2003/04/03 18:38:09
-@@ -29,16 +29,16 @@
- #ifndef FTPATHS_H
- #define FTPATHS_H
-
--#define FT_PATH_CFG_MAP "/usr/local/netflow/var/cfg/map.cfg"
--#define FT_PATH_CFG_TAG "/usr/local/netflow/var/cfg/tag.cfg"
--#define FT_PATH_CFG_FILTER "/usr/local/netflow/var/cfg/filter.cfg"
--#define FT_PATH_CFG_STAT "/usr/local/netflow/var/cfg/stat.cfg"
--#define FT_PATH_CFG_MASK "/usr/local/netflow/var/cfg/mask.cfg"
-+#define FT_PATH_CFG_MAP "/usr/local/etc/flow-tools/map.cfg"
-+#define FT_PATH_CFG_TAG "/usr/local/etc/flow-tools/tag.cfg"
-+#define FT_PATH_CFG_FILTER "/usr/local/etc/flow-tools/filter.cfg"
-+#define FT_PATH_CFG_STAT "/usr/local/etc/flow-tools/stat.cfg"
-+#define FT_PATH_CFG_MASK "/usr/local/etc/flow-tools/mask.cfg"
-
--#define FT_PATH_SYM_IP_PROT "/usr/local/netflow/var/sym/ip-prot.sym"
--#define FT_PATH_SYM_IP_TYPE "/usr/local/netflow/var/sym/ip-type.sym"
--#define FT_PATH_SYM_TCP_PORT "/usr/local/netflow/var/sym/tcp-port.sym"
--#define FT_PATH_SYM_ASN "/usr/local/netflow/var/sym/asn.sym"
--#define FT_PATH_SYM_TAG "/usr/local/netflow/var/sym/tag.sym"
-+#define FT_PATH_SYM_IP_PROT "/usr/local/share/flow-tools/ip-prot.sym"
-+#define FT_PATH_SYM_IP_TYPE "/usr/local/share/flow-tools/ip-type.sym"
-+#define FT_PATH_SYM_TCP_PORT "/usr/local/share/flow-tools/tcp-port.sym"
-+#define FT_PATH_SYM_ASN "/usr/local/share/flow-tools/asn.sym"
-+#define FT_PATH_SYM_TAG "/usr/local/share/flow-tools/tag.sym"
-
- #endif /* FTPATHS_H */
---- lib/ftpaths.h.in 2003/04/03 18:24:08
-+++ lib/ftpaths.h.in 2003/04/03 18:38:09
-@@ -29,16 +29,16 @@
- #ifndef FTPATHS_H
- #define FTPATHS_H
-
--#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map.cfg"
--#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg"
--#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter.cfg"
--#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat.cfg"
--#define FT_PATH_CFG_MASK "@localstatedir@/cfg/mask.cfg"
-+#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map.cfg"
-+#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag.cfg"
-+#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filter.cfg"
-+#define FT_PATH_CFG_STAT "@localstatedir@/etc/flow-tools/stat.cfg"
-+#define FT_PATH_CFG_MASK "@localstatedir@/etc/flow-tools/mask.cfg"
-
--#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot.sym"
--#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type.sym"
--#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port.sym"
--#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn.sym"
--#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag.sym"
-+#define FT_PATH_SYM_IP_PROT "@localstatedir@/share/flow-tools/ip-prot.sym"
-+#define FT_PATH_SYM_IP_TYPE "@localstatedir@/share/flow-tools/ip-type.sym"
-+#define FT_PATH_SYM_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port.sym"
-+#define FT_PATH_SYM_ASN "@localstatedir@/share/flow-tools/asn.sym"
-+#define FT_PATH_SYM_TAG "@localstatedir@/share/flow-tools/tag.sym"
-
- #endif /* FTPATHS_H */
diff --git a/net/flow-tools/files/patch-src_flow-dscan_c b/net/flow-tools/files/patch-src_flow-dscan_c
deleted file mode 100644
index 7452e866df56..000000000000
--- a/net/flow-tools/files/patch-src_flow-dscan_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_flow-dscan_c,v 1.1 2003/04/15 21:31:57 avsm Exp $
---- src/flow-dscan.c.orig Tue Apr 15 19:53:40 2003
-+++ src/flow-dscan.c Tue Apr 15 19:54:03 2003
-@@ -105,7 +105,7 @@ int main(int argc, char **argv)
- struct dscan_dst *ddp, *ddp2;
- struct dscan_sup *dsp_src, *dsp_dst;
- u_long hash;
-- char fmt_buf1[64], fmt_buf2[64], fmt_buf3[64], fmt_buf4[54];
-+ char fmt_buf1[64], fmt_buf2[64], fmt_buf3[64], fmt_buf4[64];
- int do_dump, do_load;
- int filter_www, filter_mcast, filter_input, filter_output;
- char in_tbl[65536], out_tbl[65536];
diff --git a/net/flow-tools/pkg-descr b/net/flow-tools/pkg-descr
deleted file mode 100644
index f22fa6444a6f..000000000000
--- a/net/flow-tools/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Tools to capture, replicate, print, filter, send and other works
-on Cisco's NetFlow Export.
-
-WWW: http://www.splintered.net/sw/flow-tools/
diff --git a/net/flow-tools/pkg-plist b/net/flow-tools/pkg-plist
deleted file mode 100644
index 8fb43449ad12..000000000000
--- a/net/flow-tools/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/flow-capture
-bin/flow-cat
-bin/flow-dscan
-bin/flow-expire
-bin/flow-export
-bin/flow-fanout
-bin/flow-filter
-bin/flow-gen
-bin/flow-header
-bin/flow-import
-bin/flow-mask
-bin/flow-merge
-bin/flow-nfilter
-bin/flow-print
-bin/flow-receive
-bin/flow-report
-bin/flow-send
-bin/flow-split
-bin/flow-stat
-bin/flow-tag
-bin/flow-xlate
-etc/flow-tools/filter.cfg
-etc/flow-tools/map.cfg
-etc/flow-tools/mask.cfg
-etc/flow-tools/stat.cfg
-etc/flow-tools/tag.cfg
-include/ftconfig.h
-include/ftlib.h
-include/ftpaths.h
-include/ftqueue.h
-include/radix.h
-lib/libft.a
-share/flow-tools/asn.sym
-share/flow-tools/ip-prot.sym
-share/flow-tools/ip-type.sym
-share/flow-tools/tag.sym
-share/flow-tools/tcp-port.sym
-@dirrm etc/flow-tools
-@dirrm share/flow-tools
diff --git a/net/flowscan/distinfo b/net/flowscan/distinfo
deleted file mode 100644
index bbc3e808e600..000000000000
--- a/net/flowscan/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (FlowScan-1.006.tar.gz) = 3c687ae0ffab82dadeb4086f122bcee5
diff --git a/net/flowscan/files/cflowd.sh b/net/flowscan/files/cflowd.sh
deleted file mode 100644
index ae9b46a6fa54..000000000000
--- a/net/flowscan/files/cflowd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-# rc script for cflowd
-# modified to use proper commandline options for flowscan
-# Andreas Klemm <andreas@FreeBSD.org>, So 25 Mär 2001 12:46:10 CEST
-# $FreeBSD$
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-'start')
- [ -x $PREFIX/sbin/cflowdmux -a -s $PREFIX/etc/cflowd.conf ] \
- && $PREFIX/sbin/cflowdmux $PREFIX/etc/cflowd.conf \
- && echo -n " cflowdmux"
- sleep 2
- [ -x $PREFIX/sbin/cflowd -a -s $PREFIX/etc/cflowd.conf ] \
- && $PREFIX/sbin/cflowd -s 300 -O 0 -m $PREFIX/etc/cflowd.conf \
- && echo -n " cflowd"
- sleep 2
- [ -x $PREFIX/sbin/cfdcollect -a -s $PREFIX/etc/cfdcollect.conf ] \
- && $PREFIX/sbin/cfdcollect $PREFIX/etc/cfdcollect.conf \
- && echo -n " cfdcollect"
- ;;
-
-'stop')
- for i in cfdcollect cflowd cflowdmux
- do
- sleep 2
- killall -15 $i && echo "graceful shutdown of $i"
- done
- ;;
-esac
-
-exit 0
diff --git a/net/flowscan/files/flowscan.sh b/net/flowscan/files/flowscan.sh
deleted file mode 100644
index 08e88d0a35a8..000000000000
--- a/net/flowscan/files/flowscan.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-
-# rc script for flowscan
-# Andreas Klemm <andreas@FreeBSD.org>, So 25 Mär 2001 12:46:10 CEST
-# $FreeBSD$
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-awk=/usr/bin/awk
-bindir=$PREFIX/var/db/flows/bin
-grep=/usr/bin/grep
-kill=/bin/kill
-logfile=$PREFIX/var/db/flows/flowscan.log
-perl=/usr/bin/perl
-scandir=$PREFIX/var/db/flows
-
-case "$1" in
-'start')
- [ -x $bindir/flowscan ] \
- && ( cd $scandir \
- && $perl $bindir/flowscan \
- >> $logfile 2>&1 </dev/null \
- > /dev/null & ) \
- && echo -n " flowscan"
- ;;
-
-'stop')
- pid=`ps -ax | $grep "$perl $bindir/flowscan" | $awk '{ print $1 }'`
- if [ -n "$pid" ]; then
- echo "killing flowscan"
- $kill $pid
- fi
- ;;
-esac
-
-exit 0
diff --git a/net/flowscan/pkg-descr b/net/flowscan/pkg-descr
deleted file mode 100644
index a45b99b0aff7..000000000000
--- a/net/flowscan/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-FlowScan is a tool to monitor and graph flow information from
-Cisco, Juniper and Riverstone routers in near real-time.
-
-Amonst many other things, FlowScan can measure and graph traffic
-for applications such as Napster.
-
-A sample of what FlowScan can do is at: http://wwwstats.net.wisc.edu
-
-WWW: http://net.doit.wisc.edu/~plonka/FlowScan/
diff --git a/net/flowscan/pkg-message b/net/flowscan/pkg-message
deleted file mode 100644
index f7709b2877c2..000000000000
--- a/net/flowscan/pkg-message
+++ /dev/null
@@ -1,35 +0,0 @@
-This is not an "easy" port. You have to take many things into consideration,
-what flow data to collect (disk space, etc), how and when to remove unneeded
-flow files. And you have to know, what it is all about. If you don't know
-Cisco NetFlow switching and its data export feature, then I recommend you
-to deinstall this port.
-
-Prerequisites:
-A) You need to read the installation instructions closely, see:
- ${PREFIX}/share/doc/flowscan/INSTALL
-
-B) You need to configure your Cisco Router, to enable Netflow Switching
- and Netflow data export (version 5 flow export format).
-
-PLEASE NOTE, YOU HAVE TO KNOW EXACTLY, IF YOU REALLY WANT TO ENABLE NETFLOW
-SWITCHING ON YOUR CISCO CORE OR DISTRIBUTION ROUTERS, WHAT PERFORMANCE IMPACT
-MIGHT BE INVOLVED WHEN DOING THIS, WITH THE GOAL, NOT TO LOOSE YOUR ROUTING/
-SWITCHING PERFORMANCE. BE WARNED !!!
-
-C) You need to configure SNMP on your Cisco Router.
-
-Post-installation tasks involve:
-a) Configure cflowd properly for your needs, see above mentioned docu !
- Example files reside in ${PREFIX}/etc, files:
- cflowd.conf.example and cfdcollect.conf
-b) Configure flowscan, see above mentioned docu !
- Example files reside in ${PREFIX}/var/db/flows/bin, files:
- "foo".sample ...
-c) Customize and install crontab file, example see:
- ${PREFIX}/share/doc/flowscan/crontab.sample
-d) Activate flowscan startscript by renaming it as usual, see example in:
- ${PREFIX}/etc/rc.d/flowscan.sh.sample
-e) Create graphs using make by customizing the sample Makefile, see docu !
- ${PREFIX}/var/db/flows/graphs/Makefile.sample
- Please note, that the Makefile has to be reconfigured if you add
- or remove protocols in ${PREFIX}/var/db/flows/bin/CampusIO.cf !
diff --git a/net/flowscan/pkg-plist b/net/flowscan/pkg-plist
deleted file mode 100644
index f7cc316fe16f..000000000000
--- a/net/flowscan/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-etc/rc.d/cflowd-flowscan.sh.sample
-var/db/flows/bin/flowscan
-var/db/flows/bin/FlowScan.pm
-var/db/flows/bin/CampusIO.pm
-var/db/flows/bin/SubNetIO.pm
-var/db/flows/bin/locker
-var/db/flows/bin/add_ds.pl
-var/db/flows/bin/add_txrx
-var/db/flows/bin/event2vrule
-var/db/flows/bin/ip2hostname
-var/db/flows/bin/CampusIO.cf.sample
-var/db/flows/bin/Napster_subnets.boulder.sample
-var/db/flows/bin/SubNetIO.cf.sample
-var/db/flows/bin/flowscan.cf.sample
-var/db/flows/bin/local_nets.boulder.sample
-var/db/flows/bin/our_subnets.boulder.sample
-var/db/flows/graphs/Makefile.sample
-share/doc/flowscan/README
-share/doc/flowscan/README.html
-share/doc/flowscan/INSTALL
-share/doc/flowscan/INSTALL.html
-share/doc/flowscan/TODO
-share/doc/flowscan/crontab.sample
-share/doc/flowscan/cflowd.sample
-share/doc/flowscan/flowscan.sample
-@dirrm var/db/flows/graphs
-@dirrm var/db/flows/bin
-@dirrm var/db/flows
-@unexec rmdir %D/var/db 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
-@dirrm share/doc/flowscan
diff --git a/net/fprobe/distinfo b/net/fprobe/distinfo
deleted file mode 100644
index 8044f0fc6627..000000000000
--- a/net/fprobe/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (fprobe-1.0.4.tar.bz2) = 4f549ca54b887f3b78c9c7217ea5647e
-SIZE (fprobe-1.0.4.tar.bz2) = 75059
diff --git a/net/fprobe/pkg-descr b/net/fprobe/pkg-descr
deleted file mode 100644
index 1bf05cb6344a..000000000000
--- a/net/fprobe/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-fprobe: a NetFlow probe - libpcap-based tool that collects
-network traffic data and emit it as NetFlow flows towards the
-specified collector.
-
-WWW: http://fprobe.sourceforge.net
diff --git a/net/fprobe/pkg-plist b/net/fprobe/pkg-plist
deleted file mode 100644
index 199d523e5144..000000000000
--- a/net/fprobe/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/fprobe
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile
index 986ad8b4d4b6..9c362303d0f0 100644
--- a/net/gkrellm_snmp/Makefile
+++ b/net/gkrellm_snmp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://triq.net/gkrellm/
MAINTAINER= eike.bernhardt@gmx.de
COMMENT= A gkrellm SNMP Monitor
-LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp4
+LIB_DEPENDS= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/net/gps/distinfo b/net/gps/distinfo
deleted file mode 100644
index 26e5525265bd..000000000000
--- a/net/gps/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gps-0.9.3-FRC.tar.gz) = 49b0727c0188f75ec2790fef817fa107
-SIZE (gps-0.9.3-FRC.tar.gz) = 94156
diff --git a/net/gps/pkg-descr b/net/gps/pkg-descr
deleted file mode 100644
index 2d1ac8deca07..000000000000
--- a/net/gps/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-The aim of Ghost Port Scan is to provide administrators and pen-testers
-with a tool that allow them to easily test firewalls and get information
-from a remote host.
-
-GPS is a port scanner and a firewall rules disclosure (FWRD) tool, which
-uses IP spoofing, ARP poisoning and some other stratagems in order to
-perform a stealth and untrackable information collect.
-
-As far as GPS needs to sniff the responses from the target host, it
-requires to be run using a loopback or an ethernet interface (including
-cable modem).
-
-WWW: http://gps.sourceforge.net/
diff --git a/net/gps/pkg-plist b/net/gps/pkg-plist
deleted file mode 100644
index fbe2331dde49..000000000000
--- a/net/gps/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/gps
-%%PORTDOCS%%share/doc/gps/FAQ
-%%PORTDOCS%%share/doc/gps/features.html
-%%PORTDOCS%%share/doc/gps/links.html
-%%PORTDOCS%%share/doc/gps/usage.html
-%%PORTDOCS%%@dirrm share/doc/gps
diff --git a/net/hawk/Makefile b/net/hawk/Makefile
index b3cd6a5b88d6..20c2b6a7b8bd 100644
--- a/net/hawk/Makefile
+++ b/net/hawk/Makefile
@@ -16,7 +16,7 @@ COMMENT= Track uptime and DNS status for machines on your networks
RUN_DEPENDS= php-config:${PORTSDIR}/www/mod_php4 \
safe_mysqld:${PORTSDIR}/databases/mysql323-server \
- ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask
+ ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask
BROKEN= "Inconsistent dependencies (mysql-client 3.x and 4.x)"
DEPRECATED= ${BROKEN}
diff --git a/net/icmpmonitor/distinfo b/net/icmpmonitor/distinfo
deleted file mode 100644
index 137b2e92364b..000000000000
--- a/net/icmpmonitor/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (icmpmonitor-1.1.tar.gz) = f7902666a76f77b5f1b9a36f7dc0980c
diff --git a/net/icmpmonitor/files/patch-aa b/net/icmpmonitor/files/patch-aa
deleted file mode 100644
index b13715ae0e7f..000000000000
--- a/net/icmpmonitor/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- icmpmonitor.c.orig Fri Jun 7 00:05:24 2002
-+++ icmpmonitor.c Fri Jun 7 00:05:11 2002
-@@ -160,7 +160,7 @@
- /* protos */
- static void logopen(void);
- static void logclose(void);
--static void log(int type, char *format, ...);
-+static void log(int type, char *format, ...) __printflike(2, 3);
- static int gethostaddr(const char *name);
- static void read_hosts(const char *cfg_file_name);
- static void init_hosts(void);
-@@ -698,7 +698,7 @@
- # endif
- #endif
- #if HAVE_SYSLOG
-- syslog(type,buffer);
-+ syslog(type,"%s",buffer);
- #endif
- } else
- {
diff --git a/net/icmpmonitor/pkg-descr b/net/icmpmonitor/pkg-descr
deleted file mode 100644
index d1153f81930e..000000000000
--- a/net/icmpmonitor/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The icmpmonitor uses the Internet Control Message Protocol (ICMP) "ECHO"
-facility, monitors several hosts, and notify admin if some of them are
-down.
-
-WWW: http://www.crocodile.org/software.html
diff --git a/net/icmpquery/distinfo b/net/icmpquery/distinfo
deleted file mode 100644
index 3487bcab0115..000000000000
--- a/net/icmpquery/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (icmpquery.c) = 49ec82cc335951652662211fd1759cbd
diff --git a/net/icmpquery/files/Makefile b/net/icmpquery/files/Makefile
deleted file mode 100644
index 45bf000780e4..000000000000
--- a/net/icmpquery/files/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Small Makefile for icmpquery.
-#
-# $FreeBSD$
-#
-
-PROG=icmpquery
-
-.include <bsd.prog.mk>
diff --git a/net/icmpquery/pkg-descr b/net/icmpquery/pkg-descr
deleted file mode 100644
index abe44fd5ba54..000000000000
--- a/net/icmpquery/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A small utility for finding out time & netmask through ICMP.
-
-Written by David G. Andersen (danderse@cs.utah.edu)
diff --git a/net/ifgraph/distinfo b/net/ifgraph/distinfo
deleted file mode 100644
index caf4f48156ac..000000000000
--- a/net/ifgraph/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ifgraph-0.4.9.tar.gz) = 9da25053e0aa376e5c7ba5c4e4c48dfa
diff --git a/net/ifgraph/files/crontab.in b/net/ifgraph/files/crontab.in
deleted file mode 100644
index 6d856dd91303..000000000000
--- a/net/ifgraph/files/crontab.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# crontab file for ifGraph
-#*/5 * * * * %%PREFIX%%/bin/ifgraph.pl -c %%PREFIX%%/etc/ifgraph.conf > /dev/null
-#*/5 * * * * %%PREFIX%%/bin/makegraph.pl -c %%PREFIX%%/etc/ifgraph.conf > /dev/null
diff --git a/net/ifgraph/files/patch-find-if.pl b/net/ifgraph/files/patch-find-if.pl
deleted file mode 100644
index c547871067eb..000000000000
--- a/net/ifgraph/files/patch-find-if.pl
+++ /dev/null
@@ -1,22 +0,0 @@
---- find-if.pl.orig Sat Sep 20 14:35:38 2003
-+++ find-if.pl Sat Sep 20 14:36:07 2003
-@@ -19,10 +19,6 @@
- #Sugestoes e criticas (sem flames!!) mailto:sartori@ifgraph.org
- #Visite: http://www.ifgraph.org
-
--# Let's find out where we are
--use FindBin;
--# # Found, now we add it to the @INC
--use lib "$FindBin::Bin/lib";
- # # We are strict
- use strict;
- # # Get the command line options
-@@ -30,7 +26,7 @@
- getopts('adhims');
-
- # We just nedd the basic features here
--use Net::SNMP_365;
-+use Net::SNMP;
-
- use vars qw($response $response2 $response3 $response4 $response5 $response6 $response7 $response8 $response9
- $response10 $response11 $response12 $opt_d @ips $ip $mac $opt_a $opt_h $opt_m $opt_i $opt_s $if $desc $stat $ocin
diff --git a/net/ifgraph/files/patch-ifgraph.conf b/net/ifgraph/files/patch-ifgraph.conf
deleted file mode 100644
index 9dc20049c6b6..000000000000
--- a/net/ifgraph/files/patch-ifgraph.conf
+++ /dev/null
@@ -1,17 +0,0 @@
---- ifgraph.conf.orig Fri Sep 19 19:06:49 2003
-+++ ifgraph.conf Fri Sep 19 19:08:52 2003
-@@ -19,10 +19,10 @@
- # will not work as expected.
-
- [global]
--rrdtool = /usr/local/bin/rrdtool
--rrddir = /home/someuser/rrdfiles
--graphdir= /home/someuser/public_html/ifgraph-0.4.9
--template=/home/someuser/ifgraph-0.4.9/templates/en
-+rrdtool = %%PREFIX%%/bin/rrdtool
-+rrddir = %%PREFIX%%/var/ifgraph
-+graphdir = %%PREFIX%%/ifgraph/htdocs
-+template = %%PREFIX%%/ifgraph/templates/en
- imgformat=PNG
- # those are the default configurations, should be
- # overriden in each target
diff --git a/net/ifgraph/files/patch-ifgraph.pl b/net/ifgraph/files/patch-ifgraph.pl
deleted file mode 100644
index 619831a4e173..000000000000
--- a/net/ifgraph/files/patch-ifgraph.pl
+++ /dev/null
@@ -1,29 +0,0 @@
---- ifgraph.pl.orig Sun Sep 28 22:29:51 2003
-+++ ifgraph.pl Sun Sep 28 22:30:19 2003
-@@ -19,10 +19,6 @@
- #Sugestoes e criticas (sem flames!!) mailto:sartori@ifgraph.org
- #Visite: http://www.ifgraph.org
-
--# Let's find out where we are
--use FindBin;
--# Found, now we add it to the @INC
--use lib "$FindBin::Bin/lib";
- # We are strict
- use strict;
- # Get the command line options
-@@ -32,14 +28,7 @@
- getopt('cltF');
- getopts('dh');
-
--# If the perl is older, we have to fetch the older Net::SNMP library
--if ($] < 5.006) {
-- &debug("Warning: Older perl version $], we will use Net::SNMP 3.65\n");
-- require Net::SNMP_365;
--} else {
-- &debug("Starting ifgraph 0.4.9 with perl $], Net::SNMP 4.3\n");
-- require Net::SNMP;
--}
-+use Net::SNMP;
-
- # SIGINT call
- $SIG{INT}=\&sigint;
diff --git a/net/ifgraph/files/patch-makegraph.pl b/net/ifgraph/files/patch-makegraph.pl
deleted file mode 100644
index 045dabe5dfc0..000000000000
--- a/net/ifgraph/files/patch-makegraph.pl
+++ /dev/null
@@ -1,27 +0,0 @@
---- makegraph.pl.orig Sun Sep 21 12:30:49 2003
-+++ makegraph.pl Sun Sep 21 12:32:08 2003
-@@ -19,8 +19,6 @@
- #Sugestoes e criticas (sem flames!!) mailto:sartori@ifgraph.org
- #Visite: http://www.ifgraph.org
-
--use FindBin;
--use lib "$FindBin::Bin/lib";
- use strict;
- use Getopt::Std;
- use vars qw($opt_d $opt_c $opt_B $opt_b $opt_h $opt_g $opt_t $opt_T $targetindex
-@@ -30,14 +28,7 @@
- getopt('ctT');
- getopts('Bbgdh');
-
--# If the perl is older, we have to fetch the older Net::SNMP library
--if ($] < 5.006) {
-- &debug("Warning: Older perl version $], we will use Net::SNMP 3.65\n");
-- require Net::SNMP_365;
--} else {
-- &debug("Starting ifgraph 0.4.9 with perl $[, Net::SNMP 4.3\n");
-- require Net::SNMP;
--}
-+use Net::SNMP;
-
- # HELP
- if (defined($opt_h)) {
diff --git a/net/ifgraph/pkg-deinstall b/net/ifgraph/pkg-deinstall
deleted file mode 100644
index 5724a05f20ff..000000000000
--- a/net/ifgraph/pkg-deinstall
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-
-DEINSTALL)
- echo '---> Starting deinstall script:'
-
- echo '---> Zeroing crontab(5) file belonging to user "%%USER%%"'
- /usr/bin/crontab -u %%USER%% /dev/null
- echo ' (The crontab(5) will be deleted completely when user "%%USER%%" is removed.)'
-
- ;;
-
-POST-DEINSTALL)
- echo '---> Starting post-deinstall script:'
-
- if [ -f %%PREFIX%%/etc/ifgraph.conf -o \
- -d %%PREFIX%%/ifgraph -o \
- -d %%PREFIX%%/var/ifgraph ]; then
- echo '---> You seem to have made some custom ifGraph configuration.'
- echo '---> - The "%%USER%%" user and "%%GROUP%%" group were therefore not deleted.'
- echo '---> - You may delete them with "pw groupdel %%GROUP%%; pw userdel %%USER%%".'
-
- else
- echo '---> Removing group "%%GROUP%%"'
- /usr/sbin/pw groupdel -n %%GROUP%%
- echo '---> Removing user "%%USER%%"'
- echo 'y' | /usr/sbin/pw userdel -n %%USER%%
- fi
-
- ;;
-
-esac
diff --git a/net/ifgraph/pkg-descr b/net/ifgraph/pkg-descr
deleted file mode 100644
index 75d8fcf118c9..000000000000
--- a/net/ifgraph/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-ifGraph is a set of Perl scripts created to help network administrators
-to visualize network flow on a daily, weekly, monthly, and yearly basis.
-The graphics are created with RRDTool, and it shows bytes (in/out) and
-errors for each interface. It also shows the current/average/max use and
-the respective link/interface usage in percentages. The program also
-outputs HTML files to make the visualization of the PNG/GIF/GD images
-more friendly and easy.
-
-WWW: http://ifgraph.lrv.ufsc.br
-
-- Lars Thegler
-lars@thegler.dk
diff --git a/net/ifgraph/pkg-install b/net/ifgraph/pkg-install
deleted file mode 100644
index 98d6edc4c506..000000000000
--- a/net/ifgraph/pkg-install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-
-PRE-INSTALL)
- echo "---> Starting pre-install script:"
-
- if [ -z "%%USER%%" -o \
- -z "%%GROUP%%" ]; then
- echo "ERROR: A required pragma was empty"
- exit 1
- fi
-
- if pw showgroup "%%GROUP%%" 2>/dev/null; then
- echo "---> Using existing group \"%%GROUP%%\""
- else
- echo "---> Adding group \"%%GROUP%%\""
- pw addgroup %%GROUP%% -h - || exit 1
- fi
-
- # Create user if required
- if pw showuser "%%USER%%" 2>/dev/null; then
- echo "---> Using existing user \"%%USER%%\""
- else
- echo "---> Adding user \"%%USER%%\""
- pw adduser %%USER%% -g %%GROUP%% -h - \
- -s "/sbin/nologin" -c "ifGraph User" || exit 1
- fi
-
- ;;
-
-POST-INSTALL)
- echo "---> Starting post-install script:"
-
- if [ -z "%%USER%%" -o \
- -z "%%PREFIX%%" ]; then
- echo "ERROR: A required pragma was empty"
- exit 1
- fi
-
- echo "---> Creating crontab(5) file for user \"%%USER%%\""
- crontab -u "%%USER%%" "%%PREFIX%%/ifgraph/crontab.in" || exit 1
-
- ;;
-
-esac
diff --git a/net/ifgraph/pkg-message b/net/ifgraph/pkg-message
deleted file mode 100644
index 043a08c75042..000000000000
--- a/net/ifgraph/pkg-message
+++ /dev/null
@@ -1,32 +0,0 @@
-=================================================================
-
-ifGraph has now been installed in %%PREFIX%%/ifgraph/.
-
-NOTE: A sample configuration files has been placed at:
-
- %%PREFIX%%/etc/ifgraph.conf.sample
-
-You need to copy this to
-
- %%PREFIX%%/etc/ifgraph.conf
-
-and edit it to suit your requirements.
-
-A sample crontab(5) entry has been installed. You need to activate
-this to start measurements and graph generation. You can do this
-with
-
- crontab -u ifgraph -e
-
-Documentation is installed in
-
- %%DOCSDIR%%/
-
-To enable Apache web access, add the following to your
-%%PREFIX%%/etc/apache/httpd.conf:
-
- Alias /ifgraph/ %%PREFIX%%/ifgraph/htdocs/
-
-Enjoy!
-
-=================================================================
diff --git a/net/ifgraph/pkg-plist b/net/ifgraph/pkg-plist
deleted file mode 100644
index af0d537080fc..000000000000
--- a/net/ifgraph/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-@exec mkdir -p %D/ifgraph/htdocs
-@exec mkdir -p %D/var/ifgraph
-@exec chown ifgraph:ifgraph %D/var/ifgraph
-bin/find-if.pl
-bin/ifgraph.pl
-bin/makegraph.pl
-etc/ifgraph.conf.sample
-ifgraph/crontab.in
-ifgraph/templates/ifgraph-logo.jpg
-ifgraph/templates/en/main-header.html
-ifgraph/templates/en/if-data.html
-ifgraph/templates/en/if-header.html
-ifgraph/templates/en/if-trailer.html
-ifgraph/templates/en/main-data.html
-ifgraph/templates/en/main-trailer.html
-ifgraph/templates/pt-br/main-header.html
-ifgraph/templates/pt-br/if-data.html
-ifgraph/templates/pt-br/if-header.html
-ifgraph/templates/pt-br/if-trailer.html
-ifgraph/templates/pt-br/main-data.html
-ifgraph/templates/pt-br/main-trailer.html
-@dirrm ifgraph/templates/en/
-@dirrm ifgraph/templates/pt-br/
-@dirrm ifgraph/templates
-@unexec rmdir %D/ifgraph 2>/dev/null || true
-@unexec rmdir %D/var/ifgraph 2>/dev/null || true
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/INSTALACAO
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
-%%PORTDOCS%%%%DOCSDIR%%/MUDANCAS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile
index 8f01ba39b636..76d1d159ebbe 100644
--- a/net/ifstat/Makefile
+++ b/net/ifstat/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= krion@FreeBSD.org
COMMENT= Network interface statistics monitoring tool
-LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net/net-snmp
+LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
USE_SIZE= yes
GNU_CONFIGURE= yes
diff --git a/net/iftop/distinfo b/net/iftop/distinfo
deleted file mode 100644
index b17689f802ff..000000000000
--- a/net/iftop/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (iftop-0.15.tar.gz) = 87a0a93b023d73429b0bfc5965a66d2e
-SIZE (iftop-0.15.tar.gz) = 153146
diff --git a/net/iftop/files/patch-cfgfile.c b/net/iftop/files/patch-cfgfile.c
deleted file mode 100644
index 148cd8844a20..000000000000
--- a/net/iftop/files/patch-cfgfile.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cfgfile.c.orig Tue Nov 11 22:10:29 2003
-+++ cfgfile.c Tue Nov 11 22:10:43 2003
-@@ -8,6 +8,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/types.h>
-
- #include "stringmap.h"
- #include "iftop.h"
diff --git a/net/iftop/pkg-descr b/net/iftop/pkg-descr
deleted file mode 100644
index 768905ed87a4..000000000000
--- a/net/iftop/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-iftop provides real-time bandwidth usage information on a
-specified interface, listed by host pairs.
-
-WWW: http://www.ex-parrot.com/~pdw/iftop/
diff --git a/net/iftop/pkg-plist b/net/iftop/pkg-plist
deleted file mode 100644
index 4198288675c7..000000000000
--- a/net/iftop/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/iftop
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
diff --git a/net/iog/distinfo b/net/iog/distinfo
deleted file mode 100644
index 11852f877393..000000000000
--- a/net/iog/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (iog-1.03.tgz) = 3b45e60e7420e57cd25f5499ee8d5f81
diff --git a/net/iog/pkg-descr b/net/iog/pkg-descr
deleted file mode 100644
index e5d199449cee..000000000000
--- a/net/iog/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-IOG is a network I/O byte grapher made to graph cumulative KB/MB/GB
-totals for hours/days and months. It is intended to be simple, fast
-(support thousands of hosts) and integrate well with MRTG. Data for
-each host is updated hourly and HTML graphs are created. It uses a
-data consolidation algorithm which allows for a small, non-growing
-database file for each host. No external graphing libs or
-executables are required.
-
-IOG has been used in several production ISP environments,
-including at the authors company, Dynamic Internet (dyni.net).
-
--Larry Rosenman <ler@lerctr.org>
diff --git a/net/iog/pkg-install b/net/iog/pkg-install
deleted file mode 100644
index ce43dfee9316..000000000000
--- a/net/iog/pkg-install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
- exit 0
-fi
-
-USER=iog
-# group selected to be www since the webserver has to be able to serve it
-GROUP=www
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
- if pw useradd ${USER} -g ${GROUP} -h - \
- -s "/sbin/nologin" -d "${PREFIX}/iog" \
- -c "iog Monitoring Owner"; \
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
-fi
-exit 0
diff --git a/net/iog/pkg-plist b/net/iog/pkg-plist
deleted file mode 100644
index 599f74e62128..000000000000
--- a/net/iog/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-iog/iog-%%VERSION%%/Artistic
-iog/iog-%%VERSION%%/BER.pm
-iog/iog-%%VERSION%%/README
-iog/iog-%%VERSION%%/SNMP_Session.pm
-iog/iog-%%VERSION%%/howto-iog.html
-iog/iog-%%VERSION%%/in.gif
-iog/iog-%%VERSION%%/index.php
-iog/iog-%%VERSION%%/iog
-@unexec if cmp -s %D/iog/iog-%%VERSION%%/iog.cfg %D/iog/iog-%%VERSION%%/iog.cfg.sample; then rm -f %D/iog/iog-%%VERSION%%/iog.cfg; fi
-iog/iog-%%VERSION%%/iog.cfg.sample
-iog/iog-%%VERSION%%/ioglogo.gif
-iog/iog-%%VERSION%%/out.gif
-iog/iog
-@unexec rmdir %D/iog/iog-%%VERSION%% 2>/dev/null || true
-@unexec rmdir %D/iog 2>/dev/null || true
diff --git a/net/ipacctd/distinfo b/net/ipacctd/distinfo
deleted file mode 100644
index 137a298715b5..000000000000
--- a/net/ipacctd/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ipacctd-1.46.tar.gz) = 34cce133b21973eaf050a9df943b7eff
diff --git a/net/ipacctd/files/ipacctd.sh.sample b/net/ipacctd/files/ipacctd.sh.sample
deleted file mode 100644
index 90e85c15b81d..000000000000
--- a/net/ipacctd/files/ipacctd.sh.sample
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-# If there is a global system configuration file, suck it in.
-if [ -r /etc/defaults/rc.conf ]; then
- . /etc/defaults/rc.conf
- source_rc_confs
-elif [ -r /etc/rc.conf ]; then
- . /etc/rc.conf
-fi
-
-ipacctd_enable=${ipacctd_enable:-YES}
-ipacctd_program=${ipacctd_program:-${PREFIX}/sbin/ipacctd}
-ipacctd_flags=${ipacctd_flags:-"-v"}
-
-#ipacctd_log_base=${ipacctd_log_base:-/var/log/ipacct}
-#ipacctd_log_ext=${ipacctd_log_ext:-%Y-%m-%d-%T}
-
-ipacctd_rules="xl0 ppp0"
-
-ipacctd_rule_xl0_flags=""
-ipacctd_rule_xl0_pid="/var/run/ipacctd.xl0"
-
-ipacctd_rule_ppp0_flags=""
-ipacctd_rule_ppp0_pid="/var/run/ipacctd.ppp0"
-
-case "$1" in
-start)
- case "${ipacctd_enable}" in
- [Yy][Ee][Ss])
- if [ -f ${ipacctd_program} ]; then
- echo -n ' ipacctd ['
-
- for rule in ${ipacctd_rules}; do
- echo -n " ${rule}"
-
- eval ipacctd_rule_flags=\$ipacctd_rule_${rule}_flags
- if [ -z $ipacctd_rule_flags ]; then
- echo " you must define flags for rule ${rule}"
- exit 1
- fi
-
- eval ipacctd_rule_pid=\${ipacctd_rule_${rule}_pid:-"/var/run/ipacctd.${rule}"}
-
- ${ipacctd_program} \
- ${ipacctd_flags} \
- ${ipacctd_rule_flags} \
- -r ${ipacctd_rule_pid}
-
- done
- echo -n " ]"
- fi
- ;;
- esac
- ;;
-stop)
- for rule in ${ipacctd_rules}; do
- eval ipacctd_rule_pid=\${ipacctd_rule_${rule}_pid:-"/var/run/ipacctd.${rule}"}
- kill `cat ${ipacctd_rule_pid}`
- done
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
-
diff --git a/net/ipacctd/pkg-descr b/net/ipacctd/pkg-descr
deleted file mode 100644
index 26a342ef10b7..000000000000
--- a/net/ipacctd/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The ipacctd is intended for IP accounting. divert(4) and corresponding
-ipfw(8) rules are used for obtaining IP packets.
-
-Author: Roman V. Palagin <romanp@unshadow.net>
-FTP: ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/ipacctd/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/net/ipacctd/pkg-plist b/net/ipacctd/pkg-plist
deleted file mode 100644
index 5715a08c9d96..000000000000
--- a/net/ipacctd/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-sbin/ipacctd
-etc/rc.d/%%STARTUP_SCRIPT%%
-%%PORTDOCS%%%%DOCSDIR%%/ru/README.ipacctd
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ipaudit/distinfo b/net/ipaudit/distinfo
deleted file mode 100644
index 5f885bd5239e..000000000000
--- a/net/ipaudit/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ipaudit-0.95.tgz) = 8581ea00ebb854806b19a3759764f536
diff --git a/net/ipaudit/files/patch-Makefile b/net/ipaudit/files/patch-Makefile
deleted file mode 100644
index 3e4aa81735ce..000000000000
--- a/net/ipaudit/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig Wed Oct 18 01:38:27 2000
-+++ Makefile Tue Jul 15 18:20:49 2003
-@@ -8,10 +8,10 @@
- BIN=ipaudit ipstrings total pdate
-
- MAKE=make
--CIDIR=-I/usr/include/pcap
-+#CIDIR=-I/usr/include/pcap
-
- all:
-- $(MAKE) -C src all
-+ cd src && $(MAKE) all
-
- clean:
- $(MAKE) -C src clean
diff --git a/net/ipaudit/files/patch-src::Makefile b/net/ipaudit/files/patch-src::Makefile
deleted file mode 100644
index 7024a9dec573..000000000000
--- a/net/ipaudit/files/patch-src::Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/Makefile.orig Mon Jan 8 05:56:59 2001
-+++ src/Makefile Tue Jul 15 18:19:58 2003
-@@ -1,36 +1,36 @@
--CIDIR=-I/usr/include/pcap
-+#CIDIR=-I/usr/include/pcap
-
- #LIB=../../libpcap-0.5/libpcap.a
- LIB=-lpcap
-
--all: ipaudit total ipstrings beta-dir
-+all: ipaudit total ipstrings
-
- ipaudit: ipaudit.o hash.o
-- $(CC) -o ipaudit ipaudit.o hash.o $(LIB)
-+ $(CC) $(CFLAGS) -o ipaudit ipaudit.o hash.o $(LIB)
-
- total: total.o hash.o
-- $(CC) -o total total.o hash.o -lm
-+ $(CC) $(CFLAGS) -o total total.o hash.o -lm
-
- ipstrings: ipstrings.o
-- $(CC) -o ipstrings ipstrings.o $(LIB)
-+ $(CC) $(CFLAGS) -o ipstrings ipstrings.o $(LIB)
-
- ipaudit.o: ipaudit.c hash.h
-- $(CC) -c ipaudit.c $(CIDIR) $(DFLAGS)
-+ $(CC) $(CFLAGS) -c ipaudit.c $(CIDIR) $(DFLAGS)
-
- hash.o: hash.c hash.h
-- $(CC) -c hash.c
-+ $(CC) $(CFLAGS) -c hash.c
-
- total.o: total.c hash.c hash.h
-- $(CC) -c total.c
-+ $(CC) $(CFLAGS) -c total.c
-
- ipstrings.o: ipstrings.c
-- $(CC) -c ipstrings.c $(CIDIR) $(DFLAGS)
-+ $(CC) $(CFLAGS) -c ipstrings.c $(CIDIR) $(DFLAGS)
-
- iprange: iprange.c
- $(CC) -g -o iprange iprange.c
-
--beta-dir:
-- $(MAKE) -C beta
-+#beta-dir:
-+# $(MAKE) -C beta
-
- clean:
- rm -f *.o
diff --git a/net/ipaudit/files/patch-src::hash.h b/net/ipaudit/files/patch-src::hash.h
deleted file mode 100644
index ed2cf54dd670..000000000000
--- a/net/ipaudit/files/patch-src::hash.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hash.h.orig Tue Jul 15 16:53:16 2003
-+++ src/hash.h Tue Jul 15 16:53:49 2003
-@@ -1,6 +1,8 @@
- #ifndef _HASH_H
- #define _HASH_H
-
-+#include <sys/types.h>
-+
- /*
- ------------------------------------------------------------------------
- Type Definitions
diff --git a/net/ipaudit/pkg-descr b/net/ipaudit/pkg-descr
deleted file mode 100644
index 0c8f53e42059..000000000000
--- a/net/ipaudit/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-Would you like to summarize and/or log network activity down to the ip address
-and port level of detail, but not record every packet?
-
-Ipaudit provides that ability.
-
-Ipaudit listens to a network device in promiscuous mode, and records of every
-'connection', each conversation between two ip addresses. A unique connection
-is determined by the ip addresses of the two machines, the protocol used
-between them and the port numbers (if they are communicating via udp or tcp).
-
-It uses a hash table to keep track of the number of bytes and packets in both
-directions. When ipaudit receives a signal SIGTERM (kill) or SIGINT (kill -2,
-usually the same as a Control-C), it stops collecting data and writes the
-tabulated results.
-
-Ipaudit is built using the pcap packet capture library to read the network port
-from LBNL Network Research Group.
-
-WWW: http://ipaudit.sourceforge.net/
-
-Maintainer: "Ying-Chieh Chen" <yinjieh@csie.nctu.edu.tw>
diff --git a/net/ipaudit/pkg-message b/net/ipaudit/pkg-message
deleted file mode 100644
index e3befb17c329..000000000000
--- a/net/ipaudit/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-***********************************************************
-
- Please copy %%PREFIX%%/etc/ipaudit.conf.sample to
- %%PREFIX%%/etc/ipaudit.conf by yourself and modify it,
- then start ipaudit with
-
- 'ipaudit -g %%PREFIX%%/etc/ipaudit.conf' command.
-
- Thanks.
-
-***********************************************************
diff --git a/net/ipaudit/pkg-plist b/net/ipaudit/pkg-plist
deleted file mode 100644
index 80403c68db4a..000000000000
--- a/net/ipaudit/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/ipaudit
-bin/ipstrings
-bin/total
-etc/ipaudit.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ipcad/distinfo b/net/ipcad/distinfo
deleted file mode 100644
index 9b4fb2781ca2..000000000000
--- a/net/ipcad/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ipcad-2.8.2.tar.gz) = cf1cf2ef6144ea63b7287b676e8d9b14
diff --git a/net/ipcad/files/ipcad.sh.tmpl b/net/ipcad/files/ipcad.sh.tmpl
deleted file mode 100644
index 6fda2ff21dce..000000000000
--- a/net/ipcad/files/ipcad.sh.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# ipcad startup script example.
-
-case "$1" in
-start)
- if [ -x !!PREFIX!!/bin/ipcad -a -f !!PREFIX!!/etc/ipcad.conf ]; then
- !!PREFIX!!/bin/ipcad -rds && echo -n ' ipcad'
- fi
- ;;
-stop)
- /usr/bin/killall ipcad && /bin/echo -n ' ipcad'
- ;;
-*)
- /bin/echo "Usage: `basename $0` {start|stop}" >&2
- exit 64
- ;;
-esac
-
-exit 0
diff --git a/net/ipcad/pkg-descr b/net/ipcad/pkg-descr
deleted file mode 100644
index dd42f9f96f73..000000000000
--- a/net/ipcad/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-IPCAD is an ip accounting daemon. It uses bpf or pcap to access interfaces
-and gather ip statistics. Collected numbers are arranged to form an
-address-to-address flow pairs and than can be accessed via rsh in Cisco
-fashion.
-
-See README file and man pages for details.
-
-WWW: http://www.spelio.net.ru/soft/
-
---
-Lev Walkin
-vlm@spelio.net.ru
diff --git a/net/ipcad/pkg-message b/net/ipcad/pkg-message
deleted file mode 100644
index 60ecea5cd2d1..000000000000
--- a/net/ipcad/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-
-To configure this package, adjust ${PREFIX}/etc/ipcad.conf from
-${PREFIX}/etc/ipcad.conf.sample, then start "ipcad -rds"
-You should be able to "rsh localhost sh ip accounting" after that
-
-===========================================================================
diff --git a/net/ipcad/pkg-plist b/net/ipcad/pkg-plist
deleted file mode 100644
index ce68298b7e98..000000000000
--- a/net/ipcad/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/ipcad
-etc/ipcad.conf.sample
-etc/rc.d/ipcad.sh
diff --git a/net/ipcalc/distinfo b/net/ipcalc/distinfo
deleted file mode 100644
index 5069d3dc8784..000000000000
--- a/net/ipcalc/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ipcalc.pl) = e0321f2e796ba541c6afc0a8570f7d09
diff --git a/net/ipcalc/pkg-descr b/net/ipcalc/pkg-descr
deleted file mode 100644
index 482494aa4bf3..000000000000
--- a/net/ipcalc/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-ipcalc takes an IP address and netmask and calculates the resulting broadcast,
-network, Cisco wildcard mask, and host range. By giving a second netmask, you
-can design sub- and supernetworks. It is also intended to be a teaching tool
-and presents the results as easy-to-understand binary values.
-
-Enter your netmask(s) in CIDR notation (/25) or dotted decimals
-(255.255.255.0). Inverse netmasks are recognized.
-
-WWW: http://jodies.de/ipcalc/
-
-- Pete
-petef@databits.net
diff --git a/net/ipfm/distinfo b/net/ipfm/distinfo
deleted file mode 100644
index 373ac4e5245c..000000000000
--- a/net/ipfm/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ipfm-0.11.5.tgz) = 7331aeeabf47cbd37603abe75355fe20
diff --git a/net/ipfm/pkg-descr b/net/ipfm/pkg-descr
deleted file mode 100644
index e42b27691f81..000000000000
--- a/net/ipfm/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-IP Flow Meter is a bandwidth analysis tool, that measures how much bandwidth
-specified hosts use on their Internet link.
-
-It is written using libpcap, so it ought to be portable.
-
-WWW: http://robert.cheramy.net/ipfm/
-
-- Alex Dupre
-sysadmin@alexdupre.com
diff --git a/net/ipfm/pkg-plist b/net/ipfm/pkg-plist
deleted file mode 100644
index 51974749b2b9..000000000000
--- a/net/ipfm/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin/ipfm
-etc/ipfm.conf
-@exec mkdir -p /var/log/ipfm
-@unexec rmdir /var/log/ipfm 2>/dev/null || echo "The logs will be left in /var/log/ipfm after the port is deinstalled."
diff --git a/net/ipv6calc/distinfo b/net/ipv6calc/distinfo
deleted file mode 100644
index 4f78545f4526..000000000000
--- a/net/ipv6calc/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ipv6calc-0.46.tar.gz) = 5aa60b8a744fe53164c68309898b4e8e
diff --git a/net/ipv6calc/pkg-descr b/net/ipv6calc/pkg-descr
deleted file mode 100644
index 0c818c2a12bd..000000000000
--- a/net/ipv6calc/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-ipv6calc will do some format changes and calculations for you
-
-Intention:
-* This utility can be used by the IPv6 enabled initscripts for
- better duplicate address detection on setup of IPv6 addresses.
-
-WWW: http://www.bieringer.de/linux/IPv6/tools/
diff --git a/net/ipv6calc/pkg-plist b/net/ipv6calc/pkg-plist
deleted file mode 100644
index 3509d7ff1b29..000000000000
--- a/net/ipv6calc/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/ipv6calc
-bin/ipv6logconv
diff --git a/net/irrtoolset/distinfo b/net/irrtoolset/distinfo
deleted file mode 100644
index 38744390d41a..000000000000
--- a/net/irrtoolset/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (IRRToolSet-4.7.3.tar.gz) = fcf8305464c8ae5886c41dcb8d85e53d
diff --git a/net/irrtoolset/pkg-descr b/net/irrtoolset/pkg-descr
deleted file mode 100644
index b131fb3f2f1e..000000000000
--- a/net/irrtoolset/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-RAToolSet is a suite of policy analysis tools. It is implemented in C++ on a
-UNIX platform. It has been ported successfully to many platforms including
-Sun Sparc stations running SunOS 4.1.3 or Solaris, FreeBSD, DEC Alphas
-running OSF/1, and BSDI. It contains the following programs:
-
-RtConfig routing policies analyzer and router configuration tool
-
-peval a low-level policy evaluation tool
-
-roe route object editor
-
-CIDRAdvisor suggests safe cidr aggregates
-
-aoe autonomous system object editor
-
-prpath enumerates a list of patchs between ASes and destinations
-
-prtraceroute prints route and policy information packets take to a
- network host
-
-rpslcheck sytax checks the aut-num policy for an AS.
-
-WWW: http://www.ripe.net/db/irrtoolset/
diff --git a/net/irrtoolset/pkg-plist b/net/irrtoolset/pkg-plist
deleted file mode 100644
index be6868193bc0..000000000000
--- a/net/irrtoolset/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/rpslcheck
-bin/peval
-bin/prpath
-bin/RtConfig
-bin/CIDRAdvisor
-bin/roe
-bin/aoe
-bin/prtraceroute
diff --git a/net/isic/distinfo b/net/isic/distinfo
deleted file mode 100644
index 0ba0790827a9..000000000000
--- a/net/isic/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (isic-0.05.tgz) = 652d07978f050f090924bd98d2548cd7
diff --git a/net/isic/pkg-descr b/net/isic/pkg-descr
deleted file mode 100644
index 4d5318c62934..000000000000
--- a/net/isic/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-IP Stack Integrity Checker
-
-Its purpose is to test the stability of an IP Stack and its component stacks
-(TCP, UDP, ICMP et. al.) It does this be generating random packets of the
-desired protocol. The packets can have tendancies. ie by default all packets
-have a 50% chance of having IP Options. The packets are then sent against the
-target machine to either penetrate its firewall rules or find bugs in the IP
-stack.
-
-WWW: http://www.packetfactory.net/Projects/ISIC/
-
---
-Brad Hendrickse
-bradh@uunet.co.za
diff --git a/net/isic/pkg-plist b/net/isic/pkg-plist
deleted file mode 100644
index 4ab4bf83b0a0..000000000000
--- a/net/isic/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/isic
-bin/tcpsic
-bin/udpsic
-bin/icmpsic
-bin/esic
diff --git a/net/junipoll/distinfo b/net/junipoll/distinfo
deleted file mode 100644
index 5e85254cb4c5..000000000000
--- a/net/junipoll/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (junipoll-1.017.tar.gz) = f0bc765a4e092900c5d26c47e0cb8cb3
diff --git a/net/junipoll/pkg-descr b/net/junipoll/pkg-descr
deleted file mode 100644
index 8977d968e290..000000000000
--- a/net/junipoll/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-junipoll is an mrtg-like utility which polls the counter values from the
-firewall filters configured on Juniper routers. It creates ".rrd" files
-with names matching the router and its filter counter names, each
-containing a bytes and a pkts data source suitable for graphing using
-RRGrapher or RRDTOOL.
-
-WWW: http://net.doit.wisc.edu/~plonka/junipoll/
-
-- Bill Fumerola
-billf@FreeBSD.org
diff --git a/net/junipoll/pkg-plist b/net/junipoll/pkg-plist
deleted file mode 100644
index b2014994c599..000000000000
--- a/net/junipoll/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/junipoll
-%%SITE_PERL%%/HCInterfaceTemplate.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/junipoll/.packlist
diff --git a/net/knowlan/distinfo b/net/knowlan/distinfo
deleted file mode 100644
index 1ecb50c24571..000000000000
--- a/net/knowlan/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (knowlan-0.1.1.tar.gz) = db39896a9389c88181630d5adab8d32f
diff --git a/net/knowlan/files/patch-configure b/net/knowlan/files/patch-configure
deleted file mode 100644
index 24e1c0ff9df5..000000000000
--- a/net/knowlan/files/patch-configure
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.orig Tue Sep 23 15:43:13 2003
-+++ configure Tue Oct 28 16:44:31 2003
-@@ -95,8 +95,8 @@
- exit
- fi
- elif test "$OS" = FreeBSD || test "$OS" = OpenBSD || test "$OS" = NetBSD; then
-- echo -n "testing /usr/local/include/libnet.h..."
-- if(test -f /usr/local/include/libnet.h); then
-+ echo -n "testing ${LOCALBASE}/include/libnet.h..."
-+ if(test -f ${LOCALBASE}/include/libnet.h); then
- echo "ok"
- else
- exit
-@@ -109,8 +109,8 @@
-
-
- if test "$OS" = FreeBSD || test "$OS" = OpenBSD || test "$OS" = NetBSD; then
-- echo -n "testing /usr/local/lib/libnet.a..."
-- if(test -f /usr/local/lib/libnet.a); then
-+ echo -n "testing ${LOCALBASE}/lib/libnet.a..."
-+ if(test -f ${LOCALBASE}/lib/libnet.a); then
- echo "ok"
- else
- echo "can't find required libnet.a static library"
-@@ -152,7 +152,7 @@
- echo " " >> Makefile
- echo " " >> Makefile
- echo "all: kn_arp.c kn_main.c kn_defs.h" >> Makefile
--echo " gcc -Wall -c kn_main.c" >> Makefile
-+echo " gcc ${CFLAGS} -c kn_main.c" >> Makefile
-
- if test "$OS" = Linux; then
- echo " gcc -Wall \$(LIBNETDEFS) -c kn_arp.c" >> Makefile
-@@ -164,8 +164,8 @@
- echo " /bin/chown root.root /usr/sbin/knowlan" >> Makefile
- echo " /bin/chmod 755 /usr/sbin/knowlan" >> Makefile
- elif test "$OS" = FreeBSD || test "$OS" = OpenBSD || test "$OS" = NetBSD; then
-- echo " gcc -Wall -D__BSD__=1 -D__GLIBC__=1 -I/usr/local/include/ \$(LIBNETDEFS) -c kn_arp.c" >> Makefile
-- echo " gcc -o knowlan kn_main.o kn_arp.o /usr/local/lib/libnet.a -lpcap" >> Makefile
-+ echo " gcc ${CFLAGS} -D__BSD__=1 -D__GLIBC__=1 -I${LOCALBASE}/include/ \$(LIBNETDEFS) -c kn_arp.c" >> Makefile
-+ echo " gcc -o knowlan kn_main.o kn_arp.o ${LOCALBASE}/lib/libnet.a -lpcap" >> Makefile
- echo " " >> Makefile
- echo " " >> Makefile
- echo "install: knowlan" >> Makefile
diff --git a/net/knowlan/pkg-descr b/net/knowlan/pkg-descr
deleted file mode 100644
index a262965e7447..000000000000
--- a/net/knowlan/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Knowlan is ARP-based Local Area Network IP and MAC Address Extractor.
-It sends ARP REQUEST packets to the LAN and waits for ARP REPLY packets
-from network nodes that are up, producing a table of currently
-active IP and MAC addresses.
-Knowlan uses libpcap and libnet libraries for easy source code review
-and maintenance.
-
-WWW: http://www.enderunix.org/knowlan
diff --git a/net/knowlan/pkg-plist b/net/knowlan/pkg-plist
deleted file mode 100644
index a7989ab26039..000000000000
--- a/net/knowlan/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-sbin/knowlan
diff --git a/net/libsmi/distinfo b/net/libsmi/distinfo
deleted file mode 100644
index 6eca8055b36e..000000000000
--- a/net/libsmi/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (libsmi-0.4.1.tar.gz) = 32ed095e5dc67036d48cd8524b4a0b02
diff --git a/net/libsmi/pkg-descr b/net/libsmi/pkg-descr
deleted file mode 100644
index 9f08903edd23..000000000000
--- a/net/libsmi/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-The purpose of libsmi is to give network management applications
-a concise programmer-friendly interface to access MIB module information,
-separate the knowledge on SMI from the main parts of management applications,
-allow to add new kinds of MIB repositories without the need
-to adapt applications that make use of libsmi.
-
-There are also simple tools to handle MIBs included.
-
-WWW: http://www.ibr.cs.tu-bs.de/projects/libsmi/
-
-Marcin Cieslak <saper@system.pl>
diff --git a/net/libsmi/pkg-plist b/net/libsmi/pkg-plist
deleted file mode 100644
index 32087af6645e..000000000000
--- a/net/libsmi/pkg-plist
+++ /dev/null
@@ -1,248 +0,0 @@
-bin/smiquery
-bin/smilint
-bin/smidump
-bin/smidiff
-bin/smistrip
-bin/smicache
-include/smi.h
-lib/libsmi.so.2
-lib/libsmi.so
-lib/libsmi.la
-lib/libsmi.a
-lib/pkgconfig/libsmi.pc
-share/aclocal/libsmi.m4
-share/smi/mibs/iana/IANA-ADDRESS-FAMILY-NUMBERS-MIB
-share/smi/mibs/iana/IANA-LANGUAGE-MIB
-share/smi/mibs/iana/IANA-RTPROTO-MIB
-share/smi/mibs/iana/IANATn3270eTC-MIB
-share/smi/mibs/iana/IANAifType-MIB
-share/smi/mibs/ietf/ACCOUNTING-CONTROL-MIB
-share/smi/mibs/ietf/ADSL-LINE-MIB
-share/smi/mibs/ietf/ADSL-TC-MIB
-share/smi/mibs/ietf/AGENTX-MIB
-share/smi/mibs/ietf/APPC-MIB
-share/smi/mibs/ietf/APPLETALK-MIB
-share/smi/mibs/ietf/APPLICATION-MIB
-share/smi/mibs/ietf/APPN-DLUR-MIB
-share/smi/mibs/ietf/APPN-MIB
-share/smi/mibs/ietf/APPN-TRAP-MIB
-share/smi/mibs/ietf/ATM-ACCOUNTING-INFORMATION-MIB
-share/smi/mibs/ietf/ATM-MIB
-share/smi/mibs/ietf/ATM-TC-MIB
-share/smi/mibs/ietf/BGP4-MIB
-share/smi/mibs/ietf/BRIDGE-MIB
-share/smi/mibs/ietf/CHARACTER-MIB
-share/smi/mibs/ietf/CIRCUIT-IF-MIB
-share/smi/mibs/ietf/CLNS-MIB
-share/smi/mibs/ietf/COFFEE-POT-MIB
-share/smi/mibs/ietf/COPS-CLIENT-MIB
-share/smi/mibs/ietf/DECNET-PHIV-MIB
-share/smi/mibs/ietf/DIAL-CONTROL-MIB
-share/smi/mibs/ietf/DIFFSERV-DSCP-TC
-share/smi/mibs/ietf/DIFFSERV-MIB
-share/smi/mibs/ietf/DIRECTORY-SERVER-MIB
-share/smi/mibs/ietf/DISMAN-EVENT-MIB
-share/smi/mibs/ietf/DISMAN-EXPRESSION-MIB
-share/smi/mibs/ietf/DISMAN-NSLOOKUP-MIB
-share/smi/mibs/ietf/DISMAN-PING-MIB
-share/smi/mibs/ietf/DISMAN-SCHEDULE-MIB
-share/smi/mibs/ietf/DISMAN-SCRIPT-MIB
-share/smi/mibs/ietf/DISMAN-TRACEROUTE-MIB
-share/smi/mibs/ietf/DLSW-MIB
-share/smi/mibs/ietf/DNS-RESOLVER-MIB
-share/smi/mibs/ietf/DNS-SERVER-MIB
-share/smi/mibs/ietf/DOCS-BPI-MIB
-share/smi/mibs/ietf/DOCS-CABLE-DEVICE-MIB
-share/smi/mibs/ietf/DOCS-IF-MIB
-share/smi/mibs/ietf/DOT12-IF-MIB
-share/smi/mibs/ietf/DOT12-RPTR-MIB
-share/smi/mibs/ietf/DS0-MIB
-share/smi/mibs/ietf/DS0BUNDLE-MIB
-share/smi/mibs/ietf/DS1-MIB
-share/smi/mibs/ietf/DS3-MIB
-share/smi/mibs/ietf/DSA-MIB
-share/smi/mibs/ietf/DSMON-MIB
-share/smi/mibs/ietf/EBN-MIB
-share/smi/mibs/ietf/ENTITY-MIB
-share/smi/mibs/ietf/ETHER-CHIPSET-MIB
-share/smi/mibs/ietf/EtherLike-MIB
-share/smi/mibs/ietf/FDDI-SMT73-MIB
-share/smi/mibs/ietf/FIBRE-CHANNEL-FE-MIB
-share/smi/mibs/ietf/FLOW-METER-MIB
-share/smi/mibs/ietf/FR-ATM-PVC-SERVICE-IWF-MIB
-share/smi/mibs/ietf/FR-MFR-MIB
-share/smi/mibs/ietf/FRAME-RELAY-DTE-MIB
-share/smi/mibs/ietf/FRNETSERV-MIB
-share/smi/mibs/ietf/FRSLD-MIB
-share/smi/mibs/ietf/GSMP-MIB
-share/smi/mibs/ietf/HC-RMON-MIB
-share/smi/mibs/ietf/HCNUM-TC
-share/smi/mibs/ietf/HDSL2-SHDSL-LINE-MIB
-share/smi/mibs/ietf/HOST-RESOURCES-MIB
-share/smi/mibs/ietf/HOST-RESOURCES-TYPES
-share/smi/mibs/ietf/HPR-IP-MIB
-share/smi/mibs/ietf/HPR-MIB
-share/smi/mibs/ietf/IF-INVERTED-STACK-MIB
-share/smi/mibs/ietf/IF-MIB
-share/smi/mibs/ietf/IP-MIB
-share/smi/mibs/ietf/IGMP-STD-MIB
-share/smi/mibs/ietf/INET-ADDRESS-MIB
-share/smi/mibs/ietf/INTEGRATED-SERVICES-GUARANTEED-MIB
-share/smi/mibs/ietf/INTEGRATED-SERVICES-MIB
-share/smi/mibs/ietf/INTERFACETOPN-MIB
-share/smi/mibs/ietf/IP-FORWARD-MIB
-share/smi/mibs/ietf/IPATM-IPMC-MIB
-share/smi/mibs/ietf/IPMROUTE-STD-MIB
-share/smi/mibs/ietf/IPOA-MIB
-share/smi/mibs/ietf/IPV6-ICMP-MIB
-share/smi/mibs/ietf/IPV6-MIB
-share/smi/mibs/ietf/IPV6-MLD-MIB
-share/smi/mibs/ietf/IPV6-TC
-share/smi/mibs/ietf/IPV6-TCP-MIB
-share/smi/mibs/ietf/IPV6-UDP-MIB
-share/smi/mibs/ietf/ISDN-MIB
-share/smi/mibs/ietf/Job-Monitoring-MIB
-share/smi/mibs/ietf/L2TP-MIB
-share/smi/mibs/ietf/MAU-MIB
-share/smi/mibs/ietf/MIOX25-MIB
-share/smi/mibs/ietf/MIP-MIB
-share/smi/mibs/ietf/MTA-MIB
-share/smi/mibs/ietf/Modem-MIB
-share/smi/mibs/ietf/NETWORK-SERVICES-MIB
-share/smi/mibs/ietf/NHRP-MIB
-share/smi/mibs/ietf/NOTIFICATION-LOG-MIB
-share/smi/mibs/ietf/OSPF-MIB
-share/smi/mibs/ietf/OSPF-TRAP-MIB
-share/smi/mibs/ietf/P-BRIDGE-MIB
-share/smi/mibs/ietf/PARALLEL-MIB
-share/smi/mibs/ietf/PIM-MIB
-share/smi/mibs/ietf/PINT-MIB
-share/smi/mibs/ietf/PPP-BRIDGE-NCP-MIB
-share/smi/mibs/ietf/PPP-IP-NCP-MIB
-share/smi/mibs/ietf/PPP-LCP-MIB
-share/smi/mibs/ietf/PPP-SEC-MIB
-share/smi/mibs/ietf/PTOPO-MIB
-share/smi/mibs/ietf/PerfHist-TC-MIB
-share/smi/mibs/ietf/Printer-MIB
-share/smi/mibs/ietf/Q-BRIDGE-MIB
-share/smi/mibs/ietf/RADIUS-ACC-CLIENT-MIB
-share/smi/mibs/ietf/RADIUS-ACC-SERVER-MIB
-share/smi/mibs/ietf/RADIUS-AUTH-CLIENT-MIB
-share/smi/mibs/ietf/RADIUS-AUTH-SERVER-MIB
-share/smi/mibs/ietf/RDBMS-MIB
-share/smi/mibs/ietf/RFC-1212
-share/smi/mibs/ietf/RFC-1215
-share/smi/mibs/ietf/RFC1065-SMI
-share/smi/mibs/ietf/RFC1155-SMI
-share/smi/mibs/ietf/RFC1158-MIB
-share/smi/mibs/ietf/RFC1213-MIB
-share/smi/mibs/ietf/RFC1269-MIB
-share/smi/mibs/ietf/RFC1271-MIB
-share/smi/mibs/ietf/RFC1285-MIB
-share/smi/mibs/ietf/RFC1316-MIB
-share/smi/mibs/ietf/RFC1381-MIB
-share/smi/mibs/ietf/RFC1382-MIB
-share/smi/mibs/ietf/RFC1414-MIB
-share/smi/mibs/ietf/RIPv2-MIB
-share/smi/mibs/ietf/RMON-MIB
-share/smi/mibs/ietf/RMON2-MIB
-share/smi/mibs/ietf/RS-232-MIB
-share/smi/mibs/ietf/RSVP-MIB
-share/smi/mibs/ietf/RTP-MIB
-share/smi/mibs/ietf/SIP-MIB
-share/smi/mibs/ietf/SLAPM-MIB
-share/smi/mibs/ietf/SMON-MIB
-share/smi/mibs/ietf/SNA-NAU-MIB
-share/smi/mibs/ietf/SNA-SDLC-MIB
-share/smi/mibs/ietf/SNMP-COMMUNITY-MIB
-share/smi/mibs/ietf/SNMP-FRAMEWORK-MIB
-share/smi/mibs/ietf/SNMP-MPD-MIB
-share/smi/mibs/ietf/SNMP-NOTIFICATION-MIB
-share/smi/mibs/ietf/SNMP-PROXY-MIB
-share/smi/mibs/ietf/SNMP-REPEATER-MIB
-share/smi/mibs/ietf/SNMP-TARGET-MIB
-share/smi/mibs/ietf/SNMP-USER-BASED-SM-MIB
-share/smi/mibs/ietf/SNMP-USM-DH-OBJECTS-MIB
-share/smi/mibs/ietf/SNMP-VIEW-BASED-ACM-MIB
-share/smi/mibs/ietf/SNMPv2-CONF
-share/smi/mibs/ietf/SNMPv2-MIB
-share/smi/mibs/ietf/SNMPv2-SMI
-share/smi/mibs/ietf/SNMPv2-TC
-share/smi/mibs/ietf/SNMPv2-TM
-share/smi/mibs/ietf/SNMPv2-USEC-MIB
-share/smi/mibs/ietf/SONET-MIB
-share/smi/mibs/ietf/SOURCE-ROUTING-MIB
-share/smi/mibs/ietf/SYSAPPL-MIB
-share/smi/mibs/ietf/TCP-MIB
-share/smi/mibs/ietf/TCPIPX-MIB
-share/smi/mibs/ietf/TN3270E-MIB
-share/smi/mibs/ietf/TN3270E-RT-MIB
-share/smi/mibs/ietf/TOKEN-RING-RMON-MIB
-share/smi/mibs/ietf/TOKENRING-MIB
-share/smi/mibs/ietf/TOKENRING-STATION-SR-MIB
-share/smi/mibs/ietf/TUNNEL-MIB
-share/smi/mibs/ietf/UDP-MIB
-share/smi/mibs/ietf/UPS-MIB
-share/smi/mibs/ietf/VRRP-MIB
-share/smi/mibs/ietf/WWW-MIB
-share/smi/mibs/irtf/IRTF-NMRG-SMING
-share/smi/mibs/irtf/IRTF-NMRG-SMING-EXTENSIONS
-share/smi/mibs/irtf/IRTF-NMRG-SMING-TYPES
-share/smi/mibs/tubs/ACCESSBIND-PIB
-share/smi/mibs/tubs/ACCESSBIND-PIB-orig
-share/smi/mibs/tubs/ACCOUNTING-FRAMEWORK-PIB
-share/smi/mibs/tubs/ACCOUNTING-FRAMEWORK-PIB-orig
-share/smi/mibs/tubs/COPS-PR-SPPI
-share/smi/mibs/tubs/COPS-PR-SPPI-TC
-share/smi/mibs/tubs/DIFFSERV-PIB
-share/smi/mibs/tubs/DIFFSERV-PIB-orig
-share/smi/mibs/tubs/FEEDBACK-FRAMEWORK-PIB
-share/smi/mibs/tubs/FEEDBACK-FRAMEWORK-PIB-orig
-share/smi/mibs/tubs/FRAMEWORK-PIB
-share/smi/mibs/tubs/FRAMEWORK-PIB-orig
-share/smi/mibs/tubs/FRAMEWORK-TC-PIB
-share/smi/mibs/tubs/FRAMEWORK-TC-PIB-orig
-share/smi/mibs/tubs/IP-TE-PIB
-share/smi/mibs/tubs/IP-TE-PIB-orig
-share/smi/mibs/tubs/IPSEC-POLICY-PIB
-share/smi/mibs/tubs/IPSEC-POLICY-PIB-orig
-share/smi/mibs/tubs/LOAD-BALANCING-PIB
-share/smi/mibs/tubs/LOAD-BALANCING-PIB-orig
-share/smi/mibs/tubs/META-POLICY-PIB
-share/smi/mibs/tubs/META-POLICY-PIB-orig
-share/smi/mibs/tubs/MPLS-SETUP-PIB
-share/smi/mibs/tubs/MPLS-SETUP-PIB-orig
-share/smi/mibs/tubs/PARTITION-PIB
-share/smi/mibs/tubs/PARTITION-PIB-orig
-share/smi/mibs/tubs/POLICY-DEVICE-AUX-MIB
-share/smi/mibs/tubs/POLICY-DEVICE-AUX-MIB-orig
-share/smi/mibs/tubs/POLICY-FRAMEWORK-PIB
-share/smi/mibs/tubs/POLICY-FRAMEWORK-PIB-orig
-share/smi/mibs/tubs/PPVPN-PIB
-share/smi/mibs/tubs/PPVPN-PIB-orig
-share/smi/mibs/tubs/QOS-POLICY-802-PIB
-share/smi/mibs/tubs/QOS-POLICY-802-PIB-orig
-share/smi/mibs/tubs/QOS-POLICY-IP-PIB
-share/smi/mibs/tubs/QOS-POLICY-IP-PIB-orig
-share/smi/mibs/tubs/RSVP-PCC-PIB
-share/smi/mibs/tubs/RSVP-PCC-PIB-orig
-share/smi/mibs/tubs/SLS-NEGOTIATION-PIB
-share/smi/mibs/tubs/SLS-NEGOTIATION-PIB-orig
-share/smi/mibs/tubs/TUBS-IBR-AGENT-CAPABILITIES
-share/smi/mibs/tubs/TUBS-IBR-LINUX-MIB
-share/smi/mibs/tubs/TUBS-IBR-NFS-MIB
-share/smi/mibs/tubs/TUBS-IBR-PING-MIB
-share/smi/mibs/tubs/TUBS-IBR-PROC-MIB
-share/smi/mibs/tubs/TUBS-IBR-TEST-MIB
-share/smi/mibs/tubs/TUBS-IBR-TNM-MIB
-share/smi/mibs/tubs/TUBS-SMI
-share/smi/mibs/tubs/UMTS-PIB
-share/smi/mibs/tubs/UMTS-PIB-orig
-share/smi/mibs/tubs/ibrpib-assignments.txt
-@dirrm share/smi/mibs/iana
-@dirrm share/smi/mibs/ietf
-@dirrm share/smi/mibs/irtf
-@dirrm share/smi/mibs/tubs
-@dirrm share/smi/mibs/site
-@dirrm share/smi/mibs
-@dirrm share/smi
diff --git a/net/mbrowse/distinfo b/net/mbrowse/distinfo
deleted file mode 100644
index 4c6de70bb8c5..000000000000
--- a/net/mbrowse/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mbrowse-0.3.1.tar.gz) = 52c6b0a7ad9bcc7be70a35ed6b0d0d89
diff --git a/net/mbrowse/pkg-descr b/net/mbrowse/pkg-descr
deleted file mode 100644
index 8f2851e03c8b..000000000000
--- a/net/mbrowse/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Mbrowse is a GUI MIB browser and query tool based on GTK and Net-SNMP.
-
-WWW: http://www.kill-9.org/mbrowse/
diff --git a/net/mrtg-ping-probe/Makefile b/net/mrtg-ping-probe/Makefile
index fb8dd14f92fc..55e1732660e6 100644
--- a/net/mrtg-ping-probe/Makefile
+++ b/net/mrtg-ping-probe/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/
MAINTAINER= sanpei@FreeBSD.org
COMMENT= A Round Trip Time and Packet Loss Probe for MRTG
-RUN_DEPENDS= ${LOCALBASE}/bin/mrtg:${PORTSDIR}/net/mrtg
+RUN_DEPENDS= ${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
USE_PERL5= YES
USE_REINPLACE= yes
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
deleted file mode 100644
index 4b0119a6ffe7..000000000000
--- a/net/mrtg/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mrtg-2.10.13.tar.gz) = 978f2b55d74e6485662c9bd9a65c2f23
diff --git a/net/mrtg/files/patch-configure b/net/mrtg/files/patch-configure
deleted file mode 100644
index 4fe9b654edc6..000000000000
--- a/net/mrtg/files/patch-configure
+++ /dev/null
@@ -1,120 +0,0 @@
---- configure.orig Sun Mar 9 02:17:40 2003
-+++ configure Sat Jul 5 23:55:07 2003
-@@ -3159,13 +3159,13 @@
- LDFLAGS="${LDFLAGS} ${MATHLIBS}"
-
- GDEXTRALIB=""
--echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
--echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for gdImageGif in %%GD%%" >&5
-+echo $ECHO_N "checking for gdImageGif in %%GD%%... $ECHO_C" >&6
- if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd -lgd ${MATHLIBS} $LIBS"
-+LIBS="%%GD%% %%GD%% ${MATHLIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -3211,20 +3211,20 @@
- if test $ac_cv_lib_gd_gdImageGif = yes; then
-
- GDFORM_EXT=gif
-- GLIBS="-lgd"
-+ GLIBS="%%GD%%"
-
- else
- :
- fi
-
-
--echo "$as_me:$LINENO: checking for gdImagePng in -lgd" >&5
--echo $ECHO_N "checking for gdImagePng in -lgd... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for gdImagePng in %%GD%%" >&5
-+echo $ECHO_N "checking for gdImagePng in %%GD%%... $ECHO_C" >&6
- if test "${ac_cv_lib_gd_gdImagePng+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd -lgd -lpng -lz ${MATHLIBS} $LIBS"
-+LIBS="%%GD%% %%GD%% -lpng -lz ${MATHLIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -3270,20 +3270,20 @@
- if test $ac_cv_lib_gd_gdImagePng = yes; then
-
- GDFORM_EXT=png
-- GLIBS="-lgd -lpng -lz"
-+ GLIBS="%%GD%% -lpng -lz"
-
- else
- :
- fi
-
-
--echo "$as_me:$LINENO: checking for gdImagePng_jpg in -lgd" >&5
--echo $ECHO_N "checking for gdImagePng_jpg in -lgd... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for gdImagePng_jpg in %%GD%%" >&5
-+echo $ECHO_N "checking for gdImagePng_jpg in %%GD%%... $ECHO_C" >&6
- if test "${ac_cv_lib_gd_gdImagePng_jpg+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd -lgd -lpng -lz -ljpeg ${MATHLIBS} $LIBS"
-+LIBS="%%GD%% %%GD%% -lpng -lz -ljpeg ${MATHLIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -3329,20 +3329,20 @@
- if test $ac_cv_lib_gd_gdImagePng_jpg = yes; then
-
- GDFORM_EXT=png
-- GLIBS="-lgd -lpng -lz -ljpeg"
-+ GLIBS="%%GD%% -lpng -lz -ljpeg"
-
- else
- :
- fi
-
-
--echo "$as_me:$LINENO: checking for gdImagePng_jpg_ft in -lgd" >&5
--echo $ECHO_N "checking for gdImagePng_jpg_ft in -lgd... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for gdImagePng_jpg_ft in %%GD%%" >&5
-+echo $ECHO_N "checking for gdImagePng_jpg_ft in %%GD%%... $ECHO_C" >&6
- if test "${ac_cv_lib_gd_gdImagePng_jpg_ft+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd -lgd -lpng -lz -ljpeg -lfreetype ${MATHLIBS} $LIBS"
-+LIBS="%%GD%% %%GD%% -lpng -lz -ljpeg -lfreetype ${MATHLIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -3388,7 +3388,7 @@
- if test $ac_cv_lib_gd_gdImagePng_jpg_ft = yes; then
-
- GDFORM_EXT=png
-- GLIBS="-lgd -lpng -lz -ljpeg -lfreetype"
-+ GLIBS="%%GD%% -lpng -lz -ljpeg -lfreetype"
-
- else
- :
-@@ -3399,13 +3399,13 @@
- CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImageGif"
- fi
-
--echo "$as_me:$LINENO: checking for gdImageGd in -lgd" >&5
--echo $ECHO_N "checking for gdImageGd in -lgd... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for gdImageGd in %%GD%%" >&5
-+echo $ECHO_N "checking for gdImageGd in %%GD%%... $ECHO_C" >&6
- if test "${ac_cv_lib_gd_gdImageGd+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd -Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic $LIBS"
-+LIBS="%%GD%% -Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
diff --git a/net/mrtg/pkg-descr b/net/mrtg/pkg-descr
deleted file mode 100644
index 37269262fdfb..000000000000
--- a/net/mrtg/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic
-load on network-links. MRTG generates HTML pages containing PNG images which
-provide a LIVE visual representation of this traffic. Check
-
-WWW: http://www.mrtg.org/
-
-for an example. MRTG is based on Perl and C and works under UNIX and Windows
-NT.
-
-MRTG is being successfully used on many sites around the net.
-Check the MRTG-Site-Map, which is at:
-http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/users.html
diff --git a/net/mrtg/pkg-plist b/net/mrtg/pkg-plist
deleted file mode 100644
index 29c6865542c7..000000000000
--- a/net/mrtg/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-bin/cfgmaker
-bin/indexmaker
-bin/mrtg
-bin/rateup
-etc/mrtg/mrtg.cfg.sample
-%%SITE_PERL%%/MRTG_lib.pm
-%%SITE_PERL%%/locales_mrtg.pm
-%%PORTDOCS%%share/doc/mrtg/ANNOUNCE
-%%PORTDOCS%%share/doc/mrtg/CHANGES
-%%PORTDOCS%%share/doc/mrtg/COPYRIGHT
-%%PORTDOCS%%share/doc/mrtg/MANIFEST
-%%PORTDOCS%%share/doc/mrtg/README
-%%PORTDOCS%%share/doc/mrtg/cfgmaker.html
-%%PORTDOCS%%share/doc/mrtg/cfgmaker.pod
-%%PORTDOCS%%share/doc/mrtg/cfgmaker.txt
-%%PORTDOCS%%share/doc/mrtg/index.html
-%%PORTDOCS%%share/doc/mrtg/index.txt
-%%PORTDOCS%%share/doc/mrtg/index.wml
-%%PORTDOCS%%share/doc/mrtg/indexmaker.html
-%%PORTDOCS%%share/doc/mrtg/indexmaker.pod
-%%PORTDOCS%%share/doc/mrtg/indexmaker.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-faq.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-faq.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-faq.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-forum.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-forum.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-forum.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-l.png
-%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-m.png
-%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-r.png
-%%PORTDOCS%%share/doc/mrtg/mrtg-reference.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-reference.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-reference.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-rrd.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-rrd.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-rrd.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-squid.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-squid.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-squid.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-ti.png
-%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.html
-%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.txt
-%%PORTDOCS%%share/doc/mrtg/mrtg.html
-%%PORTDOCS%%share/doc/mrtg/mrtg.pod
-%%PORTDOCS%%share/doc/mrtg/mrtg.txt
-%%PORTDOCS%%share/doc/mrtg/mrtglib.html
-%%PORTDOCS%%share/doc/mrtg/mrtglib.pod
-%%PORTDOCS%%share/doc/mrtg/mrtglib.txt
-share/mrtg/favicon.ico
-share/mrtg/mrtg-l.gif
-share/mrtg/mrtg-l.png
-share/mrtg/mrtg-m.gif
-share/mrtg/mrtg-m.png
-share/mrtg/mrtg-r.gif
-share/mrtg/mrtg-r.png
-share/mrtg/mrtg-ti.gif
-share/mrtg/mrtg-ti.png
-@dirrm etc/mrtg
-%%PORTDOCS%%@dirrm share/doc/mrtg
-@dirrm share/mrtg
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
deleted file mode 100644
index 54480d21c1dc..000000000000
--- a/net/nagios-plugins/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nagios-plugins-1.3.1.tar.gz) = 0078c9c8137694181a4cdf596fdbd74f
diff --git a/net/nagios-plugins/files/patch-check_breeze.pl b/net/nagios-plugins/files/patch-check_breeze.pl
deleted file mode 100644
index ed01ed5752ce..000000000000
--- a/net/nagios-plugins/files/patch-check_breeze.pl
+++ /dev/null
@@ -1,23 +0,0 @@
---- plugins-scripts/check_breeze.pl.orig Tue May 7 07:35:49 2002
-+++ plugins-scripts/check_breeze.pl Fri Jul 19 20:46:00 2002
-@@ -1,9 +1,9 @@
--#! /usr/bin/perl -wT
-+#! /usr/bin/perl -w
-
-
- use strict;
- use Getopt::Long;
--use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $PROGNAME);
-+use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_C $PROGNAME);
- use lib utils.pm ;
- use utils qw(%ERRORS &print_revision &support &usage);
-
-@@ -47,7 +47,7 @@
- ($opt_C) || ($opt_C = "public") ;
-
- my $sig=0;
--$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
-+$sig = `/usr/bin/snmpget -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
- my @test=split(/ /,$sig);
- $sig=$test[2];
- $sig=int($sig);
diff --git a/net/nagios-plugins/files/patch-check_by_ssh.c b/net/nagios-plugins/files/patch-check_by_ssh.c
deleted file mode 100644
index f1ba6b457c0d..000000000000
--- a/net/nagios-plugins/files/patch-check_by_ssh.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/check_by_ssh.c.orig Wed Nov 20 02:19:07 2002
-+++ plugins/check_by_ssh.c Tue Nov 26 14:20:28 2002
-@@ -361,6 +361,8 @@
- " list of nagios service names, separated by ':' [optional]\n"
- "-n, --name=NAME\n"
- " short name of host in nagios configuration [optional]\n"
-+ "-v, --verbose\n"
-+ " display command being executed\n"
- "-4, --use-ipv4\n"
- " tell ssh to use IPv4\n"
- "-6, --use-ipv6\n"
-@@ -388,7 +390,7 @@
- {
- printf
- ("Usage:\n"
-- "check_by_ssh [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
-+ "check_by_ssh [-fv46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
- " [-n name] [-s servicelist] [-O outputfile] [-p port]\n"
- "check_by_ssh -V prints version info\n"
- "check_by_ssh -h prints more detailed help\n");
diff --git a/net/nagios-plugins/files/patch-check_ifoperstatus.pl b/net/nagios-plugins/files/patch-check_ifoperstatus.pl
deleted file mode 100644
index 39ee768a416b..000000000000
--- a/net/nagios-plugins/files/patch-check_ifoperstatus.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins-scripts/check_ifoperstatus.pl.orig Thu May 9 21:03:51 2002
-+++ plugins-scripts/check_ifoperstatus.pl Fri Jul 19 21:29:02 2002
-@@ -26,7 +26,7 @@
- # 11.01.2000 Version 1.0
- # $Id: check_ifoperstatus.pl,v 1.1 2002/05/09 19:03:51 sghosh Exp $
-
--use POSIX;
-+#use POSIX;
- use strict;
- use lib utils.pm ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
diff --git a/net/nagios-plugins/files/patch-check_ifstatus.pl b/net/nagios-plugins/files/patch-check_ifstatus.pl
deleted file mode 100644
index d40e7f9a4c74..000000000000
--- a/net/nagios-plugins/files/patch-check_ifstatus.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins-scripts/check_ifstatus.pl.orig Wed May 8 06:58:22 2002
-+++ plugins-scripts/check_ifstatus.pl Fri Jul 19 21:28:46 2002
-@@ -27,7 +27,7 @@
- #
- # $Id: check_ifstatus.pl,v 1.1 2002/05/08 04:58:22 sghosh Exp $
-
--use POSIX;
-+#use POSIX;
- use strict;
- use lib utils.pm ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
diff --git a/net/nagios-plugins/files/patch-configure.in b/net/nagios-plugins/files/patch-configure.in
deleted file mode 100644
index 784da9ef03fd..000000000000
--- a/net/nagios-plugins/files/patch-configure.in
+++ /dev/null
@@ -1,120 +0,0 @@
---- configure.in.orig Fri Jul 11 08:12:23 2003
-+++ configure.in Sun Jul 13 13:13:37 2003
-@@ -12,7 +12,7 @@
- AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
- AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
-
--AC_PREFIX_DEFAULT(/usr/local/nagios)
-+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
-
- dnl Figure out how to invoke "install" and what install options to use.
-
-@@ -60,7 +60,6 @@
- AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
- AC_SUBST(nagios_usr)
- AC_SUBST(nagios_grp)
--INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"
- AC_SUBST(INSTALL_OPTS)
-
- AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
-@@ -143,25 +142,37 @@
- LIBS="$_SAVEDLIBS"
- CPPFLAGS="$_SAVEDCPPFLAGS"
-
-+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
-+if test x$enable_radius = xyes; then
-+dnl Check for radiusclient header file
-+_SAVEDCPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-I${LOCALBASE}/include"
-+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include")
-+AC_SUBST(RADIUSINCLUDE)
-+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE"
-+
- dnl Check for radius libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(radiusclient,rc_read_config)
-+AC_CHECK_LIB(radiusclient,rc_read_config,,,-L${LOCALBASE}/lib)
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
- EXTRAS="$EXTRAS check_radius"
-- RADIUSLIBS="-lradiusclient"
-+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"
- AC_SUBST(RADIUSLIBS)
- else
- AC_MSG_WARN([Skipping radius plugin])
- AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
- fi
- LIBS="$_SAVEDLIBS"
-+fi
-
-+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap)
-+if test x$enable_ldap = xyes; then
- dnl Check for LDAP libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(ldap,main,,,-llber)
--if test "$ac_cv_lib_ldap_main" = "yes"; then
-- LDAPLIBS="-lldap -llber"\
-- LDAPINCLUDE="-I/usr/include/ldap"
-+AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
-+if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
-+ LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"\
-+ LDAPINCLUDE="-I${LOCALBASE}/include"
- AC_SUBST(LDAPLIBS)
- AC_SUBST(LDAPINCLUDE)
- EXTRAS="$EXTRAS check_ldap"
-@@ -170,7 +181,7 @@
- AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
- fi
- LIBS="$_SAVEDLIBS"
--
-+fi
-
- dnl Check for mysql libraries
- _SAVEDLIBS="$LIBS"
-@@ -209,7 +220,7 @@
- AC_MSG_WARN([Skipping mysql plugin])
- AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
- fi
--CPPFLAGS="$_SAVEDCPPFLAGS"
-+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
- LIBS="$_SAVEDLIBS"
-
- dnl Check for OpenSSL location
-@@ -841,6 +852,8 @@
- AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
- fi
-
-+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
-+if test x$enable_snmp = xyes; then
- AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
- if test -x "$PATH_TO_SNMPGET"
- then
-@@ -863,7 +876,10 @@
- echo "** Tried $PERL - install Net::SNMP perl module if you want to"
- echo " use the perl snmp plugins"
- fi
-+fi
-
-+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
-+if test x$enable_qstat = xyes; then
- AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
- AC_PATH_PROG(PATH_TO_QSTAT,qstat)
- if test -x "$PATH_TO_QUAKESTAT"
-@@ -877,7 +893,10 @@
- else
- echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
- fi
-+fi
-
-+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
-+if test x$enable_fping = xyes; then
- AC_PATH_PROG(PATH_TO_FPING,fping)
- if test -x "$PATH_TO_FPING"
- then
-@@ -885,6 +904,7 @@
- EXTRAS="$EXTRAS check_fping"
- else
- echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
-+fi
- fi
-
- AC_PATH_PROG(PATH_TO_SSH,ssh)
diff --git a/net/nagios-plugins/files/patch-subst.in b/net/nagios-plugins/files/patch-subst.in
deleted file mode 100644
index c5bd2477c9c8..000000000000
--- a/net/nagios-plugins/files/patch-subst.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- plugins-scripts/subst.in.orig Thu Jun 6 06:16:56 2002
-+++ plugins-scripts/subst.in Sun Jul 14 13:38:22 2002
-@@ -37,6 +37,16 @@
-
- }
-
-+# Specific programs
-+
-+#
-+/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-+ match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-+ start=RSTART+RLENGTH;
-+ c=substr($0,RSTART,RLENGTH);
-+ sub(c,which(c,path));
-+}
-+
- # scripting language (first line)
-
- /^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
-@@ -56,16 +66,6 @@
-
- /^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
- sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
--}
--
--# Specific programs
--
--#
--/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-- start=RSTART+RLENGTH;
-- c=substr($0,RSTART,RLENGTH);
-- sub(c,which(c,path));
- }
-
- {
diff --git a/net/nagios-plugins/files/patch-utils.sh.in b/net/nagios-plugins/files/patch-utils.sh.in
deleted file mode 100644
index 4526200301fe..000000000000
--- a/net/nagios-plugins/files/patch-utils.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins-scripts/utils.sh.in.orig Thu Jun 6 06:16:56 2002
-+++ plugins-scripts/utils.sh.in Sun Jul 14 17:40:56 2002
-@@ -14,10 +14,10 @@
-
- print_revision() {
- echo "$1 (@PACKAGE@ @VERSION@) $2"
-- $ECHO "@WARRANTY@" | /bin/sed -e 's/\n/ /g'
-+ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g'
- }
-
- support() {
-- $ECHO "@SUPPORT@" | /bin/sed -e 's/\n/ /g'
-+ $ECHO "@SUPPORT@" | /usr/bin/sed -e 's/\n/ /g'
- }
-
diff --git a/net/nagios-plugins/pkg-descr b/net/nagios-plugins/pkg-descr
deleted file mode 100644
index 3157597a6284..000000000000
--- a/net/nagios-plugins/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-This is a plugin package for Nagios. Quoting from the
-main Nagios package:
-
-Nagios is a host and service monitor designed to inform you of network
-problems before your clients, end-users or managers do. It has been
-designed to run under the Linux operating system, but works fine under
-most *NIX variants as well. The monitoring daemon runs intermittent
-checks on hosts and services you specify using external "plugins"
-which return status information to Nagios. When problems are
-encountered, the daemon can send notifications out to administrative
-contacts in a variety of different ways (email, instant message, SMS,
-etc.). Current status information, historical logs, and reports can
-all be accessed via a web browser.
-
-WWW: http://www.nagios.org/
diff --git a/net/nagios-plugins/pkg-plist b/net/nagios-plugins/pkg-plist
deleted file mode 100644
index 67bdc4487c11..000000000000
--- a/net/nagios-plugins/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-libexec/nagios/check_breeze
-libexec/nagios/check_by_ssh
-libexec/nagios/check_dig
-libexec/nagios/check_disk
-libexec/nagios/check_disk_smb
-libexec/nagios/check_dns
-libexec/nagios/check_dummy
-libexec/nagios/check_flexlm
-%%SUB_FPING%%libexec/nagios/check_fping
-libexec/nagios/check_ftp
-%%SUB_QSTAT%%libexec/nagios/check_game
-%%SUB_SNMP%%libexec/nagios/check_hpjd
-libexec/nagios/check_http
-libexec/nagios/check_ifoperstatus
-libexec/nagios/check_ifstatus
-libexec/nagios/check_imap
-libexec/nagios/check_ircd
-%%SUB_LDAP%%libexec/nagios/check_ldap
-libexec/nagios/check_load
-libexec/nagios/check_log
-libexec/nagios/check_mailq
-libexec/nagios/check_mrtg
-libexec/nagios/check_mrtgtraf
-%%SUB_MYSQL%%libexec/nagios/check_mysql
-libexec/nagios/check_nagios
-libexec/nagios/check_nntp
-libexec/nagios/check_nt
-libexec/nagios/check_ntp
-libexec/nagios/check_nwstat
-libexec/nagios/check_oracle
-libexec/nagios/check_overcr
-%%SUB_PGSQL%%libexec/nagios/check_pgsql
-libexec/nagios/check_ping
-libexec/nagios/check_pop
-libexec/nagios/check_procs
-%%SUB_RADIUS%%libexec/nagios/check_radius
-libexec/nagios/check_real
-libexec/nagios/check_rpc
-libexec/nagios/check_sensors
-libexec/nagios/check_simap
-libexec/nagios/check_smtp
-%%SUB_SNMP%%libexec/nagios/check_snmp
-libexec/nagios/check_spop
-libexec/nagios/check_ssh
-libexec/nagios/check_swap
-libexec/nagios/check_tcp
-libexec/nagios/check_time
-libexec/nagios/check_udp
-libexec/nagios/check_ups
-libexec/nagios/check_users
-libexec/nagios/check_vsz
-libexec/nagios/check_wave
-libexec/nagios/negate
-libexec/nagios/urlize
-libexec/nagios/utils.pm
-libexec/nagios/utils.sh
-@dirrm libexec/nagios
diff --git a/net/nagios-plugins/scripts/configure b/net/nagios-plugins/scripts/configure
deleted file mode 100644
index 00bc6d2674b4..000000000000
--- a/net/nagios-plugins/scripts/configure
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
- exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${BATCH}" = "yes" ]; then
-else
- /usr/bin/dialog --title "NetSaint plugins configuration options" --clear \
- --checklist "\n\
-Please select desired options:" -1 -1 16 \
-QStat "Game server query support" OFF \
-FPing "Support for non-flooding fast ping" OFF \
-NetSNMP "SNMP support" OFF \
-Radiusclient "Radius support" OFF \
-MySQL "MySQL support" OFF \
-PostgreSQL "PostgreSQL support" OFF \
-OpenLDAP "OpenLDAP support" OFF \
-2> $tempfile
-
- retval=$?
-
- if [ -s $tempfile ]; then
- set `cat $tempfile`
- fi
- rm -f $tempfile
-
- case $retval in
- 0) if [ -z "$*" ]; then
- echo "Nothing selected"
- fi
- ;;
- 1) echo "Cancel pressed."
- exit 1
- ;;
- esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-SUB_QSTAT="@comment "
-SUB_FPING="@comment "
-SUB_SNMP="@comment "
-SUB_RADIUS="@comment "
-SUB_MYSQL="@comment "
-SUB_PGSQL="@comment "
-SUB_LDAP="@comment "
-
-while [ "$1" ]; do
- case $1 in
- \"QStat\")
- echo "BUILD_DEPENDS+= qstat:\${PORTSDIR}/games/qstat"
- echo "RUN_DEPENDS+= qstat:\${PORTSDIR}/games/qstat"
- echo "CONFIGURE_ARGS+= --enable-qstat"
- SUB_QSTAT=""
- ;;
- \"FPing\")
- echo "BUILD_DEPENDS+= fping:\${PORTSDIR}/net/fping"
- echo "RUN_DEPENDS+= fping:\${PORTSDIR}/net/fping"
- echo "CONFIGURE_ARGS+= --enable-fping"
- SUB_FPING=""
- ;;
- \"NetSNMP\")
- echo "BUILD_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
- echo "RUN_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
- echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/perl5/site_perl/\${PERL_VER}/Net/SNMP.pm:\${PORTSDIR}/net/p5-Net-SNMP"
- echo "RUN_DEPENDS+= \${LOCALBASE}/lib/perl5/site_perl/\${PERL_VER}/Net/SNMP.pm:\${PORTSDIR}/net/p5-Net-SNMP"
- echo "CONFIGURE_ARGS+= --enable-snmp"
- SUB_SNMP=""
- ;;
- \"Radiusclient\")
- echo "LIB_DEPENDS+= radiusclient.0:\${PORTSDIR}/net/radiusclient"
- echo "CONFIGURE_ARGS+= --enable-radius"
- SUB_RADIUS=""
- ;;
- \"MySQL\")
- echo ".if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.12)"
- echo "LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client"
- echo ".else"
- echo ".if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)"
- echo "LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client"
- echo ".else"
- echo "LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client"
- echo ".endif"
- echo ".endif"
- echo "CONFIGURE_ARGS+= --with-mysql=\${LOCALBASE}"
- SUB_MYSQL=""
- ;;
- \"PostgreSQL\")
- echo "POSTGRESQL_PORT?= databases/postgresql7"
- echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
- echo "CONFIGURE_ARGS+= --with-pgsql=\${LOCALBASE}"
- SUB_PGSQL=""
- ;;
- \"OpenLDAP\")
- echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap20-client"
- echo "CONFIGURE_ARGS+= --enable-ldap"
- SUB_LDAP=""
- ;;
- *)
- echo "Invalid option(s): $*" > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- ;;
- esac
- shift
-done
-
-echo "PLIST_SUB+= SUB_QSTAT=\"${SUB_QSTAT}\""
-echo "PLIST_SUB+= SUB_FPING=\"${SUB_FPING}\""
-echo "PLIST_SUB+= SUB_SNMP=\"${SUB_SNMP}\""
-echo "PLIST_SUB+= SUB_RADIUS=\"${SUB_RADIUS}\""
-echo "PLIST_SUB+= SUB_MYSQL=\"${SUB_MYSQL}\""
-echo "PLIST_SUB+= SUB_PGSQL=\"${SUB_PGSQL}\""
-echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
diff --git a/net/nagios/distinfo b/net/nagios/distinfo
deleted file mode 100644
index 5b8482cbb29e..000000000000
--- a/net/nagios/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f
diff --git a/net/nagios/files/DEINSTALL.tmpl b/net/nagios/files/DEINSTALL.tmpl
deleted file mode 100644
index 93ed52b4d017..000000000000
--- a/net/nagios/files/DEINSTALL.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-USER=%%NAGIOSUSER%%
-GROUP=%%NAGIOSGROUP%%
-DIR=%%NAGIOSDIR%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-
- if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
- echo "You should manually remove the \"${GROUP}\" group."
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
- echo "You should manually remove the \"${USER}\" user."
- fi
-
- if [ -e ${DIR} ]; then
- echo "You should manually remove the \"${DIR}\" directory."
- fi
-fi
diff --git a/net/nagios/files/INSTALL.tmpl b/net/nagios/files/INSTALL.tmpl
deleted file mode 100644
index ca4c1a9e4b45..000000000000
--- a/net/nagios/files/INSTALL.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/nagios/files/Attic/INSTALL.tmpl,v 1.1 2004-02-11 04:56:00 linimon Exp $
-#
-
-USER=%%NAGIOSUSER%%
-GROUP=%%NAGIOSGROUP%%
-DIR=%%NAGIOSDIR%%
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local dflt question answer
-
- question=$1
- dflt=$2
- while :; do
- answer=$(ask "${question}" "${dflt}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- echo "You need a group \"${GROUP}\"."
- if yesno "Would you like me to create it" y; then
- /usr/sbin/pw groupadd ${GROUP} -h - || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- echo "You need a user \"${USER}\"."
- if yesno "Would you like me to create it" y; then
- /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - -d ${DIR} \
- -s /nonexistent -c "Nagios pseudo-user" || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
-fi
diff --git a/net/nagios/files/MESSAGE.tmpl b/net/nagios/files/MESSAGE.tmpl
deleted file mode 100644
index a96b0d6243c3..000000000000
--- a/net/nagios/files/MESSAGE.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-*******************************************************************
- Enable nagios in /etc/rc.conf with the following line:
-
- nagios_enable="YES"
-
- Configuration templates are available in %%PREFIX%%/etc/nagios
- as *.cfg-sample files. Copy them to *.cfg and edit them to suit
- your needs. Documentation is available in HTML form in
- %%PREFIX%%/share/nagios/docs.
-
- If you don't already have a web server running, you need to install
- and configure it to finish your nagios installation.
-*******************************************************************
-
diff --git a/net/nagios/files/nagios.sh.tmpl b/net/nagios/files/nagios.sh.tmpl
deleted file mode 100644
index d3cd0691f819..000000000000
--- a/net/nagios/files/nagios.sh.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-#
-# Add the following lines to /etc/rc.conf to enable nagios:
-#
-#nagios_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=nagios
-rcvar=`set_rcvar`
-
-prefix=%%PREFIX%%
-
-required_files=${prefix}/etc/nagios/nagios.cfg
-
-NagiosBin=${prefix}/bin/nagios
-NagiosCfg=${prefix}/etc/nagios/nagios.cfg
-NagiosVar=/var/spool/nagios
-NagiosLog=${NagiosVar}/status.log
-NagiosTmp=${NagiosVar}/nagios.tmp
-NagiosSav=${NagiosVar}/status.sav
-NagiosCmd=${NagiosVar}/rw/nagios.cmd
-NagiosRun=${NagiosVar}/nagios.lock
-
-pidfile=${NagiosRun}
-command=${NagiosBin}
-command_args="-d $NagiosCfg"
-nagios_user=nagios
-
-start_precmd=start_precmd
-stop_postcmd=stop_postcmd
-
-# set defaults
-
-nagios_enable=${nagios_enable:-"NO"}
-nagios_flags=${nagios_flags:-""}
-
-start_precmd()
-{
- su -m ${nagios_user} -c "touch ${NagiosVar}/nagios.log ${NagiosSav}"
- rm -f ${NagiosCmd}
-}
-
-stop_postcmd()
-{
- rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosCmd
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/nagios/files/patch-aa b/net/nagios/files/patch-aa
deleted file mode 100644
index 595da2b80d2c..000000000000
--- a/net/nagios/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.in.orig Sat Oct 26 02:47:15 2002
-+++ Makefile.in Tue Nov 26 13:58:29 2002
-@@ -28,7 +28,7 @@
- INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
- INIT_DIR=@init_dir@
--INIT_OPTS=-o root -g root
-+INIT_OPTS=-o root -g wheel
- CGICFGDIR=$(CGIDIR)
- PERLDIR=@PERLDIR@
-
-@@ -196,6 +196,8 @@
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample
-
- @echo ""
- @echo "*** Sample config file installed ***"
-@@ -215,7 +217,7 @@
-
- install-daemoninit:
- $(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
-- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
-+ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
-
- @echo ""
- @echo "*** Init script installed ***"
-@@ -238,7 +240,6 @@
-
- install-commandmode:
- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
-- chmod g+s $(DESTDIR)$(LOGDIR)/rw
-
- @echo ""
- @echo "*** External command directory configured ***"
diff --git a/net/nagios/files/patch-ab b/net/nagios/files/patch-ab
deleted file mode 100644
index 6634c8f6b40a..000000000000
--- a/net/nagios/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/Makefile.in.orig Mon Nov 11 04:52:13 2002
-+++ base/Makefile.in Tue Nov 26 13:46:41 2002
-@@ -105,7 +105,6 @@
- devclean: clean
-
- install:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
- $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
-
diff --git a/net/nagios/files/patch-ad b/net/nagios/files/patch-ad
deleted file mode 100644
index 4518f5907c41..000000000000
--- a/net/nagios/files/patch-ad
+++ /dev/null
@@ -1,69 +0,0 @@
---- configure.orig Tue Feb 3 05:45:08 2004
-+++ configure Wed Feb 4 21:26:46 2004
-@@ -11,7 +11,7 @@
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
--ac_default_prefix=/usr/local/nagios
-+#ac_default_prefix=/usr/local/nagios
- ac_help="$ac_help
- --with-nagios-user=<user> sets user name to run nagios"
- ac_help="$ac_help
-@@ -576,9 +576,9 @@
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+ CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+ CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
- fi
- fi
- for ac_site_file in $CONFIG_SITE; do
-@@ -2608,6 +2608,9 @@
- LDFLAGS="${LDFLAGS} -L${withval}"
- LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-
-+else
-+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+ LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
-
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -2615,6 +2618,8 @@
- withval="$with_gd_inc"
-
- CFLAGS="${CFLAGS} -I${withval}"
-+else
-+ CFLAGS="${CFLAGS} -I/usr/local/include/gd"
-
- fi
-
-@@ -2692,14 +2697,14 @@
-
-
-
-- echo $ac_n "checking for gdImagePng in -lgd (order 1)""... $ac_c" 1>&6
--echo "configure:2697: checking for gdImagePng in -lgd (order 1)" >&5
-+ echo $ac_n "checking for gdImagePng in -lgd1 (order 1)""... $ac_c" 1>&6
-+echo "configure:2697: checking for gdImagePng in -lgd1 (order 1)" >&5
- ac_lib_var=`echo gd'_'gdImagePng'_'1 | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
-- LIBS="-lgd $ICONV -lz -lm -lpng -ljpeg $LIBS"
-+ LIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2705 "configure"
- #include "confdefs.h"
-@@ -2729,7 +2734,7 @@
- echo "$ac_t""yes" 1>&6
-
- GDLIBFOUND=yep
-- GDLIBS="-lgd $ICONV -lz -lm -lpng -ljpeg"
-+ GDLIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg"
-
- else
- echo "$ac_t""no" 1>&6
diff --git a/net/nagios/files/patch-ae b/net/nagios/files/patch-ae
deleted file mode 100644
index 0bf8e064b3a7..000000000000
--- a/net/nagios/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig Mon Apr 30 17:22:35 2001
-+++ configure.in Tue May 1 19:36:54 2001
-@@ -1,7 +1,7 @@
- dnl Process this -*-m4-*- file with autoconf to produce a configure script.
- AC_INIT(base/nagios.c)
- AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/nagios)
-+AC_PREFIX_DEFAULT(/usr/local)
-
- dnl Figure out how to invoke "install" and what install options to use.
- AC_PROG_INSTALL
diff --git a/net/nagios/files/patch-ag b/net/nagios/files/patch-ag
deleted file mode 100644
index 14027c5d9cc9..000000000000
--- a/net/nagios/files/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
---- functions Fri Apr 7 11:11:34 2000
-+++ functions.new Sat Jun 10 13:31:31 2000
-@@ -11,7 +11,7 @@
- #
-
- # First set up a default search path.
--PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
- export PATH
-
- # Get a sane screen width
-@@ -174,7 +174,7 @@
- # fi
-
- # Finally try to extract it from ps
-- pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
-+ pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
- if [ "$pid" != "" ] ; then
- echo $pid
- return 0
-@@ -206,8 +206,8 @@
- fi
- fi
-
-- # See if /var/lock/subsys/$1 exists
-- if [ -f /var/lock/subsys/$1 ]; then
-+ # See if /var/spool/lock/$1 exists
-+ if [ -f /var/spool/lock/$1 ]; then
- echo "$1 dead but subsys locked"
- return 2
- fi
diff --git a/net/nagios/files/patch-ai b/net/nagios/files/patch-ai
deleted file mode 100644
index 433d6d74758d..000000000000
--- a/net/nagios/files/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
---- daemon-init.in.orig Thu Apr 18 06:27:13 2002
-+++ daemon-init.in Sun May 19 08:39:29 2002
-@@ -68,11 +68,8 @@
-
-
- # Source function library
--# Solaris doesn't have an rc.d directory, so do a test first
--if [ -f /etc/rc.d/init.d/functions ]; then
-- . /etc/rc.d/init.d/functions
--elif [ -f /etc/init.d/functions ]; then
-- . /etc/init.d/functions
-+if [ -f @sysconfdir@/functions ]; then
-+. @sysconfdir@/functions
- fi
-
- prefix=@prefix@
-@@ -102,7 +99,7 @@
-
- start)
- echo "Starting network monitor: nagios"
-- su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
-+ su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
- rm -f $NagiosCmd
- $NagiosBin -d $NagiosCfg
- if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi
diff --git a/net/nagios/files/patch-xcddb.c b/net/nagios/files/patch-xcddb.c
deleted file mode 100644
index 34bc8dc1759a..000000000000
--- a/net/nagios/files/patch-xcddb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
-+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
-@@ -51,7 +51,7 @@
- #endif
-
- #ifdef USE_XCDPGSQL
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- #endif
-
-
diff --git a/net/nagios/files/patch-xdddb.c b/net/nagios/files/patch-xdddb.c
deleted file mode 100644
index f1a942e7ae45..000000000000
--- a/net/nagios/files/patch-xdddb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
-+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
-@@ -51,7 +51,7 @@
- #endif
-
- #ifdef USE_XDDPGSQL
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- #endif
-
-
diff --git a/net/nagios/files/patch-xeddb.c b/net/nagios/files/patch-xeddb.c
deleted file mode 100644
index 2aaaa7db9043..000000000000
--- a/net/nagios/files/patch-xeddb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
-+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
-@@ -44,7 +44,7 @@
- #endif
-
- #ifdef USE_XEDPGSQL
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- #endif
-
-
diff --git a/net/nagios/files/patch-xrddb.c b/net/nagios/files/patch-xrddb.c
deleted file mode 100644
index 0f850674b63c..000000000000
--- a/net/nagios/files/patch-xrddb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
-+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
-@@ -43,7 +43,7 @@
- #endif
-
- #ifdef USE_XRDPGSQL
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- #endif
-
-
diff --git a/net/nagios/files/patch-xsddb.c b/net/nagios/files/patch-xsddb.c
deleted file mode 100644
index e9e1d169cc76..000000000000
--- a/net/nagios/files/patch-xsddb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
-+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
-@@ -48,7 +48,7 @@
- #endif
-
- #ifdef USE_XSDPGSQL
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- #endif
-
-
diff --git a/net/nagios/pkg-descr b/net/nagios/pkg-descr
deleted file mode 100644
index b1ff9995e7fc..000000000000
--- a/net/nagios/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Nagios is a host and service monitor designed to inform you of network
-problems before your clients, end-users or managers do. It has been
-designed to run under the Linux operating system, but works fine under
-most *NIX variants as well. The monitoring daemon runs intermittent
-checks on hosts and services you specify using external "plugins"
-which return status information to Nagios. When problems are
-encountered, the daemon can send notifications out to administrative
-contacts in a variety of different ways (email, instant message, SMS,
-etc.). Current status information, historical logs, and reports can
-all be accessed via a web browser.
-
-WWW: http://www.nagios.org/
diff --git a/net/nagios/pkg-plist b/net/nagios/pkg-plist
deleted file mode 100644
index 2f1a32523a20..000000000000
--- a/net/nagios/pkg-plist
+++ /dev/null
@@ -1,314 +0,0 @@
-@exec mkdir -p %D/share/nagios/ssi
-@exec mkdir -p /var/spool/nagios/archives
-@exec mkdir -p /var/spool/nagios/rw
-@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
-@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
-@exec chown nagios:nogroup /var/spool/nagios/rw
-bin/nagios
-etc/nagios/cgi.cfg-sample
-etc/nagios/checkcommands.cfg-sample
-etc/nagios/contactgroups.cfg-sample
-etc/nagios/contacts.cfg-sample
-etc/nagios/dependencies.cfg-sample
-etc/nagios/escalations.cfg-sample
-etc/nagios/hostextinfo.cfg-sample
-etc/nagios/hostgroups.cfg-sample
-etc/nagios/hosts.cfg-sample
-etc/nagios/misccommands.cfg-sample
-etc/nagios/nagios.cfg-sample
-etc/nagios/resource.cfg-sample
-etc/nagios/serviceextinfo.cfg-sample
-etc/nagios/services.cfg-sample
-etc/nagios/timeperiods.cfg-sample
-etc/rc.d/nagios.sh
-share/nagios/cgi-bin/avail.cgi
-share/nagios/cgi-bin/cmd.cgi
-share/nagios/cgi-bin/config.cgi
-share/nagios/cgi-bin/extinfo.cgi
-share/nagios/cgi-bin/histogram.cgi
-share/nagios/cgi-bin/history.cgi
-share/nagios/cgi-bin/notifications.cgi
-share/nagios/cgi-bin/outages.cgi
-share/nagios/cgi-bin/showlog.cgi
-share/nagios/cgi-bin/status.cgi
-share/nagios/cgi-bin/statusmap.cgi
-share/nagios/cgi-bin/statuswml.cgi
-share/nagios/cgi-bin/statuswrl.cgi
-share/nagios/cgi-bin/summary.cgi
-share/nagios/cgi-bin/tac.cgi
-share/nagios/cgi-bin/trends.cgi
-share/nagios/contexthelp/A1.html
-share/nagios/contexthelp/A2.html
-share/nagios/contexthelp/A3.html
-share/nagios/contexthelp/A4.html
-share/nagios/contexthelp/A5.html
-share/nagios/contexthelp/A6.html
-share/nagios/contexthelp/A7.html
-share/nagios/contexthelp/B1.html
-share/nagios/contexthelp/C1.html
-share/nagios/contexthelp/D1.html
-share/nagios/contexthelp/E1.html
-share/nagios/contexthelp/F1.html
-share/nagios/contexthelp/G1.html
-share/nagios/contexthelp/G2.html
-share/nagios/contexthelp/G3.html
-share/nagios/contexthelp/G4.html
-share/nagios/contexthelp/G5.html
-share/nagios/contexthelp/G6.html
-share/nagios/contexthelp/H1.html
-share/nagios/contexthelp/H2.html
-share/nagios/contexthelp/H3.html
-share/nagios/contexthelp/H4.html
-share/nagios/contexthelp/H5.html
-share/nagios/contexthelp/H6.html
-share/nagios/contexthelp/H7.html
-share/nagios/contexthelp/H8.html
-share/nagios/contexthelp/I1.html
-share/nagios/contexthelp/I2.html
-share/nagios/contexthelp/I3.html
-share/nagios/contexthelp/I4.html
-share/nagios/contexthelp/I5.html
-share/nagios/contexthelp/I6.html
-share/nagios/contexthelp/I7.html
-share/nagios/contexthelp/I8.html
-share/nagios/contexthelp/J1.html
-share/nagios/contexthelp/K1.html
-share/nagios/contexthelp/L1.html
-share/nagios/contexthelp/L10.html
-share/nagios/contexthelp/L11.html
-share/nagios/contexthelp/L12.html
-share/nagios/contexthelp/L13.html
-share/nagios/contexthelp/L2.html
-share/nagios/contexthelp/L3.html
-share/nagios/contexthelp/L4.html
-share/nagios/contexthelp/L5.html
-share/nagios/contexthelp/L6.html
-share/nagios/contexthelp/L7.html
-share/nagios/contexthelp/L8.html
-share/nagios/contexthelp/L9.html
-share/nagios/contexthelp/M1.html
-share/nagios/contexthelp/M2.html
-share/nagios/contexthelp/M3.html
-share/nagios/contexthelp/M4.html
-share/nagios/contexthelp/M5.html
-share/nagios/contexthelp/M6.html
-share/nagios/contexthelp/N1.html
-share/nagios/contexthelp/N2.html
-share/nagios/contexthelp/N3.html
-share/nagios/contexthelp/N4.html
-share/nagios/contexthelp/N5.html
-share/nagios/contexthelp/N6.html
-share/nagios/contexthelp/N7.html
-share/nagios/docs/images/activepassive.png
-share/nagios/docs/images/cgi-avail-a.png
-share/nagios/docs/images/cgi-avail-b.png
-share/nagios/docs/images/cgi-cmd.png
-share/nagios/docs/images/cgi-config.png
-share/nagios/docs/images/cgi-extinfo-a.png
-share/nagios/docs/images/cgi-extinfo-b.png
-share/nagios/docs/images/cgi-extinfo-c.png
-share/nagios/docs/images/cgi-extinfo-d.png
-share/nagios/docs/images/cgi-histogram.png
-share/nagios/docs/images/cgi-history.png
-share/nagios/docs/images/cgi-notifications.png
-share/nagios/docs/images/cgi-outages.png
-share/nagios/docs/images/cgi-showlog.png
-share/nagios/docs/images/cgi-status-a.png
-share/nagios/docs/images/cgi-status-b.png
-share/nagios/docs/images/cgi-status-c.png
-share/nagios/docs/images/cgi-status-d.png
-share/nagios/docs/images/cgi-statusmap.png
-share/nagios/docs/images/cgi-statuswml.png
-share/nagios/docs/images/cgi-statuswrl.png
-share/nagios/docs/images/cgi-summary.png
-share/nagios/docs/images/cgi-tac.png
-share/nagios/docs/images/cgi-trends.png
-share/nagios/docs/images/checktiming.png
-share/nagios/docs/images/distributed.png
-share/nagios/docs/images/host-dependencies.png
-share/nagios/docs/images/indirecthostcheck.png
-share/nagios/docs/images/indirectsvccheck.png
-share/nagios/docs/images/indirectsvccheck2.png
-share/nagios/docs/images/interleaved1.png
-share/nagios/docs/images/interleaved2.png
-share/nagios/docs/images/interleaved3.png
-share/nagios/docs/images/logofullsize.png
-share/nagios/docs/images/network-heirarchy.png
-share/nagios/docs/images/network-outage1.png
-share/nagios/docs/images/network-outage2.png
-share/nagios/docs/images/noninterleaved1.png
-share/nagios/docs/images/noninterleaved2.png
-share/nagios/docs/images/physical-network.png
-share/nagios/docs/images/plugintheory.png
-share/nagios/docs/images/redudancy.png
-share/nagios/docs/images/redundancy.png
-share/nagios/docs/images/service-dependencies.png
-share/nagios/docs/images/statetransitions.png
-share/nagios/docs/images/statetransitions2.png
-share/nagios/docs/about.html
-share/nagios/docs/addons.html
-share/nagios/docs/beginners.html
-share/nagios/docs/cgiauth.html
-share/nagios/docs/cgiincludes.html
-share/nagios/docs/cgis.html
-share/nagios/docs/checkscheduling.html
-share/nagios/docs/clusters.html
-share/nagios/docs/commandfile.html
-share/nagios/docs/config.html
-share/nagios/docs/configcgi.html
-share/nagios/docs/configextinfo.html
-share/nagios/docs/configmain.html
-share/nagios/docs/configobject.html
-share/nagios/docs/dependencies.html
-share/nagios/docs/distributed.html
-share/nagios/docs/downtime.html
-share/nagios/docs/embeddedperl.html
-share/nagios/docs/escalations.html
-share/nagios/docs/eventhandlers.html
-share/nagios/docs/extcommands.html
-share/nagios/docs/faqs.html
-share/nagios/docs/flapping.html
-share/nagios/docs/freshness.html
-share/nagios/docs/funstuff.html
-share/nagios/docs/index.html
-share/nagios/docs/indirectchecks.html
-share/nagios/docs/installing.html
-share/nagios/docs/installweb.html
-share/nagios/docs/int-portsentry.html
-share/nagios/docs/int-snmptrap.html
-share/nagios/docs/int-tcpwrappers.html
-share/nagios/docs/macros.html
-share/nagios/docs/networkoutages.html
-share/nagios/docs/networkreachability.html
-share/nagios/docs/notifications.html
-share/nagios/docs/parallelization.html
-share/nagios/docs/passivechecks.html
-share/nagios/docs/perfdata.html
-share/nagios/docs/plugins.html
-share/nagios/docs/plugintheory.html
-share/nagios/docs/redundancy.html
-share/nagios/docs/robots.txt
-share/nagios/docs/security.html
-share/nagios/docs/stalking.html
-share/nagios/docs/starting.html
-share/nagios/docs/statetypes.html
-share/nagios/docs/stoprestart.html
-share/nagios/docs/templaterecursion.html
-share/nagios/docs/templatetricks.html
-share/nagios/docs/timeperiods.html
-share/nagios/docs/toc.html
-share/nagios/docs/tuning.html
-share/nagios/docs/verifyconfig.html
-share/nagios/docs/volatileservices.html
-share/nagios/docs/whatsnew.html
-share/nagios/docs/xdata-db.html
-share/nagios/docs/xeddefault.html
-share/nagios/docs/xedtemplate.html
-share/nagios/docs/xoddefault.html
-share/nagios/docs/xodtemplate.html
-share/nagios/docs/xpddefault.html
-share/nagios/docs/xpdfile.html
-share/nagios/images/ack.gif
-share/nagios/images/command.png
-share/nagios/images/comment.gif
-share/nagios/images/contexthelp1.gif
-share/nagios/images/contexthelp2.gif
-share/nagios/images/critical.png
-share/nagios/images/delay.gif
-share/nagios/images/delete.gif
-share/nagios/images/disabled.gif
-share/nagios/images/down.gif
-share/nagios/images/downtime.gif
-share/nagios/images/empty.gif
-share/nagios/images/enabled.gif
-share/nagios/images/extinfo.gif
-share/nagios/images/flapping.gif
-share/nagios/images/greendot.gif
-share/nagios/images/histogram.png
-share/nagios/images/history.gif
-share/nagios/images/hostevent.gif
-share/nagios/images/info.png
-share/nagios/images/left.gif
-share/nagios/images/logofullsize.jpg
-share/nagios/images/logos/nagios.gd2
-share/nagios/images/logos/nagios.gif
-share/nagios/images/logos/nagiosvrml.png
-share/nagios/images/logos/unknown.gd2
-share/nagios/images/logos/unknown.gif
-share/nagios/images/logrotate.png
-share/nagios/images/ndisabled.gif
-share/nagios/images/noack.gif
-share/nagios/images/notes.gif
-share/nagios/images/notify.gif
-share/nagios/images/orangedot.gif
-share/nagios/images/passiveonly.gif
-share/nagios/images/recovery.png
-share/nagios/images/redudancy.png
-share/nagios/images/redundancy.png
-share/nagios/images/restart.gif
-share/nagios/images/right.gif
-share/nagios/images/sbconfig.png
-share/nagios/images/sbgeneral.png
-share/nagios/images/sblogo.jpg
-share/nagios/images/sbmonitor.png
-share/nagios/images/sbreport.png
-share/nagios/images/serviceevent.gif
-share/nagios/images/start.gif
-share/nagios/images/status.gif
-share/nagios/images/status2.gif
-share/nagios/images/status3.gif
-share/nagios/images/status4.gif
-share/nagios/images/stop.gif
-share/nagios/images/tacdisabled.jpg
-share/nagios/images/tacdisabled.png
-share/nagios/images/tacenabled.jpg
-share/nagios/images/tacenabled.png
-share/nagios/images/thermcrit.png
-share/nagios/images/thermok.png
-share/nagios/images/thermwarn.png
-share/nagios/images/trends.gif
-share/nagios/images/trendshost.png
-share/nagios/images/trendssvc.png
-share/nagios/images/unknown.png
-share/nagios/images/up.gif
-share/nagios/images/warning.png
-share/nagios/images/weblogo1.png
-share/nagios/images/zoom1.gif
-share/nagios/images/zoom2.gif
-share/nagios/index.html
-share/nagios/main.html
-share/nagios/media/critical.wav
-share/nagios/media/hostdown.wav
-share/nagios/media/warning.wav
-share/nagios/robots.txt
-share/nagios/side.html
-share/nagios/stylesheets/avail.css
-share/nagios/stylesheets/checksanity.css
-share/nagios/stylesheets/cmd.css
-share/nagios/stylesheets/config.css
-share/nagios/stylesheets/extinfo.css
-share/nagios/stylesheets/histogram.css
-share/nagios/stylesheets/history.css
-share/nagios/stylesheets/ministatus.css
-share/nagios/stylesheets/notifications.css
-share/nagios/stylesheets/outages.css
-share/nagios/stylesheets/showlog.css
-share/nagios/stylesheets/status.css
-share/nagios/stylesheets/statusmap.css
-share/nagios/stylesheets/summary.css
-share/nagios/stylesheets/tac.css
-share/nagios/stylesheets/trends.css
-@unexec rmdir %D/etc/nagios 2>/dev/null || true
-@dirrm share/nagios/cgi-bin
-@dirrm share/nagios/contexthelp
-@dirrm share/nagios/docs/images
-@dirrm share/nagios/docs
-@dirrm share/nagios/images/logos
-@dirrm share/nagios/images
-@dirrm share/nagios/media
-@dirrm share/nagios/ssi
-@dirrm share/nagios/stylesheets
-@dirrm share/nagios
-@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
-@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
-@unexec rmdir /var/spool/nagios 2>/dev/null || true
diff --git a/net/nat/distinfo b/net/nat/distinfo
deleted file mode 100644
index 601c3a6ed3a6..000000000000
--- a/net/nat/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nat20.freebsd.tar.gz) = 20174dc3e5f4cc6802369a298fec7cd1
diff --git a/net/nat/pkg-descr b/net/nat/pkg-descr
deleted file mode 100644
index 6cbeedae7cd3..000000000000
--- a/net/nat/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-SMB/CIFS server and file share auditing tool used to gather information and
-identify misconfigurations in security critical environments.
diff --git a/net/nat/pkg-plist b/net/nat/pkg-plist
deleted file mode 100644
index faa3d13a2275..000000000000
--- a/net/nat/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/nat
-share/nat/passlist.txt
-share/nat/userlist.txt
-@dirrm share/nat
diff --git a/net/nbtscan/distinfo b/net/nbtscan/distinfo
deleted file mode 100644
index 9e3de12a7973..000000000000
--- a/net/nbtscan/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (nbtscan-1.5.1.tar.gz) = 85bb085077c380b82a6ff73e0de0c154
-SIZE (nbtscan-1.5.1.tar.gz) = 82107
diff --git a/net/nbtscan/pkg-descr b/net/nbtscan/pkg-descr
deleted file mode 100644
index d6ef09b3d6a3..000000000000
--- a/net/nbtscan/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-NBTscan is a program for scanning IP networks for NetBIOS name
-information. It sends NetBIOS status query to each address in supplied
-range and lists received information in human readable form. For each
-responded host it lists IP address, NetBIOS computer name, logged-in
-user name and MAC address.
-
-WWW: http://www.inetcat.org/software/nbtscan.html
diff --git a/net/nbtscan/pkg-plist b/net/nbtscan/pkg-plist
deleted file mode 100644
index 3f84db2b2214..000000000000
--- a/net/nbtscan/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/nbtscan
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/nefu/distinfo b/net/nefu/distinfo
deleted file mode 100644
index 261cffef8d9f..000000000000
--- a/net/nefu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (nefu-0.9.6.tar.gz) = 430f9a3d2ea52f865c47895c93375ca3
-SIZE (nefu-0.9.6.tar.gz) = 231745
diff --git a/net/nefu/pkg-descr b/net/nefu/pkg-descr
deleted file mode 100644
index c2b3b2e8eefe..000000000000
--- a/net/nefu/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-nefu monitors network services and reports outages. Working
-from a discription of the network topography, nefu's algorithm
-prevents "false alarms" in the event of a network outage due to
-a dependency failure.
-
-WWW: http://rsug.itd.umich.edu/software/nefu/
diff --git a/net/net-snmp-tkmib/distinfo b/net/net-snmp-tkmib/distinfo
deleted file mode 100644
index cfb7dd91771d..000000000000
--- a/net/net-snmp-tkmib/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ucd-snmp-4.2.3.tar.gz) = e42df4c7558b5f12cd442b36428ec4bb
diff --git a/net/net-snmp-tkmib/files/patch-tkmib b/net/net-snmp-tkmib/files/patch-tkmib
deleted file mode 100644
index 0d9d5e7a0b87..000000000000
--- a/net/net-snmp-tkmib/files/patch-tkmib
+++ /dev/null
@@ -1,7 +0,0 @@
---- local/tkmib.orig Wed Nov 7 01:26:37 2001
-+++ local/tkmib Thu Apr 4 14:29:19 2002
-@@ -1,4 +1,3 @@
--#!/usr/bin/perl
- #!/usr/bin/perl -w
-
- require 5;
diff --git a/net/net-snmp-tkmib/pkg-descr b/net/net-snmp-tkmib/pkg-descr
deleted file mode 100644
index 1e2a7ba5a94c..000000000000
--- a/net/net-snmp-tkmib/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This is UCD SNMP, a derivative of CMU's SNMP package (tkmib part).
-
-Various tools relating to the Simple Network Management Protocol including:
-
- An extensible agent
- An SNMP library
- tools to request or set information from SNMP agents
- tools to generate and handle SNMP traps
- a version of the unix 'netstat' command using SNMP
- a Tk/perl mib browser
-
-WWW: http://net-snmp.sourceforge.net/
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
deleted file mode 100644
index f10437e32d37..000000000000
--- a/net/net-snmp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (net-snmp-5.1.tar.gz) = 14217471edb2b805b0e28c4c3cfd8c75
diff --git a/net/net-snmp/files/extra-patch-snmplib::mib.c b/net/net-snmp/files/extra-patch-snmplib::mib.c
deleted file mode 100644
index 9ee51d8abf67..000000000000
--- a/net/net-snmp/files/extra-patch-snmplib::mib.c
+++ /dev/null
@@ -1,136 +0,0 @@
---- snmplib/mib.c.orig Sun Nov 2 12:50:39 2003
-+++ snmplib/mib.c Sat Jan 3 03:08:38 2004
-@@ -167,6 +167,14 @@
- {NULL, 0} /* end of list */
- };
-
-+enum inet_address_type {
-+ IPV4 = 1,
-+ IPV6 = 2,
-+ IPV4Z = 3,
-+ IPV6Z = 4,
-+ DNS = 16
-+};
-+
-
- /**
- * @internal
-@@ -3734,6 +3742,80 @@
- return SNMPERR_SUCCESS;
- }
-
-+/*
-+ * dump_realloc_oid_to_inetaddress:
-+ * return 1 for success,
-+ * return 0 for failure,
-+ * return 2 for not handled
-+ */
-+
-+int
-+dump_realloc_oid_to_inetaddress(const int addr_type, const oid * objid, size_t objidlen,
-+ u_char ** buf, size_t * buf_len,
-+ size_t * out_len, int allow_realloc,
-+ char quotechar)
-+{
-+ if (buf) {
-+ int i, len;
-+ char intbuf[64], * p;
-+ u_int32_t zone;
-+
-+ memset(intbuf, 0, 64);
-+
-+ p = intbuf;
-+ *p = quotechar;
-+ p++;
-+ switch (addr_type) {
-+ case IPV4:
-+ case IPV4Z:
-+ if ((addr_type == IPV4 && objidlen != 4) ||
-+ (addr_type == IPV4Z && objidlen != 8))
-+ return 2;
-+
-+ len = sprintf(p, "%lu.%lu.%lu.%lu", objid[0], objid[1], objid[2], objid[3]);
-+ p += len;
-+ if (addr_type == IPV4Z) {
-+ zone = ntohl(*((u_int32_t *) objid[4]));
-+ len = sprintf(p, "\%%lu", zone);
-+ p += len;
-+ }
-+
-+ break;
-+
-+ case IPV6:
-+ case IPV6Z:
-+ if ((addr_type == IPV6 && objidlen != 16) ||
-+ (addr_type == IPV6Z && objidlen != 20))
-+ return 2;
-+
-+ len = 0;
-+ for (i = 0; i < 16; i ++) {
-+ len += snprintf(p, 4, "%02x:", objid[i]);
-+ p += 3;
-+ }
-+ p-- ; /* do not include the last ':' */
-+
-+ if (addr_type == IPV6Z) {
-+ zone = ntohl(*((u_int32_t *) objid[4]));
-+ len = sprintf(p, "\%%lu", zone);
-+ p += len;
-+ }
-+
-+ break;
-+
-+ case DNS:
-+ default:
-+ /* DNS can just be handled by dump_realloc_oid_to_string() */
-+ return 2;
-+ }
-+
-+ *p = quotechar;
-+ return snmp_strcat(buf, buf_len, out_len, allow_realloc,
-+ (const u_char *) intbuf);
-+ }
-+ return 1;
-+}
-+
- int
- dump_realloc_oid_to_string(const oid * objid, size_t objidlen,
- u_char ** buf, size_t * buf_len,
-@@ -4043,7 +4125,36 @@
- }
- } else {
- if (!*buf_overflow) {
-- if (!dump_realloc_oid_to_string
-+ struct tree * next_peer;
-+ int normal_handling = 1;
-+
-+ if (tp->next_peer) {
-+ next_peer = tp->next_peer;
-+ }
-+
-+ /* Try handling the InetAddress in the OID, in case of failure,
-+ * use the normal_handling.
-+ */
-+ if (tp->next_peer &&
-+ strcmp(get_tc_descriptor(tp->tc_index), "InetAddress") == 0 &&
-+ strcmp(get_tc_descriptor(next_peer->tc_index),
-+ "InetAddressType") == 0 ) {
-+
-+ int ret;
-+ int addr_type = *(objid - 1);
-+
-+ ret = dump_realloc_oid_to_inetaddress(addr_type,
-+ objid + 1, numids - 1, buf, buf_len, out_len,
-+ allow_realloc, '"');
-+ if (ret != 2) {
-+ normal_handling = 0;
-+ if (ret == 0) {
-+ *buf_overflow = 1;
-+ }
-+
-+ }
-+ }
-+ if (normal_handling && !dump_realloc_oid_to_string
- (objid + 1, numids - 1, buf, buf_len, out_len,
- allow_realloc, '"')) {
- *buf_overflow = 1;
diff --git a/net/net-snmp/files/patch-Makefile.in b/net/net-snmp/files/patch-Makefile.in
deleted file mode 100644
index 405b874b64aa..000000000000
--- a/net/net-snmp/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Wed Oct 22 22:13:07 2003
-+++ Makefile.in Fri Nov 14 12:59:36 2003
-@@ -15,7 +15,7 @@
- INSTALLHEADERS=version.h
- INCLUDESUBDIR=system
- INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h darwin.h \
-- dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \
-+ dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd.h generic.h hpux.h \
- irix.h linux.h mips.h netbsd.h openbsd.h osf5.h solaris2.6.h solaris2.7.h \
- solaris2.8.h solaris2.9.h solaris.h sunos.h svr5.h sysv.h ultrix4.h
- INCLUDESUBDIR2=machine
diff --git a/net/net-snmp/files/patch-Makefile.top b/net/net-snmp/files/patch-Makefile.top
deleted file mode 100644
index 33bed26b787a..000000000000
--- a/net/net-snmp/files/patch-Makefile.top
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.top.orig Thu Mar 6 05:08:26 2003
-+++ Makefile.top Sat Mar 29 21:54:50 2003
-@@ -59,7 +59,7 @@
- # generally, LIBCURRENT should stay the same unless major changes occur.
- # Increment REVISION every release.
- # Increment AGE if new stuff is available.
--LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
-+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(LIBCURRENT) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
- LIB_EXTENSION = la
- LIB_VERSION =
- LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net/net-snmp/files/patch-aa b/net/net-snmp/files/patch-aa
deleted file mode 100644
index 4d371fdbd56e..000000000000
--- a/net/net-snmp/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- snmplib/Makefile.in.orig Wed Jul 17 02:50:49 2002
-+++ snmplib/Makefile.in Mon Jul 22 12:24:37 2002
-@@ -140,6 +140,10 @@
-
- libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
- $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
-+ ld -Bshareable -soname libsnmp.so.4 \
-+ -o libsnmp.so ${OBJS}
-+ ln -f libsnmp.so \
-+ ../libsnmp.so.4
- $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-
- #how to build dependencies
diff --git a/net/net-snmp/files/patch-aclocal.m4 b/net/net-snmp/files/patch-aclocal.m4
deleted file mode 100644
index eb2e519aa7f0..000000000000
--- a/net/net-snmp/files/patch-aclocal.m4
+++ /dev/null
@@ -1,48 +0,0 @@
---- aclocal.m4.orig Tue Sep 18 17:08:01 2001
-+++ aclocal.m4 Mon Jan 21 10:38:40 2002
-@@ -196,8 +196,23 @@
- AC_DEFUN([AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-
-+# Save cache, so that ltconfig can load it
-+AC_CACHE_SAVE
-+
-+# Actually configure libtool. ac_aux_dir is where install-sh is found.
-+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
-+|| AC_MSG_ERROR([libtool configure failed])
-+
-+# Reload cache, that may have been modified by ltconfig
-+AC_CACHE_LOAD
-+
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -224,6 +239,11 @@
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
-
-+case "$target" in
-+NONE) lt_target="$host" ;;
-+*) lt_target="$target" ;;
-+esac
-+
- _LT_AC_PROG_ECHO_BACKSLASH
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
-@@ -875,7 +895,7 @@
- # All known linkers require a `.a' archive for static linking (except M$VC,
- # which needs '.lib').
- libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
- ofile="$default_ofile"
- with_gnu_ld="$lt_cv_prog_gnu_ld"
- need_locks="$enable_libtool_lock"
diff --git a/net/net-snmp/files/patch-configure.in b/net/net-snmp/files/patch-configure.in
deleted file mode 100644
index c3a85b528ce2..000000000000
--- a/net/net-snmp/files/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.orig Fri Nov 14 13:32:10 2003
-+++ configure.in Fri Nov 14 13:36:27 2003
-@@ -1357,7 +1357,7 @@
- # fall back
- CFLAG="-f"
- fi
--for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel
-+for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel
- do
- if test -f $i -o $CFLAG $i; then
- ac_cv_KERNEL_LOC="$i"
-@@ -1376,6 +1376,7 @@
- # Check for mount table location
- #
-
-+# kuriyama: should /var/db/mounttab be used?
- AC_CACHE_CHECK(for mount table location,ac_cv_ETC_MNTTAB,
- [ac_cv_ETC_MNTTAB="unknown"
- for i in /etc/mnttab /etc/mtab /etc/filesystems
diff --git a/net/net-snmp/files/patch-diskio.c b/net/net-snmp/files/patch-diskio.c
deleted file mode 100644
index 609168f22e9c..000000000000
--- a/net/net-snmp/files/patch-diskio.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- agent/mibgroup/ucd-snmp/diskio.c.orig Thu Mar 6 07:55:01 2003
-+++ agent/mibgroup/ucd-snmp/diskio.c Sat Mar 29 22:41:29 2003
-@@ -49,7 +49,12 @@
- #endif /* bsdi */
-
- #if defined (freebsd4) || defined(freebsd5)
-+#include <sys/param.h>
-+#if __FreeBSD_version >= 500101
-+#include <sys/resource.h>
-+#else
- #include <sys/dkstat.h>
-+#endif
- #include <devstat.h>
- #endif /* freebsd */
-
-@@ -380,7 +385,11 @@
- }
- memset(stat->dinfo, 0, sizeof(struct devinfo));
-
-+#if defined(freebsd5) && (__FreeBSD_version >= 500107)
-+ if ((devstat_getdevs(NULL, stat)) == -1) {
-+#else
- if ((getdevs(stat)) == -1) {
-+#endif
- fprintf(stderr, "Can't get devices:%s\n", devstat_errbuf);
- return 1;
- }
-@@ -429,6 +438,20 @@
- case DISKIO_DEVICE:
- *var_len = strlen(stat->dinfo->devices[indx].device_name);
- return (u_char *) stat->dinfo->devices[indx].device_name;
-+#if defined(freebsd5) && (__FreeBSD_version >= 500107)
-+ case DISKIO_NREAD:
-+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ];
-+ return (u_char *) & long_ret;
-+ case DISKIO_NWRITTEN:
-+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE];
-+ return (u_char *) & long_ret;
-+ case DISKIO_READS:
-+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ];
-+ return (u_char *) & long_ret;
-+ case DISKIO_WRITES:
-+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE];
-+ return (u_char *) & long_ret;
-+#else
- case DISKIO_NREAD:
- long_ret = (signed long) stat->dinfo->devices[indx].bytes_read;
- return (u_char *) & long_ret;
-@@ -441,6 +464,7 @@
- case DISKIO_WRITES:
- long_ret = (signed long) stat->dinfo->devices[indx].num_writes;
- return (u_char *) & long_ret;
-+#endif
-
- default:
- ERROR_MSG("diskio.c: don't know how to handle this request.");
diff --git a/net/net-snmp/files/patch-file.c b/net/net-snmp/files/patch-file.c
deleted file mode 100644
index 94eab370a857..000000000000
--- a/net/net-snmp/files/patch-file.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- agent/mibgroup/ucd-snmp/file.c.orig Thu Dec 25 23:57:14 2003
-+++ agent/mibgroup/ucd-snmp/file.c Thu Dec 25 23:57:37 2003
-@@ -91,17 +91,19 @@
- file_parse_config(const char *token, char *cptr)
- {
- char space;
-+ int items;
-
- if (fileCount < MAXFILE) {
- fileTable[fileCount].max = -1;
-
-- sscanf(cptr, "%255s%c%d",
-+ memset(fileTable[fileCount].name, 0, sizeof(fileTable[0].name));
-+ items = sscanf(cptr, "%255s%c%d",
- fileTable[fileCount].name, &space, &fileTable[fileCount].max);
- /*
- * Log an error then return if the string scanned in was larger then
- * it should have been.
- */
-- if (space != ' ') {
-+ if (items != 1 && space != ' ') {
- snmp_log(LOG_ERR, "file_parse_config: file name scanned " \
- "in from line %s is too large. fileCount = %d\n", cptr,
- fileCount);
diff --git a/net/net-snmp/files/patch-freebsd5.h b/net/net-snmp/files/patch-freebsd5.h
deleted file mode 100644
index 697589ec48b8..000000000000
--- a/net/net-snmp/files/patch-freebsd5.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- /dev/null Sat Aug 16 16:33:01 2003
-+++ include/net-snmp/system/freebsd5.h Sat Aug 16 16:42:08 2003
-@@ -0,0 +1,19 @@
-+#include "freebsd.h"
-+
-+/*
-+ * freebsd4 is a superset of freebsd2 and freebsd3
-+ */
-+#define freebsd2 1
-+#define freebsd3 1
-+#define freebsd4 1
-+
-+#undef IFADDR_SYMBOL
-+#define IFADDR_SYMBOL "in_ifaddrhead"
-+
-+#undef PROC_SYMBOL
-+#define PROC_SYMBOL "allproc"
-+
-+#undef NPROC_SYMBOL
-+#define NPROC_SYMBOL "nprocs"
-+
-+#undef TOTAL_MEMORY_SYMBOL
diff --git a/net/net-snmp/files/patch-hr_storage.c b/net/net-snmp/files/patch-hr_storage.c
deleted file mode 100644
index a1eff0ab8301..000000000000
--- a/net/net-snmp/files/patch-hr_storage.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- agent/mibgroup/host/hr_storage.c.orig Tue Feb 25 22:17:46 2003
-+++ agent/mibgroup/host/hr_storage.c Fri Nov 14 13:03:07 2003
-@@ -148,7 +148,7 @@
- #define HRFS_mount mnt_mountp
- #define HRFS_statfs statvfs
-
--#elif defined(HAVE_STATVFS)
-+#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT)
-
- extern struct mntent *HRFS_entry;
- extern int fscount;
-@@ -564,7 +564,7 @@
- }
- case HRSTORE_UNITS:
- if (store_idx > HRS_TYPE_FIXED_MAX)
--#if STRUCT_STATVFS_HAS_F_FRSIZE
-+#if defined(STRUCT_STATVFS_HAS_F_FRSIZE) && defined(HAVE_MNTENT)
- long_return = stat_buf.f_frsize;
- #else
- long_return = stat_buf.f_bsize;
-@@ -647,7 +647,15 @@
- i++)
- long_return += mbstat.m_mtypes[i];
- #elif defined(MBSTAT_SYMBOL)
-+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
- long_return = mbstat.m_mbufs;
-+#elif __FreeBSD_version < 500024
-+ /* mbuf stats disabled */
-+ return NULL;
-+#else
-+ /* XXX TODO: implement new method */
-+ return NULL;
-+#endif
- #elif defined(NO_DUMMY_VALUES)
- return NULL;
- #else
-@@ -705,7 +713,15 @@
- * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput)
- * mclpool.pr_size;
- #elif defined(MBSTAT_SYMBOL)
-+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
- long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */
-+#elif __FreeBSD_version < 500024
-+ /* mbuf stats disabled */
-+ return NULL;
-+#else
-+ /* XXX TODO: implement new method */
-+ return NULL;
-+#endif
- #elif defined(NO_DUMMY_VALUES)
- return NULL;
- #else
diff --git a/net/net-snmp/files/patch-hr_swrun.c b/net/net-snmp/files/patch-hr_swrun.c
deleted file mode 100644
index 5ff95f18ca72..000000000000
--- a/net/net-snmp/files/patch-hr_swrun.c
+++ /dev/null
@@ -1,86 +0,0 @@
---- agent/mibgroup/host/hr_swrun.c.orig Fri Dec 20 00:07:30 2002
-+++ agent/mibgroup/host/hr_swrun.c Sat Aug 16 17:10:54 2003
-@@ -561,7 +561,11 @@
- string[ sizeof(string)-1 ] = 0;
- #endif
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ strcpy(string, proc_table[LowProcIndex].ki_comm);
-+#else
- strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
-+#endif
- #elif defined(linux)
- sprintf(string, "/proc/%d/status", pid);
- if ((fp = fopen(string, "r")) == NULL)
-@@ -666,7 +670,11 @@
- *cp1 = 0;
- #endif
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ strcpy(string, proc_table[LowProcIndex].ki_comm);
-+#else
- strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
-+#endif
- #elif defined(linux)
- sprintf(string, "/proc/%d/cmdline", pid);
- if ((fp = fopen(string, "r")) == NULL)
-@@ -857,7 +865,11 @@
- }
- #else
- #if HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ switch ( proc_table[LowProcIndex].ki_stat ) {
-+#else
- switch (proc_table[LowProcIndex].kp_proc.p_stat) {
-+#endif
- #elif defined(dynix)
- switch (lowpsinfo.pr_state) {
- #elif defined(solaris2)
-@@ -952,9 +964,17 @@
- long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100;
- #endif
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ /* XXX: Accessing ki_paddr causes sig10 ...
-+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks +
-+ proc_table[LowProcIndex].ki_paddr->p_sticks +
-+ proc_table[LowProcIndex].ki_paddr->p_iticks; */
-+ long_return = 0;
-+#else
- long_return = proc_table[LowProcIndex].kp_proc.p_uticks +
- proc_table[LowProcIndex].kp_proc.p_sticks +
- proc_table[LowProcIndex].kp_proc.p_iticks;
-+#endif
- #elif defined(linux)
- sprintf(string, "/proc/%d/stat", pid);
- if ((fp = fopen(string, "r")) == NULL)
-@@ -1023,7 +1043,14 @@
- long_return = proc_buf->p_swrss;
- #endif
- #elif HAVE_KVM_GETPROCS
--#if defined(freebsd3) && !defined(darwin)
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ /* XXX
-+ long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize +
-+ proc_table[LowProcIndex].ki_vmspace->vm_ssize +
-+ proc_table[LowProcIndex].ki_vmspace->vm_dsize;
-+ long_return = long_return * (getpagesize() / 1024); */
-+ long_return = 0;
-+#elif defined(freebsd3) && !defined(darwin)
- long_return =
- proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024;
- #else
-@@ -1303,8 +1330,13 @@
- #elif defined(solaris2)
- return proc_table[current_proc_entry++];
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ if ( proc_table[current_proc_entry].ki_stat != 0 )
-+ return proc_table[current_proc_entry++].ki_pid;
-+#else
- if (proc_table[current_proc_entry].kp_proc.p_stat != 0)
- return proc_table[current_proc_entry++].kp_proc.p_pid;
-+#endif
- #else
- if (proc_table[current_proc_entry].p_stat != 0)
- return proc_table[current_proc_entry++].p_pid;
diff --git a/net/net-snmp/files/patch-hr_system.c b/net/net-snmp/files/patch-hr_system.c
deleted file mode 100644
index ee1f01228bfd..000000000000
--- a/net/net-snmp/files/patch-hr_system.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- agent/mibgroup/host/hr_system.c.orig Fri Nov 14 14:45:55 2003
-+++ agent/mibgroup/host/hr_system.c Fri Nov 14 14:46:01 2003
-@@ -276,11 +276,10 @@
- struct utmp *utmp_p;
- #endif
-
-+#ifndef UTMP_HAS_NO_TYPE
- setutent();
- while ((utmp_p = getutent()) != NULL) {
--#ifndef UTMP_HAS_NO_TYPE
- if (utmp_p->ut_type == USER_PROCESS) {
--#endif
- /* This block of code fixes zombie user PIDs in the
- utmp/utmpx file that would otherwise be counted as a
- current user */
-@@ -293,6 +292,7 @@
- }
- }
- endutent();
-+#endif
- return total;
- }
-
diff --git a/net/net-snmp/files/patch-interfaces.c b/net/net-snmp/files/patch-interfaces.c
deleted file mode 100644
index c9d465c00859..000000000000
--- a/net/net-snmp/files/patch-interfaces.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- agent/mibgroup/mibII/interfaces.c.orig Sat Jun 8 00:18:03 2002
-+++ agent/mibgroup/mibII/interfaces.c Mon Jul 29 12:35:08 2002
-@@ -555,11 +555,9 @@
- ifp->ifm_type));
- }
- }
-- if (have_ifinfo && have_addr) {
-+ if (have_ifinfo) {
- return 0;
-- } else if (have_ifinfo && !(if_msg->ifm_flags & IFF_UP))
-- return 0;
-- else {
-+ } else {
- return -1;
- }
- }
diff --git a/net/net-snmp/files/patch-ipv6.c b/net/net-snmp/files/patch-ipv6.c
deleted file mode 100644
index 0ee3f76c99ad..000000000000
--- a/net/net-snmp/files/patch-ipv6.c
+++ /dev/null
@@ -1,113 +0,0 @@
---- agent/mibgroup/mibII/ipv6.c.orig Fri Feb 28 18:13:36 2003
-+++ agent/mibgroup/mibII/ipv6.c Wed Nov 19 00:16:27 2003
-@@ -1238,6 +1238,7 @@
- if (!auto_nlist("udb6", (char *) &udb6, sizeof(udb6)))
- return NULL;
- p = (caddr_t) udb6.in6p_next;
-+ DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p));
- #else
- {
- const char *udblist = "net.inet.udp.pcblist";
-@@ -1254,11 +1255,11 @@
- oxig = (struct xinpgen *) sysctl_buf;
- xig = (struct xinpgen *) ((char *) oxig + oxig->xig_len);
- }
-+ DEBUGMSGTL(("mibII/ipv6", "start: xig=%p\n", xig));
- #endif
- found = hitnext = 0;
- memcpy((char *) newname, (char *) vp->name,
- (int) vp->namelen * sizeof(oid));
-- DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p));
- while (
- #if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
- p && (u_long) p != auto_nlist_value("udb6")
-@@ -1266,12 +1267,16 @@
- xig->xig_len > sizeof(struct xinpgen)
- #endif
- ) {
-- DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
-
- #if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-+ DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
- klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb));
- #else
- in6pcb = ((struct xinpcb *) xig)->xi_inp;
-+ if (!(in6pcb.inp_vflag & 0x02)) { /* Skip non-IPv6 pcb */
-+ xig = (struct xinpgen *) ((char *) xig + xig->xig_len);
-+ continue;
-+ }
- #endif
- j = (int) vp->namelen;
- for (i = 0; i < sizeof(struct in6_addr); i++)
-@@ -1283,8 +1288,8 @@
- else
- newname[j++] = 0;
- /*XXX*/
-- DEBUGMSGTL(("mibII/ipv6", "var_udp6 new: %d %d ",
-- (int) vp->namelen, j));
-+ DEBUGMSGTL(("mibII/ipv6", "var_udp6 new: %d %d ",
-+ (int) vp->namelen, j));
- DEBUGMSGOID(("mibII/ipv6", newname, j));
- DEBUGMSG(("mibII/ipv6", " %d\n", exact));
-
-@@ -1447,9 +1452,6 @@
- p));
- break;
- }
--#else
-- in6pcb = ((struct xinpcb *) xig)->xi_inp;
--#endif
- if (klookup
- ((u_long) in6pcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb))
- < 0) {
-@@ -1457,6 +1459,14 @@
- in6pcb.in6p_ppcb));
- break;
- }
-+#else
-+ in6pcb = ((struct xinpcb *) xig)->xi_inp;
-+ struct xtcpcb *xp = (struct xtcpcb *)xig;
-+ tcp6cb = xp->xt_tp;
-+ if (!(in6pcb.inp_vflag & 0x02)) { /* Skip non-IPv6 pcb */
-+ goto skip;
-+ }
-+#endif
- j = (int) vp->namelen;
- for (i = 0; i < sizeof(struct in6_addr); i++)
- newname[j++] = in6pcb.in6p_laddr.s6_addr[i];
-@@ -1590,6 +1600,7 @@
- #if defined(__FreeBSD__) && __FreeBSD__ >= 3
- char *sysctl_buf;
- struct xinpgen *xig, *oxig;
-+ struct xtcpcb *xp;
- #endif /* defined(__FreeBSD__) && __FreeBSD__ >= 3 */
-
- if (!initialized) {
-@@ -1646,11 +1657,7 @@
- DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
-
- #if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0)
--#else
-- in6pcb = ((struct xinpcb *) xig)->xi_inp;
--#endif
-- {
-+ if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) {
- DEBUGMSGTL(("mibII/ipv6", "klookup fail for in6pcb at %x\n",
- p));
- break;
-@@ -1662,6 +1669,14 @@
- in6pcb.in6p_ppcb));
- break;
- }
-+#else
-+ in6pcb = ((struct xinpcb *) xig)->xi_inp;
-+ xp = (struct xtcpcb *)xig;
-+ tcp6cb = xp->xt_tp;
-+ if (!(in6pcb.inp_vflag & 0x02)) { /* Skip non-IPv6 pcb */
-+ goto skip;
-+ }
-+#endif
- j = (int) vp->namelen;
- for (i = 0; i < sizeof(struct in6_addr); i++)
- newname[j++] = in6pcb.in6p_laddr.s6_addr[i];
diff --git a/net/net-snmp/files/patch-local:Makefile.in b/net/net-snmp/files/patch-local:Makefile.in
deleted file mode 100644
index 7f648103d7aa..000000000000
--- a/net/net-snmp/files/patch-local:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- local/Makefile.in.orig Sat Apr 20 16:30:13 2002
-+++ local/Makefile.in Wed Apr 24 01:45:55 2002
-@@ -12,7 +12,7 @@
- # local info
- #
- SNMPCONFPATH=@SNMPCONFPATH@
--PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail
-+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail
- SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \
- ipf-mod.pl.made snmpconf.made traptoemail.made
- PERLPROG=@PERLPROG@
diff --git a/net/net-snmp/files/patch-memory_freebsd2.c b/net/net-snmp/files/patch-memory_freebsd2.c
deleted file mode 100644
index 47f5da45ccc7..000000000000
--- a/net/net-snmp/files/patch-memory_freebsd2.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Nov 9 23:59:53 2002
-+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Sat Aug 16 17:09:01 2003
-@@ -207,11 +207,13 @@
- auto_nlist(NSWDEV_SYMBOL, (char *) &nswdev, sizeof(nswdev));
- auto_nlist(DMMAX_SYMBOL, (char *) &dmmax, sizeof(dmmax));
-
-+#if !defined(freebsd5)
- sw = (struct swdevt *) malloc(nswdev * sizeof(*sw));
- if (sw == NULL)
- return;
-
- auto_nlist(SWDEVT_SYMBOL, (char *) sw, nswdev * sizeof(*sw));
-+#endif
-
- n = kvm_getswapinfo(kd, kswap, sizeof(kswap) / sizeof(kswap[0]), 0);
-
-@@ -242,7 +244,9 @@
- swapUsed *= pagesize;
- swapFree *= pagesize;
-
-+#if !defined(freebsd5)
- free(sw);
-+#endif
- }
- #endif
-
-@@ -274,7 +278,7 @@
- size_t total_size = sizeof(total);
- int total_mib[] = { CTL_VM, VM_METER };
-
-- long phys_mem;
-+ u_long phys_mem;
- size_t phys_mem_size = sizeof(phys_mem);
- int phys_mem_mib[] = { CTL_HW, HW_USERMEM };
-
diff --git a/net/net-snmp/files/patch-snmpTCPIPv6Domain.c b/net/net-snmp/files/patch-snmpTCPIPv6Domain.c
deleted file mode 100644
index 9a6e083a98bc..000000000000
--- a/net/net-snmp/files/patch-snmpTCPIPv6Domain.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- snmplib/snmpTCPIPv6Domain.c.orig Fri Aug 9 22:57:43 2002
-+++ snmplib/snmpTCPIPv6Domain.c Sun Oct 6 01:07:12 2002
-@@ -62,13 +62,21 @@
- if (to == NULL) {
- return strdup("TCP/IPv6: unknown");
- } else {
-- char addr[INET6_ADDRSTRLEN];
-- char tmp[INET6_ADDRSTRLEN + 8];
-+ char tmp[NI_MAXHOST];
-
-- sprintf(tmp, "[%s]:%hd",
-- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr,
-- INET6_ADDRSTRLEN), ntohs(to->sin6_port));
-- return strdup(tmp);
-+/*
-+ * NI_WITHSCOPEID will be obsoleted. But some implementations require
-+ * this flag to retrieve scoped name.
-+ * (2002-07-25: kuriyama@FreeBSD.org)
-+ */
-+#ifndef NI_WITHSCOPEID
-+#define NI_WITHSCOPEID 0
-+#endif
-+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp),
-+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) {
-+ return strdup("UDP/IPv6: unknown");
-+ }
-+ return strdup(tmp);
- }
- }
-
diff --git a/net/net-snmp/files/patch-snmpUCDIPv6Domain.c b/net/net-snmp/files/patch-snmpUCDIPv6Domain.c
deleted file mode 100644
index 6f1f6c4caeed..000000000000
--- a/net/net-snmp/files/patch-snmpUCDIPv6Domain.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- snmplib/snmpUDPIPv6Domain.c.orig Fri Aug 9 22:57:43 2002
-+++ snmplib/snmpUDPIPv6Domain.c Sun Oct 6 18:03:18 2002
-@@ -62,13 +62,21 @@
- if (to == NULL) {
- return strdup("UDP/IPv6: unknown");
- } else {
-- char addr[INET6_ADDRSTRLEN];
-- char tmp[INET6_ADDRSTRLEN + 8];
-+ char tmp[NI_MAXHOST];
-
-- sprintf(tmp, "[%s]:%hd",
-- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr,
-- INET6_ADDRSTRLEN), ntohs(to->sin6_port));
-- return strdup(tmp);
-+/*
-+ * NI_WITHSCOPEID will be obsoleted. But some implementations require
-+ * this flag to retrieve scoped name.
-+ * (2002-07-25: kuriyama@FreeBSD.org)
-+ */
-+#ifndef NI_WITHSCOPEID
-+#define NI_WITHSCOPEID 0
-+#endif
-+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp),
-+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) {
-+ return strdup("UDP/IPv6: unknown");
-+ }
-+ return strdup(tmp);
- }
- }
-
diff --git a/net/net-snmp/files/patch-snmpd.8.def b/net/net-snmp/files/patch-snmpd.8.def
deleted file mode 100644
index ac853823ca25..000000000000
--- a/net/net-snmp/files/patch-snmpd.8.def
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003
-+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003
-@@ -211,6 +211,10 @@
- the error "Error opening specified endpoint". Likewise, since AAL5
- PVC support is only currently available on Linux, it will fail with
- the same error on other platforms.
-+.PP
-+.B snmpd
-+uses libwrap's access control if configured by --with-libwrap.
-+Access control patterns may only reference IP addresses.
-
- .RE
- .SH CONFIGURATION FILES
diff --git a/net/net-snmp/files/patch-tcpTable.c b/net/net-snmp/files/patch-tcpTable.c
deleted file mode 100644
index 20f29239b95d..000000000000
--- a/net/net-snmp/files/patch-tcpTable.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- agent/mibgroup/mibII/tcpTable.c.orig Fri Nov 14 14:49:21 2003
-+++ agent/mibgroup/mibII/tcpTable.c Fri Nov 14 15:14:16 2003
-@@ -84,6 +84,8 @@
- #define TCPTABLE_REMOTEADDRESS pcb.inp_faddr.s_addr
- #define TCPTABLE_REMOTEPORT pcb.inp_fport
- #define TCPTABLE_IS_LINKED_LIST
-+#undef INP_NEXT_SYMBOL
-+#define INP_NEXT_SYMBOL inp_next
-
- #endif /* linux */
- #endif /* WIN32 */
-@@ -695,11 +697,13 @@
- nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb);
- if (!nnew)
- break;
-+#if 0
- nnew->state = StateMap[((struct xinpcb *) xig)->xt_tp.t_state];
- if (nnew->state == 5 /* established */ ||
- nnew->state == 8 /* closeWait */ )
- tcp_estab++;
-- memcpy(&(nnew->pcb), &(((struct xinpcb *) xig)->xt_inp),
-+#endif
-+ memcpy(&(nnew->pcb), &(((struct xinpcb *) xig)->xi_inp),
- sizeof(struct inpcb));
-
- nnew->inp_next = tcp_head;
diff --git a/net/net-snmp/files/patch-udpTable.c b/net/net-snmp/files/patch-udpTable.c
deleted file mode 100644
index 83364a9a338d..000000000000
--- a/net/net-snmp/files/patch-udpTable.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- agent/mibgroup/mibII/udpTable.c.orig Fri Nov 14 15:14:52 2003
-+++ agent/mibgroup/mibII/udpTable.c Fri Nov 14 15:18:08 2003
-@@ -577,6 +577,7 @@
- * Unpick this into the constituent 'xinpgen' structures, and extract
- * the 'inpcb' elements into a linked list (built in reverse)
- */
-+#if 0
- xig = (struct xinpgen *) udpcb_buf;
- xig = (struct xinpgen *) ((char *) xig + xig->xig_len);
-
-@@ -584,12 +585,13 @@
- nnew = SNMP_MALLOC_TYPEDEF(struct inpcb);
- if (!nnew)
- break;
-- memcpy(nnew, ((struct xinpcb *) xig)->xi_inp, sizeof(struct inpcb));
-+ memcpy(nnew, &((struct xinpcb *) xig)->xi_inp, sizeof(struct inpcb));
-
- nnew->next = udp_head; /* XXX - ?? Check 'next' pointer */
- udp_head = nnew;
- xig = (struct xinpgen *) ((char *) xig + xig->xig_len);
- }
-+#endif
-
- free(udpcb_buf);
- if (udp_head) {
diff --git a/net/net-snmp/files/patch-vmstat_freebsd2.c b/net/net-snmp/files/patch-vmstat_freebsd2.c
deleted file mode 100644
index 7e64f3979bcf..000000000000
--- a/net/net-snmp/files/patch-vmstat_freebsd2.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c.orig Thu May 23 17:39:41 2002
-+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Thu Feb 20 08:08:20 2003
-@@ -10,7 +10,11 @@
- #include <sys/param.h>
- #include <sys/time.h>
- #include <sys/proc.h>
-+#if defined(freebsd5) && __FreeBSD_version >= 500101
-+#include <sys/resource.h>
-+#else
- #include <sys/dkstat.h>
-+#endif
- #ifdef freebsd5
- #include <sys/bio.h>
- #endif
diff --git a/net/net-snmp/files/snmpd.sh.sample b/net/net-snmp/files/snmpd.sh.sample
deleted file mode 100644
index f56301232645..000000000000
--- a/net/net-snmp/files/snmpd.sh.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: snmpd
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable snmpd:
-#
-# snmpd_enable="YES"
-#
-
-snmpd_enable="NO"
-snmpd_flags="-p /var/run/snmpd.pid"
-
-. %%RC_SUBR%%
-
-load_rc_config net_snmpd
-
-if [ ! -z "$net_snmpd_enable" ]; then
- echo "Warning: \$net_snmpd_enable is obsoleted."
- echo " Use \$snmpd_enable instead."
- snmpd_enable="$net_snmpd_enable"
- [ ! -z "$net_snmpd_flags" ] && snmpd_flags="$net_snmpd_flags"
-fi
-
-name=snmpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/snmpd
-pidfile='/var/run/snmpd.pid'
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/net-snmp/pkg-descr b/net/net-snmp/pkg-descr
deleted file mode 100644
index c6fa637c1590..000000000000
--- a/net/net-snmp/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This is Net-SNMP (previously known as "ucd-snmp").
-
-Various tools relating to the Simple Network Management Protocol including:
-
- An extensible agent
- An SNMP library
- tools to request or set information from SNMP agents
- tools to generate and handle SNMP traps
- a version of the unix 'netstat' command using SNMP
- a Tk/perl mib browser
-
-WWW: http://net-snmp.sourceforge.net/
diff --git a/net/net-snmp/pkg-message b/net/net-snmp/pkg-message
deleted file mode 100644
index 492dcecabfe0..000000000000
--- a/net/net-snmp/pkg-message
+++ /dev/null
@@ -1,23 +0,0 @@
-**** This port installs snmp daemon, include files and libraries but not
- invoking snmpd by default.
- If you want to invoke snmpd from startup, put these lines into
- /etc/rc.conf.
-
- snmpd_enable="YES"
- snmpd_flags=""
-
-**** You can specify make variables as:
-
- NET_SNMP_SYS_CONTACT="kuriyama@FreeBSD.org"
- NET_SNMP_SYS_LOCATION="Tokyo, Japan"
- DEFAULT_SNMP_VERSION=3
- NET_SNMP_LOGFILE=/var/log/snmpd.log
- NET_SNMP_PERSISTENTDIR=/var/net-snmp
-
- to define default values (or overwriting defaults). At least
- setting first two variables, you will not be prompted during
- configuration process. Or you can set
-
- BATCH="yes"
-
- to make to avoid interactive configuration.
diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist
deleted file mode 100644
index 844231b149c0..000000000000
--- a/net/net-snmp/pkg-plist
+++ /dev/null
@@ -1,309 +0,0 @@
-bin/encode_keychange
-bin/fixproc
-bin/ipf-mod.pl
-bin/mib2c
-bin/net-snmp-config
-bin/snmpbulkget
-bin/snmpbulkwalk
-bin/snmpcheck
-bin/snmpconf
-bin/snmpdelta
-bin/snmpdf
-bin/snmpget
-bin/snmpgetnext
-bin/snmpinform
-bin/snmpnetstat
-bin/snmpset
-bin/snmpstatus
-bin/snmptable
-bin/snmptest
-bin/snmptranslate
-bin/snmptrap
-bin/snmpusm
-bin/snmpvacm
-bin/snmpwalk
-bin/traptoemail
-etc/rc.d/snmpd.sh
-include/net-snmp/agent/agent_callbacks.h
-include/net-snmp/agent/agent_handler.h
-include/net-snmp/agent/agent_index.h
-include/net-snmp/agent/agent_read_config.h
-include/net-snmp/agent/agent_registry.h
-include/net-snmp/agent/agent_trap.h
-include/net-snmp/agent/all_helpers.h
-include/net-snmp/agent/auto_nlist.h
-include/net-snmp/agent/baby_steps.h
-include/net-snmp/agent/bulk_to_next.h
-include/net-snmp/agent/cache_handler.h
-include/net-snmp/agent/debug_handler.h
-include/net-snmp/agent/ds_agent.h
-include/net-snmp/agent/instance.h
-include/net-snmp/agent/mib_module_config.h
-include/net-snmp/agent/mib_module_includes.h
-include/net-snmp/agent/mode_end_call.h
-include/net-snmp/agent/multiplexer.h
-include/net-snmp/agent/net-snmp-agent-includes.h
-include/net-snmp/agent/null.h
-include/net-snmp/agent/old_api.h
-include/net-snmp/agent/read_only.h
-include/net-snmp/agent/row_merge.h
-include/net-snmp/agent/scalar.h
-include/net-snmp/agent/scalar_group.h
-include/net-snmp/agent/serialize.h
-include/net-snmp/agent/set_helper.h
-include/net-snmp/agent/snmp_agent.h
-include/net-snmp/agent/snmp_vars.h
-include/net-snmp/agent/table.h
-include/net-snmp/agent/table_array.h
-include/net-snmp/agent/table_data.h
-include/net-snmp/agent/table_dataset.h
-include/net-snmp/agent/table_iterator.h
-include/net-snmp/agent/table_mfd.h
-include/net-snmp/agent/var_struct.h
-include/net-snmp/agent/watcher.h
-include/net-snmp/config_api.h
-include/net-snmp/definitions.h
-include/net-snmp/library/README
-include/net-snmp/library/asn1.h
-include/net-snmp/library/callback.h
-include/net-snmp/library/check_varbind.h
-include/net-snmp/library/cmu_compat.h
-include/net-snmp/library/container.h
-include/net-snmp/library/container_binary_array.h
-include/net-snmp/library/container_iterator.h
-include/net-snmp/library/container_list_ssll.h
-include/net-snmp/library/container_null.h
-include/net-snmp/library/data_list.h
-include/net-snmp/library/default_store.h
-include/net-snmp/library/factory.h
-include/net-snmp/library/getopt.h
-include/net-snmp/library/int64.h
-include/net-snmp/library/keytools.h
-include/net-snmp/library/lcd_time.h
-include/net-snmp/library/md5.h
-include/net-snmp/library/mib.h
-include/net-snmp/library/mt_support.h
-include/net-snmp/library/oid_stash.h
-include/net-snmp/library/parse.h
-include/net-snmp/library/read_config.h
-include/net-snmp/library/scapi.h
-include/net-snmp/library/snmp-tc.h
-include/net-snmp/library/snmp.h
-include/net-snmp/library/snmpCallbackDomain.h
-include/net-snmp/library/snmpTCPDomain.h
-include/net-snmp/library/snmpTCPIPv6Domain.h
-include/net-snmp/library/snmpUDPDomain.h
-include/net-snmp/library/snmpUDPIPv6Domain.h
-include/net-snmp/library/snmpUnixDomain.h
-include/net-snmp/library/snmp_alarm.h
-include/net-snmp/library/snmp_api.h
-include/net-snmp/library/snmp_assert.h
-include/net-snmp/library/snmp_client.h
-include/net-snmp/library/snmp_debug.h
-include/net-snmp/library/snmp_enum.h
-include/net-snmp/library/snmp_impl.h
-include/net-snmp/library/snmp_locking.h
-include/net-snmp/library/snmp_logging.h
-include/net-snmp/library/snmp_parse_args.h
-include/net-snmp/library/snmp_secmod.h
-include/net-snmp/library/snmp_transport.h
-include/net-snmp/library/snmpusm.h
-include/net-snmp/library/snmpv3-security-includes.h
-include/net-snmp/library/snmpv3.h
-include/net-snmp/library/system.h
-include/net-snmp/library/tools.h
-include/net-snmp/library/transform_oids.h
-include/net-snmp/library/ucd_compat.h
-include/net-snmp/library/vacm.h
-include/net-snmp/library/winservice.h
-include/net-snmp/machine/generic.h
-include/net-snmp/mib_api.h
-include/net-snmp/net-snmp-config.h
-include/net-snmp/net-snmp-includes.h
-include/net-snmp/output_api.h
-include/net-snmp/pdu_api.h
-include/net-snmp/session_api.h
-include/net-snmp/snmpv3_api.h
-include/net-snmp/system/aix.h
-include/net-snmp/system/bsd.h
-include/net-snmp/system/bsdi.h
-include/net-snmp/system/bsdi3.h
-include/net-snmp/system/bsdi4.h
-include/net-snmp/system/cygwin.h
-include/net-snmp/system/darwin.h
-include/net-snmp/system/dynix.h
-include/net-snmp/system/freebsd.h
-include/net-snmp/system/freebsd2.h
-include/net-snmp/system/freebsd3.h
-include/net-snmp/system/freebsd4.h
-include/net-snmp/system/freebsd5.h
-include/net-snmp/system/generic.h
-include/net-snmp/system/hpux.h
-include/net-snmp/system/irix.h
-include/net-snmp/system/linux.h
-include/net-snmp/system/mips.h
-include/net-snmp/system/netbsd.h
-include/net-snmp/system/openbsd.h
-include/net-snmp/system/osf5.h
-include/net-snmp/system/solaris.h
-include/net-snmp/system/solaris2.6.h
-include/net-snmp/system/solaris2.7.h
-include/net-snmp/system/solaris2.8.h
-include/net-snmp/system/solaris2.9.h
-include/net-snmp/system/sunos.h
-include/net-snmp/system/svr5.h
-include/net-snmp/system/sysv.h
-include/net-snmp/system/ultrix4.h
-include/net-snmp/types.h
-include/net-snmp/utilities.h
-include/net-snmp/varbind_api.h
-include/net-snmp/version.h
-@dirrm include/net-snmp/agent
-@dirrm include/net-snmp/library
-@dirrm include/net-snmp/machine
-@dirrm include/net-snmp/system
-@dirrm include/net-snmp
-lib/libnetsnmp.a
-lib/libnetsnmp.so
-lib/libnetsnmp.so.%%shlib%%
-lib/libnetsnmpagent.a
-lib/libnetsnmpagent.so
-lib/libnetsnmpagent.so.%%shlib%%
-lib/libnetsnmphelpers.a
-lib/libnetsnmphelpers.so
-lib/libnetsnmphelpers.so.%%shlib%%
-lib/libnetsnmpmibs.a
-lib/libnetsnmpmibs.so
-lib/libnetsnmpmibs.so.%%shlib%%
-lib/libnetsnmptrapd.a
-lib/libnetsnmptrapd.so
-lib/libnetsnmptrapd.so.%%shlib%%
-sbin/snmpd
-sbin/snmptrapd
-share/snmp/mib2c.access_functions.conf
-share/snmp/mib2c.array-user.conf
-share/snmp/mib2c.check_values.conf
-share/snmp/mib2c.check_values_local.conf
-share/snmp/mib2c.column_defines.conf
-share/snmp/mib2c.column_enums.conf
-share/snmp/mib2c.conf
-share/snmp/mib2c.create-dataset.conf
-share/snmp/mib2c.int_watch.conf
-share/snmp/mib2c.iterate.conf
-share/snmp/mib2c.iterate_access.conf
-share/snmp/mib2c.old-api.conf
-share/snmp/mib2c.scalar.conf
-share/snmp/mibs/AGENTX-MIB.txt
-share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HCNUM-TC.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-TYPES.txt
-share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-share/snmp/mibs/IANA-LANGUAGE-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-INVERTED-STACK-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/INET-ADDRESS-MIB.txt
-share/snmp/mibs/IP-FORWARD-MIB.txt
-share/snmp/mibs/IP-MIB.txt
-share/snmp/mibs/IPV6-ICMP-MIB.txt
-share/snmp/mibs/IPV6-MIB.txt
-share/snmp/mibs/IPV6-TC.txt
-share/snmp/mibs/IPV6-TCP-MIB.txt
-share/snmp/mibs/IPV6-UDP-MIB.txt
-share/snmp/mibs/NET-SNMP-AGENT-MIB.txt
-share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
-share/snmp/mibs/NET-SNMP-MIB.txt
-share/snmp/mibs/NET-SNMP-TC.txt
-share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
-share/snmp/mibs/RFC-1215.txt
-share/snmp/mibs/RFC1155-SMI.txt
-share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/RMON-MIB.txt
-share/snmp/mibs/SMUX-MIB.txt
-share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
-share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
-share/snmp/mibs/SNMP-PROXY-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
-share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
-share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UCD-DEMO-MIB.txt
-share/snmp/mibs/UCD-DISKIO-MIB.txt
-share/snmp/mibs/UCD-DLMOD-MIB.txt
-share/snmp/mibs/UCD-IPFWACC-MIB.txt
-share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-@unexec rm -f %D/share/snmp/mibs/.index 2>/dev/null || true
-share/snmp/snmpconf-data/snmp-data/authopts
-share/snmp/snmpconf-data/snmp-data/debugging
-share/snmp/snmpconf-data/snmp-data/mibs
-share/snmp/snmpconf-data/snmp-data/output
-share/snmp/snmpconf-data/snmp-data/snmpconf-config
-share/snmp/snmpconf-data/snmpd-data/acl
-share/snmp/snmpconf-data/snmpd-data/basic_setup
-share/snmp/snmpconf-data/snmpd-data/extending
-share/snmp/snmpconf-data/snmpd-data/monitor
-share/snmp/snmpconf-data/snmpd-data/operation
-share/snmp/snmpconf-data/snmpd-data/snmpconf-config
-share/snmp/snmpconf-data/snmpd-data/system
-share/snmp/snmpconf-data/snmpd-data/trapsinks
-share/snmp/snmpconf-data/snmptrapd-data/formatting
-share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
-share/snmp/snmpconf-data/snmptrapd-data/traphandle
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm
-%%WITHPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
-@dirrm share/snmp/snmpconf-data/snmp-data
-@dirrm share/snmp/snmpconf-data/snmpd-data
-@dirrm share/snmp/snmpconf-data/snmptrapd-data
-@dirrm share/snmp/snmpconf-data
-@dirrm share/snmp/mibs
-@unexec rmdir %D/share/snmp 2>/dev/null || true
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
-%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
-%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
-%%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP 2>/dev/null || true
diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo
deleted file mode 100644
index fac39d4c4661..000000000000
--- a/net/net-snmp4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ucd-snmp-4.2.6.tar.gz) = cf3f24e6a69a4f52c14affe0064116b1
diff --git a/net/net-snmp4/files/patch-Makefile.top b/net/net-snmp4/files/patch-Makefile.top
deleted file mode 100644
index e6077bc203ef..000000000000
--- a/net/net-snmp4/files/patch-Makefile.top
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.top.orig Sat Feb 16 10:00:19 2002
-+++ Makefile.top Sat Feb 16 23:31:00 2002
-@@ -52,7 +52,7 @@
- # Misc Compiling Stuff
- CC = @CC@
- # version number is prefixed by a 0 for a better shared library version number
--LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o
-+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o
- LIB_EXTENSION = la
- LIB_VERSION =
- LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net/net-snmp4/files/patch-aa b/net/net-snmp4/files/patch-aa
deleted file mode 100644
index 6c287d18ac93..000000000000
--- a/net/net-snmp4/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- snmplib/Makefile.in.orig Mon Oct 2 11:41:46 2000
-+++ snmplib/Makefile.in Wed Jan 17 18:29:44 2001
-@@ -70,6 +70,10 @@
-
- libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS}
- $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
-+ ld -Bshareable -soname libsnmp.so.4 \
-+ -o libsnmp.so ${OBJS}
-+ ln -f libsnmp.so \
-+ ../libsnmp.so.4
- $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-
- installdirs:
diff --git a/net/net-snmp4/files/patch-aclocal.m4 b/net/net-snmp4/files/patch-aclocal.m4
deleted file mode 100644
index eb2e519aa7f0..000000000000
--- a/net/net-snmp4/files/patch-aclocal.m4
+++ /dev/null
@@ -1,48 +0,0 @@
---- aclocal.m4.orig Tue Sep 18 17:08:01 2001
-+++ aclocal.m4 Mon Jan 21 10:38:40 2002
-@@ -196,8 +196,23 @@
- AC_DEFUN([AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-
-+# Save cache, so that ltconfig can load it
-+AC_CACHE_SAVE
-+
-+# Actually configure libtool. ac_aux_dir is where install-sh is found.
-+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
-+|| AC_MSG_ERROR([libtool configure failed])
-+
-+# Reload cache, that may have been modified by ltconfig
-+AC_CACHE_LOAD
-+
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -224,6 +239,11 @@
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
-
-+case "$target" in
-+NONE) lt_target="$host" ;;
-+*) lt_target="$target" ;;
-+esac
-+
- _LT_AC_PROG_ECHO_BACKSLASH
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
-@@ -875,7 +895,7 @@
- # All known linkers require a `.a' archive for static linking (except M$VC,
- # which needs '.lib').
- libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
- ofile="$default_ofile"
- with_gnu_ld="$lt_cv_prog_gnu_ld"
- need_locks="$enable_libtool_lock"
diff --git a/net/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c b/net/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c
deleted file mode 100644
index 3fa2daff896c..000000000000
--- a/net/net-snmp4/files/patch-agent_mibgroup_mibII_tcpTable.c
+++ /dev/null
@@ -1,96 +0,0 @@
---- agent/mibgroup/mibII/tcpTable.c.orig Fri Jul 18 21:10:09 2003
-+++ agent/mibgroup/mibII/tcpTable.c Fri Jul 18 21:10:12 2003
-@@ -435,11 +435,42 @@
- int TCP_Count_Connections (void)
- {
- int Established;
-+#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-+ int mib[4], len;
-+ char *p;
-+ struct tcpcb *tpcb;
-+ struct xtcpcb *tp;
-+ struct xinpgen *next;
-+
-+ mib[0]=CTL_NET;
-+ mib[1]=PF_INET;
-+ mib[2]=IPPROTO_TCP;
-+ mib[3]=TCPCTL_PCBLIST;
-+
-+ if (sysctl(mib, 4, NULL, &len, NULL, 0) != 0) {
-+ snmp_log_perror("TCP_Count_Connections - sysctl");
-+ return 0;
-+ }
-+ if ((p=(char *)malloc(len)) == NULL) {
-+ snmp_log_perror("TCP_Count_Connections - malloc");
-+ return 0;
-+ }
-+ if (sysctl(mib, 4, p, &len, NULL, 0) != 0) {
-+ snmp_log_perror("TCP_Count_Connections - sysctl");
-+ free(p);
-+ return 0;
-+ }
-+ Established=0;
-+ next=(struct xinpgen *)p;
-+ for (next=(struct xinpgen *)((char *)next + next->xig_len); next->xig_len > sizeof(struct xinpgen); next=(struct xinpgen *)((char *)next + next->xig_len)) {
-+ tp=(struct xtcpcb *)next;
-+ if (tp->xt_tp.t_state == TCPS_ESTABLISHED || tp->xt_tp.t_state == TCPS_CLOSE_WAIT)
-+ Established++;
-+ }
-+ free(p);
-+#else
- struct inpcb cb;
- register struct inpcb *next;
--#if !(defined(freebsd2) || defined(netbsd2) || defined(openbsd2))
-- register struct inpcb *prev;
--#endif
- struct inpcb inpcb;
- struct tcpcb tcpcb;
-
-@@ -450,17 +481,10 @@
-
- auto_nlist(TCP_SYMBOL, (char *)&cb, sizeof(struct inpcb));
- inpcb = cb;
--#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-- prev = (struct inpcb *) auto_nlist_value(TCP_SYMBOL);
--#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */
- /*
- * Scan the control blocks
- */
--#if defined(freebsd2) || defined(netbsd1) || defined(openbsd2)
- while ((inpcb.INP_NEXT_SYMBOL != NULL) && (inpcb.INP_NEXT_SYMBOL != (struct inpcb *) auto_nlist_value(TCP_SYMBOL)))
--#else /* defined(freebsd2) || defined(netbsd1) || defined(openbsd2) */
-- while (inpcb.INP_NEXT_SYMBOL != (struct inpcb *) auto_nlist_value(TCP_SYMBOL))
--#endif /* defined(freebsd2) || defined(netbsd1) */
- {
- next = inpcb.INP_NEXT_SYMBOL;
-
-@@ -468,16 +492,7 @@
- snmp_log_perror("TCP_Count_Connections - inpcb");
- break;
- }
--#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-- if (inpcb.INP_PREV_SYMBOL != prev) { /* ??? */
-- sleep(1);
-- goto Again;
-- }
--#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */
- if (inet_lnaof(inpcb.inp_laddr) == INADDR_ANY) {
--#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-- prev = next;
--#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */
- continue;
- }
- if(klookup((unsigned long)inpcb.inp_ppcb, (char *)&tcpcb, sizeof (tcpcb)) == 0) {
-@@ -488,10 +503,8 @@
- if ((tcpcb.t_state == TCPS_ESTABLISHED) ||
- (tcpcb.t_state == TCPS_CLOSE_WAIT))
- Established++;
--#if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-- prev = next;
--#endif /* !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2)) */
- }
-+#endif
- return(Established);
- }
- #endif /* !linux && !hpux11 */
-
diff --git a/net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c b/net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c
deleted file mode 100644
index e41c70389805..000000000000
--- a/net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_diskio.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- agent/mibgroup/ucd-snmp/diskio.c.orig Fri Mar 28 12:58:32 2003
-+++ agent/mibgroup/ucd-snmp/diskio.c Fri Mar 28 13:21:04 2003
-@@ -47,7 +47,11 @@
- #endif /* bsdi */
-
- #if defined (freebsd4) || defined(freebsd5)
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#endif
-+#include <sys/resource.h>
- #include <devstat.h>
- #endif /* freebsd */
-
-@@ -318,7 +322,11 @@
- }
- memset(stat->dinfo, 0, sizeof(struct devinfo));
-
-+#if __FreeBSD_version > 500106
-+ if ((devstat_getdevs(NULL, stat)) == -1){
-+#else
- if ((getdevs(stat)) == -1){
-+#endif
- fprintf (stderr,"Can't get devices:%s\n", devstat_errbuf);
- return 1;
- }
-@@ -370,16 +378,32 @@
- *var_len = strlen(stat->dinfo->devices[indx].device_name);
- return (u_char *) stat->dinfo->devices[indx].device_name;
- case DISKIO_NREAD:
-+#if __FreeBSD_version > 500106
-+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DSM_TOTAL_BYTES_READ];
-+#else
- long_ret = (signed long) stat->dinfo->devices[indx].bytes_read;
-+#endif
- return (u_char *) & long_ret;
- case DISKIO_NWRITTEN:
-+#if __FreeBSD_version > 500106
-+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DSM_TOTAL_BYTES_WRITE];
-+#else
- long_ret = (signed long) stat->dinfo->devices[indx].bytes_written;
-+#endif
- return (u_char *) & long_ret;
- case DISKIO_READS:
-+#if __FreeBSD_version > 500106
-+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DSM_TOTAL_TRANSFERS_READ];
-+#else
- long_ret = (signed long) stat->dinfo->devices[indx].num_reads;
-+#endif
- return (u_char *) & long_ret;
- case DISKIO_WRITES:
-+#if __FreeBSD_version > 500106
-+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DSM_TOTAL_TRANSFERS_WRITE];
-+#else
- long_ret = (signed long) stat->dinfo->devices[indx].num_writes;
-+#endif
- return (u_char *) & long_ret;
-
- default:
diff --git a/net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c b/net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c
deleted file mode 100644
index 15b1b69390ab..000000000000
--- a/net/net-snmp4/files/patch-agent_mibgroup_ucd-snmp_vmstat_freebsd2.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c.orig Fri Mar 28 13:15:48 2003
-+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Fri Mar 28 13:16:31 2003
-@@ -8,11 +8,14 @@
- #include <sys/param.h>
- #include <sys/time.h>
- #include <sys/proc.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#endif
- #ifdef freebsd5
- #include <sys/bio.h>
- #endif
- #include <sys/buf.h>
-+#include <sys/resource.h>
- #include <sys/uio.h>
- #include <sys/namei.h>
- #include <sys/malloc.h>
diff --git a/net/net-snmp4/files/patch-ak b/net/net-snmp4/files/patch-ak
deleted file mode 100644
index 8a9d310cd7a0..000000000000
--- a/net/net-snmp4/files/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
---- agent/Makefile.in.orig Sun Nov 19 12:58:06 2000
-+++ agent/Makefile.in Wed Jan 17 18:37:02 2001
-@@ -68,10 +68,18 @@
-
- libucdagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION)
- $(LIB_LD_CMD) libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS)
-+ ld -Bshareable -soname libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) \
-+ -o libucdagent.so ${LIBAGENTOBJS}
-+ ln -f libucdagent.so \
-+ ../libucdagent.so.4
- $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION)
-
- libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS}
- $(LIB_LD_CMD) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS)
-+ ld -Bshareable -soname libucdmibs.so.4 \
-+ -o libucdmibs.so ${MIBOBJS}
-+ ln -f libucdmibs.so \
-+ ../libucdmibs.so.4
- $(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION)
-
- clean:
diff --git a/net/net-snmp4/files/patch-al b/net/net-snmp4/files/patch-al
deleted file mode 100644
index c2464056b6bc..000000000000
--- a/net/net-snmp4/files/patch-al
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in~ Sat May 6 01:46:26 2000
-+++ configure.in Wed May 17 11:09:08 2000
-@@ -1286,6 +1286,26 @@
- AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
- [
-
-+dnl 4.4 compatible but renamed on FreeBSD
-+AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#define KERNEL
-+#define _KERNEL
-+#include <sys/socket.h>
-+#undef KERNEL
-+#undef _KERNEL
-+#include <net/route.h>
-+],[
-+
-+#ifndef STRUCT_RTENTRY_HAS_RT_DST
-+#define rt_dst rt_nodes->rn_key
-+#endif
-+
-+ struct rtentry rt;
-+ rt.rt_nodes[0].rn_bit = 1;
-+ rt.rt_dst;
-+ ], ac_cv_RTENTRY_TYPE="BSD-4.4")
-+
- dnl 4.4 compat
- AC_TRY_COMPILE([
- #include <sys/types.h>
diff --git a/net/net-snmp4/files/patch-auto_nlist.c b/net/net-snmp4/files/patch-auto_nlist.c
deleted file mode 100644
index 5a2885b45cf3..000000000000
--- a/net/net-snmp4/files/patch-auto_nlist.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- agent/auto_nlist.c.orig Thu Feb 7 20:42:03 2002
-+++ agent/auto_nlist.c Sun Nov 17 00:40:52 2002
-@@ -31,6 +31,15 @@
- #endif
- #endif
-
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000)
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#endif
-+
- #include "auto_nlist.h"
- #include "autonlist.h"
- #include "kernel.h"
diff --git a/net/net-snmp4/files/patch-disk.c b/net/net-snmp4/files/patch-disk.c
deleted file mode 100644
index 5d82a33941bc..000000000000
--- a/net/net-snmp4/files/patch-disk.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- agent/mibgroup/ucd-snmp/disk.c.orig Wed Apr 3 07:57:57 2002
-+++ agent/mibgroup/ucd-snmp/disk.c Thu Aug 29 12:11:17 2002
-@@ -340,7 +340,7 @@
- double totalblks, free, used, avail, availblks;
- #else
- static long avail;
--#ifdef STRUCT_STATVFS_HAS_F_FILES
-+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
- int percent_inode;
- #endif
- #endif
-@@ -424,6 +424,11 @@
- (int) ((double) (vfs.f_files - vfs.f_ffree) /
- (double) (vfs.f_files - (vfs.f_ffree - vfs.f_favail)) * 100.0 + 0.5);
- #endif
-+#if defined(HAVE_UFS_FFS_FS_H) && !defined(STRUCT_STATVFS_HAS_F_FILES)
-+ percent_inode = vfs.f_files == 0 ? 100.0 :
-+ (int) ((double) (vfs.f_files - vfs.f_ffree) /
-+ (double) (vfs.f_files) * 100.0 + 0.5);
-+#endif
- switch (vp->magic) {
- case DISKTOTAL:
- long_ret = vfs.f_blocks * (vfs.f_bsize / 1024);
-@@ -444,7 +449,7 @@
- case DISKPERCENT:
- long_ret = percent;
- return ((u_char *) (&long_ret));
--#ifdef STRUCT_STATVFS_HAS_F_FILES
-+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
- case DISKPERCENTNODE:
- long_ret = percent_inode;
- return ((u_char *) (&long_ret));
diff --git a/net/net-snmp4/files/patch-hr_disk.c b/net/net-snmp4/files/patch-hr_disk.c
deleted file mode 100644
index b4f2c66a92f8..000000000000
--- a/net/net-snmp4/files/patch-hr_disk.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/mibgroup/host/hr_disk.c.orig Tue Feb 26 01:57:26 2002
-+++ agent/mibgroup/host/hr_disk.c Fri Mar 29 16:06:29 2002
-@@ -185,7 +185,7 @@
- #elif defined(solaris2)
- Add_HR_Disk_entry ( "/dev/rdsk/c%dt%dd0s%d", 0, 1, 0, 15, "/dev/rdsk/c%dt%dd0s0", 0, 7 );
- Add_HR_Disk_entry ( "/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15, "/dev/rdsk/c%dd%ds0", 0, 7 );
--#elif defined(freebsd4)
-+#elif defined(__FreeBSD__) && __FreeBSD__ >= 4
- Add_HR_Disk_entry ( "/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h');
- Add_HR_Disk_entry ( "/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h');
- #elif defined(freebsd3)
diff --git a/net/net-snmp4/files/patch-hr_storage.c b/net/net-snmp4/files/patch-hr_storage.c
deleted file mode 100644
index 1dfe804c9c4b..000000000000
--- a/net/net-snmp4/files/patch-hr_storage.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- agent/mibgroup/host/hr_storage.c.orig Mon Mar 18 22:39:56 2002
-+++ agent/mibgroup/host/hr_storage.c Sun Nov 17 00:43:32 2002
-@@ -32,7 +32,7 @@
- #else
- #if HAVE_VM_VM_H
- #include <vm/vm.h>
--#if HAVE_MACHINE_TYPES_H
-+#if HAVE_MACHINE_TYPES_H && (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
- #include <machine/types.h>
- #endif
- #if HAVE_SYS_VMMETER_H
-@@ -145,7 +145,7 @@
- #define HRFS_mount mnt_mountp
- #define HRFS_statfs statvfs
-
--#elif defined(HAVE_STATVFS)
-+#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT)
-
- extern struct mntent *HRFS_entry;
- extern int fscount;
-@@ -520,7 +520,7 @@
- }
- case HRSTORE_UNITS:
- if ( store_idx < HRS_TYPE_FS_MAX )
--#if STRUCT_STATVFS_HAS_F_FRSIZE
-+#if defined(STRUCT_STATVFS_HAS_F_FRSIZE) && defined(HAVE_MNTENT)
- long_return = stat_buf.f_frsize;
- #else
- long_return = stat_buf.f_bsize;
-@@ -601,7 +601,15 @@
- for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++)
- long_return += mbstat.m_mtypes[i];
- #elif defined(MBSTAT_SYMBOL)
-+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
- long_return = mbstat.m_mbufs;
-+#elif __FreeBSD_version < 500024
-+ /* mbuf stats disabled */
-+ return NULL;
-+#else
-+ /* XXX TODO: implement new method */
-+ return NULL;
-+#endif
- #elif defined(NO_DUMMY_VALUES)
- return NULL;
- #else
-@@ -660,7 +668,15 @@
- + (mclpool.pr_nget - mclpool.pr_nput)
- * mclpool.pr_size;
- #elif defined(MBSTAT_SYMBOL)
-+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
- long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */
-+#elif __FreeBSD_version < 500024
-+ /* mbuf stats disabled */
-+ return NULL;
-+#else
-+ /* XXX TODO: implement new method */
-+ return NULL;
-+#endif
- #elif defined(NO_DUMMY_VALUES)
- return NULL;
- #else
diff --git a/net/net-snmp4/files/patch-hr_swrun.c b/net/net-snmp4/files/patch-hr_swrun.c
deleted file mode 100644
index c232386f873e..000000000000
--- a/net/net-snmp4/files/patch-hr_swrun.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002
-+++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002
-@@ -543,7 +543,11 @@
- strcpy(string, proc_buf->p_user.u_comm);
- #endif
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ strcpy(string, proc_table[LowProcIndex].ki_comm);
-+#else
- strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
-+#endif
- #elif defined(linux)
- sprintf( string, "/proc/%d/status", pid );
- if ((fp = fopen( string, "r")) == NULL) return NULL;
-@@ -638,7 +642,11 @@
- *cp1 = 0;
- #endif
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ strcpy(string, proc_table[LowProcIndex].ki_comm);
-+#else
- strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
-+#endif
- #elif defined(linux)
- sprintf( string, "/proc/%d/cmdline", pid );
- if ((fp = fopen( string, "r")) == NULL) return NULL;
-@@ -810,7 +818,11 @@
- }
- #else
- #if HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ switch ( proc_table[LowProcIndex].ki_stat ) {
-+#else
- switch ( proc_table[LowProcIndex].kp_proc.p_stat ) {
-+#endif
- #elif defined(dynix)
- switch ( lowpsinfo.pr_state ) {
- #elif defined(solaris2)
-@@ -906,9 +918,17 @@
- proc_buf->p_stime*100;
- #endif
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ /* XXX: Accessing ki_paddr causes sig10 ...
-+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks +
-+ proc_table[LowProcIndex].ki_paddr->p_sticks +
-+ proc_table[LowProcIndex].ki_paddr->p_iticks; */
-+ long_return = 0;
-+#else
- long_return = proc_table[LowProcIndex].kp_proc.p_uticks +
- proc_table[LowProcIndex].kp_proc.p_sticks +
- proc_table[LowProcIndex].kp_proc.p_iticks;
-+#endif
- #elif defined(linux)
- sprintf( string, "/proc/%d/stat", pid );
- if ((fp = fopen( string, "r")) == NULL) return NULL;
-@@ -976,6 +996,13 @@
- #elif HAVE_KVM_GETPROCS
- #if defined(freebsd3) && !defined(darwin)
- long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size/1024;
-+#elif defined(freebsd5) && __FreeBSD_version >= 500014
-+ /* XXX
-+ long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize +
-+ proc_table[LowProcIndex].ki_vmspace->vm_ssize +
-+ proc_table[LowProcIndex].ki_vmspace->vm_dsize;
-+ long_return = long_return * (getpagesize() / 1024); */
-+ long_return = 0;
- #else
- long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize +
- proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize +
-@@ -1237,8 +1264,13 @@
- #elif defined(solaris2)
- return proc_table[current_proc_entry++];
- #elif HAVE_KVM_GETPROCS
-+#if defined(freebsd5) && __FreeBSD_version >= 500014
-+ if ( proc_table[current_proc_entry].ki_stat != 0 )
-+ return proc_table[current_proc_entry++].ki_pid;
-+#else
- if ( proc_table[current_proc_entry].kp_proc.p_stat != 0 )
- return proc_table[current_proc_entry++].kp_proc.p_pid;
-+#endif
- #else
- if ( proc_table[current_proc_entry].p_stat != 0 )
- return proc_table[current_proc_entry++].p_pid;
diff --git a/net/net-snmp4/files/patch-local:Makefile.in b/net/net-snmp4/files/patch-local:Makefile.in
deleted file mode 100644
index 1028734fb5b3..000000000000
--- a/net/net-snmp4/files/patch-local:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- local/Makefile.in.orig Thu Apr 4 15:04:11 2002
-+++ local/Makefile.in Thu Apr 4 15:04:17 2002
-@@ -2,7 +2,7 @@
-
- SNMPCONFPATH=@SNMPCONFPATH@
-
--SCRIPTS=snmpcheck tkmib mib2c snmpconf
-+SCRIPTS=snmpcheck mib2c snmpconf
- PERLSCRIPTS=snmpcheck tkmib fixproc ipf-mod.pl rsnmp
- SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \
- ipf-mod.pl.made rsnmp.made snmpconf.made
diff --git a/net/net-snmp4/files/patch-memory_freebsd2.c b/net/net-snmp4/files/patch-memory_freebsd2.c
deleted file mode 100644
index e49eb0d77c01..000000000000
--- a/net/net-snmp4/files/patch-memory_freebsd2.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sun Sep 16 17:16:16 2001
-+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c Fri Mar 28 13:18:19 2003
-@@ -9,7 +9,9 @@
- #include <sys/param.h>
- #include <sys/time.h>
- #include <sys/proc.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#endif
- #ifdef freebsd5
- #include <sys/bio.h>
- #endif
-@@ -232,7 +234,7 @@
- size_t total_size = sizeof (total);
- int total_mib[] = { CTL_VM, VM_METER };
-
-- long phys_mem;
-+ u_long phys_mem;
- size_t phys_mem_size = sizeof(phys_mem);
- int phys_mem_mib[] = { CTL_HW, HW_USERMEM };
-
diff --git a/net/net-snmp4/files/snmpd.sh.sample b/net/net-snmp4/files/snmpd.sh.sample
deleted file mode 100644
index 71f8b504ce81..000000000000
--- a/net/net-snmp4/files/snmpd.sh.sample
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-start)
- [ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && echo -n ' snmpd'
- ;;
-stop)
- killall snmpd && echo -n ' snmpd'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
diff --git a/net/net-snmp4/pkg-descr b/net/net-snmp4/pkg-descr
deleted file mode 100644
index d7c5d86a1b58..000000000000
--- a/net/net-snmp4/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
-
-Various tools relating to the Simple Network Management Protocol including:
-
- An extensible agent
- An SNMP library
- tools to request or set information from SNMP agents
- tools to generate and handle SNMP traps
- a version of the unix 'netstat' command using SNMP
- a Tk/perl mib browser
-
-WWW: http://net-snmp.sourceforge.net/
diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist
deleted file mode 100644
index e7d031a7cbc5..000000000000
--- a/net/net-snmp4/pkg-plist
+++ /dev/null
@@ -1,146 +0,0 @@
-bin/encode_keychange
-bin/mib2c
-bin/snmpbulkget
-bin/snmpbulkwalk
-bin/snmpcheck
-bin/snmpconf
-bin/snmpdelta
-bin/snmpdf
-bin/snmpget
-bin/snmpgetnext
-bin/snmpinform
-bin/snmpnetstat
-bin/snmpset
-bin/snmpstatus
-bin/snmptable
-bin/snmptest
-bin/snmptranslate
-bin/snmptrap
-bin/snmpusm
-bin/snmpvacm
-bin/snmpwalk
-etc/rc.d/snmpd.sh
-include/ucd-snmp/agent_index.h
-include/ucd-snmp/agent_read_config.h
-include/ucd-snmp/agent_registry.h
-include/ucd-snmp/agent_trap.h
-include/ucd-snmp/asn1.h
-include/ucd-snmp/auto_nlist.h
-include/ucd-snmp/callback.h
-include/ucd-snmp/default_store.h
-include/ucd-snmp/ds_agent.h
-include/ucd-snmp/header_complex.h
-include/ucd-snmp/int64.h
-include/ucd-snmp/keytools.h
-include/ucd-snmp/mib.h
-include/ucd-snmp/mib_module_config.h
-include/ucd-snmp/mibincl.h
-include/ucd-snmp/parse.h
-include/ucd-snmp/read_config.h
-include/ucd-snmp/scapi.h
-include/ucd-snmp/snmp-tc.h
-include/ucd-snmp/snmp.h
-include/ucd-snmp/snmp_agent.h
-include/ucd-snmp/snmp_alarm.h
-include/ucd-snmp/snmp_api.h
-include/ucd-snmp/snmp_client.h
-include/ucd-snmp/snmp_debug.h
-include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp_logging.h
-include/ucd-snmp/snmp_parse_args.h
-include/ucd-snmp/snmp_vars.h
-include/ucd-snmp/snmpusm.h
-include/ucd-snmp/snmpv3.h
-include/ucd-snmp/struct.h
-include/ucd-snmp/system.h
-include/ucd-snmp/tools.h
-include/ucd-snmp/transform_oids.h
-include/ucd-snmp/ucd-snmp-agent-includes.h
-include/ucd-snmp/ucd-snmp-config.h
-include/ucd-snmp/ucd-snmp-includes.h
-include/ucd-snmp/util_funcs.h
-include/ucd-snmp/var_struct.h
-include/ucd-snmp/version.h
-@dirrm include/ucd-snmp
-lib/libsnmp.a
-lib/libsnmp.so
-lib/libsnmp.so.%%shlib%%
-lib/libucdagent.a
-lib/libucdagent.so
-lib/libucdagent.so.%%shlib%%
-lib/libucdmibs.a
-lib/libucdmibs.so
-lib/libucdmibs.so.%%shlib%%
-sbin/snmpd
-sbin/snmptrapd
-share/examples/ucd-snmp/EXAMPLE.conf
-share/examples/ucd-snmp/ucdDemoPublic.conf
-@dirrm share/examples/ucd-snmp
-share/snmp/mib2c.conf
-share/snmp/mib2c.storage.conf
-share/snmp/mib2c.vartypes.conf
-share/snmp/mibs/AGENTX-MIB.txt
-share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HCNUM-TC.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-TYPES.txt
-share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-share/snmp/mibs/IANA-LANGUAGE-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-INVERTED-STACK-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/INET-ADDRESS-MIB.txt
-share/snmp/mibs/IP-MIB.txt
-share/snmp/mibs/IP-FORWARD-MIB.txt
-share/snmp/mibs/IPV6-ICMP-MIB.txt
-share/snmp/mibs/IPV6-MIB.txt
-share/snmp/mibs/IPV6-TC.txt
-share/snmp/mibs/IPV6-TCP-MIB.txt
-share/snmp/mibs/IPV6-UDP-MIB.txt
-share/snmp/mibs/RFC1155-SMI.txt
-share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/RFC-1215.txt
-share/snmp/mibs/RMON-MIB.txt
-share/snmp/mibs/SMUX-MIB.txt
-share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
-share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
-share/snmp/mibs/SNMP-PROXY-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
-share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
-share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UCD-DEMO-MIB.txt
-share/snmp/mibs/UCD-DISKIO-MIB.txt
-share/snmp/mibs/UCD-DLMOD-MIB.txt
-share/snmp/mibs/UCD-IPFWACC-MIB.txt
-share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/snmpconf/snmp.conf/authopts
-share/snmp/snmpconf/snmp.conf/debugging
-share/snmp/snmpconf/snmp.conf/mibs
-share/snmp/snmpconf/snmp.conf/output
-share/snmp/snmpconf/snmpd.conf/acl
-share/snmp/snmpconf/snmpd.conf/basic_setup
-share/snmp/snmpconf/snmpd.conf/extending
-share/snmp/snmpconf/snmpd.conf/monitor
-share/snmp/snmpconf/snmpd.conf/operation
-share/snmp/snmpconf/snmpd.conf/system
-share/snmp/snmpconf/snmpd.conf/trapsinks
-share/snmp/snmpconf/snmptrapd.conf/formatting
-share/snmp/snmpconf/snmptrapd.conf/traphandle
-@unexec rm -f %D/share/snmp/mibs/.index
-@dirrm share/snmp/mibs
-@dirrm share/snmp/snmpconf/snmp.conf
-@dirrm share/snmp/snmpconf/snmpd.conf
-@dirrm share/snmp/snmpconf/snmptrapd.conf
-@dirrm share/snmp/snmpconf
-@unexec rmdir %D/share/snmp 2>/dev/null || true
diff --git a/net/netams/distinfo b/net/netams/distinfo
deleted file mode 100644
index 7185e5c4bf87..000000000000
--- a/net/netams/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netams-3.1.1790.tar.gz) = 87710b6d9ecd5897d26d71e70fd118b6
diff --git a/net/netams/files/netams.sh b/net/netams/files/netams.sh
deleted file mode 100644
index 1df303d575ff..000000000000
--- a/net/netams/files/netams.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-
-start)
- sleep 3;
- /bin/mkdir -p /var/run/netams
- if [ -x /usr/local/libexec/netams ]; then
- if [ -f /usr/local/etc/netams.conf ]; then
- /usr/local/libexec/netams -lf /usr/local/etc/netams.conf >/dev/null && echo -n ' NetAMS'
- fi
- fi
- ;;
-
-stop)
- killall netams
- rmdir /var/run/netams
- ;;
-*)
- echo "$0 start | stop"
- ;;
-
-esac
-
-
-
diff --git a/net/netams/files/patch-Makefile b/net/netams/files/patch-Makefile
deleted file mode 100644
index eaf83cd7b7bf..000000000000
--- a/net/netams/files/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.orig Wed Dec 31 11:43:37 2003
-+++ Makefile Mon Jan 5 17:16:41 2004
-@@ -10,11 +10,11 @@
- # $NetAMS: netams/Makefile,v 1.25.2.4 2003/12/31 08:43:37 jura Exp $
- ##########################################################################
- # for FreeBSD, uncomment this
--DEFINE = -DFREEBSD -D_THREAD_SAFE
--LIB = -lpcap -lcrypt
-+DEFINE += -DFREEBSD
-+LIB += -lpcap -lcrypt
- #
- # For FreeBSD-4.x uncomment this
--LIB += -pthread
-+# LIB += -pthread
- # For FreeBSD-5.x uncomment this
- # LIB += -lc_r
- #
-@@ -22,8 +22,8 @@
- # DEFINE+= -DUSE_HASH
- #
- # MySQL storage support
--DEFINE += -DUSE_MYSQL
--LIB += -lmysqlclient -L/usr/local/lib/mysql
-+# DEFINE += -DUSE_MYSQL
-+# LIB += -lmysqlclient -L/usr/local/lib/mysql
- #
- # PostgreSQL storage support
- # DEFINE += -DUSE_POSTGRES
-@@ -53,14 +53,14 @@
- # DEFINE += -DIPTBL_NONE
- ##########################################################################
- # Define here a PATH variables
--PATH_TO_CONFIG="/usr/local/etc/netams.cfg"
-+PATH_TO_CONFIG="${PREFIX}/etc/netams.conf"
- PATH_TO_LOG="/var/log/netams.log"
- #
- # Uncomment this if you want to log dropped packets
- # DEFINE += -DLOG_DROP
- # Uncomment this if you want to enable debug features
--DEFINE += -DDEBUG
--FLAGS += -g -Wall
-+# DEFINE += -DDEBUG
-+# FLAGS += -g -Wall
- # Uncomment this if you want to enable profiler support
- # LIB += -lm -pg
- # FLAGS += -pg
-@@ -81,7 +81,7 @@
- flowmodule.h versions.sh versions_build.dat
-
- CC = g++
--INCLUDE=/usr/local/include
-+INCLUDE = ${LOCALBASE}/include
- OBJ = $(SRC:.c=.o)
- CFLAGS = $(FLAGS) -I$(INCLUDE) $(DEFINE)
-
diff --git a/net/netams/pkg-descr b/net/netams/pkg-descr
deleted file mode 100644
index 0c3ccce4d17e..000000000000
--- a/net/netams/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-NeTAMS is a Network Traffic Accounting and Monitoring Software.
-It runs as a daemon under FreeBSD and Linux operating systems.
-Collects an IP traffic information flowing via your PC/UNIX or Cisco router,
-filters it, aggregates, stores onto HASH/SQL database,
-and makes SMTP/HTML reports to site administrator.
-Anoter features are flexible policy targets, firewalling, access control,
-quotas, scheduler and much much more.
-
-WWW: http://www.netams.com/
diff --git a/net/netams/pkg-message b/net/netams/pkg-message
deleted file mode 100644
index 145c670c4467..000000000000
--- a/net/netams/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
---------------------------------------------------------------------------
-
-The NetAMS package has been successfully installed.
-
-To use the programm, make a copy of %%PREFIX%%/etc/rc.d/netams.sh.sample under
-%%PREFIX%%/etc/rc.d/netams.sh and do: chmod +x %%PREFIX%%/etc/rc.d/netams.sh.
-Check %%EXAMPLESDIR%% for examples.
-
-A sample configuration file has been installed to %%PREFIX%%/etc as
-"netams.conf.sample". This may be renamed to "netams.conf" and edited.
-
-In order to use the netamsctl programs, a user must copy
-%%EXAMPLESDIR%%/.netamsctl.rc to home directory and edit.
-
---------------------------------------------------------------------------
diff --git a/net/netams/pkg-plist b/net/netams/pkg-plist
deleted file mode 100644
index 2b3e1357583d..000000000000
--- a/net/netams/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-@unexec if cmp -s %D/etc/netams.conf.sample %D/etc/netams.conf; then rm -f %D/etc/netams.conf; fi
-etc/netams.conf.sample
-etc/rc.d/netams.sh.sample
-libexec/netams
-sbin/flowprobe
-sbin/ipfw2netflow
-bin/netamsctl
-%%PORTDOCS%%%%DOCSDIR%%/documentation-en.html
-%%PORTDOCS%%%%DOCSDIR%%/diagram-1.gif
-%%PORTDOCS%%%%DOCSDIR%%/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/net-1-1a.gif
-%%PORTDOCS%%%%DOCSDIR%%/net-1-2a.gif
-%%PORTDOCS%%%%DOCSDIR%%/net-1-3a.gif
-%%EXAMPLESDIR%%/netams-nat-network.cfg
-%%EXAMPLESDIR%%/netams-netflow.cfg
-%%EXAMPLESDIR%%/netams-simple.cfg
-%%EXAMPLESDIR%%/netams.cfg
-%%EXAMPLESDIR%%/netams-quotactl.cfg
-%%EXAMPLESDIR%%/.netamsctl.rc
-%%EXAMPLESDIR%%/cgi-bin/images/admintool-logo.gif
-%%EXAMPLESDIR%%/cgi-bin/images/logo-small.gif
-%%EXAMPLESDIR%%/cgi-bin/images/logo.gif
-%%EXAMPLESDIR%%/cgi-bin/netams_api.pl
-%%EXAMPLESDIR%%/cgi-bin/netams_example.cgi
-%%EXAMPLESDIR%%/cgi-bin/netams_graph.cgi
-%%EXAMPLESDIR%%/cgi-bin/weblogin.cgi
-%%EXAMPLESDIR%%/cgi-bin/weblogin.tem
-%%EXAMPLESDIR%%/cgi-bin/admintool.cgi
-%%EXAMPLESDIR%%/cgi-bin/login.cgi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%/cgi-bin/images
-@dirrm %%EXAMPLESDIR%%/cgi-bin
-@dirrm %%EXAMPLESDIR%%
diff --git a/net/netams/scripts/configure.netams b/net/netams/scripts/configure.netams
deleted file mode 100644
index 86c58468cf6f..000000000000
--- a/net/netams/scripts/configure.netams
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
- exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
- if [ "${WITH_MYSQL41}" ]; then
- OPTIONS="${OPTIONS} \"MySQL41\""
- elif [ "${WITH_MYSQL40}" ]; then
- OPTIONS="${OPTIONS} \"MySQL40\""
- elif [ "${WITH_MYSQL}" ]; then
- OPTIONS="${OPTIONS} \"MySQL\""
- fi
- if [ "${WITH_POSTGRES}" ]; then
- OPTIONS="${OPTIONS} \"PgSQL\""
- fi
- if [ "${WITH_HASH}" ]; then
- OPTIONS="$OPTIONS} \"HASH\""
- fi
- if [ "${WITH_OPT}" ]; then
- OPTIONS="${OPTIONS} \"OPTIMIZED\""
- fi
-
-else
- SET_MYSQL41="OFF"
- SET_MYSQL40="OFF"
- SET_MYSQL="OFF"
- if [ "${WITH_MYSQL41}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so.14 ] ; then
- SET_MYSQL41="ON"
- elif [ "${WITH_MYSQL40}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so.12 ] ; then
- SET_MYSQL40="ON"
- elif [ "${WITH_MYSQL}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so ] ; then
- SET_MYSQL="ON"
- fi
- SET_POSTGRES="OFF"
- if [ "${WITH_POSTGRES}" -o -f ${PREFIX}/lib/pq.3 ] ; then
- SET_POSTGRES="ON"
- fi
- SET_HASH="OFF"
- if [ "${WITH_HASH}" ] ; then
- SET_HASH="ON"
- fi
- SET_DEBUG="ON"
- if [ "${WITH_DEBUG}" ] ; then
- SET_DEBUG="ON"
- fi
- SET_OPT="OFF"
- if [ "${WITH_OPT}" ] ; then
- SET_OPT="ON"
- fi
-
- /usr/bin/dialog --title "NetAMS options" --clear \
- --checklist "\n\
-Please select desired options:" -1 -1 7 \
-MySQL "MySQL 3.23 support" ${SET_MYSQL} \
-MySQL40 "MySQL 4.0 support" ${SET_MYSQL40} \
-MySQL41 "MySQL 4.1 support" ${SET_MYSQL41} \
-PgSQL "PostgreSQL support" ${SET_POSTGRES} \
-HASH "Unix HASH support" ${SET_HASH} \
-DEBUG "Debugging support" ${SET_DEBUG} \
-OPTIMIZED "Enable optimization" ${SET_OPT} \
-2> $tempfile
-
- retval=$?
-
- if [ -s $tempfile ]; then
- set `cat $tempfile`
- fi
- rm -f $tempfile
-
- case $retval in
- 0) if [ -z "$*" ]; then
- echo "Nothing selected"
- fi
- ;;
- 1) echo "Cancel pressed."
- exit 1
- ;;
- esac
-fi
-
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-echo "PREFIX= ${PREFIX}"
-
-while [ "$1" ]; do
- case $1 in
- \"MySQL41\")
- if [ "${DEFMYSQL}" ]; then
- echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr
- exit 1
- fi
- echo "LIB_DEPENDS+= mysqlclient.14:\${PORTSDIR}/databases/mysql41-client"
- DEFMYSQL=1
- ;;
- \"MySQL40\")
- if [ "${DEFMYSQL}" ]; then
- echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr
- exit 1
- fi
- echo "LIB_DEPENDS+= mysqlclient.12:\${PORTSDIR}/databases/mysql40-client"
- DEFMYSQL=1
- ;;
- \"MySQL\")
- if [ "${DEFMYSQL}" ]; then
- echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr
- exit 1
- fi
- echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
- DEFMYSQL=1
- ;;
- \"PgSQL\")
- echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/databases/postgresql7"
- echo "DEFINE+= -DUSE_POSTGRES"
- echo "LIB += -lpq -L${LOCALBASE}/lib"
- ;;
- \"HASH\")
- echo "DEFINE+= -DUSE_HASH"
- ;;
- \"DEBUG\")
- if [ "${DEFOPT}" ]; then
- echo "DEBUG and OPTIMIZED are mutually exclusive." > /dev/stderr
- exit 1
- fi
- echo "DEFINE += -DDEBUG"
- echo "FLAGS += -g -Wall"
- DEFDEBUG=1
- ;;
- \"OPTIMIZED\")
- if [ "${DEFDEBUG}" ]; then
- echo "DEBUG and OPTIMIZED are mutually exclusive." > /dev/stderr
- exit 1
- fi
- echo "FLAGS += -O"
- DEFOPT=1
- ;;
- esac
- shift
-done
-
-if [ "${DEFMYSQL}" ]; then
-echo "LIB += -lmysqlclient -L${LOCALBASE}/lib/mysql"
-echo "DEFINE+= -DUSE_MYSQL"
-else
-fi
diff --git a/net/netmask/distinfo b/net/netmask/distinfo
deleted file mode 100644
index f6dce883f56a..000000000000
--- a/net/netmask/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netmask_2.4.tar.gz) = f722a108556fba6a921b579ab43a9baf
diff --git a/net/netmask/files/patch-aa b/net/netmask/files/patch-aa
deleted file mode 100644
index f6142c16da70..000000000000
--- a/net/netmask/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- netmask.c.orig Mon Nov 20 00:22:41 2000
-+++ netmask.c Mon Nov 20 00:22:58 2000
-@@ -17,15 +17,15 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <getopt.h>
- #include <netdb.h>
--#include <netinet/in.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/socket.h>
--#include <sys/types.h>
- #include "errors.h"
-
- struct addrmask {
diff --git a/net/netmask/files/patch-ab b/net/netmask/files/patch-ab
deleted file mode 100644
index df6d8e0d8b12..000000000000
--- a/net/netmask/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- netmask.texi.orig Mon Nov 20 00:39:20 2000
-+++ netmask.texi Mon Nov 20 00:39:33 2000
-@@ -3,6 +3,11 @@
- @setfilename netmask.info
- @settitle Generating Optimized Network Masks
- @finalout
-+@dircategory Miscellaneous
-+@direntry
-+* netmask: (netmask). Tool for generating terse netmasks.
-+@end direntry
-+
- @setchapternewpage odd
- @c %**end of header
-
diff --git a/net/netmask/pkg-descr b/net/netmask/pkg-descr
deleted file mode 100644
index 8222dcbf0534..000000000000
--- a/net/netmask/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a handy tool for generating terse netmasks in several common
-formats. If you've ever maintained a firewall with more than a few rules
-in it, you might use netmask to clean up and generalize sloppy rules left by
-the netadmin before you. It will also convert netmasks from one format
-to another for the day you change your firewall software.
diff --git a/net/netqc/distinfo b/net/netqc/distinfo
deleted file mode 100644
index 502c9b86ef74..000000000000
--- a/net/netqc/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netqc-1.2.1.tar.gz) = bdd25cb501dfdd8a6c6bcd8555b1414b
diff --git a/net/netqc/pkg-descr b/net/netqc/pkg-descr
deleted file mode 100644
index d26aa6be1161..000000000000
--- a/net/netqc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Network Monitoring System based on Net-snmp package.
-Netqc monitores preconfigured entities using SNMP protocol(v1,v2c,v3).
-It watches for degined ``events'' (onSame, onChange, onNonZero..) and
-react with different ``actions'' like logging (mysql, netqc-log file) &
-notification.
diff --git a/net/netqc/pkg-plist b/net/netqc/pkg-plist
deleted file mode 100644
index d53b5a3afd0b..000000000000
--- a/net/netqc/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/netqc
-etc/netqc.conf.sample
-%%PORTDOCS%%share/doc/netqc/COPYING
-%%PORTDOCS%%share/doc/netqc/README
-%%PORTDOCS%%@dirrm share/doc/netqc
diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo
deleted file mode 100644
index aebe302ce9e2..000000000000
--- a/net/netsaint-plugins/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (netsaint-plugins-1.2.9-4.tar.gz) = ef4adb2b9e77abebd3797e5ebe093014
-SIZE (netsaint-plugins-1.2.9-4.tar.gz) = 352023
diff --git a/net/netsaint-plugins/files/patch-ab b/net/netsaint-plugins/files/patch-ab
deleted file mode 100644
index 126c8b052a54..000000000000
--- a/net/netsaint-plugins/files/patch-ab
+++ /dev/null
@@ -1,284 +0,0 @@
---- configure.in.orig Thu Apr 26 16:00:26 2001
-+++ configure.in Tue May 1 18:28:01 2001
-@@ -7,7 +7,7 @@
- dnl AM_INIT_AUTOMAKE(netsaint-plugins,$VERSION)
- AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
-
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
-+dnl AC_PREFIX_DEFAULT(/usr/local/netsaint)
-
- dnl Figure out how to invoke "install" and what install options to use.
-
-@@ -99,8 +99,8 @@
- AC_CHECK_HEADERS(postgresql/libpq-fe.h)
- AC_CHECK_HEADERS(libpq-fe.h)
- if test "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
-- PGLIBS="-lpq -lcrypt"
-- PGINCLUDE="-I/usr/include/pgsql"
-+ PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
-+ PGINCLUDE="-I$PGSQL/include/pgsql"
- elif test "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
- PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
- PGINCLUDE="-I/usr/include/postgresql"
-@@ -128,25 +128,37 @@
- LIBS="$_SAVEDLIBS"
- CPPFLAGS="$_SAVEDCPPFLAGS"
-
-+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
-+if test $enableval; then
-+dnl Check for radiusclient header file
-+_SAVEDCPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-I${LOCALBASE}/include"
-+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include")
-+AC_SUBST(RADIUSINCLUDE)
-+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE"
-+
- dnl Check for radius libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(radiusclient,rc_read_config)
-+AC_CHECK_LIB(radiusclient,rc_read_config,,,-L${LOCALBASE}/lib)
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
- EXTRAS="$EXTRAS check_radius"
-- RADIUSLIBS="-lradiusclient"
-+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"
- AC_SUBST(RADIUSLIBS)
- else
- AC_MSG_WARN([Skipping radius plugin])
- AC_MSG_WARN([install radius libs to compile this plugin (see Requirements).])
- fi
- LIBS="$_SAVEDLIBS"
-+fi
-
-+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap)
-+if test $enableval; then
- dnl Check for LDAP libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(ldap,main,,,-llber)
--if test "$ac_cv_lib_ldap_main" = "yes"; then
-- LDAPLIBS="-lldap -llber"\
-- LDAPINCLUDE="-I/usr/include/ldap"
-+AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
-+if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
-+ LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"\
-+ LDAPINCLUDE="-I${LOCALBASE}/include"
- AC_SUBST(LDAPLIBS)
- AC_SUBST(LDAPINCLUDE)
- EXTRAS="$EXTRAS check_ldap"
-@@ -155,13 +167,14 @@
- AC_MSG_WARN([install LDAP libs to compile this plugin (see Requirements).])
- fi
- LIBS="$_SAVEDLIBS"
-+fi
-
- dnl Check for mysql libraries
- _SAVEDLIBS="$LIBS"
- _SAVEDCPPFLAGS="$CPPFLAGS"
--CPPFLAGS="-I/usr/include"
-+CPPFLAGS="-I${LOCALBASE}/include"
- AC_ARG_WITH(mysqllibdir,--with-mysqllibdir=<dir> sets path to mysql libraries,[MYSQLLIBDIR=$withval])
--if test -n "$MYSQLLIBS"; then
-+if test -n "$MYSQLLIBDIR"; then
- AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz)
- elif test -f /usr/lib/libmysqlclient.so; then
- AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
-@@ -177,7 +190,8 @@
- AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql)
- fi
- if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
-- AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h)
-+ AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h,MYSQLINCLUDE="-I${LOCALBASE}/include")
-+ AC_SUBST(MYSQLINCLUDE)
- if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
- EXTRAS="$EXTRAS check_mysql"
- AC_SUBST(MYSQLLIBS)
-@@ -191,7 +205,7 @@
- AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
- fi
- LIBS="$_SAVEDLIBS"
--CPPFLAGS="$_SAVEDCPPFLAGS"
-+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
-
- dnl Check for OpenSSL location
- AC_PATH_PROG(OPENSSL,openssl)
-@@ -270,16 +284,16 @@
- dnl AC_SUBST(libgetopt_a_DEPENDENCIES)
- dnl AC_SUBST(libsnprintf_a_SOURCES)
-
--AC_MSG_CHECKING(for getopt_long)
--AC_TRY_COMPILE([#include <getopt.h>
--#include <stdlib.h>],
--[int option_index=0;
--static struct option *long_options;
--getopt_long(0,NULL,"+h",long_options,&option_index);],
--[AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(yes)],
--[AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(no) import_sources=getopt])
-+dnl AC_MSG_CHECKING(for getopt_long)
-+dnl AC_TRY_COMPILE([#include <getopt.h>
-+dnl #include <stdlib.h>],
-+dnl [int option_index=0;
-+dnl static struct option *long_options;
-+dnl getopt_long(0,NULL,"+h",long_options,&option_index);],
-+dnl [AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(yes)],
-+dnl [AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(no) import_sources=getopt])
-
--AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")
-+dnl AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")
-
- AC_CHECK_FUNC(vsnprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a")
-
-@@ -330,72 +344,72 @@
- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
- echo " ps syntax... $PATH_TO_PS -eo 's comm vsz rss user ppid args'"
--elif [ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+elif [ps -axo 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
- AC_DEFINE(USE_PS_VARS)
- AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
-- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'")
-+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 's user ppid args'")
- EXTRAS="$EXTRAS check_netsaint"
-- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'")
-+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 's uid ppid comm args'")
- AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
-- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
-- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-- echo " ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
--elif [ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+ echo " ps syntax... $PATH_TO_PS -axo 's comm vsz rss'"
-+elif [ps -axo 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
- AC_DEFINE(USE_PS_VARS)
- AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
-- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'status user ppid args'")
-+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'status user ppid args'")
- EXTRAS="$EXTRAS check_netsaint"
-- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'status uid ppid comm args'")
-+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'status uid ppid comm args'")
- AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
-- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
-- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-- echo " ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
--elif [ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+ echo " ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'"
-+elif [ps -axo 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
- AC_DEFINE(USE_PS_VARS)
- AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
-- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'state user ppid args'")
-+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'")
- EXTRAS="$EXTRAS check_netsaint"
-- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'state uid ppid comm args'")
-+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'state uid ppid comm args'")
- AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
-- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
-- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-- echo " ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
--elif [ps -ao 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+ echo " ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'"
-+elif [ps -axo 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
- AC_DEFINE(USE_PS_VARS)
- AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
-- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'")
-+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'")
- EXTRAS="$EXTRAS check_netsaint"
-- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command args'")
-+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'state uid ppid command args'")
- AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
-- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -ao 'vsz command'")
-+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz command'")
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
-- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'")
-+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss command'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-- echo " ps syntax... $PATH_TO_PS -ao 'state command vsz rss'"
-+ echo " ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- dnl FreeBSD
--elif [ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null]
-+elif [ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null]
- then
- AC_DEFINE(USE_PS_VARS)
- AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
- EXTRAS="$EXTRAS check_netsaint"
-- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'")
-+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
- AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
-- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'")
-+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxo 'vsz command'")
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
-- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'")
-+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxo 'rss command'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-- echo " ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+ echo " ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- dnl BSD-like mode in RH 6.1
- elif [ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
-@@ -409,7 +423,7 @@
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'")
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-- echo " ps syntax... $PATH_TO_PS -waxco 'state comm vsz rss'"
-+ echo " ps syntax... $PATH_TO_PS -waxo 'state comm vsz rss'"
- dnl IRIX 53
- elif [ps -el 2>/dev/null | egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null]
- then
-@@ -620,6 +634,8 @@
- AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO")
- fi
-
-+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
-+if test $enableval; then
- AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
- if test -f "$PATH_TO_SNMPGET"
- then
-@@ -628,6 +644,7 @@
- else
- echo "** Get snmpget from http://ucd-snmp.ucdavis.edu to make check_hpjd and check_snmp plugins"
- fi
-+fi
-
- AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
- if test -f "$PATH_TO_SNMPGETNEXT"
-@@ -635,6 +652,8 @@
- AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT")
- fi
-
-+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
-+if test $enableval; then
- AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
- AC_PATH_PROG(PATH_TO_QSTAT,qstat)
- if test -n "$PATH_TO_QUAKESTAT"
-@@ -648,7 +667,10 @@
- else
- echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
- fi
-+fi
-
-+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
-+if test $enableval; then
- AC_PATH_PROG(PATH_TO_FPING,fping)
- if test -n "$PATH_TO_FPING"
- then
-@@ -656,6 +678,7 @@
- EXTRAS="$EXTRAS check_fping"
- else
- echo "** Get fping from http://www.stanford.edu/~schemers/docs/fping/fping.html in order to make check_fping plugin"
-+fi
- fi
-
- AC_PATH_PROG(PATH_TO_SSH,ssh)
diff --git a/net/netsaint-plugins/files/patch-ac b/net/netsaint-plugins/files/patch-ac
deleted file mode 100644
index 796ee76bcc2a..000000000000
--- a/net/netsaint-plugins/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins-scripts/check_ntp.pl.orig Mon Apr 23 19:43:00 2001
-+++ plugins-scripts/check_ntp.pl Sun Apr 29 18:38:26 2001
-@@ -154,7 +154,8 @@
- ###
- ###
-
--if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ) {
-+if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ||
-+ open(NTPDC,"/usr/sbin/ntpdc -c peers $host 2>&1 |")) {
- while (<NTPDC>) {
- print if ($verbose);
- if (/([^\s]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
diff --git a/net/netsaint-plugins/files/patch-check_by_ssh.c b/net/netsaint-plugins/files/patch-check_by_ssh.c
deleted file mode 100644
index 68de5fab2234..000000000000
--- a/net/netsaint-plugins/files/patch-check_by_ssh.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- plugins/check_by_ssh.c.orig Mon Apr 23 09:43:11 2001
-+++ plugins/check_by_ssh.c Tue Jul 22 05:05:52 2003
-@@ -191,7 +191,7 @@
- if (commands>1)
- remotecmd=strscat(remotecmd,";echo STATUS CODE: $?;");
-
-- if (strlen (remotecmd) <= 1)
-+ if ((remotecmd==NULL) || (strlen (remotecmd) <= 1))
- usage ("No remotecmd\n");
-
- comm = ssprintf(comm,"%s %s '%s'",comm,hostname,remotecmd);
-@@ -369,6 +369,8 @@
- " list of netsaint service names, separated by ':' [optional]\n"
- "-n, --name=NAME\n"
- " short name of host in netsaint configuration [optional]\n"
-+ "-v, --verbose\n"
-+ " short name of host in netsaint configuration [optional]\n"
- "\n"
- "The most common mode of use is to refer to a local identity file with\n"
- "the '-i' option. In this mode, the identity pair should have a null\n"
-@@ -388,7 +390,7 @@
-
-
- #define OPTIONS "\
---H <host> [-P port] [-f] [-y] [-t timeout] [-i identity]\n
-+-H <host> -C <command> [-fyv] [-P port] [-t timeout] [-i identity]\n\
- [-l user] [-n name] [-s servicelist] [-O outputfile]"
-
- void print_usage(void)
diff --git a/net/netsaint-plugins/files/patch-check_ntp.pl b/net/netsaint-plugins/files/patch-check_ntp.pl
deleted file mode 100644
index 3a3e3959ab88..000000000000
--- a/net/netsaint-plugins/files/patch-check_ntp.pl
+++ /dev/null
@@ -1,76 +0,0 @@
---- plugins-scripts/check_ntp.pl.orig Sun Jun 23 14:28:03 2002
-+++ plugins-scripts/check_ntp.pl Sun Jun 23 14:28:27 2002
-@@ -44,6 +44,10 @@
- # o Server has correct time but isn't suitable synchronization
- # source. This happens while starting up and if contact
- # with master has been lost.
-+#
-+# (c) 2001 David Douthitt <n9ubh@callsign.net>
-+#
-+# Script modified to handle NTP v2 with new -n parameter
-
- BEGIN {
- if ($0 =~ m/^(.*?)[\/\\]([^\/\\]+)$/) {
-@@ -56,7 +60,7 @@
- use POSIX;
- use strict;
- use Getopt::Long;
--use vars qw($opt_H $opt_w $opt_c $verbose $PROGNAME);
-+use vars qw($opt_n $opt_H $opt_w $opt_c $verbose $PROGNAME);
- use lib $main::runtimedir;
- use utils qw($TIMEOUT %ERRORS &print_revision &usage &support &is_error);
-
-@@ -69,6 +73,7 @@
- sub version ();
-
- delete @ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
-+$ENV{'PATH'} = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin";
-
- Getopt::Long::Configure('bundling', 'no_ignore_case');
- GetOptions
-@@ -77,6 +82,7 @@
- "v|verbose" => \$verbose,
- "w|warning=s" => \$opt_w,
- "c|critical=s" => \$opt_c,
-+ "n|ntpversion" => \$opt_n,
- "H|hostname=s" => \$opt_H);
-
- ($opt_H) || ($opt_H = shift) || usage("Host name/address not specified\n");
-@@ -93,6 +99,9 @@
- ($opt_c) || ($opt_c = shift) || ($opt_c = 120);
- my $critical = $1 if ($opt_c =~ /([0-9]+)/);
-
-+($opt_n) || ($opt_n = shift) || ($opt_n = 3);
-+my $ntp_version = $1 if ($opt_n =~ /([0-9])/);
-+
- my $answer = undef;
- my $offset = undef;
- my $msg; # first line of output to print if format is invalid
-@@ -117,7 +126,7 @@
- ###
- ###
-
--if (!open (NTPDATE, "/usr/local/sbin/ntpdate -q $host 2>&1 |")) {
-+if (!open (NTPDATE, "ntpdate -o$ntp_version -q $host 2>&1 |")) {
- print "Could not open ntpdate\n";
- exit $ERRORS{"UNKNOWN"};
- }
-@@ -154,8 +163,7 @@
- ###
- ###
-
--if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ||
-- open(NTPDC,"/usr/sbin/ntpdc -c peers $host 2>&1 |")) {
-+if (open(NTPDC,"/usr/sbin/ntpdc -c peers $host 2>&1 |")) {
- while (<NTPDC>) {
- print if ($verbose);
- if (/([^\s]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
-@@ -224,7 +232,7 @@
- exit $state;
-
- sub print_usage () {
-- print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>]\n";
-+ print "Usage: $PROGNAME -H <host> [ -n <ntp_version> ] [-w <warn>] [-c <crit>]\n";
- }
-
- sub print_help () {
diff --git a/net/netsaint-plugins/files/patch-check_snmp.c b/net/netsaint-plugins/files/patch-check_snmp.c
deleted file mode 100644
index 9f7a6dbd5e75..000000000000
--- a/net/netsaint-plugins/files/patch-check_snmp.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/check_snmp.c.orig Fri Jun 21 14:34:23 2002
-+++ plugins/check_snmp.c Fri Jun 21 14:33:45 2002
-@@ -146,13 +146,13 @@
- /* create the command line to execute */
- if (getnext==TRUE) {
- command_line = ssprintf (command_line,
-- "%s -m ALL -v 1 %s %s %s",
-- PATH_TO_SNMPGETNEXT, server_address, community, oid);
-+ "%s -m ALL -v 1 -c %s %s %s",
-+ PATH_TO_SNMPGETNEXT, community, server_address, oid);
- }
- else {
- command_line = ssprintf (command_line,
-- "%s -m ALL -v 1 %s %s %s",
-- PATH_TO_SNMPGET, server_address, community, oid);
-+ "%s -m ALL -v 1 -c %s %s %s",
-+ PATH_TO_SNMPGET, community, server_address, oid);
- }
-
- /* run the command */
diff --git a/net/netsaint-plugins/files/patch-check_ssh.c b/net/netsaint-plugins/files/patch-check_ssh.c
deleted file mode 100644
index d80b91a2abb9..000000000000
--- a/net/netsaint-plugins/files/patch-check_ssh.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/check_ssh.c.orig Fri Jun 21 12:17:43 2002
-+++ plugins/check_ssh.c Fri Jun 21 12:23:16 2002
-@@ -246,7 +246,7 @@
- printf("%s\n", output);
- ssh_proto = output + 4;
- ssh_server = ssh_proto + strspn(ssh_proto, "0123456789-. ");
-- ssh_proto[strspn(ssh_proto, "0123456789-. ")] = 0;
-+ ssh_proto[strspn(ssh_proto, "0123456789. ")] = 0;
- printf
- ("SSH ok - protocol version %s - server version %s\n",
- ssh_proto, ssh_server);
-@@ -272,7 +272,7 @@
- {
- printf
- ("Usage:\n"
-- " %s -t [timeout] -p [port] <host>\n"
-+ " %s [-t <timeout>] [-p <port>] <host>\n"
- " %s -V prints version info\n"
- " %s -h prints more detailed help\n", PROGNAME, PROGNAME, PROGNAME);
- }
diff --git a/net/netsaint-plugins/files/patch-subst.in b/net/netsaint-plugins/files/patch-subst.in
deleted file mode 100644
index 3caf2cb87757..000000000000
--- a/net/netsaint-plugins/files/patch-subst.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins-scripts/subst.in.orig Fri Sep 1 05:47:35 2000
-+++ plugins-scripts/subst.in Sun Jun 23 14:24:00 2002
-@@ -33,7 +33,7 @@
- # Trusted path mechanism (deprecated)
-
- /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
-- sub(/\=[ \t]*['"][^"']+["']/,"='@trusted_path@' # autoconf-derived");
-+ sub(/\=[ \t]*['"][^"']+["'];/,"='@trusted_path@'; # autoconf-derived");
- }
-
- /^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
diff --git a/net/netsaint-plugins/pkg-descr b/net/netsaint-plugins/pkg-descr
deleted file mode 100644
index da28433b287c..000000000000
--- a/net/netsaint-plugins/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a plugin package for Netsaint. Quoting from the
-main Netsaint package:
-
-NetSaint is a program that will monitor hosts and services
-on your network. It has the ability to email or page you
-when a problem arises and when it gets resolved. NetSaint
-is written in C and is designed to run under Linux, although
-it should work under most other *NIX variants. It can run
-either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The
-actual service checks are performed by external "plugins"
-which return service information to NetSaint. Several CGI
-programs are included with NetSaint in order to allow you
-to view the current service status, history, etc. via a web browser.
-
-WWW: http://www.netsaint.org/
diff --git a/net/netsaint-plugins/pkg-plist b/net/netsaint-plugins/pkg-plist
deleted file mode 100644
index 2fc85698322f..000000000000
--- a/net/netsaint-plugins/pkg-plist
+++ /dev/null
@@ -1,52 +0,0 @@
-libexec/netsaint/check_breeze
-libexec/netsaint/check_by_ssh
-libexec/netsaint/check_dig
-libexec/netsaint/check_disk
-libexec/netsaint/check_disk_smb
-libexec/netsaint/check_dns
-libexec/netsaint/check_dummy
-libexec/netsaint/check_flexlm
-%%SUB_FPING%%libexec/netsaint/check_fping
-libexec/netsaint/check_ftp
-%%SUB_QSTAT%%libexec/netsaint/check_game
-%%SUB_SNMP%%libexec/netsaint/check_hpjd
-libexec/netsaint/check_http
-libexec/netsaint/check_imap
-libexec/netsaint/check_ircd
-%%SUB_LDAP%%libexec/netsaint/check_ldap
-libexec/netsaint/check_load
-libexec/netsaint/check_log
-libexec/netsaint/check_mrtg
-libexec/netsaint/check_mrtgtraf
-%%SUB_MYSQL%%libexec/netsaint/check_mysql
-libexec/netsaint/check_netdns
-libexec/netsaint/check_netsaint
-libexec/netsaint/check_nntp
-libexec/netsaint/check_nt
-libexec/netsaint/check_ntp
-libexec/netsaint/check_nwstat
-libexec/netsaint/check_oracle
-libexec/netsaint/check_overcr
-%%SUB_PGSQL%%libexec/netsaint/check_pgsql
-libexec/netsaint/check_ping
-libexec/netsaint/check_pop
-libexec/netsaint/check_procs
-%%SUB_RADIUS%%libexec/netsaint/check_radius
-libexec/netsaint/check_real
-libexec/netsaint/check_rpc
-libexec/netsaint/check_sensors
-libexec/netsaint/check_smtp
-%%SUB_SNMP%%libexec/netsaint/check_snmp
-libexec/netsaint/check_ssh
-libexec/netsaint/check_swap
-libexec/netsaint/check_tcp
-libexec/netsaint/check_time
-libexec/netsaint/check_udp
-libexec/netsaint/check_ups
-libexec/netsaint/check_users
-libexec/netsaint/check_vsz
-libexec/netsaint/check_wave
-libexec/netsaint/urlize
-libexec/netsaint/utils.pm
-libexec/netsaint/utils.sh
-@dirrm libexec/netsaint
diff --git a/net/netsaint-plugins/scripts/configure b/net/netsaint-plugins/scripts/configure
deleted file mode 100644
index a58e799c2c38..000000000000
--- a/net/netsaint-plugins/scripts/configure
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
- exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${BATCH}" = "yes" ]; then
-else
- /usr/bin/dialog --title "NetSaint plugins configuration options" --clear \
- --checklist "\n\
-Please select desired options:" -1 -1 16 \
-QStat "Game server query support" OFF \
-FPing "Support for non-flooding fast ping" OFF \
-NetSNMP "SNMP support" OFF \
-Radiusclient "Radius support" OFF \
-MySQL "MySQL support" OFF \
-PostgreSQL "PostgreSQL support" OFF \
-OpenLDAP "OpenLDAP support" OFF \
-2> $tempfile
-
- retval=$?
-
- if [ -s $tempfile ]; then
- set `cat $tempfile`
- fi
- rm -f $tempfile
-
- case $retval in
- 0) if [ -z "$*" ]; then
- echo "Nothing selected"
- fi
- ;;
- 1) echo "Cancel pressed."
- exit 1
- ;;
- esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-SUB_QSTAT="@comment "
-SUB_FPING="@comment "
-SUB_SNMP="@comment "
-SUB_RADIUS="@comment "
-SUB_MYSQL="@comment "
-SUB_PGSQL="@comment "
-SUB_LDAP="@comment "
-
-while [ "$1" ]; do
- case $1 in
- \"QStat\")
- echo "BUILD_DEPENDS+= qstat:\${PORTSDIR}/games/qstat"
- echo "RUN_DEPENDS+= qstat:\${PORTSDIR}/games/qstat"
- echo "CONFIGURE_ARGS+= --enable-qstat"
- SUB_QSTAT=""
- ;;
- \"FPing\")
- echo "BUILD_DEPENDS+= fping:\${PORTSDIR}/net/fping"
- echo "RUN_DEPENDS+= fping:\${PORTSDIR}/net/fping"
- echo "CONFIGURE_ARGS+= --enable-fping"
- SUB_FPING=""
- ;;
- \"NetSNMP\")
- echo "BUILD_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
- echo "RUN_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
- echo "CONFIGURE_ARGS+= --enable-snmp"
- SUB_SNMP=""
- ;;
- \"Radiusclient\")
- echo "LIB_DEPENDS+= radiusclient.0:\${PORTSDIR}/net/radiusclient"
- echo "CONFIGURE_ARGS+= --enable-radius"
- SUB_RADIUS=""
- ;;
- \"MySQL\")
- echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
- echo "CONFIGURE_ARGS+= --with-mysqllibdir=\${LOCALBASE}/lib/mysql"
- SUB_MYSQL=""
- ;;
- \"PostgreSQL\")
- echo "POSTGRESQL_PORT?= databases/postgresql7"
- echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
- echo "CONFIGURE_ARGS+= --with-pgsql=\${LOCALBASE}"
- SUB_PGSQL=""
- ;;
- \"OpenLDAP\")
- echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap20-client"
- echo "CONFIGURE_ARGS+= --enable-ldap"
- SUB_LDAP=""
- ;;
- *)
- echo "Invalid option(s): $*" > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- ;;
- esac
- shift
-done
-
-echo "PLIST_SUB+= SUB_QSTAT=\"${SUB_QSTAT}\""
-echo "PLIST_SUB+= SUB_FPING=\"${SUB_FPING}\""
-echo "PLIST_SUB+= SUB_SNMP=\"${SUB_SNMP}\""
-echo "PLIST_SUB+= SUB_RADIUS=\"${SUB_RADIUS}\""
-echo "PLIST_SUB+= SUB_MYSQL=\"${SUB_MYSQL}\""
-echo "PLIST_SUB+= SUB_PGSQL=\"${SUB_PGSQL}\""
-echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
diff --git a/net/netsaint/distinfo b/net/netsaint/distinfo
deleted file mode 100644
index c444f819229d..000000000000
--- a/net/netsaint/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (netsaint-0.0.7.tar.gz) = 5cabd55a73a618acbc82adc76d6ef382
-SIZE (netsaint-0.0.7.tar.gz) = 1278019
-MD5 (netsaint-graphics.tar.gz) = d959b80cccdee3ff22f4025c6f2446c4
-SIZE (netsaint-graphics.tar.gz) = 25061
diff --git a/net/netsaint/files/patch-aa b/net/netsaint/files/patch-aa
deleted file mode 100644
index 52e4d1752784..000000000000
--- a/net/netsaint/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig Mon Apr 30 17:22:35 2001
-+++ Makefile.in Tue May 1 19:58:50 2001
-@@ -27,7 +27,7 @@
- INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
- INIT_DIR=@init_dir@
--INIT_OPTS=-o root -g root
-+INIT_OPTS=-o root -g wheel
- CGICFGDIR=$(CGIDIR)
- PERLDIR=@PERLDIR@
-
-@@ -99,20 +99,20 @@
-
- install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.dist
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.dist
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.dist
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.dist
-+ $(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.dist
-
- install-init: install-daemoninit
-
- install-daemoninit:
-- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
-+ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh
-
- install-commandmode:
- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
-- chmod g+s $(DESTDIR)$(LOGDIR)/rw
-+# chmod g+s $(DESTDIR)$(LOGDIR)/rw
-
- fullinstall: install install-init install-commandmode
-
diff --git a/net/netsaint/files/patch-ab b/net/netsaint/files/patch-ab
deleted file mode 100644
index 52c154d64fd0..000000000000
--- a/net/netsaint/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/Makefile.in.orig Sun Feb 18 22:33:22 2001
-+++ base/Makefile.in Thu Mar 1 21:58:39 2001
-@@ -86,7 +86,6 @@
- devclean: clean
-
- install:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
-
-
diff --git a/net/netsaint/files/patch-ad b/net/netsaint/files/patch-ad
deleted file mode 100644
index aeb6f67857ca..000000000000
--- a/net/netsaint/files/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.orig Thu Mar 1 04:54:12 2001
-+++ configure Thu Mar 1 21:58:09 2001
-@@ -11,7 +11,7 @@
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
- ac_help="$ac_help
- --with-netsaint-user=<user> sets user name to run netsaint"
- ac_help="$ac_help
-@@ -562,9 +562,9 @@
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+ CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+ CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
- fi
- fi
- for ac_site_file in $CONFIG_SITE; do
diff --git a/net/netsaint/files/patch-ae b/net/netsaint/files/patch-ae
deleted file mode 100644
index 37f2c6d96f62..000000000000
--- a/net/netsaint/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig Mon Apr 30 17:22:35 2001
-+++ configure.in Tue May 1 19:36:54 2001
-@@ -1,7 +1,7 @@
- dnl Process this -*-m4-*- file with autoconf to produce a configure script.
- AC_INIT(base/netsaint.c)
- AC_CONFIG_HEADER(common/config.h common/snprintf.h base/netsaint.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
-+AC_PREFIX_DEFAULT(/usr/local)
-
- dnl Figure out how to invoke "install" and what install options to use.
- AC_PROG_INSTALL
diff --git a/net/netsaint/files/patch-ag b/net/netsaint/files/patch-ag
deleted file mode 100644
index 14027c5d9cc9..000000000000
--- a/net/netsaint/files/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
---- functions Fri Apr 7 11:11:34 2000
-+++ functions.new Sat Jun 10 13:31:31 2000
-@@ -11,7 +11,7 @@
- #
-
- # First set up a default search path.
--PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
- export PATH
-
- # Get a sane screen width
-@@ -174,7 +174,7 @@
- # fi
-
- # Finally try to extract it from ps
-- pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
-+ pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
- if [ "$pid" != "" ] ; then
- echo $pid
- return 0
-@@ -206,8 +206,8 @@
- fi
- fi
-
-- # See if /var/lock/subsys/$1 exists
-- if [ -f /var/lock/subsys/$1 ]; then
-+ # See if /var/spool/lock/$1 exists
-+ if [ -f /var/spool/lock/$1 ]; then
- echo "$1 dead but subsys locked"
- return 2
- fi
diff --git a/net/netsaint/files/patch-ai b/net/netsaint/files/patch-ai
deleted file mode 100644
index 1820da920208..000000000000
--- a/net/netsaint/files/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
---- daemon-init.in.orig Sat Mar 24 19:58:26 2001
-+++ daemon-init.in Tue May 1 19:38:52 2001
-@@ -68,12 +68,9 @@
-
-
- # Source function library
--# Solaris doesn't have an rc.d directory, so do a test first
--#if [ -f /etc/rc.d/init.d/functions ]; then
--#. /etc/rc.d/init.d/functions
--#elif [ -f /etc/init.d/functions ]; then
--#. /etc/init.d/functions
--#fi
-+if [ -f @sysconfdir@/functions ]; then
-+. @sysconfdir@/functions
-+fi
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-@@ -102,7 +99,7 @@
-
- start)
- echo "Starting network monitor: netsaint"
-- su $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
-+ su -m $Netsaint -c "touch $NetsaintVar/netsaint.log $NetsaintSav"
- rm -f $NetsaintCmd
- $NetsaintBin -d $NetsaintCfg
- if [ -d $NetsaintLckDir ]; then touch $NetsaintLckDir/$NetsaintLckFile; fi
diff --git a/net/netsaint/files/patch-aj b/net/netsaint/files/patch-aj
deleted file mode 100644
index c427778f0d2b..000000000000
--- a/net/netsaint/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- html/main.html.orig Sat Mar 2 01:41:54 2002
-+++ html/main.html Wed Mar 13 09:12:58 2002
-@@ -27,7 +27,7 @@
-
- <P>
- <div align="center">
--<IMG SRC="images/logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
-+<IMG SRC="images/bsd_logofullsize.gif" BORDER="0" ALT="NetSaint" width="238" height="227"><br>
- Copyright (c) 1999-2002 Ethan Galstad<br>
- <a href="mailto:netsaint@netsaint.org">netsaint@netsaint.org</a>
- </div>
diff --git a/net/netsaint/files/patch-ak b/net/netsaint/files/patch-ak
deleted file mode 100644
index b419a9d04564..000000000000
--- a/net/netsaint/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- html/side.html.in.org Sun Sep 16 11:36:54 2001
-+++ html/side.html.in Sun Sep 16 11:39:53 2001
-@@ -44,7 +44,7 @@
- <table width="150" border="0">
- <tr>
- <td>
-- <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/sblogo.gif" width="130" height="125" border="0"></a></div>
-+ <div align="center"><a href="http://www.netsaint.org" target="_top"><img src="images/bsd_sblogo.gif" width="110" height="95" border="0"></a></div>
- </td>
- </tr>
- </table>
diff --git a/net/netsaint/files/patch-ba b/net/netsaint/files/patch-ba
deleted file mode 100644
index c4b47eabff35..000000000000
--- a/net/netsaint/files/patch-ba
+++ /dev/null
@@ -1,20 +0,0 @@
---- base/utils.c.orig Thu Feb 21 02:47:12 2002
-+++ base/utils.c Tue Jun 11 09:21:53 2002
-@@ -1884,6 +1884,17 @@
- val|=FD_CLOEXEC;
- fcntl(lockfile,F_SETFD,val);
-
-+ /* close existing stdin, stdout, stderr */
-+ close(0);
-+ close(1);
-+ close(2);
-+
-+ /* THIS HAS TO BE DONE TO AVOID PROBLEMS WITH STDERR BEING REDIRECTED TO SERVICE MESSAGE PIPE! */
-+ /* re-open stdin, stdout, stderr with known values */
-+ open("/dev/null",O_RDONLY);
-+ open("/dev/null",O_WRONLY);
-+ open("/dev/null",O_WRONLY);
-+
- return OK;
- }
-
diff --git a/net/netsaint/pkg-descr b/net/netsaint/pkg-descr
deleted file mode 100644
index ba87fff062b8..000000000000
--- a/net/netsaint/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-NetSaint is a program that will monitor hosts and services on your
-network. It has the ability to email or page you when a problem arises
-and when it gets resolved. NetSaint is written in C and is designed to
-run under Linux, although it should work under most other *NIX variants.
-It can run either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The actual service
-checks are performed by external "plugins" which return service
-information to NetSaint. Several CGI programs are included with NetSaint
-in order to allow you to view the current service status, history, etc.
-via a web browser.
-
-WWW: http://www.netsaint.org/
diff --git a/net/netsaint/pkg-install b/net/netsaint/pkg-install
deleted file mode 100644
index 52af9cc24d68..000000000000
--- a/net/netsaint/pkg-install
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-user=netsaint
-group=netsaint
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local dflt question answer
-
- question=$1
- dflt=$2
- while :; do
- answer=$(ask "${question}" "${dflt}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
- if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
- echo "You already have a group \"${group}\", so I will use it."
- else
- echo "You need a group \"${group}\"."
- if yesno "Would you like me to create it" y; then
- /usr/sbin/pw groupadd ${group} -h - || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${user}" 2>/dev/null; then
- echo "You already have a user \"${user}\", so I will use it."
- else
- echo "You need a user \"${user}\"."
- if yesno "Would you like me to create it" y; then
- /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/netsaint \
- -s /nonexistent -c "Netsaint pseudo-user" || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
-fi
diff --git a/net/netsaint/pkg-plist b/net/netsaint/pkg-plist
deleted file mode 100644
index 577913c6eba7..000000000000
--- a/net/netsaint/pkg-plist
+++ /dev/null
@@ -1,297 +0,0 @@
-@exec mkdir -p %D/var/netsaint/archives
-@exec mkdir -p %D/var/netsaint/rw
-@exec chmod 775 %D/var/netsaint %D/var/netsaint/archives %D/var/netsaint/rw
-@exec chown netsaint:netsaint %D/var/netsaint %D/var/netsaint/archives
-@exec chown netsaint:nogroup %D/var/netsaint/rw
-bin/netsaint
-etc/netsaint/commands.cfg.dist
-etc/netsaint/hosts.cfg.dist
-etc/netsaint/netsaint.cfg.dist
-etc/netsaint/nscgi.cfg.dist
-etc/netsaint/resource.cfg.dist
-etc/rc.d/netsaint.sh
-share/netsaint/docs/about.html
-share/netsaint/docs/addons.html
-share/netsaint/docs/cgiauth.html
-share/netsaint/docs/cgis.html
-share/netsaint/docs/checkscheduling.html
-share/netsaint/docs/clusters.html
-share/netsaint/docs/commandfile.html
-share/netsaint/docs/config.html
-share/netsaint/docs/configcgi.html
-share/netsaint/docs/confighost.html
-share/netsaint/docs/configmain.html
-share/netsaint/docs/dependencies.html
-share/netsaint/docs/developer/commentfile.html
-share/netsaint/docs/developer/images/xcdapi.gif
-share/netsaint/docs/developer/images/xedapi.gif
-share/netsaint/docs/developer/images/xodapi.gif
-share/netsaint/docs/developer/images/xrdapi.gif
-share/netsaint/docs/developer/images/xsdapi.gif
-share/netsaint/docs/developer/index.html
-share/netsaint/docs/developer/pluginhowto.html
-share/netsaint/docs/developer/stateretentionfile.html
-share/netsaint/docs/developer/statusfile.html
-share/netsaint/docs/developer/xcd.html
-share/netsaint/docs/developer/xdata.html
-share/netsaint/docs/developer/xed.html
-share/netsaint/docs/developer/xod.html
-share/netsaint/docs/developer/xrd.html
-share/netsaint/docs/developer/xsd.html
-share/netsaint/docs/distributed.html
-share/netsaint/docs/downtime.html
-share/netsaint/docs/embeddedperl.html
-share/netsaint/docs/escalations.html
-share/netsaint/docs/eventhandlers.html
-share/netsaint/docs/extcommands.html
-share/netsaint/docs/faqs.html
-share/netsaint/docs/flapping.html
-share/netsaint/docs/funstuff.html
-share/netsaint/docs/images/activepassive.gif
-share/netsaint/docs/images/avail_cgi.gif
-share/netsaint/docs/images/checktiming.gif
-share/netsaint/docs/images/cmd_cgi.gif
-share/netsaint/docs/images/config_cgi.gif
-share/netsaint/docs/images/distributed.gif
-share/netsaint/docs/images/extinfo_cgi_a.gif
-share/netsaint/docs/images/extinfo_cgi_b.gif
-share/netsaint/docs/images/extinfo_cgi_c.gif
-share/netsaint/docs/images/extinfo_cgi_d.gif
-share/netsaint/docs/images/extinfo_cgi_e.gif
-share/netsaint/docs/images/history_cgi.gif
-share/netsaint/docs/images/indirecthostcheck.gif
-share/netsaint/docs/images/indirectsvccheck.gif
-share/netsaint/docs/images/indirectsvccheck2.gif
-share/netsaint/docs/images/interleaved1.gif
-share/netsaint/docs/images/interleaved2.gif
-share/netsaint/docs/images/network-heirarchy.gif
-share/netsaint/docs/images/network-outage1.gif
-share/netsaint/docs/images/network-outage2.gif
-share/netsaint/docs/images/noninterleaved1.gif
-share/netsaint/docs/images/noninterleaved2.gif
-share/netsaint/docs/images/notification-process.gif
-share/netsaint/docs/images/notifications_cgi.gif
-share/netsaint/docs/images/outages_cgi.gif
-share/netsaint/docs/images/physical-network.gif
-share/netsaint/docs/images/plugintheory.gif
-share/netsaint/docs/images/redundancy-1.gif
-share/netsaint/docs/images/redundancy-2.gif
-share/netsaint/docs/images/service-dependencies.gif
-share/netsaint/docs/images/showlog_cgi.gif
-share/netsaint/docs/images/statetransitions.gif
-share/netsaint/docs/images/statetransitions2.gif
-share/netsaint/docs/images/status_cgi_a.gif
-share/netsaint/docs/images/status_cgi_b.gif
-share/netsaint/docs/images/statusmap_cgi.gif
-share/netsaint/docs/images/statuswml_cgi.gif
-share/netsaint/docs/images/statuswrl_cgi.gif
-share/netsaint/docs/images/tac_cgi.gif
-share/netsaint/docs/images/trends_cgi.gif
-share/netsaint/docs/index.html
-share/netsaint/docs/indirectchecks.html
-share/netsaint/docs/installing.html
-share/netsaint/docs/installweb.html
-share/netsaint/docs/macros.html
-share/netsaint/docs/makehtml.html
-share/netsaint/docs/networkoutages.html
-share/netsaint/docs/networkreachability.html
-share/netsaint/docs/notifications.html
-share/netsaint/docs/parallelization.html
-share/netsaint/docs/passivechecks.html
-share/netsaint/docs/perfdata.html
-share/netsaint/docs/pluginhowto.html
-share/netsaint/docs/plugins.html
-share/netsaint/docs/plugintheory.html
-share/netsaint/docs/programmodes.html
-share/netsaint/docs/redundancy.html
-share/netsaint/docs/robots.txt
-share/netsaint/docs/security.html
-share/netsaint/docs/starting.html
-share/netsaint/docs/statetypes.html
-share/netsaint/docs/statuslevels.html
-share/netsaint/docs/stoprestart.html
-share/netsaint/docs/theory.html
-share/netsaint/docs/timeperiods.html
-share/netsaint/docs/tuning.html
-share/netsaint/docs/verifyconfig.html
-share/netsaint/docs/volatileservices.html
-share/netsaint/docs/whatsnew.html
-share/netsaint/docs/xdata-db.html
-share/netsaint/images/ack.gif
-share/netsaint/images/active.gif
-share/netsaint/images/bsd_logofullsize.gif
-share/netsaint/images/bsd_sblogo.gif
-share/netsaint/images/command.gif
-share/netsaint/images/comment.gif
-share/netsaint/images/config.gif
-share/netsaint/images/contact.gif
-share/netsaint/images/contactgroup.gif
-share/netsaint/images/critical.gif
-share/netsaint/images/delay.gif
-share/netsaint/images/delete.gif
-share/netsaint/images/disabled.gif
-share/netsaint/images/down.gif
-share/netsaint/images/downtime.gif
-share/netsaint/images/enabled.gif
-share/netsaint/images/extinfo.gif
-share/netsaint/images/flapping.gif
-share/netsaint/images/greendot.gif
-share/netsaint/images/history.gif
-share/netsaint/images/host.gif
-share/netsaint/images/hostevent.gif
-share/netsaint/images/info.gif
-share/netsaint/images/left.gif
-share/netsaint/images/logofullsize.gif
-share/netsaint/images/logos/aix.gd2
-share/netsaint/images/logos/aix.gif
-share/netsaint/images/logos/amiga.gd2
-share/netsaint/images/logos/amiga.gif
-share/netsaint/images/logos/apple.gd2
-share/netsaint/images/logos/apple.gif
-share/netsaint/images/logos/beos.gd2
-share/netsaint/images/logos/beos.gif
-share/netsaint/images/logos/caldera.gd2
-share/netsaint/images/logos/caldera.gif
-share/netsaint/images/logos/cat1900.gd2
-share/netsaint/images/logos/cat2900.gd2
-share/netsaint/images/logos/cat5000.gd2
-share/netsaint/images/logos/debian.gd2
-share/netsaint/images/logos/debian.gif
-share/netsaint/images/logos/freebsd40.gd2
-share/netsaint/images/logos/freebsd40.gif
-share/netsaint/images/logos/hp-printer40.gd2
-share/netsaint/images/logos/hp-printer40.gif
-share/netsaint/images/logos/hpux.gd2
-share/netsaint/images/logos/hpux.gif
-share/netsaint/images/logos/irix.gd2
-share/netsaint/images/logos/irix.gif
-share/netsaint/images/logos/linux40.gd2
-share/netsaint/images/logos/linux40.gif
-share/netsaint/images/logos/logo.gd2
-share/netsaint/images/logos/mac40.gd2
-share/netsaint/images/logos/mac40.gif
-share/netsaint/images/logos/mandrake.gd2
-share/netsaint/images/logos/mandrake.gif
-share/netsaint/images/logos/next.gd2
-share/netsaint/images/logos/next.gif
-share/netsaint/images/logos/netsaint.gd2
-share/netsaint/images/logos/ng-switch40.gd2
-share/netsaint/images/logos/ng-switch40.gif
-share/netsaint/images/logos/novell40.gd2
-share/netsaint/images/logos/novell40.gif
-share/netsaint/images/logos/openbsd.gd2
-share/netsaint/images/logos/openbsd.gif
-share/netsaint/images/logos/redhat.gd2
-share/netsaint/images/logos/redhat.gif
-share/netsaint/images/logos/router40.gd2
-share/netsaint/images/logos/router40.gif
-share/netsaint/images/logos/slackware.gd2
-share/netsaint/images/logos/slackware.gif
-share/netsaint/images/logos/stampede.gd2
-share/netsaint/images/logos/stampede.gif
-share/netsaint/images/logos/storm.gd2
-share/netsaint/images/logos/storm.gif
-share/netsaint/images/logos/sun40.gd2
-share/netsaint/images/logos/sun40.gif
-share/netsaint/images/logos/sunlogo.gd2
-share/netsaint/images/logos/sunlogo.gif
-share/netsaint/images/logos/switch40.gd2
-share/netsaint/images/logos/switch40.gif
-share/netsaint/images/logos/turbolinux.gd2
-share/netsaint/images/logos/turbolinux.gif
-share/netsaint/images/logos/ultrapenguin.gd2
-share/netsaint/images/logos/ultrapenguin.gif
-share/netsaint/images/logos/unicos.gd2
-share/netsaint/images/logos/unicos.gif
-share/netsaint/images/logos/unknown.gd2
-share/netsaint/images/logos/win40.gd2
-share/netsaint/images/logos/win40.gif
-share/netsaint/images/logos/yellowdog.gd2
-share/netsaint/images/logos/yellowdog.gif
-share/netsaint/images/logrotate.gif
-share/netsaint/images/logs.gif
-share/netsaint/images/ndisabled.gif
-share/netsaint/images/noack.gif
-share/netsaint/images/notes.gif
-share/netsaint/images/notify.gif
-share/netsaint/images/orangedot.gif
-share/netsaint/images/parentup.gif
-share/netsaint/images/recovery.gif
-share/netsaint/images/restart.gif
-share/netsaint/images/right.gif
-share/netsaint/images/sbbg.gif
-share/netsaint/images/sbconfig.gif
-share/netsaint/images/sbgeneral.gif
-share/netsaint/images/sblogo.gif
-share/netsaint/images/sbmonitor.gif
-share/netsaint/images/serviceevent.gif
-share/netsaint/images/sideback.jpg
-share/netsaint/images/standby.gif
-share/netsaint/images/start.gif
-share/netsaint/images/status.gif
-share/netsaint/images/status2.gif
-share/netsaint/images/status3.gif
-share/netsaint/images/status4.gif
-share/netsaint/images/stop.gif
-share/netsaint/images/tacdisabled.jpg
-share/netsaint/images/tacenabled.jpg
-share/netsaint/images/thermcrit.gif
-share/netsaint/images/thermok.gif
-share/netsaint/images/thermwarn.gif
-share/netsaint/images/trends.gif
-share/netsaint/images/trendshost.png
-share/netsaint/images/trendssvc.png
-share/netsaint/images/unknown.gif
-share/netsaint/images/up.gif
-share/netsaint/images/warning.gif
-share/netsaint/images/zoom1.gif
-share/netsaint/images/zoom2.gif
-share/netsaint/index.html
-share/netsaint/main.html
-share/netsaint/media/critical.wav
-share/netsaint/media/hostdown.wav
-share/netsaint/media/warning.wav
-share/netsaint/robots.txt
-share/netsaint/sbin/avail.cgi
-share/netsaint/sbin/cmd.cgi
-share/netsaint/sbin/config.cgi
-share/netsaint/sbin/extinfo.cgi
-share/netsaint/sbin/history.cgi
-share/netsaint/sbin/ministatus.cgi
-share/netsaint/sbin/notifications.cgi
-share/netsaint/sbin/outages.cgi
-share/netsaint/sbin/showlog.cgi
-share/netsaint/sbin/status.cgi
-share/netsaint/sbin/statusmap.cgi
-share/netsaint/sbin/statuswml.cgi
-share/netsaint/sbin/statuswrl.cgi
-share/netsaint/sbin/tac.cgi
-share/netsaint/sbin/trends.cgi
-share/netsaint/side.html
-share/netsaint/stylesheets/avail.css
-share/netsaint/stylesheets/cmd.css
-share/netsaint/stylesheets/config.css
-share/netsaint/stylesheets/extinfo.css
-share/netsaint/stylesheets/history.css
-share/netsaint/stylesheets/notifications.css
-share/netsaint/stylesheets/outages.css
-share/netsaint/stylesheets/showlog.css
-share/netsaint/stylesheets/status.css
-share/netsaint/stylesheets/statusmap.css
-share/netsaint/stylesheets/tac.css
-share/netsaint/stylesheets/trends.css
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
-@dirrm share/netsaint/docs/developer/images
-@dirrm share/netsaint/docs/developer
-@dirrm share/netsaint/docs/images
-@dirrm share/netsaint/docs
-@dirrm share/netsaint/images/logos
-@dirrm share/netsaint/images
-@dirrm share/netsaint/media
-@dirrm share/netsaint/sbin
-@dirrm share/netsaint/stylesheets
-@dirrm share/netsaint
-@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true
-@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true
-@unexec rmdir %D/var/netsaint 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
diff --git a/net/netsaint/scripts/checkps b/net/netsaint/scripts/checkps
deleted file mode 100644
index 61a4d67baaa7..000000000000
--- a/net/netsaint/scripts/checkps
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-/bin/ps 999999 2>&1 >/dev/null
-if [ $? = 0 ]; then
- echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
- echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
- echo "return an error code if a PID does not exist. Netsaint needs this!"
- exit
-else
- echo "Great, you have a working ps(1)! Netsaint can build."
-fi
diff --git a/net/netspoc/distinfo b/net/netspoc/distinfo
deleted file mode 100644
index 686e80de82eb..000000000000
--- a/net/netspoc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (netspoc-1.7.tar.gz) = 59acf72f15fa724ed0daffd5fda29838
-SIZE (netspoc-1.7.tar.gz) = 63125
diff --git a/net/netspoc/pkg-descr b/net/netspoc/pkg-descr
deleted file mode 100644
index f4e6e10826ca..000000000000
--- a/net/netspoc/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-NetSPoC is a tool for security managment of large computer networks with
-different security domains. It generates configuration files for packet
-filters controlling the borders of security domains.
-
-NetSPoC provides its own language for describing security policy and topology
-of a network. The security policy is a set of rules that state which packets
-are allowed to pass the network and which not. NetSPoC is topology aware: a
-rule for traffic from A to B is automatically applied to all managed packet
-filters on the path from A to B.
-
-Currently NetSPoC generates ACLs and static routing entries for Cisco routers
-and PIX firewalls. Support for network address translation and IPSec has not
-been implemented yet.
-
-WWW: http://netspoc.berlios.de/
diff --git a/net/netspoc/pkg-plist b/net/netspoc/pkg-plist
deleted file mode 100644
index f5ea541bd2b3..000000000000
--- a/net/netspoc/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD$
-bin/netspoc
-bin/Netspoc.pm
-%%PORTDOCS%%%%DOCSDIR%%/CSPM.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/language.html
-%%PORTDOCS%%%%DOCSDIR%%/netspoc.html
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/nitpicker/distinfo b/net/nitpicker/distinfo
deleted file mode 100644
index eea8c58475d8..000000000000
--- a/net/nitpicker/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nitpicker-1.2.1.tar.gz) = 6f98aca85dcaea8ab3d15f2fcf652521
diff --git a/net/nitpicker/files/patch-aa b/net/nitpicker/files/patch-aa
deleted file mode 100644
index bcec6e517d14..000000000000
--- a/net/nitpicker/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.orig Sat Jul 5 02:56:12 2003
-+++ src/Makefile Tue Sep 23 09:48:56 2003
-@@ -1,8 +1,8 @@
- TARGET = nitpicker
-
--CC = gcc
-+CC = cc
- INCLUDES = -I../include -I/usr/pkg/include -I..
- LIBS = -lpcap
--CFLAGS = -pg -Wall -g $(INCLUDES) -pthread
-+CFLAGS += $(INCLUDES) -pthread
- PREFIX = /usr/local/
- INCDIR= ${.CURDIR}/../include
-@@ -31,5 +31,5 @@
- install:
- @echo "Your Binaries will be installed into $(PREFIX)/sbin"
-- mkdirhier $(PREFIX)/sbin
-+ mkdir -p $(PREFIX)/sbin
- cp nitpicker $(PREFIX)/sbin
-
diff --git a/net/nitpicker/files/patch-ab b/net/nitpicker/files/patch-ab
deleted file mode 100644
index f91dd794e110..000000000000
--- a/net/nitpicker/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/parse_flowfile/src/Makefile.orig Sat Aug 23 10:41:23 2003
-+++ tools/parse_flowfile/src/Makefile Sat Aug 23 10:42:27 2003
-@@ -3,6 +3,6 @@
- LIBS =
- INCLUDES = -I../include -I../../../include
--CFLAGS = -Wall -g $(INCLUDES)
--CC = g++
-+CFLAGS += $(INCLUDES)
-+CC = c++
- INCDIR= ${.CURDIR}/../include
- .PATH: ${INCDIR}
diff --git a/net/nitpicker/files/patch-ac b/net/nitpicker/files/patch-ac
deleted file mode 100644
index 13530fd9a5d8..000000000000
--- a/net/nitpicker/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/parse_flowfile/src/Makefile.old Fri May 23 00:01:06 2003
-+++ tools/parse_flowfile/src/Makefile Fri May 23 00:01:20 2003
-@@ -16,4 +16,7 @@
- all: $(TARGET) $(OBJS)
-
-+install: $(TARGET) $(OBJS)
-+ cp $(TARGET) $(PREFIX)/bin
-+
- clean:
- rm -f *.o
diff --git a/net/nitpicker/files/patch-ad b/net/nitpicker/files/patch-ad
deleted file mode 100644
index ffb6df2cebc5..000000000000
--- a/net/nitpicker/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/dumpit/Makefile.orig Fri May 23 10:54:06 2003
-+++ tools/dumpit/Makefile Tue Sep 23 09:49:32 2003
-@@ -1,8 +1,7 @@
- TARGET = dumpit
-
--CC = gcc
-+CC = cc
- INCLUDES = -I../../include -I/usr/pkg/include
--CFLAGS = -Wall -g $(INCLUDES)
--PREFIX = /usr/local
-+CFLAGS += $(INCLUDES)
-
- #CFLAGS += -DDEBUG # Debugging
-@@ -20,5 +19,5 @@
-
- install:
-- mkdirhier $(PREFIX)/bin && cp dumpit $(PREFIX)/bin
-+ mkdir -p $(PREFIX)/bin && cp dumpit $(PREFIX)/bin
-
- $(OBJS): $(HDRS)
diff --git a/net/nitpicker/files/patch-ae b/net/nitpicker/files/patch-ae
deleted file mode 100644
index 56f591257d21..000000000000
--- a/net/nitpicker/files/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig Fri May 23 10:48:47 2003
-+++ Makefile Tue Sep 23 10:02:57 2003
-@@ -18,6 +18,2 @@
-
- install:
-- @cd tools/dumpit; make install;
--# @cd tools/parse_flowfile; make install;
-- @cd src; make install;
--
diff --git a/net/nitpicker/pkg-descr b/net/nitpicker/pkg-descr
deleted file mode 100644
index da29bf541413..000000000000
--- a/net/nitpicker/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Nitpicker is a free IP Flow Accounter.
-It started because the commercial accounting software was just not fast,
-precise and reliable enough to fit a today's ISP / MSP requirements.
-
-Here are some of the large benefits of nitpicker:
- - It is 100% free
- - It is Public Domain.
- - It is designed for speed
- - It is designed to run reliable under djb's daemontools
- - It consumes minimal processor power
- - It also runs with little memory
-
-WWW: http://www.nitpicker.de/
diff --git a/net/nitpicker/pkg-plist b/net/nitpicker/pkg-plist
deleted file mode 100644
index edfd9d74153a..000000000000
--- a/net/nitpicker/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/dumpit
-bin/parse_flowfile
-sbin/nitpicker
diff --git a/net/nocol/distinfo b/net/nocol/distinfo
deleted file mode 100644
index 2e8f2c19056c..000000000000
--- a/net/nocol/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nocol-4.3.tar.gz) = 461576cf497f6a35fb87da152151269e
diff --git a/net/nocol/files/patch-aa b/net/nocol/files/patch-aa
deleted file mode 100644
index 606fdc3ee39f..000000000000
--- a/net/nocol/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-*** Configure Fri Oct 2 21:50:16 1998
---- Configure Sat Nov 21 18:57:22 1998
-***************
-*** 92,107 ****
- a VAR directory (or alternately create soft links to these directories).
- !
-
-- echo "Enter top level directory [${ROOTDIR}]: " | tr -d '\012'
-- read input ; if [ "X$input" != "X" ]; then ROOTDIR=${input}; fi
--
-- MANDIR=${ROOTDIR}/man
-- echo "Enter location of man pages [${MANDIR}]: " | tr -d '\012'
-- read input ; if [ "X$input" != "X" ]; then MANDIR=${input} ; fi
--
-- echo "Enter extension for man pages [${MANEXT}]: " | tr -d '\012'
-- read input ; if [ "X$input" != "X" ]; then MANEXT=${input} ; fi
--
- echo " SELECT A LOGHOST"
- echo " The various monitors will log messages to a loghost. It might"
- echo " be useful to create a CNAME entry for ${package}.your.domain..."
---- 92,97 ----
diff --git a/net/nocol/files/patch-ab b/net/nocol/files/patch-ab
deleted file mode 100644
index c9c7dcc41ff0..000000000000
--- a/net/nocol/files/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
---- doc/Makefile.mid.orig Fri Aug 28 12:28:12 1998
-+++ doc/Makefile.mid Mon Nov 23 09:26:25 1998
-@@ -6,26 +6,26 @@
- MANPAGES1 = netconsole.1
- MANPAGES3 = perlnocol.3 nocol-prog.3
- MANPAGES8 = etherload.8 eventselect.8 genmon.8 multiping.8 \
-- noclogd.8 nocol-overview.8 nocol-utility.8 nsmon.8 \
-+ noclogd.8 nocol-overview.8 nocol-utility.8 nsmon.8 ntpmon.8 \
- pingmon.8 portmon.8 tpmon.8 trapmon.8
-
- all:
- @echo "Building all in 'doc'"
-
--install: installdir
-+install: # installdir
- @echo "Installing in 'doc'"
- @- [ -d $(MANDIR) ] || mkdir $(MANDIR)
--# @-for d in $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man8; do \
--# [! -d $$d ] && mkdir $$d ;\
--# done
-+ @-for d in $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man8; do \
-+ [ -d $$d ] || mkdir $$d ;\
-+ done
- @- for m in $(MANPAGES1); do \
-- $(INSTALL) -c -m 644 $$m $(MANDIR)/`basename $$m 1`$(MANEXT) ;\
-+ $(INSTALL) -c -m 644 $$m $(MANDIR)/man1/ ;\
- done
- @- for m in $(MANPAGES3); do \
-- $(INSTALL) -c -m 644 $$m $(MANDIR)/`basename $$m 3`$(MANEXT) ;\
-+ $(INSTALL) -c -m 644 $$m $(MANDIR)/man3/ ;\
- done
- @- for m in $(MANPAGES8); do \
-- $(INSTALL) -c -m 644 $$m $(MANDIR)/`basename $$m 8`$(MANEXT) ;\
-+ $(INSTALL) -c -m 644 $$m $(MANDIR)/man8/ ;\
- done
-
- clean:
diff --git a/net/nocol/pkg-descr b/net/nocol/pkg-descr
deleted file mode 100644
index 2190505d828a..000000000000
--- a/net/nocol/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-NOCOL/NetConsole (Network Operation Center On-Line) is a network monitoring
-package that runs on Unix platforms and is capable of monitoring network and
-system variables such as ICMP or RPC reachability, RMON variables,
-nameservers, ethernet load, port reachability, host performance, SNMP traps,
-modem line usage, appletalk & novell routes/services, BGP peers, syslog
-files, etc. The software is extensible and new monitors can be added easily.
-
-WWW: http://www.netplex-tech.com/software/nocol/
-
---
-Brad Hendrickse
-bradh@uunet.co.za
diff --git a/net/nocol/pkg-plist b/net/nocol/pkg-plist
deleted file mode 100644
index b4219baae56d..000000000000
--- a/net/nocol/pkg-plist
+++ /dev/null
@@ -1,107 +0,0 @@
-@exec mkdir -p %D/nocol/data %D/nocol/msgs %D/nocol/run
-nocol/bin/apcmon
-nocol/bin/armon
-nocol/bin/bgpmon
-nocol/bin/bpmon
-nocol/bin/ciscomon
-nocol/bin/crontab.nocol
-nocol/bin/display_nocol_datafile
-nocol/bin/docrypt.pl
-nocol/bin/etherload
-nocol/bin/eventselect
-nocol/bin/genmon
-nocol/bin/genweb.pl
-nocol/bin/hostmon
-nocol/bin/hostmon-osclients/hostmon-client
-nocol/bin/hostmon-osclients/hostmon-client.aix
-nocol/bin/hostmon-osclients/hostmon-client.bsdi
-nocol/bin/hostmon-osclients/hostmon-client.freebsd
-nocol/bin/hostmon-osclients/hostmon-client.hpux
-nocol/bin/hostmon-osclients/hostmon-client.irix5
-nocol/bin/hostmon-osclients/hostmon-client.irix6
-nocol/bin/hostmon-osclients/hostmon-client.linux
-nocol/bin/hostmon-osclients/hostmon-client.osf1
-nocol/bin/hostmon-osclients/hostmon-client.seds
-nocol/bin/hostmon-osclients/hostmon-client.solaris2
-nocol/bin/hostmon-osclients/hostmon-client.sunos4
-nocol/bin/hostmon-osclients/hostmon-client.ultrix
-nocol/bin/hostmon-osclients/newsys.sh
-nocol/bin/ippingmon
-nocol/bin/keepalive_monitors
-nocol/bin/log-maint
-nocol/bin/logstats
-nocol/bin/modemmon
-nocol/bin/multiping
-nocol/bin/ndaemon
-nocol/bin/netconsole
-nocol/bin/noclogd
-nocol/bin/nocollib.pl
-nocol/bin/notifier
-nocol/bin/notifier.pl
-nocol/bin/novellmon
-nocol/bin/nrmon
-nocol/bin/nsmon
-nocol/bin/ntpmon
-nocol/bin/osipingmon
-nocol/bin/portmon
-nocol/bin/radiusmon
-nocol/bin/rcisco
-nocol/bin/rpcping
-nocol/bin/rpcpingmon
-nocol/bin/show_nocol_struct_sizes
-nocol/bin/smbmon
-nocol/bin/snmpgeneric
-nocol/bin/snmpget
-nocol/bin/snmpmon
-nocol/bin/snmpmon-client
-nocol/bin/snmpwalk
-nocol/bin/sqlmon
-nocol/bin/syslogmon
-nocol/bin/testlog
-nocol/bin/tkNocol
-nocol/bin/tpmon
-nocol/bin/trapmon
-nocol/bin/upsmon
-nocol/bin/webnocol.cgi
-nocol/etc/mib-v2.txt
-nocol/etc/netconsole-help
-nocol/etc/samples/apcmon-confg
-nocol/etc/samples/armon-confg
-nocol/etc/samples/bgpmon-confg
-nocol/etc/samples/bpmon-confg
-nocol/etc/samples/ciscomon-confg
-nocol/etc/samples/etherload-confg
-nocol/etc/samples/hostmon-confg
-nocol/etc/samples/ippingmon-confg
-nocol/etc/samples/modemmon-confg
-nocol/etc/samples/noclogd-confg
-nocol/etc/samples/notifier-confg
-nocol/etc/samples/novellmon-confg
-nocol/etc/samples/nsmon-confg
-nocol/etc/samples/ntpmon-confg
-nocol/etc/samples/pm3dmmon-confg
-nocol/etc/samples/pm3t1e1mon-confg
-nocol/etc/samples/portmon-confg
-nocol/etc/samples/radiusmon-confg
-nocol/etc/samples/rpcpingmon-confg
-nocol/etc/samples/smbmon-confg
-nocol/etc/samples/snmpgeneric-confg
-nocol/etc/samples/snmpmon-client-confg
-nocol/etc/samples/snmpmon-confg
-nocol/etc/samples/sqlmon-confg
-nocol/etc/samples/syslogmon-confg
-nocol/etc/samples/tpmon-confg
-nocol/help/default
-@dirrm nocol/run
-@dirrm nocol/msgs
-@dirrm nocol/man/man8
-@dirrm nocol/man/man3
-@dirrm nocol/man/man1
-@dirrm nocol/man
-@dirrm nocol/help
-@dirrm nocol/etc/samples
-@dirrm nocol/etc
-@dirrm nocol/data
-@dirrm nocol/bin/hostmon-osclients
-@dirrm nocol/bin
-@dirrm nocol
diff --git a/net/nrpe/distinfo b/net/nrpe/distinfo
deleted file mode 100644
index 395cd1305a87..000000000000
--- a/net/nrpe/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nrpe-1.9.tar.gz) = b4a5e00963f1aaa754ae877b9f921565
diff --git a/net/nrpe/pkg-descr b/net/nrpe/pkg-descr
deleted file mode 100644
index ad2d2a4cee3f..000000000000
--- a/net/nrpe/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-nrpe is used to execute Nagios plugins on remote hosts and report the results
-to the main Nagios server. From the Nagios homepage:
-
-Allows you to execute "local" plugins (like check_disk, check_procs, etc.) on
-remote hosts. The check_nrpe plugin is called from Nagios and actually makes
-the plugin requests to the remote host. Requires that nrpe be running on the
-remote host (either as a standalone daemon or as a service under inetd).
-
-WWW: http://www.nagios.org/
diff --git a/net/nrpe/pkg-install b/net/nrpe/pkg-install
deleted file mode 100644
index d60fb69937f1..000000000000
--- a/net/nrpe/pkg-install
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/nrpe/Attic/pkg-install,v 1.1 2003-01-09 22:13:58 edwin Exp $
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-user=nagios
-group=nagios
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local dflt question answer
-
- question=$1
- dflt=$2
- while :; do
- answer=$(ask "${question}" "${dflt}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
- if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
- echo "You already have a group \"${group}\", so I will use it."
- else
- echo "You need a group \"${group}\"."
- if yesno "Would you like me to create it" y; then
- /usr/sbin/pw groupadd ${group} -h - || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${user}" 2>/dev/null; then
- echo "You already have a user \"${user}\", so I will use it."
- else
- echo "You need a user \"${user}\"."
- if yesno "Would you like me to create it" y; then
- /usr/sbin/pw useradd ${user} -g ${group} -h - -d ${PKG_PREFIX}/var/nagios \
- -s /nonexistent -c "Nagios pseudo-user" || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
-fi
diff --git a/net/nrpe/pkg-plist b/net/nrpe/pkg-plist
deleted file mode 100644
index fb4d15e163fc..000000000000
--- a/net/nrpe/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin/nrpe
-etc/nrpe.cfg-sample
-etc/rc.d/nrpe.sh
-libexec/nagios/check_nrpe
diff --git a/net/nrpep/distinfo b/net/nrpep/distinfo
deleted file mode 100644
index de897e4f62b5..000000000000
--- a/net/nrpep/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nrpep-0.2.tar.gz) = 6c84144892b0d552b65dd007ff8fc787
diff --git a/net/nrpep/files/patch-aa b/net/nrpep/files/patch-aa
deleted file mode 100644
index a72ea0d7143b..000000000000
--- a/net/nrpep/files/patch-aa
+++ /dev/null
@@ -1,113 +0,0 @@
---- nrpep.bak Sat Jan 8 01:00:45 2000
-+++ nrpep Wed Apr 10 16:50:09 2002
-@@ -13,24 +13,39 @@
-
- # Perl libs and such the program needs
- use strict;
--use vars qw($opt_c $version %commands $key $cipher);
-+use vars qw($opt_d $opt_c $version %commands $key $cipher);
- use Getopt::Std;
- use Crypt::TripleDES;
-
- # Global Variables
--$version = "0.2";
-+$version = "0.2-fbsd";
-
- # Get the command line arguments
--getopts('c:');
-+getopts('d:c:');
-+
-+# Open a log
-+if ($opt_d) {
-+ open(LOG,">>$opt_d") or die "Cannot open $opt_d for logging";
-+ print LOG "\n\nNRPEP\n";
-+}
-+
- # Check for the proper command line arguments, if we fail, print out an
- # error message and die.
- &Check_Command($opt_c);
-+
- # Grab the configuration file, and parse it for all the variables we
- # will need.
--&Get_Configs($opt_c);
-+%commands = Get_Configs($opt_c);
-+if ($opt_d) {print LOG Dumper(%commands);}
-+
- # Now that I have a set of commands, go into recieve mode
- &Recieve;
-
-+$opt_d && close(LOG);
-+exit 0;
-+
-+######################################################################################
-+
- sub Recieve {
- my $line;
- my $commandentered;
-@@ -49,8 +64,10 @@
- $_ =~ s/(\r|\n)//g;
- # Start a new cipher with the proper key;
- $cipher = new Crypt::TripleDES;
--# Decrypt the command
-+# Decrypt the command
-+ $opt_d && print LOG "Decrypting $_\n";
- $commandentered = $cipher->decrypt3(pack("H*", $_), $key);
-+ $opt_d && print LOG " ... got $commandentered\n";
- $commandentered =~ s/\s+$//;
- # If the command entered looks like one in the config file, execute it and
- # print it's return code
-@@ -72,6 +89,8 @@
- }
- }
-
-+#################################################################################
-+
- sub Check_Command {
- # If I don't have a config file given, barf the mini-howto
- unless ($opt_c) {
-@@ -89,30 +108,31 @@
- }
- }
-
-+###################################################################################
-+
- sub Get_Configs {
- my $opt_c = $_[0];
-- my $line;
-- my $command;
-- my $plugin;
-- my $garbage;
-+
-+ my %commands;
-
- # Open the config file...
- open(FILE, "$opt_c") || die "Cannot open file at $opt_c";
-- foreach $line (<FILE>) {
-+ foreach my $line (<FILE>) {
- chomp($line);
--# Ignore comments
-- unless ($line =~ /^#/) {
-+# Ignore comments and blank lines
-+ unless ($line =~ /^#/ or $line =~ /^\s*$/) {
- # If it's a command line, grab the command name and toss it in a name value
- # hash. The value is the command to execute.
-- if ($line =~ /command\[.*\]=/) {
-- ($garbage, $plugin) = split(/\=/, $line);
-- ($garbage, $garbage, $command) = split(/(\[|\])/, $line);
-+ if (my ($command,$plugin) = $line =~ /^\s*command\[(.+)\]=(.*)$/) {
- $commands{$command} = $plugin;
-+ $opt_d && print LOG "Got command '$command' = $plugin\n";
- # If it's the secret, we want it!
-- } elsif ($line =~ /secret=/) {
-- ($garbage, $key) = split(/\=/, $line, 2);
-+ } elsif ($line =~ /secret=(.+)/) {
-+ $key = $1;
- }
- }
- }
- close(FILE);
-+
-+ return %commands;
- }
-
-
diff --git a/net/nrpep/files/patch-ab b/net/nrpep/files/patch-ab
deleted file mode 100644
index d8a0da71decf..000000000000
--- a/net/nrpep/files/patch-ab
+++ /dev/null
@@ -1,99 +0,0 @@
---- Makefile.orig Wed Jan 5 23:04:22 2000
-+++ Makefile Wed Apr 10 18:24:16 2002
-@@ -3,50 +3,57 @@
- #
-
- #
--# Configuration Files
-+# Configuration Files
- #
-
- #
- # What directory the server program (nrpep) should live in
- #
--nrpepserverdir = "/usr/sbin"
-+nrpepserverdir = $(PREFIX)/sbin
-
- #
- # What directory the plugin client should live in
- #
--nrpepplugindir = "/usr/local/netsaint/libexec"
-+nrpepplugindir = $(PREFIX)/libexec/netsaint
-
- #
- # What user should own nrpep
- #
--nrpepowner = "root"
-+nrpepowner = root
-
- #
- # What group should own nrpep
- #
--nrpepgroup = "root"
-+nrpepgroup = wheel
-
- #
- # What user should own check_nrpep
- #
--checknrpepowner = "netsaint"
-+checknrpepowner = root
-
- #
- # What group should own check_nrpep
- #
--checknrpepgroup = "netsaint"
-+checknrpepgroup = wheel
-
- #
- # What directory should the nrpep config files go to
- #
--nrpepconfigdir = "/usr/local/netsaint/etc"
-+nrpepconfigdir = $(PREFIX)/etc/netsaint
-
- # ***************************************
- # DO NOT CHANGE ANYTHING BELOW THIS POINT
- # ***************************************
-
- all:
-- cat README | more
-+ mv nrpep.cfg nrpep.cfg.orig
-+ cat nrpep.cfg.orig | sed -e 's%/usr/local/netsaint/libexec%$(PREFIX)/libexec/netsaint%' > nrpep.cfg
-+
-+install: install-client install-server
-+ if [ ! -d "$(PREFIX)/share/doc/nrpep" ]; then \
-+ mkdir -p $(PREFIX)/share/doc/nrpep; \
-+ fi
-+ cp README $(PREFIX)/share/doc/nrpep
-
- install-client:
- `if [ ! -d "$(nrpepplugindir)" ]; then \
-@@ -55,8 +62,8 @@
- `if [ ! -d "$(nrpepconfigdir)" ]; then \
- mkdir -p $(nrpepconfigdir); \
- fi`
-- install -b -D -g $(checknrpepgroup) -o $(checknrpepowner) -m 755 check_nrpep $(nrpepplugindir);
-- install -b -D -g $(checknrpepgroup) -o $(checknrpepowner) -m 644 check_nrpep.cfg $(nrpepconfigdir);
-+ install -g $(checknrpepgroup) -o $(checknrpepowner) -m 755 check_nrpep $(nrpepplugindir);
-+ install -g $(checknrpepgroup) -o $(checknrpepowner) -m 644 check_nrpep.cfg $(nrpepconfigdir);
-
- install-server:
- `if [ ! -d "$(nrpepserverdir)" ]; then \
-@@ -65,8 +72,8 @@
- `if [ ! -d "$(nrpepconfigdir)" ]; then \
- mkdir -p $(nrpepconfigdir); \
- fi`
-- install -b -D -g $(nrpepgroup) -o $(nrpepowner) -m 755 nrpep $(nrpepserverdir);
-- install -b -D -g $(nrpepgroup) -o $(nrpepowner) -m 644 nrpep.cfg $(nrpepconfigdir);
-+ install -g $(nrpepgroup) -o $(nrpepowner) -m 755 nrpep $(nrpepserverdir);
-+ install -g $(nrpepgroup) -o $(nrpepowner) -m 644 nrpep.cfg $(nrpepconfigdir);
-
- uninstall-client:
- rm $(nrpepplugindir)/check_nrpep
-@@ -75,3 +82,7 @@
- uninstall-server:
- rm $(nrpepserverdir)/nrpep
- rm $(nrpepconfigdir)/nrpep.cfg
-+
-+
-+
-+
diff --git a/net/nrpep/files/patch-ac b/net/nrpep/files/patch-ac
deleted file mode 100644
index e89895349f03..000000000000
--- a/net/nrpep/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- check_nrpep.old Tue Apr 2 16:52:01 2002
-+++ check_nrpep Wed Apr 10 17:31:09 2002
-@@ -59,7 +59,7 @@
- if ($opts{'f'}) {
- &Get_Configs($opts{'f'});
- } else {
-- &Get_Configs("/usr/local/netsaint/etc/check_nrpep.cfg");
-+ &Get_Configs("/usr/local/etc/netsaint/check_nrpep.cfg");
- }
- # Longer timeout? If it's given on the command line use it, otherwise
- # read from the config file
diff --git a/net/nrpep/pkg-descr b/net/nrpep/pkg-descr
deleted file mode 100644
index b51726e1334b..000000000000
--- a/net/nrpep/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This addon was designed as a replacemnt for the netsaint_statd and
-nrpe addons. Although this addon is similiar in function to nrpe, it
-is written in Perl and implements TripleDES encryption for the data in
-transit. It is also designed to run under inetd and make use of the
-TCP Wrappers package for access control.
-
-WWW: www.netsaint.org
-
-- Jon
-jon@netcraft.com
diff --git a/net/nrpep/pkg-message b/net/nrpep/pkg-message
deleted file mode 100644
index a67a4c7aceba..000000000000
--- a/net/nrpep/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################
-
-If you are going to be running the nrpep daemon on this machine,
-you will probably want something like the following in /etc/services:
-
- nrpep 8086/tcp # Netsaint nrpep server
-
-and the following in /etc/inetd.conf:
-
- nrpep stream tcp nowait nobody /usr/local/sbin/nrpep nrpep -c /usr/local/etc/netsaint/nrpep.cfg
-
-The config files are world readable. If this is a problem for you,
-then sort out the file ownership and permissions yourself.
-
-Additional documentation in $PREFIX/share/doc/nrpep
-
-###############################################################
diff --git a/net/nrpep/pkg-plist b/net/nrpep/pkg-plist
deleted file mode 100644
index f480a40ce910..000000000000
--- a/net/nrpep/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-sbin/nrpep
-etc/netsaint/nrpep.cfg
-libexec/netsaint/check_nrpep
-etc/netsaint/check_nrpep.cfg
-share/doc/nrpep/README
-@dirrm share/doc/nrpep
-@unexec rmdir %D/libexec/netsaint 2>/dev/null || true
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
diff --git a/net/nsc/distinfo b/net/nsc/distinfo
deleted file mode 100644
index c3cd37701503..000000000000
--- a/net/nsc/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nsc-0.52.tar.gz) = a80c8d019e2ce658c664630fb8fd7afe
diff --git a/net/nsc/files/patch-aa b/net/nsc/files/patch-aa
deleted file mode 100644
index 435a97d1bf54..000000000000
--- a/net/nsc/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- nsc.pl.orig Mon Mar 6 19:07:46 2000
-+++ nsc.pl Tue Apr 3 14:41:23 2001
-@@ -1,4 +1,4 @@
--#!/bin/perl -w
-+#!%%PERL%% -w
- # vim:aw:
-
- # nsc.pl - curses-based console monitor for Netsaint
-@@ -41,9 +41,9 @@
- my $fnConfig = "$ENV{'HOME'}/.nsc.conf";
-
- my %NSC_KEYWORDS = (
-- 'nslog', '/usr/local/netsaint/var/status.log',
-- 'hostcfg', '/usr/local/netsaint/etc/hosts.cfg',
-- 'reloadcmd','/etc/rc.d/init.d/netsaint reload',
-+ 'nslog', '%%PREFIX%%/var/netsaint/status.log',
-+ 'hostcfg', '%%PREFIX%%/etc/netsaint/hosts.cfg',
-+ 'reloadcmd','%%PREFIX%%/etc/rc.d/netsaint.sh reload',
- 'showall', '1',
- 'details', '1',
- 'reverse', '0',
diff --git a/net/nsc/pkg-descr b/net/nsc/pkg-descr
deleted file mode 100644
index 0a95e75af4cd..000000000000
--- a/net/nsc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-nsc is a curses-based console monitor for Netsaint. It allows you
-to monitor Netsaint services without the expense or availability
-of a GUI.
-
-WWW: http://goth.dk/~goth/nsc/
diff --git a/net/nsca/distinfo b/net/nsca/distinfo
deleted file mode 100644
index cbc77145878f..000000000000
--- a/net/nsca/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nsca-2.4.tar.gz) = ab58553a87940f574ec54189a43a70bc
diff --git a/net/nsca/pkg-descr b/net/nsca/pkg-descr
deleted file mode 100644
index bb5b01afa3a4..000000000000
--- a/net/nsca/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Nagios Service Check Acceptor (NSCA) is used to send service check
-results to a central Nagios server. This consists of the "nsca" daemon
-which runs on the main Nagios server and accepts results and the
-"check_nsca" plugin which is used to send results to the server.
-
-Author: Ethan Galstad
-WWW: http://www.nagios.org/
diff --git a/net/nsca/pkg-plist b/net/nsca/pkg-plist
deleted file mode 100644
index a74df080477d..000000000000
--- a/net/nsca/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $FreeBSD$
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/LEGAL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/SECURITY
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@comment This port installs into LOCALBASE as opposed to PREFIX
-@cwd %%LOCALBASE%%
-etc/nagios/nsca.cfg.sample
-etc/nagios/send_nsca.cfg.sample
-libexec/nagios/nsca
-libexec/nagios/send_nsca
diff --git a/net/nstreams/distinfo b/net/nstreams/distinfo
deleted file mode 100644
index eca7704ed5c0..000000000000
--- a/net/nstreams/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nstreams-1.0.4.tar.gz) = 6241cdc7c4680991d7814b34b492af2a
diff --git a/net/nstreams/pkg-descr b/net/nstreams/pkg-descr
deleted file mode 100644
index a9f4013d442e..000000000000
--- a/net/nstreams/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Nstreams is a program which analyzes the streams that occur on a network. It
-displays which streams are generated by the users between several networks,
-and between the networks and the outside. It can optionally generate the
-ipchains or ipfw rules that will match these streams, thus only allowing what
-is required for the users, and nothing more.
-
-Nstreams can parse the tcpdump output, or the files generated with the -w
-option of tcpdump. It can also directly sniff the data that occurs on the
-network.
-
-This product was designed by HSC and coded by Renaud Deraison
-(deraison@cvs.nessus.org), author of the Nessus software (www.nessus.org). It
-is available for free and under GNU license.
-
-WWW: http://www.hsc.fr/ressources/outils/nstreams/
diff --git a/net/nstreams/pkg-plist b/net/nstreams/pkg-plist
deleted file mode 100644
index dd2665230d39..000000000000
--- a/net/nstreams/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/nstreams
-etc/nstreams-networks.sample
-etc/nstreams-services
diff --git a/net/openvmps/distinfo b/net/openvmps/distinfo
deleted file mode 100644
index 3ca8fa234324..000000000000
--- a/net/openvmps/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (vmpsd-1.1.tar.gz) = ca76836a057fe534fe29721939e0a57a
-SIZE (vmpsd-1.1.tar.gz) = 47528
diff --git a/net/openvmps/files/vmps.db b/net/openvmps/files/vmps.db
deleted file mode 100644
index 26f9261e4762..000000000000
--- a/net/openvmps/files/vmps.db
+++ /dev/null
@@ -1,49 +0,0 @@
-! $FreeBSD$
-!
-! Sample VLAN database file for OpenVMPS server
-!
-!vmps domain <domain-name>
-! The VMPS domain must be defined.
-!vmps mode { open | secure }
-! The default mode is open.
-!vmps fallback <vlan-name>
-!vmps no-domain-req { allow | deny }
-!
-! The default value is allow.
-vmps domain CHANGE_THIS
-vmps mode open
-vmps fallback --NONE--
-vmps no-domain-req deny
-!
-!
-!MAC Addresses
-!
-!vmps-mac-addrs
-!
-! address <addr> vlan-name <vlan_name>
-!
-! address 00a0.2460.c452 vlan-name ST
-! address 10a0.2460.c452 vlan-name ST
-! address 20a0.2460.c452 vlan-name ST
-! address 30a0.2460.c452 vlan-name ST
-! address 40a0.2460.c452 vlan-name ST
-! address 0090.278c.59d5 vlan-name ST
-!
-!Port Groups
-!
-!vmps-port-group <group-name>
-! device <device-id> { port <port-name> | all-ports }
-!
-!
-!
-!VLAN groups
-!
-!vmps-vlan-group <group-name>
-! vlan-name <vlan-name>
-!
-!
-!VLAN port Policies
-!
-!vmps-port-policies {vlan-name <vlan_name> | vlan-group <group-name> }
-! { port-group <group-name> | device <device-id> port <port-name> }
-!
diff --git a/net/openvmps/files/vmpsd.sh b/net/openvmps/files/vmpsd.sh
deleted file mode 100644
index 58fd33e646fe..000000000000
--- a/net/openvmps/files/vmpsd.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Start or stop vmpsd
-# $FreeBSD$
-
-# PROVIDE: vmpsd
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/vmpsd
-
-prefix=%%PREFIX%%
-
-# Define these vmpsd_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/vmpsd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$vmpsd_enable" ] && vmpsd_enable="NO" # Enable vmpsd
-#vmpsd_program="${prefix}/sbin/vmpsd" # Location of vmpsd
-[ -z "$vmpsd_flags" ] && vmpsd_flags="-f /usr/local/etc/vmps.db" # Flags to vmpsd program
-
-. %%RC_SUBR%%
-
-name="vmpsd"
-rcvar=`set_rcvar`
-command="${prefix}/sbin/${name}"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/openvmps/pkg-descr b/net/openvmps/pkg-descr
deleted file mode 100644
index f4b21bb58169..000000000000
--- a/net/openvmps/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-VMPS (VLAN Management Policy Server) is a way of assigning switch ports to
-specific VLANs based on the MAC address of connecting device. OpenVMPS is a
-GPL implementation of VMPS.
-
-WWW: http://vmps.sourceforge.net/
diff --git a/net/openvmps/pkg-plist b/net/openvmps/pkg-plist
deleted file mode 100644
index 340d2c50b317..000000000000
--- a/net/openvmps/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/rc.d/vmpsd.sh
-@unexec if cmp -s %D/etc/vmps.db %D/etc/vmps.db.sample; then rm -f %D/etc/vmps.db; fi
-etc/vmps.db.sample
-sbin/vmpsd
diff --git a/net/oproute/distinfo b/net/oproute/distinfo
deleted file mode 100644
index 72e3641107d6..000000000000
--- a/net/oproute/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (oproute-0.7.tgz) = 57b45cd6218371e601501ed4d647bff7
-SIZE (oproute-0.7.tgz) = 15258
diff --git a/net/oproute/files/patch-Makefile b/net/oproute/files/patch-Makefile
deleted file mode 100644
index ecdbbe432bda..000000000000
--- a/net/oproute/files/patch-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig Wed Feb 28 18:28:31 2001
-+++ Makefile Fri Jan 25 22:31:09 2002
-@@ -1,12 +1,11 @@
--
--CPPFLAGS = -O3
-+CXXFLAGS ?= -O
- VERSION = 0.7
- BIN = /usr/local/bin
-
- all: oproute
-
- oproute: oproute.cpp oproute.h main.cpp
-- g++ $(CPPFLAGS) -o oproute oproute.cpp main.cpp jivastring.cpp
-+ ${CXX} $(CXXFLAGS) -o oproute oproute.cpp main.cpp jivastring.cpp
-
- install: all
- install -d $(BIN)
diff --git a/net/oproute/files/patch-oproute.cpp b/net/oproute/files/patch-oproute.cpp
deleted file mode 100644
index 324e25cc901d..000000000000
--- a/net/oproute/files/patch-oproute.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- oproute.cpp.orig Sat Mar 3 23:16:17 2001
-+++ oproute.cpp Sat Mar 3 23:18:11 2001
-@@ -706,7 +706,7 @@
- udp = (struct udphdr *)(recvbuf + hlen1 + 8 +hlen2);
- if(hip->ip_p == IPPROTO_UDP)
- {
-- pHop->nPort = ntohs(udp->dest);
-+ pHop->nPort = ntohs(udp->uh_dport);
- pHop->sRouterIP = sock_ntop_host((sockaddr *)sa_recv, sa_len);
- pHop->state = HOP_COMPLETED;
- pHop->fLatency = GetLatencyFromTV(tvNow, tvTimeOfLastSend);
-@@ -721,14 +721,14 @@
- {
- if (icmp->icmp_code == ICMP_UNREACH_PORT)
- {
-- pHop->nPort = ntohs(udp->dest);
-+ pHop->nPort = ntohs(udp->uh_dport);
- pHop->sRouterIP = sock_ntop_host((sockaddr *)sa_recv, sa_len);
- pHop->state = HOP_ENDOFLINE;
- pHop->fLatency = GetLatencyFromTV(tvNow, tvTimeOfLastSend);
- }
- else
- {
-- pHop->nPort = ntohs(udp->dest);
-+ pHop->nPort = ntohs(udp->uh_dport);
- pHop->sRouterIP = sock_ntop_host((sockaddr *)sa_recv, sa_len);
- pHop->state = HOP_FAILED;
- }
diff --git a/net/oproute/files/patch-oproute.h b/net/oproute/files/patch-oproute.h
deleted file mode 100644
index 22407f88729b..000000000000
--- a/net/oproute/files/patch-oproute.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- oproute.h.orig Thu Mar 1 10:28:31 2001
-+++ oproute.h Sat Mar 3 23:12:12 2001
-@@ -3,6 +3,9 @@
-
- #include <vector>
- #include <string>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <sys/time.h>
- #include <map>
-
diff --git a/net/oproute/pkg-descr b/net/oproute/pkg-descr
deleted file mode 100644
index 3a45998f2ba9..000000000000
--- a/net/oproute/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Everyone knows that no one can agree on a system of metrics for
-measuring general performance of the Internet. It's one of these
-horrible religious issues that no matter how hard we try, we just
-can't reach a happy middle ground.
-
-The purpose of OpRoute is to attempt to establish a *generalized*
-measurement system which takes into account all of the factors that
-are usually considered to be important when it comes to performance.
-Specifically:
-
- - Packet Loss
- - Latency
- - Layer 3 Hops
- - AS Hops
- - NAP Hops
- - Throughput
-
-WWW: http://www.oproute.net/
diff --git a/net/p0f/distinfo b/net/p0f/distinfo
deleted file mode 100644
index f0d1ba7149c7..000000000000
--- a/net/p0f/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-$FreeBSD$
-MD5 (p0f-2.0.3.tgz) = 583688a4c5718eec0bb34102b3ac457b
-SIZE (p0f-2.0.3.tgz) = 119407
diff --git a/net/p0f/files/patch-FreeBSD b/net/p0f/files/patch-FreeBSD
deleted file mode 100644
index 0de9b2359258..000000000000
--- a/net/p0f/files/patch-FreeBSD
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- mk/FreeBSD.orig Sat Aug 30 15:41:17 2003
-+++ mk/FreeBSD Mon Sep 8 03:58:17 2003
-@@ -7,10 +7,9 @@
- # (C) Copyright 2000-2003 by Michal Zalewski <lcamtuf@coredump.cx>
- #
-
--CC = gcc
-+CC? = gcc
- LIBS = -lpcap -I/usr/include/pcap -I/usr/local/include/pcap
- STRIP = strip
--CFLAGS = -O3 -Wall -fomit-frame-pointer -funroll-loops
- FILE = p0f
-
- all: $(FILE) strip
diff --git a/net/p0f/files/patch-mtu.h b/net/p0f/files/patch-mtu.h
deleted file mode 100644
index 116c1ae95371..000000000000
--- a/net/p0f/files/patch-mtu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-Add loopback support for FreeBSD.
-author: Radim Kolar
-
---- mtu.h.orig Fri Oct 10 20:56:39 2003
-+++ mtu.h Tue Feb 17 21:10:49 2004
-@@ -58,6 +58,7 @@
- { 4352, "FDDI" },
- { 4500, "token ring (2)" },
- { 9180, "FORE ATM" },
-+ { 16384, "loopback" },
- { 16436, "sometimes loopback" },
- { 18000, "token ring x4" },
- };
diff --git a/net/p0f/files/patch-p0f.c b/net/p0f/files/patch-p0f.c
deleted file mode 100644
index 449f830730e7..000000000000
--- a/net/p0f/files/patch-p0f.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$FreeBSD$
-Add loopback support for FreeBSD.
-author: Radim Kolar
-
---- p0f.c.orig Tue Feb 17 21:11:51 2004
-+++ p0f.c Tue Feb 17 21:10:48 2004
-@@ -161,7 +161,8 @@
-
- switch(type) {
-
-- case DLT_NULL:
-+ case DLT_NULL: header_len=4; break;
-+
- case DLT_SLIP:
- case DLT_RAW: break;
-
-@@ -1199,11 +1200,15 @@
- /* Whoops, IP header ends past end_ptr */
- if ((_u8*)(iph + 1) > end_ptr) return;
-
-- if ( ((iph->ihl & 0x40) != 0x40) || iph->proto != IPPROTO_TCP) {
-- debug("[!] WARNING: Non-IP packet received. Bad header_len!\n");
-+ if ( iph->proto != IPPROTO_TCP) {
-+ debug("[!] WARNING: Non-IP packet received.\n");
- return;
- }
-
-+ if ( ((iph->ihl & 0x40) != 0x40) ) {
-+ debug("[!] WARNING: Bad header_len!\n");
-+ return;
-+ }
- /* If the declared length is shorter than the snapshot (etherleak
- or such), truncate this bad boy. */
-
-@@ -1590,7 +1595,7 @@
- if (!use_iface) use_iface=pcap_lookupdev(errbuf);
- #endif /* ^WIN32 */
-
-- if (!use_iface) use_iface = "lo";
-+ if (!use_iface) use_iface = "lo0";
-
- /* We do not rely on pcap timeouts - they suck really bad. Of
- course, the documentation sucks, and if you use the timeout
diff --git a/net/p0f/files/patch-test_p0fq.c b/net/p0f/files/patch-test_p0fq.c
deleted file mode 100644
index eb1d0372afb1..000000000000
--- a/net/p0f/files/patch-test_p0fq.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- test/p0fq.c.orig Fri Oct 10 14:51:08 2003
-+++ test/p0fq.c Wed Dec 17 20:10:31 2003
-@@ -14,6 +14,7 @@
-
- */
-
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/net/p0f/pkg-descr b/net/p0f/pkg-descr
deleted file mode 100644
index def189dd1264..000000000000
--- a/net/p0f/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-from the README:
-
-Passive OS fingerprinting is based on information coming from a remote host
-when it establishes a connection to our system. Captured packets contain
-enough information to identify the operating system. In contrast to active
-scanners such as nmap and QueSO, p0f does not send anything to the host being
-identified.
-
-For more information, read Spitzner's text at:
-http://www.enteract.com/~lspitz/finger.html .
-
-from the maintainer:
-
-Use of this program requires read access to the packet filtering
-device, typically /dev/bpf0. Granting such access allows the users
-who have it to put your Ethernet device into promiscuous mode and
-sniff your network. See
-http://www.infoworld.com/articles/op/xml/00/05/29/000529opswatch.xml
-if you do not understand how this can be harmful. Running p0f with
-no options will cause it to analyse packets intended for other
-hosts.
-
-WWW: http://www.stearns.org/p0f/
diff --git a/net/p5-Altoids/distinfo b/net/p5-Altoids/distinfo
deleted file mode 100644
index 0b5ee513618a..000000000000
--- a/net/p5-Altoids/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Altoids1.017.tar.gz) = ce37ad6c1af08e59a3eefc459e4dc944
diff --git a/net/p5-Altoids/pkg-descr b/net/p5-Altoids/pkg-descr
deleted file mode 100644
index c50a7576e2b8..000000000000
--- a/net/p5-Altoids/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-perl module that provides SNMP get/walk functionality with built-in name
-to OID translation alternatively by using .oid files. It is implemented
-as a derived class based upon p5-SNMP_Session.
-
-WWW: http://dave.plonka.us/Altoids/
-
-- Bill Fumerola
-billf@FreeBSD.org
diff --git a/net/p5-Altoids/pkg-plist b/net/p5-Altoids/pkg-plist
deleted file mode 100644
index 940269ace681..000000000000
--- a/net/p5-Altoids/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/altget
-bin/altwalk
-%%SITE_PERL%%/Altoids.pm
-%%SITE_PERL%%/altoids.pl
-share/altoids/CISCO-ATM-IF-MIB.oid
-share/altoids/CISCO-LECS-MIB.oid
-share/altoids/CISCO-LES-MIB.oid
-share/altoids/IF-MIB.oid
-share/altoids/LAN-EMULATION-CLIENT-MIB.oid
-share/altoids/NOVELL-IPX-MIB.oid
-share/altoids/NOVELL-NLSP-MIB.oid
-share/altoids/NOVELL-RIPSAP-MIB.oid
-share/altoids/OLD-CISCO-INTERFACES-MIB.oid
-share/altoids/OLD-CISCO-NOVELL-MIB.oid
-share/altoids/RFC1213-MIB.oid
-share/altoids/RFC1229-MIB.oid
-share/altoids/RFC1231-MIB.oid
-share/altoids/RFC1243-MIB.oid
-share/altoids/RFC1253-MIB.oid
-share/altoids/RFC1271-MIB.oid
-share/altoids/RFC1285-MIB.oid
-share/altoids/RFC1315-MIB.oid
-share/altoids/RFC1381-MIB.oid
-share/altoids/RFC1382-MIB.oid
-share/altoids/RFC1398-MIB.oid
-share/altoids/RFC1406-MIB.oid
-@dirrm share/altoids
-%%PORTDOCS%%share/doc/Altoids/README
-%%PORTDOCS%%@dirrm share/doc/Altoids
diff --git a/net/p5-Cflow/distinfo b/net/p5-Cflow/distinfo
deleted file mode 100644
index 08c50f950f6a..000000000000
--- a/net/p5-Cflow/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (Cflow-1.051.tar.gz) = 1c4d7034ccc361bf3fe1a8ac58de638b
-SIZE (Cflow-1.051.tar.gz) = 41123
diff --git a/net/p5-Cflow/pkg-descr b/net/p5-Cflow/pkg-descr
deleted file mode 100644
index d66cf016a2b4..000000000000
--- a/net/p5-Cflow/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Cflow is a perl module for analyzing raw flow files written by
-cflowd, a package used to collect Cisco NetFlow data.
-
-WWW: http://net.doit.wisc.edu/~plonka/Cflow/
diff --git a/net/p5-Cflow/pkg-plist b/net/p5-Cflow/pkg-plist
deleted file mode 100644
index 57c85d3587fc..000000000000
--- a/net/p5-Cflow/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/flowdumper
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/Cflow.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/Cflow.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cflow
diff --git a/net/p5-JUNOScript/distinfo b/net/p5-JUNOScript/distinfo
deleted file mode 100644
index 9cbe30b0ac1f..000000000000
--- a/net/p5-JUNOScript/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (junoscript-perl-5.3R2.4-domestic.tar.gz) = 7e988f47d88faeaf4b9e0ea37f4c980b
diff --git a/net/p5-JUNOScript/pkg-descr b/net/p5-JUNOScript/pkg-descr
deleted file mode 100644
index b919ddc6c194..000000000000
--- a/net/p5-JUNOScript/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The JUNOScript application programming interface (API) is an Extensible
-Markup Language (XML) application that Juniper Networks routers use to
-exchange information with client applications. XML is a metalanguage for
-defining how to mark the organizational structures and individual elements
-in a data set or document with tags that describe the function of the
-structures and elements.
diff --git a/net/p5-JUNOScript/pkg-plist b/net/p5-JUNOScript/pkg-plist
deleted file mode 100644
index 0bdc37ffe4cc..000000000000
--- a/net/p5-JUNOScript/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-%%SITE_PERL%%/JUNOS/Access/stubs.pm
-%%SITE_PERL%%/JUNOS/Access/ssl.pm
-%%SITE_PERL%%/JUNOS/Access/xnm.pm
-%%SITE_PERL%%/JUNOS/Access/clear_text.pm
-%%SITE_PERL%%/JUNOS/Access/telnet.pm
-%%SITE_PERL%%/JUNOS/Access/rsh.pm
-%%SITE_PERL%%/JUNOS/Access/ssh.pm
-%%SITE_PERL%%/JUNOS/Access.pm
-%%SITE_PERL%%/JUNOS/5.3R2/jroute_methods.pl
-%%SITE_PERL%%/JUNOS/5.3R2/jcrypto_methods.pl
-%%SITE_PERL%%/JUNOS/5.3R2/jkernel_methods.pl
-%%SITE_PERL%%/JUNOS/Methods.pm
-%%SITE_PERL%%/JUNOS/DOM/Parser.pm
-%%SITE_PERL%%/JUNOS/version.pm
-%%SITE_PERL%%/JUNOS/Response.pm
-%%SITE_PERL%%/JUNOS/Trace.pm
-%%SITE_PERL%%/JUNOS/Device.pm
-@dirrm %%SITE_PERL%%/JUNOS/5.3R2
-@dirrm %%SITE_PERL%%/JUNOS/Access
-@dirrm %%SITE_PERL%%/JUNOS/DOM
-@dirrm %%SITE_PERL%%/JUNOS
diff --git a/net/p5-Mon/distinfo b/net/p5-Mon/distinfo
deleted file mode 100644
index 9d2c51d13765..000000000000
--- a/net/p5-Mon/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Mon-0.11.tar.gz) = 762a8c6f845f8f1482a696e6f95f4492
diff --git a/net/p5-Mon/pkg-descr b/net/p5-Mon/pkg-descr
deleted file mode 100644
index 74511b9a3dbb..000000000000
--- a/net/p5-Mon/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This is the Perl5 module for interfacing with the Mon system monitoring
-package. Currently only the client interface is implemented, but more
-things like special logging routines and persistent monitors are being
-considered.
-
-"mon" is a tool for monitoring the availability of services.
-
-WWW: http://www.kernel.org/software/mon/
diff --git a/net/p5-Mon/pkg-plist b/net/p5-Mon/pkg-plist
deleted file mode 100644
index 1e891925646e..000000000000
--- a/net/p5-Mon/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%SITE_PERL%%/Mon/SNMP.pm
-%%SITE_PERL%%/Mon/Client.pm
-%%SITE_PERL%%/Mon/Protocol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mon
-@dirrm %%SITE_PERL%%/Mon
diff --git a/net/p5-Net-CIDR/distinfo b/net/p5-Net-CIDR/distinfo
deleted file mode 100644
index b2a0dee14d88..000000000000
--- a/net/p5-Net-CIDR/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (Net-CIDR-0.09.tar.gz) = 2ecd74eba9faff498f87ec0f33241d18
-SIZE (Net-CIDR-0.09.tar.gz) = 8773
diff --git a/net/p5-Net-CIDR/pkg-descr b/net/p5-Net-CIDR/pkg-descr
deleted file mode 100644
index 12ff048081c0..000000000000
--- a/net/p5-Net-CIDR/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The Net::CIDR package contains functions that manipulate lists of
-IP netblocks expressed in CIDR notation. The Net::CIDR functions
-handle both IPv4 and IPv6 addresses.
-
-WWW: http://search.cpan.org/search?dist=Net-CIDR
diff --git a/net/p5-Net-CIDR/pkg-plist b/net/p5-Net-CIDR/pkg-plist
deleted file mode 100644
index cb70ad77e5a0..000000000000
--- a/net/p5-Net-CIDR/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%SITE_PERL%%/Net/CIDR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-IP/distinfo b/net/p5-Net-IP/distinfo
deleted file mode 100644
index de165a0f7117..000000000000
--- a/net/p5-Net-IP/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-IP-1.20.tar.gz) = 73c5941562833d5ca7ca7c3bff7983fe
diff --git a/net/p5-Net-IP/files/patch-Makefile.PL b/net/p5-Net-IP/files/patch-Makefile.PL
deleted file mode 100644
index 4c3e31b0eec2..000000000000
--- a/net/p5-Net-IP/files/patch-Makefile.PL
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.PL.orig Tue Jul 1 09:19:12 2003
-+++ Makefile.PL Tue Jul 1 09:19:34 2003
-@@ -1,4 +1,3 @@
--use 5.008;
- use ExtUtils::MakeMaker;
- use Config;
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
diff --git a/net/p5-Net-IP/pkg-descr b/net/p5-Net-IP/pkg-descr
deleted file mode 100644
index a11a8dcb4cf7..000000000000
--- a/net/p5-Net-IP/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This module provides functions to deal with IPv4/IPv6 addresses. The
-module can be used as a class, allowing the user to instantiate IP
-objects, which can be single IP addresses, prefixes, or ranges of
-addresses. There is also a procedural way of accessing most of the
-functions. Most subroutines can take either IPv4 or IPv6 addresses
-transparently.
-
-WWW: http://search.cpan.org/search?dist=Net-IP
diff --git a/net/p5-Net-IP/pkg-plist b/net/p5-Net-IP/pkg-plist
deleted file mode 100644
index 2845219738ab..000000000000
--- a/net/p5-Net-IP/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/iptab
-bin/ipcount
-%%SITE_PERL%%/Net/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Net-IPv4Addr/distinfo b/net/p5-Net-IPv4Addr/distinfo
deleted file mode 100644
index f366c4174b24..000000000000
--- a/net/p5-Net-IPv4Addr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-IPv4Addr-0.10.tar.gz) = 57aa8e28ebcd4c0c9f15792740e53d3c
diff --git a/net/p5-Net-IPv4Addr/pkg-descr b/net/p5-Net-IPv4Addr/pkg-descr
deleted file mode 100644
index e65ca924a6c6..000000000000
--- a/net/p5-Net-IPv4Addr/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Net::IPv4Addr provides functions to parse IPv4 addresses both
-in traditional address/netmask format and in the new CIDR format.
-Methods for calculating the network and broadcast address, and
-also to check if a given address is in a specific network also exist.
-
-WWW: http://indev.insu.com/
-
---
-Brad Hendrickse
-bradh@uunet.co.za
diff --git a/net/p5-Net-IPv4Addr/pkg-plist b/net/p5-Net-IPv4Addr/pkg-plist
deleted file mode 100644
index 44e353284e09..000000000000
--- a/net/p5-Net-IPv4Addr/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/ipv4calc
-%%SITE_PERL%%/Net/IPv4Addr.pm
-%%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
-@dirrm %%SITE_PERL%%/auto/Net/IPv4Addr
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-IPv6Addr/distinfo b/net/p5-Net-IPv6Addr/distinfo
deleted file mode 100644
index 1cd1895ae125..000000000000
--- a/net/p5-Net-IPv6Addr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-IPv6Addr-0.1.tar.gz) = 8e8b6eade53349563e7f552c6c20cdd8
diff --git a/net/p5-Net-IPv6Addr/pkg-descr b/net/p5-Net-IPv6Addr/pkg-descr
deleted file mode 100644
index 2542e4d58e41..000000000000
--- a/net/p5-Net-IPv6Addr/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Net::IPv6Addr provides functions for parsing IPv6 addresses in all
-formats described by RFC1884. If Math::Base85 is installed, formats
-described in RFC1924 are also valid. It will generate "IP6.INT."
-strings (as described in RFC1886) if you are inclined to play with
-DNS records.
-
-WWW: http://www.nog.net/~tony/warez/
-
---
-Tony Monroe
-tmonroe+perl@nog.net
diff --git a/net/p5-Net-IPv6Addr/pkg-plist b/net/p5-Net-IPv6Addr/pkg-plist
deleted file mode 100644
index a572beffdd37..000000000000
--- a/net/p5-Net-IPv6Addr/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%SITE_PERL%%/Net/IPv6Addr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Netmask/distinfo b/net/p5-Net-Netmask/distinfo
deleted file mode 100644
index 8bbaf5ec1c5a..000000000000
--- a/net/p5-Net-Netmask/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (Net-Netmask-1.9004.tar.gz) = 5c17055edcdd3b98a274f0aadc23030f
-SIZE (Net-Netmask-1.9004.tar.gz) = 13501
diff --git a/net/p5-Net-Netmask/pkg-descr b/net/p5-Net-Netmask/pkg-descr
deleted file mode 100644
index d82b1a7753c2..000000000000
--- a/net/p5-Net-Netmask/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Net::Netmask parses and understand IPv4 CIDR blocks. It's built with an
-object-oriented interface. Nearly all functions are methods that operate
-on a Net::Netmask object.
-
-WWW: http://www.cpan.org/
diff --git a/net/p5-Net-Netmask/pkg-plist b/net/p5-Net-Netmask/pkg-plist
deleted file mode 100644
index 99bfc80a6892..000000000000
--- a/net/p5-Net-Netmask/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%SITE_PERL%%/Net/Netmask.pod
-%%SITE_PERL%%/Net/Netmask.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SNMP/distinfo b/net/p5-Net-SNMP/distinfo
deleted file mode 100644
index 2cbd5dac0f07..000000000000
--- a/net/p5-Net-SNMP/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-SNMP-4.1.2.tar.gz) = e6b761db6115b0b1fe5446e220abaa4a
diff --git a/net/p5-Net-SNMP/pkg-descr b/net/p5-Net-SNMP/pkg-descr
deleted file mode 100644
index 753a5e759c62..000000000000
--- a/net/p5-Net-SNMP/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The module Net::SNMP implements an object oriented
-interface to the Simple Network Management Protocol. Perl
-applications can use the module to retrieve or update
-information on a remote host using the SNMP protocol.
-Net::SNMP is implemented completely in Perl, requires no
-compiling, and uses only standard Perl modules. Both
-SNMPv1 and SNMPv2c (Community-Based SNMPv2) are supported
-by the module.
diff --git a/net/p5-Net-SNMP/pkg-plist b/net/p5-Net-SNMP/pkg-plist
deleted file mode 100644
index cde0f1b4b33d..000000000000
--- a/net/p5-Net-SNMP/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/snmpkey
-%%SITE_PERL%%/Net/SNMP.pm
-%%SITE_PERL%%/Net/SNMP/Dispatcher.pm
-%%SITE_PERL%%/Net/SNMP/Message.pm
-%%SITE_PERL%%/Net/SNMP/MessageProcessing.pm
-%%SITE_PERL%%/Net/SNMP/PDU.pm
-%%SITE_PERL%%/Net/SNMP/Security.pm
-%%SITE_PERL%%/Net/SNMP/Security/Community.pm
-%%SITE_PERL%%/Net/SNMP/Security/USM.pm
-%%SITE_PERL%%/Net/SNMP/Transport/UDP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@dirrm %%SITE_PERL%%/Net/SNMP/Transport
-@dirrm %%SITE_PERL%%/Net/SNMP/Security
-@dirrm %%SITE_PERL%%/Net/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-SNMP3/distinfo b/net/p5-Net-SNMP3/distinfo
deleted file mode 100644
index 0ee51f59dd15..000000000000
--- a/net/p5-Net-SNMP3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-SNMP-3.65.tar.gz) = bbb32dbac9901a09ef67df57db3a7b9f
diff --git a/net/p5-Net-SNMP3/pkg-descr b/net/p5-Net-SNMP3/pkg-descr
deleted file mode 100644
index 753a5e759c62..000000000000
--- a/net/p5-Net-SNMP3/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The module Net::SNMP implements an object oriented
-interface to the Simple Network Management Protocol. Perl
-applications can use the module to retrieve or update
-information on a remote host using the SNMP protocol.
-Net::SNMP is implemented completely in Perl, requires no
-compiling, and uses only standard Perl modules. Both
-SNMPv1 and SNMPv2c (Community-Based SNMPv2) are supported
-by the module.
diff --git a/net/p5-Net-SNMP3/pkg-plist b/net/p5-Net-SNMP3/pkg-plist
deleted file mode 100644
index a78720eea4eb..000000000000
--- a/net/p5-Net-SNMP3/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%SITE_PERL%%/Net/SNMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index 26d7f52f378b..f50f0fadeed1 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: net/p5-NetAddr-IP-Count
+# New ports collection makefile for: net-mgmt/p5-NetAddr-IP-Count
# Date created: 29 March 2001
# Whom: Anton Berezin <tobez@tobez.org>
#
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= NetAddr::IP::Count - Count hosts in named subnets
-BUILD_DEPENDS= ${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
+BUILD_DEPENDS= ${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/net/p5-NetAddr-IP/distinfo b/net/p5-NetAddr-IP/distinfo
deleted file mode 100644
index 1400a94cf672..000000000000
--- a/net/p5-NetAddr-IP/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (NetAddr-IP-3.14.tar.gz) = 27703ec92de74998b16d736a304be479
diff --git a/net/p5-NetAddr-IP/pkg-descr b/net/p5-NetAddr-IP/pkg-descr
deleted file mode 100644
index 155ae87a9cbd..000000000000
--- a/net/p5-NetAddr-IP/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This perl module provides a simple interface to the tedious bit
-manipulation involved when handling IP address calculations. It also
-helps by performing range comparisons between subnets as well as other
-frequently used functions.
-
-Please note that this module provides more functionality when used with
-perl 5.6.1 or perl 5.8.0.
-
-WWW: http://search.cpan.org/search?dist=NetAddr-IP
diff --git a/net/p5-NetAddr-IP/pkg-plist b/net/p5-NetAddr-IP/pkg-plist
deleted file mode 100644
index 3b5b565fb485..000000000000
--- a/net/p5-NetAddr-IP/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%SITE_PERL%%/NetAddr/IP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrm %%SITE_PERL%%/NetAddr
diff --git a/net/p5-SNMP-MIB-Compiler/distinfo b/net/p5-SNMP-MIB-Compiler/distinfo
deleted file mode 100644
index d65b1acb19a7..000000000000
--- a/net/p5-SNMP-MIB-Compiler/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (SNMP-MIB-Compiler-0.06.tar.gz) = 1bc0a54ac5e5e4210503cdc4ee48c9c1
diff --git a/net/p5-SNMP-MIB-Compiler/pkg-descr b/net/p5-SNMP-MIB-Compiler/pkg-descr
deleted file mode 100644
index 946bd81d3ee3..000000000000
--- a/net/p5-SNMP-MIB-Compiler/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-SNMP::MIB::Compiler is a MIB compiler that fully supports
-both SMI(v1) and SMIv2. This module can be use to compile
-MIBs (recursively or not) or load already compiled MIBs for
-later use.
-
-More information about this module is included in this package.
diff --git a/net/p5-SNMP-MIB-Compiler/pkg-plist b/net/p5-SNMP-MIB-Compiler/pkg-plist
deleted file mode 100644
index d5743b0f21f8..000000000000
--- a/net/p5-SNMP-MIB-Compiler/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/mibbrowser
-bin/mibcompiler
-%%SITE_PERL%%/SNMP/MIB/Compiler.pm
-%%SITE_PERL%%/Bundle/SNMP/MIB/Compiler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB/Compiler
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/MIB
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
-@dirrm %%SITE_PERL%%/SNMP/MIB
-@dirrm %%SITE_PERL%%/SNMP
-@dirrm %%SITE_PERL%%/Bundle/SNMP/MIB
-@dirrm %%SITE_PERL%%/Bundle/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
diff --git a/net/p5-SNMP-Util/distinfo b/net/p5-SNMP-Util/distinfo
deleted file mode 100644
index 3e822bf63fe4..000000000000
--- a/net/p5-SNMP-Util/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (SNMP-Util-1.8.tar.gz) = 861a592e247f88c2046e9b2502d0a9ec
diff --git a/net/p5-SNMP-Util/files/patch-aa b/net/p5-SNMP-Util/files/patch-aa
deleted file mode 100644
index 1ada2f247c76..000000000000
--- a/net/p5-SNMP-Util/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.PL.orig Tue Sep 7 15:26:45 1999
-+++ Makefile.PL Tue Sep 7 15:27:02 1999
-@@ -12,21 +12,6 @@
- print "ok\n";
- }
-
--$FILE = new FileHandle;
--open($FILE,">t/snmp.data");
--
--print "\nEnter the IP address of the Device: ";
--chomp($IP = <stdin>);
--
--print "Enter the SNMP community string: ";
--chomp($community = <stdin>);
--
--print $FILE "IP = $IP\n";
--print $FILE "community = $community\n";
--
--close $FILE;
--
--
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
- # the contents of the Makefile that is written.
- WriteMakefile(
diff --git a/net/p5-SNMP-Util/pkg-descr b/net/p5-SNMP-Util/pkg-descr
deleted file mode 100644
index 0e94a34f7fc0..000000000000
--- a/net/p5-SNMP-Util/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This Perl library is a set of utilities for configuring and monitoring
-SNMP based devices. This library requires the UCD port of SNMP and the
-SNMP.pm module written by Joe Marzot.
diff --git a/net/p5-SNMP-Util/pkg-plist b/net/p5-SNMP-Util/pkg-plist
deleted file mode 100644
index 45bd43f00781..000000000000
--- a/net/p5-SNMP-Util/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%SITE_PERL%%/SNMP/Util.pm
-%%SITE_PERL%%/SNMP/Util_env.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/Util
-@dirrm %%SITE_PERL%%/SNMP
diff --git a/net/p5-SNMP/distinfo b/net/p5-SNMP/distinfo
deleted file mode 100644
index f5f7f27e943b..000000000000
--- a/net/p5-SNMP/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (SNMP-4.2.0.tar.gz) = 46715f457f3bcf5bf599d441f7e5300b
-SIZE (SNMP-4.2.0.tar.gz) = 99552
diff --git a/net/p5-SNMP/files/patch-Makefile.PL b/net/p5-SNMP/files/patch-Makefile.PL
deleted file mode 100644
index 959663ef3629..000000000000
--- a/net/p5-SNMP/files/patch-Makefile.PL
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.PL Mon Jan 8 19:58:04 2001
-+++ Makefile.PL.orig Sat Feb 5 08:09:39 2000
-@@ -27,7 +27,7 @@
- $snmp_link_lib = 'libsnmp';
- $sep = '\\';
- } else {
-- $snmp_lib = 'libsnmp.a';
-+ $snmp_lib = 'libsnmp.so';
- $snmp_link_lib = 'snmp';
- $sep = '/';
- }
diff --git a/net/p5-SNMP/pkg-descr b/net/p5-SNMP/pkg-descr
deleted file mode 100644
index cd4684825f48..000000000000
--- a/net/p5-SNMP/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a Perl5 extension module which provides an interface to the
-UCD-SNMP library.
-
-Description:
-
-The basic operations offered by SNMP are provided through an object
-oriented interface for modularity and ease of use. The primary object is
-SNMP::Session which is implemented as a blessed hash reference. The
-object supports 'get', 'set', and 'getNext' method calls. All calls are
-blocking/synchronous (i.e., they must receive a response or timeout
-before control is returned to the caller). The methods take a variety of
-input argument formats (example/* for examples). A description of the
-objects data fields follow.
diff --git a/net/p5-SNMP/pkg-plist b/net/p5-SNMP/pkg-plist
deleted file mode 100644
index 44aead515a4d..000000000000
--- a/net/p5-SNMP/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/perl5/site_perl/README.SNMP
-%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
diff --git a/net/p5-SNMP_Session/distinfo b/net/p5-SNMP_Session/distinfo
deleted file mode 100644
index e70b3a850894..000000000000
--- a/net/p5-SNMP_Session/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (SNMP_Session-1.00.tar.gz) = 1a609ca5427213f74884127013622942
diff --git a/net/p5-SNMP_Session/pkg-descr b/net/p5-SNMP_Session/pkg-descr
deleted file mode 100644
index 8f6aca1b259c..000000000000
--- a/net/p5-SNMP_Session/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-This archive contains Perl 5 modules SNMP_Session.pm and BER.pm,
-which, when used together, provide rudimentary access to remote SNMP
-(v1 and v2) agents.
-
-This module differs from existing SNMP packages in that it is
-completely stand-alone, i.e. you don't need to have another SNMP
-package such as CMU SNMP. It is also written entirely in Perl, so you
-don't have to compile any C modules. It uses the Perl 5 Socket.pm
-module and should therefore be very portable, even to non-Unix systems.
-
-The SNMP operations currently supported are "get", "get-next", "get-bulk"
-and "set", as well as trap generation and reception.
-
-WWW: http://www.switch.ch/misc/leinen/snmp/perl/
-
-- Pete
-petef@databits.net
diff --git a/net/p5-SNMP_Session/pkg-plist b/net/p5-SNMP_Session/pkg-plist
deleted file mode 100644
index f2271d1b39be..000000000000
--- a/net/p5-SNMP_Session/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/BER.pm
-%%SITE_PERL%%/SNMP_Session.pm
-%%SITE_PERL%%/SNMP_util.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session/.packlist
-%%PORTDOCS%%share/doc/SNMP_Session/README
-%%PORTDOCS%%share/doc/SNMP_Session/README.SNMP_util
-%%PORTDOCS%%share/doc/SNMP_Session/index.html
-%%PORTDOCS%%@dirrm share/doc/SNMP_Session
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP_Session
diff --git a/net/p5-Telnet-Cisco/distinfo b/net/p5-Telnet-Cisco/distinfo
deleted file mode 100644
index 756f39a3b4fa..000000000000
--- a/net/p5-Telnet-Cisco/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-Telnet-Cisco-1.10.tar.gz) = a25845350be369cb8354e0ddc55708f9
diff --git a/net/p5-Telnet-Cisco/pkg-descr b/net/p5-Telnet-Cisco/pkg-descr
deleted file mode 100644
index f4fdcb3ca62b..000000000000
--- a/net/p5-Telnet-Cisco/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Net::Telnet::Cisco provides additional functionality to Net::Telnet for
-dealing with Cisco routers.
-
-WWW: http://search.cpan.org/search?module=Net::Telnet::Cisco
-
-- Michael Lyngbol
-lyngbol@wheel.dk
diff --git a/net/p5-Telnet-Cisco/pkg-plist b/net/p5-Telnet-Cisco/pkg-plist
deleted file mode 100644
index a47cbba36307..000000000000
--- a/net/p5-Telnet-Cisco/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%SITE_PERL%%/Net/Telnet/Cisco.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
-%%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet/Cisco 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
diff --git a/net/p5-Tie-NetAddr-IP/distinfo b/net/p5-Tie-NetAddr-IP/distinfo
deleted file mode 100644
index ce3f0c1537be..000000000000
--- a/net/p5-Tie-NetAddr-IP/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Tie-NetAddr-IP-1.51.tar.gz) = 562a9e63cc3e0cf0803778922f285ff8
diff --git a/net/p5-Tie-NetAddr-IP/pkg-descr b/net/p5-Tie-NetAddr-IP/pkg-descr
deleted file mode 100644
index 52bf2842d8a6..000000000000
--- a/net/p5-Tie-NetAddr-IP/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This module overloads hashes so that the key can be a subnet as in
-NetAddr::IP. When looking values up, an interpretation will be made to
-find the given key within the subnets specified in the hash.
-
-Care must be taken, as only strings that can be parsed as an IP address
-by NetAddr::IP can be used as keys for this hash.
-
-WWW: http://search.cpan.org/search?dist=Tie-NetAddr-IP
-
--Anton
-<tobez@FreeBSD.org>
diff --git a/net/p5-Tie-NetAddr-IP/pkg-plist b/net/p5-Tie-NetAddr-IP/pkg-plist
deleted file mode 100644
index 4e9c26fc9341..000000000000
--- a/net/p5-Tie-NetAddr-IP/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP/.packlist
-%%SITE_PERL%%/Tie/NetAddr/IP.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie/NetAddr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
diff --git a/net/packit/distinfo b/net/packit/distinfo
deleted file mode 100644
index 6ad4a5ffb22a..000000000000
--- a/net/packit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (packit-0.7.1.tgz) = 08a64f736143af3038ccd3b6b1f94a65
-SIZE (packit-0.7.1.tgz) = 137409
diff --git a/net/packit/pkg-descr b/net/packit/pkg-descr
deleted file mode 100644
index d469900dba3e..000000000000
--- a/net/packit/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Packit is a network auditing tool. Its value is derived from
-its ability to customize, inject, monitor, and manipulate IP
-traffic. By allowing you to define (spoof) nearly all TCP, UDP,
-ICMP, IP, ARP, RARP, and Ethernet header options, Packit can be
-useful in testing firewalls, intrusion detection systems, port
-scanning, simulating network traffic, and general TCP/IP
-auditing. Packit is also an excellent tool for learning TCP/IP.
-
-WWW: http://packit.sourceforge.net/
diff --git a/net/pancho/distinfo b/net/pancho/distinfo
deleted file mode 100644
index ba02cf96fc9c..000000000000
--- a/net/pancho/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (pancho-v9.2.4.tar.gz) = f251adffbec7c9b60c6e2e632d272d8d
diff --git a/net/pancho/files/patch-MANIFEST b/net/pancho/files/patch-MANIFEST
deleted file mode 100644
index 6e7e7c1cf5de..000000000000
--- a/net/pancho/files/patch-MANIFEST
+++ /dev/null
@@ -1,11 +0,0 @@
---- MANIFEST.orig Wed Jan 8 20:53:26 2003
-+++ MANIFEST Wed Jan 8 20:53:45 2003
-@@ -8,8 +8,6 @@
- lib/Pancho/Plugins/Cisco.pm
- lib/Pancho/Plugins/Foundry.pm
- lib/Pancho/Plugins/Nortel.pm
--lib/Pancho/Plugins/Plugin.sample
--lib/Pancho/Plugins/README
- lib/Pancho/Snmp.pm
- lib/Pancho/Util.pm
- license/COPYRIGHT
diff --git a/net/pancho/files/patch-Makefile.PL b/net/pancho/files/patch-Makefile.PL
deleted file mode 100644
index e4e86eff0eca..000000000000
--- a/net/pancho/files/patch-Makefile.PL
+++ /dev/null
@@ -1,92 +0,0 @@
---- Makefile.PL.orig Mon Jan 6 22:22:54 2003
-+++ Makefile.PL Mon Jan 6 22:26:56 2003
-@@ -52,24 +52,26 @@
- print "Configuring Pancho.\n";
- }
-
--my @missing_mods;
--my @upgrade_mods;
--# check for modules
--foreach my $mod (keys %$DEPS) {
-- my $eval = "require $mod";
-- eval $eval;
-- if ($@) {
-- push (@missing_mods, $mod);
-- }
-- elsif ($mod->VERSION < $DEPS->{$mod}) {
-- push (@upgrade_mods, $mod);
-- }
--}
--
--if ($NOASK) {
-- installMods(\@missing_mods, 'missing');
-- installMods(\@upgrade_mods, 'upgrade');
--}
-+# FreeBSD port : inhibits dependancy checks here
-+# and use port's one
-+#my @missing_mods;
-+#my @upgrade_mods;
-+## check for modules
-+#foreach my $mod (keys %$DEPS) {
-+# my $eval = "require $mod";
-+# eval $eval;
-+# if ($@) {
-+# push (@missing_mods, $mod);
-+# }
-+# elsif ($mod->VERSION < $DEPS->{$mod}) {
-+# push (@upgrade_mods, $mod);
-+# }
-+#}
-+#
-+#if ($NOASK) {
-+# installMods(\@missing_mods, 'missing');
-+# installMods(\@upgrade_mods, 'upgrade');
-+#}
-
- if ($ALONE) {
- system("perl build_pancho.PL ALONE");
-@@ -109,25 +111,25 @@
- }
-
- # override install in order to create conf dir and copy config
--sub MY::install {
-- package MY;
-- my $inherited = shift->SUPER::install(@_);
--
-- # commands to actually create and copy the files
-- my $mkdir = "\t\$(MKPATH) \$(SYS_CONFDIR)\n";
--
-- my $copy = "\t\@ if [ -f \"\$(SYS_CONFDIR)/pancho.conf\" ]; then \\\n";
-- $copy .= "\t\techo;\\\n\t\techo Not copying configuration file. One already exists.;\\\n\t\techo;\\\n";
-- $copy .= "\telse \\\n";
-- $copy .= "\t\t\$(CP) pancho.conf \$(SYS_CONFDIR);\\\n";
-- $copy .= "\t\techo;\\\n\t\techo Configuration file has been installed into \$(SYS_CONFDIR);\\\n\t\techo;\\\n";
-- $copy .= "\tfi\n";
--
-- # add copy of config file into SYS_CONFDIR
-- $inherited =~ s|(^install\s*::.*)|$1\n$mkdir$copy|m;
--
-- $inherited;
--}
-+#sub MY::install {
-+# package MY;
-+# my $inherited = shift->SUPER::install(@_);
-+#
-+# # commands to actually create and copy the files
-+# my $mkdir = "\t\$(MKPATH) \$(SYS_CONFDIR)\n";
-+#
-+# my $copy = "\t\@ if [ -f \"\$(SYS_CONFDIR)/pancho.conf\" ]; then \\\n";
-+# $copy .= "\t\techo;\\\n\t\techo Not copying configuration file. One already exists.;\\\n\t\techo;\\\n";
-+# $copy .= "\telse \\\n";
-+# $copy .= "\t\t\$(CP) pancho.conf \$(SYS_CONFDIR);\\\n";
-+# $copy .= "\t\techo;\\\n\t\techo Configuration file has been installed into \$(SYS_CONFDIR);\\\n\t\techo;\\\n";
-+# $copy .= "\tfi\n";
-+#
-+# # add copy of config file into SYS_CONFDIR
-+# $inherited =~ s|(^install\s*::.*)|$1\n$mkdir$copy|m;
-+#
-+# $inherited;
-+#}
-
- # override realclean to remove pancho and pancho.conf
- sub MY::realclean {
diff --git a/net/pancho/pkg-descr b/net/pancho/pkg-descr
deleted file mode 100644
index c4ef971bea43..000000000000
--- a/net/pancho/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Pancho was written with the goal of allowing network
-administrators make a change to a group of Cisco routers
-without being required to log into each host.
-
-Pancho also provides the flexibility to allow admins to
-use its function against a single host, a select group
-or the entire whole. In addition to changes to current
-configurations on remote routers, pancho is also capable
-of archiving router configurations manually or through
-automated runs.
-
-Support is provided for Cisco, Foundry or Nortel/Alteon
-devices.
-
-WWW: http://www.panchoproject.org/
-
---Nicolas Jombart <ecu@ipv42.net>
diff --git a/net/pancho/pkg-message b/net/pancho/pkg-message
deleted file mode 100644
index e3040835e3d2..000000000000
--- a/net/pancho/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-Documentation is not included with Pancho distribution
-Please read it at http://www.panchoproject.org/
-
-You also need to customize PREFIX/etc/pancho.conf
-A sample configuration file is installed as pancho.conf.sample,
-copy it as pancho.conf.
diff --git a/net/pancho/pkg-plist b/net/pancho/pkg-plist
deleted file mode 100644
index 5bb965d78ae9..000000000000
--- a/net/pancho/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/pancho
-etc/pancho.conf.sample
-%%SITE_PERL%%/Pancho/Util.pm
-%%SITE_PERL%%/Pancho/Snmp.pm
-%%SITE_PERL%%/Pancho/Log.pm
-%%SITE_PERL%%/Pancho/Plugins/Nortel.pm
-%%SITE_PERL%%/Pancho/Plugins/Foundry.pm
-%%SITE_PERL%%/Pancho/Plugins/Arrowpoint.pm
-%%SITE_PERL%%/Pancho/Plugins/Cisco.pm
-%%SITE_PERL%%/Pancho/Plugins/Avaya.pm
-%%SITE_PERL%%/Pancho/Plugins/DellPowerConnect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Pancho/Plugins 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pancho 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho 2>/dev/null || true
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.plugins
-%%PORTDOCS%%%%DOCSDIR%%/Plugin.sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/pixilate/distinfo b/net/pixilate/distinfo
deleted file mode 100644
index df1f426d6fa4..000000000000
--- a/net/pixilate/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (pixilate-0.4.1.tar.gz) = 407b70eae1b54944c94a8b5937de5d03
-SIZE (pixilate-0.4.1.tar.gz) = 128153
diff --git a/net/pixilate/pkg-descr b/net/pixilate/pkg-descr
deleted file mode 100644
index e10fbb22ca19..000000000000
--- a/net/pixilate/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-pixilate parses an input file containing Cisco PIX 6.2x (normal mask)
- or Cisco IOS (inverted mask) access-list entries and generates
- the appropriate packets. For further information on writing PIX access-lists,
- look here, for information on writing IOS access-lists, look here.
-
-pixilate - is currently capable of generating TCP/UDP/ICMP (various ICMP
- types), and IGMP utilizing the Libnet 1.1.x library available from
- http://www.packetfactory.net. NOTE: Libnet 1.0.x is NOT compatible."
-
-
-WWW: http://winfingerprint.sourceforge.net/pixilate.php
diff --git a/net/pixilate/pkg-plist b/net/pixilate/pkg-plist
deleted file mode 100644
index 553d45176f9a..000000000000
--- a/net/pixilate/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/pixilate
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/pmacct/distinfo b/net/pmacct/distinfo
deleted file mode 100644
index c2b8f704d924..000000000000
--- a/net/pmacct/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (pmacct-0.6.0p3.tar.gz) = e98d69f2019fcfbf518d0152e838ece3
-SIZE (pmacct-0.6.0p3.tar.gz) = 108434
diff --git a/net/pmacct/pkg-descr b/net/pmacct/pkg-descr
deleted file mode 100644
index 1079eeb0532d..000000000000
--- a/net/pmacct/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-pmacct is a network tool to gather ip traffic informations
-(bytes counter and number of packets); aggregation of
-statistics is done using simple primitives (MAC addresses,
-source host, destination host, ports and ip protocols) that can
-be used alone or combined together to form complex aggregation
-methods; counters are either global or historical (aggregated
-and separated at fixed timeslots). Data is stored in a
-in-memory table or using a SQL database (MySQL or PostgreSQL).
-Gathering packets off the wire is done using pcap library and
-promiscuous mode of network interfaces when specifically
-required.
-
-WWW: http://www.ba.cnr.it/~paolo/pmacct/
diff --git a/net/pmacct/pkg-plist b/net/pmacct/pkg-plist
deleted file mode 100644
index 950038f8a81d..000000000000
--- a/net/pmacct/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/pmacct
-%%WITH_MYSQL%%bin/pmmyplay
-%%WITH_PGSQL%%bin/pmpgplay
-sbin/pmacctd
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLES
-%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/portmon/distinfo b/net/portmon/distinfo
deleted file mode 100644
index 65e5628b0ff3..000000000000
--- a/net/portmon/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (portmon-2.0.tar.gz) = dc9a0f9da5aa8544257c3546b65cfb93
-SIZE (portmon-2.0.tar.gz) = 107246
diff --git a/net/portmon/files/patch-extras::portmon.8 b/net/portmon/files/patch-extras::portmon.8
deleted file mode 100644
index 08e061425b9c..000000000000
--- a/net/portmon/files/patch-extras::portmon.8
+++ /dev/null
@@ -1,10 +0,0 @@
---- extras/portmon.8.orig Sun Aug 24 10:08:43 2003
-+++ extras/portmon.8 Sun Aug 24 10:09:06 2003
-@@ -1,6 +1,6 @@
- .\" manpage for portmon
- .\" by Nik Reiman, <nik@aboleo.net>
--.TH PORTMON 1 "21 August 2003"
-+.TH PORTMON 8 "21 August 2003"
- .SH NAME
- portmon \- Network service monitoring daemon
- .SH SYNOPSIS
diff --git a/net/portmon/pkg-descr b/net/portmon/pkg-descr
deleted file mode 100644
index 49b08d0e0738..000000000000
--- a/net/portmon/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Portmon is a network service monitoring daemon. Portmon
-basically uses a list of hosts and port numbers, and tries to
-connect to each host on the list at a regular time interval. It
-is a lightweight program, and requires no software to be
-installed on the machines one wishes to monitor.
-
-WWW: http://www.aboleo.net/software/portmon
diff --git a/net/portmon/pkg-plist b/net/portmon/pkg-plist
deleted file mode 100644
index 38ad7eee5858..000000000000
--- a/net/portmon/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/portmon
-etc/portmon.hosts.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/py-ipy/distinfo b/net/py-ipy/distinfo
deleted file mode 100644
index 68057dcc92fb..000000000000
--- a/net/py-ipy/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (IPy-0.41.tar.gz) = 883aca022bfe7a4a5867995bed267072
diff --git a/net/py-ipy/pkg-descr b/net/py-ipy/pkg-descr
deleted file mode 100644
index 60bb2d34e892..000000000000
--- a/net/py-ipy/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks in
-a fashion similar to perl's Net::IP and friends. The IP class allows a
-comfortable parsing and handling for most notations in use for IPv4 and IPv6
-Addresses and Networks.
-
-WWW: http://c0re.jp/c0de/IPy/
diff --git a/net/py-ipy/pkg-plist b/net/py-ipy/pkg-plist
deleted file mode 100644
index 4695f12f5a96..000000000000
--- a/net/py-ipy/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/IPy.py
-lib/%%PYTHON_VERSION%%/site-packages/IPy.pyc
-lib/%%PYTHON_VERSION%%/site-packages/IPy.pyo
diff --git a/net/py-snmp/distinfo b/net/py-snmp/distinfo
deleted file mode 100644
index 2d9da1005379..000000000000
--- a/net/py-snmp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (pysnmp-3.3.6.tar.gz) = f5b9bc60a55bb6461ffcb951e883fd87
diff --git a/net/py-snmp/pkg-descr b/net/py-snmp/pkg-descr
deleted file mode 100644
index 6519d49bfd8d..000000000000
--- a/net/py-snmp/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-PySNMP is fully functional SNMP v.1 engine (BER encoders/decoders
-for a subset of ASN.1 data types, sockets based networking etc.)
-written entirely in Python.
-
-WWW: http://pysnmp.sourceforge.net/
diff --git a/net/py-snmp/pkg-plist b/net/py-snmp/pkg-plist
deleted file mode 100644
index 5fe07b83482f..000000000000
--- a/net/py-snmp/pkg-plist
+++ /dev/null
@@ -1,318 +0,0 @@
-%%PYTHON_SITELIBDIR%%/pysnmp/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/base.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/base.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/base.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/base.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/base.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/base.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/univ.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/univ.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/univ.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/oidtree.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/oidtree.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/oidtree.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/univ.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/univ.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/univ.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/asynsnmp.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/asynsnmp.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/asynsnmp.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/ber.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/ber.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/ber.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/message.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/message.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/message.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/msession.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/msession.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/msession.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/session.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/session.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/session.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/wrapexp.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/wrapexp.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x/wrapexp.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/asn1.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/asn1.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/asn1.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/asynrole.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/asynrole.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/asynrole.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/role.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/role.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/role.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/v1.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/v1.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/v1.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/v2c.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/v2c.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x/v2c.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy/snmpy.py
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy/snmpy.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy/snmpy.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/asynrole.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/asynrole.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/asynrole.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/bulkrole.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/bulkrole.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/bulkrole.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/role.py
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/role.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp/role.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/rfc1157.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/rfc1157.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/rfc1157.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/rfc1905.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/rfc1905.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha/rfc1905.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1157.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1157.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1157.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1905.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1905.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1905.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1157.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1157.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1157.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1905.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1905.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1905.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v1.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v1.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v1.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v2c.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v2c.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v2c.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1155.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1155.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1155.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1157.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1157.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1157.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1902.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1902.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1902.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1905.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1905.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/rfc1905.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/v1.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/v1.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/v1.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/v2c.py
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/v2c.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/proto/v2c.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/cli
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/api/alpha
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/api
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/mapping
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat/snmpy
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/asyncmgr.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmpagent.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmpbulk.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmpbulkwalk.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmpget.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmpset.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmptrap.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmptrapd.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/snmpwalk.py
-%%PORTDOCS%%%%DOCSDIR%%/asn1/base-asn1-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/base-choicetypeasn1-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/base-recordtypeasn1-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/base-simpleasn1-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/base-variabletypeasn1-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/base.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/base-fixed-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/base-simple-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/base-variable-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/base.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/error.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/ber/univ.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/error.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/encoding/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/error.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-boolean-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-choice-example.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-integer-example.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-integer-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-oid-example.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-oid-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-sequence-example.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-sequenceof-example.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-string-example.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ-string-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/asn1/univ.html
-%%PORTDOCS%%%%DOCSDIR%%/compat/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/compat/snmpy/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/error-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/error.html
-%%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/error.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/asynrole-objects-agent.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/asynrole-objects-manager.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/asynrole.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/bulkrole-manager-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/bulkrole.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/error.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/role-agent-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/role-manager-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/mapping/udp/role.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/error.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/error.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1157-getrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1157-getresponsepdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1157-message-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1157-trappdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1157.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1905-getbulkrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1905-getrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1905-message-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1905-responsepdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/generic/rfc1905.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/api/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/error.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/error.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1157-getrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1157-setrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1157-trappdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1157.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1905-getrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1905-setrequestpdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1905-trappdu-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/rfc1905.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/v1-message-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/v1.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/v2c-message-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/cli/ucd/v2c.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/error.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1155-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1155.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1157-errorstatus-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1157-generictrap-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1157.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1902-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1902.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1905-errorstatus-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/rfc1905.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v1-getrequest-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v1-getrequest-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v1-getresponse-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v1-request-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v1.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v2c-getrequest-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v2c-getrequest-objects.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v2c-request-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v2c-response-example.html
-%%PORTDOCS%%%%DOCSDIR%%/proto/v2c.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/proto/cli/ucd
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/proto/cli
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/proto/api/generic
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/proto/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/proto
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mapping/udp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mapping
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/compat/snmpy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/compat
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/asn1/encoding/ber
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/asn1/encoding
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/asn1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/rancid/distinfo b/net/rancid/distinfo
deleted file mode 100644
index 0c9e0fe85aa9..000000000000
--- a/net/rancid/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rancid-2.3.rc1.tar.gz) = fb98161366fee76c879b4400805ec5bb
diff --git a/net/rancid/files/patch-etc::Makefile.am b/net/rancid/files/patch-etc::Makefile.am
deleted file mode 100644
index e4805556c2c8..000000000000
--- a/net/rancid/files/patch-etc::Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
---- etc/Makefile.am.orig Sun Jan 18 02:30:29 2004
-+++ etc/Makefile.am Sun Jan 18 02:32:16 2004
-@@ -29,24 +29,8 @@
- CLEANFILES= $(pkgdata_DATA)
-
- install-data-local: all
-- @if test -f $(sysconfdir)/rancid.conf ; then \
-- echo ""; \
-- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \
-- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \
-- echo " *** examples."; \
-- echo ""; \
-- else \
-- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
-- fi; \
-- if test -f $(sysconfdir)/lg.conf ; then \
-- echo ""; \
-- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \
-- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \
-- echo " *** examples."; \
-- echo ""; \
-- else \
-- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
-- fi;
-+ $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ \
-+ $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
-
- #clean:
- # rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff --git a/net/rancid/files/patch-etc::Makefile.in b/net/rancid/files/patch-etc::Makefile.in
deleted file mode 100644
index 1f78dfe1b6d5..000000000000
--- a/net/rancid/files/patch-etc::Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- etc/Makefile.in.orig Sun Jan 18 02:37:08 2004
-+++ etc/Makefile.in Sun Jan 18 02:38:03 2004
-@@ -342,24 +342,8 @@
-
-
- install-data-local: all
-- @if test -f $(sysconfdir)/rancid.conf ; then \
-- echo ""; \
-- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \
-- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \
-- echo " *** examples."; \
-- echo ""; \
-- else \
-- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
-- fi; \
-- if test -f $(sysconfdir)/lg.conf ; then \
-- echo ""; \
-- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \
-- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \
-- echo " *** examples."; \
-- echo ""; \
-- else \
-- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
-- fi;
-+ $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
-+ $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
-
- lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
- rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/net/rancid/pkg-descr b/net/rancid/pkg-descr
deleted file mode 100644
index 676fe9aae64c..000000000000
--- a/net/rancid/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Rancid monitors a router's (or device's) configuration, including software
-and hardware (cards, serial numbers, etc), using CVS. Rancid currently
-supports Bay routers, Cisco routers, Juniper routers, Catalyst switches,
-Foundry switches, Redback NASs, ADC EZT3 muxes, MRTd (and thus likely IRRd),
-Alteon switches, HP procurve switches, Hitachi routers.
-
-Rancid logs into each of the devices in a router table file, runs various
-commands, chomps the output, and emails any differences ( sample) from
-the previous collection to a mail list.
-
-A looking glass is also included with rancid, based on Ed Kern's in use on
-http://nitrous.digex.net/. Rancid version has added functions, supports cisco,
- juniper, and foundry and uses the login scripts that come with rancid;
-so it can use rsh, telnet, or ssh to connect to your router(s).
-
-WWW: http://www.shrubbery.net/rancid/
diff --git a/net/rancid/pkg-message b/net/rancid/pkg-message
deleted file mode 100644
index 517216c88a5c..000000000000
--- a/net/rancid/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-For further configuration information please look at
-%%INSTDIR%%/share/rancid/README.
-
-If you are upgrading from the previous version of rancid look at
-%%INSTDIR%%/share/rancid/UPGRADING.
-
-If you would like to set up Rancid to be browseable from Web,
-you need to install devel/cvsweb or devel/viewcvs.
-
-For rancid looking-glass copy the actual CGIs (located at
-%%INSTDIR%%/bin/{lg.cgi lgform.cgi}) to your cgi-bin.
diff --git a/net/rancid/pkg-plist b/net/rancid/pkg-plist
deleted file mode 100644
index fc753236a97d..000000000000
--- a/net/rancid/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-@exec mkdir -p %D/rancid/var
-@exec chmod 775 %D/rancid/var
-rancid/bin/alogin
-rancid/bin/arancid
-rancid/bin/blogin
-rancid/bin/brancid
-rancid/bin/cat5rancid
-rancid/bin/clogin
-rancid/bin/control_rancid
-rancid/bin/cssrancid
-rancid/bin/elogin
-rancid/bin/erancid
-rancid/bin/f10rancid
-rancid/bin/flogin
-rancid/bin/fnrancid
-rancid/bin/francid
-rancid/bin/hlogin
-rancid/bin/hpuifilter
-rancid/bin/hrancid
-rancid/bin/htlogin
-rancid/bin/htrancid
-rancid/bin/jerancid
-rancid/bin/jlogin
-rancid/bin/jrancid
-rancid/bin/lg.cgi
-rancid/bin/lgform.cgi
-rancid/bin/mrancid
-rancid/bin/nlogin
-rancid/bin/nrancid
-rancid/bin/nslogin
-rancid/bin/nsrancid
-rancid/bin/par
-rancid/bin/prancid
-rancid/bin/rancid
-rancid/bin/rancid-cvs
-rancid/bin/rancid-fe
-rancid/bin/rancid-run
-rancid/bin/rivlogin
-rancid/bin/rivrancid
-rancid/bin/rrancid
-rancid/bin/tntlogin
-rancid/bin/tntrancid
-rancid/bin/xrancid
-rancid/bin/zrancid
-rancid/etc/lg.conf.sample
-rancid/etc/rancid.conf.sample
-rancid/share/rancid/CHANGES
-rancid/share/rancid/COPYING
-rancid/share/rancid/FAQ
-rancid/share/rancid/README
-rancid/share/rancid/README.lg
-rancid/share/rancid/README.misc
-rancid/share/rancid/UPGRADING
-rancid/share/rancid/cisco-load.exp
-rancid/share/rancid/cisco-reload.exp
-rancid/share/rancid/cloginrc.sample
-rancid/share/rancid/downreport
-rancid/share/rancid/getipacctg
-rancid/share/rancid/index.html
-rancid/share/rancid/lg.conf.sample
-rancid/share/rancid/lgnotes.html
-rancid/share/rancid/rancid.conf.sample
-rancid/share/rancid/rtrfilter
-@dirrm rancid/share/rancid
-@dirrm rancid/share
-@dirrm rancid/var
-@dirrm rancid/etc
-@dirrm rancid/bin
-@dirrm rancid/man/man1
-@dirrm rancid/man/man5
-@dirrm rancid/man
-@dirrm rancid
diff --git a/net/rate/distinfo b/net/rate/distinfo
deleted file mode 100644
index e0c72293fb78..000000000000
--- a/net/rate/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rate-0.9.tar.gz) = 5689ff8b6e0bb8f78dec9184623c5800
diff --git a/net/rate/pkg-descr b/net/rate/pkg-descr
deleted file mode 100644
index 3a8b1a5a505c..000000000000
--- a/net/rate/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Rate is a swiss-army-knife command-line traffic analysis tool, designed
-to help a network administrator to see what is happening at a router at
-the moment. Unlike tcpdump(1), rate uses statistical and stream-oriented
-methods, and will never produce an output stream at a speed beyond human
-perception. The output is less accurate, however. Rate features four
-different operating modes, designed to perform the following tasks:
-estimating overall traffic rates, determining nodes generating the
-highest traffic, determining connections and flows generating the highest
-traffic and extracting strings from packets.
-
-WWW: http://s-tech.elsat.net.pl/
-AUTHOR: <mtg@elsat.net.pl>
-
-- Michael L. Hostbaek
- mich@FreeBSD.org
diff --git a/net/remarp/distinfo b/net/remarp/distinfo
deleted file mode 100644
index 6a147284dd7d..000000000000
--- a/net/remarp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (remarp-0.05.tar.gz) = b54723dcc163d7c9abb7ca4362017247
diff --git a/net/remarp/pkg-descr b/net/remarp/pkg-descr
deleted file mode 100644
index 22392011b20f..000000000000
--- a/net/remarp/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Remote Arpwatch collects ARP tables from remote devices using SNMP and
-checks them for changes. It is very useful for detecting problems and
-malicious users in networks with routers that don't support static
-ARP tables.
-
-WWW: http://www.raccoon.kiev.ua/projects/remarp/
-AUTHOR: melnik <melnik@raccoon.kiev.ua>
-
-- Michael L. Hostbaek
- mich@FreeBSD.org
diff --git a/net/remarp/pkg-plist b/net/remarp/pkg-plist
deleted file mode 100644
index ca539473cd5d..000000000000
--- a/net/remarp/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-sbin/remarp
-etc/remarp.conf.sample
-%%SITE_PERL%%/remarp/config.pm
-%%SITE_PERL%%/remarp/configure.pm
-@dirrm %%SITE_PERL%%/remarp
diff --git a/net/rtg/Makefile b/net/rtg/Makefile
index fff6992e63b9..f28b48a184fd 100644
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -16,7 +16,7 @@ COMMENT= A flexible, high-performance SNMP statistics monitoring system
BUILD_DEPENDS= \
${LOCALBASE}/lib/mysql/libmysqlclient_r.a:${PORTSDIR}/databases/mysql41-client \
- ${LOCALBASE}/sbin/snmpd:${PORTSDIR}/net/net-snmp
+ ${LOCALBASE}/sbin/snmpd:${PORTSDIR}/net-mgmt/net-snmp
MAN1= rtgplot.1 rtgpoll.1
diff --git a/net/ruby-snmp/distinfo b/net/ruby-snmp/distinfo
deleted file mode 100644
index fcb93d287454..000000000000
--- a/net/ruby-snmp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/rubysnmp-0.2.1.tgz) = 0c30ae623895aa5304c808fddf34dd81
diff --git a/net/ruby-snmp/files/patch-aa b/net/ruby-snmp/files/patch-aa
deleted file mode 100644
index 8e10fe8dbe29..000000000000
--- a/net/ruby-snmp/files/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
---- extconf.rb.orig Mon Jul 10 19:18:51 2000
-+++ extconf.rb Fri Sep 1 01:53:44 2000
-@@ -1,15 +1,11 @@
--require './mkmf.rb'
-+require 'mkmf.rb'
-
- def crash(str)
- printf " extconf failure:%s\n", str
- exit 1
- end
-
--if /linux/ =~ RUBY_PLATFORM
-- $LDFLAGS = "-L/usr/lib"
--else
-- $LDFLAGS = "-L/usr/local/lib"
--end
-+dir_config('snmp')
-
- # Headers
- ruby_h = have_header("ruby.h")
-@@ -35,8 +31,10 @@
- EOF
-
- # Libraies
-+have_library("crypto") if test(?e, "/usr/lib/libcrypto.so");
-+
- snmpsessinit = have_library("snmp", "snmp_sess_init")
--unless snmpsessinit or snmpsessopen or snmpsessclose or snmpsessread or snmpsesssend
-+unless snmpsessinit # or snmpsessopen or snmpsessclose or snmpsessread or snmpsesssend
- crash "This module require snmp_sess_(init|open|close|read|send) functions."
- end
-
-@@ -51,10 +49,10 @@
- $CFLAGS = "-DNO_SNMP_FREE " + $CFLAGS
- end
-
--unless try_link(header+<<EOF, "-lsnmp")
-+if try_link(header+<<EOF, "-lsnmp")
-
- void main() {
-- init_snmp("snmpapp");
-+ init_snmp();
- }
- EOF
- $CFLAGS = "-DVOID_INIT_SNMP " + $CFLAGS
diff --git a/net/ruby-snmp/files/patch-mib.c b/net/ruby-snmp/files/patch-mib.c
deleted file mode 100644
index 48eea59ab40d..000000000000
--- a/net/ruby-snmp/files/patch-mib.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- mib.c.orig Mon Jul 10 19:18:51 2000
-+++ mib.c Sat Mar 30 19:15:41 2002
-@@ -1,4 +1,6 @@
- #include <sys/types.h>
-+#include <netinet/in.h>
-+
- #ifdef HAVE_UCD_SNMP_TOOLS_H
- #include <ucd-snmp/tools.h>
- #endif
diff --git a/net/ruby-snmp/files/patch-snmp.c b/net/ruby-snmp/files/patch-snmp.c
deleted file mode 100644
index 248dc2a04db5..000000000000
--- a/net/ruby-snmp/files/patch-snmp.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- snmp.c.orig Mon Jul 10 19:18:51 2000
-+++ snmp.c Sat Mar 30 19:15:26 2002
-@@ -1,5 +1,6 @@
- #include <errno.h>
- #include <sys/types.h>
-+#include <netinet/in.h>
-
- #ifdef HAVE_UCD_SNMP_TOOLS_H
- #include <ucd-snmp/tools.h>
diff --git a/net/ruby-snmp/pkg-descr b/net/ruby-snmp/pkg-descr
deleted file mode 100644
index b2d233893508..000000000000
--- a/net/ruby-snmp/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Ruby SNMP is UCD-SNMP library interface for the Ruby.
-
-The current version only supports SNMPv1 GET and GETNEXT requests.
-
-Author: Nobuhiko Tsuruoka <tsuruoka@postman.riken.go.jp>
-WWW: http://w3cic.riken.go.jp/~tsuruoka/
diff --git a/net/ruby-snmp/pkg-plist b/net/ruby-snmp/pkg-plist
deleted file mode 100644
index 0fb53724ad83..000000000000
--- a/net/ruby-snmp/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/snmp.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mib_view.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysnmp.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sampleout.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/snmp_module.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/snmp_session.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/snmp_var.html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/net/satellite/distinfo b/net/satellite/distinfo
deleted file mode 100644
index 5dbda79f0298..000000000000
--- a/net/satellite/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (satellite-1.0.2.tar.gz) = 7a6ed7d10ebf864b6b9dde0cbcc478d7
diff --git a/net/satellite/pkg-descr b/net/satellite/pkg-descr
deleted file mode 100644
index a4708e5be82f..000000000000
--- a/net/satellite/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Satellite can track many remote machines with dynamic IP addresses in
-situations where public DNS services are inappropriate. It can log
-and alert an admin immediately when a site comes online or needs
-attention.
-
-WWW: http://www.kyne.com.au/~mark/software/satellite.php
-
-- Mark Pulford
-mark@kyne.com.au
diff --git a/net/satellite/pkg-install b/net/satellite/pkg-install
deleted file mode 100644
index 61b065a8b237..000000000000
--- a/net/satellite/pkg-install
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-case "$2" in
- PRE-INSTALL)
- if ! pw user show satellite >/dev/null 2>&1
- then
- echo "===> Creating user satellite"
- pw add user -n satellite -c 'Satellite system user' -s /sbin/nologin -h - -d /
- fi
- ;;
- POST-INSTALL)
- ;;
- *)
- echo "Incorrect parameter"
- exit 1
- ;;
-esac
diff --git a/net/satellite/pkg-message b/net/satellite/pkg-message
deleted file mode 100644
index 60ec64177cd9..000000000000
--- a/net/satellite/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-If you are planning to use the Satellite server (not the client) on
-this machine you must complete several additional steps, substituting
-your installation prefix (usually /usr/local) for PREFIX:
-
-1) Create the Satellite configuration file:
-# PREFIX/sbin/satcfg -L
-# chown satellite PREFIX/etc/satellite.db
-# chmod 600 PREFIX/etc/satellite.db
-
-2) Create the Satellite log file:
-# touch /var/log/satellite
-# chown satellite /var/log/satellite
-
-3) Add Satellite to /etc/services with the line:
-satellite 1764/tcp
-
-4) Add Satellite to /etc/inetd.conf with the line:
-satellite stream tcp nowait satellite PREFIX/sbin/satellited satellited -v
diff --git a/net/satellite/pkg-plist b/net/satellite/pkg-plist
deleted file mode 100644
index 0cd0d8969de7..000000000000
--- a/net/satellite/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin/satcfg
-sbin/satellite
-sbin/satellited
-sbin/satwatch
diff --git a/net/scdp/distinfo b/net/scdp/distinfo
deleted file mode 100644
index 50e056b9eedd..000000000000
--- a/net/scdp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (scdp-1.0b.tar.gz) = 7eafaf5a422e37d04715613993ed5d95
diff --git a/net/scdp/pkg-descr b/net/scdp/pkg-descr
deleted file mode 100644
index 90bdef9f49af..000000000000
--- a/net/scdp/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This program sends CDP (Cisco Discovery Protocol) packets out on selected
-interfaces and tells the connected switch (Cisco only) where the host is
-connected.
-
-WWW: http://sourceforge.net/projects/scdp/
diff --git a/net/scli/distinfo b/net/scli/distinfo
deleted file mode 100644
index b2e1e0a7f45b..000000000000
--- a/net/scli/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (scli-0.2.12.tar.gz) = 5e2e783d7e5f734f8588f23f215b3ff0
diff --git a/net/scli/files/patch-ab b/net/scli/files/patch-ab
deleted file mode 100644
index db0464b514f8..000000000000
--- a/net/scli/files/patch-ab
+++ /dev/null
@@ -1,991 +0,0 @@
---- /dev/null Fri May 24 23:07:13 2002
-+++ doc/modes.texinfo Fri May 24 23:06:43 2002
-@@ -0,0 +1,988 @@
-+@verbatim
-+ATM MODE
-+========
-+
-+The atm scli mode is based on the ATM-MIB as published in RFC 2515.
-+This mode is intended to display and configure ATM parameters.
-+
-+ `show atm interface info <regexp>'
-+ `show atm interface details <regexp>'
-+
-+The show atm interface info command displays summary information for
-+all selected ATM interfaces. The optional regular expression <regexp>
-+is matched against the interface descriptions to select the interfaces
-+of interest. The command generates a table with the following columns:
-+
-+
-+INTERFACE network interface number
-+
-+
-+The show atm interface details command describes the selected
-+ATM interfaces in more detail. The optional regular expression
-+<regexp> is matched against the interface descriptions to
-+select the interfaces of interest.
-+
-+BRIDGE MODE
-+===========
-+
-+The scli bridge mode is based on the BRIDGE-MIB as published in RFC
-+1493. It provides commands to browse information specific to LAN
-+bridges (also known as layer two switches).
-+
-+ `show bridge info'
-+ `show bridge ports'
-+ `show bridge stp ports'
-+ `show bridge forwarding'
-+ `show bridge filter'
-+ `show bridge stats'
-+ `monitor bridge stats'
-+
-+The show bridge info command displays summary information about a
-+bridge, such as the number of ports and the supported bridging
-+functions and associated parameters.
-+
-+The show bridge ports command displays information about the bridge
-+ports.
-+
-+The show bridge stp ports command displays information about the bridge
-+ports which participate in the spanning tree protocol. The command
-+generates a table with the following columns:
-+
-+
-+ PORT port number
-+ PRIO spanning tree priority of the port
-+ STATE spanning tree status of the port
-+ P-COST path costs for this port
-+ D-ROOT designated root port
-+ D-COST designated costs
-+ D-BRIDGE designated bridge
-+ D-PORT designated port
-+
-+
-+The status is encoded in two characters. The first character
-+indicates whether STP on the port is enabled (E) or disabled
-+(D). The second character indicates the current status
-+(D=disabled, B=blocking, I=listening, L=learning, F=forwarding,
-+X=broken).
-+
-+The show bridge forwarding command displays the forwarding
-+data base used by transparent bridges. The command generates
-+a table with the following columns:
-+
-+ PORT port number
-+ STATUS status of the forwarding entry
-+ ADDRESS address associated with the port
-+ NAME name of the address (where known)
-+ VENDOR vendor info derived from the address
-+
-+
-+The show bridge filter command shows filtering information.
-+
-+The show bridge stats command displays per port statistics for
-+transparent bridges. The command generates a table with the
-+following columns:
-+
-+ PORT port number
-+ I-FPS input frames per second
-+ O-FPS output frames per second
-+ D-FPS discarded frames per second
-+ DESCRIPTION description of the port
-+
-+
-+The monitor bridge stats command shows the same
-+information as the show bridge stats command. Theinformation is updated periodically.
-+
-+CISCO MODE
-+==========
-+
-+The cisco scli mode is used to display and configure cisco parameters.
-+
-+ `show cisco ip accounting info'
-+ `show cisco ip accounting current'
-+ `show cisco ip accounting snapshot'
-+ `monitor cisco ip accounting current'
-+ `monitor cisco ip accounting snapshot'
-+
-+cisco IP accounting info
-+
-+cisco IP current accounting data
-+
-+cisco IP snapshot accounting data
-+
-+cisco IP current accounting data
-+
-+cisco IP snapshot accounting data
-+
-+DISMAN MODE
-+===========
-+
-+The disman scli mode is based on the DISMAN-SCRIPT-MIB as published in
-+RFC 3165 and the DISMAN-SCHEDULE-MIB as published in RFC 3231. It
-+allows to browse and configure distributed managers.
-+
-+ `create disman script <owner> <name> <description>'
-+ `create disman run <owner> <name> <args>'
-+ `show disman languages'
-+ `show disman script info'
-+ `show disman script details'
-+ `show disman launch info'
-+ `show disman launch details'
-+ `show disman run info'
-+ `show disman run details'
-+ `show disman scheduler info'
-+ `show disman scheduler details'
-+ `monitor disman run'
-+
-+...
-+
-+...
-+
-+languages supported by the distributed manager
-+
-+script summary information
-+
-+scripts installed at the distributed manager
-+
-+launch summary information
-+
-+launch buttons installed on the distributed manager
-+
-+summary information about running scripts
-+
-+running scripts on the distributed manager
-+
-+scheduler information
-+
-+schedules on the distributed manager
-+
-+monitor running scripts
-+
-+ENTITY MODE
-+===========
-+
-+The entity scli mode is based on the ENTITY-MIB as published in RFC
-+2737. It provides commands to browse the physical entities or physical
-+components what make up a managed system.
-+
-+ `show entity info'
-+ `show entity details'
-+ `show entity containment'
-+
-+The show entity info command displays summary information about the
-+physical entities that compose the system. The command generates a
-+table with the following columns:
-+
-+
-+ ENTITY entity number
-+ CLASS class of the entity (see below)
-+ NAME name of the entity
-+ DESCRIPTION description of the entity
-+
-+
-+The show entity details command describes the physical entities
-+in more detail.
-+
-+The show entity containment command displays the physical entity
-+containment hierarchy.
-+
-+ETHERNET MODE
-+=============
-+
-+The ethernet scli mode is based on the EtherLike-MIB as published in
-+RFC 2665 and the MAU-MIB as published in RFC 2668.
-+
-+ `show ethernet mau'
-+ `show ethernet stats'
-+ `monitor ethernet stats'
-+
-+The show ethernet mau command displays information about the medium
-+attachment units (MAUs) for each ethernet port. The command generates a
-+table which has the following columns:
-+
-+
-+ INTERFACE network interface number
-+ MAU medium attachment unit number per interface
-+ STATUS status of the medium attachment unit
-+ MEDIA media availability
-+ JABBER jabber state of the medium attachment unit
-+ AUTONEG autonegation capabilities
-+ TYPE type of the medium attachment unit
-+
-+
-+The show ethernet stats command displays ethernet specific
-+statistics for each ethernet interface. The command outputs
-+a table which has the following columns:
-+
-+ INTERFACE network interface number
-+ ALIGN alignement errors per second
-+ FCS frame check sequence errors per second
-+ RCV MAC receive errors per second
-+ LONG frames exceeding maximum frame size per second
-+ DEFER deferred transmission per second
-+ SCOL single collisions per second
-+ MCOLR multiple collisions per second
-+ XCOL excessive collisions per second
-+ LCOL late collisions per second
-+ XMIT MAC transmit errors per second
-+ CARR carrier sense errors per second
-+
-+
-+The monitor ethernet stats command shows the same information
-+as the show ethernet stats command. The information is updated
-+periodically.
-+
-+INTERFACE MODE
-+==============
-+
-+The scli interface mode is based on the IF-MIB as published in RFC
-+2863. It provides commands to browse, monitor and configure arbitrary
-+network interfaces.
-+
-+ `set interface status <regexp> <status>'
-+ `set interface alias <regexp> <string>'
-+ `set interface notifications <regexp> <value>'
-+ `set interface promiscuous <regexp> <bool>'
-+ `show interface info [<regexp>]'
-+ `show interface details [<regexp>]'
-+ `show interface stack [<regexp>]'
-+ `show interface stats [<regexp>]'
-+ `monitor interface stats [<regexp>]'
-+ `alert interface status <regexp> [<regexp>]'
-+ `dump interface'
-+
-+The set interface status command modifies the administrative status of
-+all selected interfaces. The regular expression <regexp> is matched
-+against the interface descriptions to select the interfaces of
-+interest. The <value> parameter must be one of the strings "up",
-+"down", or "testing".
-+
-+The set interface alias command assigns the alias name <string> to the
-+selected interfaces. The alias name provies a non-volatile 'handle'
-+which can be used by management applications to better identify
-+interfaces. The regular expression <regexp> is matched against the
-+interface descriptions to select the interfaces.
-+
-+The set interface notifications command controls whether the selected
-+interfaces generate linkUp and linkDown notifications. The regular
-+expression <regexp> is matched against the interface descriptions to
-+select the interfaces. The <value> parameter must be one of the strings
-+"enabled" or "disabled".
-+
-+The set interface promiscuous command controls whether the selected
-+interfaces operate in promiscuous mode or not. The regular expression
-+<regexp> is matched against the interface descriptions to select the
-+interfaces. The <bool> parameter must be one of the strings "true" or
-+"false".
-+
-+The show interface info command displays summary information for all
-+selected interfaces. The optional regular expression <regexp> is
-+matched against the interface descriptions to select the interfaces of
-+interest. The command generates a table with the following columns:
-+
-+
-+ INTERFACE network interface number
-+ STATUS interface status (see below)
-+ MTU maximum transfer unit
-+ TYPE type of the network interface
-+ SPEED speed in bits per second
-+ NAME name of the network interface
-+ DESCRIPTION description of the network interface
-+
-+
-+The status is encoded in four characters. The first character
-+indicates the administrative status (U=up, D=down, T=testing).
-+The second character indicates the operational status (U=up,
-+D=down, T=testing, ?=unknown, O=dormant, N=not-present,
-+L=lower-layer-down). The third character indicates whether a
-+connector is present (C=connector, N=none) and the fourth
-+character indicates whether the interface is in promiscuous
-+mode (P=promiscuous, N=normal).
-+
-+The show interface details command describes the selected
-+interfaces in more detail. The optional regular expression
-+<regexp> is matched against the interface descriptions to
-+select the interfaces of interest.
-+
-+The show interface stack command shows the stacking order
-+of the interfaces.
-+
-+The show interface stats command displays network
-+interface statistics for all selected interfaces.
-+The optional regular expression <regexp> is matched
-+against the interface description to select the
-+interfaces. The command outputs a table which has
-+the following columns:
-+
-+ INTERFACE network interface number
-+ STATUS interface status (see above)
-+ I-BPS input bytes per second
-+ O-BPS output bytes per second
-+ I-PPS input packets per second
-+ O-PPS output packets per second
-+ I-ERR input errors per second
-+ O-ERR output errors per second
-+ DESCRIPTION description of the network interface
-+
-+
-+The monitor interface stats command shows the same
-+information as the show interface stats command. The
-+information is updated periodically.
-+
-+The alarm interface status command generates alerts for
-+interfaces that are in given status.
-+
-+The dump interface command generates a sequence of scli commands
-+which can be used to restore the interface configuration.
-+
-+IP MODE
-+=======
-+
-+The ip scli mode is based on the IP-MIB as published in RFC 2011, the
-+IP-FORWARD-MIB as published in RFC 2096, the IP-TUNNEL-MIB as published
-+in RFC 2667 and the RFC1213-MIB as published in RFC 1213. It provides
-+commands to browse, monitor and configure IP protocol engines.
-+
-+ `set ip forwarding <value>'
-+ `set ip ttl <number>'
-+ `show ip info'
-+ `show ip forwarding'
-+ `show ip addresses'
-+ `show ip tunnel'
-+ `show ip mapping'
-+ `dump ip'
-+
-+The set ip forwarding command controls whether the IP protocol engine
-+forwards IP datagrams or not. The <value> parameter must be one of the
-+strings "enabled" or "disabled".
-+
-+The set ip ttl command can be used to change the default time to live
-+(TTL) value used by the IP protocol engine. The <number> parameter must
-+be a number between 1 and 255 inclusive.
-+
-+The show ip info command displays paramters of the IP protocol engine,
-+such as the default TTL or whether the node is forwarding IP packets.
-+
-+The show ip forwarding command displays the IP forwarding data base.
-+The command generates a table with the following columns:
-+
-+
-+ DESTINATION
-+ NEXT HOP
-+ TYPE
-+ PROTO
-+ INTERFACE
-+
-+
-+The show ip addresses command displays the IP addresses assigned
-+to network interfaces. The command generates a table with the
-+following columns:
-+
-+ INTERFACE network interface number
-+ ADDRESS IP address
-+ PREFIX IP address prefix length
-+ NAME name of the IP address
-+
-+
-+The show ip tunnel command displays information about existing
-+IP tunnels.
-+
-+The show ip mapping command displays the mapping of IP address
-+to lower layer address (e.g., IEEE 802 addresses). The command
-+generates a table with the following columns:
-+
-+ INTERFACE network interface number
-+ STATUS status of the mapping entry
-+ ADDRESS IP address
-+ ADDRESS lower layer address
-+
-+
-+The dump ip command generates a sequence of scli commands
-+which can be used to restore the IP configuration.
-+
-+NETSNMP MODE
-+============
-+
-+The netsnmp scli mode is used to display and configure netsnmp specific
-+parameters. It is based on the UCD-SNMP-MIB.
-+
-+ `set netsnmp debugging <value>'
-+ `set netsnmp restart'
-+ `show netsnmp info'
-+ `show netsnmp load'
-+ `show netsnmp exec'
-+ `show netsnmp proc'
-+ `dump netsnmp'
-+
-+The set netsnmp debugging command controls whether the agent generates
-+debug messages or not. The <value> parameter must be one of the strings
-+"enabled" or "disabled".
-+
-+The set netsnmp restart command restarts the agent.
-+
-+The show netsnmp info command shows general information about the
-+netsnmp/ucdsnmp agent such as the version number and the software
-+configuration.
-+
-+The show netsnmp load command shows the system's load.
-+
-+The show netsnmp exec command shows information about pre-configured
-+commands that can be invoked.
-+
-+The show netsnmp proc command shows information about which processes
-+netsnmp watches.
-+
-+The dump netsnmp command generates a sequence of scli commands which
-+can be used to restore the netsnmp specific configuration.
-+
-+NORTEL MODE
-+===========
-+
-+The nortel scli mode allows to manipulate virtual lans (vlans) on
-+nortel bridges. It is based on the RAPID-CITY MIB which is implemented
-+at least on the baystack bridges.
-+
-+ `create nortel bridge vlan <vlanid> <name>'
-+ `delete nortel bridge vlan <regexp>'
-+ `set nortel bridge vlan ports <regexp> <ports>'
-+ `set nortel bridge vlan default <string> <ports>'
-+ `show nortel bridge vlan info [<regexp>]'
-+ `show nortel bridge vlan details [<regexp>]'
-+ `show nortel bridge vlan ports'
-+ `dump nortel bridge vlan'
-+
-+The create nortel bridge vlan command is used to create a new vlan with
-+the given <vlanid> and <name>.
-+
-+The delete nortel bridge vlan command deletes all selected vlans. The
-+regular expression <regexp> is matched against the vlan names to select
-+the vlans that should be deleted.
-+
-+The set nortel bridge vlan ports command allows to assign ports to
-+port-based vlans. The regular expression <regexp> is matched against
-+the vlan names to select the vlans that should be modified. The <ports>
-+argument contains a comma separated list of port numbers or port number
-+ranges, e.g. 1,5,7-8.
-+
-+The set nortel bridge vlan default command allows to assign ports to a
-+default vlan. The <string> argument is matched against the vlan names
-+to select the vlan. The <ports> argument contains a comma separated
-+list of port numbers or port number ranges, e.g. 1,5,7-8.
-+
-+The show nortel bridge vlan info command shows summary information
-+about all selected vlans. The optional regular expression <regexp> is
-+matched against the vlan names to select the vlans of interest. The
-+command generates a table with the following columns:
-+
-+
-+ VLAN vlan number
-+ STATUS status of the vlan (see below)
-+ NAME vlan name
-+ PORTS ports assigned to the vlan
-+
-+
-+The status is encoded in four characters. The first character
-+indicates the status of the row (A=active, S=not in service,
-+R=not ready). The second character indicates vlan type (P=B
-+port, I=IP-subnet, O=protocol, S=src address, D=dst address).
-+The third character indicates the priority of the vlan (H=high,
-+N=normal) and the fourth character indicates whether routing
-+is enabled (R=routing, N=no routing).
-+
-+The show nortel bridge vlan details command describes the
-+selected vlans in more detail. The optional regular expression
-+<regexp> is matched against the vlan names to select the vlans
-+of interest.
-+
-+The show nortel bridge vlan ports command shows information
-+for each vlan port. The command generates a table with the
-+following columns:
-+
-+ PORT port number
-+ FLAGS port vlan flags (see below)
-+ DEFAULT default vlan number
-+ VLANS vlan numbers the port is member of
-+
-+
-+The flags are encoded in four characters. The first character
-+indicates the port type (A=access, T=trunk). The second character
-+indicates whether the port tags frames (T=tagging, N=none). The
-+third character indicates whether the port discards tagged frames
-+(D=discard, N=none) and the fourth character indicates whether
-+the port discards untagged frames (D=discard, N=none).
-+
-+The dump nortel bridge vlan command generates a sequence of scli
-+commands which can be used to restore the vlan configuration.
-+
-+OSPF MODE
-+=========
-+
-+The scli ospf mode is used to display and configure OSPF parameters.
-+
-+ `show ospf area'
-+ `show ospf info'
-+ `show ospf interface'
-+
-+show OSPF areas
-+
-+general OSPF information
-+
-+show OSPF interfaces
-+
-+PRINTER MODE
-+============
-+
-+The scli printer mode is based on the Printer-MIB as published in RFC
-+1759 and some updates currently being worked on in the IETF Printer MIB
-+working group.
-+
-+ `show printer info'
-+ `show printer covers'
-+ `show printer inputs'
-+ `show printer outputs'
-+ `show printer markers'
-+ `show printer supplies'
-+ `show printer interpreter'
-+ `show printer console display'
-+ `show printer console lights'
-+ `show printer alerts'
-+ `monitor printer console display'
-+ `monitor printer console lights'
-+ `monitor printer alerts'
-+
-+The show printer info command shows general information about the
-+printer including global status information.
-+
-+The show printer covers command shows information about the covers of a
-+printer.
-+
-+The show printer inputs command shows information about the input
-+sub-units of a printer which provide media for input to the printing
-+process.
-+
-+The show printer output command shows information about the output
-+sub-units of a printer capable of receiving media delivered from the
-+printing process.
-+
-+The show printer markers command shows information about the marker
-+sub-units of a printer which produce marks on the print media.
-+
-+The show printer supplies command shows information about the supplies
-+which are consumed and the waste produced by the markers of a printer.
-+
-+The show printer interpreter command shows information about the page
-+description language and control language interpreters supported by the
-+printer.
-+
-+The show printer console display command shows the current contents of
-+the printer's display. The command generates a table with the following
-+columns:
-+
-+
-+ PRINTER logical printer number
-+ LINE display line number
-+ TEXT contents of the display line
-+
-+
-+The show printer console lights command shows the current
-+status of the printer's lights. The command generates a table
-+with the following columns:
-+
-+ PRINTER logical printer number
-+ LIGHT number identifying the light/led
-+ DESCRIPTION description of the light/led
-+ STATUS current status (on, off, blink)
-+ COLOR current color of the light
-+
-+
-+The show printer alerts command displays the list of active
-+printer alerts including the alert code, the alert severity,
-+the alert description, the alert time, the alert location and
-+the personel required to handle the alert.
-+
-+The monitor printer console display command shows the same
-+information as the show printer console display command. The
-+information is updated periodically.
-+
-+The monitor printer console lights command shows the same
-+information as the show printer console lights command. The
-+information is updated periodically.
-+
-+The monitor printer alerts command shows the same information
-+as the show printer alerts command. The information is updated
-+periodically.
-+
-+SCLI MODE
-+=========
-+
-+The scli mode provides commands that can be used to display and
-+manipulate the internal state of the scli interpreter.
-+
-+ `open <nodename> [<community>]'
-+ `close'
-+ `create scli plugin <module>'
-+ `delete scli plugin <module>'
-+ `exit'
-+ `help'
-+ `history'
-+ `create scli alias <name> <value>'
-+ `delete scli alias <regexp>'
-+ `set scli regex [<regexp>]'
-+ `set scli debugging [<regexp>]'
-+ `set scli pager <pager>'
-+ `set scli format <fmt>'
-+ `show scli info'
-+ `show scli commands'
-+ `show scli aliases'
-+ `show scli modes [<regex>]'
-+ `show scli schema [<regex>]'
-+ `show scli alarm info'
-+
-+The open command establishes an association to a remote SNMP agent. The
-+<nodename> argument is the DNS name or the IP address of the remote
-+node. Scli will try to talks to this node's SNMP agent on the default
-+port number (usually 161) using the default transport mapping (usually
-+SNMP over UDP). The optional <community> argument is the community
-+string needed to communicate with the remote SNMP agent. The default
-+community string is "public". Opening an association while an
-+association is already established is not considered an error. The
-+existing established association will be closed automatically before an
-+attempt to create a new association is started.
-+
-+The close command closes an established association to a remote SNMP
-+agent. Invoking the close command when no association is established is
-+not considered an error and will do just nothing.
-+
-+The create scli plugin command dynamically loads an scli mode into a
-+running scli process. This can be used to dynamically extend scli with
-+modules coming from other sources. Dynamic loadable modules also
-+simplify the development and management of site-specific modules.
-+
-+The delete scli plugin command removes a previously loaded modules from
-+a running scli process.
-+
-+The exit command terminates the scli interpreter. An end of file in the
-+standard input stream will also terminate the the scli interpreter.
-+
-+The help command displays some help information including a list of all
-+top-level scli commands.
-+
-+The history command displays the scli command history list with line
-+numbers.
-+
-+The create scli alias command creates the alias <name> for the scli
-+command (fragment) <value>. If the alias <name> already exists, then
-+the new <value> will be assigned to the existing alias.
-+
-+The delete scli alias command removes previously defined aliases from
-+the scli interpreter. The regular expression <regexp> is matched
-+against all alias names in order to select the aliases that are deleted.
-+
-+The set scli regex command controls how scli matches regular
-+expressions. The optional regular expression <regexp> is matched
-+against the regular expression options. A successful match turns a
-+regular expression option on while an unsuccessful match turns a
-+regular expression option off. Invoking the command without the
-+<regexp> argument will turn all regular expression options off. The
-+currently defined regular expression options are "extended" for POSIX
-+extended regular expressions and "case-insensitive" for case
-+insensitive matches.
-+
-+The set scli debugging command sets the debugging level of the SNMP
-+engine. The optional regular expression <regexp> is matched against the
-+debugging levels. A successful match turns a debugging level on while
-+an unsuccessful match turns a debugging level off. Invoking the command
-+without the <regexp> argument will turn all debugging levels off. The
-+currently defined debugging levels are "session" for the SNMP session
-+layer, "request" for the SNMP request handling layer, "transport" for
-+the SNMP transport layer, "packet" for the SNMP packet layer, and
-+"asn1" for the ASN.1 coding layer.
-+
-+The set scli pager command defines the shell command which is used as a
-+pager if the output produced by an scli command does not fit on a
-+single screen. The output is passed to the <pager> shell command via
-+its standard input stream.
-+
-+The set scli format command defines the output format used by
-+subsequent scli commands. The currently supported formats are "scli"
-+and "xml". The "scli" format is the default output format and described
-+in this documentation. The "xml" output format is experimental and
-+therefore not described here.
-+
-+The show scli info command displays the current status of the scli
-+interpreter.
-+
-+The show scli commands command displays the scli command tree. The
-+full command syntax is displayed for each leaf node.
-+
-+The show scli aliases command lists all scli command aliases. The
-+first column in the generated table lists the aliase names while the
-+second column shows the alias values.
-+
-+The show scli modes command shows information about the scli modes. An
-+scli mode is a logical grouping of related commands (e.g., all commands
-+that deal with printers). The optional regular expression <regex> can
-+be use to select a subset of the available scli modes.
-+
-+The show scli schema command produces xml schema definitions for the
-+selected scli modes. An scli mode is a logical grouping of related
-+commands (e.g., all commands that deal with printers). The optional
-+regular expression <regex> can be use to select a subset of the
-+available scli modes.
-+
-+The show scli alarm info command displays summary information about all
-+known alarms.
-+
-+SNMP MODE
-+=========
-+
-+The snmp scli mode is based on the SNMPv2-MIB as published in RFC 1907,
-+the SNMP-FRAMEWORK-MIB as published in RFC 2571, the
-+SNMP-USER-BASED-SM-MIB as published in RFC 2574, the
-+SNMP-VIEW-BASED-ACM-MIB as published in RFC 2575, the SNMP-TARGET-MIB
-+as published in RFC 2573, and the SNMP-NOTIFICATION-MIB as published in
-+RFC 2573.
-+
-+ `create snmp vacm member <name> <group> [<model>]'
-+ `delete snmp vacm member <regex-name> <regex-group> [<model>]'
-+ `set snmp authentication traps <status>'
-+ `show snmp engine'
-+ `show snmp resources'
-+ `show snmp vacm member'
-+ `show snmp vacm access'
-+ `show snmp vacm views'
-+ `show snmp usm users'
-+ `show snmp target addresses'
-+ `show snmp target parameters'
-+ `show snmp notification targets'
-+ `dump snmp'
-+
-+The create snmp vacm member commands can be used to assign new members
-+(security names) to vacm groups. New groups are created if they do not
-+exist.
-+
-+The delete snmp vacm member commands can be used to delete members
-+(security names) from vacm groups. Groups are deleted if the last
-+member is deleted.
-+
-+The set snmp authentication traps command controls whether the SNMP
-+engine generates authentication failure notifications. The <value>
-+parameter must be one of the strings "enabled" or "disabled".
-+
-+The show snmp engine command displays information about the SNMP
-+protocol engine such as the number of boots, the current time relative
-+to the last boot and the maximum message size.
-+
-+The show snmp resources command displays information about the MIB
-+resources supported by the SNMP agent.
-+
-+The show snmp vacm member command displays the mapping of security
-+names to group names. The command generates a table with the following
-+columns:
-+
-+
-+ ROW row storage type and status
-+ MOD security model
-+ NAME member name (security name)
-+ GROUP name of the vacm group
-+
-+
-+The show snmp vacm access command display the access control
-+rules for the security groups. The command generates a table
-+with the following columns:
-+
-+ ROW row storage type and status
-+ GROUP security group name
-+ MOD security model
-+ LVL security level (--, a-, ap)
-+ CTX context name
-+ MATCH match (exact or prefix)
-+ READ view name for read access
-+ WRITE view name for write access
-+ NOTIFY view name for notification
-+
-+
-+The show snmp vacm views command displays MIB view definitions.
-+The command generates a table with the following columns:
-+
-+ ROW row storage type and status
-+ VIEW view name
-+ TYPE access to the view subtree (incl/excl)
-+ PREFIX object identifier wildcard prefix
-+
-+
-+The show snmp usm users command displays the configured users.
-+The command generates a table with the following columns:
-+
-+ ROW row storage type and status
-+ USER USM user name
-+ NAME security name of the USM user
-+ AUTH authentication protocol
-+ PRIV privacy protocol
-+
-+
-+The show snmp target addresses command displays information
-+about the configured SNMP target addresses. The command
-+generates a table with the following columns:
-+
-+ ROW row storage type and status
-+ TARGET target name
-+ DOMAIN transport domain
-+ ADDRESS transport address
-+ TMOUT timeout value in ms
-+ RETRY number of retries
-+ PARAMS associated parameters
-+ TAGS tag list
-+
-+
-+The show snmp target parameters command displays information
-+about the configured SNMP target parameters. The command
-+generates a table with the following columns:
-+
-+ ROW row storage type and status
-+ PARAMS parameter name
-+ NAME security name
-+
-+
-+The show snmp notification targets command displays information
-+about the configured SNMP notification targets. The command
-+generates a table with the following columns:
-+
-+ ROW row storage type and status
-+ NAME notification target name
-+ TYPE notification type
-+ TAG tag reference to targets
-+
-+
-+The dump snmp command generates a sequence of scli commands
-+which can be used to restore the engine configuration.
-+
-+SYSTEM MODE
-+===========
-+
-+The system scli mode is primarily based on the SNMPv2-MIB as published
-+in RFC 1907 and the HOST-RESOURCES-MIB as publisched in RFC 2790. It
-+can be used to browse and configure system parameters and
-+characteristics.
-+
-+ `set system contact <string>'
-+ `set system name <string>'
-+ `set system location <string>'
-+ `show system info'
-+ `show system devices'
-+ `show system storage'
-+ `show system mounts'
-+ `show system processes [<regexp>]'
-+ `monitor system storage'
-+ `monitor system processes [<regexp>]'
-+ `dump system'
-+
-+The set system contact command configures the system's contact
-+information. The <string> argument should include information on how to
-+contact a person who is responsible for this system.
-+
-+The set system name command configures the systems's name. By
-+convention, this is the system's fully-qualified domain name.
-+
-+The set system location command configures the system's physical
-+location.
-+
-+The show system info command shows general information about the system.
-+
-+The show system devices command shows a list of system devices. The
-+command generates a table with the following columns:
-+
-+
-+ INDEX device number
-+ STATUS current status of the device
-+ DESCRIPTION description of the device
-+
-+
-+The show system storage command displays information about the
-+logical areas attached in the system. The command generates a
-+table with the following columns:
-+
-+ INDEX logical storage area number
-+ DESCRIPTION description of the storage area
-+ TYPE logical storage area type
-+ SIZE total size of the storage area
-+ USED amount of storage in use
-+ FREE amount of storage available
-+ USE% used storage in percent
-+
-+
-+The show system mounts command shows the list of filesystems
-+mounted on the system. The command generates a table with the
-+following columns:
-+
-+ INDEX filesystem identification number
-+ LOCAL local root path name of the filesystem
-+ REMOTE remote server and root path name (if any)
-+ TYPE filesytem type (if known)
-+ OPTIONS access mode (ro/rw) and boot flag
-+
-+
-+The show system processes command display information about the
-+processes currently running on the system. The regular expression
-+<regexp> is matched against the command executed by the process
-+to select the processes of interest.The command generates a table
-+with the following columns:
-+
-+ PID process identification number
-+ S status of the process (see below)
-+ T type of the process (see below)
-+ MEMORY memory used by the process
-+ TIME CPU time used by the process
-+ COMMAND command executed by the process
-+
-+
-+The process status values are C=running, R=runnable,
-+S=not runnable, and Z=invalid. The process types values are
-+?=unknown, O=operating system, D=device driver, and A=application.
-+
-+The monitor system storage command shows the same
-+information as the show system storage command. The
-+information is updated periodically.
-+
-+The monitor system processes command show the same
-+information as the show system processes command. The
-+information is updated periodically.
-+
-+The dump system command generates a sequence of scli commands
-+which can be used to restore the system configuration.
-+
-+TCP MODE
-+========
-+
-+The scli tcp mode is based on the TCP-MIB as published in RFC 2012. It
-+provides commands to browse information specific to the TCP transport
-+protocol.
-+
-+ `show tcp listener'
-+ `show tcp connections'
-+ `monitor tcp connections'
-+
-+The show tcp listener command displays the listening TCP endpoints.
-+
-+The show tcp connections command displays the connected TCP endpoints
-+including the current state of the connection as seen by the remote
-+SNMP agent.
-+
-+The monitor tcp connections command displays the connected TCP
-+endpoints including the current state of the connection as seen by the
-+remote SNMP agent. The information is updated periodically.
-+
-+UDP MODE
-+========
-+
-+The scli udp mode is based on the UDP-MIB as published in RFC 2013. It
-+provides commands to browse information specific to the UDP transport
-+protocol.
-+
-+ `show udp listener'
-+ `show udp stats'
-+
-+The show udp listener command displays the listening UDP endpoints.
-+
-+The show udp statistics about datagrams received or sent.
-+
-+@end verbatim
diff --git a/net/scli/files/patch-ac b/net/scli/files/patch-ac
deleted file mode 100644
index d466792c5ff7..000000000000
--- a/net/scli/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/scli.texinfo_orig Thu Sep 27 09:57:00 2001
-+++ doc/scli.texinfo Fri May 24 16:11:34 2002
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename scli.info
- @settitle SNMP Command Line Interface
-+@dircategory Net Utilities
-+@direntry
-+* SCLI: (scli). SNMP Command Line Interface
-+@end direntry
- @finalout
- @setchapternewpage odd
- @c %**end of header
diff --git a/net/scli/pkg-descr b/net/scli/pkg-descr
deleted file mode 100644
index 149ce93450d3..000000000000
--- a/net/scli/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The scli package written to address the need for small and efficient
-command line utilities to monitor and configure network devices and
-host systems. The scli package is based on the SNMP management
-protocol.
-
-WWW: http://www.ibr.cs.tu-bs.de/projects/scli/
-
diff --git a/net/scotty3/distinfo b/net/scotty3/distinfo
deleted file mode 100644
index 1de7bef2f27a..000000000000
--- a/net/scotty3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (scotty-00-02-21.tar.gz) = ca39ecfaa32f3c5defa81974e8d9ebe2
-SIZE (scotty-00-02-21.tar.gz) = 1774544
diff --git a/net/scotty3/files/patch-aa b/net/scotty3/files/patch-aa
deleted file mode 100644
index de3a255d2b03..000000000000
--- a/net/scotty3/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- tkined.sh.in~ Fri Sep 13 09:30:41 1996
-+++ tkined.sh.in Fri Sep 13 09:26:21 1996
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
-+exec @PREFIX@/bin/tkined1.4.10 $*
---- scotty.sh.in~ Fri Sep 13 09:30:41 1996
-+++ scotty.sh.in Fri Sep 13 09:26:21 1996
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tnm3.0.0"
-+exec @PREFIX@/bin/scotty3.0.0
diff --git a/net/scotty3/files/patch-ab b/net/scotty3/files/patch-ab
deleted file mode 100644
index a441e9db4ce8..000000000000
--- a/net/scotty3/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../tkined/apps/snmp_monitor.tcl.orig Thu Feb 3 23:11:40 2000
-+++ ../tkined/apps/snmp_monitor.tcl Wed Jun 7 16:02:39 2000
-@@ -517,8 +517,11 @@
-
- set args $ip
- set i 0
-+ set snmpconfig [ined attribute $id "SNMP:Config"]
- foreach if $iflist {
-- lappend args [CreateChart $id [expr 30+$i] [expr 30+$i]]
-+ set nid [CreateChart $id [expr 30+$i] [expr 30+$i]]
-+ lappend args $nid
-+ ined -noupdate attribute $nid "SNMP:Config" $snmpconfig
- lappend args $if
- incr i
- }
diff --git a/net/scotty3/files/patch-ac b/net/scotty3/files/patch-ac
deleted file mode 100644
index cc564591c641..000000000000
--- a/net/scotty3/files/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.in Wed Feb 16 11:08:00 2000
-+++ Makefile.in Thu Mar 8 19:20:25 2001
-@@ -56,7 +56,7 @@
-
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
--CFLAGS = -O
-+CFLAGS = @CFLAGS@
-
- # NMICMPD should contain the full path to the installed nmicmpd binary.
- NMICMPD = $(BIN_INSTALL_DIR)/nmicmpd
-@@ -473,7 +473,7 @@
- $(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
-
- tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
-- $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS)
-+ $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) @NEED_TCL_LIB@ $(LIBS)
-
- tkined: tkined$(SHLIB_SUFFIX) $(UNIX_DIR)/tkined.in
- @sed -e 's+%WISH%+$(TK_WISH)+' \
-@@ -528,7 +528,7 @@
- @$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
- @$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
-- @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
-+ @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
-
- tnm-install-man:
- @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN8_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
-@@ -708,10 +708,14 @@
- fi; \
- done;
- @echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
-- @$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+ @$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+ @sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
-+ @sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
-+ @$(INSTALL_DATA) -m 555 tkined.sh ${BIN_INSTALL_DIR}/tkined
-+ @$(INSTALL_DATA) -m 555 scotty.sh ${BIN_INSTALL_DIR}/scotty
- @$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
-- @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
-+ @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
- @$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
-
- tki-install-man:
diff --git a/net/scotty3/files/patch-ad b/net/scotty3/files/patch-ad
deleted file mode 100644
index e09d45dc0d54..000000000000
--- a/net/scotty3/files/patch-ad
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure Wed Feb 16 11:08:00 2000
-+++ configure Thu Mar 8 19:22:52 2001
-@@ -749,9 +749,14 @@
- LD_FLAGS=$TCL_LD_FLAGS
- LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
- TCL_EXEC_PREFIX=$TCL_EXEC_PREFIX
--TCL_INCLUDES=-I$TCL_PREFIX/include
-+TCL_INCLUDES=-I$TCL_PREFIX/include/tcl$TCL_VERSION
- TK_EXEC_PREFIX=$TK_EXEC_PREFIX
-
-+if /usr/bin/ldd ${prefix}/bin/tclsh$TCL_VERSION | fgrep -qv libtcl; then
-+ CFLAGS="$CFLAGS -DUSE_TCL_STUBS"
-+ NEED_TCL_LIB=$TCL_LIB_SPEC
-+fi
-+
- if test $TCL_SHARED_BUILD -ne 1 ; then
- { echo "configure: error: Tcl is not configured with --enable-shared" 1>&2; exit 1; }
- fi
-@@ -763,8 +767,8 @@
- echo $ac_n "checking for tcl version""... $ac_c" 1>&6
- echo "configure:765: checking for tcl version" >&5
- echo "$ac_t"""$TCL_VERSION"" 1>&6
--if test "$TCL_VERSION" != "8.2" ; then
-- { echo "configure: error: "Tcl version 8.2 needed"" 1>&2; exit 1; }
-+if test "$TCL_VERSION" \< "8.2" ; then
-+ { echo "configure: error: "Tcl version at least 8.2 needed"" 1>&2; exit 1; }
- fi
-
- BUILD_TARGETS="$BUILD_TARGETS scotty"
-@@ -821,6 +825,7 @@
- fi
-
-
-+if test x$tnm_path_tk_config != xno; then
- dirs="$tnm_path_tk_config $wish_prefix/lib $prefix/lib /usr/local/lib"
-
- found=0
-@@ -842,7 +847,7 @@
- echo "configure: warning: "will not build tkined"" 1>&2
- else
- . $tnm_cv_path_tk_config/tkConfig.sh
-- TK_INCLUDES=-I$TK_PREFIX/include
-+ TK_INCLUDES=-I$TK_PREFIX/include/tk$TK_VERSION
- if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
- TK_INCLUDES=""
- fi
-@@ -850,13 +855,14 @@
- echo $ac_n "checking for tk version""... $ac_c" 1>&6
- echo "configure:852: checking for tk version" >&5
- echo "$ac_t"""$TK_VERSION"" 1>&6
-- if test "$TK_VERSION" != "8.2" ; then
-- { echo "configure: error: "Tk version 8.2 needed"" 1>&2; exit 1; }
-+ if test "$TK_VERSION" \< "8.2" ; then
-+ { echo "configure: error: "Tk version at least 8.2 needed"" 1>&2; exit 1; }
- fi
-
- BUILD_TARGETS="$BUILD_TARGETS tkined"
- INSTALL_TARGETS="$INSTALL_TARGETS tki-install"
- fi
-+fi # --with-tk=<something other than ``no''>
-
- #----------------------------------------------------------------------------
- # Check for some basic stuff. We don't check for the compiler.
-@@ -3318,6 +3324,7 @@
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-+s%@NEED_TCL_LIB@%$NEED_TCL_LIB%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
diff --git a/net/scotty3/files/patch-ae b/net/scotty3/files/patch-ae
deleted file mode 100644
index 95bd9e1a0721..000000000000
--- a/net/scotty3/files/patch-ae
+++ /dev/null
@@ -1,8 +0,0 @@
---- tkined.sh.in.orig Tue Jun 6 05:14:19 2000
-+++ tkined.sh.in Tue Jun 6 05:13:12 2000
-@@ -1,3 +1,3 @@
- #!/bin/sh
--export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
--exec @PREFIX@/bin/tkined1.4.10 $*
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.5.0 @PREFIX@/lib/tnm3.0.0"
-+exec @PREFIX@/bin/tkined1.5.0 $*
diff --git a/net/scotty3/files/patch-af b/net/scotty3/files/patch-af
deleted file mode 100644
index 19ba69fd4144..000000000000
--- a/net/scotty3/files/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../tnm/generic/tnmInt.h.orig Tue Sep 21 14:17:18 1999
-+++ ../tnm/generic/tnmInt.h Tue Dec 9 00:06:26 2003
-@@ -54,11 +54,16 @@
- */
-
- #define TnmGetTime TclpGetTime
-+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 4
-+#define TnmCreateDirectory(p) mkdir (p, 0777)
-+#define TnmStat stat
-+#else
- #define TnmCreateDirectory TclpCreateDirectory
--#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 8 && TCL_RELEASE_SERIAL > 2
-+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 3 && TCL_RELEASE_SERIAL > 2
- #define TnmStat TclStat
- #else
- #define TnmStat stat
-+#endif
- #endif
-
- EXTERN void
diff --git a/net/scotty3/files/patch-fixes b/net/scotty3/files/patch-fixes
deleted file mode 100644
index 0940c7e0c6cd..000000000000
--- a/net/scotty3/files/patch-fixes
+++ /dev/null
@@ -1,38 +0,0 @@
-This patches fix actual BUGS in the Scotty code:
- . any Tcl above 8.2 will also work fine;
- . icmp.test no longer causes crashes -- an off-by-one
- error in argument parsing code was the reason for
- occasional segfaults
- . TUBS-REGISTRATION was renamed to TUBS-SMI, but the
- mibs.test did not know about it
-There still are some test failures, but I think (hope), they are due to
-mistakes in the tests themselves.
-
- -mi
-
---- ../tnm/generic/tnmInit.c Wed Oct 6 05:35:57 1999
-+++ ../tnm/generic/tnmInit.c Thu Mar 8 19:49:33 2001
-@@ -431,3 +431,3 @@
- #ifdef USE_TCL_STUBS
-- if (Tcl_InitStubs(interp, "8.2", 1) == NULL) {
-+ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
- return TCL_ERROR;
---- ../tnm/generic/tnmIcmp.c Wed Oct 6 05:07:04 1999
-+++ ../tnm/generic/tnmIcmp.c Fri Mar 9 17:58:05 2001
-@@ -273,6 +273,6 @@
- * Parse the options.
- */
-
-- while (1) {
-+ while (x < objc) {
- code = TnmGetTableKeyFromObj(interp, icmpOptionTable,
- objv[x], "option");
---- ../tnm/tests/mib.test Fri Feb 11 14:43:38 2000
-+++ ../tnm/tests/mib.test Fri Mar 9 18:25:48 2001
-@@ -30,1 +30,1 @@
--lappend tnm(mibs) TUBS-REGISTRATION TUBS-IBR-TEST-MIB
-+lappend tnm(mibs) TUBS-SMI TUBS-IBR-TEST-MIB
-@@ -689,2 +689,2 @@
- mib info files *SMI
--} {RFC1155-SMI SNMPv2-SMI}
-+} {RFC1155-SMI SNMPv2-SMI TUBS-SMI}
diff --git a/net/scotty3/files/patch-unix:nmicmpd.c b/net/scotty3/files/patch-unix:nmicmpd.c
deleted file mode 100644
index 6432fa8643d7..000000000000
--- a/net/scotty3/files/patch-unix:nmicmpd.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- nmicmpd.c.orig Tue Feb 6 15:34:03 2001
-+++ nmicmpd.c Tue Feb 6 15:44:53 2001
-@@ -924,6 +924,14 @@
-
- if (rc != size) {
- if (rc < 0) {
-+ /*
-+ * If we get an EHOSTDOWN error, this probably means that
-+ * the the pending ARP entry has timed out for the host.
-+ * Just ignore the error, and attempt a normal retry.
-+ */
-+ if (errno == EHOSTDOWN)
-+ return 0;
-+
- PosixError("sendto failed");
- }
- job->status = ICMP_STATUS_GENERROR;
diff --git a/net/scotty3/files/scotty.c b/net/scotty3/files/scotty.c
deleted file mode 100644
index 375cd2a7529e..000000000000
--- a/net/scotty3/files/scotty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* All that's needed for bin/scotty, really... -mi */
-
-#include "tnmInt.h"
-
-static int
-Tcl_AppInit(interp)
- Tcl_Interp *interp;
-{
- if (Tcl_Init(interp) != TCL_OK) {
- return TCL_ERROR;
- }
-
- if (Tcl_PkgRequire(interp, "Tnm", TNM_VERSION, 1) == NULL) {
- return TCL_ERROR;
- }
-
- Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY);
- return TCL_OK;
-}
-
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
- Tcl_Main(argc, argv, Tcl_AppInit);
-}
diff --git a/net/scotty3/pkg-descr b/net/scotty3/pkg-descr
deleted file mode 100644
index fcc22b336440..000000000000
--- a/net/scotty3/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-scotty is a tcl extension which allows to set up TCP and UDP
-connections, to send various ICMP packets, to query the domain name
-system (DNS), to check clock skew using the NTP protocol and to query
-various SUN RPC services (like rstat and mountd).
-
-WWW: http://wwwhome.cs.utwente.nl/~schoenw/scotty/
diff --git a/net/scotty3/pkg-plist b/net/scotty3/pkg-plist
deleted file mode 100644
index 600a90964bb3..000000000000
--- a/net/scotty3/pkg-plist
+++ /dev/null
@@ -1,375 +0,0 @@
-bin/nmicmpd
-bin/nmtrapd
-bin/scotty%%SCOTTY_VERSION%%
-bin/scotty
-%%X11%%bin/tkined
-%%X11%%bin/tkined%%TKINED_VERSION%%
-lib/tnm%%SCOTTY_VERSION%%/mibs/ACCOUNTING-CONTROL-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ADSL-LINE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ADSL-TC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/AGENTX-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/APPC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/APPLETALK-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/APPLICATION-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/APPN-DLUR-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/APPN-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/APPN-TRAP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ATM-ACCOUNTING-INFORMATION-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ATM-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ATM-TC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/BGP4-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/BRIDGE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/CHARACTER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/CLNS-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DECNET-PHIV-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DIAL-CONTROL-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DIRECTORY-SERVER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DISMAN-SCHEDULE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DISMAN-SCRIPT-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DLSW-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DNS-RESOLVER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DNS-SERVER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DOCS-CABLE-DEVICE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DOCS-IF-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DOT12-IF-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DOT12-RPTR-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DS0-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DS0BUNDLE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DS1-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DS3-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/DSA-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/EBN-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ENTITY-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ETHER-CHIPSET-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/EtherLike-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/FDDI-SMT73-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/FLOW-METER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/FRAME-RELAY-DTE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/FRNETSERV-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/HOST-RESOURCES-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/HPR-IP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/HPR-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IANA-LANGUAGE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IANATn3270eTC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IANAifType-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IF-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/INTEGRATED-SERVICES-GUARANTEED-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/INTEGRATED-SERVICES-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IP-FORWARD-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPATM-IPMC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPOA-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPV6-ICMP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPV6-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPV6-TC
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPV6-TCP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/IPV6-UDP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/ISDN-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/Job-Monitoring-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/MAU-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/MIOX25-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/MIP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/MTA-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/Modem-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/NETWORK-SERVICES-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/NHRP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/OSPF-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/OSPF-TRAP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/P-BRIDGE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/PARALLEL-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/PPP-BRIDGE-NCP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/PPP-IP-NCP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/PPP-LCP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/PPP-SEC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/PerfHist-TC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/Printer-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/Q-BRIDGE-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RADIUS-ACC-CLIENT-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RADIUS-ACC-SERVER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RADIUS-AUTH-CLIENT-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RADIUS-AUTH-SERVER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RDBMS-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RFC1155-SMI
-lib/tnm%%SCOTTY_VERSION%%/mibs/RFC1213-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RFC1269-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RFC1381-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RFC1382-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RFC1414-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RIPv2-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RMON-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RMON2-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RS-232-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/RSVP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SIP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SMON-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNA-NAU-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNA-SDLC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-FRAMEWORK-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-MPD-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-NOTIFICATION-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-PROXY-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-REPEATER-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-TARGET-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-USER-BASED-SM-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMP-VIEW-BASED-ACM-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMPv2-CONF
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMPv2-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMPv2-SMI
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMPv2-TC
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMPv2-TM
-lib/tnm%%SCOTTY_VERSION%%/mibs/SNMPv2-USEC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SONET-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SOURCE-ROUTING-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/SYSAPPL-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TCP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TCPIPX-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TN3270E-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TN3270E-RT-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TOKEN-RING-RMON-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TOKENRING-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TOKENRING-STATION-SR-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-IBR-LINUX-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-IBR-NFS-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-IBR-PROC-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-IBR-TEST-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-IBR-TNM-COMPAT
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-IBR-TNM-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUBS-SMI
-lib/tnm%%SCOTTY_VERSION%%/mibs/TUNNEL-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/UDP-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/UPS-MIB
-lib/tnm%%SCOTTY_VERSION%%/mibs/WWW-MIB
-lib/tnm%%SCOTTY_VERSION%%/pkgIndex.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/README
-lib/tnm%%SCOTTY_VERSION%%/library/TnmDialog.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmDisman.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmEther.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmIetf.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmInet.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmMap.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmMib.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmMonitor.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmSnmp.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/TnmTerm.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/init.tcl
-lib/tnm%%SCOTTY_VERSION%%/library/pkgIndex.tcl
-lib/tnm%%SCOTTY_VERSION%%/agents/snmpd
-lib/tnm%%SCOTTY_VERSION%%/agents/snmpd-tnm.tcl
-lib/tnm%%SCOTTY_VERSION%%/agents/snmpd-nfs.tcl
-lib/tnm%%SCOTTY_VERSION%%/agents/snmpd-proc.tcl
-lib/tnm%%SCOTTY_VERSION%%/agents/README
-lib/tnm%%SCOTTY_VERSION%%/examples/bridge
-lib/tnm%%SCOTTY_VERSION%%/examples/bridge.n
-lib/tnm%%SCOTTY_VERSION%%/examples/discover
-lib/tnm%%SCOTTY_VERSION%%/examples/discover.n
-lib/tnm%%SCOTTY_VERSION%%/examples/emok
-lib/tnm%%SCOTTY_VERSION%%/examples/emok.n
-lib/tnm%%SCOTTY_VERSION%%/examples/etherload
-lib/tnm%%SCOTTY_VERSION%%/examples/etherload.n
-lib/tnm%%SCOTTY_VERSION%%/examples/ifload
-lib/tnm%%SCOTTY_VERSION%%/examples/ifload.n
-lib/tnm%%SCOTTY_VERSION%%/examples/ifload2gif
-lib/tnm%%SCOTTY_VERSION%%/examples/ifload2gif.n
-lib/tnm%%SCOTTY_VERSION%%/examples/mibgrep
-lib/tnm%%SCOTTY_VERSION%%/examples/mibgrep.n
-lib/tnm%%SCOTTY_VERSION%%/examples/mibtree
-lib/tnm%%SCOTTY_VERSION%%/examples/mibtree.n
-lib/tnm%%SCOTTY_VERSION%%/examples/nslook
-lib/tnm%%SCOTTY_VERSION%%/examples/nslook.n
-lib/tnm%%SCOTTY_VERSION%%/examples/pcnfs
-lib/tnm%%SCOTTY_VERSION%%/examples/pcnfs.n
-lib/tnm%%SCOTTY_VERSION%%/examples/rpcprobe
-lib/tnm%%SCOTTY_VERSION%%/examples/rpcprobe.n
-lib/tnm%%SCOTTY_VERSION%%/examples/rstat
-lib/tnm%%SCOTTY_VERSION%%/examples/rstat.n
-lib/tnm%%SCOTTY_VERSION%%/examples/snmptrapd
-lib/tnm%%SCOTTY_VERSION%%/examples/snmptrapd.n
-lib/tnm%%SCOTTY_VERSION%%/examples/snmpwalk
-lib/tnm%%SCOTTY_VERSION%%/examples/snmpwalk.n
-lib/tnm%%SCOTTY_VERSION%%/examples/tcpspeed
-lib/tnm%%SCOTTY_VERSION%%/examples/tcpspeed.n
-lib/tnm%%SCOTTY_VERSION%%/examples/traceroute
-lib/tnm%%SCOTTY_VERSION%%/examples/traceroute.n
-lib/tnm%%SCOTTY_VERSION%%/examples/udploss
-lib/tnm%%SCOTTY_VERSION%%/examples/udploss.n
-lib/tnm%%SCOTTY_VERSION%%/examples/udpspeed
-lib/tnm%%SCOTTY_VERSION%%/examples/udpspeed.n
-lib/tnm%%SCOTTY_VERSION%%/examples/uiping
-lib/tnm%%SCOTTY_VERSION%%/examples/uiping.n
-lib/tnm%%SCOTTY_VERSION%%/examples/yanny
-lib/tnm%%SCOTTY_VERSION%%/examples/yanny.n
-lib/tnm%%SCOTTY_VERSION%%/site/init.tcl
-lib/tnm%%SCOTTY_VERSION%%.so
-%%X11%%lib/tkined%%TKINED_VERSION%%/pkgIndex.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/tkined.defaults
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Command.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Diagram.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Dialog.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Editor.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Event.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Help.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Misc.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Objects.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/Tool.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/library/pkgIndex.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/Box.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/BoxMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DEC-Server.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DEC-ServerMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DEC.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DECMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HP.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HP7550.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HP7550Mask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPdj.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPdjMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPsj.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPsjMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/IPC.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/IPCMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-client.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-clientMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-server.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-serverMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/RS6000.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/RS6000Mask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SLC.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SLCMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN-Server.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN-ServerMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN3.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN3Mask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SparcStation.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SparcStationMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/Xstation.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/XstationMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/action.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/actionMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/backbone.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/backboneMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bigBox.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bigBoxMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bone.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/boneMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bridge.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bridgeMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bus.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/busMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/cisco.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ciscoMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/clock.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/clockMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/concent.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/concentMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/connector.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/connectorMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/corner.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/explode.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/explodeMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/graph.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/group.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/groupMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/hand.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/handMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/hyper.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/hyperMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/icon.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ined.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/inedMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/laser.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/laserMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/link.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/linkMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/locker.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/lockerMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/mac.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/macMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/machine.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/machineMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/modem.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/modemMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/mx.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/mxMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/network.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/networkMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/node.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/nodeMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/noicon.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/octane.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/octaneMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/parsytec.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/parsytecMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pc.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pcMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/phone.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/phoneMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pointer.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pointerMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/printer.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/printerMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pserver.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pserverMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/reference.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/referenceMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ring.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ringMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/router.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/routerMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/smallBox.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/smallBoxMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/spock.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/switch.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/switchMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/text.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/textMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tkined.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tkinedMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tserver.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tserverMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/unixpc.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/unixpcMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/world.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/worldMask.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/zoomin.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/zoomout.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/README
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/clock.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/event.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/game.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/germany-map.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_discover.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_layout.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_monitor.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_trouble.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_world.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/library.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/locations
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/manager.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/mibtree
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/movie.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/netherlands-map.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_browser.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_cisco.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_config.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_disman.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_host.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_hp.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_monitor.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_trouble.tcl
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/usa-map.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/world-map.xbm
-%%X11%%lib/tkined%%TKINED_VERSION%%/apps/tclIndex
-%%X11%%lib/tkined%%TKINED_VERSION%%.so
-%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%/library
-%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%/bitmaps
-%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%/apps
-%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%
-@dirrm lib/tnm%%SCOTTY_VERSION%%/mibs
-@dirrm lib/tnm%%SCOTTY_VERSION%%/icons
-@dirrm lib/tnm%%SCOTTY_VERSION%%/library
-@dirrm lib/tnm%%SCOTTY_VERSION%%/examples
-@dirrm lib/tnm%%SCOTTY_VERSION%%/agents
-@dirrm lib/tnm%%SCOTTY_VERSION%%/site
-@dirrm lib/tnm%%SCOTTY_VERSION%%
diff --git a/net/sendip/distinfo b/net/sendip/distinfo
deleted file mode 100644
index 56b1a2cb0b13..000000000000
--- a/net/sendip/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sendip-2.5.tar.gz) = 35fa3306f39bfd46d83371da63eec3ad
diff --git a/net/sendip/files/patch-Makefile b/net/sendip/files/patch-Makefile
deleted file mode 100644
index a3a0a455f5e1..000000000000
--- a/net/sendip/files/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig Tue Jan 28 13:03:48 2003
-+++ Makefile Tue Jan 28 13:04:35 2003
-@@ -1,23 +1,23 @@
- #configureable stuff
--PREFIX ?= /usr/local
--BINDIR ?= $(PREFIX)/bin
--MANDIR ?= $(PREFIX)/share/man/man1
--LIBDIR ?= $(PREFIX)/lib/sendip
-+#PREFIX ?= /usr/local
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man/man1
-+LIBDIR=${PREFIX}/lib/sendip
- #For most systems, this works
--INSTALL ?= install
-+INSTALL?=install
- #For Solaris, you may need
- #INSTALL=/usr/ucb/install
-
- CFLAGS= -fPIC -fsigned-char -pipe -Wall -Wpointer-arith -Wwrite-strings \
- -Wstrict-prototypes -Wnested-externs -Winline -Werror -g -Wcast-align \
-- -DSENDIP_LIBS=\"$(LIBDIR)\"
-+ -DSENDIP_LIBS=\"${LIBDIR}\"
- #-Wcast-align causes problems on solaris, but not serious ones
- LDFLAGS= -g -rdynamic -lm
- #LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm
- LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm -ldl
- LDFLAGS_LINUX= -g -rdynamic -ldl -lm
- LIBCFLAGS= -shared
--CC= gcc
-+#CC= gcc
-
- PROGS= sendip
- BASEPROTOS= ipv4.so ipv6.so
diff --git a/net/sendip/files/patch-gnugetopt.c b/net/sendip/files/patch-gnugetopt.c
deleted file mode 100644
index 65ec257ae5ad..000000000000
--- a/net/sendip/files/patch-gnugetopt.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnugetopt.c.orig Thu May 22 08:35:25 2003
-+++ gnugetopt.c Thu May 22 08:35:37 2003
-@@ -45,6 +45,7 @@
- #endif
-
- #include <stdio.h>
-+#include <string.h>
-
- /* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
diff --git a/net/sendip/pkg-descr b/net/sendip/pkg-descr
deleted file mode 100644
index 03b0c1211c7b..000000000000
--- a/net/sendip/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-SendIP has a large number of command line options to specify the content of
-every header of a RIP, TCP, UDP, ICMP or raw IPv4 and IPv6 packet. It also
-allows any data to be added to the packet. Checksums can be calculated
-automatically, but if you wish to send out wrong checksums, that is
-supported too.
-
-WWW: http://www.earth.li/projectpurple/progs/sendip.html
diff --git a/net/sendip/pkg-plist b/net/sendip/pkg-plist
deleted file mode 100644
index fa444f45d78c..000000000000
--- a/net/sendip/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/sendip
-lib/sendip/ipv4.so
-lib/sendip/ipv6.so
-lib/sendip/icmp.so
-lib/sendip/tcp.so
-lib/sendip/udp.so
-lib/sendip/rip.so
-lib/sendip/ripng.so
-lib/sendip/bgp.so
-lib/sendip/ntp.so
-@dirrm lib/sendip
diff --git a/net/sing/distinfo b/net/sing/distinfo
deleted file mode 100644
index f0b9313ded0c..000000000000
--- a/net/sing/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (SING-1.1.tgz) = f9f649c4b40174a983601d46e4a3daac
diff --git a/net/sing/files/patch-Makefile.in b/net/sing/files/patch-Makefile.in
deleted file mode 100644
index 89198ecd6a7b..000000000000
--- a/net/sing/files/patch-Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.in.orig Wed Apr 18 14:11:06 2001
-+++ Makefile.in Thu May 3 16:01:19 2001
-@@ -76,7 +76,7 @@
- libnetdir = @libnetdir@
- libpcapdir = @libpcapdir@
-
--INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
-+INCLUDES = -I$(includedir) #-I$(libpcapdir) -I$(libnetdir)/include
-
- LIBS = @LIBS@ -lpcap -lnet
-
-@@ -111,7 +111,7 @@
- SOURCES = $(sing_SOURCES)
- OBJECTS = $(sing_OBJECTS)
-
--all: libpcap libnet all-redirect
-+all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
-
-@@ -152,11 +152,11 @@
-
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(bindir)
-+ $(mkinstalldirs) $(DESTDIR)$(sbindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
-@@ -226,8 +226,7 @@
-
-
- help.o: help.c config.h
--sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
-- sing.h ipcompat.h misc.h packet.h dev_struct.h
-+sing.o: sing.c config.h sing.h ipcompat.h misc.h packet.h dev_struct.h
- ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
- misc.h
- device.o: device.c config.h device.h misc.h packet.h dev_struct.h
diff --git a/net/sing/files/patch-configure b/net/sing/files/patch-configure
deleted file mode 100644
index 44c0c18a9355..000000000000
--- a/net/sing/files/patch-configure
+++ /dev/null
@@ -1,53 +0,0 @@
---- configure.orig Thu May 3 17:44:18 2001
-+++ configure Thu May 3 16:33:56 2001
-@@ -11,6 +11,10 @@
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
-+ac_help="$ac_help
-+ --with-libnet-prefix=PATH path for libnet-config"
-+ac_help="$ac_help
-+ --with-libpcap-prefix=PATH path for libpcap"
-
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -526,8 +530,23 @@
-
-
-
--libpcapdir=libpcap-0.4
--libnetdir=Libnet-1.0.1b
-+# Check whether --with-libnet-prefix or --without-libnet-prefix was given.
-+if test "${with_libnet_prefix+set}" = set; then
-+ withval="$with_libnet_prefix/bin"
-+ libnetdir="$withval"
-+else
-+ libnetdir="Libnet-1.0.1b"
-+fi
-+
-+
-+# Check whether --with-libpcap-prefix or --without-libpcap-prefix was given.
-+if test "${with_libpcap_prefix+set}" = set; then
-+ withval="$with_libpcap_prefix"
-+ libpcapdir="$withval"
-+else
-+ libpcapdir="libpcap-0.4"
-+fi
-+
-
-
-
-@@ -1097,12 +1116,9 @@
- fi
- fi
-
--if test -n "$GCC"; then
-- CFLAGS="-O3 -Wall"
--fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1106: checking how to run the C preprocessor" >&5
-+echo "configure:1122: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
diff --git a/net/sing/pkg-descr b/net/sing/pkg-descr
deleted file mode 100644
index d53357cb5ff9..000000000000
--- a/net/sing/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Sing is a little tool that sends ICMP packets fully customized from command
-line. The main purpose is to replace/complement the niceful ping command
-with certain enhancements as:
-
- - Send fragmented packets (Linux and BSD).
- - Send monster packets > 65534 (Linux and BSD).
- - Send/read spoofed packets.
- - Send many ICMP Information types in addition to the ECHO REQUEST type sent
- by default as Address Mask Request, Timestamp, Information Request, Router
- Solicitation and Router Advertisement.
- - Send many ICMP error types: Redirect, Source Quench, Time Exceeded,
- Destination Unreach and Parameter Problem.
- - Send to host with Loose or Strict Source Routing.
- - Use little fingerprinting techniques to discover Windows or Solaris boxes.
- - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
- Unix and Windows at the moment.
-
-WWW: http://sourceforge.net/projects/sing/
-
---Roman <roman@xpert.com>
diff --git a/net/sipcalc/distinfo b/net/sipcalc/distinfo
deleted file mode 100644
index a89cdd166c1a..000000000000
--- a/net/sipcalc/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sipcalc-1.1.2.tar.gz) = 6be9c77d8c9ba4fff8291389a33c2de1
diff --git a/net/sipcalc/pkg-descr b/net/sipcalc/pkg-descr
deleted file mode 100644
index a291eaaed04a..000000000000
--- a/net/sipcalc/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Sipcalc is an ip subnet calculator.
-Features:
-
-IPv4 -
-* Retrieving of address information from interfaces.
-* Classful and CIDR output.
-* Multiple address and netmask formats (dotted quad, hex, number of bits).
-* Output of broadcast address, network class, Cisco wildcard, hosts/range,
- network range.
-* Output of a userdefined number of extra networks.
-* The ability to "split" a network based on a smaller netmask,
- now also with recursive runs on the generated subnets.
-* DNS resolution.
-
-IPv6 -
-* Compressed and expanded input addresses.
-* Compressed and expanded output.
-* Standard IPv6 network output.
-* Reverse dns address generation.
-* The ability to "split" a network based on a smaller netmask,
- now also with recursive runs on the generated subnets.
-* DNS resolution.
-
-WWW: http://www.routemeister.net/projects/sipcalc/
diff --git a/net/sipcalc/pkg-plist b/net/sipcalc/pkg-plist
deleted file mode 100644
index ba6a605b7fe4..000000000000
--- a/net/sipcalc/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/sipcalc
-%%PORTDOCS%%share/doc/sipcalc/sipcalc.txt
-%%PORTDOCS%%@dirrm share/doc/sipcalc
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 6643000d695c..6ee949f103dc 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -15,7 +15,7 @@ COMMENT= Latency logging and graphing system
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
- ${SITE_PERL}/BER.pm:${PORTSDIR}/net/p5-SNMP_Session \
+ ${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
diff --git a/net/sting/distinfo b/net/sting/distinfo
deleted file mode 100644
index 214db5a42fdb..000000000000
--- a/net/sting/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (sting.tar.gz) = 7b0d22f96bbde22f94ed5eb0f4a39e29
-SIZE (sting.tar.gz) = 143749
diff --git a/net/sting/files/patch-aa b/net/sting/files/patch-aa
deleted file mode 100644
index 97e617a7d8cd..000000000000
--- a/net/sting/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig Thu Nov 4 11:00:22 1999
-+++ Makefile Sat Jul 1 16:27:33 2000
-@@ -37,12 +37,13 @@
- HDR = inet.h capture.h gmt2local.h distribtion.h
-
- LIBPCAP = ./libpcap-0.4
--CC = gcc
-+CC ?= gcc
-+CFLAGS ?= -O -pipe
- OBJS = version.o $(SRC:.c=.o)
- INCLS = -I. -I$(LIBPCAP)
- DEFS = -DRETSIGTYPE=void -DHAVE_SIGACTION=1
--CFLAGS = -Wall $(CCOPT) $(DEFS) $(INCLS)
--LIBS = -lm $(LIBPCAP)/libpcap.a
-+CFLAGS += -Wall $(DEFS) $(INCLS)
-+LIBS = -lm -lpcap
-
- all: sting
-
diff --git a/net/sting/files/patch-ab b/net/sting/files/patch-ab
deleted file mode 100644
index 11ec20827f7b..000000000000
--- a/net/sting/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmt2local.c Fri Nov 5 06:00:22 1999
-+++ gmt2local.c.new Wed May 10 11:10:05 2000
-@@ -32,7 +32,7 @@
- #include <time.h>
- #endif
-
--#include "gnuc.h"
-+/* #include "gnuc.h" */
- #ifdef HAVE_OS_PROTO_H
- #include "os-proto.h"
- #endif
diff --git a/net/sting/files/patch-ac b/net/sting/files/patch-ac
deleted file mode 100644
index 346d2c9cb3ef..000000000000
--- a/net/sting/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- setsignal.c Fri Nov 5 06:00:22 1999
-+++ setsignal.c.new Wed May 10 11:10:59 2000
-@@ -34,7 +34,7 @@
- #include <string.h>
- #endif
-
--#include "gnuc.h"
-+/* #include "gnuc.h" */
- #ifdef HAVE_OS_PROTO_H
- #include "os-proto.h"
- #endif
diff --git a/net/sting/pkg-descr b/net/sting/pkg-descr
deleted file mode 100644
index a989bbf4db19..000000000000
--- a/net/sting/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-sting is a TCP-based network measurement tool that measures end-to-end
-network path characteristics. sting is unique because it can estimate
-one-way properties, such as loss rate, through careful manipulation and
-observation of TCP behavior. In addition, using TCP allows sting to
-leverage the existing Internet infrastructure -- any TCP server can be
-used as a de facto measurement service -- and it avoids increasing
-problems with ICMP-based network measurement (blocking, spoofing, rate
-limiting, etc).
-
-WWW: http://www.cs.washington.edu/homes/savage/sting/
diff --git a/net/sting/pkg-plist b/net/sting/pkg-plist
deleted file mode 100644
index 8fb50dd64617..000000000000
--- a/net/sting/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/sting
-share/doc/README.sting
diff --git a/net/subcalc/distinfo b/net/subcalc/distinfo
deleted file mode 100644
index 41261c33eca9..000000000000
--- a/net/subcalc/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (subcalc-1.1.tar.gz) = 964f2a9435cfc9c6ff8a2c3a7c72f1f8
diff --git a/net/subcalc/pkg-descr b/net/subcalc/pkg-descr
deleted file mode 100644
index d8d34137429f..000000000000
--- a/net/subcalc/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The subcalc utility is used for subnet calculation and IPv6 DNS PTR
-record generation. subcalc takes command line arguments in a similar
-format to ifconfig(8) so the synopsis should be familiar to the user.
-Given an address family, address and a netmask/prefix length, subcalc
-will calculate the number of hosts and address ranges of the specific
-network.
-
-WWW: http://www.seccuris.com
diff --git a/net/sysmon/distinfo b/net/sysmon/distinfo
deleted file mode 100644
index be895ad56432..000000000000
--- a/net/sysmon/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sysmon-0.91.20.tar.gz) = a5325f16580e4147cb605cacd81b8873
diff --git a/net/sysmon/pkg-descr b/net/sysmon/pkg-descr
deleted file mode 100644
index 1587cff38ed0..000000000000
--- a/net/sysmon/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Sysmon is a network monitoring tool designed to provide high
-performance and accurate network monitoring.
-
-This tool is available in the public domain for anyone to use
-it that is interested. It provides better performance and
-checking capabilities than other tools such as Rover, Nocmon
-(not this: Nocmonitor),Whatsup, Big Brother, and other such tools.
-
-Currently supported protocols include SMTP, IMAP, HTTP,TCP,
-UDP, NNTP, and PING tests.
-
-WWW: http://www.sysmon.org/
diff --git a/net/sysmon/pkg-plist b/net/sysmon/pkg-plist
deleted file mode 100644
index 964603db3ed6..000000000000
--- a/net/sysmon/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/sysmond
-bin/sysmon
-etc/sysmon.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/Changes.html
-%%PORTDOCS%%%%DOCSDIR%%/binaries.html
-%%PORTDOCS%%%%DOCSDIR%%/config.html
-%%PORTDOCS%%%%DOCSDIR%%/docs.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/jclient.jpg
-%%PORTDOCS%%%%DOCSDIR%%/net-example.png
-%%PORTDOCS%%%%DOCSDIR%%/sysmon.conf.man.html
-%%PORTDOCS%%%%DOCSDIR%%/sysmon.jpg
-%%PORTDOCS%%%%DOCSDIR%%/sysmon.man.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tas/distinfo b/net/tas/distinfo
deleted file mode 100644
index 4f9de33e50bf..000000000000
--- a/net/tas/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (tas-1.2.1.tar.gz) = 82d6c8b3b1ec8b8f1444f5bc0fc42760
diff --git a/net/tas/pkg-descr b/net/tas/pkg-descr
deleted file mode 100644
index 3df3cfb0b076..000000000000
--- a/net/tas/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-TAS is a traffic accounting system that picks up ip and application level
-traffic statistics, stores it and processes to build reports. Report is a set
-of user-defined tables. Table columns and rows are groups of hosts (traffic
-sources or destinations) aggregated according to the rules defined by user.
-What TAS can let you, in a few words:
-- Do traffic accounting on IP-level and application level
-- Store all accounting data for the desirable number of months for later
- data extraction
-- Generate complex reports (in HTML or plain text) according to the
- specified rules either on periodic basis or on demand
-- Have a convinient web interface for easy definition of report rules and
- quick report generation
-What TAS is not intended for:
-- Time accounting
-- Accounting for non IP or IP-based traffic
-- Accounting by username (in case of password-based internet access)
-- Charging/Pricing/Billing/Client management
-- Gathering traffic accounting information from the router interfaces
- like trafd, bpft, ipacctd, or ipa do (TAS is just a front-end for such kind
- of programs)
-- Reports generation for arbitrary time intervals
-
-WWW: http://tas.net-conex.com
- http://rnoc.urc.ac.ru/~anton/projects/tas/TAS.html
diff --git a/net/tas/pkg-plist b/net/tas/pkg-plist
deleted file mode 100644
index a18e11a95350..000000000000
--- a/net/tas/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-etc/periodic/daily/accounting
-etc/periodic/monthly/accounting
-etc/tas/AcctLog.conf.sample
-etc/tas/accounting.conf.sample
-etc/tas/cgi.conf.en
-etc/tas/cgi.conf.ru
-etc/tas/tas.conf.sample
-sbin/AcctConvert
-sbin/AcctFetch
-sbin/AcctJoin
-sbin/AcctLog
-sbin/AcctMailgate
-sbin/AcctMax
-sbin/AcctSendmail
-sbin/AcctSquid
-share/doc/tas/TAS.html
-share/doc/tas/model.png
-share/doc/tas/newcolumn.png
-share/doc/tas/newlist.png
-share/doc/tas/report.html
-share/tas/cgi/AcctLog.cgi
-share/tas/cgi/Client.cgi
-@unexec if [ -L %D/etc/tas/cgi.conf ] ; then /bin/rm %D/etc/tas/cgi.conf ; fi
-@dirrm etc/tas
-@dirrm share/doc/tas
-@dirrm share/tas/cgi
-@dirrm share/tas
diff --git a/net/tcpreplay/distinfo b/net/tcpreplay/distinfo
deleted file mode 100644
index 95ec8369605b..000000000000
--- a/net/tcpreplay/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (tcpreplay-1.4.6.tar.gz) = 0fe0dfc1fac8bad23846d33ac04ade3a
diff --git a/net/tcpreplay/pkg-descr b/net/tcpreplay/pkg-descr
deleted file mode 100644
index 82b682d06456..000000000000
--- a/net/tcpreplay/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Tcpreplay is aimed at testing the performance of a Network Intrusion Detection
-System by replaying real background network traffic in which to hide attacks.
-
-Tcpreplay allows you to control the speed at which the traffic is replayed,
-and can replay arbitrary libpcap traces.
-
-Unlike programmatically-generated artificial traffic which doesn't exercise
-the application/protocol inspection that a NIDS performs, and doesn't
-reproduce the real-world anomalies that appear on production networks
-(asymmetric routes, traffic bursts/lulls, fragmentation, retransmissions,
-etc.), tcpreplay allows for exact replication of real traffic seen on real
-networks.
-
-WWW: http://www.sf.net/projects/tcpreplay
diff --git a/net/tcpreplay/pkg-plist b/net/tcpreplay/pkg-plist
deleted file mode 100644
index cbca05e7af6d..000000000000
--- a/net/tcpreplay/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/capinfo
-bin/pcapmerge
-bin/tcpprep
-sbin/tcpreplay
diff --git a/net/trafd/distinfo b/net/trafd/distinfo
deleted file mode 100644
index dcebcedf0a57..000000000000
--- a/net/trafd/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (trafd-3.0.1.tgz) = 6a5abb246e95b68f0d53ebf789bda4fb
diff --git a/net/trafd/files/patch-aa b/net/trafd/files/patch-aa
deleted file mode 100644
index 250fb8c59302..000000000000
--- a/net/trafd/files/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.orig Thu Nov 25 03:38:29 1999
-+++ Makefile Thu Feb 17 00:51:02 2000
-@@ -12,22 +12,22 @@
- #
-
- # Target directory for install execution files.
--PATH_BINDIR=/usr/local/bin
-+PATH_BINDIR=${PREFIX}/bin
-
- # Target directory for install man pages.
--PATH_MANDIR=/usr/local/man/man1
-+PATH_MANDIR=${MANPREFIX}/man1
-
- # Trailing slash directory, summary traffic log files will be put there.
--PATH_TOSAVE=/var/trafd/
-+PATH_TOSAVE=${PREFIX}/var/trafd/
-
- # Full pathname where locate tarfstat program.
--PATH_TRAFSTAT=/usr/local/bin/trafstat
-+PATH_TRAFSTAT=${PREFIX}/bin/trafstat
-
- # Where locate trafstatd log file, if you want log then file must exist.
--PATH_TRAFSTAT_LOG=/var/log/trafstat.log
-+PATH_TRAFSTAT_LOG=${PREFIX}/var/log/trafstat.log
-
- # File with user defined descriptions of the traflog output format.
--PATH_TRAFLOG_FMT=/usr/local/etc/traflog.format
-+PATH_TRAFLOG_FMT=${PREFIX}/etc/traflog.format
-
- # Only group wheel can execute binary files.
- SHELL = /bin/sh
-@@ -35,8 +35,8 @@
- GROUP = wheel
-
- # This options intended for BSD/OS V2.
--CC = gcc
--FLAGS = -O2
-+CC ?= gcc
-+#FLAGS = -O2
- DEFINE = -DRETSIGTYPE=void -DRETSIGVAL=
- #DEFINE += -DHAVE_FCNTL_H=1
- #DEFINE += -DHAVE_MEMORY_H=1
-@@ -45,7 +45,7 @@
- LDFLAGS = -L../lib -lbpft -lpcap -lcurses -ltermcap -ll
-
- INCLUDE = -I../include
--CFLAGS = ${FLAGS} ${INCLUDE} ${DEFINE} \
-+CFLAGS += ${INCLUDE} ${DEFINE} \
- -DPATH_TOSAVE=\"${PATH_TOSAVE}\"\
- -DPATH_TRAFSTAT=\"${PATH_TRAFSTAT}\"\
- -DPATH_TRAFSTAT_LOG=\"${PATH_TRAFSTAT_LOG}\"\
-@@ -69,10 +69,15 @@
- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstop ${PATH_BINDIR}
- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafsave ${PATH_BINDIR}
- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafdump ${PATH_BINDIR}
-- install -s -o root -g ${GROUP} -m ${MODE} trafstat/trafstat ${PATH_BINDIR}
-- install -s -o root -g ${GROUP} -m ${MODE} trafstatd/trafstatd ${PATH_BINDIR}
-- install -s -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR}
-- install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog.format ${PATH_TRAFLOG_FMT}
-+ ${BSD_INSTALL_PROGRAM} trafd/trafd ${PATH_BINDIR}
-+ ${BSD_INSTALL_SCRIPT} trafd/trafstart ${PATH_BINDIR}
-+ ${BSD_INSTALL_SCRIPT} trafd/trafstop ${PATH_BINDIR}
-+ ${BSD_INSTALL_SCRIPT} trafd/trafsave ${PATH_BINDIR}
-+ ${BSD_INSTALL_SCRIPT} trafd/trafdump ${PATH_BINDIR}
-+ ${BSD_INSTALL_PROGRAM} trafstat/trafstat ${PATH_BINDIR}
-+ ${BSD_INSTALL_PROGRAM} trafstatd/trafstatd ${PATH_BINDIR}
-+ ${BSD_INSTALL_PROGRAM} traflog/traflog ${PATH_BINDIR}
-+ ${BSD_INSTALL_SCRIPT} traflog/traflog.format ${PATH_TRAFLOG_FMT}
- @echo Done.
-
- clean:
diff --git a/net/trafd/files/patch-ab b/net/trafd/files/patch-ab
deleted file mode 100644
index 37b96f3f6542..000000000000
--- a/net/trafd/files/patch-ab
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafdump.orig Tue Feb 8 00:14:22 2000
-+++ trafd/trafdump Tue Feb 8 00:15:05 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # trafdump Copyright (c)1993 CAD lab
- #
diff --git a/net/trafd/files/patch-ac b/net/trafd/files/patch-ac
deleted file mode 100644
index 3bd0c67318ad..000000000000
--- a/net/trafd/files/patch-ac
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafsave.orig Tue Feb 8 00:14:31 2000
-+++ trafd/trafsave Tue Feb 8 00:15:15 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # trafsave Copyright (c)1993 CAD lab
- #
diff --git a/net/trafd/files/patch-ad b/net/trafd/files/patch-ad
deleted file mode 100644
index d03435051373..000000000000
--- a/net/trafd/files/patch-ad
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafstart.orig Tue Feb 8 00:14:42 2000
-+++ trafd/trafstart Tue Feb 8 00:15:38 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # trafstart Copyright (c)1993 CAD lab
- #
diff --git a/net/trafd/files/patch-ae b/net/trafd/files/patch-ae
deleted file mode 100644
index b583de35ce86..000000000000
--- a/net/trafd/files/patch-ae
+++ /dev/null
@@ -1,7 +0,0 @@
---- trafd/trafstop.orig Tue Feb 8 00:14:49 2000
-+++ trafd/trafstop Tue Feb 8 00:15:51 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # trafstop Copyright (c)1993 CAD lab
- #
diff --git a/net/trafd/files/patch-ah b/net/trafd/files/patch-ah
deleted file mode 100644
index 832f7e5333d7..000000000000
--- a/net/trafd/files/patch-ah
+++ /dev/null
@@ -1,39 +0,0 @@
---- trafd/traffic.c.buggy Mon Aug 7 18:45:54 2000
-+++ trafd/traffic.c Mon Aug 7 18:46:42 2000
-@@ -253,7 +253,7 @@
- t.p_port = tp->th_sport, t.who_srv = 1;
- else if (tp->th_sport > tp->th_dport)
- t.p_port = tp->th_dport, t.who_srv = 2;
-- else if (tp->th_sport = tp->th_dport)
-+ else if (tp->th_sport == tp->th_dport)
- t.p_port = tp->th_sport, t.who_srv = 3;
- if (t.p_port > IPPORT_RESERVED) {
- if (s_port_big[tp->th_sport & (IPPORT_RESERVED-1)] & IPPROTO_TCP) {
-@@ -263,7 +263,7 @@
- t.p_port = tp->th_dport;
- t.who_srv = 2;
- }
-- if (tp->th_sport = tp->th_dport) t.who_srv = 3;
-+ if (tp->th_sport == tp->th_dport) t.who_srv = 3;
- }
- traf_add(insertentry(&t), t.n_bytes, t.n_psize);
-
-@@ -300,7 +300,7 @@
- t.p_port = up->uh_sport, t.who_srv = 1;
- else if (up->uh_sport > up->uh_dport)
- t.p_port = up->uh_dport, t.who_srv = 2;
-- else if (up->uh_sport = up->uh_dport)
-+ else if (up->uh_sport == up->uh_dport)
- t.p_port = up->uh_sport, t.who_srv = 3;
- if (t.p_port > IPPORT_RESERVED) {
- if (s_port_big[up->uh_sport & (IPPORT_RESERVED-1)] & IPPROTO_UDP) {
-@@ -310,7 +310,7 @@
- t.p_port = up->uh_dport;
- t.who_srv = 2;
- }
-- if (up->uh_sport = up->uh_dport) t.who_srv = 3;
-+ if (up->uh_sport == up->uh_dport) t.who_srv = 3;
- }
- traf_add(insertentry(&t), t.n_bytes, t.n_psize);
-
-
diff --git a/net/trafd/files/trafd.sh.sample b/net/trafd/files/trafd.sh.sample
deleted file mode 100644
index daf53e8c4b1b..000000000000
--- a/net/trafd/files/trafd.sh.sample
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: trafd
-# REQUIRE: netif routing
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable trafd:
-#
-#trafd_enable="YES"
-#trafd_ifaces="fxp0 fxp1 fxp2"
-#trafd_flags=""
-#trafd_log="/var/log/traffic.log"
-#
-
-. %%RC_SUBR%%
-
-name="trafd"
-rcvar=`set_rcvar`
-command="/usr/local/bin/trafd"
-start_cmd="trafd_start"
-stop_cmd="trafd_stop"
-
-trafd_enable=${trafd_enable:-"NO"}
-trafd_log=${trafd_log:-"/var/log/traffic.log"}
-load_rc_config $name
-
-trafd_start()
-{
- echo 'Starting trafd.'
- if checkyesno ${rcvar} && [ "x${trafd_ifaces}" != "x" ]; then
- for iface in ${trafd_ifaces}; do
- ${command} -i ${iface} ${trafd_flags}
- done
- else
- warn '$trafd_ifaces is not set.'
- fi
-}
-
-trafd_stop()
-{
- echo 'Stopping trafd.'
- for iface in ${trafd_ifaces}; do
- read rc_pid < /var/run/trafd.$iface
- if [ -n "${rc_pid}" ]; then
- kill -TERM ${rc_pid}
- wait_for_pids ${rc_pid}
- echo "$(date +"%b %e %H:%M:%S") $(hostname -s) trafstop:" "'('${iface}')' signaling to shutdown" >> ${trafd_log}
- fi
- done
-}
-
-run_rc_command "$1"
diff --git a/net/trafd/pkg-descr b/net/trafd/pkg-descr
deleted file mode 100644
index d4d4190e1098..000000000000
--- a/net/trafd/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-trafd is a superset of trafshow, and extends it by adding a daemon
-which collects data about network connections (src, dst, protocol
-and length). The resulting data can be dumped to a file for later
-processing.
-
-Read /usr/local/share/doc/trafd/README after installation for more
-information.
-
-To use trafd, your kernel must be rebuilt with the following line
-added to your kernel config file (/sys/i386/conf/<YourMachine>):
-
-pseudo-device bpfilter 4 # Berkeley packet filter
-
-The number after bpfilter is the number of interfaces that can be
-examined simultaneously. See section 6.1 of the Handbook for details.
-
-On FreeBSD 4.0 or later versions, use the following line instead:
-
-pseudo-device bpf 4 # Berkeley packet filter
-
-- oddbjorn <oddbjorn@tricknology.org>
diff --git a/net/trafd/pkg-plist b/net/trafd/pkg-plist
deleted file mode 100644
index b0d384d59596..000000000000
--- a/net/trafd/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/trafd
-bin/trafdump
-bin/traflog
-bin/trafsave
-bin/trafstart
-bin/trafstat
-bin/trafstatd
-bin/trafstop
-etc/traflog.format
-etc/rc.d/trafd.sh.sample
-%%PORTDOCS%%share/doc/trafd/README
-%%PORTDOCS%%@dirrm share/doc/trafd
-@exec mkdir %D/var 2>/dev/null || true
-@exec mkdir %D/var/log 2>/dev/null || true
-@exec mkdir %D/var/trafd 2>/dev/null || true
-@unexec rmdir %D/var/trafd 2>/dev/null || true
-@unexec rmdir %D/var/log 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
diff --git a/net/whatmask/distinfo b/net/whatmask/distinfo
deleted file mode 100644
index b78f48a99641..000000000000
--- a/net/whatmask/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (whatmask-1.2.tar.gz) = 26aeff74dbba70262ccd426e681dcf4a
-SIZE (whatmask-1.2.tar.gz) = 170183
diff --git a/net/whatmask/pkg-descr b/net/whatmask/pkg-descr
deleted file mode 100644
index 4c447d29920e..000000000000
--- a/net/whatmask/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Whatmask is a small C program that will help you with network settings.
-
-It displays the following information given IP address and/or netmask:
-- The netmask in the following formats: CIDR, Netmask, Hex, Wildcard Bits
-- The Network Address
-- The Broadcast Address
-- The number of Usable IP Addresses
-- The First Usable IP Address
-- The Last Usable IP Address
-
-Author: Joe Laffey <joe@laffeycomputer.com>
-WWW: http://www.laffeycomputer.com/whatmask.html
diff --git a/net/whatmask/pkg-plist b/net/whatmask/pkg-plist
deleted file mode 100644
index 990b8915585d..000000000000
--- a/net/whatmask/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $FreeBSD$
-bin/whatmask
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/wide-dhcp/distinfo b/net/wide-dhcp/distinfo
deleted file mode 100644
index 796c586e172e..000000000000
--- a/net/wide-dhcp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (dhcp-1.4.0p6.tar.gz) = 2344ea3a93ea5b6c1dae6999c4904c37
-SIZE (dhcp-1.4.0p6.tar.gz) = 135616
diff --git a/net/wide-dhcp/files/patch-aa b/net/wide-dhcp/files/patch-aa
deleted file mode 100644
index d76aca16f6d9..000000000000
--- a/net/wide-dhcp/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- client/Makefile.FreeBSD.orig Fri Jan 1 06:21:32 1999
-+++ client/Makefile.FreeBSD Sun Feb 7 10:38:40 1999
-@@ -2,16 +2,16 @@
- OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
-
- CC = cc
--CFLAGS = -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
-+CFLAGS += -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
- LDFLAGS =
-
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- SBIN = $(PREFIX)/sbin
- LIBEXEC = $(PREFIX)/libexec
- MAN = $(PREFIX)/man
- CP = /bin/cp
- RM = /bin/rm
--GZIP = /usr/bin/gzip
-+GZIP = /usr/bin/touch # don't `gzip' anything for FreeBSD
-
- dhcpc: ${OBJ}
- ${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
diff --git a/net/wide-dhcp/files/patch-ac b/net/wide-dhcp/files/patch-ac
deleted file mode 100644
index 36fcc36aa7d7..000000000000
--- a/net/wide-dhcp/files/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
---- client/dhcpc_subr.c.orig Fri Jan 1 06:21:08 1999
-+++ client/dhcpc_subr.c Sun Feb 7 10:46:25 1999
-@@ -170,6 +170,8 @@
-
- int config_if();
- void set_route();
-+void set_resolv();
-+void set_hostname();
- void make_decline();
- void make_release();
- Long generate_xid();
-@@ -3221,4 +3223,41 @@
-
- buf += OPTLEN(buf) + 1;
- return(0);
-+}
-+
-+void
-+set_resolv(param)
-+struct dhcp_param *param;
-+{
-+ FILE *fp;
-+ int i;
-+
-+ /*
-+ * set resolv.conf
-+ */
-+ if (param && param->dns_server != NULL) {
-+ if (param->dns_server->num && param->dns_server->addr != NULL) {
-+ unlink(_PATH_RESCONF);
-+ if ((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
-+ return;
-+ }
-+ if (param->dns_domain != NULL)
-+ fprintf(fp, "domain %s\n", param->dns_domain);
-+ if (param->dns_server->addr)
-+ for (i = 0; i < param->dns_server->num; i++) {
-+ fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
-+ }
-+ fclose(fp);
-+ }
-+ }
-+}
-+
-+void
-+set_hostname(param)
-+struct dhcp_param *param;
-+{
-+ if (param && param->hostname != NULL) {
-+ sethostname(param->hostname,strlen(param->hostname));
-+ }
-+ return;
- }
diff --git a/net/wide-dhcp/files/patch-ae b/net/wide-dhcp/files/patch-ae
deleted file mode 100644
index 2b565f37a4e9..000000000000
--- a/net/wide-dhcp/files/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/Makefile.FreeBSD.orig Tue Jan 26 02:13:13 1999
-+++ server/Makefile.FreeBSD Sun Feb 7 10:54:41 1999
-@@ -5,13 +5,13 @@
- CFLAGS = -O2 -I. #-DMAC_FILTER #-DCOMPAT_RFC1541 #-DNOICMPCHK
- LDFLAGS =
-
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- SBIN = ${PREFIX}/sbin
- LIBEXEC = ${PREFIX}/libexec
- MAN = ${PREFIX}/man
- CP = /bin/cp
- RM = /bin/rm
--GZIP = /usr/bin/gzip
-+GZIP = /usr/bin/touch # don't `gzip' anything for FreeBSD
-
- dhcps: ${OBJ}
- ${CC} ${CFLAGS} -o dhcps ${OBJ} ${LDFLAGS}
diff --git a/net/wide-dhcp/files/patch-ag b/net/wide-dhcp/files/patch-ag
deleted file mode 100644
index 403705393395..000000000000
--- a/net/wide-dhcp/files/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
---- relay/Makefile.FreeBSD.orig Fri Jan 1 02:25:43 1999
-+++ relay/Makefile.FreeBSD Sun Feb 7 10:56:47 1999
-@@ -4,13 +4,13 @@
- CFLAGS = -O2 -I. -I../server
- LDFLAGS =
-
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- SBIN = ${PREFIX}/sbin
- LIBEXEC = ${PREFIX}/libexec
- MAN = ${PREFIX}/man
- CP = /bin/cp
- RM = /bin/rm
--GZIP = /usr/bin/gzip
-+GZIP = /usr/bin/touch # don't `gzip' anything for FreeBSD
-
- relay: ${OBJ}
- ${CC} ${CFLAGS} -o relay ${OBJ} ${LDFLAGS}
diff --git a/net/wide-dhcp/files/patch-aq b/net/wide-dhcp/files/patch-aq
deleted file mode 100644
index c2b9b0000741..000000000000
--- a/net/wide-dhcp/files/patch-aq
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/Makefile.FreeBSD.orig Fri Jan 1 02:31:45 1999
-+++ tools/Makefile.FreeBSD Sun Feb 7 11:00:20 1999
-@@ -1,14 +1,14 @@
- CC = cc
- CFLAGS = -O2 -I. -I../server
-
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- SBIN = ${PREFIX}/sbin
- LIBEXEC = ${PREFIX}/libexec
- MAN = ${PREFIX}/man
-
- CP = /bin/cp
- RM = /bin/rm
--GZIP = /usr/bin/gzip
-+GZIP = /usr/bin/touch # don't `gzip' anything for FreeBSD
-
- dhcpm: dhcpm.c ../server/dhcp.h
- $(CC) $(CFLAGS) dhcpm.c -o dhcpm
diff --git a/net/wide-dhcp/files/patch-as b/net/wide-dhcp/files/patch-as
deleted file mode 100644
index a977a72eb2ba..000000000000
--- a/net/wide-dhcp/files/patch-as
+++ /dev/null
@@ -1,319 +0,0 @@
---- client/dhcpc.c.orig Fri Jan 1 05:20:08 1999
-+++ client/dhcpc.c Thu Jan 20 13:21:05 2000
-@@ -88,6 +88,7 @@
- struct dhcp_reqspec reqspec;
- struct if_info intface;
- struct dhcp_param *param_list;
-+int f_resolv, f_hostname;
- char pid_filename[MAXPATHLEN];
- char cache_filename[MAXPATHLEN];
-
-@@ -256,6 +257,14 @@
- if (config_if(&intface, &addr, &mask, &brdaddr) == 0) {
- set_route(paramp);
- }
-+#ifdef __FreeBSD__
-+ if (f_resolv) {
-+ set_resolv(param_list);
-+ }
-+ if (f_hostname) {
-+ set_hostname(param_list);
-+ }
-+#endif
- #endif
-
- return;
-@@ -293,7 +302,7 @@
- /*
- * split conditions into pieces for debugging
- */
--#ifndef sun
-+#if !defined(sun) && !defined(__FreeBSD__)
- if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
- return(0);
- if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
-@@ -350,7 +359,7 @@
- /*
- * split conditions into pieces for debugging
- */
--#ifndef sun
-+#if !defined(sun) && !defined(__FreeBSD__)
- if (ntohs(rcv.ip->ip_len) < MINDHCPLEN + UDPHL + IPHL)
- return(0);
- if (ntohs(rcv.udp->uh_ulen) < MINDHCPLEN + UDPHL)
-@@ -398,11 +407,14 @@
-
- bzero(&tmp_reqspec, sizeof(tmp_reqspec));
- bzero(errmsg, sizeof(errmsg));
-- bzero(&newsigmask, sizeof(newsigmask));
-- bzero(&oldsigmask, sizeof(oldsigmask));
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGALRM);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigemptyset(&newsigmask);
-+
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGALRM);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL);
-
- switch (curr_state) {
- case BOUND:
-@@ -423,7 +435,7 @@
- default:
- break;
- }
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- unlink(pid_filename);
-
-@@ -1157,8 +1169,8 @@
- struct dhcp_param tmpparam;
-
- bzero(errmsg, sizeof(errmsg));
-- bzero(&newsigmask, sizeof(newsigmask));
-- bzero(&oldsigmask, sizeof(oldsigmask));
-+ sigemptyset(&newsigmask);
-+ sigemptyset(&oldsigmask);
- bzero(&tmpparam, sizeof(tmpparam));
-
- if (prev_state != RENEWING) {
-@@ -1247,12 +1259,15 @@
- errmsg);
- }
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask); /* begin critical */
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL);
- clean_param(param_list);
- free(param_list);
- param_list = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- return(INIT); /* Next state is INIT */
- }
-@@ -1260,13 +1275,16 @@
- dhcp_msgtoparam(rcv.dhcp, DHCPLEN(rcv.udp),
- &tmpparam) == OK) {
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL); /* begin critical */
- merge_param(param_list, &tmpparam);
- *param_list = tmpparam;
- param_list->lease_origin = send_epoch;
- param_list->next = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- syslog(LOG_INFO, "Got DHCPACK (IP = %s, duration = %d secs)",
- inet_ntoa(param_list->yiaddr), param_list->lease_duration);
-@@ -1316,8 +1334,8 @@
- struct dhcp_param tmpparam;
-
- bzero(errmsg, sizeof(errmsg));
-- bzero(&newsigmask, sizeof(newsigmask));
-- bzero(&oldsigmask, sizeof(oldsigmask));
-+ sigemptyset(&newsigmask);
-+ sigemptyset(&oldsigmask);
- bzero(&tmpparam, sizeof(tmpparam));
-
- if (time(&curr_epoch) == -1) {
-@@ -1386,12 +1404,15 @@
- errmsg);
- }
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL); /* begin critical */
- clean_param(param_list);
- free(param_list);
- param_list = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- return(INIT); /* Next state is INIT */
- }
-@@ -1399,13 +1420,16 @@
- dhcp_msgtoparam(rcv.dhcp, DHCPLEN(rcv.udp),
- &tmpparam) == OK) {
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL); /* begin critical */
- merge_param(param_list, &tmpparam);
- *param_list = tmpparam;
- param_list->lease_origin = send_epoch;
- param_list->next = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- syslog(LOG_INFO, "Got DHCPACK (IP = %s, duration = %d secs)",
- inet_ntoa(param_list->yiaddr), param_list->lease_duration);
-@@ -1577,8 +1601,8 @@
- struct dhcp_reqspec tmp_reqspec;
-
- bzero(errmsg, sizeof(errmsg));
-- bzero(&newsigmask, sizeof(newsigmask));
-- bzero(&oldsigmask, sizeof(oldsigmask));
-+ sigemptyset(&newsigmask);
-+ sigemptyset(&oldsigmask);
- bzero(&tmpparam, sizeof(tmpparam));
- bzero(&tmp_reqspec, sizeof(tmp_reqspec));
-
-@@ -1666,12 +1690,15 @@
- errmsg);
- }
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL); /* begin critical */
- clean_param(param_list);
- free(param_list);
- param_list = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- return(INIT); /* Next state is INIT */
- }
-@@ -1679,13 +1706,16 @@
- dhcp_msgtoparam(rcv.dhcp, DHCPLEN(rcv.udp),
- &tmpparam) == OK) {
- if ((arpans = arp_check(&tmpparam.yiaddr, &arpif)) == OK) {
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL); /* begin critical */
- merge_param(param_list, &tmpparam);
- *param_list = tmpparam;
- param_list->lease_origin = init_epoch;
- param_list->next = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- syslog(LOG_INFO, "Got DHCPACK (IP = %s, duration = %d secs)",
- inet_ntoa(param_list->yiaddr), param_list->lease_duration);
-@@ -1697,12 +1727,15 @@
- set_declinfo(&tmp_reqspec, param_list, errmsg, arpans);
- dhcp_decline(&tmp_reqspec);
-
-- newsigmask = sigmask(SIGUSR1) | sigmask(SIGUSR2);
-- oldsigmask = sigblock(newsigmask); /* begin critical */
-+ sigprocmask(0, NULL, &oldsigmask);
-+ memcpy(&newsigmask, &oldsigmask, sizeof(sigset_t));
-+ sigaddset(&newsigmask, SIGUSR1);
-+ sigaddset(&newsigmask, SIGUSR2);
-+ sigprocmask(SIG_SETMASK, &newsigmask, NULL); /* begin critical */
- clean_param(param_list);
- free(param_list);
- param_list = NULL;
-- sigsetmask(oldsigmask); /* end critical */
-+ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); /* end critical */
-
- syslog(LOG_NOTICE,
- "Got non-preferable DHCPACK, so go into INIT state");
-@@ -1789,7 +1822,11 @@
- void
- usage()
- {
-- fprintf(stderr, "Usage: dhcpc [-d] if_name\n");
-+#ifdef __FreeBSD__
-+ fprintf(stderr, "Usage: dhcpc [-v] [-drn] if_name\n");
-+#else
-+ fprintf(stderr, "Usage: dhcpc [-v] [-d] if_name\n");
-+#endif
- exit(1);
- }
-
-@@ -1809,26 +1846,39 @@
- {
- int debug = 0;
- int n = 0;
-+ int count;
- struct if_info ifinfo;
-
- bzero(&reqspec, sizeof(reqspec));
- bzero(&ifinfo, sizeof(ifinfo));
-
-- while (*++argv && argv[0][0] == '-') {
-- switch (argv[0][1]) {
-- case 'v':
-- version();
-- break;
-- case 'd':
-- debug = 1;
-- break;
-- default:
-- usage();
-- break;
-- }
-- }
-- if (argv[0] == NULL) usage();
-+#ifdef __FreeBSD__
-+#define COM_OPTS "vdrn"
-+#else
-+#define COM_OPTS "vd"
-+#endif
-
-+ while ((count = getopt(argc, argv, COM_OPTS)) != EOF) {
-+ switch (count) {
-+ case 'v':
-+ version();
-+ case 'd':
-+ debug = 1;
-+ break;
-+#ifdef __FreeBSD__
-+ case 'r':
-+ f_resolv = 1;
-+ break;
-+ case 'n':
-+ f_hostname = 1;
-+ break;
-+#endif
-+ }
-+ }
-+ argc -= optind;
-+ argv += optind;
-+
-+ if (argc < 1) usage();
- strcpy(ifinfo.name, argv[0]);
-
- /*
-@@ -1859,6 +1909,11 @@
- reqspec.reqlist.list[reqspec.reqlist.len++] = SUBNET_MASK;
- reqspec.reqlist.list[reqspec.reqlist.len++] = ROUTER;
- reqspec.reqlist.list[reqspec.reqlist.len++] = BRDCAST_ADDR;
-+#ifdef __FreeBSD__
-+ reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_DOMAIN;
-+ reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_SERVER;
-+ reqspec.reqlist.list[reqspec.reqlist.len++] = HOSTNAME;
-+#endif
-
- n = dhcp_client(&ifinfo);
- unlink(pid_filename);
diff --git a/net/wide-dhcp/files/patch-aw b/net/wide-dhcp/files/patch-aw
deleted file mode 100644
index 23a9473fa546..000000000000
--- a/net/wide-dhcp/files/patch-aw
+++ /dev/null
@@ -1,20 +0,0 @@
---- db_sample.bak/dhcpdb.pool Thu Jul 21 19:39:46 1994
-+++ db_sample/dhcpdb.pool Sun Mar 23 00:07:21 1997
-@@ -2,12 +2,14 @@
- global:!snmk=255.255.255.224:tmof=32400:
-
- # define different master entries for each subnet. . .
-+# `dnsv' is IP address of DNS server.
-+# `dnsd' is domain name of your domain.
- subnet30:tblc=global:rout=133.4.30.1:dht1=500:dht2=850:\
-- :brda=133.4.30.31:
-+ :brda=133.4.30.31:dnsv=133.4.30.10:dnsd=you.domain.name:
-
- # entries for manual allocation (DHCP, BOOTP)
--3001: :ipad=133.4.30.1:tblc=subnet30:clid="1:0x0080c75fdc03":
--3002: :ipad=133.4.30.2:tblc=subnet30:clid="1:0x08004600e5d5":
-+3001: :ipad=133.4.30.1:hstn="yourclient1.host.name":tblc=subnet30:clid="1:0x0080c75fdc03":
-+3002: :ipad=133.4.30.2:hstn="yourclient2.host.name":tblc=subnet30:clid="1:0x08004600e5d5":
-
- # entries for dynamic allocation (DHCP)
- 3003: :ipad=133.4.30.3:dfll=3600:maxl=7200:tblc=subnet30:
diff --git a/net/wide-dhcp/files/patch-az b/net/wide-dhcp/files/patch-az
deleted file mode 100644
index ab04b6ed492f..000000000000
--- a/net/wide-dhcp/files/patch-az
+++ /dev/null
@@ -1,53 +0,0 @@
---- client/dhcpc.8.orig Sat Jan 9 20:54:01 1999
-+++ client/dhcpc.8 Sun Feb 7 11:27:29 1999
-@@ -5,7 +5,7 @@
- .SH SYNOPSIS
- .B dhcpc
- [
--.B \-d
-+.B \-drn
- ]
- .I interface
- .SH DESCRIPTION
-@@ -26,7 +26,7 @@
- requests server to assign the same address as before.
- To get the same address,
- .B dhcpc
--creates file named /etc/dhcpc_cache.interface
-+creates file named /var/db/dhcpc_cache.interface
- (or /var/db/dhcpc_cache.interface for BSD/OS and FreeBSD). This
- file name could be configured when it is compiled. But it is required
- that the file must remains after the host reboot. For example, the
-@@ -38,6 +38,21 @@
- .B dhcpc
- runs in foreground and debugging mode.
- .LP
-+If the
-+.B \-r
-+option is specified, and if your DHCP server supplies the DNS address,
-+.B dhcpc
-+overwrites "/etc/resolv.conf" with supplied address.
-+.LP
-+If the
-+.B \-n
-+option is specified, and if your DHCP server supplies the hostname of
-+the client,
-+.B dhcpc
-+call
-+.B sethostname(3)
-+with supplied name.
-+.LP
- The DHCP client can verify whether its assigned information is still
- valid at any time.
- .B dhcpc
-@@ -70,6 +85,10 @@
- .TP
- .B /etc/dhcpc_cache.interface
- The file to record previously assigned informations (for others)
-+.TP
-+.B /var/run/dhcpc.[interface name].pid
-+File which includes process ID
-+.PD
- .PD
- .SH SEE ALSO
- R. Droms,
diff --git a/net/wide-dhcp/files/patch-ba b/net/wide-dhcp/files/patch-ba
deleted file mode 100644
index c98ed7d460fe..000000000000
--- a/net/wide-dhcp/files/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/dhcps.8.orig Fri Jan 1 05:28:25 1999
-+++ server/dhcps.8 Sun Feb 7 11:30:56 1999
-@@ -37,7 +37,7 @@
- .B dhcps
- manages these with files, /etc/dhcpdb.pool and /etc/dhcpdb.bind
- (/var/db/dhcpdb.bind for BSD/OS and FreeBSD). It is possible to change
--these path with command line option.
-+this path with command line options.
- .LP
- Also
- .B dhcps
diff --git a/net/wide-dhcp/files/patch-database.c b/net/wide-dhcp/files/patch-database.c
deleted file mode 100644
index 44af0935345d..000000000000
--- a/net/wide-dhcp/files/patch-database.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- server/database.c.orig Fri Jan 1 22:35:33 1999
-+++ server/database.c Sun Aug 3 19:55:32 2003
-@@ -560,15 +560,15 @@
- char **cp;
- struct in_addr *subnet;
- {
-- char *tmpstr;
-+ char *tmpstr, *line;
- struct in_addr *tmpaddr;
-
-- if ((tmpstr = get_string(cp)) == NULL) {
-+ if ((line = get_string(cp)) == NULL) {
- errno = 0;
- syslog(LOG_WARNING, "Can't get strings");
- return(-1);
- }
--
-+ tmpstr = line;
- if ((tmpaddr = get_ip(&tmpstr)) == NULL) {
- errno = 0;
- syslog(LOG_WARNING, "get_ip() error in read_subnet()");
-@@ -576,7 +576,7 @@
- }
-
- *subnet = *tmpaddr;
-- free(tmpstr);
-+ free(line);
- free(tmpaddr);
-
- return(0);
diff --git a/net/wide-dhcp/files/wide-dhcps.sh.sample b/net/wide-dhcp/files/wide-dhcps.sh.sample
deleted file mode 100644
index 6cab4e824a0f..000000000000
--- a/net/wide-dhcp/files/wide-dhcps.sh.sample
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-DB_POOL=/etc/dhcpdb.pool
-DB_RELAY=/etc/dhcpdb.relay
-DB_BIND=/var/db/dhcpdb.bind
-
-case "$1" in
-start)
- if [ -f ${DB_POOL} -a -f ${DB_RELAY} -a -x ${PREFIX}/sbin/dhcps ]; then
- if [ -f ${DB_BIND} ]; then
- find ${DB_POOL} -newer ${DB_BIND} -exec rm ${DB_BIND} \;
- fi
- ${PREFIX}/sbin/dhcps [Interface Name]
- echo -n ' dhcps'
- fi
- ;;
-stop)
- killall dhcps && echo -n ' dhcps'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
diff --git a/net/wide-dhcp/pkg-descr b/net/wide-dhcp/pkg-descr
deleted file mode 100644
index 816bd08fa7f3..000000000000
--- a/net/wide-dhcp/pkg-descr
+++ /dev/null
@@ -1,66 +0,0 @@
- << DHCP WIDE-Implementation, version 1.3.6 >>
-
- April, 1997.
-
- This package is a distribution kit of DHCP WIDE-Implementation
- version 1.3.6. DHCP (Dynamic Host Configuration Protocol) is a
- protocol which provides informations to computer when it boots.
- This release includes DHCP server, relay agent, and client.
-
-
-<License>
-
- See "Copyright" included in this directory.
-
- Also, portions of this software may fall under the copyrights which
- are included the end of this file. These are included corresponded
- source code files.
-
-
-<Package>
-
- You can get the latest version from;
- ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/
-
-------------------------------
-
-** Attention for this ports file **
-
- To use DHCP, your kernel must be rebuilt with the following
- line added to your kernel config file (/sys/i386/conf/<YourMachine>):
-
-pseudo-device bpfilter 4 #Berkeley packet filter
-
- and make bpf devices in your /dev directory: /dev/bpf[1-3].
-
-cd /dev
-./MAKEDEV bpf1
-./MAKEDEV bpf2
-./MAKEDEV bpf3
-
-** dhcpdb.relay file is need without relay agent **
-
- Please read more information in
- /usr/local/share/doc/dhcp/intro.dhcp or intro.dhcp.jis.
-
-** additional function **
-
- DHCP client(dhcpc) in this port is supported "dynamic change
- /etc/resolv.conf and hostname via DHCP infomation".
-
- o `-r' is recreate /etc/resolv.conf
- (resolv.conf file is overwritten.)
- o `-n' is reset HOSTNAME
-
-** Acknowledgements to this ports file **
- Special thanks to:
- Hirotaka TAKETA<taketa@csk.co.jp>
- Hajimu UMEMOTO<ume@calm.imasy.or.jp>
- Tamotsu KANOH<kanoh@kanoh.iijnet.or.jp>
- Junichi SATOH<junichi@astec.co.jp>
- Hisashi HIRAMOTO<hiramoto@phys.chs.nihon-u.ac.jp>
- Takeshi TAGUCHI<taguchi@tohoku.iij.ad.jp>
- Keisuke INOUE<keisuke@aa.cs.keio.ac.jp>
-
-- Yoshiro MIHIRA
-(sanpei@yy.cs.keio.ac.jp)
diff --git a/net/wide-dhcp/pkg-plist b/net/wide-dhcp/pkg-plist
deleted file mode 100644
index 7f4f884837be..000000000000
--- a/net/wide-dhcp/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-etc/rc.d/wide-dhcps.sh.sample
-sbin/dhcpc
-sbin/dhcpm
-sbin/relay
-sbin/dhcps
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.jis
-%%PORTDOCS%%%%DOCSDIR%%/intro.dhcp
-%%PORTDOCS%%%%DOCSDIR%%/intro.dhcp.jis
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/dhcpdb.pool
-%%EXAMPLESDIR%%/dhcpdb.relay
-%%EXAMPLESDIR%%/dhcpdb.server
-@dirrm %%EXAMPLESDIR%%
-@unexec rm -f /var/db/dhcp_cache
diff --git a/net/wide-dhcp/pkg-req b/net/wide-dhcp/pkg-req
deleted file mode 100644
index 9ac3b498db7d..000000000000
--- a/net/wide-dhcp/pkg-req
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-if [ "$2" != "INSTALL" ]; then
- exit 0
-fi
-if [ ! -c /dev/bpf1 ]; then
- echo "**********************************************************"
- echo "* This DHCP program need Berkeley packet filter (bpf)"
- echo "* To use DHCP, you need to rebuild your kernel with bpf"
- echo "* and make bpf devices in the /dev directory."
- echo "**********************************************************"
-fi
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 53233682ae1b..ceff626e905f 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= billf@FreeBSD.org
COMMENT= An X11/GTK network analyzer/capture tool
.if !defined(WITHOUT_SNMP)
-LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net/net-snmp
+LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
.endif
USE_BZIP2= yes
diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index 6f0c8242c0a5..549c37952020 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -41,7 +41,7 @@ pre-fetch:
@${FALSE}
.elif defined(OPTION)
.if ${OPTION}==RD
-BUILD_DEPENDS= ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask \
+BUILD_DEPENDS= ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
INSTALL_TARGET= rd
PLIST= ${PKGDIR}/pkg-plist.rd
@@ -49,7 +49,7 @@ PLIST= ${PKGDIR}/pkg-plist.rd
BUILD_DEPENDS= ${PREFIX}/sbin/httpsd:${PORTSDIR}/www/apache13-ssl\
${SITE_PERL}/CGI/Carp.pm:${PORTSDIR}/www/p5-CGI.pm \
${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
- ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask\
+ ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask\
${SITE_PERL}/File/CounterFile.pm:${PORTSDIR}/misc/p5-File-CounterFile \
${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
diff --git a/net/zabbix-agent/Makefile b/net/zabbix-agent/Makefile
index 941cd3dd82aa..ab2a6bc70bf4 100644
--- a/net/zabbix-agent/Makefile
+++ b/net/zabbix-agent/Makefile
@@ -12,6 +12,6 @@ MAINTAINER= asa@gascom.ru
COMMENT= Very advanced network monitoring system (agent only)
ZABBIX_AGENT_ONLY=yes
-MASTERDIR= ${.CURDIR}/../zabbix
+MASTERDIR= ${.CURDIR}/../../net-mgmt/zabbix
.include "${MASTERDIR}/Makefile"
diff --git a/net/zabbix/distinfo b/net/zabbix/distinfo
deleted file mode 100644
index 713d13a9a9ed..000000000000
--- a/net/zabbix/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab
diff --git a/net/zabbix/files/patch-src-zabbix_sucker-Makefile.in b/net/zabbix/files/patch-src-zabbix_sucker-Makefile.in
deleted file mode 100644
index d72d0587df50..000000000000
--- a/net/zabbix/files/patch-src-zabbix_sucker-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/zabbix_sucker/Makefile.in.orig Mon Sep 1 21:34:12 2003
-+++ src/zabbix_sucker/Makefile.in Mon Sep 1 21:34:37 2003
-@@ -1,7 +1,7 @@
- # Build rules
-
--INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@
--LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@
-+INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@ -I$(LOCALBASE)/include
-+LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@ -L$(LOCALBASE)/lib
-
- all:
-
diff --git a/net/zabbix/files/patch-src-zabbix_sucker-zabbix_sucker.c b/net/zabbix/files/patch-src-zabbix_sucker-zabbix_sucker.c
deleted file mode 100644
index 1b8ca44f8aac..000000000000
--- a/net/zabbix/files/patch-src-zabbix_sucker-zabbix_sucker.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zabbix_sucker/zabbix_sucker.c.orig Wed Jan 14 07:43:02 2004
-+++ src/zabbix_sucker/zabbix_sucker.c Wed Jan 14 07:43:21 2004
-@@ -254,7 +254,7 @@
- }
- if(CONFIG_FPING_LOCATION == NULL)
- {
-- CONFIG_FPING_LOCATION=strdup("/usr/sbin/fping");
-+ CONFIG_FPING_LOCATION=strdup("%LOCALBASE%/sbin/fping");
- }
- }
-
diff --git a/net/zabbix/pkg-descr b/net/zabbix/pkg-descr
deleted file mode 100644
index a85383fa4768..000000000000
--- a/net/zabbix/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Zabbix is software for application and network monitoring.
-Zabbix supports both polling and trapping techniques to
-collect data from monitored hosts. Flexible notification
-mechanism allows easy and quckly configure email notifications
-for pre-defined events. Zabbix is freely available under the
-terms of the GNU General Public License (GPL).
-
-WWW: http://zabbix.sourceforge.net/
diff --git a/net/zabbix/pkg-install b/net/zabbix/pkg-install
deleted file mode 100644
index bd120120918d..000000000000
--- a/net/zabbix/pkg-install
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Script was taken from mysql323-server port, and modified
-# to suit zabbix needs
-
-[ -n "${PACKAGE_BUILDING}" ] && exit 0
-
-[ "${2}" = "POST-INSTALL" ] && exit 0
-
-PATH=/bin:/usr/sbin
-
-USER=zabbix
-GROUP=${USER}
-UID=112
-GID=${UID}
-
-if pw group show "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
-else
- if pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- exit 1
- fi
-fi
-
-if pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- if pw usermod ${USER} -d /nonexistent
- then
- echo "Changed home directory of \"${USER}\" to /nonexistent"
- else
- echo "Changing home directory of \"${USER}\" to /nonexistent failed..."
- exit 1
- fi
-else
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d /nonexistent -s /sbin/nologin -c "Zabbix Sandbox"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
-fi
diff --git a/net/zabbix/pkg-message b/net/zabbix/pkg-message
deleted file mode 100644
index 13c338ed4d4d..000000000000
--- a/net/zabbix/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-====================================================
-ACHTUNG!!!
-
-Run dbsetup.sh from %PREFIX%/share/zabbix/create
-to setup database tables. Arguments, given to
-it will be passed to mysql client, allowing
-connection do non-local MySQL server
-====================================================
diff --git a/net/zabbix/pkg-plist b/net/zabbix/pkg-plist
deleted file mode 100644
index c5bfd3a76dae..000000000000
--- a/net/zabbix/pkg-plist
+++ /dev/null
@@ -1,196 +0,0 @@
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-etc/zabbix/zabbix_suckerd.conf.sample
-etc/zabbix/zabbix_trapper.conf.sample
-etc/zabbix/zabbix_trapperd.conf.sample
-etc/rc.d/zabbix.sh.sample
-etc/rc.d/zabbix-agent.sh.sample
-bin/zabbix_agent
-bin/zabbix_agentd
-bin/zabbix_sender
-bin/zabbix_suckerd
-bin/zabbix_trapper
-bin/zabbix_trapperd
-%%DATADIR%%/php/audio/disaster_on.wav
-%%DATADIR%%/php/audio/warning_off.wav
-%%DATADIR%%/php/audio/warning_on.wav
-%%DATADIR%%/php/about.php
-%%DATADIR%%/php/actions.php
-%%DATADIR%%/php/alarms.php
-%%DATADIR%%/php/alerts.php
-%%DATADIR%%/php/chart.php
-%%DATADIR%%/php/chart2.php
-%%DATADIR%%/php/chart3.php
-%%DATADIR%%/php/chart4.php
-%%DATADIR%%/php/chart5.php
-%%DATADIR%%/php/chart_diff.php
-%%DATADIR%%/php/chart_sla.php
-%%DATADIR%%/php/charts.php
-%%DATADIR%%/php/compare.php
-%%DATADIR%%/php/config.php
-%%DATADIR%%/php/css.css
-%%DATADIR%%/php/graph.php
-%%DATADIR%%/php/graphs.php
-%%DATADIR%%/php/helpdesk.php
-%%DATADIR%%/php/history.php
-%%DATADIR%%/php/hosts.php
-%%DATADIR%%/php/index.php
-%%DATADIR%%/php/items.php
-%%DATADIR%%/php/latest.php
-%%DATADIR%%/php/latestalarms.php
-%%DATADIR%%/php/map.php
-%%DATADIR%%/php/maps.php
-%%DATADIR%%/php/media.php
-%%DATADIR%%/php/queue.php
-%%DATADIR%%/php/report1.php
-%%DATADIR%%/php/report2.php
-%%DATADIR%%/php/report3.php
-%%DATADIR%%/php/screenconf.php
-%%DATADIR%%/php/screenedit.php
-%%DATADIR%%/php/screens.php
-%%DATADIR%%/php/services.php
-%%DATADIR%%/php/srv_status.php
-%%DATADIR%%/php/sysmap.php
-%%DATADIR%%/php/sysmaps.php
-%%DATADIR%%/php/tr_comments.php
-%%DATADIR%%/php/tr_status.php
-%%DATADIR%%/php/trend.php
-%%DATADIR%%/php/trends.php
-%%DATADIR%%/php/triggers.php
-%%DATADIR%%/php/users.php
-%%DATADIR%%/php/images/sysmaps/old/Notebook.png
-%%DATADIR%%/php/images/sysmaps/old/Hub.png
-%%DATADIR%%/php/images/sysmaps/old/Printer.png
-%%DATADIR%%/php/images/sysmaps/old/Router.png
-%%DATADIR%%/php/images/sysmaps/old/Server.png
-%%DATADIR%%/php/images/sysmaps/old/Workstation.png
-%%DATADIR%%/php/images/sysmaps/Notebook.png
-%%DATADIR%%/php/images/sysmaps/Hub.png
-%%DATADIR%%/php/images/sysmaps/Printer.png
-%%DATADIR%%/php/images/sysmaps/Router.png
-%%DATADIR%%/php/images/sysmaps/Server.png
-%%DATADIR%%/php/images/sysmaps/Workstation.png
-%%DATADIR%%/php/images/sysmaps/README
-%%DATADIR%%/php/images/sysmaps/Phone.png
-%%DATADIR%%/php/images/sysmaps/Battery.png
-%%DATADIR%%/php/images/sysmaps/Network.png
-%%DATADIR%%/php/images/sysmaps/Satellite.png
-%%DATADIR%%/php/include/.htaccess
-%%DATADIR%%/php/include/classes.inc.php
-%%DATADIR%%/php/include/config.inc.php
-%%DATADIR%%/php/include/db.inc.php
-%%DATADIR%%/php/include/defines.inc.php
-%%DATADIR%%/create/data/data.sql
-%%DATADIR%%/create/mysql/schema.sql
-%%DATADIR%%/create/postgresql/schema.sql
-%%DATADIR%%/create/dbsetup.sh
-%%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql
-@dirrm etc/zabbix
-@dirrm %%DATADIR%%/php/audio
-@dirrm %%DATADIR%%/php/images/sysmaps/old
-@dirrm %%DATADIR%%/php/images/sysmaps
-@dirrm %%DATADIR%%/php/images
-@dirrm %%DATADIR%%/php/include
-@dirrm %%DATADIR%%/php
-@dirrm %%DATADIR%%/create/data
-@dirrm %%DATADIR%%/create/mysql
-@dirrm %%DATADIR%%/create/postgresql
-@dirrm %%DATADIR%%/create
-@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11
-@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12
-@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1
-@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4
-@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5
-@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7
-@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8
-@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9
-@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10
-@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3
-@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4
-@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5
-@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6
-@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7
-@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8
-@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9
-@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10
-@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11
-@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql
-@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13
-@dirrm %%DATADIR%%/dbpatches
-@dirrm %%DATADIR%%
-@exec ln -sf %D/etc/zabbix /etc/zabbix
-@unexec rm /etc/zabbix
diff --git a/net/zabbix/pkg-plist.agent b/net/zabbix/pkg-plist.agent
deleted file mode 100644
index 2e5a1980939c..000000000000
--- a/net/zabbix/pkg-plist.agent
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/zabbix_agent
-bin/zabbix_agentd
-bin/zabbix_sender
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-@dirrm etc/zabbix
-@exec ln -sf %D/etc/zabbix /etc/zabbix
-@unexec rm /etc/zabbix
diff --git a/net/zabbix/scripts/dbsetup.sh b/net/zabbix/scripts/dbsetup.sh
deleted file mode 100644
index 240f46157640..000000000000
--- a/net/zabbix/scripts/dbsetup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-{
- echo "create database zabbix; use zabbix;"
- cat mysql/schema.sql data/data.sql
-} | mysql ${*}
diff --git a/net/zabbix/scripts/zabbix-agent.sh.sample b/net/zabbix/scripts/zabbix-agent.sh.sample
deleted file mode 100644
index 1001c6cb694f..000000000000
--- a/net/zabbix/scripts/zabbix-agent.sh.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-prefix=%PREFIX%
-
-zabbix_agentd_enable="YES"
-
-. %LOCALBASE%/etc/rc.subr
-
-name="zabbix_agentd"
-rcvar=`set_rcvar`
-command="${prefix}/bin/${name}"
-required_files="/etc/zabbix/${name}.conf"
-
-run_rc_command "$1"
diff --git a/net/zabbix/scripts/zabbix.sh.sample b/net/zabbix/scripts/zabbix.sh.sample
deleted file mode 100644
index 01a0fbce27ef..000000000000
--- a/net/zabbix/scripts/zabbix.sh.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-prefix=%PREFIX%
-
-zabbix_suckerd_enable="YES"
-
-. %LOCALBASE%/etc/rc.subr
-
-name="zabbix_suckerd"
-rcvar=`set_rcvar`
-command="${prefix}/bin/${name}"
-required_files="/etc/zabbix/${name}.conf"
-
-run_rc_command "$1"