From f5a3a55344cd842a1d8b18b354320c5991762a11 Mon Sep 17 00:00:00 2001
From: wulf <wulf>
Date: Sun, 21 May 2000 13:40:30 +0000
Subject: Fixed bug which prevented dpbox to build succesfully on systems
 without a valid cgi-bin directory.

---
 ham/dpbox/files/patch-sum  |  4 +--
 ham/dpbox/patches/patch-aa | 61 ++++++++++++++++++++++++++++------------------
 ham/dpbox/pkg/PLIST        |  4 ++-
 3 files changed, 42 insertions(+), 27 deletions(-)

(limited to 'ham/dpbox')

diff --git a/ham/dpbox/files/patch-sum b/ham/dpbox/files/patch-sum
index 1ce35eb1cf1..e94bc707b76 100644
--- a/ham/dpbox/files/patch-sum
+++ b/ham/dpbox/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/05/15 10:54:44 wulf Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/21 13:40:30 wulf Exp $
 
-MD5 (patch-aa) = 7e8fa40fe8bb76bfb7a7f495e4562da3
+MD5 (patch-aa) = bbc6ecf24107cb080c52a291e48984a7
diff --git a/ham/dpbox/patches/patch-aa b/ham/dpbox/patches/patch-aa
index 51c1a057617..7b6dc74e229 100644
--- a/ham/dpbox/patches/patch-aa
+++ b/ham/dpbox/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/15 10:54:45 wulf Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
 
 --- Makefile.netbsd.orig	Thu Apr 27 22:18:57 2000
-+++ Makefile.netbsd	Mon May 15 20:05:31 2000
++++ Makefile.netbsd	Sun May 21 22:50:24 2000
 @@ -1,9 +1,9 @@
  ###############################################################################
  #                                                                             #
@@ -50,10 +50,28 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/05/15 10:54:45 wulf Exp $
  	  echo "***********************************************************"; \
  	else \
  	  $(MKDIR) $(confdir); \
-@@ -158,9 +164,20 @@
+@@ -158,24 +164,45 @@
  	  $(INSTALL_CONF) ../sf/* $(confdir)/sf; \
  	fi
  
+-	@if [ -e ${cgidir} ]; then \
+-	  echo "installing cgi-scripts"; \
+-	  $(INSTALL) -m 755 ../cgi/cgi/* $(cgidir); \
+-	  $(INSTALL_DATA) ../cgi/dpboxcgi/*.html $(cgidir); \
+-	fi
+-
+-	@if [ -e ${httpdir} ]; then \
+-	  echo "installing html pages"; \
+-	  $(MKDIR) $(httpdir)/dpbox/pic; \
+-	  $(INSTALL_DATA) ../cgi/dpbox/*.html $(httpdir)/dpbox; \
+-	  $(INSTALL_DATA) ../cgi/dpbox/pic/* $(httpdir)/dpbox/pic; \
+-	fi
+-
+-	@echo 
+-	@echo dpbox installation complete
+-	@echo 
+-	@echo Now edit the configuration files in $(confdir) and 
+-	@echo $(confdir)/dpbox.ini!!!
 +	$(MKDIR) $(exampledir); \
 +	$(INSTALL_CONF) ../dpbox.ini $(exampledir)/dpbox.ini; \
 +	$(MKDIR) $(exampledir)/system; \
@@ -61,26 +79,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/05/15 10:54:45 wulf Exp $
 +	$(MKDIR) $(exampledir)/sf ; \
 +	$(INSTALL_CONF) ../sf/* $(exampledir)/sf; \
 +
- 	@if [ -e ${cgidir} ]; then \
- 	  echo "installing cgi-scripts"; \
--	  $(INSTALL) -m 755 ../cgi/cgi/* $(cgidir); \
-+          for i in `ls -1 ../cgi/cgi`; \
-+          do \
-+	    $(SED) "s,/installdir,$(bindir)," < ../cgi/cgi/$$i > $(cgidir)/$$i; \
-+	    $(CHMOD) 555 $(cgidir)/$$i; \
-+	  done; \
- 	  $(INSTALL_DATA) ../cgi/dpboxcgi/*.html $(cgidir); \
- 	fi
- 
-@@ -171,11 +188,23 @@
- 	  $(INSTALL_DATA) ../cgi/dpbox/pic/* $(httpdir)/dpbox/pic; \
- 	fi
- 
--	@echo 
--	@echo dpbox installation complete
--	@echo 
--	@echo Now edit the configuration files in $(confdir) and 
--	@echo $(confdir)/dpbox.ini!!!
++	$(MKDIR) $(cgidir)
++	echo "installing cgi-scripts";
++	@for i in `ls -1 ../cgi/cgi`; \
++	do \
++	  $(SED) "s,/installdir,$(bindir)," < ../cgi/cgi/$$i > $(cgidir)/$$i; \
++	  $(CHMOD) 555 $(cgidir)/$$i; \
++	done; \
++	$(INSTALL_DATA) ../cgi/dpboxcgi/*.html $(cgidir);
++
++	$(MKDIR) $(httpdir)
++	echo "installing html pages";
++	$(MKDIR) $(httpdir)/dpbox/pic;
++	$(INSTALL_DATA) ../cgi/dpbox/*.html $(httpdir)/dpbox;
++	$(INSTALL_DATA) ../cgi/dpbox/pic/* $(httpdir)/dpbox/pic;
++
 +	@echo
 +	@echo "***********************************************************"
 +	@echo "*                                                         *"
@@ -101,7 +114,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/05/15 10:54:45 wulf Exp $
  
  clean:
  	$(RM)  *.o *~ .*~ *.orig *.bak *.s *.core  
-@@ -193,4 +222,3 @@
+@@ -193,4 +220,3 @@
  ifeq (.depend,$(wildcard .depend))
  include .depend
  endif
diff --git a/ham/dpbox/pkg/PLIST b/ham/dpbox/pkg/PLIST
index af934849f6d..604edb4f433 100644
--- a/ham/dpbox/pkg/PLIST
+++ b/ham/dpbox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/15 10:54:44 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/05/21 13:40:31 wulf Exp $
 bin/dpgate
 bin/dpcodeconv
 bin/dpmybbs
@@ -119,3 +119,5 @@ libexec/dpbox/search
 @dirrm share/examples/dpbox/conf
 @dirrm share/examples/dpbox
 @dirrm libexec/dpbox
+@dirrm share/httpd/htdocs/dpbox/pic
+@dirrm share/httpd/htdocs/dpbox
-- 
cgit v1.2.3