Re: pkg/37301: Patch to update sysutils/ups-nut to 2.2.0

To: pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost, jdw-pkgsrc%menelos.com@localhost
Subject: Re: pkg/37301: Patch to update sysutils/ups-nut to 2.2.0
From: Jason White <jdw-pkgsrc%menelos.com@localhost>
Date: Thu, 8 Nov 2007 07:20:06 +0000 (UTC)
The following reply was made to PR pkg/37301; it has been noted by GNATS.

From: Jason White <jdw-pkgsrc%menelos.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/37301: Patch to update sysutils/ups-nut to 2.2.0
Date: Thu, 8 Nov 2007 01:16:44 -0600

 On Thu, Nov 08, 2007 at 06:45AM +0000, gnats-admin%netbsd.org@localhost wrote:
 
 This new patch supercedes the previous patch which was missing many files.
 (Thanks Cube!)
 
 diff -Nru ups-nut.orig/CVS/Entries ups-nut/CVS/Entries
 --- ups-nut.orig/CVS/Entries   2007-11-07 16:10:02.000000000 -0600
 +++ ups-nut/CVS/Entries        2007-11-06 21:45:06.000000000 -0600
 @@ -3,7 +3,7 @@
  /DESCR/1.1/Sat May 13 04:13:26 2006//
  /MESSAGE/1.6/Sat May 13 04:13:26 2006//
  /PLIST/1.20/Wed Aug 16 09:42:43 2006//
 +/distinfo/1.25/Wed Aug 16 09:42:44 2006//
 +/Makefile.common/1.1/Wed Aug 16 13:15:54 2006//
  /Makefile/1.48/Thu Jul  5 10:20:01 2007//
 -/Makefile.common/1.1/Wed Nov  7 22:10:02 2007//
 -/distinfo/1.25/Wed Nov  7 22:10:02 2007//
  D
 diff -Nru ups-nut.orig/CVS/Entries.Log ups-nut/CVS/Entries.Log
 --- ups-nut.orig/CVS/Entries.Log       2007-11-07 16:10:02.000000000 -0600
 +++ ups-nut/CVS/Entries.Log    1969-12-31 18:00:00.000000000 -0600
 @@ -1,2 +0,0 @@
 -A D/pkg////
 -R D/pkg////
 diff -Nru ups-nut.orig/DESCR ups-nut/DESCR
 --- ups-nut.orig/DESCR 2006-05-12 23:13:26.000000000 -0500
 +++ ups-nut/DESCR      2007-11-07 20:55:49.000000000 -0600
 @@ -1,5 +1,7 @@
 -This is a developing project to monitor a large assortment of UPS hardware.
 +The primary goal of the Network UPS Tools (NUT) project is to provide
 +reliable monitoring of UPS hardware and ensure safe shutdowns of the
 +systems which are connected.
 +
  Network communications are used so that multiple systems can monitor a
  single physical UPS and shut down together if necessary without any
 -special "sharing hardware" on the UPS itself. CGI scripts are in the
 -ups-nut-cgi package.
 +special "sharing hardware" on the UPS itself.
 diff -Nru ups-nut.orig/MESSAGE ups-nut/MESSAGE
 --- ups-nut.orig/MESSAGE       2006-05-12 23:13:26.000000000 -0500
 +++ ups-nut/MESSAGE    2007-11-06 22:38:08.000000000 -0600
 @@ -5,4 +5,8 @@
   If upgrading from a prior version, refer to
   ${NUT_DOCDIR}/UPGRADING for more information.
  
 + Driver changes occurred in version 2.2.
 + If upgrading from a prior version, refer to
 + ${NUT_DOCDIR}/UPGRADING for more information.
 +
  ===========================================================================
 diff -Nru ups-nut.orig/Makefile ups-nut/Makefile
 --- ups-nut.orig/Makefile      2007-07-05 05:20:01.000000000 -0500
 +++ ups-nut/Makefile   2007-11-08 01:09:10.000000000 -0600
 @@ -1,22 +1,50 @@
  # $NetBSD: Makefile,v 1.48 2007/07/04 20:55:01 jlam Exp $
  
 -.include "Makefile.common"
 -
 +DISTNAME=             nut-2.2.0
  PKGNAME=              ups-${DISTNAME}
 +CATEGORIES=           sysutils
 +MASTER_SITES=         http://www.networkupstools.org/source/2.2/
 +
 +MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 +HOMEPAGE=             http://www.networkupstools.org/
  COMMENT=              Network UPS Tools
  
 +.include "options.mk"
 +
 +GNU_CONFIGURE=                yes
 +USE_TOOLS+=           gmake
 +PLIST_SRC+=           ${.CURDIR}/PLIST
 +CHECK_PORTABILITY_SKIP+= packaging/mandriva/upsmon
 +
 +PKG_SYSCONFSUBDIR?=   nut
 +NUT_CONFDIR=          ${PKG_SYSCONFDIR}
 +NUT_DATADIR=          ${PREFIX}/share/nut
 +NUT_DOCDIR=           ${PREFIX}/share/doc/nut
 +NUT_DRVDIR=           ${PREFIX}/libexec/nut
 +NUT_EGDIR=            ${PREFIX}/share/examples/nut
 +NUT_STATEDIR?=                ${VARBASE}/db/nut
 +NUT_CGIDIR=           ${PREFIX}/libexec/cgi-bin/nut
 +
 +CONFIGURE_ARGS+=      --sysconfdir=${NUT_CONFDIR:Q}
 +CONFIGURE_ARGS+=      --datadir=${NUT_DATADIR:Q}
 +CONFIGURE_ARGS+=      --localstatedir=${NUT_STATEDIR:Q}
 +CONFIGURE_ARGS+=      --with-statepath=${NUT_STATEDIR:Q}
  CONFIGURE_ARGS+=      --with-user=${NUT_USER:Q}
  CONFIGURE_ARGS+=      --with-group=${NUT_GROUP:Q}
  CONFIGURE_ARGS+=      --with-drvpath=${NUT_DRVDIR:Q}
  CONFIGURE_ARGS+=      --with-altpidpath=${NUT_STATEDIR:Q}
  CONFIGURE_ARGS+=      --with-pidpath=${NUT_STATEDIR:Q}
  
 +#INSTALLATION_DIRS+=  share/examples/nut
 +INSTALLATION_DIRS_FROM_PLIST= yes
 +
  NUT_USER?=            nut
  NUT_GROUP?=           nut
  
  PKG_GROUPS_VARS+=     NUT_GROUP
  PKG_USERS_VARS+=      NUT_USER
  BUILD_DEFS+=          NUT_STATEDIR
 +BUILD_DEFS+=          VARBASE
  
  FILES_SUBST+=         NUT_CONFDIR=${NUT_CONFDIR:Q}
  FILES_SUBST+=         NUT_STATEDIR=${NUT_STATEDIR:Q}
 @@ -31,35 +59,35 @@
  PKG_HOME.${NUT_USER}= ${NUT_STATEDIR}
  PKG_SHELL.${NUT_USER}=        ${SH}
  
 -CONF_FILES=           ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
 -CONF_FILES+=          ${NUT_EGDIR}/upssched.conf.sample               \
 -                      ${NUT_CONFDIR}/upssched.conf
 -
 -CONF_FILES_PERMS=     ${NUT_EGDIR}/upsd.conf.sample                   \
 +CONF_FILES+=          ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
 +CONF_FILES_PERMS+=    ${NUT_EGDIR}/upssched.conf.sample               \
 +                      ${NUT_CONFDIR}/upssched.conf                    \
 +                      ${ROOT_USER} ${NUT_GROUP} 0640
 +CONF_FILES_PERMS+=    ${NUT_EGDIR}/upsd.conf.sample                   \
                        ${NUT_CONFDIR}/upsd.conf                        \
 -                      ${ROOT_USER} ${ROOT_GROUP} 0600
 +                      ${ROOT_USER} ${NUT_GROUP} 0640
  CONF_FILES_PERMS+=    ${NUT_EGDIR}/upsd.users.sample                  \
                        ${NUT_CONFDIR}/upsd.users                       \
 -                      ${ROOT_USER} ${ROOT_GROUP} 0600
 +                      ${ROOT_USER} ${NUT_GROUP} 0640
  CONF_FILES_PERMS+=    ${NUT_EGDIR}/upsmon.conf.sample                 \
                        ${NUT_CONFDIR}/upsmon.conf                      \
 -                      ${ROOT_USER} ${ROOT_GROUP} 0600
 +                      ${ROOT_USER} ${NUT_GROUP} 0640
  RCD_SCRIPTS=          ups upsd upsdriver upslog upsmon
  
  OWN_DIRS=             ${NUT_CONFDIR}
  OWN_DIRS_PERMS=               ${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770
  
  pre-install:
 -      ${MKDIR} ${NUT_STATEDIR}
 -      ${MKDIR} ${NUT_DRVDIR}
 -      ${CHOWN} ${NUT_USER} ${NUT_STATEDIR}
 +      mkdir ${NUT_STATEDIR}
 +      mkdir ${NUT_DRVDIR}
 +      chown ${NUT_USER} ${NUT_STATEDIR}
        ${INSTALL_DATA_DIR} ${NUT_EGDIR}
  
  post-install:
        ${INSTALL_DATA_DIR} ${NUT_DOCDIR}
        ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables
        ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/drivers
 -      for f in CHANGES COPYING CREDITS NEWS README INSTALL UPGRADING; do \
 +      for f in AUTHORS COPYING INSTALL MAINTAINERS NEWS README UPGRADING; do \
                ${INSTALL_DATA} ${WRKSRC}/$$f ${NUT_DOCDIR}; \
        done
        ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
 diff -Nru ups-nut.orig/Makefile.common ups-nut/Makefile.common
 --- ups-nut.orig/Makefile.common       2007-11-07 16:22:01.000000000 -0600
 +++ ups-nut/Makefile.common    1969-12-31 18:00:00.000000000 -0600
 @@ -1,28 +0,0 @@
 -# $NetBSD: Makefile.common,v 1.1 2006/08/16 13:15:54 ghen Exp $
 -
 -DISTNAME=             nut-2.0.4
 -CATEGORIES=           sysutils
 -MASTER_SITES=         http://random.networkupstools.org/source/2.0/
 -
 -MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 -HOMEPAGE=             http://www.networkupstools.org/
 -
 -DISTINFO_FILE=                ${.CURDIR}/../../sysutils/ups-nut.orig/distinfo
 -PATCHDIR=             ${.CURDIR}/../../sysutils/ups-nut.orig/patches
 -
 -GNU_CONFIGURE=                yes
 -CONFIGURE_ARGS+=      --sysconfdir=${NUT_CONFDIR:Q}
 -CONFIGURE_ARGS+=      --datadir=${NUT_DATADIR:Q}
 -CONFIGURE_ARGS+=      --localstatedir=${NUT_STATEDIR:Q}
 -CONFIGURE_ARGS+=      --with-statepath=${NUT_STATEDIR:Q}
 -
 -.include "../../mk/bsd.prefs.mk"
 -
 -PKG_SYSCONFSUBDIR?=   nut
 -NUT_CONFDIR=          ${PKG_SYSCONFDIR}
 -NUT_DATADIR=          ${PREFIX}/share/nut
 -NUT_DOCDIR=           ${PREFIX}/share/doc/nut
 -NUT_DRVDIR=           ${PREFIX}/libexec/nut
 -NUT_EGDIR=            ${PREFIX}/share/examples/nut
 -NUT_STATEDIR?=                ${VARBASE}/db/nut
 -NUT_CGIDIR=           ${PREFIX}/libexec/cgi-bin
 diff -Nru ups-nut.orig/PLIST ups-nut/PLIST
 --- ups-nut.orig/PLIST 2006-08-16 04:42:43.000000000 -0500
 +++ ups-nut/PLIST      2007-11-08 01:08:54.000000000 -0600
 @@ -1,8 +1,10 @@
 -@comment $NetBSD: PLIST,v 1.20 2006/08/15 12:26:07 ghen Exp $
 +@comment $NetBSD$
  bin/upsc
  bin/upscmd
  bin/upslog
  bin/upsrw
 +bin/upssched-cmd
 +libexec/nut/al175
  libexec/nut/apcsmart
  libexec/nut/bcmxcp
  libexec/nut/belkin
 @@ -10,16 +12,13 @@
  libexec/nut/bestfcom
  libexec/nut/bestuferrups
  libexec/nut/bestups
 -libexec/nut/blazer
  libexec/nut/cpsups
  libexec/nut/cyberpower
 -libexec/nut/esupssmart
 +libexec/nut/dummy-ups
  libexec/nut/etapro
  libexec/nut/everups
 -libexec/nut/fentonups
  libexec/nut/gamatronic
  libexec/nut/genericups
 -libexec/nut/ippon
  libexec/nut/isbmex
  libexec/nut/liebert
  libexec/nut/masterguard
 @@ -27,13 +26,15 @@
  libexec/nut/metasys
  libexec/nut/mge-shut
  libexec/nut/mge-utalk
 -libexec/nut/mustek
 +libexec/nut/newmge-shut
 +libexec/nut/nitram
  libexec/nut/oneac
 +libexec/nut/optiups
  libexec/nut/powercom
 -libexec/nut/powermust
 +libexec/nut/powerpanel
  libexec/nut/rhino
  libexec/nut/safenet
 -libexec/nut/sms
 +libexec/nut/skel
  libexec/nut/solis
  libexec/nut/tripplite
  libexec/nut/tripplitesu
 @@ -45,6 +46,7 @@
  man/man5/upsd.users.5
  man/man5/upsmon.conf.5
  man/man5/upssched.conf.5
 +man/man8/al175.8
  man/man8/apcsmart.8
  man/man8/bcmxcp.8
  man/man8/belkin.8
 @@ -54,25 +56,26 @@
  man/man8/bestups.8
  man/man8/cpsups.8
  man/man8/cyberpower.8
 +man/man8/dummy-ups.8
  man/man8/etapro.8
  man/man8/everups.8
 -man/man8/fentonups.8
  man/man8/gamatronic.8
  man/man8/genericups.8
 -man/man8/ippon.8
  man/man8/isbmex.8
  man/man8/liebert.8
  man/man8/masterguard.8
 +man/man8/megatec.8
  man/man8/metasys.8
  man/man8/mge-shut.8
  man/man8/mge-utalk.8
 -man/man8/mustek.8
 +man/man8/nitram.8
  man/man8/nutupsdrv.8
  man/man8/oneac.8
 +man/man8/optiups.8
  man/man8/powercom.8
 -man/man8/powermust.8
 +man/man8/powerpanel.8
 +man/man8/rhino.8
  man/man8/safenet.8
 -man/man8/sms.8
  man/man8/solis.8
  man/man8/tripplite.8
  man/man8/tripplitesu.8
 @@ -89,14 +92,16 @@
  sbin/upsd
  sbin/upsmon
  sbin/upssched
 -share/doc/nut/CHANGES
 +share/doc/nut/AUTHORS
  share/doc/nut/COPYING
 -share/doc/nut/CREDITS
  share/doc/nut/FAQ
  share/doc/nut/INSTALL
 +share/doc/nut/MAINTAINERS
  share/doc/nut/NEWS
  share/doc/nut/README
  share/doc/nut/UPGRADING
 +share/doc/nut/acpi.txt
 +share/doc/nut/al175-vars.txt
  share/doc/nut/big-servers.txt
  share/doc/nut/cables/apc-rs500-serial.txt
  share/doc/nut/cables/apc.txt
 @@ -117,9 +122,11 @@
  share/doc/nut/driver.list
  share/doc/nut/hid-subdrivers.txt
  share/doc/nut/ideas.txt
 +share/doc/nut/macros.txt
  share/doc/nut/megatec.txt
  share/doc/nut/new-drivers.txt
  share/doc/nut/new-names.txt
 +share/doc/nut/nut-hal.txt
  share/doc/nut/osd-notify.txt
  share/doc/nut/pager.txt
  share/doc/nut/powersaving.txt
 @@ -142,9 +149,10 @@
  share/nut/cmdvartab
  share/nut/driver.list
  @dirrm share/nut
 +@dirrm share/httpd/htdocs
  @dirrm share/examples/nut
 -@exec ${MKDIR} %D/share/doc/nut/drivers
  @dirrm share/doc/nut/drivers
  @dirrm share/doc/nut/cables
  @dirrm share/doc/nut
  @dirrm libexec/nut
 +@dirrm etc/nut
 diff -Nru ups-nut.orig/PLIST.cgi ups-nut/PLIST.cgi
 --- ups-nut.orig/PLIST.cgi     1969-12-31 18:00:00.000000000 -0600
 +++ ups-nut/PLIST.cgi  2007-11-07 02:48:51.000000000 -0600
 @@ -0,0 +1,20 @@
 +@comment $NetBSD$
 +libexec/cgi-bin/nut/upsimage.cgi
 +libexec/cgi-bin/nut/upsset.cgi
 +libexec/cgi-bin/nut/upsstats.cgi
 +man/man5/hosts.conf.5
 +man/man5/upsset.conf.5
 +man/man5/upsstats.html.5
 +man/man8/upsimage.cgi.8
 +man/man8/upsset.cgi.8
 +man/man8/upsstats.cgi.8
 +share/examples/nut/hosts.conf.sample
 +share/examples/nut/upsset.conf.sample
 +share/examples/nut/upsstats-single.html.sample
 +share/examples/nut/upsstats.html.sample
 +share/httpd/htdocs/nut/bottom.html
 +share/httpd/htdocs/nut/header.html
 +share/httpd/htdocs/nut/index.html
 +share/httpd/htdocs/nut/nut-banner.png
 +@dirrm share/httpd/htdocs/nut
 +@dirrm libexec/cgi-bin/nut
 diff -Nru ups-nut.orig/PLIST.snmp ups-nut/PLIST.snmp
 --- ups-nut.orig/PLIST.snmp    1969-12-31 18:00:00.000000000 -0600
 +++ ups-nut/PLIST.snmp 2007-11-06 23:29:24.000000000 -0600
 @@ -0,0 +1,3 @@
 +@comment $NetBSD$
 +libexec/nut/snmp-ups
 +man/man8/snmp-ups.8
 diff -Nru ups-nut.orig/PLIST.usb ups-nut/PLIST.usb
 --- ups-nut.orig/PLIST.usb     1969-12-31 18:00:00.000000000 -0600
 +++ ups-nut/PLIST.usb  2007-11-07 02:19:01.000000000 -0600
 @@ -0,0 +1,9 @@
 +@comment $NetBSD$
 +libexec/nut/bcmxcp_usb
 +libexec/nut/megatec_usb
 +libexec/nut/tripplite_usb
 +libexec/nut/usbhid-ups
 +man/man8/bcmxcp_usb.8
 +man/man8/megatec_usb.8
 +man/man8/tripplite_usb.8
 +man/man8/usbhid-ups.8
 diff -Nru ups-nut.orig/distinfo ups-nut/distinfo
 --- ups-nut.orig/distinfo      2007-11-07 16:10:02.000000000 -0600
 +++ ups-nut/distinfo   2007-11-07 20:42:42.000000000 -0600
 @@ -1,7 +1,7 @@
  $NetBSD: distinfo,v 1.25 2006/08/15 12:26:07 ghen Exp $
  
 -SHA1 (nut-2.0.4.tar.gz) = 31e2464a0f868c7d04d052ee558e52956220ccba
 -RMD160 (nut-2.0.4.tar.gz) = 7368967572bd8b2361c6fdd642308ecbb661a994
 -Size (nut-2.0.4.tar.gz) = 699424 bytes
 -SHA1 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b
 -SHA1 (patch-ab) = 2a5ad1397736f8119532d756afe31dd523a23813
 +SHA1 (nut-2.2.0.tar.gz) = b8017300d41c0a7a946034cf0bdb92ad8b7367a9
 +RMD160 (nut-2.2.0.tar.gz) = d4e0e50239ba2b020060445869b6d364a56092f4
 +Size (nut-2.2.0.tar.gz) = 1173801 bytes
 +SHA1 (patch-aa) = 7af88d1a45ef5b661d423a15ec65e1c1c0cd68d3
 +SHA1 (patch-ab) = 4b2ce75b4f52df2343a7acac871a5b4ade0449a9
 diff -Nru ups-nut.orig/options.description ups-nut/options.description
 --- ups-nut.orig/options.description   1969-12-31 18:00:00.000000000 -0600
 +++ ups-nut/options.description        2007-11-07 21:12:46.000000000 -0600
 @@ -0,0 +1,3 @@
 +ups-nut-cgi   Build and install CGI programs.
 +ups-nut-snmp  Enable SNMP drivers.
 +ups-nut-usb   Enable USB drivers.
 diff -Nru ups-nut.orig/options.mk ups-nut/options.mk
 --- ups-nut.orig/options.mk    1969-12-31 18:00:00.000000000 -0600
 +++ ups-nut/options.mk 2007-11-07 22:05:09.000000000 -0600
 @@ -0,0 +1,46 @@
 +# $NetBSD$
 +
 +.include "../../mk/bsd.prefs.mk"
 +
 +PKG_OPTIONS_VAR=      PKG_OPTIONS.ups-nut
 +PKG_SUPPORTED_OPTIONS+=       ups-nut-cgi ups-nut-snmp ups-nut-usb
 +PKG_SUGGESTED_OPTIONS=
 +
 +.include "../../mk/bsd.options.mk"
 +
 +.if !empty(PKG_OPTIONS:Mups-nut-cgi)
 +CONFIGURE_ARGS+=      --with-cgi
 +CONFIGURE_ARGS+=      --with-cgipath=${NUT_CGIDIR:Q}
 +CONFIGURE_ARGS+=      --with-htmlpath=${PREFIX}/share/httpd/htdocs/nut
 +PLIST_SRC+=           ${.CURDIR}/PLIST.cgi
 +CONF_FILES+=          ${NUT_EGDIR}/upsstats-single.html.sample        \
 +                      ${NUT_CONFDIR}/upsstats-single.html
 +CONF_FILES+=          ${NUT_EGDIR}/upsstats.html.sample               \
 +                      ${NUT_CONFDIR}/upsstats.html
 +CONF_FILES_PERMS+=    ${NUT_EGDIR}/hosts.conf.sample                  \
 +                      ${NUT_CONFDIR}/hosts.conf                       \
 +                      ${ROOT_USER} ${ROOT_GROUP} 0600
 +CONF_FILES_PERMS+=    ${NUT_EGDIR}/upsset.conf.sample                 \
 +                      ${NUT_CONFDIR}/upsset.conf                      \
 +                      ${ROOT_USER} ${ROOT_GROUP} 0600
 +.include "../../graphics/freetype2/buildlink3.mk"
 +.include "../../graphics/gd/buildlink3.mk"
 +.else
 +CONFIGURE_ARGS+=      --without-cgi
 +.endif
 +
 +.if !empty(PKG_OPTIONS:Mups-nut-snmp)
 +CONFIGURE_ARGS+=      --with-snmp
 +PLIST_SRC+=           ${.CURDIR}/PLIST.snmp
 +.include "../../net/net-snmp/buildlink3.mk"
 +.else
 +CONFIGURE_ARGS+=      --without-snmp
 +.endif
 +
 +.if !empty(PKG_OPTIONS:Mups-nut-usb)
 +CONFIGURE_ARGS+=      --with-usb=auto
 +.include "../../devel/libusb/buildlink3.mk"
 +PLIST_SRC+=           ${.CURDIR}/PLIST.usb
 +.else
 +CONFIGURE_ARGS+=      --without-usb
 +.endif
 diff -Nru ups-nut.orig/patches/CVS/Entries ups-nut/patches/CVS/Entries
 --- ups-nut.orig/patches/CVS/Entries   2006-08-03 05:52:35.000000000 -0500
 +++ ups-nut/patches/CVS/Entries        1969-12-31 18:00:00.000000000 -0600
 @@ -1,3 +0,0 @@
 -/patch-aa/1.9/Sat May 13 04:13:26 2006//
 -/patch-ab/1.9/Thu Aug  3 10:52:34 2006//
 -D
 diff -Nru ups-nut.orig/patches/CVS/Repository ups-nut/patches/CVS/Repository
 --- ups-nut.orig/patches/CVS/Repository        2006-05-12 23:13:26.000000000 
-0500
 +++ ups-nut/patches/CVS/Repository     1969-12-31 18:00:00.000000000 -0600
 @@ -1 +0,0 @@
 -pkgsrc/sysutils/ups-nut/patches
 diff -Nru ups-nut.orig/patches/CVS/Root ups-nut/patches/CVS/Root
 --- ups-nut.orig/patches/CVS/Root      2006-05-12 23:13:26.000000000 -0500
 +++ ups-nut/patches/CVS/Root   1969-12-31 18:00:00.000000000 -0600
 @@ -1 +0,0 @@
 -:pserver:anoncvs%anoncvs.NetBSD.org@localhost:/cvsroot
 diff -Nru ups-nut.orig/patches/patch-aa ups-nut/patches/patch-aa
 --- ups-nut.orig/patches/patch-aa      2006-05-12 23:13:26.000000000 -0500
 +++ ups-nut/patches/patch-aa   2007-11-07 01:57:44.000000000 -0600
 @@ -1,13 +1,38 @@
 -$NetBSD: patch-aa,v 1.9 2004/02/15 13:14:25 lukem Exp $
 +$NetBSD$
  
 ---- conf/Makefile.in.orig     Tue Sep  3 09:23:02 2002
 -+++ conf/Makefile.in  Sat Feb 14 22:02:46 2004
 -@@ -4,7 +4,7 @@
 - prefix               = @prefix@
 - exec_prefix  = @exec_prefix@
 - 
 --CONFPATH     = $(DESTDIR)@sysconfdir@
 -+CONFPATH     = $(DESTDIR)@prefix@/share/examples/nut
 - 
 - INSTALLCMD  = @INSTALL@
 +--- conf/Makefile.in.orig     2007-07-05 08:21:22.000000000 -0500
 ++++ conf/Makefile.in  2007-11-07 01:56:30.000000000 -0600
 +@@ -153,6 +153,7 @@
 + RANLIB = @RANLIB@
 + RUN_AS_GROUP = @RUN_AS_GROUP@
 + RUN_AS_USER = @RUN_AS_USER@
 ++SAMPLEDIR = $(DESTDIR)@prefix@/share/examples/nut
 + SERLIBS = @SERLIBS@
 + SET_MAKE = @SET_MAKE@
 + SHELL = @SHELL@
 +@@ -290,20 +291,20 @@
 + uninstall-info-am:
 + install-dist_sysconfDATA: $(dist_sysconf_DATA)
 +      @$(NORMAL_INSTALL)
 +-     test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
 ++     test -z "$(SAMPLEDIR)" || $(mkdir_p) "$(SAMPLEDIR)"
 +      @list='$(dist_sysconf_DATA)'; for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        f=$(am__strip_dir) \
 +-       echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' 
'$(DESTDIR)$(sysconfdir)/$$f'"; \
 +-       $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 ++       echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(SAMPLEDIR)/$$f'"; \
 ++       $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(SAMPLEDIR)/$$f"; \
 +      done
   
 + uninstall-dist_sysconfDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(dist_sysconf_DATA)'; for p in $$list; do \
 +        f=$(am__strip_dir) \
 +-       echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
 +-       rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
 ++       echo " rm -f '$(SAMPLEDIR)/$$f'"; \
 ++       rm -f "$(SAMPLEDIR)/$$f"; \
 +      done
 + tags: TAGS
 + TAGS:
 diff -Nru ups-nut.orig/patches/patch-ab ups-nut/patches/patch-ab
 --- ups-nut.orig/patches/patch-ab      2006-08-03 05:52:34.000000000 -0500
 +++ ups-nut/patches/patch-ab   2007-11-07 20:42:35.000000000 -0600
 @@ -1,25 +1,17 @@
 -$NetBSD: patch-ab,v 1.9 2006/08/02 12:11:00 ghen Exp $
 +$NetBSD$
  
 ---- Makefile.in.orig  2006-08-02 13:55:06.000000000 +0200
 -+++ Makefile.in
 -@@ -41,7 +41,7 @@ distclean: clean
 -              rm $$i/Makefile; \
 -      done
 +--- include/Makefile.in.orig  2007-07-05 08:21:24.000000000 -0500
 ++++ include/Makefile.in               2007-11-07 20:37:49.000000000 -0600
 +@@ -225,11 +225,9 @@
 +  state.h timehead.h upsconf.h upshandler.h
   
 --install: install-dirs install-bin install-man install-data
 -+install: install-dirs install-bin install-man install-conf install-data
   
 - install-bin:
 -      @for i in $(SUBDIRS); do \
 -@@ -72,9 +72,10 @@ build-cgi-fake:
 -      @echo "Run 'configure --with-cgi' before doing 'make cgi'."
 +-# magic to include SVN revision number in NUT version string
 + BUILT_SOURCES = nut_version.h
 + CLEANFILES = nut_version.h
 +-SVNREV = $(shell svnversion -n $(top_srcdir) 2>/dev/null)
 +-NUT_VERSION = $(shell if test "$(SVNREV)" = "exported"; then echo 
"$(PACKAGE_VERSION)"; else echo "$(PACKAGE_VERSION)-$(SVNREV)"; fi)
 ++NUT_VERSION = $(PACKAGE_VERSION)
 + all: $(BUILT_SOURCES) config.h
 +      $(MAKE) $(AM_MAKEFLAGS) all-am
   
 - build-cgi:
 -+     @cd common; $(MAKE); cd ..;
 -      @cd clients; $(MAKE) cgi; cd ..;
 - 
 --install-cgi: cgi install-cgi-dir install-dirs install-cgi-bin install-cgi-man
 -+install-cgi: cgi install-cgi-dir install-dirs install-cgi-conf 
install-cgi-bin install-cgi-man
 - 
 - install-cgi-dir:
 -      if (test ! -d $(CGIPATH)) then \
 
 
 -- 
 Jason White <jdwhite%menelos.com@localhost>       Jabber: jdwhite(jabber.org)
 http://jdwhite.menelos.com/                     jason.d.white(gmail.com)
 PGP KeyID: 0x5290E477
Prev by Date: pkg/37301: Patch to update sysutils/ups-nut to 2.2.0
Next by Date: Re: pkg/37296: pkg_info -X doesn't work on Linux
Previous by Thread: pkg/37301: Patch to update sysutils/ups-nut to 2.2.0
Next by Thread: pkg/37302: please update x11/bwidget to version 1.8.0
Indexes:
Home | Main Index | Thread Index | Old Index