Unify the patches and distinfo for sysutils/ups-nut and sysutils/ups-nut-cgi.

Both are under sysutils/ups-nut now.

6 files changed, 23 insertions, 44 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 0f51bd7d381..649223b7c54 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/05/11 15:01:00 seb Exp $
+# $NetBSD: Makefile,v 1.42 2006/08/02 12:11:00 ghen Exp $
 
 DISTNAME=		nut-2.0.3
 PKGNAME=		ups-nut-cgi-2.0.3
@@ -9,6 +9,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.networkupstools.org/
 COMMENT=		Network UPS Tools CGI scripts
 
+DISTINFO_FILE=		${.CURDIR}/../../sysutils/ups-nut/distinfo
+PATCHDIR=		${.CURDIR}/../../sysutils/ups-nut/patches
+
 DEPENDS+=		ups-nut-2.*:../../sysutils/ups-nut
 
 BUILD_TARGET=		cgi
@@ -17,7 +20,7 @@ INSTALL_TARGET=		install-cgi
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR:Q}			\
 			--datadir=${NUT_DATADIR:Q}			\
-			--localstatedir=${NUT_STATEDIR:Q}			\
+			--localstatedir=${NUT_STATEDIR:Q}		\
 			--with-statepath=${NUT_STATEDIR:Q}		\
 			--with-cgi					\
 			--with-cgipath=${NUT_CGIDIR:Q}
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
deleted file mode 100644
index a8557fa3e4f..00000000000
--- a/sysutils/ups-nut-cgi/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.17 2006/05/11 15:01:00 seb Exp $
-
-SHA1 (nut-2.0.3.tar.gz) = 3ea064668846529d95663eadbf07b41ca8c25b1d
-RMD160 (nut-2.0.3.tar.gz) = 890c52b1ab538101c30e5be33e785817a773cdb9
-Size (nut-2.0.3.tar.gz) = 656376 bytes
-SHA1 (patch-aa) = c127e81de7377dce56fccc842eb7207c972805d2
-SHA1 (patch-ac) = b8f2f582168834b3957b1a877f3cd55cdeb2a92e
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
deleted file mode 100644
index ac9939fed4a..00000000000
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/04/05 22:38:09 martin Exp $
-
---- Makefile.in.orig	2004-03-08 11:00:02.000000000 +0100
-+++ Makefile.in	2004-04-05 03:30:50.000000000 +0200
-@@ -72,9 +72,10 @@
- 	@echo "Run 'configure --with-cgi' before doing 'make cgi'."
- 
- 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 \
diff --git a/sysutils/ups-nut-cgi/patches/patch-ac b/sysutils/ups-nut-cgi/patches/patch-ac
deleted file mode 100644
index f813f1f5135..00000000000
--- a/sysutils/ups-nut-cgi/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/02/15 13:15:43 lukem Exp $
-
---- conf/Makefile.in.orig	Tue Sep  3 17:23:02 2002
-+++ conf/Makefile.in
-@@ -4,7 +4,7 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- 
--CONFPATH	= $(DESTDIR)@sysconfdir@
-+CONFPATH	= $(DESTDIR)@prefix@/share/examples/nut
- 
- INSTALLCMD  = @INSTALL@
- 
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 3ca97b6e2eb..315bd848c37 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.23 2006/03/09 18:32:33 abs Exp $
+$NetBSD: distinfo,v 1.24 2006/08/02 12:11:00 ghen Exp $
 
 SHA1 (nut-2.0.3.tar.gz) = 3ea064668846529d95663eadbf07b41ca8c25b1d
 RMD160 (nut-2.0.3.tar.gz) = 890c52b1ab538101c30e5be33e785817a773cdb9
 Size (nut-2.0.3.tar.gz) = 656376 bytes
 SHA1 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b
-SHA1 (patch-ab) = c7ffec283e3e8a92e942035b5cc16167d58725a3
+SHA1 (patch-ab) = 2a5ad1397736f8119532d756afe31dd523a23813
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
index 5027beb7cf1..442e156d77d 100644
--- a/sysutils/ups-nut/patches/patch-ab
+++ b/sysutils/ups-nut/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/04/05 22:39:42 martin Exp $
+$NetBSD: patch-ab,v 1.9 2006/08/02 12:11:00 ghen Exp $
 
---- Makefile.in.orig	2004-03-08 11:00:02.000000000 +0100
-+++ Makefile.in	2004-04-05 02:31:25.000000000 +0200
-@@ -41,7 +41,7 @@
+--- Makefile.in.orig	2006-08-02 13:55:06.000000000 +0200
++++ Makefile.in
+@@ -41,7 +41,7 @@ distclean: clean
  		rm $$i/Makefile; \
  	done
  
@@ -11,3 +11,15 @@ $NetBSD: patch-ab,v 1.8 2004/04/05 22:39:42 martin Exp $
  
  install-bin:
  	@for i in $(SUBDIRS); do \
+@@ -72,9 +72,10 @@ build-cgi-fake:
+ 	@echo "Run 'configure --with-cgi' before doing 'make cgi'."
+ 
+ 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 \