Back-propagate the changes that patch-ac makes to doc/Makefile.in to

doc/Makefile.am. Otherwise, the changes are lost when automake is
rerun, which now (?) happens sometimes (?) during the build. This then
leads to massive PLIST divergence. Bump PKGREVISION in case anyone,
such as perhaps the person who updated it, installed it without
PKG_DEVELOPER set.

4 files changed, 94 insertions, 4 deletions

diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index c1b4e3f77e4..81331b33a90 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2012/03/07 16:29:45 adam Exp $
+# $NetBSD: Makefile,v 1.41 2012/06/16 06:47:25 dholland Exp $
 
 DISTNAME=	gri-2.12.23
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gri/}
 
diff --git a/graphics/gri/distinfo b/graphics/gri/distinfo
index 97f7d032a33..7a43af35e6c 100644
--- a/graphics/gri/distinfo
+++ b/graphics/gri/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2012/03/07 16:29:45 adam Exp $
+$NetBSD: distinfo,v 1.10 2012/06/16 06:47:25 dholland Exp $
 
 SHA1 (gri-2.12.23.tar.gz) = 75856cc100040da28ba7d667e12301293e7dd5a5
 RMD160 (gri-2.12.23.tar.gz) = 9cd7861c88f7db0ec9a23e9cc2a2971a9d763842
 Size (gri-2.12.23.tar.gz) = 1668587 bytes
 SHA1 (patch-aa) = bce867b76177e0625e36f7dead764cce9ba8cb6f
 SHA1 (patch-ab) = a6bfac5aa9d3dd1228a35d31900e3b553a293552
-SHA1 (patch-ac) = c4552643d14c32ff3539daf9193565077c2eb583
+SHA1 (patch-ac) = 23ff5c44f023395a0af21e329c887bb846d9dfba
 SHA1 (patch-ae) = f3f25302a8893b3cbe23f909ffd5c8a2782c5b1f
+SHA1 (patch-doc_Makefile_am) = 990c56b17bbc6bf35076e9ac9cd8768b9d3e7f2c
diff --git a/graphics/gri/patches/patch-ac b/graphics/gri/patches/patch-ac
index 91be0f6559a..a18e7229820 100644
--- a/graphics/gri/patches/patch-ac
+++ b/graphics/gri/patches/patch-ac
@@ -1,4 +1,9 @@
-$NetBSD: patch-ac,v 1.4 2012/03/07 16:29:45 adam Exp $
+$NetBSD: patch-ac,v 1.5 2012/06/16 06:47:25 dholland Exp $
+
+- configure paths for pkgsrc; throw away OS-dependent path logic
+- use the right mkdir -p
+
+This patch needs to match patch-doc_Makefile_am.
 
 --- doc/Makefile.in.orig	2011-07-06 14:09:14.000000000 +0000
 +++ doc/Makefile.in
