5 files changed, 42 insertions, 44 deletions

diff --git a/sysutils/nut22/files/patch-Makefile.in b/sysutils/nut22/files/patch-Makefile.in
deleted file mode 100644
index 72832e15e229..000000000000
--- a/sysutils/nut22/files/patch-Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.in.orig	Mon Oct 10 04:12:51 2005
-+++ Makefile.in	Thu Feb 23 19:44:12 2006
-@@ -90,6 +90,12 @@
- install-cgi-conf:
- 	@cd conf; $(MAKE) install-cgi-conf; cd ..;
- 
-+lib: build-lib
-+
-+build-lib:
-+	@cd common ; $(MAKE) || exit 1; cd ..;
-+	@cd clients; $(MAKE) libupsclient.a || exit 1; cd ..;
-+
- install-lib:
- 	@cd clients; $(MAKE) install-lib; cd ..;
- 	@cd man; $(MAKE) install-lib-man; cd ..;
-@@ -98,6 +104,7 @@
- usb: build-usb
- 
- build-usb:
-+	@cd common ; $(MAKE) || exit 1; cd ..;
- 	@cd drivers; $(MAKE) build-usb; cd ..;
- 
- install-usb:
-@@ -107,7 +114,8 @@
- snmp: build-snmp
- 
- build-snmp:
--	@cd drivers; $(MAKE) snmp-ups; cd ..;
-+	@cd common ; $(MAKE) || exit 1; cd ..;
-+	@cd drivers; $(MAKE) snmp-ups || exit 1; cd ..;
- 
- install-snmp: snmp install-snmp-man install-snmp-mgr
- 
diff --git a/sysutils/nut22/files/patch-clients-Makefile.in b/sysutils/nut22/files/patch-clients-Makefile.in
new file mode 100644
index 000000000000..a8fb0585387d
--- /dev/null
+++ b/sysutils/nut22/files/patch-clients-Makefile.in
@@ -0,0 +1,11 @@
+--- clients/Makefile.in.orig	2007-07-05 15:21:22.000000000 +0200
++++ clients/Makefile.in	2007-08-28 15:25:39.000000000 +0200
+@@ -440,7 +440,7 @@
+ 	done
+ install-cgiexecPROGRAMS: $(cgiexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(cgiexecdir)" || $(mkdir_p) "$(DESTDIR)$(cgiexecdir)"
++	test -z "$(cgiexec_PROGRAMS)" -o -z "$(cgiexecdir)" || $(mkdir_p) "$(DESTDIR)$(cgiexecdir)"
+ 	@list='$(cgiexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
diff --git a/sysutils/nut22/files/patch-data-html-Makefile.in b/sysutils/nut22/files/patch-data-html-Makefile.in
new file mode 100644
index 000000000000..002733026fcf
--- /dev/null
+++ b/sysutils/nut22/files/patch-data-html-Makefile.in
@@ -0,0 +1,20 @@
+--- data/html/Makefile.in.orig	2007-07-05 15:21:23.000000000 +0200
++++ data/html/Makefile.in	2007-08-28 15:25:08.000000000 +0200
+@@ -285,7 +285,7 @@
+ uninstall-info-am:
+ install-dist_htmlDATA: $(dist_html_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
++	test -z "$(dist_html_DATA)" -o -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ 	@list='$(dist_html_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -302,7 +302,7 @@
+ 	done
+ install-nodist_htmlDATA: $(nodist_html_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
++	test -z "$(nodist_html_DATA)" -o -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ 	@list='$(nodist_html_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
diff --git a/sysutils/nut22/files/patch-drivers_Makefile.in b/sysutils/nut22/files/patch-drivers_Makefile.in
deleted file mode 100644
index 5ef287b7ee51..000000000000
--- a/sysutils/nut22/files/patch-drivers_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- drivers/Makefile.in.orig	Thu Feb 23 19:38:14 2006
-+++ drivers/Makefile.in	Thu Feb 23 19:38:43 2006
-@@ -8,7 +8,7 @@
- 
- # other definitions
- CC	= @CC@
--CFLAGS	= -I../include @CFLAGS@
-+CFLAGS	= -I../include @CFLAGS@ @LIBUSB_CFLAGS@
- PROGS	= bestups fentonups apcsmart everups belkin masterguard powercom \
- 	  cyberpower tripplite victronups genericups mge-utalk bestuferrups \
- 	  isbmex etapro liebert sms esupssmart tripplitesu blazer safenet \
diff --git a/sysutils/nut22/files/patch-include-Makefile.in b/sysutils/nut22/files/patch-include-Makefile.in
new file mode 100644
index 000000000000..ad0ffe555c98
--- /dev/null
+++ b/sysutils/nut22/files/patch-include-Makefile.in
@@ -0,0 +1,11 @@
+--- include/Makefile.in.orig	2007-08-28 15:39:22.000000000 +0200
++++ include/Makefile.in	2007-08-28 15:36:52.000000000 +0200
+@@ -229,7 +229,7 @@
+ 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 = $(shell if test "$(SVNREV)" = "exported" -o -z "${SVNREV}"; then echo "$(PACKAGE_VERSION)"; else echo "$(PACKAGE_VERSION)-$(SVNREV)"; fi)
+ all: $(BUILT_SOURCES) config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+