Re: sysutils/apupsd: switch from MESSAGE to README

2013-12-24 Thread Stuart Henderson 
On 2013/12/24 00:06, Kirill Bychkov wrote:
 Hi!
 This patch removes MESSAGEs in favor of READMEs.
 Update my email and regen distinfo while here.
 OK?

I think it would make sense to merge the two READMEs, i.e. include the
information about CGIs in README-main ..

  share/doc/apcupsd/README.openbsd
 +@group bin
 +share/doc/pkg-readmes/${FULLPKGNAME}
 +@group

is the @group necessary?

I also wonder if it's worth including any relevant parts of
README.openbsd here (and maybe not installing README.openbsd; some of
the information is good but some is just confusing when used with the
port - e.g. where it talks about /etc/rc.apcupsd)..

Re: sysutils/apupsd: switch from MESSAGE to README

2013-12-24 Thread Kirill Bychkov 
On Tue, December 24, 2013 16:24, Stuart Henderson wrote:
 On 2013/12/24 00:06, Kirill Bychkov wrote:
 Hi!
 This patch removes MESSAGEs in favor of READMEs.
 Update my email and regen distinfo while here.
 OK?

 I think it would make sense to merge the two READMEs, i.e. include the
 information about CGIs in README-main ..

I've splitted -cgi and -main in new patch (moved multimon.conf, hosts.conf and
apcupsd.css to cgi), so from now -cgi is a standalone package and it have its
own README.


  share/doc/apcupsd/README.openbsd
 +@group bin
 +share/doc/pkg-readmes/${FULLPKGNAME}
 +@group

 is the @group necessary?

It was added by update-plist, sorry. Removed.

 I also wonder if it's worth including any relevant parts of
 README.openbsd here (and maybe not installing README.openbsd; some of
 the information is good but some is just confusing when used with the
 port - e.g. where it talks about /etc/rc.apcupsd)..

