Index: head/sysutils/nut/Makefile
===================================================================
--- head/sysutils/nut/Makefile	(revision 26586)
+++ head/sysutils/nut/Makefile	(revision 26587)
@@ -1,65 +1,65 @@
 # New ports collection makefile for:    nut
-# Version required:     nut-0.43.0
+# Version required:     nut-0.43.1
 # Date created:         08 Jan 2000
 # Whom:                 Boris Popov <bp@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nut-0.43.0
+DISTNAME=	nut-0.43.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
 MAINTAINER=	bp@butya.kz
 
 .if defined(CGI)
 LIB_DEPENDS=    gd:${PORTSDIR}/graphics/gd
 .endif
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
 		--with-uid=65534 --with-gid=68
 ALL_TARGET=	all
 
 PLIST=	${WRKDIR}/PLIST.DYN
 
 NDOCDIR=	${PREFIX}/share/doc/nut
 
 .if defined(CGI)
 NCGIDIR=	${PREFIX}/share/nut/cgi
 ALL_TARGET+=	cgi
 .endif
 
 pre-fetch:
 .if !defined(CGI)
 	@${ECHO_MSG} "Type \"make CGI=yes\" if you want to build CGI scripts."
 .endif
 
 pre-install:
 	@cp ${PKGDIR}/PLIST ${WRKDIR}/PLIST.DYN
 .if !defined(NOPORSDOCS)
 	@cat ${PKGDIR}/PLIST.DOC >> ${WRKDIR}/PLIST.DYN
 .endif
 .if defined(CGI)
 	@cat ${PKGDIR}/PLIST.CGI >> ${WRKDIR}/PLIST.DYN
 .endif
 
 post-install:
 	@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \
 		${WRKSRC}/scripts/FreeBSD/upsd.sh.sample \
 		>${PREFIX}/etc/rc.d/upsd.sh.sample
 	@${CHMOD} 0755 ${PREFIX}/etc/rc.d/upsd.sh.sample
 .if !defined(NOPORTDOCS)
 	@if ! [ -d ${NDOCDIR} ]; then ${MKDIR} ${NDOCDIR}; fi
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${NDOCDIR}
 .endif
 .if defined(CGI)
 	@if ! [ -d ${NCGIDIR} ]; then ${MKDIR} ${NCGIDIR}; fi
 	${INSTALL_DATA} ${WRKSRC}/clients/*.cgi ${NCGIDIR}
 	@${ECHO_MSG} "Look in ${NCGIDIR} for cgi scripts."
 .endif
 	@${ECHO_MSG} "Look in ${NDOCDIR} for documentation."
 
 .include <bsd.port.mk>

Property changes on: head/sysutils/nut/Makefile
___________________________________________________________________
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/nut/distinfo
===================================================================
--- head/sysutils/nut/distinfo	(revision 26586)
+++ head/sysutils/nut/distinfo	(revision 26587)
@@ -1 +1 @@
-MD5 (nut-0.43.0.tar.gz) = ca434de59590517430fa44280e32c5d0
+MD5 (nut-0.43.1.tar.gz) = 9f9ba2843065b6b8002558cd5dc779de

Property changes on: head/sysutils/nut/distinfo
___________________________________________________________________
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/nut/files/patch-aa
===================================================================
--- head/sysutils/nut/files/patch-aa	(revision 26586)
+++ head/sysutils/nut/files/patch-aa	(revision 26587)
@@ -1,54 +1,57 @@
---- clients/Makefile.in.org	Wed Nov 10 01:36:44 1999
-+++ clients/Makefile.in	Mon Jan 10 16:43:44 2000
-@@ -53,8 +53,8 @@
+diff -ru ../431/clients/Makefile.in ./clients/Makefile.in
+--- ../431/clients/Makefile.in	Mon Feb 14 09:39:16 2000
++++ ./clients/Makefile.in	Mon Mar  6 17:29:46 2000
+@@ -57,10 +57,10 @@
+ distclean: clean
  
  install: all
- 	@for p in $(PROGS) ; do \
--		echo cp $$p $(BASEPATH)/bin; \
--		cp $$p $(BASEPATH)/bin; \
-+		echo cp $$p $(BASEPATH)/sbin; \
-+		cp $$p $(BASEPATH)/sbin; \
- 	done
+-	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/bin
++	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/sbin
  
  install-cgi: cgi
+-	$(INSTALLCMD) -m $(INSTALLMODE) $(CGIPROGS) $(BASEPATH)/cgi-bin
++	$(INSTALLCMD) -m $(INSTALLMODE) $(CGIPROGS) $(BASEPATH)/share/nut/cgi
  
---- conf/Makefile.in.org	Mon Oct 18 03:56:11 1999
-+++ conf/Makefile.in	Tue Jan 11 16:57:15 2000
-@@ -9,10 +9,6 @@
+ install-misc: upsfetch.o
+ 	$(INSTALLCMD) upsfetch.[oh] $(BASEPATH)/misc
+diff -ru ../431/conf/Makefile.in ./conf/Makefile.in
+--- ../431/conf/Makefile.in	Mon Feb 14 09:08:01 2000
++++ ./conf/Makefile.in	Mon Mar  6 17:30:39 2000
+@@ -12,17 +12,9 @@
  
  install:
- 	@for f in $(CONFFILES) ; do \
+ 	@for f in $(SECFILES) ; do \
 -		if [ -f $(CONFPATH)/$$f ]; then \
 -			echo "Preserving existing config file: $$f"; \
 -		else \
--			echo cp $$f $(CONFPATH); \
--			cp $$f $(CONFPATH); \
+-			$(INSTALLCMD) -m 0600 $$f $(BASEPATH)/etc; \
 -		fi; \
-+		echo cp $$f $(CONFPATH)/$$f.sample; \
-+		cp $$f $(CONFPATH)/$$f.sample; \
++		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
  	done
  
---- server/Makefile.in.org	Wed Nov 10 01:37:01 1999
-+++ server/Makefile.in	Mon Jan 10 16:41:55 2000
-@@ -21,6 +21,6 @@
+ 	@for f in $(PUBFILES) ; do \
+-		if [ -f $(CONFPATH)/$$f ]; then \
+-			echo "Preserving existing config file: $$f"; \
+-		else \
+-			$(INSTALLCMD) -m 0644 $$f $(BASEPATH)/etc; \
+-		fi; \
++		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
+ 	done
+diff -ru ../431/models/Makefile.in ./models/Makefile.in
+--- ../431/models/Makefile.in	Fri Feb 11 03:14:25 2000
++++ ./models/Makefile.in	Mon Mar  6 17:29:46 2000
+@@ -36,4 +36,4 @@
+ distclean: clean
  
  install: all
- 	@for p in $(PROGS) ; do \
--		echo cp $$p $(BASEPATH)/bin ; \
--		cp $$p $(BASEPATH)/bin; \
-+		echo cp $$p $(BASEPATH)/sbin ; \
-+		cp $$p $(BASEPATH)/sbin; \
- 	done
-
---- models/Makefile.in.org	Wed Nov 10 01:36:44 1999
-+++ models/Makefile.in	Mon Jan 10 16:43:44 2000
-@@ -35,6 +35,6 @@
+-	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/bin
++	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/sbin
+diff -ru ../431/server/Makefile.in ./server/Makefile.in
+--- ../431/server/Makefile.in	Fri Feb 11 03:18:22 2000
++++ ./server/Makefile.in	Mon Mar  6 17:29:46 2000
+@@ -22,4 +22,4 @@
+ distclean: clean
  
  install: all
- 	@for p in $(PROGS) ; do \
--		echo cp $$p $(BASEPATH)/bin; \
--		cp $$p $(BASEPATH)/bin; \
-+		echo cp $$p $(BASEPATH)/sbin; \
-+		cp $$p $(BASEPATH)/sbin; \
- 	done
-
+-	$(INSTALLCMD) $(PROGS) $(BASEPATH)/bin
++	$(INSTALLCMD) $(PROGS) $(BASEPATH)/sbin

Property changes on: head/sysutils/nut/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/sysutils/nut22/Makefile
===================================================================
--- head/sysutils/nut22/Makefile	(revision 26586)
+++ head/sysutils/nut22/Makefile	(revision 26587)
@@ -1,65 +1,65 @@
 # New ports collection makefile for:    nut
-# Version required:     nut-0.43.0
+# Version required:     nut-0.43.1
 # Date created:         08 Jan 2000
 # Whom:                 Boris Popov <bp@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nut-0.43.0
+DISTNAME=	nut-0.43.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
 MAINTAINER=	bp@butya.kz
 
 .if defined(CGI)
 LIB_DEPENDS=    gd:${PORTSDIR}/graphics/gd
 .endif
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
 		--with-uid=65534 --with-gid=68
 ALL_TARGET=	all
 
 PLIST=	${WRKDIR}/PLIST.DYN
 
 NDOCDIR=	${PREFIX}/share/doc/nut
 
 .if defined(CGI)
 NCGIDIR=	${PREFIX}/share/nut/cgi
 ALL_TARGET+=	cgi
 .endif
 
 pre-fetch:
 .if !defined(CGI)
 	@${ECHO_MSG} "Type \"make CGI=yes\" if you want to build CGI scripts."
 .endif
 
 pre-install:
 	@cp ${PKGDIR}/PLIST ${WRKDIR}/PLIST.DYN
 .if !defined(NOPORSDOCS)
 	@cat ${PKGDIR}/PLIST.DOC >> ${WRKDIR}/PLIST.DYN
 .endif
 .if defined(CGI)
 	@cat ${PKGDIR}/PLIST.CGI >> ${WRKDIR}/PLIST.DYN
 .endif
 
 post-install:
 	@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \
 		${WRKSRC}/scripts/FreeBSD/upsd.sh.sample \
 		>${PREFIX}/etc/rc.d/upsd.sh.sample
 	@${CHMOD} 0755 ${PREFIX}/etc/rc.d/upsd.sh.sample
 .if !defined(NOPORTDOCS)
 	@if ! [ -d ${NDOCDIR} ]; then ${MKDIR} ${NDOCDIR}; fi
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${NDOCDIR}
 .endif
 .if defined(CGI)
 	@if ! [ -d ${NCGIDIR} ]; then ${MKDIR} ${NCGIDIR}; fi
 	${INSTALL_DATA} ${WRKSRC}/clients/*.cgi ${NCGIDIR}
 	@${ECHO_MSG} "Look in ${NCGIDIR} for cgi scripts."
 .endif
 	@${ECHO_MSG} "Look in ${NDOCDIR} for documentation."
 
 .include <bsd.port.mk>

Property changes on: head/sysutils/nut22/Makefile
___________________________________________________________________
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/nut22/distinfo
===================================================================
--- head/sysutils/nut22/distinfo	(revision 26586)
+++ head/sysutils/nut22/distinfo	(revision 26587)
@@ -1 +1 @@
-MD5 (nut-0.43.0.tar.gz) = ca434de59590517430fa44280e32c5d0
+MD5 (nut-0.43.1.tar.gz) = 9f9ba2843065b6b8002558cd5dc779de

Property changes on: head/sysutils/nut22/distinfo
___________________________________________________________________
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/nut22/files/patch-aa
===================================================================
--- head/sysutils/nut22/files/patch-aa	(revision 26586)
+++ head/sysutils/nut22/files/patch-aa	(revision 26587)
@@ -1,54 +1,57 @@
---- clients/Makefile.in.org	Wed Nov 10 01:36:44 1999
-+++ clients/Makefile.in	Mon Jan 10 16:43:44 2000
-@@ -53,8 +53,8 @@
+diff -ru ../431/clients/Makefile.in ./clients/Makefile.in
+--- ../431/clients/Makefile.in	Mon Feb 14 09:39:16 2000
++++ ./clients/Makefile.in	Mon Mar  6 17:29:46 2000
+@@ -57,10 +57,10 @@
+ distclean: clean
  
  install: all
- 	@for p in $(PROGS) ; do \
--		echo cp $$p $(BASEPATH)/bin; \
--		cp $$p $(BASEPATH)/bin; \
-+		echo cp $$p $(BASEPATH)/sbin; \
-+		cp $$p $(BASEPATH)/sbin; \
- 	done
+-	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/bin
++	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/sbin
  
  install-cgi: cgi
+-	$(INSTALLCMD) -m $(INSTALLMODE) $(CGIPROGS) $(BASEPATH)/cgi-bin
++	$(INSTALLCMD) -m $(INSTALLMODE) $(CGIPROGS) $(BASEPATH)/share/nut/cgi
  
---- conf/Makefile.in.org	Mon Oct 18 03:56:11 1999
-+++ conf/Makefile.in	Tue Jan 11 16:57:15 2000
-@@ -9,10 +9,6 @@
+ install-misc: upsfetch.o
+ 	$(INSTALLCMD) upsfetch.[oh] $(BASEPATH)/misc
+diff -ru ../431/conf/Makefile.in ./conf/Makefile.in
+--- ../431/conf/Makefile.in	Mon Feb 14 09:08:01 2000
++++ ./conf/Makefile.in	Mon Mar  6 17:30:39 2000
+@@ -12,17 +12,9 @@
  
  install:
- 	@for f in $(CONFFILES) ; do \
+ 	@for f in $(SECFILES) ; do \
 -		if [ -f $(CONFPATH)/$$f ]; then \
 -			echo "Preserving existing config file: $$f"; \
 -		else \
--			echo cp $$f $(CONFPATH); \
--			cp $$f $(CONFPATH); \
+-			$(INSTALLCMD) -m 0600 $$f $(BASEPATH)/etc; \
 -		fi; \
-+		echo cp $$f $(CONFPATH)/$$f.sample; \
-+		cp $$f $(CONFPATH)/$$f.sample; \
++		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
  	done
  
---- server/Makefile.in.org	Wed Nov 10 01:37:01 1999
-+++ server/Makefile.in	Mon Jan 10 16:41:55 2000
-@@ -21,6 +21,6 @@
+ 	@for f in $(PUBFILES) ; do \
+-		if [ -f $(CONFPATH)/$$f ]; then \
+-			echo "Preserving existing config file: $$f"; \
+-		else \
+-			$(INSTALLCMD) -m 0644 $$f $(BASEPATH)/etc; \
+-		fi; \
++		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
+ 	done
+diff -ru ../431/models/Makefile.in ./models/Makefile.in
+--- ../431/models/Makefile.in	Fri Feb 11 03:14:25 2000
++++ ./models/Makefile.in	Mon Mar  6 17:29:46 2000
+@@ -36,4 +36,4 @@
+ distclean: clean
  
  install: all
- 	@for p in $(PROGS) ; do \
--		echo cp $$p $(BASEPATH)/bin ; \
--		cp $$p $(BASEPATH)/bin; \
-+		echo cp $$p $(BASEPATH)/sbin ; \
-+		cp $$p $(BASEPATH)/sbin; \
- 	done
-
---- models/Makefile.in.org	Wed Nov 10 01:36:44 1999
-+++ models/Makefile.in	Mon Jan 10 16:43:44 2000
-@@ -35,6 +35,6 @@
+-	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/bin
++	$(INSTALLCMD) -m $(INSTALLMODE) $(PROGS) $(BASEPATH)/sbin
+diff -ru ../431/server/Makefile.in ./server/Makefile.in
+--- ../431/server/Makefile.in	Fri Feb 11 03:18:22 2000
++++ ./server/Makefile.in	Mon Mar  6 17:29:46 2000
+@@ -22,4 +22,4 @@
+ distclean: clean
  
  install: all
- 	@for p in $(PROGS) ; do \
--		echo cp $$p $(BASEPATH)/bin; \
--		cp $$p $(BASEPATH)/bin; \
-+		echo cp $$p $(BASEPATH)/sbin; \
-+		cp $$p $(BASEPATH)/sbin; \
- 	done
-
+-	$(INSTALLCMD) $(PROGS) $(BASEPATH)/bin
++	$(INSTALLCMD) $(PROGS) $(BASEPATH)/sbin

Property changes on: head/sysutils/nut22/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property