diff --git a/graphics/gri/patches/patch-doc_Makefile_am b/graphics/gri/patches/patch-doc_Makefile_am
new file mode 100644
index 00000000000..554c42a17a4
--- /dev/null
+++ b/graphics/gri/patches/patch-doc_Makefile_am
@@ -0,0 +1,83 @@
+$NetBSD: patch-doc_Makefile_am,v 1.1 2012/06/16 06:47:25 dholland Exp $
+
+- configure paths for pkgsrc; throw away OS-dependent path logic
+- use the right mkdir -p
+
+This patch needs to match patch-ac.
+
+--- doc/Makefile.am.orig	2010-06-08 12:00:57.000000000 +0000
++++ doc/Makefile.am
+@@ -4,43 +4,11 @@
+               VPATH = @srcdir@
+       info_TEXINFOS = gri.texi
+     PACKAGE_VERSION = @PACKAGE_VERSION@
+-if OS_IS_LINUX_REDHAT
+-            MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-           INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-            DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri-${PACKAGE_VERSION}
+-           HTML_DIR = $(DOC_DIR)/html
+-       EXAMPLES_DIR = $(DOC_DIR)/examples
+-else
+-if OS_IS_LINUX_DEBIAN
+-            MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-           INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-            DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri
+-           HTML_DIR = $(DOC_DIR)/html
+-       EXAMPLES_DIR = $(DOC_DIR)/examples
+-else
+-if OS_IS_FINK
+-            MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-           INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-            DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri-${PACKAGE_VERSION}
+-           HTML_DIR = $(DOC_DIR)/html
+-       EXAMPLES_DIR = $(DOC_DIR)/examples
+-else
+-if OS_IS_FREEBSD
+-            MAN_DIR = $(DESTDIR)$(prefix)/man/man1
+-           INFO_DIR = $(DESTDIR)$(prefix)/info
++            MAN_DIR = $(DESTDIR)$(prefix)/${PKGMANDIR}/man1
++           INFO_DIR = $(DESTDIR)$(prefix)/${PKGINFODIR}
+             DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri
+-           HTML_DIR = $(DOC_DIR)/html
++           HTML_DIR = $(DESTDIR)$(prefix)/share/doc/gri/html
+        EXAMPLES_DIR = $(DESTDIR)$(prefix)/share/examples/gri
+-else
+-            MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-           INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-            DOC_DIR = $(DESTDIR)$(prefix)/share/gri/doc
+-           HTML_DIR = $(DOC_DIR)/html
+-       EXAMPLES_DIR = $(DOC_DIR)/examples
+-endif
+-endif
+-endif
+-endif
+                  RM = rm -f
+ #           REFCARD = refcard
+ #       CMD_REFCARD = cmdrefcard
+@@ -111,7 +79,7 @@ html-install:
+ 	$(INSTALL_DATA) $(srcdir)/examples/*.gri      $(EXAMPLES_DIR)
+ 	$(INSTALL_DATA) $(srcdir)/examples/e*.ps      $(EXAMPLES_DIR)
+ 	$(INSTALL_SCRIPT) $(srcdir)/examples/FEM.pl  $(EXAMPLES_DIR)
+-	(cd $(HTML_DIR); rm -rf examples ; ln -sf ../examples)
++	(cd $(HTML_DIR); rm -rf examples ; ln -sf ../../../examples/gri examples)
+ 
+ # Sun Jun  8 11:40:52 UTC 2003  [Dan Kelley]
+ # This is commented-out because it's not used.  Later it will be deleted.
+@@ -196,7 +164,7 @@ if !OS_IS_LINUX_REDHAT
+ 	$(INSTALL_DATA) refcard.ps                       $(DOC_DIR)
+ 	$(INSTALL_DATA) cmdrefcard.ps                    $(DOC_DIR)
+ endif
+-	mkdir -m 755 -p                                    $(MAN_DIR)
++	$(MKDIR_P)                                       $(MAN_DIR)
+ 	cat $(srcdir)/../doc/$(gri_manpage_name) | sed -e s,VERSION,${PACKAGE_VERSION}, > tmp
+ 	$(INSTALL_DATA)    tmp                             $(MAN_DIR)/gri.1
+ 	$(RM) tmp
+@@ -204,7 +172,7 @@ endif
+ #	they are supposed to go, at least on linux/redhat systems [2003-jun-8 Dan Kelley]
+ 	$(INSTALL_DATA) $(srcdir)/../doc/gri_merge.1-skel  $(MAN_DIR)/gri_merge.1
+ 	$(INSTALL_DATA) $(srcdir)/../doc/gri_unpage.1-skel $(MAN_DIR)/gri_unpage.1
+-	mkdir -m 755 -p                                    $(INFO_DIR)
++	$(MKDIR_P)                                         $(INFO_DIR)
+ 	echo "INSTALLING INTO INFO_DIR WHICH IS [$(INFO_DIR)]"
+ if !OS_IS_FINK
+ 	$(INSTALL_DATA)    $(srcdir)/../doc/gri.info*      $(INFO_DIR)