Index: head/net-mgmt/pandorafms_agent/Makefile =================================================================== --- head/net-mgmt/pandorafms_agent/Makefile (revision 393245) +++ head/net-mgmt/pandorafms_agent/Makefile (revision 393246) @@ -1,50 +1,51 @@ # Created by: KIKUCHI Koichiro # $FreeBSD$ PORTNAME= pandora_agent CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp COMMENT= Pandora FMS agent, Perl version LICENSE= ${PANDORA_LICENSE} LICENSE_FILE= ${PANDORA_LICENSE_FILE} OPTIONS_DEFINE= DOCS TENTACLE_SERVER OPTIONS_DEFAULT= DOCS TENTACLE_SERVER TENTACLE_SERVER_DESC= Install tentalce_server -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= plugins/pandora_netusage SUB_FILES= pkg-message .include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk" PORTDOCS+= README PANDORA_INSTALLER_ARGS+= --fakeroot .include .if ${PORT_OPTIONS:MTENTACLE_SERVER} CONFLICTS= pandora_server-[45]* PLIST_SUB+= TENTACLE_SERVER="" .else PLIST_SUB+= TENTACLE_SERVER="@comment " PANDORA_INSTALLER_ARGS+= --no-tentacle-server .endif PANDORA_INSTALLER_ARGS+= ${STAGEDIR} root ${PERL} post-patch: @${REINPLACE_CMD} -e '\|PREFIX=|s|=[^;]*|=${PREFIX}|' ${WRKSRC}/pandora_agent_installer post-install: @${RM} -f ${STAGEDIR}${LOGDIR}/pandora_agent.log @${RM} -f ${STAGEDIR}${DATADIR}/collections/.empty @${MKDIR} ${STAGEDIR}${DOCSDIR} .for x in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor @${MV} ${STAGEDIR}${ETCDIR}/pandora_agent.conf ${STAGEDIR}${ETCDIR}/pandora_agent.conf.sample .include Index: head/net-mgmt/pandorafms_console/Makefile =================================================================== --- head/net-mgmt/pandorafms_console/Makefile (revision 393245) +++ head/net-mgmt/pandorafms_console/Makefile (revision 393246) @@ -1,67 +1,77 @@ # Created by: KIKUCHI Koichiro # $FreeBSD$ PORTNAME= pandora_console CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp COMMENT= Pandora FMS console LICENSE= ${PANDORA_LICENSE} LICENSE_FILE= ${PANDORA_LICENSE_FILE} RUN_DEPENDS= ${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz +USES= shebangfix +SHEBANG_FILES= include/languages/util-all \ + include/languages/util-bzr-update \ + include/languages/util-compile-mo \ + include/languages/util-create-po \ + include/languages/util-create-template \ + include/languages/util-generate-tarball \ + include/languages/util-update-po \ + pandora_console_upgrade + OPTIONS_DEFINE= DOCS PGSQL DOCS_DESC= Install AUTHORS and ChangeLog PGSQL_DESC= Use PostgreSQL backend (experimental) USE_PHP= curl gd gettext json ldap mbstring mysql snmp session \ xml zip zlib WANT_PHP_WEB= yes USE_APACHE_RUN= 22+ SUB_FILES+= pandora_console.conf pkg-message .include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk" PANDORA_INSTALLER_ARGS+= --destdir ${STAGEDIR} .include .if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql .endif post-patch: @${REINPLACE_CMD} \ -e "\|PANDORA_HOME=|s|=[^;]*|=${WWWDIR}|g" \ ${WRKSRC}/pandora_console_install @${REINPLACE_CMD} \ -e "s|/usr/bin|${LOCALBASE}/bin|g" \ ${WRKSRC}/pandoradb.data*.sql @${REINPLACE_CMD} \ -e 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/extras/check_other_languages.sh \ ${WRKSRC}/include/languages/extract_newlines.sh post-install: @cd ${STAGEDIR}${WWWDIR} \ && ${RM} -rf pandora_console_install* *.spec \ extras/check_other_languages.sh.bak \ include/languages/extract_newlines.sh.bak \ *.sql.bak COPYING ${PORTDOCS} DEBIAN/ \ attachment/collections/.empty attachment/downloads/.gitignore @cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install.done .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for x in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor .endif @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes ${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \ ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/pandora_console.conf.sample @${LN} -sf ${_LICENSE_DIR}/${LICENSE} ${STAGEDIR}${WWWDIR}/COPYING .include Index: head/net-mgmt/pandorafms_server/Makefile =================================================================== --- head/net-mgmt/pandorafms_server/Makefile (revision 393245) +++ head/net-mgmt/pandorafms_server/Makefile (revision 393246) @@ -1,107 +1,128 @@ # Created by: KIKUCHI Koichiro # $FreeBSD$ PORTNAME= pandora_server CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp COMMENT= Pandora FMS server LICENSE= ${PANDORA_LICENSE} LICENSE_FILE= ${PANDORA_LICENSE_FILE} PANDORA_DEPS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \ p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \ p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \ p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \ p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \ p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \ p5-JSON>=0:${PORTSDIR}/converters/p5-JSON BUILD_DEPENDS= ${PANDORA_DEPS} RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-DBD-mysql>=4:${PORTSDIR}/databases/p5-DBD-mysql \ ${LOCALBASE}/bin/wmic:${PORTSDIR}/net-mgmt/wmi-client \ ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \ p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \ p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \ ${PANDORA_DEPS} OPTIONS_DEFINE= DOCS TENTACLE XPROBE PGSQL ORACLE EXTRAS OPTIONS_DEFAULT= DOCS TENTACLE XPROBE EXTRAS DOCS_DESC= Install AUTHORS, ChangeLog and README TENTACLE_DESC= Install tentacle_server XPROBE_DESC= Install xprobe PGSQL_DESC= Use PostgreSQL backend (experimental) ORACLE_DESC= Use Oracle backend (experimental) EXTRAS_DESC= Extra dependencies for util scripts -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= FreeBSD/pandora_server \ + bin/pandora_server \ + util/integrity_check \ + util/pandora_backup.sh \ + util/pandora_count.sh \ + util/pandora_diagnostic.sh \ + util/pandora_remote_agent.sh \ + util/pandora_server \ + util/pandora_watchdog.sh \ + util/plugin/babel_plugin/babel_plugin.sh \ + util/plugin/create_integria_incident.sh \ + util/plugin/dns_plugin.sh \ + util/plugin/integria_plugin/integria_plugin.sh \ + util/plugin/mysql_plugin.sh \ + util/plugin/packet_loss.sh \ + util/plugin/ssh_pandoraplugin.sh \ + util/plugin/udp_nmap_plugin.sh \ + util/plugin/webcheck_plugin.sh \ + util/snmptrap_gen.sh \ + util/tentacle_serverd \ + util/trap_rate.sh USE_PERL5= build run SUB_LIST+= PERL="${PERL}" DATADIR="${DATADIR}" SUB_FILES= pkg-message .include "${.CURDIR}/bsd.pandora.mk" PORTDOCS+= README PANDORA_INSTALLER_ARGS+= --destdir ${STAGEDIR} .include .if ! ${PORT_OPTIONS:MTENTACLE} PLIST_SUB+= TENTACLE="@comment " PANDORA_INSTALLER_ARGS+=--no-tentacle .else PLIST_SUB+= TENTACLE="" #USE_RC_SUBR+= tentacle_server .endif .if ${PORT_OPTIONS:MXPROBE} RUN_DEPENDS+= ${LOCALBASE}/bin/xprobe2:${PORTSDIR}/net/xprobe .endif .if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg .endif .if ${PORT_OPTIONS:MORACLE} RUN_DEPENDS+= p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle .endif .if ${PORT_OPTIONS:MEXTRAS} # plugin/bgp_pluin.pl RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP # plugin/multicast.pl RUN_DEPENDS+= p5-IO-Socket-Multicast>=0:${PORTSDIR}/net/p5-IO-Socket-Multicast # plugin/openvpn_pandoraplugin.pl RUN_DEPENDS+= p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet # plugin/integria_plugin/integria_plugin.sh, plugin/webcheck_plugin.sh, # plugin/babel_plugin/babel_plugin.sh, plugin/create_integria_incident.sh RUN_DEPENDS+= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget # plugin/ipmi-plugin.pl, recon_scripts/ipmi-recon.pl RUN_DEPENDS+= ${LOCALBASE}/sbin/ipmi-sensors:${PORTSDIR}/sysutils/freeipmi .endif post-patch: @${REINPLACE_CMD} \ -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%DATADIR%%|${DATADIR}|g' \ -e 's|%%MAN1PREFIX%%|${MAN1PREFIX}|g' \ -e 's|%%PANDORA_ETCDIR%%|${PANDORA_ETCDIR}|g' \ -e 's|%%PANDORA_LOGDIR%%|${PANDORA_LOGDIR}|g' \ -e 's|%%PANDORA_SPOOLDIR%%|${PANDORA_SPOOLDIR}|g' \ ${WRKSRC}/pandora_server_installer @${REINPLACE_CMD} -i "" \ -e 's,/usr/bin/perl,${PERL},g' \ `${GREP} -rl /usr/bin/perl ${WRKSRC} | ${GREP} -v pandora_server_installer` post-install: @${FIND} ${STAGEDIR}${DATADIR} -type l -name PandoraFMS -delete .for x in pandora_server tentacle_server @cd ${STAGEDIR}${PREFIX}/etc/rc.d && test -f ${x} \ && ${REINPLACE_CMD} -i "" -e 's|/usr/local|${PREFIX}|g' ${x} .endfor @${MV} ${STAGEDIR}${ETCDIR}/pandora_server.conf ${STAGEDIR}${ETCDIR}/pandora_server.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} .for x in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/net-mgmt/pandorafms_server/bsd.pandora.mk =================================================================== --- head/net-mgmt/pandorafms_server/bsd.pandora.mk (revision 393245) +++ head/net-mgmt/pandorafms_server/bsd.pandora.mk (revision 393246) @@ -1,72 +1,73 @@ # $FreeBSD$ PANDORA_VERSION= 5.1SP2 PANDORA_LICENSE= GPLv2 PANDORA_LICENSE_FILE= ${WRKSRC}/COPYING PANDORA_SPOOLDIR?= /var/spool/pandora PANDORA_LOGDIR?= /var/log/pandora PANDORA_ETCDIR?= ${PREFIX}/etc/pandora PANDORA_HOMEDIR?= ${PANDORA_ETCDIR}/home PANDORA_INSTALLER= ${PORTNAME}_installer PANDORA_INSTALLER_ARGS= --install PORTVERSION= ${PANDORA_VERSION:C/SP/./} +PORTREVISION= 1 MASTER_SITES?= SF/pandora/Pandora%20FMS%20${PANDORA_VERSION:C/(SP[0-9]*)/\/\1/}Final/Tarball .if ${PORTNAME} == "pandora_agent" DISTNAME= pandorafms_agent_unix-${PANDORA_VERSION} .else DISTNAME= ${PORTNAME:S/pandora_/pandorafms_/}-${PANDORA_VERSION} .endif DIST_SUBDIR= pandora NO_BUILD= yes NO_ARCH= yes USERS= pandora GROUPS= pandora ETCDIR?= ${PANDORA_ETCDIR} SPOOLDIR?= ${PANDORA_SPOOLDIR} LOGDIR?= ${PANDORA_LOGDIR} HOMEDIR?= ${PANDORA_HOMEDIR} PLIST_SUB+= SPOOLDIR="${PANDORA_SPOOLDIR}" LOGDIR="${PANDORA_LOGDIR}" \ USE_SPOOL_IN=${USE_SPOOL_IN} USE_SPOOL_OUT=${USE_SPOOL_OUT} \ USE_LOGDIR=${USE_LOGDIR} SUB_LIST+= PANDORA_VERSION="${PANDORA_VERSION}" PLIST= ${WRKDIR}/PLIST PORTDOCS?= AUTHORS .if ${PORTNAME} == "pandora_server" USE_LOGDIR= "" USE_SPOOL_IN= "" USE_SPOOL_OUT= "@comment " .elif ${PORTNAME} == "pandora_console" USE_LOGDIR= "@comment " USE_SPOOL_IN= "" USE_SPOOL_OUT= "@comment " PANDORA_INSTALLER= pandora_console_install .elif ${PORTNAME} == "pandora_agent" USE_LOGDIR= "" USE_SPOOL_IN= "@comment " USE_SPOOL_OUT= "" .endif .if ${PORTNAME} == "pandora_agent" post-extract: @${MV} ${WRKDIR}/unix ${WRKSRC} .else post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} .endif pre-install: @${CAT} ${PKGDIR}/../pandorafms_server/pkg-plist.spool > ${PLIST} @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} do-install: @cd ${WRKSRC} && ${SH} ${PANDORA_INSTALLER} ${PANDORA_INSTALLER_ARGS}