diff options
author | shattered <shattered> | 2011-08-14 21:42:14 +0000 |
---|---|---|
committer | shattered <shattered> | 2011-08-14 21:42:14 +0000 |
commit | 33e47746f1f3f0b5f6ec006f4620308c5d6ebf0d (patch) | |
tree | 99bbf2fe79a832562745a3f5def5d3035ae0cc77 /sysutils | |
parent | 86daaebe04d1042bfc776fc679b7c1054f236ce9 (diff) | |
download | pkgsrc-33e47746f1f3f0b5f6ec006f4620308c5d6ebf0d.tar.gz |
PR/38104 - remove conflict with nut: rename upsimage.cgi to apcupsimage.cgi
OK by maintainer.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/apcupsd/Makefile | 3 | ||||
-rw-r--r-- | sysutils/apcupsd/PLIST | 4 | ||||
-rw-r--r-- | sysutils/apcupsd/distinfo | 5 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-an | 33 |
4 files changed, 34 insertions, 11 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index e08faa5d227..cbcf44bee82 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2011/08/07 17:27:24 bouyer Exp $ +# $NetBSD: Makefile,v 1.64 2011/08/14 21:42:14 shattered Exp $ DISTNAME= apcupsd-3.14.9 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/} PKGREVISION= 1 diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST index 8766a31b5c6..e83ec6faac2 100644 --- a/sysutils/apcupsd/PLIST +++ b/sysutils/apcupsd/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.13 2011/08/01 14:54:51 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.14 2011/08/14 21:42:14 shattered Exp $ ${PLIST.cgi}libexec/cgi-bin/upsstats.cgi ${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi -${PLIST.cgi}libexec/cgi-bin/upsimage.cgi +${PLIST.cgi}libexec/cgi-bin/apcupsimage.cgi ${PLIST.cgi}libexec/cgi-bin/multimon.cgi sbin/apcaccess sbin/apctest diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo index 64cd3cef3c1..13cda87a67c 100644 --- a/sysutils/apcupsd/distinfo +++ b/sysutils/apcupsd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2011/08/01 14:54:51 bouyer Exp $ +$NetBSD: distinfo,v 1.16 2011/08/14 21:42:14 shattered Exp $ SHA1 (apcupsd-3.14.9.tar.gz) = 1e9e8a054f17c554c047ec1d7b363d35553058bc RMD160 (apcupsd-3.14.9.tar.gz) = be1a33b85c790fc3bc62bab370a62d014dbf0a57 @@ -14,5 +14,6 @@ SHA1 (patch-ai) = 0295d1bd90b5bb7890e93ef04f12c76cfdc6c94a SHA1 (patch-aj) = d6e3b244c184b090e3b3f56ab6780283e85b2593 SHA1 (patch-al) = bf84f2db316e944a7231ff4c75a5c903f61121dc SHA1 (patch-am) = a2c060519748cf95f0f9aaa284f783f086c1d7d4 -SHA1 (patch-an) = f9c58bff4cc839f11cd3d200c61e02bbb3d40ec3 +SHA1 (patch-an) = 4464effaf8c67e202bb6c71bad1e6c3fb87c5444 SHA1 (patch-ao) = 1f755c11e30759f023c3a1a6f23949300d1ff7f7 +SHA1 (patch-ap) = ad7d33ca160cd4ede277cf94c37d75f36e2edd4c diff --git a/sysutils/apcupsd/patches/patch-an b/sysutils/apcupsd/patches/patch-an index 37efa13dc14..713740fdd52 100644 --- a/sysutils/apcupsd/patches/patch-an +++ b/sysutils/apcupsd/patches/patch-an @@ -1,27 +1,48 @@ -$NetBSD: patch-an,v 1.6 2011/08/01 14:54:51 bouyer Exp $ +$NetBSD: patch-an,v 1.7 2011/08/14 21:42:14 shattered Exp $ ---- src/cgi/Makefile.orig 2011-08-01 15:54:51.000000000 +0200 -+++ src/cgi/Makefile 2011-08-01 15:55:10.000000000 +0200 -@@ -39,22 +39,12 @@ +--- src/cgi/Makefile.orig 2009-09-20 19:41:26.000000000 +0000 ++++ src/cgi/Makefile +@@ -16,7 +16,7 @@ upsimage_obj := $(call SRC2OBJ,$(upsim + SRCS = $(common_srcs) $(multimon_srcs) $(upsstats_srcs) \ + $(upsfstats_srcs) $(upsimage_srcs) + +-all-targets: multimon.cgi upsstats.cgi upsfstats.cgi upsimage.cgi ++all-targets: multimon.cgi upsstats.cgi upsfstats.cgi apcupsimage.cgi + + multimon.cgi: $(common_obj) $(multimon_obj) $(APCLIBS) + $(LINK) +@@ -27,7 +27,7 @@ upsstats.cgi: $(common_obj) $(upsstats_o + upsfstats.cgi: $(common_obj) $(upsfstats_obj) $(APCLIBS) + $(LINK) + +-upsimage.cgi: $(common_obj) $(upsimage_obj) $(APCLIBS) ++apcupsimage.cgi: $(common_obj) $(upsimage_obj) $(APCLIBS) + $(LINK) $(X_LIBS) $(LIBGD) + + all-install: install-cgi +@@ -38,23 +38,13 @@ install-cgi: + $(call INSTPROG,755,multimon.cgi,$(cgibin)) $(call INSTPROG,755,upsstats.cgi,$(cgibin)) $(call INSTPROG,755,upsfstats.cgi,$(cgibin)) - $(call INSTPROG,755,upsimage.cgi,$(cgibin)) +- $(call INSTPROG,755,upsimage.cgi,$(cgibin)) - $(call MKDIR,$(sysconfdir)) - $(call INSTNEW,644,apcupsd.css,$(sysconfdir)) - $(call INSTNEW,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir)) - $(call INSTNEW,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir)) ++ $(call INSTPROG,755,apcupsimage.cgi,$(cgibin)) uninstall-cgi: $(call UNINST,$(cgibin)/multimon.cgi) $(call UNINST,$(cgibin)/upsstats.cgi) $(call UNINST,$(cgibin)/upsfstats.cgi) - $(call UNINST,$(cgibin)/upsimage.cgi) +- $(call UNINST,$(cgibin)/upsimage.cgi) - $(call UNINST,$(sysconfdir)/apcupsd.css) - $(call UNINST,$(sysconfdir)/apcupsd.css.new) - $(call UNINST,$(sysconfdir)/hosts.conf) - $(call UNINST,$(sysconfdir)/hosts.conf.new) - $(call UNINST,$(sysconfdir)/multimon.conf) - $(call UNINST,$(sysconfdir)/multimon.conf.new) ++ $(call UNINST,$(cgibin)/apcupsimage.cgi) # Include dependencies -include $(DEPS) |