diff options
author | Martin Matuska <mm@FreeBSD.org> | 2008-02-19 12:23:39 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2008-02-19 12:23:39 +0000 |
commit | f366e089522a2b15ae67451c0169b8fff850853f (patch) | |
tree | 52c68f9eac74aad3bd2d169889e83b22bcd02044 /sysutils | |
parent | 2259fcb443dd884c34720f6775d5a5b95babce16 (diff) | |
download | ports-f366e089522a2b15ae67451c0169b8fff850853f.tar.gz ports-f366e089522a2b15ae67451c0169b8fff850853f.zip |
- Update to 2.2.1
PR: ports/119777
Submitted by: Mikle Davidkin <skylord at vt.net.ru>
Tested by: mm
Approved by: maintainer (timeout)
Notes
Notes:
svn path=/head/; revision=207582
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/nut/Makefile | 4 | ||||
-rw-r--r-- | sysutils/nut/distinfo | 12 | ||||
-rw-r--r-- | sysutils/nut/files/patch-include-Makefile.in | 10 | ||||
-rw-r--r-- | sysutils/nut/pkg-plist | 1 | ||||
-rw-r--r-- | sysutils/nut22/Makefile | 4 | ||||
-rw-r--r-- | sysutils/nut22/distinfo | 12 | ||||
-rw-r--r-- | sysutils/nut22/files/patch-include-Makefile.in | 10 | ||||
-rw-r--r-- | sysutils/nut22/pkg-plist | 1 |
8 files changed, 28 insertions, 26 deletions
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 973ab7ac05b2..4d8073571ab4 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -6,8 +6,8 @@ # PORTNAME= nut -PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTVERSION= 2.2.1 +#PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo index ee34cf696f29..f523f9165a9f 100644 --- a/sysutils/nut/distinfo +++ b/sysutils/nut/distinfo @@ -1,6 +1,6 @@ -MD5 (nut-2.2.0.tar.gz) = a3570515d80804051d4e7631e8a3eb12 -SHA256 (nut-2.2.0.tar.gz) = e670ff7b51a652fd61472aa5fa5a1ed4730b5411671068be456551ea46094120 -SIZE (nut-2.2.0.tar.gz) = 1173801 -MD5 (nut-2.2.0.tar.gz.sig) = b844a079cd7673f79d87197c189f23fe -SHA256 (nut-2.2.0.tar.gz.sig) = 6b240886432e0e095c4bf6109a79f4bd1c67e53a14438fe885f7ffd7932e2169 -SIZE (nut-2.2.0.tar.gz.sig) = 65 +MD5 (nut-2.2.1.tar.gz) = c7ae871961a7dbe12b22d504267dc132 +SHA256 (nut-2.2.1.tar.gz) = 9aad15d8cdd8694839b54342c8b4c26ddce508f6fb29ff4bee3abbe1555771f4 +SIZE (nut-2.2.1.tar.gz) = 1192538 +MD5 (nut-2.2.1.tar.gz.sig) = 544eb134c6f42887656eb0aabde10df3 +SHA256 (nut-2.2.1.tar.gz.sig) = 769320a47ffcb96ada3f774c48f8338d7cd6836dca8c72d439bfc8bffe661393 +SIZE (nut-2.2.1.tar.gz.sig) = 65 diff --git a/sysutils/nut/files/patch-include-Makefile.in b/sysutils/nut/files/patch-include-Makefile.in index ad0ffe555c98..de795aaf72e0 100644 --- a/sysutils/nut/files/patch-include-Makefile.in +++ b/sysutils/nut/files/patch-include-Makefile.in @@ -1,9 +1,9 @@ ---- include/Makefile.in.orig 2007-08-28 15:39:22.000000000 +0200 -+++ include/Makefile.in 2007-08-28 15:36:52.000000000 +0200 +--- include/Makefile.in.orig Fri Dec 21 15:00:52 2007 ++++ include/Makefile.in Thu Jan 17 20:23:32 2008 @@ -229,7 +229,7 @@ - BUILT_SOURCES = nut_version.h - CLEANFILES = nut_version.h - SVNREV = $(shell svnversion -n $(top_srcdir) 2>/dev/null) + BUILT_SOURCES = nut_version.h nut_stdint.h + CLEANFILES = nut_version.h nut_stdint.h + SVNREV = $(shell unset LANG && 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 = $(shell if test "$(SVNREV)" = "exported" -o -z "${SVNREV}"; then echo "$(PACKAGE_VERSION)"; else echo "$(PACKAGE_VERSION)-$(SVNREV)"; fi) all: $(BUILT_SOURCES) config.h diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index c9f2f25af901..f586f5cfa8d7 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -78,6 +78,7 @@ sbin/upssched %%NUT_CGI%%%%WWWDIR%%/nut/index.html %%NUT_CGI%%%%WWWDIR%%/nut/nut-banner.png @dirrmtry etc/nut +@dirrmtry lib/pkgconfig @dirrmtry libexec/nut @dirrmtry %%STATEDIR%% %%NUT_CGI%%@dirrm %%CGIDIR%%/nut diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile index 973ab7ac05b2..4d8073571ab4 100644 --- a/sysutils/nut22/Makefile +++ b/sysutils/nut22/Makefile @@ -6,8 +6,8 @@ # PORTNAME= nut -PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTVERSION= 2.2.1 +#PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo index ee34cf696f29..f523f9165a9f 100644 --- a/sysutils/nut22/distinfo +++ b/sysutils/nut22/distinfo @@ -1,6 +1,6 @@ -MD5 (nut-2.2.0.tar.gz) = a3570515d80804051d4e7631e8a3eb12 -SHA256 (nut-2.2.0.tar.gz) = e670ff7b51a652fd61472aa5fa5a1ed4730b5411671068be456551ea46094120 -SIZE (nut-2.2.0.tar.gz) = 1173801 -MD5 (nut-2.2.0.tar.gz.sig) = b844a079cd7673f79d87197c189f23fe -SHA256 (nut-2.2.0.tar.gz.sig) = 6b240886432e0e095c4bf6109a79f4bd1c67e53a14438fe885f7ffd7932e2169 -SIZE (nut-2.2.0.tar.gz.sig) = 65 +MD5 (nut-2.2.1.tar.gz) = c7ae871961a7dbe12b22d504267dc132 +SHA256 (nut-2.2.1.tar.gz) = 9aad15d8cdd8694839b54342c8b4c26ddce508f6fb29ff4bee3abbe1555771f4 +SIZE (nut-2.2.1.tar.gz) = 1192538 +MD5 (nut-2.2.1.tar.gz.sig) = 544eb134c6f42887656eb0aabde10df3 +SHA256 (nut-2.2.1.tar.gz.sig) = 769320a47ffcb96ada3f774c48f8338d7cd6836dca8c72d439bfc8bffe661393 +SIZE (nut-2.2.1.tar.gz.sig) = 65 diff --git a/sysutils/nut22/files/patch-include-Makefile.in b/sysutils/nut22/files/patch-include-Makefile.in index ad0ffe555c98..de795aaf72e0 100644 --- a/sysutils/nut22/files/patch-include-Makefile.in +++ b/sysutils/nut22/files/patch-include-Makefile.in @@ -1,9 +1,9 @@ ---- include/Makefile.in.orig 2007-08-28 15:39:22.000000000 +0200 -+++ include/Makefile.in 2007-08-28 15:36:52.000000000 +0200 +--- include/Makefile.in.orig Fri Dec 21 15:00:52 2007 ++++ include/Makefile.in Thu Jan 17 20:23:32 2008 @@ -229,7 +229,7 @@ - BUILT_SOURCES = nut_version.h - CLEANFILES = nut_version.h - SVNREV = $(shell svnversion -n $(top_srcdir) 2>/dev/null) + BUILT_SOURCES = nut_version.h nut_stdint.h + CLEANFILES = nut_version.h nut_stdint.h + SVNREV = $(shell unset LANG && 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 = $(shell if test "$(SVNREV)" = "exported" -o -z "${SVNREV}"; then echo "$(PACKAGE_VERSION)"; else echo "$(PACKAGE_VERSION)-$(SVNREV)"; fi) all: $(BUILT_SOURCES) config.h diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist index c9f2f25af901..f586f5cfa8d7 100644 --- a/sysutils/nut22/pkg-plist +++ b/sysutils/nut22/pkg-plist @@ -78,6 +78,7 @@ sbin/upssched %%NUT_CGI%%%%WWWDIR%%/nut/index.html %%NUT_CGI%%%%WWWDIR%%/nut/nut-banner.png @dirrmtry etc/nut +@dirrmtry lib/pkgconfig @dirrmtry libexec/nut @dirrmtry %%STATEDIR%% %%NUT_CGI%%@dirrm %%CGIDIR%%/nut |