Sorry, I can't find nothing about /etc/rc.apcupsd in README.openbsd. And it
says nothing wrong nor confusing, as I can see.
Anyway, this file contains only extra information and not really needed for
Running ${FULPKGNAME} on OpenBSD, so I think we shouldn't merge it with
port's readme.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile27 Sep 2013 17:49:09 -  1.19
+++ Makefile24 Dec 2013 13:51:12 -
@@ -8,15 +8,15 @@ DISTNAME =apcupsd-3.14.10
 PKGNAME-main = ${DISTNAME}
 PKGNAME-cgi =  ${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =  ${DISTNAME:S/-/-x11-/}
-REVISION-main =1
-REVISION-cgi = 0
-REVISION-x11 = 1
+REVISION-main =2
+REVISION-cgi = 1
+REVISION-x11 = 2

 CATEGORIES =   sysutils

 HOMEPAGE = http://www.apcupsd.com

-MAINTAINER =   Kirill Bychkov ya...@linklevel.net
+MAINTAINER =   Kirill Bychkov ki...@openbsd.org

 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/apcupsd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo20 Sep 2011 11:26:14 -  1.3
+++ distinfo24 Dec 2013 13:51:12 -
@@ -1,5 +1,2 @@
-MD5 (apcupsd-3.14.10.tar.gz) = WSiCLYVcXPesKWVePguMIw==
-RMD160 (apcupsd-3.14.10.tar.gz) = uwFTUjLulgRe4Fit5w3dOcBLVFc=
-SHA1 (apcupsd-3.14.10.tar.gz) = Sj1VkWchIfXXYdMzB7VvENM/W2c=
 SHA256 (apcupsd-3.14.10.tar.gz) = Bwe17JkW+96eROuNGAN8jY9139au71GrpUh+GJ7vIDI=
 SIZE (apcupsd-3.14.10.tar.gz) = 1336852
Index: pkg/MESSAGE-cgi
===
RCS file: pkg/MESSAGE-cgi
diff -N pkg/MESSAGE-cgi
--- pkg/MESSAGE-cgi 28 Nov 2011 10:46:19 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,10 +0,0 @@
-Before using multimon and the other CGI programs, first ensure that
-apcupsd is configured to run the Network Information Server. This is
-done by setting NETSERVER on in ${SYSCONFDIR}/apcupsd.conf.
-This switch is on by default.
-To run scripts in chrooted apache (default behaviour), configuration
-files must be available to the webserver:
-# mv ${SYSCONFDIR} /var/www/${SYSCONFDIR}
-# ln -s /var/www/${SYSCONFDIR} ${BASESYSCONFDIR}/
-And some libraries must be copied in:
-# ${WEB_ROOT}/cgi-bin/apcupsd/copy-libs.sh
Index: pkg/MESSAGE-main
===
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- pkg/MESSAGE-main28 Nov 2011 10:46:19 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-To allow the system to be fully powered down (in order to preserve
-UPS battery), add the following lines to /etc/rc.shutdown:
-
-if [ -f ${SYSCONFDIR}/powerfail ]; then
-  echo
-  echo APCUPSD requested this system is powered down.
-  echo
-  powerdown=YES
-  echo
-  echo Please ensure that the UPS has powered off before rebooting
-  echo Otherwise, the UPS may cut the power during the reboot!!!
-  echo
-fi
Index: pkg/PLIST-cgi
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-cgi,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-cgi
--- pkg/PLIST-cgi   25 May 2010 21:56:33 -  1.1.1.1
+++ pkg/PLIST-cgi   24 Dec 2013 13:51:12 -
@@ -9,3 +9,14 @@ cgi-bin/apcupsd/copy-libs.sh
 @bin cgi-bin/apcupsd/upsfstats.cgi
 @bin cgi-bin/apcupsd/upsimage.cgi
 @bin cgi-bin/apcupsd/upsstats.cgi
+@cwd ${LOCALBASE}
+@sample share/examples/apcupsd/
+share/examples/apcupsd/etc/
+@sample ${SYSCONFDIR}/
+share/examples/apcupsd/etc/apcupsd.css
+@sample ${SYSCONFDIR}/apcupsd.css
+share/examples/apcupsd/etc/hosts.conf
+@sample ${SYSCONFDIR}/hosts.conf
+share/examples/apcupsd/etc/multimon.conf
+@sample ${SYSCONFDIR}/multimon.conf
+share/doc/pkg-readmes/${FULLPKGNAME}
Index:

Re: sysutils/apupsd: switch from MESSAGE to README

2013-12-24 Thread Stuart Henderson 
On 2013/12/24 18:05, Kirill Bychkov wrote:
 On Tue, December 24, 2013 16:24, Stuart Henderson wrote:
  On 2013/12/24 00:06, Kirill Bychkov wrote:
  Hi!
  This patch removes MESSAGEs in favor of READMEs.
  Update my email and regen distinfo while here.
  OK?
 
  I think it would make sense to merge the two READMEs, i.e. include the
  information about CGIs in README-main ..
 
 I've splitted -cgi and -main in new patch (moved multimon.conf, hosts.conf and
 apcupsd.css to cgi),

Hmm, these ones need some more work. You need @conflict markers so
that pkg_add works (new PLIST-cgi needs @conflict apcupsd-=3.14.10p1)
and ..

 Index: pkg/PLIST-cgi
..
 +@cwd ${LOCALBASE}
 +@sample share/examples/apcupsd/
 +share/examples/apcupsd/etc/
..
 Index: pkg/PLIST-main
..
 -share/examples/apcupsd/
 +share/doc/pkg-readmes/${FULLPKGNAME}
 +@sample share/examples/apcupsd/

.. those should just be normal directories not @sample.

 so from now -cgi is a standalone package and it have its
 own README.

I just think the separate README is unnecessary, I don't mind too much
but now that we don't have to conserve screen space for MESSAGEs, isn't
it easier for the user if all the pkg-readme information for apcupsd
is in one place rather than split between 2 files?

  I also wonder if it's worth including any relevant parts of
  README.openbsd here (and maybe not installing README.openbsd; some of
  the information is good but some is just confusing when used with the
  port - e.g. where it talks about /etc/rc.apcupsd)..
 
 Sorry, I can't find nothing about /etc/rc.apcupsd in README.openbsd. And it
 says nothing wrong nor confusing, as I can see.
 
 Anyway, this file contains only extra information and not really needed for
 Running ${FULPKGNAME} on OpenBSD, so I think we shouldn't merge it with
 port's readme.

Ah I see now, I was looking in the source tarball not the installed
file, it is patched with a perl subst in pre-configure. OK this is less
confusing so I agree, don't merge.

Re: sysutils/apupsd: switch from MESSAGE to README

