Index: head/GIDs =================================================================== --- head/GIDs (revision 250269) +++ head/GIDs (revision 250270) @@ -1,155 +1,156 @@ # $FreeBSD$ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: rdfdb:*:55: spamd:*:58: cyrus:*:60: proxy:*:62: authpf:*:63: uucp:*:66: xten:*:67: dialer:*:68: network:*:69: pgsql:*:70: ircd:*:72: simscan:*:74: hybserv:*:76: audit:*:77: virtuoso:*:79: www:*:80: qnofiles:*:81: qmail:*:82: mysql:*:88: vchkpw:*:89: firebird:*:90: mailman:*:91: gdm:*:92: jabber:*:93: p4admin:*:94: interch:*:95: squeuer:*:96: mud:*:97: msql:*:98: rscsi:*:99: squid:*:100: quagga:*:101: ganglia:*:102: sgeadmin:*:103: slimserv:*:104: dnetc:*:105: clamav:*:106: cacti:*:107: webkit:*:108: quickml:*:109: vscan:*:110: fido:*:111: dcc:*:112: amavis:*:113: dhis:*:114: _symon:*:115: smokeping:*:117: ircproxyd:*:118: mythtv:*:119: pdns:*:120: otrs:*:121: zabbix:*:122: _ntp:*:123: fetchmail:*:124: postfix:*:125: maildrop:*:126: nav:*:127: vchat:*:128: vlock:*:129: _bgpd:*:130: _ospfd:*:131: _spamd:*:132: freeradius:*:133: undernet:*:134: rabbitmq:*:135: dhcpd:*:136: mpd:*:137: wolfpack:*:138: ladvd:*:142: dovecot:*:143: rbldns:*:153: sfs:*:171: agk:*:172: polipo:*:173: flowtools:*:174: rt:*:180: nagios:*:181: noc:*:182: moinmoin:*:192: cups:*:193: sympa:*:200: dspam:*:202: git:*:211: bs:*:220: postgrey:*:225: aprsd:*:240: tnc:*:241: prosody:*:242: fcron:*:247: _tor:*:256: meta1s:*:260: meta1q:*:261: meta1c:*:262: meta1m:*:263: meta1:*:264: haclient:*:275: frontbase:*:276: mrtg:*:279: hobbit:*:280: prelude:*:281: _sphinx:*:312: dkfilter:*:325: wildfire:*:340: stunnel:*:341: openfire:*:342: _iodined:*:353: httptunnel:*:361: ldap:*:389: tiarra:*:398: drweb:*:426: callweaver:*:444: courier:*:465: _bbstored:*:505: nullmail:*:522: dkimproxy:*:525: pgbouncer:*:534: redis:*:535: ejabberd:*:543: qtss:*:554: ircdru:*:555: messagebus:*:556: pulse-rt:*:557: avahi:*:558: tacacs:*:559: haldaemon:*:560: distcc:*:561: polkit:*:562: pulse:*:563: pulse-access:*:564: _xsi:*:600: bnetd:*:700: bopm:*:717: openxpki:*:777: puppet:*:814: openacs:*:820: dotlrn:*:821: netdisco:*:840: +munin:*:842: fossy:*:901:www bacula:*:910: iserv:*:911: _relayd:*:913: bitlbee:*:914: logcheck:*:915: ssmtp:*:916: prayer:*:917: nefu:*:918: couchdb:*:919: vboxusers:*:920: transmission:*:921: mongodb:*:922: liquidsoap:*:923: Property changes on: head/GIDs ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.87 \ No newline at end of property +1.88 \ No newline at end of property Index: head/UIDs =================================================================== --- head/UIDs (revision 250269) +++ head/UIDs (revision 250270) @@ -1,165 +1,166 @@ # $FreeBSD$ # Please keep this file sorted by UID! smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin majordom:*:54:54::0:0:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent rdfdb:*:55:55::0:0:rdfDB Daemon:/var/db/rdfdb:/bin/sh spamd:*:58:58::0:0:SpamAssassin user:/var/spool/spamd:/usr/sbin/nologin unbound:*:59:1::0:0:unbound dns resolver:/nonexistent:/usr/sbin/nologin cyrus:*:60:60::0:0:the cyrus mail server:/nonexistent:/nonexistent gnats:*:61:1::0:0:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/nonexistent uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/nonexistent pop:*:68:6::0:0:Post Office Owner (popper):/nonexistent:/usr/sbin/nologin wnn:*:69:7::0:0:Wnn:/nonexistent:/nonexistent pgsql:*:70:70::0:0:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh oracle:*:71:71::0:0:Oracle:/usr/local/oracle7:/usr/sbin/nologin ircd:*:72:72::0:0:IRC daemon:/nonexistent:/nonexistent ircservices:*:73:73::0:0:IRC services:/nonexistent:/nonexistent simscan:*:74:74::0:0:Simscan User:/nonexistent:/usr/sbin/nologin ifmail:*:75:66::0:0:Ifmail user:/nonexistent:/nonexistent hybserv:*:76:76::0:0:HybServ Daemon:/nonexistent:/usr/sbin/nologin virtuoso:*:79:79::0:0:Virtuoso Universal Server:/usr/local/virtuoso:/bin/sh www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin alias:*:81:81::0:0:QMail user:/var/qmail/alias:/nonexistent qmaild:*:82:81::0:0:QMail user:/var/qmail:/nonexistent qmaill:*:83:81::0:0:QMail user:/var/qmail:/nonexistent qmailp:*:84:81::0:0:QMail user:/var/qmail:/nonexistent qmailq:*:85:82::0:0:QMail user:/var/qmail:/nonexistent qmailr:*:86:82::0:0:QMail user:/var/qmail:/nonexistent qmails:*:87:82::0:0:QMail user:/var/qmail:/nonexistent mysql:*:88:88::0:0:MySQL Daemon:/var/db/mysql:/usr/sbin/nologin vpopmail:*:89:89::0:0:VPop Mail User:/usr/local/vpopmail:/nonexistent firebird:*:90:90::0:0:Firebird Database Administrator:/var/db/firebird:/bin/sh mailman:*:91:91::0:0:Mailman User:/usr/local/mailman:/usr/sbin/nologin gdm:*:92:92::0:0:GNOME Display Manager:/usr/local/etc/gdm/home:/usr/sbin/nologin jabber:*:93:93::0:0:Jabber Daemon:/nonexistent:/nonexistent p4admin:*:94:94::0:0:Perforce admin:/usr/local/perforce:/usr/sbin/nologin interch:*:95:95::0:0:Interchange user:/usr/local/interchange:/usr/sbin/nologin squeuer:*:96:96::0:0:SQueuer Owner:/nonexistent:/bin/sh mud:*:97:97::0:0:MUD Owner:/nonexistent:/bin/sh msql:*:98:98::0:0:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi squid:*:100:100::0:0:squid caching-proxy pseudo user:/usr/local/squid:/usr/sbin/nologin quagga:*:101:101::0:0:Quagga route daemon pseudo user:/usr/local/etc/quagga:/usr/sbin/nologin ganglia:*:102:102::0:0:Ganglia User:/nonexistent:/usr/sbin/nologin sgeadmin:*:103:103::0:0:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin slimserv:*:104:104::0:0:Slim Devices SlimServer pseudo-user:/nonexistent:/usr/sbin/nologin dnetc:*:105:105::0:0:distributed.net client and proxy pseudo-user:/nonexistent:/usr/sbin/nologin clamav:*:106:106::0:0:Clamav Antivirus:/nonexistent:/usr/sbin/nologin cacti:*:107:107::0:0:Cacti Sandbox:/nonexistent:/usr/sbin/nologin webkit:*:108:108::0:0:WebKit Default User:/usr/local/www/webkit:/bin/sh quickml:*:109:109::0:0:quickml Server:/nonexistent:/usr/sbin/nologin vscan:*:110:110::0:0:Scanning Virus Account:/var/amavis:/bin/sh fido:*:111:111::0:0:Fido System:/usr/local/fido:/bin/sh dcc:*:112:112::0:0:Distributed Checksum Clearinghouse:/nonexistent:/usr/sbin/nologin amavis:*:113:113::0:0:Amavis-stats Account:/nonexistent:/usr/sbin/nologin dhis:*:114:114::0:0:DHIS Daemon:/nonexistent:/usr/sbin/nologin _symon:*:115:115::0:0:Symon Account:/var/empty:/usr/sbin/nologin hplip:*:116:116::0:0:HPLIP Server:/nonexistent:/usr/sbin/nologin smokeping:*:117:117::0:0:SmokePing Daemon:/nonexistent:/usr/sbin/nologin ircproxyd:*:118:118::0:0:Night Light IRC Proxy:/nonexistent:/usr/sbin/nologin mythtv:*:119:119::0:0:MythTV pseudo-user:/nonexistent:/bin/sh pdns_recursor:*:120:120::0:0:pdns_recursor pseudo-user:/nonexistent:/usr/sbin/nologin otrs:*:121:121::0:0:OTRS Administrator:/usr/local/otrs:/bin/csh zabbix:*:122:122::0:0:Zabbix NMS:/nonexistent:/usr/sbin/nologin _ntp:*:123:123::0:0:NTP Daemon:/var/empty:/usr/sbin/nologin fetchmail:*:124:124::0:0:Fetchmail mail-retrieval daemon:/nonexistent:/usr/sbin/nologin postfix:*:125:125::0:0:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin navcron:*:127:127::0:0:Network Administration Visualized:/usr/local/nav:/usr/sbin/nologin vchat:*:128:128::0:0:VChat Conferencing System:/nonexistent:/usr/sbin/nologin _bgpd:*:130:130::0:0:BGP Daemon:/var/empty:/usr/sbin/nologin _ospfd:*:131:131::0:0:OSPF Daemon:/var/empty:/usr/sbin/nologin _spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin freeradius:*:133:133::0:0:FreeRADIUS Daemon:/nonexistent:/usr/sbin/nologin undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistent:/usr/sbin/nologin rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin dhcpd:*:136:136::0:0:ISC DHCP daemon:/nonexistent:/usr/sbin/nologin mpd:*:137:137::0:0:MusicPD pseudo-user:/usr/local/var/mpd:/usr/sbin/nologin wolfpack:*:138:138::0:0:Wolfpack Empire Server:/usr/local/share/wolfpack:/usr/sbin/nologin cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin ladvd:*:142:142::0:0:Ladvd User:/var/empty:/usr/sbin/nologin dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin sfs:*:171:171::0:0:Self-Certifying File System:/nonexistent:/usr/sbin/nologin agk:*:172:172::0:0:AquaGateKeeper:/nonexistent:/nonexistent polipo:*:173:173::0:0:polipo web cache:/nonexistent:/usr/sbin/nologin flowtools:*:174:174::0:0:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin nagios:*:181:181::0:0:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin noc:*:182:182::0:0:NOC pseudo-user:/usr/local/noc:/bin/sh moinmoin:*:192:192::0:0:MoinMoin User:/nonexistent:/usr/sbin/nologin cups:*:193:193::0:0:Cups Owner:/nonexistent:/usr/sbin/nologin sympa:*:200:200::0:0:Sympa Owner:/nonexistent:/usr/sbin/nologin privoxy:*:201:201::0:0:Privoxy proxy user:/nonexistent:/usr/sbin/nologin dspam:*:202:202::0:0:Dspam:/nonexistent:/usr/sbin/nologin shoutcast:*:210:210::0:0:Shoutcast sandbox:/nonexistent:/bin/sh git:*:211:211:gitosis user:/usr/local/git:/bin/sh bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh postgrey:*:225:225::0:0:Postgrey Owner:/nonexistent:/usr/sbin/nologin aprsd:*:240:240::0:0:aprsd:/nonexistent:/bin/sh tnc:*:241:241::0:0:aprsd:/nonexistent:/bin/sh prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin _tor:*:256:256::0:0:Tor anonymising router:/var/db/tor:/bin/sh meta1s:*:260:260::0:0:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin meta1q:*:261:261::0:0:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin meta1c:*:262:262::0:0:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin meta1m:*:263:263::0:0:MeTA1 misc:/nonexistent:/usr/sbin/nologin meta1:*:264:264::0:0: X other:/nonexistent:/usr/sbin/nologin hacluster:*:275:275::0:0:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin frontbase:*:276:276::0:0:FrontBase Daemon:/usr/local/FrontBase/Databases:/bin/sh mrtg:*:279:279::0:0:MRTG daemon:/nonexistent:/usr/sbin/nologin hobbit:*:280:280::0:0:Hobbit Monitor:/nonexistent:/usr/sbin/nologin prelude:*:281:281::0:0:Prelude user:/nonexistent:/usr/sbin/nologin _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin dkfilter:*:325:325::0:0:DK Filter Owner:/nonexistent:/usr/sbin/nologin _pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin openfire:*:342:342::0:0:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin _iodined:*:353:353::0:0:Iodine Daemon:/nonexistent:/usr/sbin/nologin httptunnel:*:361:361::0:0:httptunnel Daemon:/nonexistent:/usr/sbin/nologin ldap:*:389:389::0:0:OpenLDAP Server:/nonexistent:/usr/sbin/nologin tiarra:*:398:398::0:0:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin drweb:*:426:426::0:0:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin callweaver:*:444:444::0:0:Callweaver account:/var/lib/callweaver:/usr/sbin/nologin courier:*:465:465::0:0:Courier Mail Server:/nonexistent:/usr/sbin/nologin _bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin pgbouncer:*:534:534::0:0:Pgbouncer Daemon:/nonexistent:/usr/sbin/nologin redis:*:535:535::0:0:Redis Daemon:/nonexistent:/usr/sbin/nologin ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh qtss:*:554:554::0:0:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin ircdru:*:555:555::0:0:Russian hybrid IRC server:/nonexistent:/bin/sh messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin avahi:*:558:558::0:0:Avahi Daemon User:/nonexistent:/usr/sbin/nologin tacacs:*:559:559::0:0:TACACS+ Daemon User:/nonexistent:/usr/sbin/nologin haldaemon:*:560:560::0:0:HAL Daemon User:/nonexistent:/usr/sbin/nologin distcc:*:561:561::0:0:Distcc user:/nonexistent:/usr/sbin/nologin polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin pulse:*:563:563::0:0:PulseAudio System User:/nonexistent:/usr/sbin/nologin _xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin _pla:*:636:80::0:0:phpLDAPAdmin Owner:/nonexistent:/usr/sbin/nologin bnetd:*:700:700::0:0:Bnetd user:/nonexistent:/usr/sbin/nologin bopm:*:717:717::0:0:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh openxpki:*:777:777::0:0:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin dotlrn:*:821:821::0:0:.LRN Daemon User:/nonexistent:/usr/sbin/nologin netdisco:*:840:840::0:0:netdisco daemon:/nonexistent:/usr/sbin/nologin +munin:*:842:842::0:0:Munin:/var/munin:/usr/sbin/nologin fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash bacula:*:910:910::0:0:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin iserv:*:911:911::0:0:Iserv Daemon:/nonexistent:/usr/sbin/nologin _sj3:*:912:912::0:0:SJ3 Daemon:/nonexistent:/usr/sbin/nologin _relayd:*:913:913::0:0:Relay Daemon:/var/empty:/usr/sbin/nologin bitlbee:*:914:914::0:0:Bitlbee pseudo-user:/nonexistent:/usr/sbin/nologin logcheck:*:915:915::0:0:Logcheck system account:/var/lib/logcheck:/usr/local/bin/bash _prayer:*:917:917:daemon:0:0:Prayer Account:/nonexistent:/usr/sbin/nologin nefu:*:918:918::0:0:Nefu daemon:/var/db/nefu:/usr/sbin/nologin couchdb:*:919:919:daemon:0:0:CouchDB Account:/var/empty:/usr/sbin/nologin vboxusers:*:920:920::0:0:Virtualbox user:/nonexistent:/usr/sbin/nologin transmission:*:921:921::0:0:Transmission Daemon User:/usr/local/etc/transmission/home:/usr/sbin/nologin mongodb:*:922:922:daemon:0:0:MongoDB Account:/var/empty:/usr/sbin/nologin liquidsoap:*:923:923::0:0:Liquidsoap User:/nonexistent:/usr/sbin/nologin Property changes on: head/UIDs ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.101 \ No newline at end of property +1.102 \ No newline at end of property Index: head/sysutils/munin-common/Makefile =================================================================== --- head/sysutils/munin-common/Makefile (revision 250269) +++ head/sysutils/munin-common/Makefile (revision 250270) @@ -1,46 +1,45 @@ # New ports collection makefile for: munin-common # Date created: 10 February 2010 # Whom: Sean Rees # # $FreeBSD$ # PORTNAME= munin PORTVERSION= 1.4.3 +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} PKGNAMESUFFIX= -common MAINTAINER= des@FreeBSD.org COMMENT= Common components between a munin node and server BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay USE_PERL5= yes USE_GMAKE= yes PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} -PKGMESSAGE= ${WRKDIR}/pkg-message -MAKE_ARGS= LIBDIR=${DATADIR} CONFDIR=${ETCDIR} \ +DBDIR= /var/${PORTNAME} +MAKE_ARGS= LIBDIR=${DATADIR} CONFDIR=${ETCDIR} DBDIR=${DBDIR} \ PERL=${PERL} SITE_PERL_REL=${SITE_PERL_REL} ALL_TARGET= build-common-prime INSTALL_TARGET= install-common MAN3= Munin::Common::Config.3 \ Munin::Common::Defaults.3 \ Munin::Common::TLS.3 \ Munin::Common::TLSClient.3 \ Munin::Common::TLSServer.3 \ Munin::Common::Timeout.3 - -SUB_FILES= pkg-message post-install: @(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \ done) .include Property changes on: head/sysutils/munin-common/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/sysutils/munin-common/files/pkg-message.in =================================================================== --- head/sysutils/munin-common/files/pkg-message.in (revision 250269) +++ head/sysutils/munin-common/files/pkg-message.in (nonexistent) @@ -1,8 +0,0 @@ -******************************************************************** -Unless this file already existed, a sample configuration file -has been placed in %%PREFIX%%/etc/munin/munin.conf. - -Please edit it according to your needs. - -The Munin server will be run from cron under the user 'munin'. -******************************************************************** Property changes on: head/sysutils/munin-common/files/pkg-message.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/munin-master/Makefile =================================================================== --- head/sysutils/munin-master/Makefile (revision 250269) +++ head/sysutils/munin-master/Makefile (revision 250270) @@ -1,91 +1,99 @@ # New ports collection makefile for: munin-master # Date created: 25 Januar 2004 # Whom: Lupe Christoph # # $FreeBSD$ # PORTNAME= munin PORTVERSION= 1.4.3 +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} PKGNAMESUFFIX= -master MAINTAINER= des@FreeBSD.org COMMENT= Collector part of Munin BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/converters/p5-Storable-AMF \ ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ ${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced RUN_DEPENDS= ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/converters/p5-Storable-AMF \ ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ ${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced USE_PERL5= yes USE_GMAKE= yes PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} PKGMESSAGE= ${WRKDIR}/pkg-message -MAKE_ARGS= LIBDIR=${DATADIR} CONFDIR=${ETCDIR} \ +USERS= munin +GROUPS= munin + +DBDIR= /var/${PORTNAME} +MAKE_ARGS= LIBDIR=${DATADIR} CONFDIR=${ETCDIR} DBDIR=${DBDIR} \ WWWDIR=${WWWDIR} CGIDIR=${WWWDIR}/cgi-bin \ PERL=${PERL} SITE_PERL_REL=${SITE_PERL_REL} ALL_TARGET= build-master build-man INSTALL_TARGET= install-master-prime MAN3= Munin::Master::Config.3 \ Munin::Master::Group.3 \ Munin::Master::GroupRepository.3 \ Munin::Master::HTMLOld.3 \ Munin::Master::Host.3 \ Munin::Master::Logger.3 \ Munin::Master::Node.3 \ Munin::Master::ProcessManager.3 \ Munin::Master::Update.3 \ Munin::Master::UpdateWorker.3 \ Munin::Master::Utils.3 \ Munin::Master::Worker.3 MAN5= munin.conf.5 MAN8= munin-cron.8 \ munin-graph.8 \ munin-html.8 \ munin-limits.8 \ munin-update.8 +PLIST_SUB= DBDIR=${DBDIR} SUB_FILES= pkg-message pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL post-install: @${INSTALL_DATA} ${WRKSRC}/build/master/munin.conf ${PREFIX}/etc/munin/munin.conf.sample @(cd ${WRKSRC}/master/blib/libdoc && for man in ${MAN3}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \ done) @(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \ done) @(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \ done) - @DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL @${CHOWN} munin /var/log/munin-master - @${CHGRP} munin /var/run/munin /var/log/munin-master ${WWWDIR} ${PREFIX}/var/munin + @${CHGRP} munin /var/run/munin /var/log/munin-master ${WWWDIR} ${DBDIR} @${CAT} ${PKGMESSAGE} .include Property changes on: head/sysutils/munin-master/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/sysutils/munin-master/files/pkg-message.in =================================================================== --- head/sysutils/munin-master/files/pkg-message.in (revision 250269) +++ head/sysutils/munin-master/files/pkg-message.in (revision 250270) @@ -1,8 +1,8 @@ ******************************************************************** Unless this file already existed, a sample configuration file -has been placed in %%ETCDIR%%/munin/munin.conf. +has been placed in %%ETCDIR%%/munin.conf. Please edit it according to your needs. The Munin server will be run from cron under the user 'munin'. ******************************************************************** Property changes on: head/sysutils/munin-master/files/pkg-message.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/sysutils/munin-master/pkg-deinstall =================================================================== --- head/sysutils/munin-master/pkg-deinstall (revision 250269) +++ head/sysutils/munin-master/pkg-deinstall (revision 250270) @@ -1,118 +1,83 @@ #! /bin/sh ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; 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 } -delete_account() { - local u g home - - u=$1 - g=$2 - if pw group show ${g} > /dev/null 2>&1; then - if yesno "Do you want me to remove group \"${g}\"" y; then - pw group del -n ${g} - echo "Done." - else - GID=`pw group show ${g} | awk -F: '{ print $3 }'` - fi - fi - if pw user show ${u} > /dev/null 2>&1; then - if yesno "Do you want me to remove user \"${u}\"" y; then - eval home=~${u} - pw user del -n ${u} -r - echo "Done." - if [ -d "${home}" ]; then - echo "Please remember to remove the home directory \"${home}\"" - fi - - # pw user del may have removed the group, too. - # Put it back if the admin asked us to retain it. - if [ -n "$GID" ]; then - pw group show ${g} > /dev/null 2>&1 - if [ $? -ne 0 ]; then - pw group add ${g} - fi - fi - fi - fi -} - delete_crontab_entries() { local b e b=$1 e=$2 TMPFILE=`mktemp -t munin` || exit 1 crontab -u munin -l | sed -e "/^$b\$/,/^$e\$/d" -e '/^[ ]*#/d' -e '/^$/d' > $TMPFILE if [ -s $TMPFILE ]; then crontab -u munin -l | sed -e "/^$b\$/,/^$e\$/d" | crontab -u munin - echo "The crontab for user munin had manually created entries." echo "Only the automatically created entries have been removed." echo "These are the remaining lines:" crontab -u munin -l else echo y | crontab -u munin -r echo "crontab for user munin removed" fi rm $TMPFILE } delnewsyslog() { tmp="/etc/#munin-node$$" sed -e '/^\/var\/log\/munin-master\/\*\.log[ ]/d' /etc/newsyslog.conf >${tmp} cat ${tmp} > /etc/newsyslog.conf rm ${tmp} } newsyslog() { ENTRY=`fgrep '/var/log/munin-master/*' /etc/newsyslog.conf` DEFAULT='/var/log/munin-master/*.log munin:munin 644 7 * @T00 GNWZ' if [ -z "$ENTRY" ]; then exit 0 elif [ "$ENTRY" = "$DEFAULT" ]; then delnewsyslog elif yesno "You have changed the default munin-master entry in \"/etc/newsyslog.conf\". Do you want me to delete it?" y; then delnewsyslog echo "Done." fi } case $2 in DEINSTALL) if [ -z "${PACKAGE_BUILDING}" ]; then delete_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' newsyslog fi ;; POST-DEINSTALL) - delete_account munin munin ;; esac Property changes on: head/sysutils/munin-master/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/sysutils/munin-master/pkg-install =================================================================== --- head/sysutils/munin-master/pkg-install (revision 250269) +++ head/sysutils/munin-master/pkg-install (revision 250270) @@ -1,127 +1,87 @@ #! /bin/sh ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; 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 } -make_account() { - local u g gcos - - u=$1 - g=$2 - gcos=$3 - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd ${g} || exit - echo "Done." - else - echo "Please create it, and try again." - if ! /usr/sbin/pw user show ${u} >/dev/null 2>/dev/null; then - echo "While you're at it, please create a user \"${u}\" too," - echo "with a default group of \"${g}\"." - fi - exit 1 - fi - fi - - if pw user show "${u}" >/dev/null 2>&1; then - echo "You already have a user \"${u}\", so I will use it." - else - echo "You need a user \"${u}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd ${u} -g ${g} -h - \ - -s /bin/sh -c "${gcos}" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi -} - create_crontab_entries() { local b e b=$1 e=$2 if crontab -u munin -l > /dev/null 2>&1; then TMPFILE=`mktemp -t munin` || exit 1 cat > $TMPFILE crontab -u munin -l | sed -e "/^$b$/,/^$e$/d" | \ cat - $TMPFILE | crontab -u munin - rm $TMPFILE else crontab -u munin - fi } mklogdir() { } newsyslog() { if fgrep -q '/var/log/munin-master/*' /etc/newsyslog.conf; then : else cat >> /etc/newsyslog.conf < # # $FreeBSD$ # PORTNAME= munin PORTVERSION= 1.4.3 +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} PKGNAMESUFFIX= -node MAINTAINER= des@FreeBSD.org COMMENT= Node-specific part of Munin BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \ ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ bash:${PORTSDIR}/shells/bash RUN_DEPENDS= ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \ ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ bash:${PORTSDIR}/shells/bash USE_PERL5= yes USE_GMAKE= yes PATCH_STRIP= -p0 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} PKGMESSAGE= ${WRKDIR}/pkg-message -MAKE_ARGS= LIBDIR=${DATADIR} CONFDIR=${ETCDIR} \ +USERS= munin +GROUPS= munin + +DBDIR= /var/${PORTNAME} +MAKE_ARGS= LIBDIR=${DATADIR} CONFDIR=${ETCDIR} DBDIR=${DBDIR} \ PERL=${PERL} SITE_PERL_REL=${SITE_PERL_REL} ALL_TARGET= build-node build-plugins INSTALL_TARGET= install-node-prime install-plugins-prime MAN1= munin-node-configure.1 \ munin-node.1 \ munin-run.1 \ munindoc.1 MAN3_NODE= Munin::Node::Config.3 \ Munin::Node::Configure::Debug.3 \ Munin::Node::Configure::History.3 \ Munin::Node::Configure::HostEnumeration.3 \ Munin::Node::Configure::Plugin.3 \ Munin::Node::Configure::PluginList.3 \ Munin::Node::Logger.3 \ Munin::Node::OS.3 \ Munin::Node::SNMPConfig.3 \ Munin::Node::Server.3 \ Munin::Node::Service.3 \ Munin::Node::Session.3 \ Munin::Node::Utils.3 MAN3_PLUGIN= Munin::Plugin.3 \ Munin::Plugin::Pgsql.3 \ Munin::Plugin::SNMP.3 MAN3= ${MAN3_NODE} ${MAN3_PLUGIN} MAN5= munin-node.conf.5 MAN8= munin.8 +PLIST_SUB= DBDIR=${DBDIR} SUB_FILES= pkg-message munin-node-revive.sh USE_RC_SUBR= munin-node.sh RC_SUBR_SUFFIX= .sh pre-su-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: ${INSTALL_SCRIPT} ${WRKDIR}/munin-node.sh \ ${PREFIX}/etc/rc.d/munin-node.sh ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ - ${PREFIX}/etc/munin/munin-node.conf.sample + ${ETCDIR}/munin-node.conf.sample + @if [ ! -f ${ETCDIR}/munin-node.conf ]; then \ + ${INSTALL_DATA} ${ETCDIR}/munin-node.conf.sample \ + ${ETCDIR}/munin-node.conf; \ + fi ${INSTALL_DATA} ${FILESDIR}/plugins.conf \ - ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf.sample - @if [ ! -f ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf ]; then \ - ${INSTALL_DATA} ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf.sample \ - ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf; \ + ${ETCDIR}/plugin-conf.d/plugins.conf.sample + @if [ ! -f ${ETCDIR}/plugin-conf.d/plugins.conf ]; then \ + ${INSTALL_DATA} ${ETCDIR}/plugin-conf.d/plugins.conf.sample \ + ${ETCDIR}/plugin-conf.d/plugins.conf; \ fi @(cd ${WRKSRC}/node/blib/bindoc && for man in ${MAN1}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man1; \ done) @(cd ${WRKSRC}/node/blib/libdoc && for man in ${MAN3_NODE}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \ done) @(cd ${WRKSRC}/plugins/blib/libdoc && for man in ${MAN3_PLUGIN}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \ done) @(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \ done) @(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \ ${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \ done) @${ECHO} ${PORTVERSION} > ${PREFIX}/etc/munin/VERSION.node - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/sysutils/munin-node/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.30 \ No newline at end of property +1.31 \ No newline at end of property Index: head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff =================================================================== --- head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff (nonexistent) +++ head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff (revision 250270) @@ -0,0 +1,16 @@ +--- plugins/node.d.freebsd/if_.in.orig 2009-12-30 13:55:55.000000000 +0100 ++++ plugins/node.d.freebsd/if_.in 2010-02-24 18:59:15.670282185 +0100 +@@ -81,9 +81,12 @@ + if (NF == 10) { + print "rbytes.value", $6; + print "obytes.value", $9; +- } else { ++ } else if (NF == 11) { + print "rbytes.value", $7; + print "obytes.value", $10; ++ } else { ++ print "rbytes.value", $8; ++ print "obytes.value", $11; + } + }' + fi Property changes on: head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff =================================================================== --- head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff (nonexistent) +++ head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff (revision 250270) @@ -0,0 +1,17 @@ +--- plugins/node.d.freebsd/if_errcoll_.in.orig 2009-12-30 13:55:55.000000000 +0100 ++++ plugins/node.d.freebsd/if_errcoll_.in 2010-02-24 19:00:26.026407278 +0100 +@@ -59,9 +59,13 @@ + print "ierrors.value", $5; + print "oerrors.value", $8; + print "collisions.value", $10; +- } else { ++ } else if (NF == 11) { + print "ierrors.value", $6; + print "oerrors.value", $9; + print "collisions.value", $11; ++ } else { ++ print "ierrors.value", $6; ++ print "oerrors.value", $10; ++ print "collisions.value", $12; + } + }' Property changes on: head/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/sysutils/munin-node/files/pkg-message.in =================================================================== --- head/sysutils/munin-node/files/pkg-message.in (revision 250269) +++ head/sysutils/munin-node/files/pkg-message.in (revision 250270) @@ -1,19 +1,19 @@ ******************************************************************** Unless this file already existed, a sample configuration file -has been placed in %%ETCDIR%%/munin/munin-node.conf. +has been placed in %%ETCDIR%%/munin-node.conf. Please edit it according to your needs. ******************************************************************** The Munin client will *not* be started automatically. To allow it to start, put this line in /etc/rc.conf: munin_node_enable="YES" Then, it will be started on the next boot. If this line is already present, the client will be started now. Otherwise, edit /etc/rc.conf and execute this command: - %%ETCDIR%%/rc.d/munin-node.sh start + %%PREFIX%%/etc/rc.d/munin-node.sh start ******************************************************************** Property changes on: head/sysutils/munin-node/files/pkg-message.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/sysutils/munin-node/pkg-deinstall =================================================================== --- head/sysutils/munin-node/pkg-deinstall (revision 250269) +++ head/sysutils/munin-node/pkg-deinstall (revision 250270) @@ -1,95 +1,84 @@ #! /bin/sh ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; 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 } stop_process() { STARTSTOP=${PKG_PREFIX}/etc/rc.d/munin-node.sh if [ -x $STARTSTOP ]; then $STARTSTOP stop fi } -delete_group() { - local g - - g=$1 - if yesno "Do you want me to remove group \"${g}\"" y; then - pw groupdel -n ${g} - echo "Done." - fi -} - delete_crontab_entries() { local prog prog=$1 if grep -q "^[^#]*$prog" /etc/crontab; then TMPFILE=`mktemp -t munin` || exit 1 grep -v $prog /etc/crontab > $TMPFILE cat $TMPFILE > /etc/crontab rm $/etc/crontab fi } delnewsyslog() { tmp="/etc/#munin-node$$" sed -e '/^\/var\/log\/munin-node.log[ ]/d' /etc/newsyslog.conf >${tmp} cat ${tmp} > /etc/newsyslog.conf rm ${tmp} } newsyslog() { ENTRY=`grep /var/log/munin-node.log /etc/newsyslog.conf` DEFAULT='/var/log/munin-node.log 644 7 * @T00 Z /var/run/munin/munin-node.pid' if [ -z "$ENTRY" ]; then exit 0 elif [ "$ENTRY" = "$DEFAULT" ]; then delnewsyslog elif yesno "You have changed the default munin-node entry in \"/etc/newsyslog.conf\". Do you want me to delete it?" y; then delnewsyslog echo "Done." fi } case $2 in DEINSTALL) if [ -z "${PACKAGE_BUILDING}" ]; then delete_crontab_entries ${PKG_PREFIX}/bin/munin-node-revive stop_process newsyslog fi ;; POST-DEINSTALL) - delete_group munin ;; esac Property changes on: head/sysutils/munin-node/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/sysutils/munin-node/pkg-install =================================================================== --- head/sysutils/munin-node/pkg-install (revision 250269) +++ head/sysutils/munin-node/pkg-install (revision 250270) @@ -1,121 +1,97 @@ #! /bin/sh ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; 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 } -make_group() { - local g - - g=$1 - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd ${g} || exit - echo "Done." - else - echo "Please create it, and try again." - if ! /usr/sbin/pw user show ${u} >/dev/null 2>/dev/null; then - echo "While you're at it, please create a user \"${u}\" too," - echo "with a default group of \"${g}\"." - fi - exit 1 - fi - fi -} - init_plugins() { if [ -f ${PKG_PREFIX}/etc/munin/VERSION.node ]; then prevver=$(cat ${PKG_PREFIX}/etc/munin/VERSION.node) fi if [ -n "$prevver" ]; then echo -n "Initializing new plugins.." ${PKG_PREFIX}/sbin/munin-node-configure --shell --newer "${prevver%-*}" | sh -x else echo -n "Initializing plugins.." ${PKG_PREFIX}/sbin/munin-node-configure --shell | sh -x fi echo "done." } create_crontab_entries() { local sched prog sched=$1 prog=$2 if grep -q "^[^#]*$prog" /etc/crontab; then echo "It looks like your crontab is already set up, so I'll use that." else echo "It looks like your perl suffers from unsafe signals." if yesno "Would you like me to set up your root crontab to restart munin-node" y; then cat <>/etc/crontab $sched root $prog EOT else echo "You may suffer from munin-node crashing after log rotation." echo "If you still want to restart munin-node, use $prog." fi fi } newsyslog() { if yesno "Would you like me to set up log rotation" y; then if grep -q /var/log/munin-node.log /etc/newsyslog.conf; then : else cat >> /etc/newsyslog.conf <