Log message:
Remove @dirrm entries from PLISTs

Log message:
Update Network UPS Tools (pkgsrc/sysutils/ups-nut-*) to version 2.0.5.

This release is a backport of the development version.  Many changes
have already been backported previously.  Thus it is more a
synchronisation release, though it includes many bugfixes and support
for new models.

- support for new devices: APC Smart-UPS with 6TI firmware; Belkin
  Small Enterprise F6C1500-TW-RK; Compaq R3000 XR, R5500 XR; Cyber
  Power 550SL, 725SL, 685AVR, 800AVR, 1200AVR, AE550, BC1200 and
  many similar models; Eltek; Inform GUARD; Microsol Rhino; Opti-UPS
  PowerES 420E; PowerMan RealSmart, BackPro; Powerware PW9315 3-phase;
  SOLA 305; Tripp-Lite SMART550USB, SMART2200RMXL2U, OMNI1000LCD,
  OMNI900LCD, OMNI650LCD, 1500 LCD, AVR550U; Viewsonic PowerES 420E.

- bcmxcp: added 3-phase support

- megatec: better hardware support, more instant commands

- mge-hid: support more instant commands

- newhidups: fixed APC and Tripp Lite bugs, various memory bugs,
  improved report buffering, improved Solaris support, added
  '-x explore' option for easy diagnosis of new devices

- solis: shutdown programming, support new cables, Solaris support

- tripplite_usb: updated SMARTPRO support, fixed OL/OB reporting,
  better error handling, some memory bugs

- new dummy-ups driver simulator

- added HTML interface for access to CGI scripts

- powerpanel: new driver for CyberPower BC1200 and similar models

Log message:
Make it easier to build and install packages "unprivileged", where
the owner of all installed files is a non-root user.  This change
affects most packages that require special users or groups by making
them use the specified unprivileged user and group instead.

(1) Add two new variables PKG_GROUPS_VARS and PKG_USERS_VARS to
    unprivileged.mk.  These two variables are lists of other bmake
    variables that define package-specific users and groups.  Packages
    that have user-settable variables for users and groups, e.g. apache
    and APACHE_{USER,GROUP}, courier-mta and COURIER_{USER,GROUP},
    etc., should list these variables in PKG_USERS_VARS and PKG_GROUPS_VARS
    so that unprivileged.mk can know to set them to ${UNPRIVILEGED_USER}
    and ${UNPRIVILEGED_GROUP}.

(2) Modify packages to use PKG_GROUPS_VARS and PKG_USERS_VARS.

Log message:
Merge the common bits of net/ups-nut/Makefile and net/ups-nut-cgi/Makefile
into net/ups-nut/Makefile.common.  No functional changes.

Log message:
Update to nut-2.0.4.  Also set NUT_USER's homedirectory to NUT_STATEDIR.

Changes since nut-2.0.3:

 - The newhidups critical bug (segmentation fault) has been fixed. It has
   also received some more care, like buxfixes and new models support and
   enhancement for Solaris.
 - A bug has been fixed in NUT core to support resuming from suspend-to-disk.
   This should also fix other similar issues, like time synchronisation
   through the NTP - Network Time Protocol.
 - The mge-shut driver now better detects the Low Battery status, support
   new models and fixes some wrong status and data. It also fixes some
   issue where the UPS wasn't restarting (refer to mge-shut manpage).
 - The genericups custom configuration through ups.conf is working again.
 - The genericups driver type 22 also support CyberPower 725SL
   (and maybe others SL models).
 - The new megatec driver, which will replace a bunch of drivers by nut 2.2
   (refer to docs/megatec.txt and UPGRADING) has been backported from the
   trunk (Development tree). The powermust driver has also received some
   attention.
 - The new rhino driver was added to support Microsol Rhino UPS hardware
   The solis has also been improved for solaris compatibility, and
   internal / external shutdown programming. solis can now save external
   shutdown programming to ups, and support new cables for solis 3.
 - Several fixes and improvements have been made to upsrw, upsset,
   cpsups, tripplite_usb and the FAQ.

>From UPGRADING:
 - users of the following drivers (powermust, blazer, fentonups, mustek,
   esupssmart, ippon, sms, masterguard) are encouraged to switch to megatec,
   which should replace all these drivers by nut 2.2. For more information,
   please refer to doc/megatec.txt

Log message:
rc.d scripts: upsmon does not require upsd <running on the same machine>, but
still, upsd should start before upsmon when they are running on the same
machine.  The current setup (where upsmon.sh has REQUIRE: upsd) results in
errors like "rcorder: requirement `upsd' in file `upsmon' has no \ 
providers."
when you don't copy the upsd script to /etc/rc.d and set upsd=NO in
/etc/rc.conf.

Hence, remove REQUIRE: upsd from upsmon.sh and add BEFORE: upsmon to upsd.sh,
as suggested by jnemeth on tech-userlevel@.  Bump PKGREVISION.

Log message:
Fix more pkglint warnings:
- The shell command "${MKDIR}" should not be hidden.
- The INSTALL_*_DIR commands can only handle one directory at a time.

Log message:
Change NUT_STATEDIR from an absolute pathname /var/db/nut to ${VARBASE}/db/nut,
and make it user-settable.  Bump PKGREVISION because VARBASE is not always /var.

Log message:
Unify the patches and distinfo for sysutils/ups-nut and sysutils/ups-nut-cgi.
Both are under sysutils/ups-nut now.

Log message:
Modify packages that set PKG_USERS and PKG_GROUPS to follow the new
syntax as specified in pkgsrc/mk/install/bsd.pkginstall.mk:1.47.