Remove the previous post-install hack which moved documentation around.

Add patches to put the documentation in the correct directory, according
to hier(7).
Fixes the concerns raised in pkg PR 8620 by Simon Burge.

7 files changed, 101 insertions, 8 deletions

diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index a70210b1b51..577a5330852 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/10/21 15:12:40 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/10/21 15:15:01 agc Exp $
 
 DISTNAME=       siag-3.1.20
 CATEGORIES=     misc textproc math
@@ -29,8 +29,4 @@ DEPENDS+=	ncurses-4.2:../../devel/ncurses
 
 XAW_TYPE?=	3d
 
-post-install:
-	${MV} ${PREFIX}/doc/siag ${PREFIX}/share/doc/siag
-	-${RMDIR} ${PREFIX}/doc
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/patches/patch-aa b/misc/siag/patches/patch-aa
index 20b865b0494..bd792392b32 100644
--- a/misc/siag/patches/patch-aa
+++ b/misc/siag/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/03/05 01:52:32 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 1999/10/21 15:15:02 agc Exp $
 
---- siag/Makefile.in.BAK	Fri Mar  5 02:04:49 1999
-+++ siag/Makefile.in	Fri Mar  5 02:05:41 1999
+--- Makefile.in.orig	Tue Jul  6 02:09:00 1999
++++ Makefile.in	Thu Oct 21 16:07:11 1999
 @@ -58,7 +58,7 @@
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -11,3 +11,19 @@ $NetBSD: patch-aa,v 1.3 1999/03/05 01:52:32 hubertf Exp $
  GUILE = @GUILE@
  LIBCURSES = @LIBCURSES@
  LIBDL = @LIBDL@
+@@ -423,12 +423,12 @@
+ 
+ install-data-local:
+ 	@echo "Install support files for Siag"
+-	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/siag/siag
+-	cp $(srcdir)/data.scm $(DESTDIR)$(prefix)/doc/siag/siag
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/siag/siag
++	cp $(srcdir)/data.scm $(DESTDIR)$(prefix)/share/doc/siag/siag
+ 
+ uninstall-local:
+ 	@echo "Uninstalling support files for Siag"
+-	rm -rf $(DESTDIR)$(prefix)/doc/siag/siag
++	rm -rf $(DESTDIR)$(prefix)/share/doc/siag/siag
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/misc/siag/patches/patch-ag b/misc/siag/patches/patch-ag
new file mode 100644
index 00000000000..4b7bbc07813
--- /dev/null
+++ b/misc/siag/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 1999/10/21 15:15:02 agc Exp $
+
+Use the correct doc directory
+
+--- gvu/Makefile.in	1999/10/21 15:04:19	1.1
++++ gvu/Makefile.in	1999/10/21 15:04:40
+@@ -83,7 +83,7 @@
+ VERSION = @VERSION@
+ XAWLIB = @XAWLIB@
+ 
+-docdir = $(prefix)/doc/siag/gvu
++docdir = $(prefix)/share/doc/siag/gvu
+ 
+ doc_DATA = README COPYING CHANGES TODO gs.interface comments.doc gvu.html \
+ 	copyright.html
diff --git a/misc/siag/patches/patch-ah b/misc/siag/patches/patch-ah
new file mode 100644
index 00000000000..3703a5d3d94
--- /dev/null
+++ b/misc/siag/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 1999/10/21 15:15:02 agc Exp $
+
+Use the correct directory for docs.
+
+--- plugins/Makefile.in	1999/10/21 15:05:37	1.1
++++ plugins/Makefile.in	1999/10/21 15:05:57
+@@ -83,7 +83,7 @@
+ 
+ bindir = $(libexecdir)/siag/plugins
+ 
+-docdir = $(prefix)/doc/siag/plugins
++docdir = $(prefix)/share/doc/siag/plugins
+ 
+ doc_DATA = README CHANGES
+ 
diff --git a/misc/siag/patches/patch-ai b/misc/siag/patches/patch-ai
new file mode 100644
index 00000000000..1d3dc718df8
--- /dev/null
+++ b/misc/siag/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 1999/10/21 15:15:03 agc Exp $
+
+Use the correct doc directory
+
+--- xcommon/Makefile.in	1999/10/21 15:08:23	1.1
++++ xcommon/Makefile.in	1999/10/21 15:08:41
+@@ -439,11 +439,11 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/siag/xcommon
+-	cp $(srcdir)/form.scm $(DESTDIR)$(prefix)/doc/siag/xcommon
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/siag/xcommon
++	cp $(srcdir)/form.scm $(DESTDIR)$(prefix)/share/doc/siag/xcommon
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)@prefix@/doc/siag/xcommon
++	rm -rf $(DESTDIR)@prefix@/share/doc/siag/xcommon
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/misc/siag/patches/patch-aj b/misc/siag/patches/patch-aj
new file mode 100644
index 00000000000..e744df15ecc
--- /dev/null
+++ b/misc/siag/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 1999/10/21 15:15:03 agc Exp $
+
+Use the correct doc directory.
+
+--- xed/Makefile.in	1999/10/21 15:09:36	1.1
++++ xed/Makefile.in	1999/10/21 15:09:49
+@@ -83,7 +83,7 @@
+ VERSION = @VERSION@
+ XAWLIB = @XAWLIB@
+ 
+-docdir = $(prefix)/doc/siag/xedplus
++docdir = $(prefix)/share/doc/siag/xedplus
+ 
+ doc_DATA = xedplus.html CHANGES README TODO
+ 
diff --git a/misc/siag/patches/patch-ak b/misc/siag/patches/patch-ak
new file mode 100644
index 00000000000..096d041b72c
--- /dev/null
+++ b/misc/siag/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 1999/10/21 15:15:03 agc Exp $
+
+Use the correct documentation directory.
+
+--- xfiler/Makefile.in	1999/10/21 15:10:40	1.1
++++ xfiler/Makefile.in	1999/10/21 15:10:53
+@@ -85,7 +85,7 @@
+ 
+ xfilerdir = $(datadir)/siag/xfiler
+ 
+-docdir = $(prefix)/doc/siag/xfiler
++docdir = $(prefix)/share/doc/siag/xfiler
+ 
+ doc_DATA = xfiler.html README CHANGES TODO
+