2013-12-24 Thread Kirill Bychkov 
On Tue, December 24, 2013 18:24, Stuart Henderson wrote:
 On 2013/12/24 18:05, Kirill Bychkov wrote:
 On Tue, December 24, 2013 16:24, Stuart Henderson wrote:
  On 2013/12/24 00:06, Kirill Bychkov wrote:
  Hi!
  This patch removes MESSAGEs in favor of READMEs.
  Update my email and regen distinfo while here.
  OK?
 
  I think it would make sense to merge the two READMEs, i.e. include the
  information about CGIs in README-main ..

 I've splitted -cgi and -main in new patch (moved multimon.conf, hosts.conf
 and
 apcupsd.css to cgi),

 Hmm, these ones need some more work. You need @conflict markers so
 that pkg_add works (new PLIST-cgi needs @conflict apcupsd-=3.14.10p1)
 and ..

Missed that. Added in new patch, thanks.

 Index: pkg/PLIST-cgi
 ..
 +@cwd ${LOCALBASE}
 +@sample share/examples/apcupsd/
 +share/examples/apcupsd/etc/
 ..
 Index: pkg/PLIST-main
 ..
 -share/examples/apcupsd/
 +share/doc/pkg-readmes/${FULLPKGNAME}
 +@sample share/examples/apcupsd/

 .. those should just be normal directories not @sample.

If share/examples/apcupsd/ is not @sampled, pkg_delete apcupds gives error
about directory not empty. Or it is normal to ignore such messages in cases
when two packages use one directory for storing their files?


 so from now -cgi is a standalone package and it have its
 own README.

 I just think the separate README is unnecessary, I don't mind too much
 but now that we don't have to conserve screen space for MESSAGEs, isn't
 it easier for the user if all the pkg-readme information for apcupsd
 is in one place rather than split between 2 files?

Well, -cgi package could be installed standalone now (tested). So if anyone
needs only CGI scpripts for monitoring apcupsd on different hosts, why install
main package with instructions how to run CGI-scripts in chrooted apache?

  I also wonder if it's worth including any relevant parts of
  README.openbsd here (and maybe not installing README.openbsd; some of
  the information is good but some is just confusing when used with the
  port - e.g. where it talks about /etc/rc.apcupsd)..

 Sorry, I can't find nothing about /etc/rc.apcupsd in README.openbsd. And it
 says nothing wrong nor confusing, as I can see.

 Anyway, this file contains only extra information and not really needed for
 Running ${FULPKGNAME} on OpenBSD, so I think we shouldn't merge it with
 port's readme.

 Ah I see now, I was looking in the source tarball not the installed
 file, it is patched with a perl subst in pre-configure. OK this is less
 confusing so I agree, don't merge.

Re: sysutils/apupsd: switch from MESSAGE to README

2013-12-24 Thread Stuart Henderson 
On 2013/12/24 18:52, Kirill Bychkov wrote:
  -share/examples/apcupsd/
  +share/doc/pkg-readmes/${FULLPKGNAME}
  +@sample share/examples/apcupsd/
 
  .. those should just be normal directories not @sample.
 
 If share/examples/apcupsd/ is not @sampled, pkg_delete apcupds gives error
 about directory not empty. Or it is normal to ignore such messages in cases
 when two packages use one directory for storing their files?

espie@ may like to comment, but I think it's better to have bogus warning
messages, rather than have directories under ${PREFIX} created by the
package which aren't recorded properly in the PLIST.

I think this might be a special case because it isn't in the usual PREFIX
and uses @cwd.. in normal cases you don't get these warnings if a file
provided by another package is within the directory.

 Well, -cgi package could be installed standalone now (tested). So if anyone
 needs only CGI scpripts for monitoring apcupsd on different hosts, why install
 main package with instructions how to run CGI-scripts in chrooted apache?

Fair enough then, I'm OK with that.

sysutils/apupsd: switch from MESSAGE to README

