diff options
Diffstat (limited to 'net-mgmt')
170 files changed, 0 insertions, 9127 deletions
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile deleted file mode 100644 index d8eae593b8e9..000000000000 --- a/net-mgmt/cacti/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# New ports collection makefile for: cacti -# Date created: 6 December 2003 -# Whom: Vincent Tantardini <vinc@freebsd-fr.org> -# -# $FreeBSD$ -# - -PORTNAME= cacti -PORTVERSION= 0.8.6b -CATEGORIES= net -MASTER_SITES= http://www.cacti.net/downloads/ - -MAINTAINER= so14k@so14k.com -COMMENT= Web-driven graphing interface for RRDTool - -RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ - net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp - -USE_MYSQL= yes -USE_PHP= mysql pcre session xml -WANT_PHP_WEB= yes -WANT_PHP_CLI= yes -NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/pkg-message - -CACTIDIR?= share/cacti -CACTIUSER?= cacti -CACTIGROUP?= ${CACTIUSER} -PLIST_SUB+= CACTIDIR=${CACTIDIR} - -post-extract: - @${RM} -rf ${WRKSRC}/cactid/.deps - -post-patch: - @${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ - s|%%LOCALBASE%%|${LOCALBASE}| ; \ - s|%%CACTIDIR%%|${CACTIDIR}| ; \ - s|%%CACTIUSER%%|${CACTIUSER}|' > ${PKGMESSAGE} - -pre-install: - @PREFIX=${PREFIX} CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} CACTIGROUP=${CACTIGROUP} \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -do-install: - @${MKDIR} ${PREFIX}/${CACTIDIR}/ - @${CP} -R ${WRKSRC}/* ${PREFIX}/${CACTIDIR}/ - -post-install: - @PREFIX=${PREFIX} CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} CACTIGROUP=${CACTIGROUP} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo deleted file mode 100644 index 93b8637d756e..000000000000 --- a/net-mgmt/cacti/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (cacti-0.8.6b.tar.gz) = 6c6304aed42823b70648b4d5a3c329bd -SIZE (cacti-0.8.6b.tar.gz) = 1021894 diff --git a/net-mgmt/cacti/pkg-descr b/net-mgmt/cacti/pkg-descr deleted file mode 100644 index b17fbc17b3d2..000000000000 --- a/net-mgmt/cacti/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -One drawback to RRDTool, is that by itself it is not a complete package for -users wanting to graph their own networks. This is where cacti's job comes -in. Cacti brings the power of RRDTool to a friendly web interface making it -easy to graph anything using RRDTool. - -WWW: http://www.raxnet.net/products/cacti/ diff --git a/net-mgmt/cacti/pkg-install b/net-mgmt/cacti/pkg-install deleted file mode 100644 index 9c6d7bb893ae..000000000000 --- a/net-mgmt/cacti/pkg-install +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -PW=/usr/sbin/pw -UID=107 -GID=${UID} - -case $2 in - -PRE-INSTALL) - - if ${PW} group show "${CACTIGROUP}" 2>/dev/null; then - echo "You already have a group \"${CACTIGROUP}\", so I will use it." - else - if ${PW} groupadd ${CACTIGROUP} -g ${GID}; then - echo "Added group \"${CACTIGROUP}\"." - else - echo "Adding group \"${CACTIGROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${CACTIUSER}" 2>/dev/null; then - echo "You already have a user \"${CACTIUSER}\", so I will use it." - else - if ${PW} useradd ${CACTIUSER} -u ${UID} -g ${CACTIGROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "Cacti Sandbox" - then - echo "Added user \"${CACTIUSER}\"." - else - echo "Adding user \"${CACTIUSER}\" failed..." - exit 1 - fi - fi - ;; - -POST-INSTALL) - - chown ${CACTIUSER}:${CACTIGROUP} ${PREFIX}/${CACTIDIR}/log/ - chown ${CACTIUSER}:${CACTIGROUP} ${PREFIX}/${CACTIDIR}/rra/ - ;; -*) - exit 1 -;; -esac -exit diff --git a/net-mgmt/cacti/pkg-message b/net-mgmt/cacti/pkg-message deleted file mode 100644 index aef3e932a4ae..000000000000 --- a/net-mgmt/cacti/pkg-message +++ /dev/null @@ -1,21 +0,0 @@ -========================================================== -Cacti is now installed. You may have to follow this steps -to make it work correctly. - -1: Create the MySQL database -# mysqladmin --user=root create cacti -2: Create a mysql user/password for cacti -# echo "CREATE DATABASE cacti; -GRANT ALL ON cacti.* TO cactiuser at localhost IDENTIFIED BY 'cactiuser'; -FLUSH PRIVILEGES;" | mysql && -3: Import the default cacti database -# mysql cacti < %%PREFIX%%/%%CACTIDIR%%/cacti.sql -4: Edit your config.php -Specify the MySQL user, password and database for -your cacti configuration. -5: Add a line to your /etc/crontab file similar to: -*/5 * * * * %%CACTIUSER%% %%LOCALBASE%%/bin/php %%PREFIX%%/%%CACTIDIR%%/poller.php > /dev/null 2>&1 -6: Point your web browser to the cacti dir and login with admin/admin - -Have fun! -========================================================== diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist deleted file mode 100644 index 40f33040c59b..000000000000 --- a/net-mgmt/cacti/pkg-plist +++ /dev/null @@ -1,384 +0,0 @@ -%%CACTIDIR%%/LICENSE -%%CACTIDIR%%/README -%%CACTIDIR%%/about.php -%%CACTIDIR%%/auth_changepassword.php -%%CACTIDIR%%/auth_login.php -%%CACTIDIR%%/cacti.sql -%%CACTIDIR%%/cdef.php -%%CACTIDIR%%/cmd.php -%%CACTIDIR%%/color.php -%%CACTIDIR%%/data_input.php -%%CACTIDIR%%/data_queries.php -%%CACTIDIR%%/data_sources.php -%%CACTIDIR%%/data_templates.php -%%CACTIDIR%%/docs/CHANGELOG -%%CACTIDIR%%/docs/CONTRIB -%%CACTIDIR%%/docs/INSTALL -%%CACTIDIR%%/docs/README -%%CACTIDIR%%/docs/REQUIREMENTS -%%CACTIDIR%%/docs/UPGRADE -%%CACTIDIR%%/docs/html/LICENSE.html -%%CACTIDIR%%/docs/html/advanced_topics.html -%%CACTIDIR%%/docs/html/basics.html -%%CACTIDIR%%/docs/html/cdefs.html -%%CACTIDIR%%/docs/html/data_input_methods.html -%%CACTIDIR%%/docs/html/data_queries.html -%%CACTIDIR%%/docs/html/data_templates.html -%%CACTIDIR%%/docs/html/faq.html -%%CACTIDIR%%/docs/html/graph_howto.html -%%CACTIDIR%%/docs/html/graph_overview.html -%%CACTIDIR%%/docs/html/graph_permissions.html -%%CACTIDIR%%/docs/html/graph_settings.html -%%CACTIDIR%%/docs/html/graph_viewing.html -%%CACTIDIR%%/docs/html/host_templates.html -%%CACTIDIR%%/docs/html/host_variables.html -%%CACTIDIR%%/docs/html/how_to.html -%%CACTIDIR%%/docs/html/images/data_template.png -%%CACTIDIR%%/docs/html/images/graph_template.png -%%CACTIDIR%%/docs/html/images/graph_tree.png -%%CACTIDIR%%/docs/html/images/host_template.png -%%CACTIDIR%%/docs/html/images/new_device.png -%%CACTIDIR%%/docs/html/images/new_graphs.png -%%CACTIDIR%%/docs/html/images/user_management.png -%%CACTIDIR%%/docs/html/index.html -%%CACTIDIR%%/docs/html/install_unix.html -%%CACTIDIR%%/docs/html/install_windows.html -%%CACTIDIR%%/docs/html/installation.html -%%CACTIDIR%%/docs/html/making_scripts_work_with_cacti.html -%%CACTIDIR%%/docs/html/manual.css -%%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html -%%CACTIDIR%%/docs/html/new_graphs.html -%%CACTIDIR%%/docs/html/php_script_server.html -%%CACTIDIR%%/docs/html/realm_permissions.html -%%CACTIDIR%%/docs/html/reference.html -%%CACTIDIR%%/docs/html/requirements.html -%%CACTIDIR%%/docs/html/rrdtool_features.html -%%CACTIDIR%%/docs/html/script_query_xml.html -%%CACTIDIR%%/docs/html/script_to_graph.html -%%CACTIDIR%%/docs/html/snmp_query_xml.html -%%CACTIDIR%%/docs/html/templates.html -%%CACTIDIR%%/docs/html/testing_script_in_script_server.html -%%CACTIDIR%%/docs/html/upgrade.html -%%CACTIDIR%%/docs/html/upgrade_using_hostmib_data_queries.html -%%CACTIDIR%%/docs/html/user_management.html -%%CACTIDIR%%/docs/html/using_cacti.html -%%CACTIDIR%%/docs/html/variables.html -%%CACTIDIR%%/docs/pdf/README -%%CACTIDIR%%/docs/text/manual.txt -%%CACTIDIR%%/gprint_presets.php -%%CACTIDIR%%/graph.php -%%CACTIDIR%%/graph_image.php -%%CACTIDIR%%/graph_settings.php -%%CACTIDIR%%/graph_templates.php -%%CACTIDIR%%/graph_templates_inputs.php -%%CACTIDIR%%/graph_templates_items.php -%%CACTIDIR%%/graph_view.php -%%CACTIDIR%%/graphs.php -%%CACTIDIR%%/graphs_items.php -%%CACTIDIR%%/graphs_new.php -%%CACTIDIR%%/host.php -%%CACTIDIR%%/host_templates.php -%%CACTIDIR%%/images/arrow.gif -%%CACTIDIR%%/images/auth_deny.gif -%%CACTIDIR%%/images/auth_login.gif -%%CACTIDIR%%/images/button_add.gif -%%CACTIDIR%%/images/button_cancel.gif -%%CACTIDIR%%/images/button_cancel2.gif -%%CACTIDIR%%/images/button_clear.gif -%%CACTIDIR%%/images/button_create.gif -%%CACTIDIR%%/images/button_default.gif -%%CACTIDIR%%/images/button_delete.gif -%%CACTIDIR%%/images/button_go.gif -%%CACTIDIR%%/images/button_no.gif -%%CACTIDIR%%/images/button_refresh.gif -%%CACTIDIR%%/images/button_save.gif -%%CACTIDIR%%/images/button_view.gif -%%CACTIDIR%%/images/button_yes.gif -%%CACTIDIR%%/images/cacti_backdrop.gif -%%CACTIDIR%%/images/cacti_backdrop2.gif -%%CACTIDIR%%/images/cacti_logo.gif -%%CACTIDIR%%/images/calendar.gif -%%CACTIDIR%%/images/delete_icon.gif -%%CACTIDIR%%/images/delete_icon_large.gif -%%CACTIDIR%%/images/graph_properties.gif -%%CACTIDIR%%/images/graph_zoom.gif -%%CACTIDIR%%/images/hide.gif -%%CACTIDIR%%/images/left_border.gif -%%CACTIDIR%%/images/menu_line.gif -%%CACTIDIR%%/images/move_down.gif -%%CACTIDIR%%/images/move_up.gif -%%CACTIDIR%%/images/raxnet_logo.gif -%%CACTIDIR%%/images/reload_icon_small.gif -%%CACTIDIR%%/images/shadow.gif -%%CACTIDIR%%/images/shadow_gray.gif -%%CACTIDIR%%/images/show.gif -%%CACTIDIR%%/images/tab_cacti.gif -%%CACTIDIR%%/images/tab_console.gif -%%CACTIDIR%%/images/tab_graphs.gif -%%CACTIDIR%%/images/tab_mode_list.gif -%%CACTIDIR%%/images/tab_mode_list_down.gif -%%CACTIDIR%%/images/tab_mode_preview.gif -%%CACTIDIR%%/images/tab_mode_preview_down.gif -%%CACTIDIR%%/images/tab_mode_tree.gif -%%CACTIDIR%%/images/tab_mode_tree_down.gif -%%CACTIDIR%%/images/tab_settings.gif -%%CACTIDIR%%/images/tab_settings_down.gif -%%CACTIDIR%%/images/transparent_line.gif -%%CACTIDIR%%/include/auth.php -%%CACTIDIR%%/include/bottom_footer.php -%%CACTIDIR%%/include/config.php -%%CACTIDIR%%/include/config_arrays.php -%%CACTIDIR%%/include/config_constants.php -%%CACTIDIR%%/include/config_form.php -%%CACTIDIR%%/include/config_settings.php -%%CACTIDIR%%/include/html/inc_data_source_filter_table.php -%%CACTIDIR%%/include/html/inc_device_filter_table.php -%%CACTIDIR%%/include/html/inc_graph_filter_table.php -%%CACTIDIR%%/include/html/inc_graph_view_filter_table.php -%%CACTIDIR%%/include/html/inc_timespan_selector.php -%%CACTIDIR%%/include/html/inc_timespan_settings.php -%%CACTIDIR%%/include/jscalendar/calendar-setup.js -%%CACTIDIR%%/include/jscalendar/calendar.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-af.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-br.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ca.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-cs-win.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-da.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-de.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-du.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-el.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-en.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-es.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-fi.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-fr.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-hr-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-hr.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-hu.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-it.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-jp.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ko-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ko.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-lt-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-lt.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-nl.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-no.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-pl-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-pl.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-pt.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ro.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ru.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-si.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-sk.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-sp.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-sv.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-tr.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-zh.js -%%CACTIDIR%%/include/layout.js -%%CACTIDIR%%/include/main.css -%%CACTIDIR%%/include/top_graph_header.php -%%CACTIDIR%%/include/top_header.php -%%CACTIDIR%%/include/treeview/ftiens4.js -%%CACTIDIR%%/include/treeview/ftv2blank.gif -%%CACTIDIR%%/include/treeview/ftv2lastnode.gif -%%CACTIDIR%%/include/treeview/ftv2mlastnode.gif -%%CACTIDIR%%/include/treeview/ftv2mnode.gif -%%CACTIDIR%%/include/treeview/ftv2node.gif -%%CACTIDIR%%/include/treeview/ftv2plastnode.gif -%%CACTIDIR%%/include/treeview/ftv2pnode.gif -%%CACTIDIR%%/include/treeview/ftv2vertline.gif -%%CACTIDIR%%/include/treeview/ua.js -%%CACTIDIR%%/include/zoom.js -%%CACTIDIR%%/index.php -%%CACTIDIR%%/install/0_8_1_to_0_8_2.php -%%CACTIDIR%%/install/0_8_2_to_0_8_2a.php -%%CACTIDIR%%/install/0_8_2a_to_0_8_3.php -%%CACTIDIR%%/install/0_8_3_to_0_8_4.php -%%CACTIDIR%%/install/0_8_4_to_0_8_5.php -%%CACTIDIR%%/install/0_8_5a_to_0_8_6.php -%%CACTIDIR%%/install/0_8_6_to_0_8_6a.php -%%CACTIDIR%%/install/0_8_to_0_8_1.php -%%CACTIDIR%%/install/index.php -%%CACTIDIR%%/install/install_finish.gif -%%CACTIDIR%%/install/install_next.gif -%%CACTIDIR%%/lib/adodb/adodb-csvlib.inc.php -%%CACTIDIR%%/lib/adodb/adodb-datadict.inc.php -%%CACTIDIR%%/lib/adodb/adodb-error.inc.php -%%CACTIDIR%%/lib/adodb/adodb-errorhandler.inc.php -%%CACTIDIR%%/lib/adodb/adodb-errorpear.inc.php -%%CACTIDIR%%/lib/adodb/adodb-exceptions.inc.php -%%CACTIDIR%%/lib/adodb/adodb-iterator.inc.php -%%CACTIDIR%%/lib/adodb/adodb-lib.inc.php -%%CACTIDIR%%/lib/adodb/adodb-pager.inc.php -%%CACTIDIR%%/lib/adodb/adodb-pear.inc.php -%%CACTIDIR%%/lib/adodb/adodb-perf.inc.php -%%CACTIDIR%%/lib/adodb/adodb-php4.inc.php -%%CACTIDIR%%/lib/adodb/adodb-time.inc.php -%%CACTIDIR%%/lib/adodb/adodb-xmlschema.inc.php -%%CACTIDIR%%/lib/adodb/adodb.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-access.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-db2.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-firebird.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-generic.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-ibase.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-informix.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-mssql.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-mysql.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-oci8.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-postgres.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-sybase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-access.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado_access.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado_mssql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-borland_ibase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-csv.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-db2.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-fbsql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-firebird.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ibase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-informix.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-informix72.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ldap.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mssql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mssqlpo.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mysql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqli.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqlt.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-netezza.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oci8.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oci805.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oci8po.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc_mssql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc_oracle.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbtp.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbtp_unicode.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oracle.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres64.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres7.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-proxy.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sapdb.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlanywhere.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlite.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sybase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-vfp.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-bg.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-bgutf8.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ca.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-cn.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-cz.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-de.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-en.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-es.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-fr.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-it.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-nl.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-pl.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-pt-br.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ro.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ru1251.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-sv.inc.php -%%CACTIDIR%%/lib/adodb/license.txt -%%CACTIDIR%%/lib/adodb/pivottable.inc.php -%%CACTIDIR%%/lib/adodb/rsfilter.inc.php -%%CACTIDIR%%/lib/adodb/server.php -%%CACTIDIR%%/lib/adodb/toexport.inc.php -%%CACTIDIR%%/lib/adodb/tohtml.inc.php -%%CACTIDIR%%/lib/api_data_source.php -%%CACTIDIR%%/lib/api_device.php -%%CACTIDIR%%/lib/api_graph.php -%%CACTIDIR%%/lib/api_poller.php -%%CACTIDIR%%/lib/api_tree.php -%%CACTIDIR%%/lib/auth.php -%%CACTIDIR%%/lib/cdef.php -%%CACTIDIR%%/lib/data_query.php -%%CACTIDIR%%/lib/database.php -%%CACTIDIR%%/lib/export.php -%%CACTIDIR%%/lib/functions.php -%%CACTIDIR%%/lib/graph_export.php -%%CACTIDIR%%/lib/graph_variables.php -%%CACTIDIR%%/lib/html.php -%%CACTIDIR%%/lib/html_form.php -%%CACTIDIR%%/lib/html_form_template.php -%%CACTIDIR%%/lib/html_tree.php -%%CACTIDIR%%/lib/html_utility.php -%%CACTIDIR%%/lib/import.php -%%CACTIDIR%%/lib/ping.php -%%CACTIDIR%%/lib/poller.php -%%CACTIDIR%%/lib/rrd.php -%%CACTIDIR%%/lib/snmp.php -%%CACTIDIR%%/lib/sort.php -%%CACTIDIR%%/lib/template.php -%%CACTIDIR%%/lib/tree.php -%%CACTIDIR%%/lib/utility.php -%%CACTIDIR%%/lib/variables.php -%%CACTIDIR%%/lib/xml.php -%%CACTIDIR%%/log/cacti.log -%%CACTIDIR%%/logout.php -%%CACTIDIR%%/poller.php -%%CACTIDIR%%/resource/script_queries/host_cpu.xml -%%CACTIDIR%%/resource/script_queries/host_disk.xml -%%CACTIDIR%%/resource/script_queries/unix_disk.xml -%%CACTIDIR%%/resource/script_server/host_cpu.xml -%%CACTIDIR%%/resource/script_server/host_disk.xml -%%CACTIDIR%%/resource/snmp_queries/host_disk.xml -%%CACTIDIR%%/resource/snmp_queries/interface.xml -%%CACTIDIR%%/resource/snmp_queries/kbridge.xml -%%CACTIDIR%%/resource/snmp_queries/net-snmp_disk.xml -%%CACTIDIR%%/resource/snmp_queries/netware_cpu.xml -%%CACTIDIR%%/resource/snmp_queries/netware_disk.xml -%%CACTIDIR%%/rra.php -%%CACTIDIR%%/rra/.placeholder -%%CACTIDIR%%/script_server.php -%%CACTIDIR%%/script_server.pl -%%CACTIDIR%%/scripts/3com_cable_modem.pl -%%CACTIDIR%%/scripts/diskfree.pl -%%CACTIDIR%%/scripts/diskfree.sh -%%CACTIDIR%%/scripts/linux_memory.pl -%%CACTIDIR%%/scripts/loadavg.pl -%%CACTIDIR%%/scripts/loadavg_multi.pl -%%CACTIDIR%%/scripts/ping.pl -%%CACTIDIR%%/scripts/query_host_cpu.php -%%CACTIDIR%%/scripts/query_host_partitions.php -%%CACTIDIR%%/scripts/query_unix_partitions.pl -%%CACTIDIR%%/scripts/sql.php -%%CACTIDIR%%/scripts/ss_host_cpu.php -%%CACTIDIR%%/scripts/ss_host_disk.php -%%CACTIDIR%%/scripts/ss_sql.php -%%CACTIDIR%%/scripts/unix_processes.pl -%%CACTIDIR%%/scripts/unix_tcp_connections.pl -%%CACTIDIR%%/scripts/unix_users.pl -%%CACTIDIR%%/scripts/weatherbug.pl -%%CACTIDIR%%/scripts/webhits.pl -%%CACTIDIR%%/settings.php -%%CACTIDIR%%/templates_export.php -%%CACTIDIR%%/templates_import.php -%%CACTIDIR%%/tree.php -%%CACTIDIR%%/user_admin.php -%%CACTIDIR%%/utilities.php -@dirrm %%CACTIDIR%%/scripts -@dirrm %%CACTIDIR%%/rra -@dirrm %%CACTIDIR%%/resource/snmp_queries -@dirrm %%CACTIDIR%%/resource/script_server -@dirrm %%CACTIDIR%%/resource/script_queries -@dirrm %%CACTIDIR%%/resource -@dirrm %%CACTIDIR%%/log -@dirrm %%CACTIDIR%%/lib/adodb/lang -@dirrm %%CACTIDIR%%/lib/adodb/drivers -@dirrm %%CACTIDIR%%/lib/adodb/datadict -@dirrm %%CACTIDIR%%/lib/adodb -@dirrm %%CACTIDIR%%/lib -@dirrm %%CACTIDIR%%/install -@dirrm %%CACTIDIR%%/include/treeview -@dirrm %%CACTIDIR%%/include/jscalendar/lang -@dirrm %%CACTIDIR%%/include/jscalendar -@dirrm %%CACTIDIR%%/include/html -@dirrm %%CACTIDIR%%/include -@dirrm %%CACTIDIR%%/images -@dirrm %%CACTIDIR%%/docs/text -@dirrm %%CACTIDIR%%/docs/pdf -@dirrm %%CACTIDIR%%/docs/html/images -@dirrm %%CACTIDIR%%/docs/html -@dirrm %%CACTIDIR%%/docs -@dirrm %%CACTIDIR%% diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile deleted file mode 100644 index d8c491f6045d..000000000000 --- a/net-mgmt/jffnms/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# Ports collection makefile for: jffnms -# Date created: Aug 21 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= jffnms -PORTVERSION= 0.7.9 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=${PORTNAME} - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring and control system - -RUN_DEPENDS= neato:${PORTSDIR}/graphics/graphviz \ - rrdtool:${PORTSDIR}/net/rrdtool \ - nmap:${PORTSDIR}/security/nmap \ - ${LOCALBASE}/sbin/tmpwatch:${PORTSDIR}/sysutils/tmpwatch - -USE_PHP= gd snmp sockets -USE_MYSQL= yes -USE_REINPLACE= yes - -JFFNMSDIR?= share/jffnms -CRONTAB?= /usr/bin/crontab - -PLIST_SUB= JFFNMSDIR=${JFFNMSDIR} - -do-build: - @${REINPLACE_CMD} -e 's|/opt/jffnms|${PREFIX}/${JFFNMSDIR}|g' \ - -e 's|/usr/bin/php|${LOCALBASE}/bin/php|g' \ - -e 's|/usr/bin/rrdtool|${LOCALBASE}/bin/rrdtool|g' \ - -e 's|/usr/bin/nmap|${LOCALBASE}/bin/nmap|g' \ - -e 's|/usr/bin/neato|${LOCALBASE}/bin/neato|g' \ - -e 's| /jffnms| /htdocs|g' \ - ${WRKSRC}/conf/config.ini - -do-install: - @-${RM} ${WRKSRC}/engine/tmpwatch.sh.orig > /dev/null 2>&1 - @${MKDIR} ${PREFIX}/${JFFNMSDIR} - @${CP} -R ${WRKSRC}/* ${PREFIX}/${JFFNMSDIR} - @${CHOWN} -R www:www ${PREFIX}/${JFFNMSDIR} - @${SED} -e 's|%LOCALBASE%|${PREFIX}|g' \ - -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' ${FILESDIR}/jffnms.cron \ - > ${PREFIX}/${JFFNMSDIR}/jffnms.cron - @${SED} -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' \ - -e 's|%JFFNMS%|${DISTNAME}|g' ${FILESDIR}/jffnms_db.sh \ - > ${PREFIX}/${JFFNMSDIR}/jffnms_db.sh - @${CRONTAB} -u www ${PREFIX}/${JFFNMSDIR}/jffnms.cron - @${SED} -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' ${PKGMESSAGE} - -# -# !!! Maintainer only !!! -# -packinglist: pkg-plist.new -pkg-plist.new: - @${ECHO_MSG} '---> Making ${@}' - @${FIND} '${PREFIX}/${JFFNMSDIR}' -type f | \ - ${SED} -e 's|^${PREFIX}/${JFFNMSDIR}|%%JFFNMSDIR%%|' | \ - ${SORT} -t / > ${@} - @${FIND} '${PREFIX}/${JFFNMSDIR}' -type d | \ - ${SORT} -rt / | \ - ${SED} -e 's|^${PREFIX}/${JFFNMSDIR}|@dirrm %%JFFNMSDIR%%|' >> ${@} - @${ECHO} "@exec crontab -u www %%JFFNMSDIR%%/jffnms.cron" >> ${@} - @${ECHO} "@unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www -" >> ${@} - -.include <bsd.port.mk> diff --git a/net-mgmt/jffnms/distinfo b/net-mgmt/jffnms/distinfo deleted file mode 100644 index afa114cb4f92..000000000000 --- a/net-mgmt/jffnms/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (jffnms-0.7.9.tar.gz) = 8b2b60fa8ba1d6853e0ed2eda2d0d28d -SIZE (jffnms-0.7.9.tar.gz) = 503953 diff --git a/net-mgmt/jffnms/files/jffnms.cron b/net-mgmt/jffnms/files/jffnms.cron deleted file mode 100644 index 9039597de48e..000000000000 --- a/net-mgmt/jffnms/files/jffnms.cron +++ /dev/null @@ -1,11 +0,0 @@ -# jffnms crontab file -# Created by Sergey Akifyev <asa@gascom.ru> -JFFNMS=%JFFNMSDIR%/engine -PATH=${PATH}:/bin:/usr/bin:%LOCALBASE%/bin:/sbin:/usr/sbin:/%LOCALBASE%/sbin # JFFNMS -*/1 * * * * cd $JFFNMS && php -q consolidate.php >/dev/null 2>&1 -*/5 * * * * cd $JFFNMS && php -q poller.php >/dev/null 2>&1 -*/30 * * * * cd $JFFNMS && php -q rrd_analizer.php >/dev/null 2>&1 -*/30 * * * * cd $JFFNMS && php -q autodiscovery_interfaces.php > /dev/null 2>&1 -02 4 * * * cd $JFFNMS && php -q tftp_get_host_config.php >/dev/null 2>&1 -02 5 * * * cd $JFFNMS && php -q cleanup_raw_tables.php >/dev/null 2>&1 -20 5 * * * cd $JFFNMS && sh tmpwatch.sh $JFFNMS >/dev/null 2>&1 diff --git a/net-mgmt/jffnms/files/jffnms_db.sh b/net-mgmt/jffnms/files/jffnms_db.sh deleted file mode 100644 index aa6c14df53ee..000000000000 --- a/net-mgmt/jffnms/files/jffnms_db.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Created by Sergey Akifyev <asa@gascom.ru> -# - -{ - echo "CREATE DATABASE jffnms; - GRANT ALL PRIVILEGES ON jffnms.* TO jffnms@localhost - IDENTIFIED BY 'jffnms'; - FLUSH PRIVILEGES;" - cat %JFFNMSDIR%/docs/%JFFNMS%.mysql -} | mysql ${*} diff --git a/net-mgmt/jffnms/pkg-descr b/net-mgmt/jffnms/pkg-descr deleted file mode 100644 index 8894ea2d2353..000000000000 --- a/net-mgmt/jffnms/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -JFFNMS is a Network Management System designed to -mantain a IP SNMP / Syslog / Tacacs+ Network. It -can be used to monitor any standards compilant SNMP -device, Server, TCP port or Custom Poller, also it -has some Cisco oriented features. - -WWW: http://jffnms.sourceforge.net/ diff --git a/net-mgmt/jffnms/pkg-message b/net-mgmt/jffnms/pkg-message deleted file mode 100644 index a22b65276b23..000000000000 --- a/net-mgmt/jffnms/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ -==================================================== -ACHTUNG!!! - -1) Run %JFFNMSDIR%/jffnms_db.sh -when MySQL is running - -2) Configure apache to serve pages from -%JFFNMSDIR% - -3) Modify 'Register globals = on' in php.ini - -4) Go to http://<your-hostname>/htdocs/admin/setup.php and -finish setting up JFFNMS -==================================================== diff --git a/net-mgmt/jffnms/pkg-plist b/net-mgmt/jffnms/pkg-plist deleted file mode 100644 index 585efd883f2d..000000000000 --- a/net-mgmt/jffnms/pkg-plist +++ /dev/null @@ -1,499 +0,0 @@ -%%JFFNMSDIR%%/BUGS -%%JFFNMSDIR%%/Changelog -%%JFFNMSDIR%%/INSTALL -%%JFFNMSDIR%%/INSTALL.win32.txt -%%JFFNMSDIR%%/LICENSE -%%JFFNMSDIR%%/TODO -%%JFFNMSDIR%%/UPGRADE -%%JFFNMSDIR%%/UPGRADE.win32.txt -%%JFFNMSDIR%%/conf/config.ini -%%JFFNMSDIR%%/conf/config.ini.bak -%%JFFNMSDIR%%/conf/config.php -%%JFFNMSDIR%%/conf/functions.php -%%JFFNMSDIR%%/docs/apache-example -%%JFFNMSDIR%%/docs/cisco-example -%%JFFNMSDIR%%/docs/jffnms-0.7.9.mysql -%%JFFNMSDIR%%/docs/jffnms-0.7.9.pgsql -%%JFFNMSDIR%%/docs/sla-creation-example.txt -%%JFFNMSDIR%%/docs/unix/msyslog-example -%%JFFNMSDIR%%/docs/unix/php.ini.example -%%JFFNMSDIR%%/docs/unix/snmp.conf -%%JFFNMSDIR%%/docs/unix/snmptrap.txt -%%JFFNMSDIR%%/docs/unix/snmptrapd.conf -%%JFFNMSDIR%%/docs/unix/syslog-ng-example -%%JFFNMSDIR%%/docs/unix/syslog.conf -%%JFFNMSDIR%%/docs/unix/tac_plus.cfg -%%JFFNMSDIR%%/docs/unix/tftp -%%JFFNMSDIR%%/docs/upgrade/jffnms-0.7.8-to-0.7.9.patch -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.aggr -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.apache -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.compaq -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.iis -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.it_rename_bgp -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.mail_from -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.mini_sla -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.pkt_graph -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.pm3 -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.temp_aggr -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.win -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.x_fix_internal_ids -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.aggr -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.apache -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.compaq -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.iis -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.it_rename_bgp -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.mail_from -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.mini_sla -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.pkt_graph -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.pm3 -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.temp_aggr -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.win -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.x_fix_internal_ids -%%JFFNMSDIR%%/docs/utils/adjust_bw.php -%%JFFNMSDIR%%/docs/utils/clean_auth.php -%%JFFNMSDIR%%/docs/utils/exp_poller_test.php -%%JFFNMSDIR%%/docs/utils/export_custom.php -%%JFFNMSDIR%%/docs/utils/int_values_convert.php -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/iptables.inc.php -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/jffnms-snmp.php -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/snmpd.conf.example -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/tc.inc.php -%%JFFNMSDIR%%/docs/utils/lines.sh -%%JFFNMSDIR%%/docs/utils/makedb_release.php -%%JFFNMSDIR%%/docs/utils/mib.php -%%JFFNMSDIR%%/docs/utils/perl_wddx.pl -%%JFFNMSDIR%%/docs/utils/ping.php -%%JFFNMSDIR%%/docs/utils/rrd_export.php -%%JFFNMSDIR%%/docs/utils/rrd_import.php -%%JFFNMSDIR%%/docs/utils/satellite-client.php -%%JFFNMSDIR%%/docs/utils/satellite_sync.php -%%JFFNMSDIR%%/docs/utils/slice-rrd.php -%%JFFNMSDIR%%/docs/utils/sql_alter_pg.php -%%JFFNMSDIR%%/docs/utils/sql_diff.php -%%JFFNMSDIR%%/docs/utils/syslog_file_import.php -%%JFFNMSDIR%%/docs/utils/tftp_put_host_config.php -%%JFFNMSDIR%%/docs/windows/httpd.conf -%%JFFNMSDIR%%/docs/windows/php.ini -%%JFFNMSDIR%%/engine/actions/email.inc.php -%%JFFNMSDIR%%/engine/actions/none.inc.php -%%JFFNMSDIR%%/engine/actions/smsclient.inc.php -%%JFFNMSDIR%%/engine/analyzers/sla.inc.php -%%JFFNMSDIR%%/engine/autodiscovery_interfaces.php -%%JFFNMSDIR%%/engine/autodiscovery_network.php -%%JFFNMSDIR%%/engine/backends/alarm.php -%%JFFNMSDIR%%/engine/backends/buffer.php -%%JFFNMSDIR%%/engine/backends/db.php -%%JFFNMSDIR%%/engine/backends/multi_buffer.php -%%JFFNMSDIR%%/engine/backends/no_backend.php -%%JFFNMSDIR%%/engine/backends/rrd.php -%%JFFNMSDIR%%/engine/backends/verify_interface_number.php -%%JFFNMSDIR%%/engine/cleanup_raw_tables.php -%%JFFNMSDIR%%/engine/configs/cisco_catos.inc.php -%%JFFNMSDIR%%/engine/configs/cisco_cc.inc.php -%%JFFNMSDIR%%/engine/configs/cisco_sys.inc.php -%%JFFNMSDIR%%/engine/configs/none.inc.php -%%JFFNMSDIR%%/engine/consolidate.php -%%JFFNMSDIR%%/engine/consolidate/alarms.php -%%JFFNMSDIR%%/engine/consolidate/events.php -%%JFFNMSDIR%%/engine/consolidate/events_latest.php -%%JFFNMSDIR%%/engine/consolidate/syslog.php -%%JFFNMSDIR%%/engine/consolidate/tacacs.php -%%JFFNMSDIR%%/engine/consolidate/traps.php -%%JFFNMSDIR%%/engine/discovery/apache.inc.php -%%JFFNMSDIR%%/engine/discovery/bgp_peers.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_accounting.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_envmib.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_saagent.inc.php -%%JFFNMSDIR%%/engine/discovery/cpqmib.inc.php -%%JFFNMSDIR%%/engine/discovery/css_vips.inc.php -%%JFFNMSDIR%%/engine/discovery/host_information.inc.php -%%JFFNMSDIR%%/engine/discovery/hostmib_apps.inc.php -%%JFFNMSDIR%%/engine/discovery/iis_info.inc.php -%%JFFNMSDIR%%/engine/discovery/linux_tc.inc.php -%%JFFNMSDIR%%/engine/discovery/livingston_serial_port.inc.php -%%JFFNMSDIR%%/engine/discovery/none.inc.php -%%JFFNMSDIR%%/engine/discovery/ntp_client.inc.php -%%JFFNMSDIR%%/engine/discovery/reachability.inc.php -%%JFFNMSDIR%%/engine/discovery/smokeping.inc.php -%%JFFNMSDIR%%/engine/discovery/snmp_interfaces.inc.php -%%JFFNMSDIR%%/engine/discovery/storage.inc.php -%%JFFNMSDIR%%/engine/discovery/tcp_ports.inc.php -%%JFFNMSDIR%%/engine/exp_poller_child.php -%%JFFNMSDIR%%/engine/exp_poller_master.php -%%JFFNMSDIR%%/engine/graphs/acct_bytes.inc.php -%%JFFNMSDIR%%/engine/graphs/acct_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_bpr.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_cplo.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tac.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tac_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tkb.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tkb_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_workers.inc.php -%%JFFNMSDIR%%/engine/graphs/apps_instances.inc.php -%%JFFNMSDIR%%/engine/graphs/apps_memory.inc.php -%%JFFNMSDIR%%/engine/graphs/bgp_updates.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_mac_bytes.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_mac_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_saagent_jitter.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_saagent_packetloss.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_saagent_rtl.inc.php -%%JFFNMSDIR%%/engine/graphs/cpu_util.inc.php -%%JFFNMSDIR%%/engine/graphs/cpu_util_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/css_vip_hits.inc.php -%%JFFNMSDIR%%/engine/graphs/css_vip_output_only_traffic.inc.php -%%JFFNMSDIR%%/engine/graphs/drop_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/error_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/error_rate.inc.php -%%JFFNMSDIR%%/engine/graphs/hostmib_users_procs.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tbr.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tcgir.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tfs.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tptg.inc.php -%%JFFNMSDIR%%/engine/graphs/memory.inc.php -%%JFFNMSDIR%%/engine/graphs/packetloss.inc.php -%%JFFNMSDIR%%/engine/graphs/packets.inc.php -%%JFFNMSDIR%%/engine/graphs/packets_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/packets_new.inc.php -%%JFFNMSDIR%%/engine/graphs/pm_serial.inc.php -%%JFFNMSDIR%%/engine/graphs/rtt.inc.php -%%JFFNMSDIR%%/engine/graphs/storage.inc.php -%%JFFNMSDIR%%/engine/graphs/storage_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/tc_rate.inc.php -%%JFFNMSDIR%%/engine/graphs/tc_rate_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/tcp_conn_delay.inc.php -%%JFFNMSDIR%%/engine/graphs/tcp_conn_number.inc.php -%%JFFNMSDIR%%/engine/graphs/tcp_conn_number_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/tcpmib_connections.inc.php -%%JFFNMSDIR%%/engine/graphs/temperature.inc.php -%%JFFNMSDIR%%/engine/graphs/temperature_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_pl.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_util.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_cpu_solaris.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_load_average.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_load_average_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_memory.inc.php -%%JFFNMSDIR%%/engine/handlers/bool.inc.php -%%JFFNMSDIR%%/engine/handlers/none.inc.php -%%JFFNMSDIR%%/engine/handlers/rrd_ds.inc.php -%%JFFNMSDIR%%/engine/handlers/tcp_ports.inc.php -%%JFFNMSDIR%%/engine/poller.php -%%JFFNMSDIR%%/engine/poller_helper.php -%%JFFNMSDIR%%/engine/pollers/apache.php -%%JFFNMSDIR%%/engine/pollers/bgp_peer_status.php -%%JFFNMSDIR%%/engine/pollers/buffer.php -%%JFFNMSDIR%%/engine/pollers/cisco_accounting.php -%%JFFNMSDIR%%/engine/pollers/cisco_envmib_status.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_backwardjitter.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_bwpacketloss.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_forwardjitter.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_fwpacketloss.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_rtl.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_verify.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_end.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_get_pl.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_get_rtt.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_start.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_wait.php -%%JFFNMSDIR%%/engine/pollers/db.php -%%JFFNMSDIR%%/engine/pollers/hostmib_apps.php -%%JFFNMSDIR%%/engine/pollers/hostmib_perf.php -%%JFFNMSDIR%%/engine/pollers/internal.php -%%JFFNMSDIR%%/engine/pollers/livingston_serial_port_status.php -%%JFFNMSDIR%%/engine/pollers/no_poller.php -%%JFFNMSDIR%%/engine/pollers/ntp_client.php -%%JFFNMSDIR%%/engine/pollers/reachability_end.php -%%JFFNMSDIR%%/engine/pollers/reachability_start.php -%%JFFNMSDIR%%/engine/pollers/reachability_status.php -%%JFFNMSDIR%%/engine/pollers/reachability_values.php -%%JFFNMSDIR%%/engine/pollers/reachability_wait.php -%%JFFNMSDIR%%/engine/pollers/smokeping.php -%%JFFNMSDIR%%/engine/pollers/snmp_counter.php -%%JFFNMSDIR%%/engine/pollers/snmp_interface_status_all.php -%%JFFNMSDIR%%/engine/pollers/snmp_status.php -%%JFFNMSDIR%%/engine/pollers/snmp_walk_average.php -%%JFFNMSDIR%%/engine/pollers/tcp_connection_number.php -%%JFFNMSDIR%%/engine/pollers/tcp_port_content.php -%%JFFNMSDIR%%/engine/pollers/tcp_status.php -%%JFFNMSDIR%%/engine/pollers/udp_status.php -%%JFFNMSDIR%%/engine/pollers/verify_interface_number.php -%%JFFNMSDIR%%/engine/pollers/verify_smokeping_number.php -%%JFFNMSDIR%%/engine/pollers/verify_tc_class_number.php -%%JFFNMSDIR%%/engine/rrd_analizer.php -%%JFFNMSDIR%%/engine/satellite/distribution.inc.php -%%JFFNMSDIR%%/engine/satellite/ping.inc.php -%%JFFNMSDIR%%/engine/satellite/poller.inc.php -%%JFFNMSDIR%%/engine/satellite_distribution.php -%%JFFNMSDIR%%/engine/shared/.check -%%JFFNMSDIR%%/engine/shared/catos.inc.php -%%JFFNMSDIR%%/engine/temp/.check -%%JFFNMSDIR%%/engine/tftp_get_host_config.php -%%JFFNMSDIR%%/engine/ticket/tiba.inc.php -%%JFFNMSDIR%%/engine/tmpwatch.sh -%%JFFNMSDIR%%/engine/tools/if_admin.inc.php -%%JFFNMSDIR%%/engine/tools/if_alias.inc.php -%%JFFNMSDIR%%/engine/tools/none.inc.php -%%JFFNMSDIR%%/engine/tools/separator.inc.php -%%JFFNMSDIR%%/engine/tools/tcp_cnx.inc.php -%%JFFNMSDIR%%/engine/trap_receiver.php -%%JFFNMSDIR%%/engine/windows/autodiscovery_interfaces.bat -%%JFFNMSDIR%%/engine/windows/cleanup_raw_tables.bat -%%JFFNMSDIR%%/engine/windows/consolidate.bat -%%JFFNMSDIR%%/engine/windows/poller.bat -%%JFFNMSDIR%%/engine/windows/rrd_analizer.bat -%%JFFNMSDIR%%/engine/windows/tftpget_hosts.bat -%%JFFNMSDIR%%/htdocs/.check -%%JFFNMSDIR%%/htdocs/.htaccess -%%JFFNMSDIR%%/htdocs/admin/adm/adm_alarms.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_auth.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts_config.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_interfaces.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_nad.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_profiles.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_profiles_options.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_satellites.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_standard.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_triggers_rules.php -%%JFFNMSDIR%%/htdocs/admin/adm/structures.php -%%JFFNMSDIR%%/htdocs/admin/adm/test.php -%%JFFNMSDIR%%/htdocs/admin/calendar.php -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-blue2.css -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-en.js -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-setup_stripped.js -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar_stripped.js -%%JFFNMSDIR%%/htdocs/admin/color_select.php -%%JFFNMSDIR%%/htdocs/admin/event_filter.php -%%JFFNMSDIR%%/htdocs/admin/menu.php -%%JFFNMSDIR%%/htdocs/admin/menu_frame.php -%%JFFNMSDIR%%/htdocs/admin/menu_interface_list.php -%%JFFNMSDIR%%/htdocs/admin/reports/journal_report.php -%%JFFNMSDIR%%/htdocs/admin/reports/state_report.php -%%JFFNMSDIR%%/htdocs/admin/sat_session.inc.php -%%JFFNMSDIR%%/htdocs/admin/satellite.php -%%JFFNMSDIR%%/htdocs/admin/setup.php -%%JFFNMSDIR%%/htdocs/admin/tools.php -%%JFFNMSDIR%%/htdocs/auth.php -%%JFFNMSDIR%%/htdocs/blank.html -%%JFFNMSDIR%%/htdocs/controls.php -%%JFFNMSDIR%%/htdocs/events.php -%%JFFNMSDIR%%/htdocs/frame_interfaces.php -%%JFFNMSDIR%%/htdocs/frame_interfaces_events.php -%%JFFNMSDIR%%/htdocs/images/a-down.png -%%JFFNMSDIR%%/htdocs/images/a-left.png -%%JFFNMSDIR%%/htdocs/images/a-right.png -%%JFFNMSDIR%%/htdocs/images/a-top.png -%%JFFNMSDIR%%/htdocs/images/a-up.png -%%JFFNMSDIR%%/htdocs/images/alert.gif -%%JFFNMSDIR%%/htdocs/images/alert.png -%%JFFNMSDIR%%/htdocs/images/all.png -%%JFFNMSDIR%%/htdocs/images/ar.png -%%JFFNMSDIR%%/htdocs/images/at.png -%%JFFNMSDIR%%/htdocs/images/au.png -%%JFFNMSDIR%%/htdocs/images/be.png -%%JFFNMSDIR%%/htdocs/images/br.png -%%JFFNMSDIR%%/htdocs/images/bullet1.png -%%JFFNMSDIR%%/htdocs/images/bullet2.png -%%JFFNMSDIR%%/htdocs/images/bullet3.png -%%JFFNMSDIR%%/htdocs/images/bullet4.png -%%JFFNMSDIR%%/htdocs/images/ca.png -%%JFFNMSDIR%%/htdocs/images/calendar.png -%%JFFNMSDIR%%/htdocs/images/color.png -%%JFFNMSDIR%%/htdocs/images/config.png -%%JFFNMSDIR%%/htdocs/images/config1.png -%%JFFNMSDIR%%/htdocs/images/csv.png -%%JFFNMSDIR%%/htdocs/images/de.png -%%JFFNMSDIR%%/htdocs/images/delete.png -%%JFFNMSDIR%%/htdocs/images/edit.png -%%JFFNMSDIR%%/htdocs/images/es.png -%%JFFNMSDIR%%/htdocs/images/est.png -%%JFFNMSDIR%%/htdocs/images/eu.png -%%JFFNMSDIR%%/htdocs/images/event.png -%%JFFNMSDIR%%/htdocs/images/event2.png -%%JFFNMSDIR%%/htdocs/images/favicon.ico -%%JFFNMSDIR%%/htdocs/images/filter.png -%%JFFNMSDIR%%/htdocs/images/fr.png -%%JFFNMSDIR%%/htdocs/images/graph.png -%%JFFNMSDIR%%/htdocs/images/home.png -%%JFFNMSDIR%%/htdocs/images/host.png -%%JFFNMSDIR%%/htdocs/images/int1.png -%%JFFNMSDIR%%/htdocs/images/it.png -%%JFFNMSDIR%%/htdocs/images/java.png -%%JFFNMSDIR%%/htdocs/images/jffnms.png -%%JFFNMSDIR%%/htdocs/images/lock.png -%%JFFNMSDIR%%/htdocs/images/log.png -%%JFFNMSDIR%%/htdocs/images/logoff.png -%%JFFNMSDIR%%/htdocs/images/mail.png -%%JFFNMSDIR%%/htdocs/images/mail2.png -%%JFFNMSDIR%%/htdocs/images/map2.png -%%JFFNMSDIR%%/htdocs/images/mess.png -%%JFFNMSDIR%%/htdocs/images/minus.png -%%JFFNMSDIR%%/htdocs/images/new.png -%%JFFNMSDIR%%/htdocs/images/normal.png -%%JFFNMSDIR%%/htdocs/images/nosound.png -%%JFFNMSDIR%%/htdocs/images/pen.png -%%JFFNMSDIR%%/htdocs/images/pencil.png -%%JFFNMSDIR%%/htdocs/images/pl.png -%%JFFNMSDIR%%/htdocs/images/plus.png -%%JFFNMSDIR%%/htdocs/images/popup.png -%%JFFNMSDIR%%/htdocs/images/query.png -%%JFFNMSDIR%%/htdocs/images/refresh.png -%%JFFNMSDIR%%/htdocs/images/refresh2.png -%%JFFNMSDIR%%/htdocs/images/service.png -%%JFFNMSDIR%%/htdocs/images/sla.png -%%JFFNMSDIR%%/htdocs/images/sound.png -%%JFFNMSDIR%%/htdocs/images/tag.png -%%JFFNMSDIR%%/htdocs/images/temp/.check -%%JFFNMSDIR%%/htdocs/images/text.png -%%JFFNMSDIR%%/htdocs/images/tickmark.png -%%JFFNMSDIR%%/htdocs/images/tool.png -%%JFFNMSDIR%%/htdocs/images/uk.png -%%JFFNMSDIR%%/htdocs/images/unknown.png -%%JFFNMSDIR%%/htdocs/images/usa.png -%%JFFNMSDIR%%/htdocs/images/user2.png -%%JFFNMSDIR%%/htdocs/images/users.png -%%JFFNMSDIR%%/htdocs/images/uy.png -%%JFFNMSDIR%%/htdocs/images/world.png -%%JFFNMSDIR%%/htdocs/index.php -%%JFFNMSDIR%%/htdocs/journal.php -%%JFFNMSDIR%%/htdocs/login.php -%%JFFNMSDIR%%/htdocs/logout.php -%%JFFNMSDIR%%/htdocs/sounds/18_16b.wav -%%JFFNMSDIR%%/htdocs/sounds/boing.wav -%%JFFNMSDIR%%/htdocs/sounds/down.wav -%%JFFNMSDIR%%/htdocs/sounds/tling.wav -%%JFFNMSDIR%%/htdocs/sounds/up.wav -%%JFFNMSDIR%%/htdocs/start.php -%%JFFNMSDIR%%/htdocs/view_interfaces.php -%%JFFNMSDIR%%/htdocs/view_interfaces_map_list.php -%%JFFNMSDIR%%/htdocs/view_performance.php -%%JFFNMSDIR%%/htdocs/views/infobox.js -%%JFFNMSDIR%%/htdocs/views/source_hosts_dhtml.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_get.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_init.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_normal.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_text.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_urls.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_dhtml.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_get.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_infobox.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_init.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_normal.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_performance.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_text.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_urls.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_dhtml.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_get.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_init.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_normal.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_text.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_urls.inc.php -%%JFFNMSDIR%%/htdocs/views/source_none.inc.php -%%JFFNMSDIR%%/htdocs/views/toolbox.inc.php -%%JFFNMSDIR%%/htdocs/views/toolbox.js -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_card.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_zone.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_finish_row.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_next_line_span.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_no_interfaces.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap.js -%%JFFNMSDIR%%/htdocs/views/view_dynmap_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_interface_process.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_line.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_no_interfaces.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_save.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_break_by_host.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_none.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_by_card.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_by_host.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_by_zone.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_finish_row.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_next_line_span.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_no_interfaces.inc.php -%%JFFNMSDIR%%/htdocs/views/view_performance_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_performance_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_no_interfaces.inc.php -%%JFFNMSDIR%%/jffnms.cron -%%JFFNMSDIR%%/jffnms_db.sh -%%JFFNMSDIR%%/lib/api.classes.inc.php -%%JFFNMSDIR%%/lib/api.db.inc.php -%%JFFNMSDIR%%/lib/api.events.inc.php -%%JFFNMSDIR%%/lib/api.hosts.inc.php -%%JFFNMSDIR%%/lib/api.inc.php -%%JFFNMSDIR%%/lib/api.interface.inc.php -%%JFFNMSDIR%%/lib/api.maps.inc.php -%%JFFNMSDIR%%/lib/api.nad.inc.php -%%JFFNMSDIR%%/lib/api.network.inc.php -%%JFFNMSDIR%%/lib/api.profile.inc.php -%%JFFNMSDIR%%/lib/api.rrdtool.inc.php -%%JFFNMSDIR%%/lib/api.satellites.inc.php -%%JFFNMSDIR%%/lib/api.tools.inc.php -%%JFFNMSDIR%%/lib/api.triggers.inc.php -%%JFFNMSDIR%%/lib/api.user.inc.php -%%JFFNMSDIR%%/lib/api.zones.inc.php -%%JFFNMSDIR%%/lib/gui.controls.inc.php -%%JFFNMSDIR%%/lib/gui.inc.php -%%JFFNMSDIR%%/logs/.check -%%JFFNMSDIR%%/rrd/.check -%%JFFNMSDIR%%/tftpd/.check -@dirrm %%JFFNMSDIR%%/tftpd -@dirrm %%JFFNMSDIR%%/rrd -@dirrm %%JFFNMSDIR%%/logs -@dirrm %%JFFNMSDIR%%/lib -@dirrm %%JFFNMSDIR%%/htdocs/views -@dirrm %%JFFNMSDIR%%/htdocs/sounds -@dirrm %%JFFNMSDIR%%/htdocs/images/temp -@dirrm %%JFFNMSDIR%%/htdocs/images -@dirrm %%JFFNMSDIR%%/htdocs/admin/reports -@dirrm %%JFFNMSDIR%%/htdocs/admin/calendar -@dirrm %%JFFNMSDIR%%/htdocs/admin/adm -@dirrm %%JFFNMSDIR%%/htdocs/admin -@dirrm %%JFFNMSDIR%%/htdocs -@dirrm %%JFFNMSDIR%%/engine/windows -@dirrm %%JFFNMSDIR%%/engine/tools -@dirrm %%JFFNMSDIR%%/engine/ticket -@dirrm %%JFFNMSDIR%%/engine/temp -@dirrm %%JFFNMSDIR%%/engine/shared -@dirrm %%JFFNMSDIR%%/engine/satellite -@dirrm %%JFFNMSDIR%%/engine/pollers -@dirrm %%JFFNMSDIR%%/engine/handlers -@dirrm %%JFFNMSDIR%%/engine/graphs -@dirrm %%JFFNMSDIR%%/engine/discovery -@dirrm %%JFFNMSDIR%%/engine/consolidate -@dirrm %%JFFNMSDIR%%/engine/configs -@dirrm %%JFFNMSDIR%%/engine/backends -@dirrm %%JFFNMSDIR%%/engine/analyzers -@dirrm %%JFFNMSDIR%%/engine/actions -@dirrm %%JFFNMSDIR%%/engine -@dirrm %%JFFNMSDIR%%/docs/windows -@dirrm %%JFFNMSDIR%%/docs/utils/jffnms-snmp -@dirrm %%JFFNMSDIR%%/docs/utils -@dirrm %%JFFNMSDIR%%/docs/upgrade/pgsql -@dirrm %%JFFNMSDIR%%/docs/upgrade/mysql -@dirrm %%JFFNMSDIR%%/docs/upgrade -@dirrm %%JFFNMSDIR%%/docs/unix -@dirrm %%JFFNMSDIR%%/docs -@dirrm %%JFFNMSDIR%%/conf -@dirrm %%JFFNMSDIR%% -@exec crontab -u www %%JFFNMSDIR%%/jffnms.cron -@unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www - diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile deleted file mode 100644 index 55e1732660e6..000000000000 --- a/net-mgmt/mrtg-ping-probe/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: mrng-cfgtg-ping-probe -# Date created: 17 Jan 2004 -# Whom: sanpei@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= mrtg-ping-probe -PORTVERSION= 2.2.0 -CATEGORIES= net -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-mgmt/mrtg - -USE_PERL5= YES -USE_REINPLACE= yes - -MAN1= ${PORTNAME}.1 - -post-patch: - @${REINPLACE_CMD} -e 's|%%PERL%%|${PERL5}|' ${WRKSRC}/${PORTNAME} - @${CHMOD} +x ${WRKSRC}/${PORTNAME} - -do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/mrtg-ping-cfg ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/mrtg.cfg-ping ${PREFIX}/etc/mrtg - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1 - -.include <bsd.port.mk> diff --git a/net-mgmt/mrtg-ping-probe/distinfo b/net-mgmt/mrtg-ping-probe/distinfo deleted file mode 100644 index f5a780c0c1ae..000000000000 --- a/net-mgmt/mrtg-ping-probe/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (mrtg-ping-probe-2.2.0.tar.gz) = 5eec5bc5f1c5097248c701d54639d292 -SIZE (mrtg-ping-probe-2.2.0.tar.gz) = 36923 diff --git a/net-mgmt/mrtg-ping-probe/files/patch-aa b/net-mgmt/mrtg-ping-probe/files/patch-aa deleted file mode 100644 index d9e81c42c8a7..000000000000 --- a/net-mgmt/mrtg-ping-probe/files/patch-aa +++ /dev/null @@ -1,8 +0,0 @@ ---- mrtg-ping-probe.org Sat Jan 17 22:27:33 2004 -+++ mrtg-ping-probe Sat Jan 17 22:27:53 2004 -@@ -1,4 +1,4 @@ --#!/bin/perl -+#!%%PERL%% - ################################################################## - # @(#) $Id: mrtg-ping-probe,v 2.5 2003/09/13 18:04:29 pwo Exp $ - # @(#) mrtg-ping-probe release $Name: Release_2_2_0 $ diff --git a/net-mgmt/mrtg-ping-probe/files/patch-ab b/net-mgmt/mrtg-ping-probe/files/patch-ab deleted file mode 100644 index f16832bbc659..000000000000 --- a/net-mgmt/mrtg-ping-probe/files/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ ---- mrtg-ping-cfg.org Sat Jan 17 22:28:55 2004 -+++ mrtg-ping-cfg Sat Jan 17 22:35:40 2004 -@@ -1,4 +1,4 @@ --#!/bin/ksh -+#!/bin/sh - # - # mrtg-ping-cfg <device> <"Title of page"> - # -@@ -10,7 +10,7 @@ - # IT Site Infrastructure Services - - # location of mrtg ping probe --PING_PROBE=/usr/local/httpd/mrtg/mrtg-ping-probe -+PING_PROBE=/usr/local/bin/mrtg-ping-probe - - if [ $# -ne 2 ] - then diff --git a/net-mgmt/mrtg-ping-probe/pkg-descr b/net-mgmt/mrtg-ping-probe/pkg-descr deleted file mode 100644 index 7ae2841fb75e..000000000000 --- a/net-mgmt/mrtg-ping-probe/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -mrtg-ping-probe is a ping probe for MRTG 2.x. It is used to monitor -the round trip time and packet loss to networked devices. MRTG uses -its output to generate graphs visualizing minimum and maximum round -trip times or packet loss. - -WWW: http://pwo.de/projects/mrtg/ - -Yoshiro MIHIRA -<sanpei@FreeBSD.org> diff --git a/net-mgmt/mrtg-ping-probe/pkg-plist b/net-mgmt/mrtg-ping-probe/pkg-plist deleted file mode 100644 index abef662a5bd1..000000000000 --- a/net-mgmt/mrtg-ping-probe/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/mrtg-ping-cfg -bin/mrtg-ping-probe -etc/mrtg/mrtg.cfg-ping diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile deleted file mode 100644 index 58d5af39282d..000000000000 --- a/net-mgmt/nagios12/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# New ports collection makefile for: nagios -# Date created: 19 May 2002 -# Whom: Blaz Zupan <blaz@si.FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= nagios -PORTVERSION= 1.2 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=nagios - -MAINTAINER= blaz@si.FreeBSD.org -COMMENT= Extremely powerful network monitoring system - -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins - -USE_GETOPT_LONG=yes -GNU_CONFIGURE= yes -USE_RC_SUBR= yes -USE_PERL5_BUILD=yes - -PKGINSTALL= ${WRKDIR}/INSTALL -PKGDEINSTALL= ${WRKDIR}/DEINSTALL -PKGMESSAGE= ${WRKDIR}/MESSAGE - -NAGIOSUSER?= nagios -NAGIOSGROUP?= nagios -NAGIOSDIR?= /var/spool/nagios - -OPTIONS= MYSQL "MySQL suport" off \ - PGSQL "PostgreSQL suport" off \ - FILE_PERFDATA "Save performance data to files" off - -.include <bsd.port.pre.mk> - -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CFLAGS="${CPPFLAGS} ${CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -lgd" -CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ - --with-command-grp=www \ - --with-nagios-user=${NAGIOSUSER} \ - --with-nagios-grp=${NAGIOSGROUP} \ - --with-template-objects \ - --sbindir=${PREFIX}/share/nagios/cgi-bin \ - --libexecdir=${PREFIX}/libexec/nagios \ - --datadir=${PREFIX}/share/nagios \ - --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${NAGIOSDIR} \ - --prefix=${PREFIX} - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql-lib=${LOCALBASE}/lib/mysql \ - --with-mysql-inc=${LOCALBASE}/include/mysql \ - --with-mysql-xdata -.else -CONFIGURE_ARGS+= --with-template-extinfo -.endif - -.if defined(WITH_FILE_PERFDATA) -CONFIGURE_ARGS+=--with-file-perfdata -.endif - -.if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 -CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ - --with-pgsql-inc=${LOCALBASE}/pgsql \ - --with-pgsql-xdata -.endif - -SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \ - -e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \ - -e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' - -INSTALL_TARGET= all install config install-config install-commandmode - -pre-build: - for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \ - ${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \ - done - -pre-install: - @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL - -post-install: - @${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/ - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-mgmt/nagios12/distinfo b/net-mgmt/nagios12/distinfo deleted file mode 100644 index 80d6959ba4ac..000000000000 --- a/net-mgmt/nagios12/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f -SIZE (nagios-1.2.tar.gz) = 1625322 diff --git a/net-mgmt/nagios12/files/DEINSTALL.tmpl b/net-mgmt/nagios12/files/DEINSTALL.tmpl deleted file mode 100644 index 93ed52b4d017..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/INSTALL.tmpl b/net-mgmt/nagios12/files/INSTALL.tmpl deleted file mode 100644 index 64e6882bdee2..000000000000 --- a/net-mgmt/nagios12/files/INSTALL.tmpl +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -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-mgmt/nagios12/files/MESSAGE.tmpl b/net-mgmt/nagios12/files/MESSAGE.tmpl deleted file mode 100644 index a96b0d6243c3..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/nagios.sh.tmpl b/net-mgmt/nagios12/files/nagios.sh.tmpl deleted file mode 100644 index d3cd0691f819..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa deleted file mode 100644 index 595da2b80d2c..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-ab b/net-mgmt/nagios12/files/patch-ab deleted file mode 100644 index 6634c8f6b40a..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-ad b/net-mgmt/nagios12/files/patch-ad deleted file mode 100644 index 4518f5907c41..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-ae b/net-mgmt/nagios12/files/patch-ae deleted file mode 100644 index 0bf8e064b3a7..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-ag b/net-mgmt/nagios12/files/patch-ag deleted file mode 100644 index 14027c5d9cc9..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-ai b/net-mgmt/nagios12/files/patch-ai deleted file mode 100644 index 433d6d74758d..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-xcddb.c b/net-mgmt/nagios12/files/patch-xcddb.c deleted file mode 100644 index 34bc8dc1759a..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-xdddb.c b/net-mgmt/nagios12/files/patch-xdddb.c deleted file mode 100644 index f1a942e7ae45..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-xeddb.c b/net-mgmt/nagios12/files/patch-xeddb.c deleted file mode 100644 index 2aaaa7db9043..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-xrddb.c b/net-mgmt/nagios12/files/patch-xrddb.c deleted file mode 100644 index 0f850674b63c..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/files/patch-xsddb.c b/net-mgmt/nagios12/files/patch-xsddb.c deleted file mode 100644 index e9e1d169cc76..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/pkg-descr b/net-mgmt/nagios12/pkg-descr deleted file mode 100644 index b1ff9995e7fc..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist deleted file mode 100644 index 2f1a32523a20..000000000000 --- a/net-mgmt/nagios12/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-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile deleted file mode 100644 index 58d5af39282d..000000000000 --- a/net-mgmt/nagios2/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# New ports collection makefile for: nagios -# Date created: 19 May 2002 -# Whom: Blaz Zupan <blaz@si.FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= nagios -PORTVERSION= 1.2 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=nagios - -MAINTAINER= blaz@si.FreeBSD.org -COMMENT= Extremely powerful network monitoring system - -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins - -USE_GETOPT_LONG=yes -GNU_CONFIGURE= yes -USE_RC_SUBR= yes -USE_PERL5_BUILD=yes - -PKGINSTALL= ${WRKDIR}/INSTALL -PKGDEINSTALL= ${WRKDIR}/DEINSTALL -PKGMESSAGE= ${WRKDIR}/MESSAGE - -NAGIOSUSER?= nagios -NAGIOSGROUP?= nagios -NAGIOSDIR?= /var/spool/nagios - -OPTIONS= MYSQL "MySQL suport" off \ - PGSQL "PostgreSQL suport" off \ - FILE_PERFDATA "Save performance data to files" off - -.include <bsd.port.pre.mk> - -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CFLAGS="${CPPFLAGS} ${CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -lgd" -CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ - --with-command-grp=www \ - --with-nagios-user=${NAGIOSUSER} \ - --with-nagios-grp=${NAGIOSGROUP} \ - --with-template-objects \ - --sbindir=${PREFIX}/share/nagios/cgi-bin \ - --libexecdir=${PREFIX}/libexec/nagios \ - --datadir=${PREFIX}/share/nagios \ - --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${NAGIOSDIR} \ - --prefix=${PREFIX} - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql-lib=${LOCALBASE}/lib/mysql \ - --with-mysql-inc=${LOCALBASE}/include/mysql \ - --with-mysql-xdata -.else -CONFIGURE_ARGS+= --with-template-extinfo -.endif - -.if defined(WITH_FILE_PERFDATA) -CONFIGURE_ARGS+=--with-file-perfdata -.endif - -.if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 -CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ - --with-pgsql-inc=${LOCALBASE}/pgsql \ - --with-pgsql-xdata -.endif - -SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \ - -e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \ - -e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' - -INSTALL_TARGET= all install config install-config install-commandmode - -pre-build: - for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \ - ${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \ - done - -pre-install: - @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL - -post-install: - @${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/ - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo deleted file mode 100644 index 80d6959ba4ac..000000000000 --- a/net-mgmt/nagios2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f -SIZE (nagios-1.2.tar.gz) = 1625322 diff --git a/net-mgmt/nagios2/files/DEINSTALL.tmpl b/net-mgmt/nagios2/files/DEINSTALL.tmpl deleted file mode 100644 index 93ed52b4d017..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/INSTALL.tmpl b/net-mgmt/nagios2/files/INSTALL.tmpl deleted file mode 100644 index 7ef71df5d57f..000000000000 --- a/net-mgmt/nagios2/files/INSTALL.tmpl +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios2/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-mgmt/nagios2/files/MESSAGE.tmpl b/net-mgmt/nagios2/files/MESSAGE.tmpl deleted file mode 100644 index a96b0d6243c3..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/nagios.sh.tmpl b/net-mgmt/nagios2/files/nagios.sh.tmpl deleted file mode 100644 index d3cd0691f819..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-aa b/net-mgmt/nagios2/files/patch-aa deleted file mode 100644 index 595da2b80d2c..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-ab b/net-mgmt/nagios2/files/patch-ab deleted file mode 100644 index 6634c8f6b40a..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-ad b/net-mgmt/nagios2/files/patch-ad deleted file mode 100644 index 4518f5907c41..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-ae b/net-mgmt/nagios2/files/patch-ae deleted file mode 100644 index 0bf8e064b3a7..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-ag b/net-mgmt/nagios2/files/patch-ag deleted file mode 100644 index 14027c5d9cc9..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-ai b/net-mgmt/nagios2/files/patch-ai deleted file mode 100644 index 433d6d74758d..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-xcddb.c b/net-mgmt/nagios2/files/patch-xcddb.c deleted file mode 100644 index 34bc8dc1759a..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-xdddb.c b/net-mgmt/nagios2/files/patch-xdddb.c deleted file mode 100644 index f1a942e7ae45..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-xeddb.c b/net-mgmt/nagios2/files/patch-xeddb.c deleted file mode 100644 index 2aaaa7db9043..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-xrddb.c b/net-mgmt/nagios2/files/patch-xrddb.c deleted file mode 100644 index 0f850674b63c..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/files/patch-xsddb.c b/net-mgmt/nagios2/files/patch-xsddb.c deleted file mode 100644 index e9e1d169cc76..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/pkg-descr b/net-mgmt/nagios2/pkg-descr deleted file mode 100644 index b1ff9995e7fc..000000000000 --- a/net-mgmt/nagios2/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-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist deleted file mode 100644 index 2f1a32523a20..000000000000 --- a/net-mgmt/nagios2/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-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile deleted file mode 100644 index 83aec90bbd02..000000000000 --- a/net-mgmt/net-snmp-devel/Makefile +++ /dev/null @@ -1,273 +0,0 @@ -# New ports collection makefile for: ucd-snmp -# Date created: 26 June 1996 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= snmp -PORTVERSION= 5.2 -PORTREVISION= 1 -PKGNAMEPREFIX= net- -CATEGORIES= net-mgmt ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= net-snmp -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} - -.if defined(WITH_INETADDRESS_HACK) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-snmplib::mib.c -.endif -.if !defined(WITH_TKMIB) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-local:Makefile.in -.endif - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= An extendable SNMP implementation - -.if defined(WITH_TKMIB) -RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk -.endif -PATCH_DEPENDS= ${LIBTOOL_DEPENDS} - -USE_REINPLACE= yes -USE_AUTOCONF_VER=259 -USE_LIBTOOL_VER=15 -USE_RC_SUBR= yes -INSTALLS_SHLIB= yes -LIBTOOLFLAGS= #empty -.if !defined(WITHOUT_PERL) -USE_PERL5= yes -.endif - -CONFIGURE_ENV+= PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}" -CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ - --with-mib-modules="${_NET_SNMP_MIB_MODULES}" \ - --with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \ - --with-sys-contact="${NET_SNMP_SYS_CONTACT}" \ - --with-sys-location="${NET_SNMP_SYS_LOCATION}" \ - --with-logfile="${NET_SNMP_LOGFILE}" \ - --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ - --with-gnu-ld --with-libwrap --with-libs="-lkvm -ldevstat" - -.if defined(BATCH) -CONFIGURE_ARGS+=--with-defaults -.endif - -.if !defined(WITHOUT_DUMMY_VALUES) -CONFIGURE_ARGS+=--with-dummy-values -.endif - -.include <bsd.port.pre.mk> - -.if defined(WITHOUT_PERL) -PLIST_SUB+= WITH_PERL="@comment " -CONFIGURE_ARGS+=--disable-embedded-perl --without-perl-modules -.else -CONFIGURE_ARGS+=--enable-embedded-perl --with-perl-modules -PLIST_SUB+= WITH_PERL="" -.endif - -.if defined(WITH_TKMIB) -PLIST_SUB+= WITH_TKMIB="" -.else -PLIST_SUB+= WITH_TKMIB="@comment " -.endif - -.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--enable-ipv6 -# --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6" -PLIST_SUB+= WITH_IPV6="" -.else -PLIST_SUB+= WITH_IPV6="@comment " -.endif - -SHLIB_VERSION= 7 -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} -SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -DEFAULT_SNMP_VERSION?= 3 -NET_SNMP_SYS_CONTACT?= nobody@nowhere.invalid -NET_SNMP_SYS_LOCATION?= somewhere -NET_SNMP_LOGFILE?= /var/log/snmpd.log -NET_SNMP_PERSISTENTDIR?=/var/net-snmp -NET_SNMP_MIB_MODULES?= ${NET_SNMP_MIB_MODULE_LIST} - -NET_SNMP_MIB_MODULE_LIST=host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio -_NET_SNMP_MIB_MODULES= -.for module1 in ${NET_SNMP_MIB_MODULE_LIST} -_module1=${module1} -_define= false -. for module2 in ${NET_SNMP_MIB_MODULES} -_module2=${module2} -. if ${_module1} == ${_module2} -_define= true -. endif -. endfor -. if ${_define} == true -_NET_SNMP_MIB_MODULES+= ${module1} -PLIST_SUB+= WITH_${module1:C|.*/||:U}="" -. else -PLIST_SUB+= WITH_${module1:C|.*/||:U}="@comment " -. endif -.endfor - -MAN1= mib2c.1 \ - snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \ - snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ - snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1 -MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ - get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ - netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ - netsnmp_example_scalar_int.3 netsnmp_handler.3 \ - netsnmp_instance.3 netsnmp_library.3 \ - netsnmp_mib_handler_methods.3 netsnmp_mib_utilities.3 \ - netsnmp_mode_end_call.3 netsnmp_multiplexer.3 \ - netsnmp_old_api.3 netsnmp_read_only.3 netsnmp_scalar.3 \ - netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ - netsnmp_table_data.3 netsnmp_table_dataset.3 \ - netsnmp_table_iterator.3 netsnmp_watcher.3 \ - print_description.3 print_mib.3 print_objid.3 print_value.3 \ - print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \ - read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ - snmp_agent_api.3 snmp_alarm.3 snmp_api.3 \ - snmp_api_errstring.3 snmp_close.3 \ - snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.3 \ - snmp_read.3 snmp_select_info.3 \ - snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ - snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ - snmp_sess_open.3 snmp_sess_perror.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 \ - snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ - snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ - snmp_timeout.3 snmp_trap_api.3 \ - netsnmp_Container_iterator.3 \ - netsnmp_baby_steps.3 \ - netsnmp_cache_handler.3 netsnmp_container.3 \ - netsnmp_iterator_info_s.3 \ - netsnmp_leaf.3 \ - netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \ - netsnmp_stash_cache.3 netsnmp_utilities.3 - -.if !defined(WITHOUT_PERL) -MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \ - NetSNMP::TrapReceiver.3 \ - NetSNMP::agent::default_store.3 \ - NetSNMP::default_store.3 \ - NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -_MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} -.endif - -MAN5= mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \ - snmptrapd.conf.5 variables.5 -MAN8= snmpd.8 snmptrapd.8 - -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk -SBIN_FILES= snmpd snmptrapd -STARTUP_DIR= ${PREFIX}/etc/rc.d -STARTUP_FILES= snmpd.sh snmptrapd.sh -SCRIPT_FILES= snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \ - traptoemail -.if defined(WITH_TKMIB) -SCRIPT_FILES+= tkmib -.endif -DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ - README.agentx README.krb5 README.snmpv3 README.thread \ - agent/mibgroup/README.smux - -PS_CMD?= /bin/ps - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITH_INETADDRESS_HACK=yes builds with the inetaddress hack" - @${ECHO_MSG} "WITH_TKMIB=yes Install a graphical Perl/Tk/SNMP based mib browser" - @${ECHO_MSG} "WITHOUT_DUMMY_VALUES=yes Provide 'placeholder' dummy values where" - @${ECHO_MSG} " the necessary information is not available." - @${ECHO_MSG} "WITHOUT_PERL=yes Do not install the perl modules along with the rest" - @${ECHO_MSG} " of the net-snmp toolkit." - @${ECHO_MSG} "WITHOUT_IPV6=yes Disable IPv6." - @${ECHO_MSG} - @${ECHO_MSG} "DEFAULT_SNMP_VERSION=\"3\" Default version of SNMP to use." - @${ECHO_MSG} "NET_SNMP_SYS_CONTACT=\"${NET_SNMP_SYS_CONTACT}\"" - @${ECHO_MSG} " Default system contact." - @${ECHO_MSG} "NET_SNMP_SYS_LOCATION=\"${NET_SNMP_SYS_LOCATION}\"" - @${ECHO_MSG} " Default system location." - @${ECHO_MSG} "NET_SNMP_LOGFILE=\"${NET_SNMP_LOGFILE}\"" - @${ECHO_MSG} " Default log file location for snmpd." - @${ECHO_MSG} "NET_SNMP_PERSISTENTDIR=\"${NET_SNMP_PERSISTENTDIR}\"" - @${ECHO_MSG} " Default directory for persistent data storage." - @${ECHO_MSG} "NET_SNMP_MIB_MODULES=\"${NET_SNMP_MIB_MODULE_LIST}\"" - @${ECHO_MSG} " Optional mib modules that can be built into the" - @${ECHO_MSG} " agent" - @${ECHO_MSG} - -post-patch: patch-autoconf patch-script-files patch-startup-files - -patch-autoconf: - @${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp - @${CAT} ${LOCALBASE}/share/aclocal/libtool15.m4 >> ${WRKSRC}/aclocal.m4.tmp - @${CP} ${LOCALBASE}/share/libtool15/ltmain.sh ${WRKSRC} - @${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4 - -patch-script-files: -.for file in ${SCRIPT_FILES} - @${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/local/${file} -.endfor - -patch-startup-files: -.for file in ${STARTUP_FILES} - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${file}.sample > ${WRKDIR}/${file} -.endfor - -post-configure: - @${FIND} ${WRKSRC} -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ ]+=/s|$$| -m 755|' - -.if !defined(WITHOUT_PERL) -post-build: - ${FIND} ${WRKSRC}/perl -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -E -e '\ - s!^(PREFIX) = .*!\1 = ${PREFIX}!; \ - s!^(INSTALLMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \ - s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \ - ' -.endif - -post-install: strip-files install-startup-files install-config-files install-doc-files display-message - -strip-files: - @cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES} - @cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES} - -install-startup-files: -.for file in ${STARTUP_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${file} ${STARTUP_DIR} -.endfor - -install-config-files: - @${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example - -install-doc-files: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor -.endif - -display-message: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - -# Maintainer's note: -# Don't forget to bump library version in these ports. -# lang/php4,lang/php5,net-mgmt/braa,net-mgmt/docsis,net/ethereal,net-mgmt/mbrowse,net/quagga,net/tethereal,net-mgmt/zabbix,security/libfwbuilder,net-mgmt/p5-SNMP-Info,net-mgmt/nagios-snmp-plugins,french/plgrenouille - -.include <bsd.port.post.mk> diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo deleted file mode 100644 index 443d314fbbf9..000000000000 --- a/net-mgmt/net-snmp-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (net-snmp-5.2.tar.gz) = af1c18209474ec4851b06504aae2a7c1 -SIZE (net-snmp-5.2.tar.gz) = 3853153 diff --git a/net-mgmt/net-snmp-devel/files/extra-patch-local:Makefile.in b/net-mgmt/net-snmp-devel/files/extra-patch-local:Makefile.in deleted file mode 100644 index d3da47b8a662..000000000000 --- a/net-mgmt/net-snmp-devel/files/extra-patch-local:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- local/Makefile.in.orig Fri Sep 17 02:34:58 2004 -+++ local/Makefile.in Mon Oct 25 07:39:24 2004 -@@ -15,7 +15,7 @@ - # local info - # - SNMPCONFPATH=@SNMPCONFPATH@ --PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail -+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail - SHELLSCRIPTS=mib2c-update - SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made snmpconf.made traptoemail.made diff --git a/net-mgmt/net-snmp-devel/files/extra-patch-snmplib::mib.c b/net-mgmt/net-snmp-devel/files/extra-patch-snmplib::mib.c deleted file mode 100644 index 9ee51d8abf67..000000000000 --- a/net-mgmt/net-snmp-devel/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-mgmt/net-snmp-devel/files/patch-configure.in b/net-mgmt/net-snmp-devel/files/patch-configure.in deleted file mode 100644 index 99cd2dad2893..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-configure.in +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.in.orig Sat Oct 30 14:05:59 2004 -+++ configure.in Sat Oct 30 15:02:25 2004 -@@ -2071,7 +2071,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 /dev/null - do - if test -f $i -o $CFLAG $i; then - ac_cv_KERNEL_LOC="$i" -@@ -2357,7 +2357,7 @@ - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h net/if_arp.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/times.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h) - # FreeBSD required headers --AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h machine/types.h sys/socketvar.h) -+AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h sys/socketvar.h) - # Linux - AC_CHECK_HEADERS(sys/conf.h netinet/in_systm.h netinet/tcp.h netinet/udp.h netinet/in_var.h netinet/if_ether.h netinet/ip_var.h netinet/tcp_timer.h netinet/tcp_var.h netinet/tcp_fsm.h netinet/udp_var.h netinet/icmp_var.h sys/protosw.h nlist.h ioctls.h asm/page.h netipx/ipx.h) - # NetBSD required headers -@@ -2811,6 +2811,26 @@ - # checking for 4.3 vs 4.4 rtentry. - 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") - - # 4.4 compat - AC_TRY_COMPILE([ diff --git a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h b/net-mgmt/net-snmp-devel/files/patch-freebsd5.h deleted file mode 100644 index 8bc6de2831b5..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/net-snmp/system/freebsd5.h.orig Wed Sep 1 00:13:46 2004 -+++ include/net-snmp/system/freebsd5.h Wed Sep 1 00:13:57 2004 -@@ -7,6 +7,7 @@ - #define freebsd3 1 - /* freebsd5 is a superset of freebsd4 */ - #define freebsd4 1 -+#define freebsd5 1 - - #undef IFADDR_SYMBOL - #define IFADDR_SYMBOL "in_ifaddrhead" diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c deleted file mode 100644 index 3fe873c4eaac..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c +++ /dev/null @@ -1,230 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Sun Oct 17 10:59:14 2004 -+++ agent/mibgroup/host/hr_storage.c Mon Oct 25 07:49:40 2004 -@@ -212,6 +212,10 @@ - void sol_get_swapinfo(int *, int *); - #endif - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void collect_mbuf(long *long_mbuf, long *long_mbufc); -+#endif -+ - #define HRSTORE_MEMSIZE 1 - #define HRSTORE_INDEX 2 - #define HRSTORE_TYPE 3 -@@ -451,7 +455,8 @@ - NULL, - "Memory Buffers", /* HRS_TYPE_MBUF */ - "Real Memory", /* HRS_TYPE_MEM */ -- "Swap Space" /* HRS_TYPE_SWAP */ -+ "Swap Space", /* HRS_TYPE_SWAP */ -+ "Memory Buffer Clusters" /* HRS_TYPE_MBUFCLUSTER */ - }; - - -@@ -566,6 +571,7 @@ - storage_type_id[storage_type_len - 1] = 3; /* Virtual Mem */ - break; - case HRS_TYPE_MBUF: -+ case HRS_TYPE_MBUFCLUSTER: - storage_type_id[storage_type_len - 1] = 1; /* Other */ - break; - default: -@@ -654,7 +660,7 @@ - case HRS_TYPE_SWAP: - long_return = memory_totals.t_vm; - break; --#else /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#else - case HRS_TYPE_MEM: - long_return = physmem; - break; -@@ -664,6 +670,8 @@ - #endif - long_return = 0; - break; -+#endif /* linux || solaris2 || hpux10 || hpux11 || ... */ -+#if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) - case HRS_TYPE_MBUF: - #if HAVE_SYS_POOL_H - long_return = 0; -@@ -673,7 +681,26 @@ - i++) - long_return += mbstat.m_mtypes[i]; - #elif defined(MBSTAT_SYMBOL) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ { -+ size_t mlen = sizeof(int); -+ int nmbufs; -+ if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbufs; -+ break; -+ } -+#else -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif /* __FreeBSD__ */ - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -681,6 +708,18 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500024 -+ case HRS_TYPE_MBUFCLUSTER: { -+ size_t mlen = sizeof(int); -+ int nmbclusters; -+ if (sysctlbyname("kern.ipc.nmbclusters", &nmbclusters, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbclusters; -+ break; -+ } -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -733,6 +772,12 @@ - * mclpool.pr_size; - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS) - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500102 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ collect_mbuf((long*)&long_return, (long*)NULL); -+ break; - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -740,6 +785,11 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+ case HRS_TYPE_MBUFCLUSTER: -+ collect_mbuf(NULL, &long_return); -+ break; -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -766,7 +816,11 @@ - break; - #if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) && defined(MBSTAT_SYMBOL) - case HRS_TYPE_MBUF: -+#if defined(__FreeBSD__) && __FreeBSD_version >= 502113 -+ long_return = mbstat.m_mcfail + mbstat.m_mpfail; -+#else - long_return = mbstat.m_drops; -+#endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && MBSTAT_SYMBOL */ - default: -@@ -892,3 +946,97 @@ - *usedP = ainfo.ani_resv; - } - #endif /* solaris2 */ -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void -+collect_mbuf(long *long_mbuf, long *long_mbufc) -+{ -+#if __FreeBSD_version >= 502113 -+ size_t mlen; -+ struct mbstat mbstat; -+ -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ return; -+ } -+ if (mbstat.m_mbufs < 0) mbstat.m_mbufs = 0; /* XXX */ -+ if (mbstat.m_mclusts < 0) mbstat.m_mclusts = 0; /* XXX */ -+ if (long_mbuf) { -+ *long_mbuf = mbstat.m_mbufs; -+ } -+ if (long_mbufc) { -+ *long_mbufc = mbstat.m_mclusts; -+ } -+#else -+ int i, j, num_objs; -+ size_t mlen; -+ u_long totused[2]; -+ u_long totnum, totfree; -+ struct mbstat mbstat; -+ struct mbpstat **mbpstat = NULL; -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu len"); -+ goto err; -+ } -+ num_objs = (int)(mlen / sizeof(struct mbpstat)); -+ if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats pointers"); -+ goto err; -+ } -+ if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats"); -+ goto err; -+ } -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu"); -+ goto err; -+ } -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ goto err; -+ } -+ -+ for (i = 0; i < num_objs; i++) -+ mbpstat[i] = mbpstat[0] + i; -+ -+#define GENLST (num_objs - 1) -+ -+ totnum = mbpstat[GENLST]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree = mbpstat[GENLST]->mb_mbfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree += mbpstat[i]->mb_mbfree; -+ } -+ totused[0] = totnum - totfree; -+ totnum = mbpstat[GENLST]->mb_clbucks * mbstat.m_clperbuck; -+ totfree = mbpstat[GENLST]->mb_clfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_clbucks * mbstat.m_clperbuck; -+ totfree += mbpstat[i]->mb_clfree; -+ } -+ totused[1] = totnum - totfree; -+ -+ if (long_mbuf) { -+ *long_mbuf = totused[0]; -+ } -+ if (long_mbufc) { -+ *long_mbufc = totused[1]; -+ } -+ -+ err: -+ if (mbpstat != NULL) { -+ if (mbpstat[0] != NULL) -+ free(mbpstat[0]); -+ free(mbpstat); -+ } -+#endif -+} -+#endif diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.h b/net-mgmt/net-snmp-devel/files/patch-hr_storage.h deleted file mode 100644 index a14eb9f1043c..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_storage.h.orig Tue Feb 25 22:17:48 2003 -+++ agent/mibgroup/host/hr_storage.h Wed May 5 15:27:40 2004 -@@ -12,6 +12,7 @@ - #define HRS_TYPE_MBUF 1 - #define HRS_TYPE_MEM 2 - #define HRS_TYPE_SWAP 3 --#define HRS_TYPE_FIXED_MAX 3 /* the largest fixed type */ -+#define HRS_TYPE_MBUFCLUSTER 4 -+#define HRS_TYPE_FIXED_MAX 4 /* the largest fixed type */ - - #endif /* _MIBGROUP_HRSTORAGE_H */ diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c deleted file mode 100644 index 3bd1e7800e7b..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c +++ /dev/null @@ -1,69 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Wed Jun 9 05:56:03 2004 -+++ agent/mibgroup/host/hr_swrun.c Fri Jun 25 10:56:38 2004 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -694,7 +694,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -889,7 +889,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -988,7 +988,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #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; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1063,7 +1069,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 = - #if defined(freebsd5) - proc_table[LowProcIndex].ki_size / 1024; -@@ -1349,7 +1362,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_system.c b/net-mgmt/net-snmp-devel/files/patch-hr_system.c deleted file mode 100644 index f2d810ac0771..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_system.c +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_system.c.orig Mon Feb 23 02:29:34 2004 -+++ agent/mibgroup/host/hr_system.c Sat Apr 3 00:00:24 2004 -@@ -596,6 +596,8 @@ - #ifndef UTMP_HAS_NO_TYPE - if (utmp_p->ut_type != USER_PROCESS) - continue; -+#else -+ if (*utmp_p->ut_name != '~') - #endif - #ifndef UTMP_HAS_NO_PID - /* This block of code fixes zombie user PIDs in the diff --git a/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c b/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c deleted file mode 100644 index 4939166949be..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./agent/mibgroup/if-mib/data_access/interface_ioctl.c.orig Mon Oct 25 12:57:23 2004 -+++ ./agent/mibgroup/if-mib/data_access/interface_ioctl.c Mon Oct 25 12:56:33 2004 -@@ -385,6 +385,10 @@ - if (rc < 0) - return 0; - -+#if defined(__FreeBSD__) -+ return ifrq.ifr_index; -+#else - return ifrq.ifr_ifindex; -+#endif - #endif /* SIOCGIFINDEX */ - } diff --git a/net-mgmt/net-snmp-devel/files/patch-interfaces.c b/net-mgmt/net-snmp-devel/files/patch-interfaces.c deleted file mode 100644 index c9d465c00859..000000000000 --- a/net-mgmt/net-snmp-devel/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-mgmt/net-snmp-devel/files/patch-ipv6.c b/net-mgmt/net-snmp-devel/files/patch-ipv6.c deleted file mode 100644 index 29e2de99aa97..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-ipv6.c +++ /dev/null @@ -1,603 +0,0 @@ ---- agent/mibgroup/mibII/ipv6.c.orig Thu Jul 8 05:31:54 2004 -+++ agent/mibgroup/mibII/ipv6.c Mon Oct 25 08:32:31 2004 -@@ -8,10 +8,25 @@ - #define _KERNEL 1 - #define _I_DEFINED_KERNEL - #endif -+ -+/* make this source a wee bit more readable */ -+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#define OS_NET_BSD_16_OR_LATER 1 -+#endif -+#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#define OS_NOT_FREEBSD_NOR_DARWIN 1 -+#endif -+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#define OS_FREEBSD_OR_DARWIN 1 -+#if !defined(INP_IPV6PROTO) -+#define INP_IPV6PROTO 0x04 -+#endif -+#endif -+ - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - # if HAVE_SYS_SOCKETVAR_H - # include <sys/socketvar.h> - # endif -@@ -80,7 +95,7 @@ - # include <netinet6/ip6_var.h> - #endif - #include <net/route.h> --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - # if HAVE_NETINET_IN_PCB_H - # include <netinet/in_pcb.h> - # endif -@@ -575,7 +590,7 @@ - memcpy(result, &tmp, sizeof(tmp)); - return 0; - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - q = (caddr_t) TAILQ_NEXT(&tmp, if_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -806,7 +821,7 @@ - - if (if_getifnet(interface, &ifnet) < 0) - break; --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -827,7 +842,7 @@ - *var_len = sdl.sdl_alen; - return (u_char *) (sdl.sdl_data + sdl.sdl_nlen); - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -1220,32 +1235,33 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - int found, savnameLen; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb udb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable udbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#endif -+#if OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb udb6; - #endif - - DEBUGMSGTL(("mibII/ipv6", "var_udp6: ")); - DEBUGMSGOID(("mibII/ipv6", name, *length)); - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable))) - return NULL; - first = p = (caddr_t)udbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - if (!auto_nlist("udb6", (char *) &udb6, sizeof(udb6))) - return NULL; - p = (caddr_t) udb6.in6p_next; -@@ -1274,9 +1290,10 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ - p && (u_long) p != auto_nlist_value("udb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1284,31 +1301,32 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) { -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ -@@ -1319,7 +1337,7 @@ - - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1330,7 +1348,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1338,15 +1356,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1354,7 +1372,7 @@ - return NULL; - *length = savnameLen; - memcpy((char *) name, (char *) savname, *length * sizeof(oid)); -- memcpy(&in6pcb, &savpcb, sizeof(savpcb)); -+ memcpy(&tstpcb, &savpcb, sizeof(savpcb)); - *write_method = 0; - *var_len = sizeof(long); /* default to 'long' results */ - -@@ -1367,14 +1385,14 @@ - switch (vp->magic) { - case IPV6UDPLOCALADDRESS: - *var_len = sizeof(struct in6_addr); -- return in6pcb.in6p_laddr.s6_addr; -+ return savpcb.in6p_laddr.s6_addr; - case IPV6UDPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6UDPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; -@@ -1392,24 +1410,24 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - struct tcp6cb tcp6cb; - int found, savnameLen; - static int tcp6statemap[TCP6_NSTATES]; - static int initialized = 0; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb tcb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb tcb6; - #endif - - if (!initialized) { -@@ -1431,11 +1449,11 @@ - DEBUGMSGOID(("mibII/ipv6", name, *length)); - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) - return NULL; - first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6))) - return NULL; - p = (caddr_t) tcb6.in6p_next; -@@ -1464,9 +1482,10 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1474,41 +1493,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) - < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -- in6pcb.in6p_ppcb)); -+ tstpcb.in6p_ppcb)); - found = 0; - break; - } - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_faddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_fport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_fport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ newname[j++] = tcp6statemap[tcp6cb.t_state]; -@@ -1519,13 +1538,13 @@ - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - - #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ -- if (ntohs(in6pcb.in6p_lport) == 0) -+ if (ntohs(tstpcb.in6p_lport) == 0) - goto skip; - #endif - - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1536,7 +1555,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1544,15 +1563,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1573,20 +1592,20 @@ - switch (vp->magic) { - case IPV6TCPLOCALADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_laddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; - case IPV6TCPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6TCPREMOTEADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_faddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; - case IPV6TCPREMOTEPORT: -- long_return = ntohs(in6pcb.in6p_fport); -+ long_return = ntohs(savpcb.in6p_fport); - return (u_char *) & long_return; - case IPV6TCPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; -@@ -1633,22 +1652,23 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - struct tcpcb tcpcb; - int found, savnameLen; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb tcb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#endif -+#if OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb tcb6; - #endif - - DEBUGMSGTL(("mibII/ipv6", "var_tcp6: ")); -@@ -1688,9 +1708,9 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1698,41 +1718,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(in6pcb)) < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) - < 0) { -- DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcpcb at %x\n", -- in6pcb.in6p_ppcb)); -+ DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -+ tstpcb.in6p_ppcb)); - found = 0; - break; - } - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_faddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_fport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_fport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ newname[j++] = mapTcpState((int)tcpcb.t_state); -@@ -1743,12 +1763,12 @@ - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - - #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ -- if (ntohs(in6pcb.in6p_lport) == 0) -+ if (ntohs(tstpcb.in6p_lport) == 0) - goto skip; - #endif - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1759,7 +1779,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1767,15 +1787,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1783,7 +1803,7 @@ - return NULL; - *length = savnameLen; - memcpy((char *) name, (char *) savname, *length * sizeof(oid)); -- memcpy(&in6pcb, &savpcb, sizeof(savpcb)); -+ memcpy(&tstpcb, &savpcb, sizeof(savpcb)); - *write_method = 0; - *var_len = sizeof(long); /* default to 'long' results */ - -@@ -1796,20 +1816,20 @@ - switch (vp->magic) { - case IPV6TCPLOCALADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_laddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; - case IPV6TCPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6TCPREMOTEADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_faddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; - case IPV6TCPREMOTEPORT: -- long_return = ntohs(in6pcb.in6p_fport); -+ long_return = ntohs(savpcb.in6p_fport); - return (u_char *) & long_return; - case IPV6TCPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; diff --git a/net-mgmt/net-snmp-devel/files/patch-local:fixproc b/net-mgmt/net-snmp-devel/files/patch-local:fixproc deleted file mode 100644 index 5d6e3515467d..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:fixproc +++ /dev/null @@ -1,138 +0,0 @@ ---- local/fixproc.orig Sat Apr 20 09:30:13 2002 -+++ local/fixproc Sat Mar 6 01:59:59 2004 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!%%PERL%% - # - # fixproc [-min n] [-max n] [-check | -kill | -restart | -exist | -fix] proc ... - # -@@ -129,7 +129,7 @@ - # - # Timothy Kong 3/1995 - --$database_file = '/local/etc/fixproc.conf'; -+$database_file = '%%PREFIX%%/etc/fixproc.conf'; - - $debug = 0; # specify debug level using -dN - # currently defined: -d1 -@@ -155,6 +155,14 @@ - $shell_header = "#!/bin/sh\n"; - $shell_end_marker = 'shell_end_marker'; - -+open(command, "/bin/ps -p $$ |") || die "$0: can't run ps command\n"; -+if (split(' ', <command>) > 4) { -+ $ps_opts = 'ax'; -+} else { -+ $ps_opts = '-e'; -+} -+close command; -+ - &read_args(); - &read_database(); - # &dump_database(); # debug only -@@ -203,7 +211,9 @@ - $i++; - } - close (file); -- system "chmod +x $file"; -+ ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, -+ $atime,$mtime,$ctime,$blksize,$blocks) = stat($file); -+ chmod $mode | 0111, $file; - return file; - } - -@@ -237,8 +247,8 @@ - - # return code is number divided by 256 - $error_code = (system "$tmpfile") / 256; -- system "rm $tmpfile"; -- return ($fix_failed_error) if ($error_code != 0); -+ unlink $tmpfile; -+ return ($cannot_fix_error) if ($error_code != 0); - # sleep needed here? - return &do_exist ($proc); - } -@@ -268,7 +278,7 @@ - - # return code is number divided by 256 - $error_code = (system "$tmpfile") / 256; -- system "rm $tmpfile"; -+ unlink $tmpfile; - return ($check_failed_error) if ($error_code != 0); - - # check passed, continue -@@ -285,10 +295,12 @@ - - # do ps, check to see if min <= no. of processes <= max - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc | /bin/wc -l |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-wc command\n"; -- $proc_count = <command>; -- if (($proc_count < $min{$proc}) || ($proc_count > $max{$proc})) -+ @allprocs = <command>; -+ close command; -+ @procs = grep(/$proc/, @allprocs); -+ if (($#procs < $min{$proc}) || ($#procs > $max{$proc})) - { - return $check_failed_error; - } -@@ -305,41 +317,48 @@ - - # first try kill - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - while (<command>) - { -- # match the first field of ps -e -+ if /$proc/ { -+ # match the first field of ps $ps_opts - $! = $fixproc_error; -- /^\s*(\d+)\s/ || die "$0: can't match ps -e output\n"; -- system "kill $1"; -+ /^\s*(\d+)\s/ || die "$0: can't match ps $ps_opts output\n"; -+ kill 15, $1; -+ } - } -+ close command; - - # if process still exist, try kill -9 - sleep 2; - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - $second_kill_needed = 0; - while (<command>) - { -- # match the first field of ps -e -+ if /$proc/ { -+ # match the first field of ps $ps_opts - $! = $fixproc_error; -- /^\s*(\d+)\s/ || die "$0: can't match ps -e output\n"; -- system "kill -9 $1"; -+ /^\s*(\d+)\s/ || die "$0: can't match ps $ps_opts output\n"; -+ kill 9, $1; - $second_kill_needed = 1; -+ } - } -+ close command; - return ($no_error) if ($second_kill_needed == 0); - - # see if kill -9 worked - sleep 2; - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - while (<command>) - { # a process still exist, return error -- return $cannot_kill_error; -+ return $cannot_kill_error if /$proc/; - } -+ close command; - return $no_error; # good, all dead - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-local:ipf-mod.pl b/net-mgmt/net-snmp-devel/files/patch-local:ipf-mod.pl deleted file mode 100644 index 8bf98d4f1d52..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:ipf-mod.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- local/ipf-mod.pl.orig Thu May 29 05:30:19 2003 -+++ local/ipf-mod.pl Thu May 29 05:40:13 2003 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -s -+#!%%PERL%% -s - ## - ## IP Filter UCD-SNMP pass module - ## -@@ -9,10 +9,10 @@ - ## Date: $ Tue Dec 1 10:24:08 EET 1998 $ - ## Version: 1.1a - --# Put this file in /usr/local/bin/ipf-mod.pl and then add the following -+# Put this file in %%PREFIX%%/bin/ipf-mod.pl and then add the following - # line to your snmpd.conf file (without the # at the front): - # --# pass .1.3.6.1.4.1.2021.13.2 /usr/local/bin/ipf-mod.pl -+# pass .1.3.6.1.4.1.2021.13.2 %%PREFIX%%/bin/ipf-mod.pl - - # enterprises.ucdavis.ucdExperimental.ipFilter = .1.3.6.1.4.1.2021.13.2 - # ipfInTable.ipfInEntry.ipfInIndex integer = 1.1.1 diff --git a/net-mgmt/net-snmp-devel/files/patch-local:mib2c b/net-mgmt/net-snmp-devel/files/patch-local:mib2c deleted file mode 100644 index a0a2ce336f86..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:mib2c +++ /dev/null @@ -1,21 +0,0 @@ ---- local/mib2c.orig Fri Sep 10 21:30:15 2004 -+++ local/mib2c Mon Oct 25 08:38:30 2004 -@@ -1,5 +1,4 @@ --#!/usr/bin/perl --#!/usr/bin/perl -w -+#!%%PERL%% - - # - # $Id: mib2c,v 5.57 2004/09/10 12:30:15 dts12 Exp $ -@@ -60,8 +59,9 @@ - if($ENV{MIB2C_DIR}) { - push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR}); - } --push @def_search_dirs, "/usr/local/share/snmp/"; --push @def_search_dirs, "/usr/local/share/snmp/mib2c-data"; -+push @def_search_dirs, "%%PREFIX%%/share/snmp/"; -+push @def_search_dirs, "%%PREFIX%%/etc/snmp/"; -+push @def_search_dirs, "%%PREFIX%%/share/snmp/mib2c-data"; - push @def_search_dirs, "./mib2c-conf.d"; - - sub usage { diff --git a/net-mgmt/net-snmp-devel/files/patch-local:snmpcheck.def b/net-mgmt/net-snmp-devel/files/patch-local:snmpcheck.def deleted file mode 100644 index 4f3b4a2491da..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:snmpcheck.def +++ /dev/null @@ -1,8 +0,0 @@ ---- local/snmpcheck.def.orig Thu May 29 05:28:22 2003 -+++ local/snmpcheck.def Thu May 29 05:29:49 2003 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!%%PERL%% -w - - use strict 'refs'; - require Net::Ping; diff --git a/net-mgmt/net-snmp-devel/files/patch-local:snmpconf b/net-mgmt/net-snmp-devel/files/patch-local:snmpconf deleted file mode 100644 index 5b3623782df9..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:snmpconf +++ /dev/null @@ -1,53 +0,0 @@ ---- local/snmpconf.orig Sat Oct 9 01:01:37 2004 -+++ local/snmpconf Mon Oct 25 08:42:23 2004 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!%%PERL%% -w - - # - # A simple configuration file builder based on questions listed in -@@ -32,7 +32,7 @@ - $opts{'c'} = "$ENV{SNMPSHAREPATH}/snmpconf-data"; - } - else { -- $opts{'c'} = "/usr/local/share/snmp/snmpconf-data"; -+ $opts{'c'} = "%%PREFIX%%/share/snmp/snmpconf-data"; - } - - # default config file path -@@ -40,7 +40,7 @@ - $confpath = "$ENV{SNMPCONFPATH}"; - } - else { -- $confpath = "/usr/local/share/snmp"; -+ $confpath = "%%PREFIX%%/share/snmp"; - } - } - else -@@ -128,7 +128,7 @@ - # - # Find existing files to possibly read in. - # --my @searchpath = ("$confpath","/usr/local/etc/snmp", ".", "$home"); -+my @searchpath = ("$confpath","%%PREFIX%%/etc/snmp", ".", "$home"); - push @searchpath, $opts{I} if ($opts{I}); - foreach my $i (@searchpath) { - debug("searching $i\n"); -@@ -227,7 +227,7 @@ - if ($opts{'i'} || $opts{'I'}) { - $opts{'I'} = "$confpath" if (!$opts{'I'}); - -- if (! (-d "$opts{'I'}") && ! (mkdir ("$opts{'I'}"))) { -+ if (! (-d "$opts{'I'}") && ! (mkdir ("$opts{'I'}", 0777))) { - print "\nCould not create $opts{'I'} directory: $!\n"; - print ("File $didfile{$i} left in current directory\n"); - } -@@ -242,7 +242,7 @@ - } - } - } elsif ($opts{'p'}) { -- if (! (-d "$home") && ! (mkdir ("$home"))) { -+ if (! (-d "$home") && ! (mkdir ("$home", 0777))) { - print "\nCould not create $home directory: $!\n"; - print ("File $didfile{$i} left in current directory\n"); - } diff --git a/net-mgmt/net-snmp-devel/files/patch-local:tkmib b/net-mgmt/net-snmp-devel/files/patch-local:tkmib deleted file mode 100644 index 3278d27c3809..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:tkmib +++ /dev/null @@ -1,9 +0,0 @@ ---- local/tkmib.orig Thu May 29 05:30:19 2003 -+++ local/tkmib Thu May 29 05:31:46 2003 -@@ -1,5 +1,4 @@ --#!/usr/bin/perl --#!/usr/bin/perl -w -+#!%%PERL%% -w - - require 5; - diff --git a/net-mgmt/net-snmp-devel/files/patch-local:traptoemail b/net-mgmt/net-snmp-devel/files/patch-local:traptoemail deleted file mode 100644 index 402506b540c6..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:traptoemail +++ /dev/null @@ -1,16 +0,0 @@ ---- local/traptoemail.orig Thu May 29 05:30:19 2003 -+++ local/traptoemail Thu May 29 05:35:13 2003 -@@ -1,11 +1,11 @@ --#!/usr/bin/perl -+#!%%PERL%% - - # This is a snmptrapd handler script to convert snmp traps into email - # messages. - - # Usage: - # Put a line like the following in your snmptrapd.conf file: --# traphandle TRAPOID|default /usr/local/bin/traptoemail [-f FROM] [-s SMTPSERVER]b ADDRESSES -+# traphandle TRAPOID|default %%PREFIX%%/bin/traptoemail [-f FROM] [-s SMTPSERVER]b ADDRESSES - # FROM defaults to "root" - # SMTPSERVER defaults to "localhost" - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c deleted file mode 100644 index 365b6f398ebe..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpTCPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpTCPIPv6Domain.c Mon Oct 25 09:22:06 2004 -@@ -95,13 +95,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, "TCP/IPv6: [%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-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c deleted file mode 100644 index c36abaaba730..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpUDPIPv6Domain.c Mon Oct 25 09:28:10 2004 -@@ -104,13 +104,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, "UDP/IPv6: [%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-mgmt/net-snmp-devel/files/patch-snmpd.8.def b/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp-devel/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-mgmt/net-snmp-devel/files/patch-snmpusm.c b/net-mgmt/net-snmp-devel/files/patch-snmpusm.c deleted file mode 100644 index 7b0ced219ae5..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpusm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpusm.c.orig Wed Dec 8 19:32:52 2004 -+++ snmplib/snmpusm.c Wed Dec 8 19:33:30 2004 -@@ -89,6 +89,8 @@ - oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; - /* backwards compat */ - oid *usmAES128PrivProtocol = usmAESPrivProtocol; -+oid *usmAES192PrivProtocol = usmAESPrivProtocol; -+oid *usmAES256PrivProtocol = usmAESPrivProtocol; - - static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ - diff --git a/net-mgmt/net-snmp-devel/files/patch-tcpTable.c b/net-mgmt/net-snmp-devel/files/patch-tcpTable.c deleted file mode 100644 index d96d0976189b..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-tcpTable.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/tcpTable.c.orig Wed Jun 9 05:53:17 2004 -+++ agent/mibgroup/mibII/tcpTable.c Thu Jun 24 23:21:32 2004 -@@ -275,6 +277,9 @@ - - int - TCP_Count_Connections( void ) { -+#if (defined(CAN_USE_SYSCTL) && defined(TCPCTL_PCBLIST)) -+ tcpTable_load(NULL, NULL); -+#endif - return tcp_estab; - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-transform_oids.h b/net-mgmt/net-snmp-devel/files/patch-transform_oids.h deleted file mode 100644 index 874acac2f086..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-transform_oids.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/net-snmp/library/transform_oids.h.orig Wed Dec 8 19:34:06 2004 -+++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 -@@ -23,6 +23,8 @@ - /* XXX: OIDs not defined yet */ - extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ - extern oid *usmAES128PrivProtocol; /* backwards compat */ -+extern oid *usmAES192PrivProtocol; /* backwards compat */ -+extern oid *usmAES256PrivProtocol; /* backwards compat */ - - #define USM_AUTH_PROTO_NOAUTH_LEN 10 - #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h b/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h deleted file mode 100644 index 2690553112a1..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 -+++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 -@@ -39,6 +39,8 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) - config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) - config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample deleted file mode 100644 index 6e089e397b40..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample +++ /dev/null @@ -1,36 +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=${snmpd_enable-"NO"} -snmpd_flags=${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/${name} -pidfile=/var/run/${name}.pid -sig_stop=-KILL - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample deleted file mode 100644 index b3b48c2d79c2..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: snmptrapd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# Add the following line to /etc/rc.conf to enable snmptrapd: -# -# snmptrapd_enable="YES" -# - -snmptrapd_enable=${snmptrapd_enable-"NO"} -snmptrapd_flags=${snmptrapd_flags-"-p /var/run/snmptrapd.pid"} - -. %%RC_SUBR%% - -load_rc_config net_snmptrapd - -if [ ! -z "$net_snmptrapd_enable" ]; then - echo "Warning: \$net_snmptrapd_enable is obsoleted." - echo " Use \$snmptrapd_enable instead." - snmptrapd_enable="$net_snmptrapd_enable" - [ ! -z "$net_snmptrapd_flags" ] && snmptrapd_flags="$net_snmptrapd_flags" -fi - -name=snmptrapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp-devel/pkg-descr b/net-mgmt/net-snmp-devel/pkg-descr deleted file mode 100644 index d1fc04717b8e..000000000000 --- a/net-mgmt/net-snmp-devel/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 graphical Perl/Tk/SNMP based mib browser - -WWW: http://net-snmp.sourceforge.net/ diff --git a/net-mgmt/net-snmp-devel/pkg-message b/net-mgmt/net-snmp-devel/pkg-message deleted file mode 100644 index 4a213e367a42..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-message +++ /dev/null @@ -1,26 +0,0 @@ -**** This port installs snmp daemon, header files and libraries but don't - invokes snmpd by default. - If you want to invoke snmpd and/or snmptrapd at startup, put these - lines into /etc/rc.conf. - - snmpd_enable="YES" - snmpd_flags="-a -p /var/run/snmpd.pid" - snmptrapd_enable="YES" - snmptrapd_flags="-a -p /var/run/snmptrapd.pid" - -**** You may specify the following make variables: - - NET_SNMP_SYS_CONTACT="kuriyama@FreeBSD.org" - NET_SNMP_SYS_LOCATION="Tokyo, Japan" - DEFAULT_SNMP_VERSION=3 - NET_SNMP_MIB_MODULES="host smux mibII/mta_sendmail ucd-snmp/diskio" - 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. You may also set - - BATCH="yes" - - to avoid interactive configuration. diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist deleted file mode 100644 index ec11fcd47f22..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ /dev/null @@ -1,421 +0,0 @@ -bin/encode_keychange -bin/fixproc -bin/ipf-mod.pl -bin/mib2c -bin/mib2c-update -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 -%%WITH_TKMIB%%bin/tkmib -bin/traptoemail -etc/rc.d/snmpd.sh -etc/rc.d/snmptrapd.sh -@exec mkdir %D/etc/snmp 2>/dev/null || true -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_module_config.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/mfd.h -include/net-snmp/agent/mib_module_config.h -include/net-snmp/agent/mib_module_includes.h -include/net-snmp/agent/mib_modules.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_container.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/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 -%%WITH_IPV6%%include/net-snmp/library/snmpTCPIPv6Domain.h -include/net-snmp/library/snmpUDPDomain.h -%%WITH_IPV6%%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/winpipe.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/darwin7.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/freebsd6.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/mingw32.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 -lib/libnetsnmp.a -lib/libnetsnmp.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so -@unexec rm -f %B/libnetsnmp.so 2> /dev/null || true -lib/libnetsnmpagent.a -lib/libnetsnmpagent.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so -@unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true -lib/libnetsnmphelpers.a -lib/libnetsnmphelpers.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so -@unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true -lib/libnetsnmpmibs.a -lib/libnetsnmpmibs.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so -@unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true -lib/libnetsnmptrapd.a -lib/libnetsnmptrapd.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so -@unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/TrapReceiver.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix -sbin/snmpd -sbin/snmptrapd -%%PORTDOCS%%%%DOCSDIR%%/AGENT.txt -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.agentx -%%PORTDOCS%%%%DOCSDIR%%/README.krb5 -%%PORTDOCS%%%%DOCSDIR%%/README.snmpv3 -%%PORTDOCS%%%%DOCSDIR%%/README.thread -%%PORTDOCS%%%%DOCSDIR%%/README.smux -%%DATADIR%%/snmpd.conf.example -%%DATADIR%%/snmp_perl_trapd.pl -%%DATADIR%%/mib2c.access_functions.conf -%%DATADIR%%/mib2c.array-user.conf -%%DATADIR%%/mib2c.check_values.conf -%%DATADIR%%/mib2c.check_values_local.conf -%%DATADIR%%/mib2c.column_defines.conf -%%DATADIR%%/mib2c.column_enums.conf -%%DATADIR%%/mib2c.column_storage.conf -%%DATADIR%%/mib2c.conf -%%DATADIR%%/mib2c.create-dataset.conf -%%DATADIR%%/mib2c.genhtml.conf -%%DATADIR%%/mib2c.int_watch.conf -%%DATADIR%%/mib2c.iterate.conf -%%DATADIR%%/mib2c.iterate_access.conf -%%DATADIR%%/mib2c.mfd.conf -%%DATADIR%%/mib2c.notify.conf -%%DATADIR%%/mib2c.old-api.conf -%%DATADIR%%/mib2c.scalar.conf -%%DATADIR%%/mib2c-data/default-mfd-top.m2c -%%DATADIR%%/mib2c-data/details-enums.m2i -%%DATADIR%%/mib2c-data/details-node.m2i -%%DATADIR%%/mib2c-data/details-table.m2i -%%DATADIR%%/mib2c-data/generic-ctx-copy.m2i -%%DATADIR%%/mib2c-data/generic-ctx-get.m2i -%%DATADIR%%/mib2c-data/generic-ctx-set.m2i -%%DATADIR%%/mib2c-data/generic-data-allocate.m2i -%%DATADIR%%/mib2c-data/generic-data-context.m2i -%%DATADIR%%/mib2c-data/generic-get-char.m2i -%%DATADIR%%/mib2c-data/generic-get-decl-bot.m2i -%%DATADIR%%/mib2c-data/generic-get-decl.m2i -%%DATADIR%%/mib2c-data/generic-get-long.m2i -%%DATADIR%%/mib2c-data/generic-get-oid.m2i -%%DATADIR%%/mib2c-data/generic-header-bottom.m2i -%%DATADIR%%/mib2c-data/generic-header-top.m2i -%%DATADIR%%/mib2c-data/generic-source-includes.m2i -%%DATADIR%%/mib2c-data/generic-table-constants.m2c -%%DATADIR%%/mib2c-data/generic-table-enums.m2c -%%DATADIR%%/mib2c-data/generic-table-indexes-from-oid.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-set.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-to-oid.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-varbind-setup.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes.m2i -%%DATADIR%%/mib2c-data/generic-table-oids.m2c -%%DATADIR%%/mib2c-data/generic-value-map-func.m2i -%%DATADIR%%/mib2c-data/generic-value-map-reverse.m2i -%%DATADIR%%/mib2c-data/generic-value-map.m2i -%%DATADIR%%/mib2c-data/m2c-internal-warning.m2i -%%DATADIR%%/mib2c-data/m2c_setup_enum.m2i -%%DATADIR%%/mib2c-data/m2c_setup_node.m2i -%%DATADIR%%/mib2c-data/m2c_setup_table.m2i -%%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i -%%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i -%%DATADIR%%/mib2c-data/mfd-data-access.m2c -%%DATADIR%%/mib2c-data/mfd-data-get.m2c -%%DATADIR%%/mib2c-data/mfd-data-set.m2c -%%DATADIR%%/mib2c-data/mfd-doxygen.m2c -%%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c -%%DATADIR%%/mib2c-data/mfd-interface.m2c -%%DATADIR%%/mib2c-data/mfd-makefile.m2m -%%DATADIR%%/mib2c-data/mfd-readme.m2c -%%DATADIR%%/mib2c-data/mfd-top.m2c -%%DATADIR%%/mib2c-data/node-get.m2i -%%DATADIR%%/mib2c-data/node-set.m2i -%%DATADIR%%/mib2c-data/node-storage.m2i -%%DATADIR%%/mib2c-data/node-varbind-validate.m2i -%%DATADIR%%/mib2c-data/parent-dependencies.m2i -%%DATADIR%%/mib2c-data/parent-set.m2i -%%DATADIR%%/mib2c-data/subagent.m2c -%%DATADIR%%/mib2c-data/syntax-COUNTER64-get.m2i -%%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2d -%%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2i -%%DATADIR%%/mib2c-data/syntax-DateAndTime-readme.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddress-get.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddress-set.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddressType-get.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddressType-set.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-dependencies.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-get.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-varbind-validate.m2i -%%DATADIR%%/mib2c-data/syntax-StorageType-dependencies.m2i -%%DATADIR%%/mib2c-data/syntax-TestAndIncr-get.m2i -%%DATADIR%%/mibs/AGENTX-MIB.txt -%%WITH_EVENT-MIB%%%%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt -%%DATADIR%%/mibs/DISMAN-SCHEDULE-MIB.txt -%%DATADIR%%/mibs/DISMAN-SCRIPT-MIB.txt -%%DATADIR%%/mibs/EtherLike-MIB.txt -%%DATADIR%%/mibs/HCNUM-TC.txt -%%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt -%%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt -%%DATADIR%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -%%DATADIR%%/mibs/IANA-LANGUAGE-MIB.txt -%%DATADIR%%/mibs/IANAifType-MIB.txt -%%DATADIR%%/mibs/IF-INVERTED-STACK-MIB.txt -%%DATADIR%%/mibs/IF-MIB.txt -%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt -%%DATADIR%%/mibs/IP-FORWARD-MIB.txt -%%DATADIR%%/mibs/IP-MIB.txt -%%DATADIR%%/mibs/IPV6-ICMP-MIB.txt -%%DATADIR%%/mibs/IPV6-MIB.txt -%%DATADIR%%/mibs/IPV6-TC.txt -%%DATADIR%%/mibs/IPV6-TCP-MIB.txt -%%DATADIR%%/mibs/IPV6-UDP-MIB.txt -%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/MTA-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-EXAMPLES-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-EXTEND-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-TC.txt -%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt -%%DATADIR%%/mibs/NOTIFICATION-LOG-MIB.txt -%%DATADIR%%/mibs/RFC-1215.txt -%%DATADIR%%/mibs/RFC1155-SMI.txt -%%DATADIR%%/mibs/RFC1213-MIB.txt -%%DATADIR%%/mibs/RMON-MIB.txt -%%DATADIR%%/mibs/SMUX-MIB.txt -%%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt -%%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt -%%DATADIR%%/mibs/SNMP-MPD-MIB.txt -%%DATADIR%%/mibs/SNMP-NOTIFICATION-MIB.txt -%%DATADIR%%/mibs/SNMP-PROXY-MIB.txt -%%DATADIR%%/mibs/SNMP-TARGET-MIB.txt -%%DATADIR%%/mibs/SNMP-USER-BASED-SM-MIB.txt -%%DATADIR%%/mibs/SNMP-USM-AES-MIB.txt -%%DATADIR%%/mibs/SNMP-USM-DH-OBJECTS-MIB.txt -%%DATADIR%%/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -%%DATADIR%%/mibs/SNMPv2-CONF.txt -%%DATADIR%%/mibs/SNMPv2-MIB.txt -%%DATADIR%%/mibs/SNMPv2-SMI.txt -%%DATADIR%%/mibs/SNMPv2-TC.txt -%%DATADIR%%/mibs/SNMPv2-TM.txt -%%DATADIR%%/mibs/TCP-MIB.txt -%%DATADIR%%/mibs/TRANSPORT-ADDRESS-MIB.txt -%%DATADIR%%/mibs/UCD-DEMO-MIB.txt -%%DATADIR%%/mibs/UCD-DISKIO-MIB.txt -%%DATADIR%%/mibs/UCD-DLMOD-MIB.txt -%%DATADIR%%/mibs/UCD-IPFWACC-MIB.txt -%%DATADIR%%/mibs/UCD-SNMP-MIB.txt -%%DATADIR%%/mibs/UDP-MIB.txt -@unexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true -%%WITH_PERL%%%%DATADIR%%/snmp_perl.pl -%%DATADIR%%/snmpconf-data/snmp-data/authopts -%%DATADIR%%/snmpconf-data/snmp-data/debugging -%%DATADIR%%/snmpconf-data/snmp-data/mibs -%%DATADIR%%/snmpconf-data/snmp-data/output -%%DATADIR%%/snmpconf-data/snmp-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmpd-data/acl -%%DATADIR%%/snmpconf-data/snmpd-data/basic_setup -%%DATADIR%%/snmpconf-data/snmpd-data/extending -%%DATADIR%%/snmpconf-data/snmpd-data/monitor -%%DATADIR%%/snmpconf-data/snmpd-data/operation -%%DATADIR%%/snmpconf-data/snmpd-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmpd-data/system -%%DATADIR%%/snmpconf-data/snmpd-data/trapsinks -%%DATADIR%%/snmpconf-data/snmptrapd-data/authentication -%%DATADIR%%/snmpconf-data/snmptrapd-data/formatting -%%DATADIR%%/snmpconf-data/snmptrapd-data/logging -%%DATADIR%%/snmpconf-data/snmptrapd-data/runtime -%%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle -@dirrm %%DATADIR%%/mib2c-data/ -@dirrm %%DATADIR%%/snmpconf-data/snmptrapd-data -@dirrm %%DATADIR%%/snmpconf-data/snmpd-data -@dirrm %%DATADIR%%/snmpconf-data/snmp-data -@dirrm %%DATADIR%%/snmpconf-data -@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true -@dirrm include/net-snmp/system -@dirrm include/net-snmp/machine -@dirrm include/net-snmp/library -@dirrm include/net-snmp/agent -@dirrm include/net-snmp -@unexec rmdir %D/etc/snmp 2>/dev/null || true diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile deleted file mode 100644 index 83aec90bbd02..000000000000 --- a/net-mgmt/net-snmp53/Makefile +++ /dev/null @@ -1,273 +0,0 @@ -# New ports collection makefile for: ucd-snmp -# Date created: 26 June 1996 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= snmp -PORTVERSION= 5.2 -PORTREVISION= 1 -PKGNAMEPREFIX= net- -CATEGORIES= net-mgmt ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= net-snmp -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} - -.if defined(WITH_INETADDRESS_HACK) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-snmplib::mib.c -.endif -.if !defined(WITH_TKMIB) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-local:Makefile.in -.endif - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= An extendable SNMP implementation - -.if defined(WITH_TKMIB) -RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk -.endif -PATCH_DEPENDS= ${LIBTOOL_DEPENDS} - -USE_REINPLACE= yes -USE_AUTOCONF_VER=259 -USE_LIBTOOL_VER=15 -USE_RC_SUBR= yes -INSTALLS_SHLIB= yes -LIBTOOLFLAGS= #empty -.if !defined(WITHOUT_PERL) -USE_PERL5= yes -.endif - -CONFIGURE_ENV+= PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}" -CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ - --with-mib-modules="${_NET_SNMP_MIB_MODULES}" \ - --with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \ - --with-sys-contact="${NET_SNMP_SYS_CONTACT}" \ - --with-sys-location="${NET_SNMP_SYS_LOCATION}" \ - --with-logfile="${NET_SNMP_LOGFILE}" \ - --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ - --with-gnu-ld --with-libwrap --with-libs="-lkvm -ldevstat" - -.if defined(BATCH) -CONFIGURE_ARGS+=--with-defaults -.endif - -.if !defined(WITHOUT_DUMMY_VALUES) -CONFIGURE_ARGS+=--with-dummy-values -.endif - -.include <bsd.port.pre.mk> - -.if defined(WITHOUT_PERL) -PLIST_SUB+= WITH_PERL="@comment " -CONFIGURE_ARGS+=--disable-embedded-perl --without-perl-modules -.else -CONFIGURE_ARGS+=--enable-embedded-perl --with-perl-modules -PLIST_SUB+= WITH_PERL="" -.endif - -.if defined(WITH_TKMIB) -PLIST_SUB+= WITH_TKMIB="" -.else -PLIST_SUB+= WITH_TKMIB="@comment " -.endif - -.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--enable-ipv6 -# --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6" -PLIST_SUB+= WITH_IPV6="" -.else -PLIST_SUB+= WITH_IPV6="@comment " -.endif - -SHLIB_VERSION= 7 -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} -SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -DEFAULT_SNMP_VERSION?= 3 -NET_SNMP_SYS_CONTACT?= nobody@nowhere.invalid -NET_SNMP_SYS_LOCATION?= somewhere -NET_SNMP_LOGFILE?= /var/log/snmpd.log -NET_SNMP_PERSISTENTDIR?=/var/net-snmp -NET_SNMP_MIB_MODULES?= ${NET_SNMP_MIB_MODULE_LIST} - -NET_SNMP_MIB_MODULE_LIST=host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio -_NET_SNMP_MIB_MODULES= -.for module1 in ${NET_SNMP_MIB_MODULE_LIST} -_module1=${module1} -_define= false -. for module2 in ${NET_SNMP_MIB_MODULES} -_module2=${module2} -. if ${_module1} == ${_module2} -_define= true -. endif -. endfor -. if ${_define} == true -_NET_SNMP_MIB_MODULES+= ${module1} -PLIST_SUB+= WITH_${module1:C|.*/||:U}="" -. else -PLIST_SUB+= WITH_${module1:C|.*/||:U}="@comment " -. endif -.endfor - -MAN1= mib2c.1 \ - snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \ - snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ - snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1 -MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ - get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ - netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ - netsnmp_example_scalar_int.3 netsnmp_handler.3 \ - netsnmp_instance.3 netsnmp_library.3 \ - netsnmp_mib_handler_methods.3 netsnmp_mib_utilities.3 \ - netsnmp_mode_end_call.3 netsnmp_multiplexer.3 \ - netsnmp_old_api.3 netsnmp_read_only.3 netsnmp_scalar.3 \ - netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ - netsnmp_table_data.3 netsnmp_table_dataset.3 \ - netsnmp_table_iterator.3 netsnmp_watcher.3 \ - print_description.3 print_mib.3 print_objid.3 print_value.3 \ - print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \ - read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ - snmp_agent_api.3 snmp_alarm.3 snmp_api.3 \ - snmp_api_errstring.3 snmp_close.3 \ - snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.3 \ - snmp_read.3 snmp_select_info.3 \ - snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ - snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ - snmp_sess_open.3 snmp_sess_perror.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 \ - snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ - snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ - snmp_timeout.3 snmp_trap_api.3 \ - netsnmp_Container_iterator.3 \ - netsnmp_baby_steps.3 \ - netsnmp_cache_handler.3 netsnmp_container.3 \ - netsnmp_iterator_info_s.3 \ - netsnmp_leaf.3 \ - netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \ - netsnmp_stash_cache.3 netsnmp_utilities.3 - -.if !defined(WITHOUT_PERL) -MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \ - NetSNMP::TrapReceiver.3 \ - NetSNMP::agent::default_store.3 \ - NetSNMP::default_store.3 \ - NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -_MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} -.endif - -MAN5= mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \ - snmptrapd.conf.5 variables.5 -MAN8= snmpd.8 snmptrapd.8 - -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk -SBIN_FILES= snmpd snmptrapd -STARTUP_DIR= ${PREFIX}/etc/rc.d -STARTUP_FILES= snmpd.sh snmptrapd.sh -SCRIPT_FILES= snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \ - traptoemail -.if defined(WITH_TKMIB) -SCRIPT_FILES+= tkmib -.endif -DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ - README.agentx README.krb5 README.snmpv3 README.thread \ - agent/mibgroup/README.smux - -PS_CMD?= /bin/ps - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITH_INETADDRESS_HACK=yes builds with the inetaddress hack" - @${ECHO_MSG} "WITH_TKMIB=yes Install a graphical Perl/Tk/SNMP based mib browser" - @${ECHO_MSG} "WITHOUT_DUMMY_VALUES=yes Provide 'placeholder' dummy values where" - @${ECHO_MSG} " the necessary information is not available." - @${ECHO_MSG} "WITHOUT_PERL=yes Do not install the perl modules along with the rest" - @${ECHO_MSG} " of the net-snmp toolkit." - @${ECHO_MSG} "WITHOUT_IPV6=yes Disable IPv6." - @${ECHO_MSG} - @${ECHO_MSG} "DEFAULT_SNMP_VERSION=\"3\" Default version of SNMP to use." - @${ECHO_MSG} "NET_SNMP_SYS_CONTACT=\"${NET_SNMP_SYS_CONTACT}\"" - @${ECHO_MSG} " Default system contact." - @${ECHO_MSG} "NET_SNMP_SYS_LOCATION=\"${NET_SNMP_SYS_LOCATION}\"" - @${ECHO_MSG} " Default system location." - @${ECHO_MSG} "NET_SNMP_LOGFILE=\"${NET_SNMP_LOGFILE}\"" - @${ECHO_MSG} " Default log file location for snmpd." - @${ECHO_MSG} "NET_SNMP_PERSISTENTDIR=\"${NET_SNMP_PERSISTENTDIR}\"" - @${ECHO_MSG} " Default directory for persistent data storage." - @${ECHO_MSG} "NET_SNMP_MIB_MODULES=\"${NET_SNMP_MIB_MODULE_LIST}\"" - @${ECHO_MSG} " Optional mib modules that can be built into the" - @${ECHO_MSG} " agent" - @${ECHO_MSG} - -post-patch: patch-autoconf patch-script-files patch-startup-files - -patch-autoconf: - @${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp - @${CAT} ${LOCALBASE}/share/aclocal/libtool15.m4 >> ${WRKSRC}/aclocal.m4.tmp - @${CP} ${LOCALBASE}/share/libtool15/ltmain.sh ${WRKSRC} - @${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4 - -patch-script-files: -.for file in ${SCRIPT_FILES} - @${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/local/${file} -.endfor - -patch-startup-files: -.for file in ${STARTUP_FILES} - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${file}.sample > ${WRKDIR}/${file} -.endfor - -post-configure: - @${FIND} ${WRKSRC} -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ ]+=/s|$$| -m 755|' - -.if !defined(WITHOUT_PERL) -post-build: - ${FIND} ${WRKSRC}/perl -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -E -e '\ - s!^(PREFIX) = .*!\1 = ${PREFIX}!; \ - s!^(INSTALLMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \ - s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \ - ' -.endif - -post-install: strip-files install-startup-files install-config-files install-doc-files display-message - -strip-files: - @cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES} - @cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES} - -install-startup-files: -.for file in ${STARTUP_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${file} ${STARTUP_DIR} -.endfor - -install-config-files: - @${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example - -install-doc-files: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor -.endif - -display-message: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - -# Maintainer's note: -# Don't forget to bump library version in these ports. -# lang/php4,lang/php5,net-mgmt/braa,net-mgmt/docsis,net/ethereal,net-mgmt/mbrowse,net/quagga,net/tethereal,net-mgmt/zabbix,security/libfwbuilder,net-mgmt/p5-SNMP-Info,net-mgmt/nagios-snmp-plugins,french/plgrenouille - -.include <bsd.port.post.mk> diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo deleted file mode 100644 index 443d314fbbf9..000000000000 --- a/net-mgmt/net-snmp53/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (net-snmp-5.2.tar.gz) = af1c18209474ec4851b06504aae2a7c1 -SIZE (net-snmp-5.2.tar.gz) = 3853153 diff --git a/net-mgmt/net-snmp53/files/extra-patch-local:Makefile.in b/net-mgmt/net-snmp53/files/extra-patch-local:Makefile.in deleted file mode 100644 index d3da47b8a662..000000000000 --- a/net-mgmt/net-snmp53/files/extra-patch-local:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- local/Makefile.in.orig Fri Sep 17 02:34:58 2004 -+++ local/Makefile.in Mon Oct 25 07:39:24 2004 -@@ -15,7 +15,7 @@ - # local info - # - SNMPCONFPATH=@SNMPCONFPATH@ --PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail -+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail - SHELLSCRIPTS=mib2c-update - SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made snmpconf.made traptoemail.made diff --git a/net-mgmt/net-snmp53/files/extra-patch-snmplib::mib.c b/net-mgmt/net-snmp53/files/extra-patch-snmplib::mib.c deleted file mode 100644 index 9ee51d8abf67..000000000000 --- a/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-configure.in b/net-mgmt/net-snmp53/files/patch-configure.in deleted file mode 100644 index 99cd2dad2893..000000000000 --- a/net-mgmt/net-snmp53/files/patch-configure.in +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.in.orig Sat Oct 30 14:05:59 2004 -+++ configure.in Sat Oct 30 15:02:25 2004 -@@ -2071,7 +2071,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 /dev/null - do - if test -f $i -o $CFLAG $i; then - ac_cv_KERNEL_LOC="$i" -@@ -2357,7 +2357,7 @@ - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h net/if_arp.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/times.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h) - # FreeBSD required headers --AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h machine/types.h sys/socketvar.h) -+AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h sys/socketvar.h) - # Linux - AC_CHECK_HEADERS(sys/conf.h netinet/in_systm.h netinet/tcp.h netinet/udp.h netinet/in_var.h netinet/if_ether.h netinet/ip_var.h netinet/tcp_timer.h netinet/tcp_var.h netinet/tcp_fsm.h netinet/udp_var.h netinet/icmp_var.h sys/protosw.h nlist.h ioctls.h asm/page.h netipx/ipx.h) - # NetBSD required headers -@@ -2811,6 +2811,26 @@ - # checking for 4.3 vs 4.4 rtentry. - 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") - - # 4.4 compat - AC_TRY_COMPILE([ diff --git a/net-mgmt/net-snmp53/files/patch-freebsd5.h b/net-mgmt/net-snmp53/files/patch-freebsd5.h deleted file mode 100644 index 8bc6de2831b5..000000000000 --- a/net-mgmt/net-snmp53/files/patch-freebsd5.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/net-snmp/system/freebsd5.h.orig Wed Sep 1 00:13:46 2004 -+++ include/net-snmp/system/freebsd5.h Wed Sep 1 00:13:57 2004 -@@ -7,6 +7,7 @@ - #define freebsd3 1 - /* freebsd5 is a superset of freebsd4 */ - #define freebsd4 1 -+#define freebsd5 1 - - #undef IFADDR_SYMBOL - #define IFADDR_SYMBOL "in_ifaddrhead" diff --git a/net-mgmt/net-snmp53/files/patch-hr_storage.c b/net-mgmt/net-snmp53/files/patch-hr_storage.c deleted file mode 100644 index 3fe873c4eaac..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_storage.c +++ /dev/null @@ -1,230 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Sun Oct 17 10:59:14 2004 -+++ agent/mibgroup/host/hr_storage.c Mon Oct 25 07:49:40 2004 -@@ -212,6 +212,10 @@ - void sol_get_swapinfo(int *, int *); - #endif - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void collect_mbuf(long *long_mbuf, long *long_mbufc); -+#endif -+ - #define HRSTORE_MEMSIZE 1 - #define HRSTORE_INDEX 2 - #define HRSTORE_TYPE 3 -@@ -451,7 +455,8 @@ - NULL, - "Memory Buffers", /* HRS_TYPE_MBUF */ - "Real Memory", /* HRS_TYPE_MEM */ -- "Swap Space" /* HRS_TYPE_SWAP */ -+ "Swap Space", /* HRS_TYPE_SWAP */ -+ "Memory Buffer Clusters" /* HRS_TYPE_MBUFCLUSTER */ - }; - - -@@ -566,6 +571,7 @@ - storage_type_id[storage_type_len - 1] = 3; /* Virtual Mem */ - break; - case HRS_TYPE_MBUF: -+ case HRS_TYPE_MBUFCLUSTER: - storage_type_id[storage_type_len - 1] = 1; /* Other */ - break; - default: -@@ -654,7 +660,7 @@ - case HRS_TYPE_SWAP: - long_return = memory_totals.t_vm; - break; --#else /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#else - case HRS_TYPE_MEM: - long_return = physmem; - break; -@@ -664,6 +670,8 @@ - #endif - long_return = 0; - break; -+#endif /* linux || solaris2 || hpux10 || hpux11 || ... */ -+#if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) - case HRS_TYPE_MBUF: - #if HAVE_SYS_POOL_H - long_return = 0; -@@ -673,7 +681,26 @@ - i++) - long_return += mbstat.m_mtypes[i]; - #elif defined(MBSTAT_SYMBOL) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ { -+ size_t mlen = sizeof(int); -+ int nmbufs; -+ if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbufs; -+ break; -+ } -+#else -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif /* __FreeBSD__ */ - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -681,6 +708,18 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500024 -+ case HRS_TYPE_MBUFCLUSTER: { -+ size_t mlen = sizeof(int); -+ int nmbclusters; -+ if (sysctlbyname("kern.ipc.nmbclusters", &nmbclusters, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbclusters; -+ break; -+ } -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -733,6 +772,12 @@ - * mclpool.pr_size; - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS) - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500102 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ collect_mbuf((long*)&long_return, (long*)NULL); -+ break; - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -740,6 +785,11 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+ case HRS_TYPE_MBUFCLUSTER: -+ collect_mbuf(NULL, &long_return); -+ break; -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -766,7 +816,11 @@ - break; - #if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) && defined(MBSTAT_SYMBOL) - case HRS_TYPE_MBUF: -+#if defined(__FreeBSD__) && __FreeBSD_version >= 502113 -+ long_return = mbstat.m_mcfail + mbstat.m_mpfail; -+#else - long_return = mbstat.m_drops; -+#endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && MBSTAT_SYMBOL */ - default: -@@ -892,3 +946,97 @@ - *usedP = ainfo.ani_resv; - } - #endif /* solaris2 */ -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void -+collect_mbuf(long *long_mbuf, long *long_mbufc) -+{ -+#if __FreeBSD_version >= 502113 -+ size_t mlen; -+ struct mbstat mbstat; -+ -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ return; -+ } -+ if (mbstat.m_mbufs < 0) mbstat.m_mbufs = 0; /* XXX */ -+ if (mbstat.m_mclusts < 0) mbstat.m_mclusts = 0; /* XXX */ -+ if (long_mbuf) { -+ *long_mbuf = mbstat.m_mbufs; -+ } -+ if (long_mbufc) { -+ *long_mbufc = mbstat.m_mclusts; -+ } -+#else -+ int i, j, num_objs; -+ size_t mlen; -+ u_long totused[2]; -+ u_long totnum, totfree; -+ struct mbstat mbstat; -+ struct mbpstat **mbpstat = NULL; -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu len"); -+ goto err; -+ } -+ num_objs = (int)(mlen / sizeof(struct mbpstat)); -+ if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats pointers"); -+ goto err; -+ } -+ if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats"); -+ goto err; -+ } -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu"); -+ goto err; -+ } -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ goto err; -+ } -+ -+ for (i = 0; i < num_objs; i++) -+ mbpstat[i] = mbpstat[0] + i; -+ -+#define GENLST (num_objs - 1) -+ -+ totnum = mbpstat[GENLST]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree = mbpstat[GENLST]->mb_mbfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree += mbpstat[i]->mb_mbfree; -+ } -+ totused[0] = totnum - totfree; -+ totnum = mbpstat[GENLST]->mb_clbucks * mbstat.m_clperbuck; -+ totfree = mbpstat[GENLST]->mb_clfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_clbucks * mbstat.m_clperbuck; -+ totfree += mbpstat[i]->mb_clfree; -+ } -+ totused[1] = totnum - totfree; -+ -+ if (long_mbuf) { -+ *long_mbuf = totused[0]; -+ } -+ if (long_mbufc) { -+ *long_mbufc = totused[1]; -+ } -+ -+ err: -+ if (mbpstat != NULL) { -+ if (mbpstat[0] != NULL) -+ free(mbpstat[0]); -+ free(mbpstat); -+ } -+#endif -+} -+#endif diff --git a/net-mgmt/net-snmp53/files/patch-hr_storage.h b/net-mgmt/net-snmp53/files/patch-hr_storage.h deleted file mode 100644 index a14eb9f1043c..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_storage.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_storage.h.orig Tue Feb 25 22:17:48 2003 -+++ agent/mibgroup/host/hr_storage.h Wed May 5 15:27:40 2004 -@@ -12,6 +12,7 @@ - #define HRS_TYPE_MBUF 1 - #define HRS_TYPE_MEM 2 - #define HRS_TYPE_SWAP 3 --#define HRS_TYPE_FIXED_MAX 3 /* the largest fixed type */ -+#define HRS_TYPE_MBUFCLUSTER 4 -+#define HRS_TYPE_FIXED_MAX 4 /* the largest fixed type */ - - #endif /* _MIBGROUP_HRSTORAGE_H */ diff --git a/net-mgmt/net-snmp53/files/patch-hr_swrun.c b/net-mgmt/net-snmp53/files/patch-hr_swrun.c deleted file mode 100644 index 3bd1e7800e7b..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_swrun.c +++ /dev/null @@ -1,69 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Wed Jun 9 05:56:03 2004 -+++ agent/mibgroup/host/hr_swrun.c Fri Jun 25 10:56:38 2004 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -694,7 +694,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -889,7 +889,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -988,7 +988,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #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; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1063,7 +1069,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 = - #if defined(freebsd5) - proc_table[LowProcIndex].ki_size / 1024; -@@ -1349,7 +1362,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff --git a/net-mgmt/net-snmp53/files/patch-hr_system.c b/net-mgmt/net-snmp53/files/patch-hr_system.c deleted file mode 100644 index f2d810ac0771..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_system.c +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_system.c.orig Mon Feb 23 02:29:34 2004 -+++ agent/mibgroup/host/hr_system.c Sat Apr 3 00:00:24 2004 -@@ -596,6 +596,8 @@ - #ifndef UTMP_HAS_NO_TYPE - if (utmp_p->ut_type != USER_PROCESS) - continue; -+#else -+ if (*utmp_p->ut_name != '~') - #endif - #ifndef UTMP_HAS_NO_PID - /* This block of code fixes zombie user PIDs in the diff --git a/net-mgmt/net-snmp53/files/patch-interface_ioctl.c b/net-mgmt/net-snmp53/files/patch-interface_ioctl.c deleted file mode 100644 index 4939166949be..000000000000 --- a/net-mgmt/net-snmp53/files/patch-interface_ioctl.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./agent/mibgroup/if-mib/data_access/interface_ioctl.c.orig Mon Oct 25 12:57:23 2004 -+++ ./agent/mibgroup/if-mib/data_access/interface_ioctl.c Mon Oct 25 12:56:33 2004 -@@ -385,6 +385,10 @@ - if (rc < 0) - return 0; - -+#if defined(__FreeBSD__) -+ return ifrq.ifr_index; -+#else - return ifrq.ifr_ifindex; -+#endif - #endif /* SIOCGIFINDEX */ - } diff --git a/net-mgmt/net-snmp53/files/patch-interfaces.c b/net-mgmt/net-snmp53/files/patch-interfaces.c deleted file mode 100644 index c9d465c00859..000000000000 --- a/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-ipv6.c b/net-mgmt/net-snmp53/files/patch-ipv6.c deleted file mode 100644 index 29e2de99aa97..000000000000 --- a/net-mgmt/net-snmp53/files/patch-ipv6.c +++ /dev/null @@ -1,603 +0,0 @@ ---- agent/mibgroup/mibII/ipv6.c.orig Thu Jul 8 05:31:54 2004 -+++ agent/mibgroup/mibII/ipv6.c Mon Oct 25 08:32:31 2004 -@@ -8,10 +8,25 @@ - #define _KERNEL 1 - #define _I_DEFINED_KERNEL - #endif -+ -+/* make this source a wee bit more readable */ -+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#define OS_NET_BSD_16_OR_LATER 1 -+#endif -+#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#define OS_NOT_FREEBSD_NOR_DARWIN 1 -+#endif -+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#define OS_FREEBSD_OR_DARWIN 1 -+#if !defined(INP_IPV6PROTO) -+#define INP_IPV6PROTO 0x04 -+#endif -+#endif -+ - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - # if HAVE_SYS_SOCKETVAR_H - # include <sys/socketvar.h> - # endif -@@ -80,7 +95,7 @@ - # include <netinet6/ip6_var.h> - #endif - #include <net/route.h> --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - # if HAVE_NETINET_IN_PCB_H - # include <netinet/in_pcb.h> - # endif -@@ -575,7 +590,7 @@ - memcpy(result, &tmp, sizeof(tmp)); - return 0; - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - q = (caddr_t) TAILQ_NEXT(&tmp, if_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -806,7 +821,7 @@ - - if (if_getifnet(interface, &ifnet) < 0) - break; --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -827,7 +842,7 @@ - *var_len = sdl.sdl_alen; - return (u_char *) (sdl.sdl_data + sdl.sdl_nlen); - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -1220,32 +1235,33 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - int found, savnameLen; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb udb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable udbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#endif -+#if OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb udb6; - #endif - - DEBUGMSGTL(("mibII/ipv6", "var_udp6: ")); - DEBUGMSGOID(("mibII/ipv6", name, *length)); - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable))) - return NULL; - first = p = (caddr_t)udbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - if (!auto_nlist("udb6", (char *) &udb6, sizeof(udb6))) - return NULL; - p = (caddr_t) udb6.in6p_next; -@@ -1274,9 +1290,10 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ - p && (u_long) p != auto_nlist_value("udb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1284,31 +1301,32 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) { -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ -@@ -1319,7 +1337,7 @@ - - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1330,7 +1348,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1338,15 +1356,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1354,7 +1372,7 @@ - return NULL; - *length = savnameLen; - memcpy((char *) name, (char *) savname, *length * sizeof(oid)); -- memcpy(&in6pcb, &savpcb, sizeof(savpcb)); -+ memcpy(&tstpcb, &savpcb, sizeof(savpcb)); - *write_method = 0; - *var_len = sizeof(long); /* default to 'long' results */ - -@@ -1367,14 +1385,14 @@ - switch (vp->magic) { - case IPV6UDPLOCALADDRESS: - *var_len = sizeof(struct in6_addr); -- return in6pcb.in6p_laddr.s6_addr; -+ return savpcb.in6p_laddr.s6_addr; - case IPV6UDPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6UDPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; -@@ -1392,24 +1410,24 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - struct tcp6cb tcp6cb; - int found, savnameLen; - static int tcp6statemap[TCP6_NSTATES]; - static int initialized = 0; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb tcb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb tcb6; - #endif - - if (!initialized) { -@@ -1431,11 +1449,11 @@ - DEBUGMSGOID(("mibII/ipv6", name, *length)); - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) - return NULL; - first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6))) - return NULL; - p = (caddr_t) tcb6.in6p_next; -@@ -1464,9 +1482,10 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1474,41 +1493,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) - < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -- in6pcb.in6p_ppcb)); -+ tstpcb.in6p_ppcb)); - found = 0; - break; - } - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_faddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_fport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_fport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ newname[j++] = tcp6statemap[tcp6cb.t_state]; -@@ -1519,13 +1538,13 @@ - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - - #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ -- if (ntohs(in6pcb.in6p_lport) == 0) -+ if (ntohs(tstpcb.in6p_lport) == 0) - goto skip; - #endif - - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1536,7 +1555,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1544,15 +1563,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1573,20 +1592,20 @@ - switch (vp->magic) { - case IPV6TCPLOCALADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_laddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; - case IPV6TCPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6TCPREMOTEADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_faddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; - case IPV6TCPREMOTEPORT: -- long_return = ntohs(in6pcb.in6p_fport); -+ long_return = ntohs(savpcb.in6p_fport); - return (u_char *) & long_return; - case IPV6TCPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; -@@ -1633,22 +1652,23 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - struct tcpcb tcpcb; - int found, savnameLen; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb tcb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#endif -+#if OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb tcb6; - #endif - - DEBUGMSGTL(("mibII/ipv6", "var_tcp6: ")); -@@ -1688,9 +1708,9 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1698,41 +1718,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(in6pcb)) < 0) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) - < 0) { -- DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcpcb at %x\n", -- in6pcb.in6p_ppcb)); -+ DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -+ tstpcb.in6p_ppcb)); - found = 0; - break; - } - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_faddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_fport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_fport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ newname[j++] = mapTcpState((int)tcpcb.t_state); -@@ -1743,12 +1763,12 @@ - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - - #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ -- if (ntohs(in6pcb.in6p_lport) == 0) -+ if (ntohs(tstpcb.in6p_lport) == 0) - goto skip; - #endif - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1759,7 +1779,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1767,15 +1787,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1783,7 +1803,7 @@ - return NULL; - *length = savnameLen; - memcpy((char *) name, (char *) savname, *length * sizeof(oid)); -- memcpy(&in6pcb, &savpcb, sizeof(savpcb)); -+ memcpy(&tstpcb, &savpcb, sizeof(savpcb)); - *write_method = 0; - *var_len = sizeof(long); /* default to 'long' results */ - -@@ -1796,20 +1816,20 @@ - switch (vp->magic) { - case IPV6TCPLOCALADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_laddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; - case IPV6TCPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6TCPREMOTEADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_faddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; - case IPV6TCPREMOTEPORT: -- long_return = ntohs(in6pcb.in6p_fport); -+ long_return = ntohs(savpcb.in6p_fport); - return (u_char *) & long_return; - case IPV6TCPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; diff --git a/net-mgmt/net-snmp53/files/patch-local:fixproc b/net-mgmt/net-snmp53/files/patch-local:fixproc deleted file mode 100644 index 5d6e3515467d..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:fixproc +++ /dev/null @@ -1,138 +0,0 @@ ---- local/fixproc.orig Sat Apr 20 09:30:13 2002 -+++ local/fixproc Sat Mar 6 01:59:59 2004 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!%%PERL%% - # - # fixproc [-min n] [-max n] [-check | -kill | -restart | -exist | -fix] proc ... - # -@@ -129,7 +129,7 @@ - # - # Timothy Kong 3/1995 - --$database_file = '/local/etc/fixproc.conf'; -+$database_file = '%%PREFIX%%/etc/fixproc.conf'; - - $debug = 0; # specify debug level using -dN - # currently defined: -d1 -@@ -155,6 +155,14 @@ - $shell_header = "#!/bin/sh\n"; - $shell_end_marker = 'shell_end_marker'; - -+open(command, "/bin/ps -p $$ |") || die "$0: can't run ps command\n"; -+if (split(' ', <command>) > 4) { -+ $ps_opts = 'ax'; -+} else { -+ $ps_opts = '-e'; -+} -+close command; -+ - &read_args(); - &read_database(); - # &dump_database(); # debug only -@@ -203,7 +211,9 @@ - $i++; - } - close (file); -- system "chmod +x $file"; -+ ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, -+ $atime,$mtime,$ctime,$blksize,$blocks) = stat($file); -+ chmod $mode | 0111, $file; - return file; - } - -@@ -237,8 +247,8 @@ - - # return code is number divided by 256 - $error_code = (system "$tmpfile") / 256; -- system "rm $tmpfile"; -- return ($fix_failed_error) if ($error_code != 0); -+ unlink $tmpfile; -+ return ($cannot_fix_error) if ($error_code != 0); - # sleep needed here? - return &do_exist ($proc); - } -@@ -268,7 +278,7 @@ - - # return code is number divided by 256 - $error_code = (system "$tmpfile") / 256; -- system "rm $tmpfile"; -+ unlink $tmpfile; - return ($check_failed_error) if ($error_code != 0); - - # check passed, continue -@@ -285,10 +295,12 @@ - - # do ps, check to see if min <= no. of processes <= max - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc | /bin/wc -l |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-wc command\n"; -- $proc_count = <command>; -- if (($proc_count < $min{$proc}) || ($proc_count > $max{$proc})) -+ @allprocs = <command>; -+ close command; -+ @procs = grep(/$proc/, @allprocs); -+ if (($#procs < $min{$proc}) || ($#procs > $max{$proc})) - { - return $check_failed_error; - } -@@ -305,41 +317,48 @@ - - # first try kill - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - while (<command>) - { -- # match the first field of ps -e -+ if /$proc/ { -+ # match the first field of ps $ps_opts - $! = $fixproc_error; -- /^\s*(\d+)\s/ || die "$0: can't match ps -e output\n"; -- system "kill $1"; -+ /^\s*(\d+)\s/ || die "$0: can't match ps $ps_opts output\n"; -+ kill 15, $1; -+ } - } -+ close command; - - # if process still exist, try kill -9 - sleep 2; - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - $second_kill_needed = 0; - while (<command>) - { -- # match the first field of ps -e -+ if /$proc/ { -+ # match the first field of ps $ps_opts - $! = $fixproc_error; -- /^\s*(\d+)\s/ || die "$0: can't match ps -e output\n"; -- system "kill -9 $1"; -+ /^\s*(\d+)\s/ || die "$0: can't match ps $ps_opts output\n"; -+ kill 9, $1; - $second_kill_needed = 1; -+ } - } -+ close command; - return ($no_error) if ($second_kill_needed == 0); - - # see if kill -9 worked - sleep 2; - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (command, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - while (<command>) - { # a process still exist, return error -- return $cannot_kill_error; -+ return $cannot_kill_error if /$proc/; - } -+ close command; - return $no_error; # good, all dead - } - diff --git a/net-mgmt/net-snmp53/files/patch-local:ipf-mod.pl b/net-mgmt/net-snmp53/files/patch-local:ipf-mod.pl deleted file mode 100644 index 8bf98d4f1d52..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:ipf-mod.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- local/ipf-mod.pl.orig Thu May 29 05:30:19 2003 -+++ local/ipf-mod.pl Thu May 29 05:40:13 2003 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -s -+#!%%PERL%% -s - ## - ## IP Filter UCD-SNMP pass module - ## -@@ -9,10 +9,10 @@ - ## Date: $ Tue Dec 1 10:24:08 EET 1998 $ - ## Version: 1.1a - --# Put this file in /usr/local/bin/ipf-mod.pl and then add the following -+# Put this file in %%PREFIX%%/bin/ipf-mod.pl and then add the following - # line to your snmpd.conf file (without the # at the front): - # --# pass .1.3.6.1.4.1.2021.13.2 /usr/local/bin/ipf-mod.pl -+# pass .1.3.6.1.4.1.2021.13.2 %%PREFIX%%/bin/ipf-mod.pl - - # enterprises.ucdavis.ucdExperimental.ipFilter = .1.3.6.1.4.1.2021.13.2 - # ipfInTable.ipfInEntry.ipfInIndex integer = 1.1.1 diff --git a/net-mgmt/net-snmp53/files/patch-local:mib2c b/net-mgmt/net-snmp53/files/patch-local:mib2c deleted file mode 100644 index a0a2ce336f86..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:mib2c +++ /dev/null @@ -1,21 +0,0 @@ ---- local/mib2c.orig Fri Sep 10 21:30:15 2004 -+++ local/mib2c Mon Oct 25 08:38:30 2004 -@@ -1,5 +1,4 @@ --#!/usr/bin/perl --#!/usr/bin/perl -w -+#!%%PERL%% - - # - # $Id: mib2c,v 5.57 2004/09/10 12:30:15 dts12 Exp $ -@@ -60,8 +59,9 @@ - if($ENV{MIB2C_DIR}) { - push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR}); - } --push @def_search_dirs, "/usr/local/share/snmp/"; --push @def_search_dirs, "/usr/local/share/snmp/mib2c-data"; -+push @def_search_dirs, "%%PREFIX%%/share/snmp/"; -+push @def_search_dirs, "%%PREFIX%%/etc/snmp/"; -+push @def_search_dirs, "%%PREFIX%%/share/snmp/mib2c-data"; - push @def_search_dirs, "./mib2c-conf.d"; - - sub usage { diff --git a/net-mgmt/net-snmp53/files/patch-local:snmpcheck.def b/net-mgmt/net-snmp53/files/patch-local:snmpcheck.def deleted file mode 100644 index 4f3b4a2491da..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:snmpcheck.def +++ /dev/null @@ -1,8 +0,0 @@ ---- local/snmpcheck.def.orig Thu May 29 05:28:22 2003 -+++ local/snmpcheck.def Thu May 29 05:29:49 2003 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!%%PERL%% -w - - use strict 'refs'; - require Net::Ping; diff --git a/net-mgmt/net-snmp53/files/patch-local:snmpconf b/net-mgmt/net-snmp53/files/patch-local:snmpconf deleted file mode 100644 index 5b3623782df9..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:snmpconf +++ /dev/null @@ -1,53 +0,0 @@ ---- local/snmpconf.orig Sat Oct 9 01:01:37 2004 -+++ local/snmpconf Mon Oct 25 08:42:23 2004 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!%%PERL%% -w - - # - # A simple configuration file builder based on questions listed in -@@ -32,7 +32,7 @@ - $opts{'c'} = "$ENV{SNMPSHAREPATH}/snmpconf-data"; - } - else { -- $opts{'c'} = "/usr/local/share/snmp/snmpconf-data"; -+ $opts{'c'} = "%%PREFIX%%/share/snmp/snmpconf-data"; - } - - # default config file path -@@ -40,7 +40,7 @@ - $confpath = "$ENV{SNMPCONFPATH}"; - } - else { -- $confpath = "/usr/local/share/snmp"; -+ $confpath = "%%PREFIX%%/share/snmp"; - } - } - else -@@ -128,7 +128,7 @@ - # - # Find existing files to possibly read in. - # --my @searchpath = ("$confpath","/usr/local/etc/snmp", ".", "$home"); -+my @searchpath = ("$confpath","%%PREFIX%%/etc/snmp", ".", "$home"); - push @searchpath, $opts{I} if ($opts{I}); - foreach my $i (@searchpath) { - debug("searching $i\n"); -@@ -227,7 +227,7 @@ - if ($opts{'i'} || $opts{'I'}) { - $opts{'I'} = "$confpath" if (!$opts{'I'}); - -- if (! (-d "$opts{'I'}") && ! (mkdir ("$opts{'I'}"))) { -+ if (! (-d "$opts{'I'}") && ! (mkdir ("$opts{'I'}", 0777))) { - print "\nCould not create $opts{'I'} directory: $!\n"; - print ("File $didfile{$i} left in current directory\n"); - } -@@ -242,7 +242,7 @@ - } - } - } elsif ($opts{'p'}) { -- if (! (-d "$home") && ! (mkdir ("$home"))) { -+ if (! (-d "$home") && ! (mkdir ("$home", 0777))) { - print "\nCould not create $home directory: $!\n"; - print ("File $didfile{$i} left in current directory\n"); - } diff --git a/net-mgmt/net-snmp53/files/patch-local:tkmib b/net-mgmt/net-snmp53/files/patch-local:tkmib deleted file mode 100644 index 3278d27c3809..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:tkmib +++ /dev/null @@ -1,9 +0,0 @@ ---- local/tkmib.orig Thu May 29 05:30:19 2003 -+++ local/tkmib Thu May 29 05:31:46 2003 -@@ -1,5 +1,4 @@ --#!/usr/bin/perl --#!/usr/bin/perl -w -+#!%%PERL%% -w - - require 5; - diff --git a/net-mgmt/net-snmp53/files/patch-local:traptoemail b/net-mgmt/net-snmp53/files/patch-local:traptoemail deleted file mode 100644 index 402506b540c6..000000000000 --- a/net-mgmt/net-snmp53/files/patch-local:traptoemail +++ /dev/null @@ -1,16 +0,0 @@ ---- local/traptoemail.orig Thu May 29 05:30:19 2003 -+++ local/traptoemail Thu May 29 05:35:13 2003 -@@ -1,11 +1,11 @@ --#!/usr/bin/perl -+#!%%PERL%% - - # This is a snmptrapd handler script to convert snmp traps into email - # messages. - - # Usage: - # Put a line like the following in your snmptrapd.conf file: --# traphandle TRAPOID|default /usr/local/bin/traptoemail [-f FROM] [-s SMTPSERVER]b ADDRESSES -+# traphandle TRAPOID|default %%PREFIX%%/bin/traptoemail [-f FROM] [-s SMTPSERVER]b ADDRESSES - # FROM defaults to "root" - # SMTPSERVER defaults to "localhost" - diff --git a/net-mgmt/net-snmp53/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp53/files/patch-snmpTCPIPv6Domain.c deleted file mode 100644 index 365b6f398ebe..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpTCPIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpTCPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpTCPIPv6Domain.c Mon Oct 25 09:22:06 2004 -@@ -95,13 +95,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, "TCP/IPv6: [%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-mgmt/net-snmp53/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp53/files/patch-snmpUCDIPv6Domain.c deleted file mode 100644 index c36abaaba730..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpUCDIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpUDPIPv6Domain.c Mon Oct 25 09:28:10 2004 -@@ -104,13 +104,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, "UDP/IPv6: [%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-mgmt/net-snmp53/files/patch-snmpd.8.def b/net-mgmt/net-snmp53/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-snmpusm.c b/net-mgmt/net-snmp53/files/patch-snmpusm.c deleted file mode 100644 index 7b0ced219ae5..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpusm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpusm.c.orig Wed Dec 8 19:32:52 2004 -+++ snmplib/snmpusm.c Wed Dec 8 19:33:30 2004 -@@ -89,6 +89,8 @@ - oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; - /* backwards compat */ - oid *usmAES128PrivProtocol = usmAESPrivProtocol; -+oid *usmAES192PrivProtocol = usmAESPrivProtocol; -+oid *usmAES256PrivProtocol = usmAESPrivProtocol; - - static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ - diff --git a/net-mgmt/net-snmp53/files/patch-tcpTable.c b/net-mgmt/net-snmp53/files/patch-tcpTable.c deleted file mode 100644 index d96d0976189b..000000000000 --- a/net-mgmt/net-snmp53/files/patch-tcpTable.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/tcpTable.c.orig Wed Jun 9 05:53:17 2004 -+++ agent/mibgroup/mibII/tcpTable.c Thu Jun 24 23:21:32 2004 -@@ -275,6 +277,9 @@ - - int - TCP_Count_Connections( void ) { -+#if (defined(CAN_USE_SYSCTL) && defined(TCPCTL_PCBLIST)) -+ tcpTable_load(NULL, NULL); -+#endif - return tcp_estab; - } - diff --git a/net-mgmt/net-snmp53/files/patch-transform_oids.h b/net-mgmt/net-snmp53/files/patch-transform_oids.h deleted file mode 100644 index 874acac2f086..000000000000 --- a/net-mgmt/net-snmp53/files/patch-transform_oids.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/net-snmp/library/transform_oids.h.orig Wed Dec 8 19:34:06 2004 -+++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 -@@ -23,6 +23,8 @@ - /* XXX: OIDs not defined yet */ - extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ - extern oid *usmAES128PrivProtocol; /* backwards compat */ -+extern oid *usmAES192PrivProtocol; /* backwards compat */ -+extern oid *usmAES256PrivProtocol; /* backwards compat */ - - #define USM_AUTH_PROTO_NOAUTH_LEN 10 - #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h b/net-mgmt/net-snmp53/files/patch-ucd_snmp.h deleted file mode 100644 index 2690553112a1..000000000000 --- a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 -+++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 -@@ -39,6 +39,8 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) - config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) - config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.sample b/net-mgmt/net-snmp53/files/snmpd.sh.sample deleted file mode 100644 index 6e089e397b40..000000000000 --- a/net-mgmt/net-snmp53/files/snmpd.sh.sample +++ /dev/null @@ -1,36 +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=${snmpd_enable-"NO"} -snmpd_flags=${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/${name} -pidfile=/var/run/${name}.pid -sig_stop=-KILL - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample b/net-mgmt/net-snmp53/files/snmptrapd.sh.sample deleted file mode 100644 index b3b48c2d79c2..000000000000 --- a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: snmptrapd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# Add the following line to /etc/rc.conf to enable snmptrapd: -# -# snmptrapd_enable="YES" -# - -snmptrapd_enable=${snmptrapd_enable-"NO"} -snmptrapd_flags=${snmptrapd_flags-"-p /var/run/snmptrapd.pid"} - -. %%RC_SUBR%% - -load_rc_config net_snmptrapd - -if [ ! -z "$net_snmptrapd_enable" ]; then - echo "Warning: \$net_snmptrapd_enable is obsoleted." - echo " Use \$snmptrapd_enable instead." - snmptrapd_enable="$net_snmptrapd_enable" - [ ! -z "$net_snmptrapd_flags" ] && snmptrapd_flags="$net_snmptrapd_flags" -fi - -name=snmptrapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp53/pkg-descr b/net-mgmt/net-snmp53/pkg-descr deleted file mode 100644 index d1fc04717b8e..000000000000 --- a/net-mgmt/net-snmp53/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 graphical Perl/Tk/SNMP based mib browser - -WWW: http://net-snmp.sourceforge.net/ diff --git a/net-mgmt/net-snmp53/pkg-message b/net-mgmt/net-snmp53/pkg-message deleted file mode 100644 index 4a213e367a42..000000000000 --- a/net-mgmt/net-snmp53/pkg-message +++ /dev/null @@ -1,26 +0,0 @@ -**** This port installs snmp daemon, header files and libraries but don't - invokes snmpd by default. - If you want to invoke snmpd and/or snmptrapd at startup, put these - lines into /etc/rc.conf. - - snmpd_enable="YES" - snmpd_flags="-a -p /var/run/snmpd.pid" - snmptrapd_enable="YES" - snmptrapd_flags="-a -p /var/run/snmptrapd.pid" - -**** You may specify the following make variables: - - NET_SNMP_SYS_CONTACT="kuriyama@FreeBSD.org" - NET_SNMP_SYS_LOCATION="Tokyo, Japan" - DEFAULT_SNMP_VERSION=3 - NET_SNMP_MIB_MODULES="host smux mibII/mta_sendmail ucd-snmp/diskio" - 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. You may also set - - BATCH="yes" - - to avoid interactive configuration. diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist deleted file mode 100644 index ec11fcd47f22..000000000000 --- a/net-mgmt/net-snmp53/pkg-plist +++ /dev/null @@ -1,421 +0,0 @@ -bin/encode_keychange -bin/fixproc -bin/ipf-mod.pl -bin/mib2c -bin/mib2c-update -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 -%%WITH_TKMIB%%bin/tkmib -bin/traptoemail -etc/rc.d/snmpd.sh -etc/rc.d/snmptrapd.sh -@exec mkdir %D/etc/snmp 2>/dev/null || true -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_module_config.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/mfd.h -include/net-snmp/agent/mib_module_config.h -include/net-snmp/agent/mib_module_includes.h -include/net-snmp/agent/mib_modules.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_container.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/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 -%%WITH_IPV6%%include/net-snmp/library/snmpTCPIPv6Domain.h -include/net-snmp/library/snmpUDPDomain.h -%%WITH_IPV6%%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/winpipe.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/darwin7.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/freebsd6.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/mingw32.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 -lib/libnetsnmp.a -lib/libnetsnmp.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so -@unexec rm -f %B/libnetsnmp.so 2> /dev/null || true -lib/libnetsnmpagent.a -lib/libnetsnmpagent.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so -@unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true -lib/libnetsnmphelpers.a -lib/libnetsnmphelpers.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so -@unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true -lib/libnetsnmpmibs.a -lib/libnetsnmpmibs.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so -@unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true -lib/libnetsnmptrapd.a -lib/libnetsnmptrapd.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so -@unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/TrapReceiver.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix -sbin/snmpd -sbin/snmptrapd -%%PORTDOCS%%%%DOCSDIR%%/AGENT.txt -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.agentx -%%PORTDOCS%%%%DOCSDIR%%/README.krb5 -%%PORTDOCS%%%%DOCSDIR%%/README.snmpv3 -%%PORTDOCS%%%%DOCSDIR%%/README.thread -%%PORTDOCS%%%%DOCSDIR%%/README.smux -%%DATADIR%%/snmpd.conf.example -%%DATADIR%%/snmp_perl_trapd.pl -%%DATADIR%%/mib2c.access_functions.conf -%%DATADIR%%/mib2c.array-user.conf -%%DATADIR%%/mib2c.check_values.conf -%%DATADIR%%/mib2c.check_values_local.conf -%%DATADIR%%/mib2c.column_defines.conf -%%DATADIR%%/mib2c.column_enums.conf -%%DATADIR%%/mib2c.column_storage.conf -%%DATADIR%%/mib2c.conf -%%DATADIR%%/mib2c.create-dataset.conf -%%DATADIR%%/mib2c.genhtml.conf -%%DATADIR%%/mib2c.int_watch.conf -%%DATADIR%%/mib2c.iterate.conf -%%DATADIR%%/mib2c.iterate_access.conf -%%DATADIR%%/mib2c.mfd.conf -%%DATADIR%%/mib2c.notify.conf -%%DATADIR%%/mib2c.old-api.conf -%%DATADIR%%/mib2c.scalar.conf -%%DATADIR%%/mib2c-data/default-mfd-top.m2c -%%DATADIR%%/mib2c-data/details-enums.m2i -%%DATADIR%%/mib2c-data/details-node.m2i -%%DATADIR%%/mib2c-data/details-table.m2i -%%DATADIR%%/mib2c-data/generic-ctx-copy.m2i -%%DATADIR%%/mib2c-data/generic-ctx-get.m2i -%%DATADIR%%/mib2c-data/generic-ctx-set.m2i -%%DATADIR%%/mib2c-data/generic-data-allocate.m2i -%%DATADIR%%/mib2c-data/generic-data-context.m2i -%%DATADIR%%/mib2c-data/generic-get-char.m2i -%%DATADIR%%/mib2c-data/generic-get-decl-bot.m2i -%%DATADIR%%/mib2c-data/generic-get-decl.m2i -%%DATADIR%%/mib2c-data/generic-get-long.m2i -%%DATADIR%%/mib2c-data/generic-get-oid.m2i -%%DATADIR%%/mib2c-data/generic-header-bottom.m2i -%%DATADIR%%/mib2c-data/generic-header-top.m2i -%%DATADIR%%/mib2c-data/generic-source-includes.m2i -%%DATADIR%%/mib2c-data/generic-table-constants.m2c -%%DATADIR%%/mib2c-data/generic-table-enums.m2c -%%DATADIR%%/mib2c-data/generic-table-indexes-from-oid.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-set.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-to-oid.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-varbind-setup.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes.m2i -%%DATADIR%%/mib2c-data/generic-table-oids.m2c -%%DATADIR%%/mib2c-data/generic-value-map-func.m2i -%%DATADIR%%/mib2c-data/generic-value-map-reverse.m2i -%%DATADIR%%/mib2c-data/generic-value-map.m2i -%%DATADIR%%/mib2c-data/m2c-internal-warning.m2i -%%DATADIR%%/mib2c-data/m2c_setup_enum.m2i -%%DATADIR%%/mib2c-data/m2c_setup_node.m2i -%%DATADIR%%/mib2c-data/m2c_setup_table.m2i -%%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i -%%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i -%%DATADIR%%/mib2c-data/mfd-data-access.m2c -%%DATADIR%%/mib2c-data/mfd-data-get.m2c -%%DATADIR%%/mib2c-data/mfd-data-set.m2c -%%DATADIR%%/mib2c-data/mfd-doxygen.m2c -%%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c -%%DATADIR%%/mib2c-data/mfd-interface.m2c -%%DATADIR%%/mib2c-data/mfd-makefile.m2m -%%DATADIR%%/mib2c-data/mfd-readme.m2c -%%DATADIR%%/mib2c-data/mfd-top.m2c -%%DATADIR%%/mib2c-data/node-get.m2i -%%DATADIR%%/mib2c-data/node-set.m2i -%%DATADIR%%/mib2c-data/node-storage.m2i -%%DATADIR%%/mib2c-data/node-varbind-validate.m2i -%%DATADIR%%/mib2c-data/parent-dependencies.m2i -%%DATADIR%%/mib2c-data/parent-set.m2i -%%DATADIR%%/mib2c-data/subagent.m2c -%%DATADIR%%/mib2c-data/syntax-COUNTER64-get.m2i -%%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2d -%%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2i -%%DATADIR%%/mib2c-data/syntax-DateAndTime-readme.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddress-get.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddress-set.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddressType-get.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddressType-set.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-dependencies.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-get.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-varbind-validate.m2i -%%DATADIR%%/mib2c-data/syntax-StorageType-dependencies.m2i -%%DATADIR%%/mib2c-data/syntax-TestAndIncr-get.m2i -%%DATADIR%%/mibs/AGENTX-MIB.txt -%%WITH_EVENT-MIB%%%%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt -%%DATADIR%%/mibs/DISMAN-SCHEDULE-MIB.txt -%%DATADIR%%/mibs/DISMAN-SCRIPT-MIB.txt -%%DATADIR%%/mibs/EtherLike-MIB.txt -%%DATADIR%%/mibs/HCNUM-TC.txt -%%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt -%%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt -%%DATADIR%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -%%DATADIR%%/mibs/IANA-LANGUAGE-MIB.txt -%%DATADIR%%/mibs/IANAifType-MIB.txt -%%DATADIR%%/mibs/IF-INVERTED-STACK-MIB.txt -%%DATADIR%%/mibs/IF-MIB.txt -%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt -%%DATADIR%%/mibs/IP-FORWARD-MIB.txt -%%DATADIR%%/mibs/IP-MIB.txt -%%DATADIR%%/mibs/IPV6-ICMP-MIB.txt -%%DATADIR%%/mibs/IPV6-MIB.txt -%%DATADIR%%/mibs/IPV6-TC.txt -%%DATADIR%%/mibs/IPV6-TCP-MIB.txt -%%DATADIR%%/mibs/IPV6-UDP-MIB.txt -%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/MTA-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-EXAMPLES-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-EXTEND-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-TC.txt -%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt -%%DATADIR%%/mibs/NOTIFICATION-LOG-MIB.txt -%%DATADIR%%/mibs/RFC-1215.txt -%%DATADIR%%/mibs/RFC1155-SMI.txt -%%DATADIR%%/mibs/RFC1213-MIB.txt -%%DATADIR%%/mibs/RMON-MIB.txt -%%DATADIR%%/mibs/SMUX-MIB.txt -%%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt -%%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt -%%DATADIR%%/mibs/SNMP-MPD-MIB.txt -%%DATADIR%%/mibs/SNMP-NOTIFICATION-MIB.txt -%%DATADIR%%/mibs/SNMP-PROXY-MIB.txt -%%DATADIR%%/mibs/SNMP-TARGET-MIB.txt -%%DATADIR%%/mibs/SNMP-USER-BASED-SM-MIB.txt -%%DATADIR%%/mibs/SNMP-USM-AES-MIB.txt -%%DATADIR%%/mibs/SNMP-USM-DH-OBJECTS-MIB.txt -%%DATADIR%%/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -%%DATADIR%%/mibs/SNMPv2-CONF.txt -%%DATADIR%%/mibs/SNMPv2-MIB.txt -%%DATADIR%%/mibs/SNMPv2-SMI.txt -%%DATADIR%%/mibs/SNMPv2-TC.txt -%%DATADIR%%/mibs/SNMPv2-TM.txt -%%DATADIR%%/mibs/TCP-MIB.txt -%%DATADIR%%/mibs/TRANSPORT-ADDRESS-MIB.txt -%%DATADIR%%/mibs/UCD-DEMO-MIB.txt -%%DATADIR%%/mibs/UCD-DISKIO-MIB.txt -%%DATADIR%%/mibs/UCD-DLMOD-MIB.txt -%%DATADIR%%/mibs/UCD-IPFWACC-MIB.txt -%%DATADIR%%/mibs/UCD-SNMP-MIB.txt -%%DATADIR%%/mibs/UDP-MIB.txt -@unexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true -%%WITH_PERL%%%%DATADIR%%/snmp_perl.pl -%%DATADIR%%/snmpconf-data/snmp-data/authopts -%%DATADIR%%/snmpconf-data/snmp-data/debugging -%%DATADIR%%/snmpconf-data/snmp-data/mibs -%%DATADIR%%/snmpconf-data/snmp-data/output -%%DATADIR%%/snmpconf-data/snmp-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmpd-data/acl -%%DATADIR%%/snmpconf-data/snmpd-data/basic_setup -%%DATADIR%%/snmpconf-data/snmpd-data/extending -%%DATADIR%%/snmpconf-data/snmpd-data/monitor -%%DATADIR%%/snmpconf-data/snmpd-data/operation -%%DATADIR%%/snmpconf-data/snmpd-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmpd-data/system -%%DATADIR%%/snmpconf-data/snmpd-data/trapsinks -%%DATADIR%%/snmpconf-data/snmptrapd-data/authentication -%%DATADIR%%/snmpconf-data/snmptrapd-data/formatting -%%DATADIR%%/snmpconf-data/snmptrapd-data/logging -%%DATADIR%%/snmpconf-data/snmptrapd-data/runtime -%%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle -@dirrm %%DATADIR%%/mib2c-data/ -@dirrm %%DATADIR%%/snmpconf-data/snmptrapd-data -@dirrm %%DATADIR%%/snmpconf-data/snmpd-data -@dirrm %%DATADIR%%/snmpconf-data/snmp-data -@dirrm %%DATADIR%%/snmpconf-data -@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true -@dirrm include/net-snmp/system -@dirrm include/net-snmp/machine -@dirrm include/net-snmp/library -@dirrm include/net-snmp/agent -@dirrm include/net-snmp -@unexec rmdir %D/etc/snmp 2>/dev/null || true diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile deleted file mode 100644 index b019b0bab79b..000000000000 --- a/net-mgmt/nfdump-devel/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: nfdump -# Date created: 2004-09-29 -# Whom: Janos.Mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= nfdump -PORTVERSION= 1.1 -CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= janos.mohacsi@bsd.hu -COMMENT= Command-line tools to collect and process NetFlow data - -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl -MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1 -PORTDOCS= AUTHORS ChangeLog INSTALL README - -.if !defined(NOPORTDOCS) -post-install: - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/net-mgmt/nfdump-devel/distinfo b/net-mgmt/nfdump-devel/distinfo deleted file mode 100644 index 4a33651e3523..000000000000 --- a/net-mgmt/nfdump-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (nfdump-1.1.tar.gz) = b9085f91d64985e856e43200d2869a87 -SIZE (nfdump-1.1.tar.gz) = 92044 diff --git a/net-mgmt/nfdump-devel/files/patch-Makefile.in b/net-mgmt/nfdump-devel/files/patch-Makefile.in deleted file mode 100644 index 99117d595dc2..000000000000 --- a/net-mgmt/nfdump-devel/files/patch-Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Sep 22 09:23:10 2004 -+++ Makefile.in Wed Sep 29 16:31:23 2004 -@@ -47,7 +47,7 @@ - LFLAGS = -i - LDFLAGS = @LIBS@ - PREFIX = @prefix@ --MANDIR = @mandir@ -+MANDIR = @prefix@ - FSRC = grammar.c scanner.c nftree.c netflow_v5.c netflow_v7.c nfstat.c util.c - FOBJ = $(FSRC:.c=.o) - ASRC = $(FSRC) nfdump.c nftree_check.c nfreplay.c -@@ -82,20 +82,20 @@ - $(CC) $(CFLAGS) $(INCS) -o $@ nfreplay.o $(FOBJ) $(LDFLAGS) - - install: $(OBJECTS) -- test -d $(PREFIX) || install -d -o root -g root -m 755 $(PREFIX) -- test -d $(PREFIX)/bin || install -d -o root -g root -m 755 $(PREFIX)/bin -- test -d $(MANDIR)/man || install -d -o root -g root -m 755 $(MANDIR)/man -- test -d $(MANDIR)/man/man1 || install -d -o root -g root -m 755 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 755 nfcapd $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfdump $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfprofile $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfreplay $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfclean.pl $(PREFIX)/bin -+ test -d $(PREFIX) || install -d -o root -g wheel -m 755 $(PREFIX) -+ test -d $(PREFIX)/bin || install -d -o root -g wheel -m 755 $(PREFIX)/bin -+ test -d $(MANDIR)/man || install -d -o root -g wheel -m 755 $(MANDIR)/man -+ test -d $(MANDIR)/man/man1 || install -d -o root -g wheel -m 755 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 755 nfcapd $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfdump $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfprofile $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfreplay $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfclean.pl $(PREFIX)/bin - -- $(INSTALL) -o root -g root -m 644 nfcapd.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfdump.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfprofile.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfreplay.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfcapd.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfdump.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfprofile.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfreplay.1 $(MANDIR)/man/man1 - - uninstall: - /bin/rm -f $(PREFIX)/bin/nfcapd diff --git a/net-mgmt/nfdump-devel/pkg-descr b/net-mgmt/nfdump-devel/pkg-descr deleted file mode 100644 index 553f2ef06c74..000000000000 --- a/net-mgmt/nfdump-devel/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -NFDUMP tools support netflow v5 and v7 capturing and processing. - -nfcapd - netflow capture daemon. -Reads the netflow data from the network and stores the data into files. - -nfdump - netflow dump. -Reads the netflow data from the files stored by nfcapd. It's syntax is similar -to tcpdump. If you like tcpdump you will like nfdump. - -nfprofile - netflow profiler. -Reads the netflow data from the files stored by nfcapd. Filters the netflow -data according to the specified filter sets ( profiles ) and stores the -filtered data into files for later use. - -nfreplay - netflow replay -Reads the netflow data from the files stored by nfcapd and sends it over -the network to another host. - - -WWW: http://nfdump.sourceforge.net - -Janos Mohacsi <janos.mohacsi@bsd.hu> diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile deleted file mode 100644 index ea9eb3d67e3e..000000000000 --- a/net-mgmt/rancid-devel/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# New ports collection makefile for: rancid -# Date created: 3 June 2002 -# Whom: Janos.Mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= rancid -PORTVERSION= 2.3.1 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ - -MAINTAINER= janos.mohacsi@bsd.hu -COMMENT= Really Awesome New Cisco confIg Differ - -BUILD_DEPENDS= expect:${PORTSDIR}/lang/expect -RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \ - ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple - -USE_PERL5= yes -PKGMESSAGE= ${WRKDIR}/pkg-message -USE_GMAKE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= \ - --prefix=${PREFIX}/ \ - --localstatedir=${PREFIX}/var/${PORTNAME}/ \ - --bindir=${PREFIX}/libexec/${PORTNAME}/ \ - --sysconfdir=${PREFIX}/etc/${PORTNAME}/ - -MAN1= alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \ - cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \ - francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \ - jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \ - nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \ - rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \ - tntrancid.1 xrancid.1 zrancid.1 - -MAN5= lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5 - -OLDCONFIG_FILE1= bin/env -OLDCONFIG_FILE2= util/lg/lg.conf -NEWERCONFIG_FILES1= etc/rancid.conf -NEWERCONFIG_FILES2= etc/lg.conf -NEWCONFIG_FILES= rancid.conf lg.conf - -pre-everything:: - @ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs" - -post-install: - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${PREFIX}/bin - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${PREFIX}/bin - @ ${SED} -e "s:%%INSTDIR%%:${PREFIX}:g" pkg-message >${PKGMESSAGE} -.if !defined(BATCH) - @ ${ECHO} - @ ${CAT} ${PKGMESSAGE} - @ ${ECHO} -.endif -.for file in ${NEWCONFIG_FILES} - @ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \ - ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \ - ${ECHO} " : *** review ${file}.sample for new/deprecated switches or install in place ${file}"; \ - fi -.endfor - @ if [ -f ${PREFIX}/rancid/$NEWERCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/var/${PORTNAME}/ "; \ - ${ECHO} " : *** Copy the repository if you want to keep the history "; \ - fi - - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \ - ${ECHO} " : *** Copy the repository if you want to keep the history "; \ - fi - -.include <bsd.port.mk> diff --git a/net-mgmt/rancid-devel/distinfo b/net-mgmt/rancid-devel/distinfo deleted file mode 100644 index 4a489c7adcf0..000000000000 --- a/net-mgmt/rancid-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (rancid-2.3.1.tar.gz) = b188595e528515b4f87078f63936d355 -SIZE (rancid-2.3.1.tar.gz) = 276562 diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am deleted file mode 100644 index 67a61d8b98e0..000000000000 --- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- etc/Makefile.am.orig Tue Jan 13 19:02:00 2004 -+++ etc/Makefile.am Wed May 5 16:36:40 2004 -@@ -33,26 +33,8 @@ - endif - - install-data-local: all -- @if test "$(DO_CONF_INSTALL)" = "yes"; then \ -- 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; \ -- 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-mgmt/rancid-devel/files/patch-etc::Makefile.in b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in deleted file mode 100644 index f5c70a4d9d68..000000000000 --- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- etc/Makefile.in.orig Fri Feb 6 16:56:50 2004 -+++ etc/Makefile.in Wed May 5 16:40:00 2004 -@@ -347,26 +347,8 @@ - - - install-data-local: all -- @if test "$(DO_CONF_INSTALL)" = "yes"; then \ -- 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; \ -- 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-mgmt/rancid-devel/pkg-descr b/net-mgmt/rancid-devel/pkg-descr deleted file mode 100644 index 676fe9aae64c..000000000000 --- a/net-mgmt/rancid-devel/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-mgmt/rancid-devel/pkg-message b/net-mgmt/rancid-devel/pkg-message deleted file mode 100644 index 2c086cfd4f36..000000000000 --- a/net-mgmt/rancid-devel/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%%/libexec/rancid/{lg.cgi lgform.cgi}) to your cgi-bin. diff --git a/net-mgmt/rancid-devel/pkg-plist b/net-mgmt/rancid-devel/pkg-plist deleted file mode 100644 index 5566b9b79d16..000000000000 --- a/net-mgmt/rancid-devel/pkg-plist +++ /dev/null @@ -1,70 +0,0 @@ -@exec mkdir -p %D/var/rancid -@exec chmod 775 %D/var/rancid -@unexec rmdir %D/var 2>/dev/null || true -bin/rancid-cvs -bin/rancid-run -libexec/rancid/alogin -libexec/rancid/arancid -libexec/rancid/blogin -libexec/rancid/brancid -libexec/rancid/cat5rancid -libexec/rancid/clogin -libexec/rancid/control_rancid -libexec/rancid/cssrancid -libexec/rancid/elogin -libexec/rancid/erancid -libexec/rancid/f10rancid -libexec/rancid/flogin -libexec/rancid/fnrancid -libexec/rancid/francid -libexec/rancid/hlogin -libexec/rancid/hpuifilter -libexec/rancid/hrancid -libexec/rancid/htlogin -libexec/rancid/htrancid -libexec/rancid/jerancid -libexec/rancid/jlogin -libexec/rancid/jrancid -libexec/rancid/lg.cgi -libexec/rancid/lgform.cgi -libexec/rancid/mrancid -libexec/rancid/nlogin -libexec/rancid/nrancid -libexec/rancid/nslogin -libexec/rancid/nsrancid -libexec/rancid/par -libexec/rancid/prancid -libexec/rancid/rancid -libexec/rancid/rancid-cvs -libexec/rancid/rancid-fe -libexec/rancid/rancid-run -libexec/rancid/rivlogin -libexec/rancid/rivrancid -libexec/rancid/rrancid -libexec/rancid/tntlogin -libexec/rancid/tntrancid -libexec/rancid/xrancid -libexec/rancid/zrancid -etc/rancid/lg.conf.sample -etc/rancid/rancid.conf.sample -share/rancid/CHANGES -share/rancid/COPYING -share/rancid/FAQ -share/rancid/README -share/rancid/README.lg -share/rancid/README.misc -share/rancid/UPGRADING -share/rancid/cisco-load.exp -share/rancid/cisco-reload.exp -share/rancid/cloginrc.sample -share/rancid/downreport -share/rancid/getipacctg -share/rancid/index.html -share/rancid/lg.conf.sample -share/rancid/lgnotes.html -share/rancid/rancid.conf.sample -share/rancid/rtrfilter -@dirrm share/rancid -@dirrm var/rancid -@dirrm etc/rancid -@dirrm libexec/rancid diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile deleted file mode 100644 index c1f2db0f9284..000000000000 --- a/net-mgmt/smokeping/Makefile +++ /dev/null @@ -1,168 +0,0 @@ -# New ports collection makefile for: SmokePing -# Date created: Tue Feb 12 22:17:40 CET 2002 -# Whom: Lars Thegler <lars@thegler.dk> -# -# $FreeBSD$ -# - -PORTNAME= smokeping -PORTVERSION= 1.31 -PORTREVISION= 1 -CATEGORIES= net www -MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ - -MAINTAINER= lth@FreeBSD.org -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-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 \ - ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net - -OPTIONS= FPING "Support for fping probes" on -OPTIONS+= ECHOPING "Support for EchoPing probes" off -OPTIONS+= CURL "Support for Curl probes" off -OPTIONS+= LDAP "Support for LDAP probes" off -OPTIONS+= RADIUS "Support for Radius probes" off - -.include <bsd.port.pre.mk> - -.ifdef(WITH_FPING) -RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping -.endif - -.ifdef(WITH_ECHOPING) -RUN_DEPENDS+= ${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping -.endif - -.ifdef(WITH_CURL) -RUN_DEPENDS+= ${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl -.endif - -.ifdef(WITH_LDAP) -RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap -.endif - -.ifdef(WITH_RADIUS) -RUN_DEPENDS+= ${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius -.endif - -.if defined(WITH_LDAP) || defined(WITH_RADIUS) -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -NO_BUILD= yes -USE_REINPLACE= yes -USE_PERL5= yes - -MAN1= CiscoRTTMonDNS.pm.1 CiscoRTTMonEchoICMP.pm.1 CiscoRTTMonTcpConnect.pm.1 \ - Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \ - EchoPingHttp.pm.1 EchoPingHttps.pm.1 EchoPingIcp.pm.1 EchoPingSmtp.pm.1 \ - FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 RemoteFPing.pm.1 \ - Smokeping.pm.1 base.pm.1 basefork.pm.1 basevars.pm.1 smokeping.1 \ - smokeping.cgi.1 smokeping_config.1 smokeping_install.1 telnetIOSPing.pm.1 - -PKGMESSAGE= ${WRKDIR}/pkg-message -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - -USER= smokeping -GROUP= smokeping -WWW_USER= www -WWW_UID= 80 -WWW_GROUP= www -WWW_GID= 80 - -FILES_SUB= USER=${USER} GROUP=${GROUP} \ - WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \ - WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \ - PERL=${PERL} PREFIX=${PREFIX} - -DOC1= CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO -DOC2= CiscoRTTMonDNS.pm CiscoRTTMonEchoICMP.pm CiscoRTTMonTcpConnect.pm \ - Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \ - EchoPingHttp.pm EchoPingHttps.pm EchoPingIcp.pm EchoPingSmtp.pm \ - FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm RemoteFPing.pm Smokeping.pm \ - base.pm basefork.pm basevars.pm smokeping.cgi \ - smokeping smokeping_config smokeping_install telnetIOSPing.pm -ETC1= basepage.html config smokemail config-echoping - -# Things that shouldn't have been in the tarball in the first place -post-extract: - @${RM} ${WRKSRC}/lib/BER.pm - @${RM} ${WRKSRC}/lib/SNMP_*.pm - @${RM} ${WRKSRC}/lib/probes/patch - -post-patch: - @${FIND} ${WRKSRC} -name \*.orig -delete - -pre-configure: - @${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/bin/smokeping.dist \ - ${WRKSRC}/htdocs/smokeping.cgi.dist \ - ${WRKSRC}/etc/config.dist \ - ${WRKSRC}/lib/probes/*.pm - @${FIND} ${WRKSRC} -name \*.bak -delete - @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-install > ${PKGINSTALL} - @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL} - @${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping - @${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi - -# work around a bug in bsd.port.mk, see PR 63293 - remove when resolved -do-build: - @${DO_NADA} - -pre-su-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin -.if !defined(NOPORTDOCS) -.for FILE in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${PREFIX}/man/man1 -.endfor - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOC1} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor -.for FILE in ${DOC2} - @${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt ${DOCSDIR} -.endfor -.endif - @${MKDIR} ${PREFIX}/etc/smokeping -.for FILE in ${ETC1} - @${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping - @if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \ - ${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \ - fi -.endfor - @${MKDIR} ${PREFIX}/smokeping/htdocs - @${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${PREFIX}/smokeping/htdocs/smokeping.cgi - @${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/ - @${MKDIR} ${PREFIX}/var/smokeping - @${CHOWN} ${USER}:${GROUP} ${PREFIX}/var/smokeping - @${MKDIR} ${PREFIX}/smokeping/htdocs/img - @${CHOWN} ${WWW_USER}:${WWW_GROUP} ${PREFIX}/smokeping/htdocs/img - @if [ ! -f ${PREFIX}/etc/rc.d/smokeping.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/smokeping.sh startup file."; \ - ${INSTALL_SCRIPT} ${FILESDIR}/smokeping.sh ${PREFIX}/etc/rc.d/smokeping.sh; \ - fi - -post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} -.endif - -post-deinstall: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL - -.include <bsd.port.post.mk> diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo deleted file mode 100644 index 3213701cd8c1..000000000000 --- a/net-mgmt/smokeping/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (smokeping-1.31.tar.gz) = 1d175cdc39cdacaa7d81059501bdd725 -SIZE (smokeping-1.31.tar.gz) = 200712 diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist deleted file mode 100644 index f0fae8d5038c..000000000000 --- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist +++ /dev/null @@ -1,45 +0,0 @@ ---- bin/smokeping.dist.orig Sun Jan 18 15:48:21 2004 -+++ bin/smokeping.dist Sun Jan 18 15:52:40 2004 -@@ -1,14 +1,11 @@ --#!/usr/sepp/bin/perl -w -+#!%%PERL%% -w - # -*-perl-*- - --use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/lib); --use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/arch); --use lib qw(/usr/pack/rrdtool-1.0.40-ds/lib/perl/5.8.0); --use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 1.31; - --Smokeping::main("etc/config.dist"); -+Smokeping::main("%%PREFIX%%/etc/smokeping/config"); - - =head1 NAME - -@@ -86,22 +83,8 @@ - - =head1 SETUP - --When installing SmokePing, this file has to be adjusted to fit your --local system. Three paths have to be entered. -- --One pointing to your B<rrdtool> installation -- -- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); -- --One pointing to the place where you have installed the SmokePing libraries -- -- use lib qw(/home/oetiker/public_html/smokeping/lib); -- --The third path is the argument to the Smokeping::main command. It points to --the SmokePing configuration file. -- -- use Smokeping; -- Smokeping::main("/home/oetiker/.smokeping/config"); -+When installing SmokePing, this file has been adjusted to fit your -+local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT - diff --git a/net-mgmt/smokeping/files/patch-etc-config.dist b/net-mgmt/smokeping/files/patch-etc-config.dist deleted file mode 100644 index 56ab47555974..000000000000 --- a/net-mgmt/smokeping/files/patch-etc-config.dist +++ /dev/null @@ -1,40 +0,0 @@ ---- etc/config.dist.orig Sun Jan 18 15:55:11 2004 -+++ etc/config.dist Sun Jan 18 15:57:10 2004 -@@ -7,13 +7,13 @@ - owner = Joe Random - contact = joe@some.place.xyz - mailhost = smtp.mailhost.abc --sendmail = /usr/lib/sendmail --imgcache = /home/oetiker/public_html/.simg --imgurl = ../.simg --datadir = /home/oetiker/data/projects/AADJ-smokeping/dist/var --piddir = /home/oetiker/data/projects/AADJ-smokeping/dist/var -+sendmail = /usr/sbin/sendmail -+imgcache = %%PREFIX%%/smokeping/htdocs/img -+imgurl = /smokeimg -+datadir = %%PREFIX%%/var/smokeping -+piddir = %%PREFIX%%/var/smokeping - cgiurl = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi --smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist -+smokemail = %%PREFIX%%/etc/smokeping/smokemail - # specify this to get syslog logging - # syslogfacility = local0 - -@@ -63,7 +63,7 @@ - - *** Presentation *** - --template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist -+template = %%PREFIX%%/etc/smokeping/basepage.html - - + overview - -@@ -86,7 +86,7 @@ - - + FPing - --binary = /usr/sepp/bin/fping -+binary = %%PREFIX%%/sbin/fping - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist deleted file mode 100644 index c9fd03cc12fc..000000000000 --- a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist +++ /dev/null @@ -1,18 +0,0 @@ ---- htdocs/smokeping.cgi.dist.orig Sun Oct 5 16:20:06 2003 -+++ htdocs/smokeping.cgi.dist Sun Jan 11 18:03:19 2004 -@@ -1,12 +1,11 @@ --#!/usr/sepp/bin/speedy -w -+#!%%PREFIX%%/bin/speedy -w - # -*-perl-*- - --use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); --use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 1.31; - --Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); -+Smokeping::cgi("%%PREFIX%%/etc/smokeping/config"); - - - BEGIN { diff --git a/net-mgmt/smokeping/files/patch-lib-probes-Curl.pm b/net-mgmt/smokeping/files/patch-lib-probes-Curl.pm deleted file mode 100644 index 0dfe8a9f7e2d..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-Curl.pm +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/probes/Curl.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/Curl.pm Sun Jan 11 18:06:12 2004 -@@ -1,6 +1,6 @@ - package probes::Curl; - --my $DEFAULTBIN = "/usr/bin/curl"; -+my $DEFAULTBIN = "%%PREFIX%%/bin/curl"; - - =head1 NAME - -@@ -15,7 +15,7 @@ - *** Probes *** - + Curl - -- binary = /usr/bin/curl # default value -+ binary = %%PREFIX%%/bin/curl # default value - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPing.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPing.pm deleted file mode 100644 index bd90fa1f9950..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPing.pm +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/probes/EchoPing.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPing.pm Sun Jan 11 18:06:12 2004 -@@ -1,6 +1,6 @@ - package probes::EchoPing; - --my $DEFAULTBIN = "/usr/bin/echoping"; -+my $DEFAULTBIN = "%%PREFIX%%/bin/echoping"; - - =head1 NAME - -@@ -16,7 +16,7 @@ - *** Probes *** - + EchoPing - -- binary = /usr/bin/echoping # default value -+ binary = %%PREFIX%%/bin/echoping # default value - - *** Targets *** - -@@ -105,7 +105,7 @@ - - The location of the echoping binary should probably be a global variable - instead of a probe-specific one. As things are, every EchoPing -derived probe --has to declare it if the default (/usr/bin/echoping) isn't correct. -+has to declare it if the default (%%PREFIX%%/bin/echoping) isn't correct. - - =head1 AUTHOR - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingChargen.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingChargen.pm deleted file mode 100644 index 29305add431e..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingChargen.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/EchoPingChargen.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPingChargen.pm Sun Jan 11 18:06:12 2004 -@@ -13,7 +13,7 @@ - *** Probes *** - + EchoPingChargen - -- binary = /usr/bin/echoping -+ binary = %%PREFIX%%/bin/echoping - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingDiscard.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingDiscard.pm deleted file mode 100644 index fe12d1194750..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingDiscard.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/EchoPingDiscard.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPingDiscard.pm Sun Jan 11 18:06:12 2004 -@@ -13,7 +13,7 @@ - *** Probes *** - + EchoPingDiscard - -- binary = /usr/bin/echoping -+ binary = %%PREFIX%%/bin/echoping - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttp.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttp.pm deleted file mode 100644 index 43aa1a403214..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttp.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/EchoPingHttp.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPingHttp.pm Sun Jan 11 18:06:12 2004 -@@ -13,7 +13,7 @@ - *** Probes *** - + EchoPingHttp - -- binary = /usr/bin/echoping # mandatory -+ binary = %%PREFIX%%/bin/echoping # mandatory - - - *** Targets *** diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttps.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttps.pm deleted file mode 100644 index e8d7036cb5db..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttps.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/EchoPingHttps.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPingHttps.pm Sun Jan 11 18:06:12 2004 -@@ -14,7 +14,7 @@ - *** Probes *** - + EchoPingHttps - -- binary = /usr/bin/echoping # mandatory -+ binary = %%PREFIX%%/bin/echoping # mandatory - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingIcp.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingIcp.pm deleted file mode 100644 index 60d762c3452b..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingIcp.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/EchoPingIcp.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPingIcp.pm Sun Jan 11 18:06:12 2004 -@@ -14,7 +14,7 @@ - *** Probes *** - + EchoPingIcp - -- binary = /usr/bin/echoping # mandatory -+ binary = %%PREFIX%%/bin/echoping # mandatory - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingSmtp.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingSmtp.pm deleted file mode 100644 index bf4fa61ea529..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingSmtp.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/EchoPingSmtp.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/EchoPingSmtp.pm Sun Jan 11 18:06:12 2004 -@@ -13,7 +13,7 @@ - *** Probes *** - + EchoPingSmtp - -- binary = /usr/bin/echoping # mandatory -+ binary = %%PREFIX%%/bin/echoping # mandatory - - *** Targets *** - probe = EchoPingSmtp diff --git a/net-mgmt/smokeping/files/patch-lib-probes-IOSPing.pm b/net-mgmt/smokeping/files/patch-lib-probes-IOSPing.pm deleted file mode 100644 index 4868b7864d2c..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-IOSPing.pm +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/probes/IOSPing.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/IOSPing.pm Sun Jan 11 18:06:12 2004 -@@ -8,7 +8,7 @@ - - *** Probes *** - + IOSPing -- binary = /usr/bin/remsh -+ binary = %%PREFIX%%/bin/remsh - packetsize = 1024 - forks = 1 - -@@ -27,8 +27,8 @@ - The binary and ioshost options are mandatory. - - The binary option specifies the path of the binary to be used to --connect to the IOS device. Commonly used binaries are /usr/bin/rsh --and /usr/bin/remsh, although any script or binary should work if can -+connect to the IOS device. Commonly used binaries are %%PREFIX%%/bin/rsh -+and %%PREFIX%%/bin/remsh, although any script or binary should work if can - be called as - - /path/to/binary [ -l user ] router ping diff --git a/net-mgmt/smokeping/files/patch-lib-probes-LDAP.pm b/net-mgmt/smokeping/files/patch-lib-probes-LDAP.pm deleted file mode 100644 index d66dadf4c561..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-LDAP.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/LDAP.pm.orig Fri Feb 20 00:28:14 2004 -+++ lib/probes/LDAP.pm Fri Feb 20 00:28:44 2004 -@@ -13,7 +13,7 @@ - *** Probes *** - + LDAP - -- passwordfile = /usr/share/smokeping/etc/password # optional -+ passwordfile = %%PREFIX%%/etc/smokeping/password # optional - sleeptime = 0.5 # optional, 1 second by default - - *** Targets *** diff --git a/net-mgmt/smokeping/files/patch-lib-probes-Radius.pm b/net-mgmt/smokeping/files/patch-lib-probes-Radius.pm deleted file mode 100644 index 0e25c7ebe52a..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-Radius.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/Radius.pm.orig Fri Feb 20 00:29:00 2004 -+++ lib/probes/Radius.pm Fri Feb 20 00:29:21 2004 -@@ -13,7 +13,7 @@ - *** Probes *** - + Radius - -- passwordfile = /usr/share/smokeping/etc/password -+ passwordfile = %%PREFIX%%/etc/smokeping/password - secretfile = /etc/raddb/secret - sleeptime = 0.5 # optional, 1 second by default - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-RemoteFPing.pm b/net-mgmt/smokeping/files/patch-lib-probes-RemoteFPing.pm deleted file mode 100644 index b88f9a593335..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-RemoteFPing.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/RemoteFPing.pm.orig Sun Jan 11 18:06:12 2004 -+++ lib/probes/RemoteFPing.pm Sun Jan 11 18:06:12 2004 -@@ -8,7 +8,7 @@ - - *** Probes *** - + RemoteFPing -- binary = /usr/bin/ssh -+ binary = %%PREFIX%%/bin/ssh - packetsize = 1024 - forks = 1 - diff --git a/net-mgmt/smokeping/files/patch-lib-probes-passwordchecker.pm b/net-mgmt/smokeping/files/patch-lib-probes-passwordchecker.pm deleted file mode 100644 index 031a03089d9a..000000000000 --- a/net-mgmt/smokeping/files/patch-lib-probes-passwordchecker.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/probes/passwordchecker.pm.orig Fri Feb 20 00:29:34 2004 -+++ lib/probes/passwordchecker.pm Fri Feb 20 00:29:55 2004 -@@ -16,7 +16,7 @@ - *** Probes *** - + MyPasswordChecker - # location of the file containing usernames and passwords -- passwordfile = /usr/share/smokeping/etc/passwords -+ passwordfile = %%PREFIX%%/etc/smokeping/passwords - - The specified password file: - diff --git a/net-mgmt/smokeping/files/smokeping.sh b/net-mgmt/smokeping/files/smokeping.sh deleted file mode 100644 index e47e7470d6d2..000000000000 --- a/net-mgmt/smokeping/files/smokeping.sh +++ /dev/null @@ -1,29 +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) - [ -r ${PREFIX}/etc/smokeping/config ] && \ - su -f -m smokeping -c ${PREFIX}/bin/smokeping > /dev/null && \ - echo -n ' smokeping' - ;; -restart) - [ -r ${PREFIX}/etc/smokeping/config ] && \ - su -f -m smokeping -c "${PREFIX}/bin/smokeping --restart" > /dev/null && \ - echo -n ' smokeping' - ;; -stop) - [ -r ${PREFIX}/var/smokeping/smokeping.pid ] && \ - su -f -m smokeping -c "kill `cat ${PREFIX}/var/smokeping/smokeping.pid`" > /dev/null && \ - echo -n ' smokeping' - ;; -*) - echo "Usage: `basename $0` {start|restart|stop}" >&2 - ;; -esac - -exit 0 diff --git a/net-mgmt/smokeping/pkg-deinstall b/net-mgmt/smokeping/pkg-deinstall deleted file mode 100644 index e02852135496..000000000000 --- a/net-mgmt/smokeping/pkg-deinstall +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -echo 'Stopping Smokeping daemon.' -if [ -f ${PKG_PREFIX}/var/smokeping/smokeping.pid ]; then - if [ -x ${PKG_PREFIX}/etc/rc.d/smokeping.sh ]; then - ${PKG_PREFIX}/etc/rc.d/smokeping.sh stop > /dev/null - fi - rm ${PKG_PREFIX}/var/smokeping/smokeping.pid -fi - -case $2 in -POST-DEINSTALL) - - if [ ! -n "$BATCH" ]; then - - if [ -d ${PKG_PREFIX}/etc/smokeping -o -d ${PKG_PREFIX}/var/smokeping ]; then - echo '=================================================================' - echo - echo 'You seem to have some custom config and data.' - echo 'The "%%USER%%" user and "%%GROUP%%" group were therefore not deleted.' - echo - echo 'You may delete them with:' - echo - echo ' pw groupdel %%GROUP%%' - echo ' pw userdel %%USER%%' - echo - echo 'The config and data can be deleted with:' - echo - echo " rm -R ${PKG_PREFIX}/etc/smokeping" - echo " rm -R ${PKG_PREFIX}/var/smokeping" - echo - echo '=================================================================' - else - if pw groupdel -n %%GROUP%%; then - echo 'Removed group "%%GROUP%%".' - else - echo 'Removing group "%%GROUP%%" failed...' - exit 1 - fi - - if pw userdel -n %%USER%%; then - echo 'Removed user "%%USER%%".' - else - echo 'Removing user "%%USER%%" failed...' - exit 1 - fi - fi - fi - - exit 0 - ;; -esac diff --git a/net-mgmt/smokeping/pkg-descr b/net-mgmt/smokeping/pkg-descr deleted file mode 100644 index 0361624e771e..000000000000 --- a/net-mgmt/smokeping/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -SmokePing is a latency logging and graphing system. It consists of a -daemon process which organizes the latency measurements and a CGI -which presents the graphs. - -WWW: http://people.ee.ethz.ch/~oetiker/webtools/smokeping - ---lars -lars@thegler.dk diff --git a/net-mgmt/smokeping/pkg-install b/net-mgmt/smokeping/pkg-install deleted file mode 100644 index b0c96b325b67..000000000000 --- a/net-mgmt/smokeping/pkg-install +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# - -case $2 in -PRE-INSTALL) - if ! pw groupshow %%WWW_GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%WWW_GROUP%% -g %%WWW_GID%%; then - echo 'Added group "%%WWW_GROUP%%".' - else - echo 'Adding group "%%WWW_GROUP%%" failed...' - exit 1 - fi - fi - - if ! pw usershow %%WWW_USER%% 2>/dev/null 1>&2; then - if pw useradd %%WWW_USER%% -u %%WWW_UID%% -g %%WWW_GROUP%% -h - \ - -s /sbin/nologin -d /nonexistent \ - -c "World Wide Web Owner"; \ - then - echo 'Added user "%%WWW_USER%%".' - else - echo 'Adding user "%%WWW_USER%%" failed...' - exit 1 - fi - fi - - if ! pw groupshow %%GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%GROUP%%; then - echo 'Added group "%%GROUP%%".' - else - echo 'Adding group "%%GROUP%%" failed...' - exit 1 - fi - fi - - if ! pw usershow %%USER%% 2>/dev/null 1>&2; then - if pw useradd %%USER%% -g %%GROUP%% -h - \ - -s /nonexistent -c "SmokePing Daemon"; \ - then - echo 'Added user "%%USER%%".' - else - echo 'Adding user "%%USER%%" failed...' - exit 1 - fi - fi - - exit 0 - ;; -esac diff --git a/net-mgmt/smokeping/pkg-message b/net-mgmt/smokeping/pkg-message deleted file mode 100644 index ba60a0827b61..000000000000 --- a/net-mgmt/smokeping/pkg-message +++ /dev/null @@ -1,31 +0,0 @@ -================================================================= - -SmokePing has now been installed in %%PREFIX%%/smokeping/. - -NOTE: A set of sample configuration files have been installed: - - %%PREFIX%%/etc/smokeping/config - %%PREFIX%%/etc/smokeping/smokemail - %%PREFIX%%/etc/smokeping/basepage.html - %%PREFIX%%/etc/smokeping/config-echoping - -You *MUST* edit these to suit your requirements. Please refer to -%%PREFIX%%/share/doc/smokeping/smokeping_install.txt and -%%PREFIX%%/share/doc/smokeping/smokeping_config.txt for further -details on installation and configuration. - - -Once configured, you can start SmokePing data collection by running: - - %%PREFIX%%/etc/rc.d/smokeping.sh start - - -To enable Apache web access, add the following to your -%%PREFIX%%/etc/apache/httpd.conf: - - ScriptAlias /smokeping.cgi %%PREFIX%%/smokeping/htdocs/smokeping.cgi - Alias /smokeimg/ %%PREFIX%%/smokeping/htdocs/img/ - -Enjoy! - -================================================================= diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist deleted file mode 100644 index 836609111c19..000000000000 --- a/net-mgmt/smokeping/pkg-plist +++ /dev/null @@ -1,115 +0,0 @@ -bin/smokeping -etc/rc.d/smokeping.sh -@unexec if cmp -s %D/etc/smokeping/basepage.html %D/etc/smokeping/basepage.html.dist; then rm -f %D/etc/smokeping/basepage.html; fi -etc/smokeping/basepage.html.dist -@exec [ -f %B/basepage.html ] || cp %B/%f %B/basepage.html -@unexec if cmp -s %D/etc/smokeping/config %D/etc/smokeping/config.dist; then rm -f %D/etc/smokeping/config; fi -etc/smokeping/config.dist -@exec [ -f %B/config ] || cp %B/%f %B/config -@unexec if cmp -s %D/etc/smokeping/smokemail %D/etc/smokeping/smokemail.dist; then rm -f %D/etc/smokeping/smokemail; fi -etc/smokeping/smokemail.dist -@exec [ -f %B/smokemail ] || cp %B/%f %B/smokemail -@unexec if cmp -s %D/etc/smokeping/config-echoping %D/etc/smokeping/config-echoping.dist; then rm -f %D/etc/smokeping/config-echoping; fi -etc/smokeping/config-echoping.dist -@exec [ -f %B/config-echoping ] || cp %B/%f %B/config-echoping -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonDNS.pm.html -%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonDNS.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonEchoICMP.pm.html -%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonEchoICMP.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonTcpConnect.pm.html -%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonTcpConnect.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/Curl.pm.html -%%PORTDOCS%%%%DOCSDIR%%/Curl.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/DNS.pm.html -%%PORTDOCS%%%%DOCSDIR%%/DNS.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPing.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPing.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPingChargen.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPingChargen.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPingDiscard.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPingDiscard.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttp.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttp.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttps.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttps.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPingIcp.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPingIcp.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/EchoPingSmtp.pm.html -%%PORTDOCS%%%%DOCSDIR%%/EchoPingSmtp.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/FPing.pm.html -%%PORTDOCS%%%%DOCSDIR%%/FPing.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/FPing6.pm.html -%%PORTDOCS%%%%DOCSDIR%%/FPing6.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/IOSPing.pm.html -%%PORTDOCS%%%%DOCSDIR%%/IOSPing.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/ParseConfig.pm.html -%%PORTDOCS%%%%DOCSDIR%%/ParseConfig.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/RemoteFPing.pm.html -%%PORTDOCS%%%%DOCSDIR%%/RemoteFPing.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping.pm.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/base.pm.html -%%PORTDOCS%%%%DOCSDIR%%/base.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/basefork.pm.html -%%PORTDOCS%%%%DOCSDIR%%/basefork.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/basevars.pm.html -%%PORTDOCS%%%%DOCSDIR%%/basevars.pm.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.txt -%%PORTDOCS%%%%DOCSDIR%%/telnetIOSPing.pm.html -%%PORTDOCS%%%%DOCSDIR%%/telnetIOSPing.pm.txt -smokeping/htdocs/smokeping.cgi -smokeping/lib/ISG/ParseConfig.pm -smokeping/lib/Smokeping.pm -smokeping/lib/ciscoRttMonMIB.pm -smokeping/lib/probes/AnotherDNS.pm -smokeping/lib/probes/AnotherSSH.pm -smokeping/lib/probes/CiscoRTTMonDNS.pm -smokeping/lib/probes/CiscoRTTMonEchoICMP.pm -smokeping/lib/probes/CiscoRTTMonTcpConnect.pm -smokeping/lib/probes/Curl.pm -smokeping/lib/probes/DNS.pm -smokeping/lib/probes/EchoPing.pm -smokeping/lib/probes/EchoPingChargen.pm -smokeping/lib/probes/EchoPingDiscard.pm -smokeping/lib/probes/EchoPingHttp.pm -smokeping/lib/probes/EchoPingHttps.pm -smokeping/lib/probes/EchoPingIcp.pm -smokeping/lib/probes/EchoPingSmtp.pm -smokeping/lib/probes/FPing.pm -smokeping/lib/probes/FPing6.pm -smokeping/lib/probes/IOSPing.pm -smokeping/lib/probes/LDAP.pm -smokeping/lib/probes/Radius.pm -smokeping/lib/probes/RemoteFPing.pm -smokeping/lib/probes/SSH.pm -smokeping/lib/probes/base.pm -smokeping/lib/probes/basefork.pm -smokeping/lib/probes/basevars.pm -smokeping/lib/probes/passwordchecker.pm -smokeping/lib/probes/telnetIOSPing.pm -@unexec rmdir %D/etc/smokeping 2>/dev/null || true -@exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img -@unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true -@exec mkdir -p %D/var/smokeping -@exec chown smokeping:smokeping %D/var/smokeping -@unexec rmdir %D/var/smokeping 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true -@dirrm smokeping/htdocs -@dirrm smokeping/lib/probes -@dirrm smokeping/lib/ISG -@dirrm smokeping/lib -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/smokeping 2>/dev/null || true diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile deleted file mode 100644 index ab2a6bc70bf4..000000000000 --- a/net-mgmt/zabbix-agent/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix-agent -CATEGORIES= net - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring system (agent only) - -ZABBIX_AGENT_ONLY=yes -MASTERDIR= ${.CURDIR}/../../net-mgmt/zabbix - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile deleted file mode 100644 index ab2a6bc70bf4..000000000000 --- a/net-mgmt/zabbix2-agent/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix-agent -CATEGORIES= net - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring system (agent only) - -ZABBIX_AGENT_ONLY=yes -MASTERDIR= ${.CURDIR}/../../net-mgmt/zabbix - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile deleted file mode 100644 index 347cfd271cf5..000000000000 --- a/net-mgmt/zabbix2/Makefile +++ /dev/null @@ -1,126 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PORTVERSION= 1.0 -PORTREVISION= 2 -PORTEPOCH= 1 -CATEGORIES?= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring system - -.ifndef(ZABBIX_AGENT_ONLY) -OPTIONS= PGSQL "Use a PostgreSQL backend" off \ - MYSQL "Use a MySQL backend" on \ - FPING "Use fping for pinging hosts" on -.endif - -.ifdef(ZABBIX_AGENT_ONLY) -PKGNAMESUFFIX= -agent -PLIST= ${MASTERDIR}/pkg-plist.agent -PKGMESSAGE= nonexistent -.else # ZABBIX_AGENT_ONLY -LIB_DEPENDS= netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp -USE_PHP= gd snmp sockets -.endif # ZABBIX_AGENT_ONLY - -.include <bsd.port.pre.mk> - -.ifndef(WITHOUT_FPING) -RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping -.endif - -.ifndef(ZABBIX_AGENT_ONLY) -.ifndef(WITH_PGSQL) -.ifdef(WITHOUT_MYSQL) -IGNORE= You should configure to use either a MySQL or PostgreSQL backend -.endif -.endif - -.ifdef(WITH_PGSQL) -CONFIGURE_ARGS+=--with-pgsql -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 -.endif -.ifndef(WITHOUT_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS= --with-mysql -.endif -CONFIGURE_ARGS+=--with-net-snmp -.endif # ZABBIX_AGENT_ONLY - -PKGMESSAGE= ${WRKDIR}/pkg-message - -USE_REINPLACE= yes -USE_RC_SUBR= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include - -ZABBIX_BINARIES= zabbix_agent zabbix_agentd zabbix_sender -ZABBIX_CONFIGS= zabbix_agent.conf zabbix_agentd.conf -.ifndef(ZABBIX_AGENT_ONLY) -ZABBIX_BINARIES+= zabbix_suckerd zabbix_trapper zabbix_trapperd -ZABBIX_CONFIGS+= zabbix_suckerd.conf zabbix_trapper.conf zabbix_trapperd.conf -.endif - -SCRIPT_REGEX= -e 's|%PREFIX%|${PREFIX}|g' -e 's|%LOCALBASE%|${LOCALBASE}|g' - -pre-patch: -.if !defined(ZABBIX_AGENT_ONLY) - @${SED} ${SCRIPT_REGEX} ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix.sh.sample > \ - ${WRKDIR}/zabbix.sh.sample -.endif - @${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \ - ${WRKDIR}/zabbix-agent.sh.sample - -.ifndef(ZABBIX_AGENT_ONLY) -post-patch: - @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c -.ifdef WITHOUT_FPING - @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf -.endif -.endif # ZABBIX_AGENT_ONLY - -.if ${ARCH} == "amd64" -post-configure: - ${ECHO_CMD} "#define HAVE_VA_COPY 1" >> ${WRKSRC}/include/config.h -.endif - -do-install: -.for FILE in ${ZABBIX_BINARIES} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/etc/zabbix - ${LN} -sf ${PREFIX}/etc/zabbix /etc/zabbix -.for FILE in ${ZABBIX_CONFIGS} - ${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \ - ${PREFIX}/etc/zabbix/${FILE}.sample -.endfor -.ifndef(ZABBIX_AGENT_ONLY) - ${MKDIR} ${PREFIX}/share/zabbix - ${MKDIR} ${PREFIX}/share/zabbix/create - ${INSTALL_DATA} ${MASTERDIR}/scripts/dbsetup.sh \ - ${PREFIX}/share/zabbix/create - ${CP} -Rf ${WRKSRC}/frontends/* ${PREFIX}/share/zabbix - ${CP} -Rf ${WRKSRC}/create/* ${PREFIX}/share/zabbix/create - ${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix - ${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \ - ${PREFIX}/share/zabbix/create - ${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix.sh.sample \ - ${PREFIX}/etc/rc.d -.endif - ${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix-agent.sh.sample \ - ${PREFIX}/etc/rc.d - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.ifndef(ZABBIX_AGENT_ONLY) - @${CAT} ${PKGMESSAGE} -.endif - -.include <bsd.port.post.mk> diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo deleted file mode 100644 index 7134e9c4f47a..000000000000 --- a/net-mgmt/zabbix2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (zabbix-1.0.tar.gz) = e83a3b92f13942081ed2f3fe3f3084d8 -SIZE (zabbix-1.0.tar.gz) = 1847471 diff --git a/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-Makefile.in b/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-Makefile.in deleted file mode 100644 index d72d0587df50..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/files/patch-src-zabbix_sucker-zabbix_sucker.c b/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-zabbix_sucker.c deleted file mode 100644 index 1b8ca44f8aac..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/pkg-descr b/net-mgmt/zabbix2/pkg-descr deleted file mode 100644 index a85383fa4768..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/pkg-install b/net-mgmt/zabbix2/pkg-install deleted file mode 100644 index bd120120918d..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/pkg-message b/net-mgmt/zabbix2/pkg-message deleted file mode 100644 index 13c338ed4d4d..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/pkg-plist b/net-mgmt/zabbix2/pkg-plist deleted file mode 100644 index e197b32ccfe6..000000000000 --- a/net-mgmt/zabbix2/pkg-plist +++ /dev/null @@ -1,201 +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/UPS.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/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 -%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/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/1.0beta13_to_1.0beta14/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14 -@dirrm %%DATADIR%%/dbpatches -@dirrm %%DATADIR%% -@exec ln -sf %D/etc/zabbix /etc/zabbix -@unexec rm /etc/zabbix diff --git a/net-mgmt/zabbix2/pkg-plist.agent b/net-mgmt/zabbix2/pkg-plist.agent deleted file mode 100644 index 2e5a1980939c..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/scripts/dbsetup.sh b/net-mgmt/zabbix2/scripts/dbsetup.sh deleted file mode 100644 index 240f46157640..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/scripts/zabbix-agent.sh.sample b/net-mgmt/zabbix2/scripts/zabbix-agent.sh.sample deleted file mode 100644 index 1001c6cb694f..000000000000 --- a/net-mgmt/zabbix2/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-mgmt/zabbix2/scripts/zabbix.sh.sample b/net-mgmt/zabbix2/scripts/zabbix.sh.sample deleted file mode 100644 index 01a0fbce27ef..000000000000 --- a/net-mgmt/zabbix2/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" |