2013-12-23 Thread Kirill Bychkov 
Hi!
This patch removes MESSAGEs in favor of READMEs.
Update my email and regen distinfo while here.
OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile27 Sep 2013 17:49:09 -  1.19
+++ Makefile21 Dec 2013 21:36:30 -
@@ -8,15 +8,15 @@ DISTNAME =apcupsd-3.14.10
 PKGNAME-main = ${DISTNAME}
 PKGNAME-cgi =  ${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =  ${DISTNAME:S/-/-x11-/}
-REVISION-main =1
-REVISION-cgi = 0
-REVISION-x11 = 1
+REVISION-main =2
+REVISION-cgi = 1
+REVISION-x11 = 2

 CATEGORIES =   sysutils

 HOMEPAGE = http://www.apcupsd.com

-MAINTAINER =   Kirill Bychkov ya...@linklevel.net
+MAINTAINER =   Kirill Bychkov ki...@openbsd.org

 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/apcupsd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo20 Sep 2011 11:26:14 -  1.3
+++ distinfo21 Dec 2013 21:36:30 -
@@ -1,5 +1,2 @@
-MD5 (apcupsd-3.14.10.tar.gz) = WSiCLYVcXPesKWVePguMIw==
-RMD160 (apcupsd-3.14.10.tar.gz) = uwFTUjLulgRe4Fit5w3dOcBLVFc=
-SHA1 (apcupsd-3.14.10.tar.gz) = Sj1VkWchIfXXYdMzB7VvENM/W2c=
 SHA256 (apcupsd-3.14.10.tar.gz) = Bwe17JkW+96eROuNGAN8jY9139au71GrpUh+GJ7vIDI=
 SIZE (apcupsd-3.14.10.tar.gz) = 1336852
Index: pkg/MESSAGE-cgi
===
RCS file: pkg/MESSAGE-cgi
diff -N pkg/MESSAGE-cgi
--- pkg/MESSAGE-cgi 28 Nov 2011 10:46:19 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,10 +0,0 @@
-Before using multimon and the other CGI programs, first ensure that
-apcupsd is configured to run the Network Information Server. This is
-done by setting NETSERVER on in ${SYSCONFDIR}/apcupsd.conf.
-This switch is on by default.
-To run scripts in chrooted apache (default behaviour), configuration
-files must be available to the webserver:
-# mv ${SYSCONFDIR} /var/www/${SYSCONFDIR}
-# ln -s /var/www/${SYSCONFDIR} ${BASESYSCONFDIR}/
-And some libraries must be copied in:
-# ${WEB_ROOT}/cgi-bin/apcupsd/copy-libs.sh
Index: pkg/MESSAGE-main
===
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- pkg/MESSAGE-main28 Nov 2011 10:46:19 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-To allow the system to be fully powered down (in order to preserve
-UPS battery), add the following lines to /etc/rc.shutdown:
-
-if [ -f ${SYSCONFDIR}/powerfail ]; then
-  echo
-  echo APCUPSD requested this system is powered down.
-  echo
-  powerdown=YES
-  echo
-  echo Please ensure that the UPS has powered off before rebooting
-  echo Otherwise, the UPS may cut the power during the reboot!!!
-  echo
-fi
Index: pkg/PLIST-cgi
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-cgi,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-cgi
--- pkg/PLIST-cgi   25 May 2010 21:56:33 -  1.1.1.1
+++ pkg/PLIST-cgi   21 Dec 2013 21:36:30 -
@@ -9,3 +9,5 @@ cgi-bin/apcupsd/copy-libs.sh
 @bin cgi-bin/apcupsd/upsfstats.cgi
 @bin cgi-bin/apcupsd/upsimage.cgi
 @bin cgi-bin/apcupsd/upsstats.cgi
+@cwd ${LOCALBASE}/share/doc/pkg-readmes
+${FULLPKGNAME}
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main  28 Nov 2011 10:46:19 -  1.3
+++ pkg/PLIST-main  21 Dec 2013 21:36:30 -
@@ -18,6 +18,9 @@ share/doc/apcupsd/COPYING
 share/doc/apcupsd/COPYRIGHT
 share/doc/apcupsd/DISCLAIMER
 share/doc/apcupsd/README.openbsd
+@group bin
+share/doc/pkg-readmes/${FULLPKGNAME}
+@group
 share/examples/apcupsd/
 share/examples/apcupsd/etc/
 @sample ${SYSCONFDIR}/
Index: pkg/README-cgi
===
RCS file: pkg/README-cgi
diff -N pkg/README-cgi
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/README-cgi  21 Dec 2013 21:36:30 -
@@ -0,0 +1,18 @@
+$OpenBSD: README,v 1.2 2012/12/09 22:05:25 rpe Exp $
+
++---
+| Running ${FULLPKGNAME} on OpenBSD
++---
+
+Before using multimon and the other CGI programs, first ensure that
+apcupsd is configured to run the Network Information Server. This is
+done by setting NETSERVER on in ${SYSCONFDIR}/apcupsd.conf.
+This switch is on by default.
+
+To run scripts in chrooted apache (default behaviour), configuration
+files must be available to the webserver:
+# mv ${SYSCONFDIR}