- update to 1.21

- conform with hier(7) more
- support NOPORTDOCS

PR:		31501
Submitted by:	maintainer (partially)

4 files changed, 65 insertions, 27 deletions

diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile
index 5bc4cd7cbb32..679656563a7b 100644
--- a/textproc/grap/Makefile
+++ b/textproc/grap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	grap
-PORTVERSION=	1.20
+PORTVERSION=	1.21
 CATEGORIES=	textproc graphics
 MASTER_SITES=	http://www.lunabase.org/~faber/Vault/software/grap/
 
diff --git a/textproc/grap/distinfo b/textproc/grap/distinfo
index 228d40f53886..d3bc6ef30ec1 100644
--- a/textproc/grap/distinfo
+++ b/textproc/grap/distinfo
@@ -1 +1 @@
-MD5 (grap-1.20.tar.gz) = 8833cce886b81a100793541b05ea0cf3
+MD5 (grap-1.21.tar.gz) = 249fc47d2b4e2a6522e626cf99705c71
diff --git a/textproc/grap/files/patch-Makefile.in b/textproc/grap/files/patch-Makefile.in
new file mode 100644
index 000000000000..ce8111ee766b
--- /dev/null
+++ b/textproc/grap/files/patch-Makefile.in
@@ -0,0 +1,38 @@
+--- Makefile.in.orig	Tue Oct 30 03:58:17 2001
++++ Makefile.in	Tue Oct 30 04:00:22 2001
+@@ -5,7 +5,7 @@
+ exec_prefix = @exec_prefix@
+ 
+ BINDIR = @bindir@
+-DEFINESDIR = @datadir@/grap
++DEFINESDIR = @datadir@
+ MANDIR = @mandir@/man1
+ 
+ PROGS=grap
+@@ -85,7 +85,7 @@
+ 	groff -mdoc grap.1 > grap.ps
+ 
+ grap.1:	grap.doc
+-	sed "s#DEFINES_FILE#${DEFINESDIR}/grap.defines#g; s#EXAMPLES#${DEFINESDIR}/examples#g;" < grap.doc > grap.1 ;
++	sed "s#DEFINES_FILE#${DEFINESDIR}/grap.defines#g; s#EXAMPLES#${DEFINESDIR}/examples/grap#g;" < grap.doc > grap.1 ;
+ 
+ # The || true lines allow make to continue on systems where install -d
+ # fails on existing directories.
+@@ -93,11 +93,14 @@
+ 	strip grap || true
+ 	${INSTALL} -d ${BINDIR} || true
+ 	${INSTALL} -d ${MANDIR} || true
+-	${INSTALL} -d ${DEFINESDIR}/examples || true
++	${INSTALL} -d ${DEFINESDIR}/examples/grap || true
+ 	${INSTALL_PROGRAM} grap ${BINDIR}
+ 	${INSTALL_DATA} grap.1 ${MANDIR}
+-	${INSTALL_DATA} grap*.defines README CHANGES COPYRIGHT grap.man ${DEFINESDIR}
+-	${INSTALL_DATA} examples/*.d examples/example.ms examples/*.result examples/Makefile ${DEFINESDIR}/examples
++.if !defined(NOPORTDOCS)
++	${INSTALL} -d ${DEFINESDIR}/doc/grap
++	${INSTALL_DATA} grap*.defines README CHANGES COPYRIGHT grap.man ${DEFINESDIR}/doc/grap
++.endif
++	${INSTALL_DATA} examples/*.d examples/example.ms examples/*.result examples/Makefile ${DEFINESDIR}/examples/grap
+ 
+ deinstall:
+ 	${RM} ${BINDIR}/grap
diff --git a/textproc/grap/pkg-plist b/textproc/grap/pkg-plist
index c92c4a2e69f2..f6da7c201ae1 100644
--- a/textproc/grap/pkg-plist
+++ b/textproc/grap/pkg-plist
@@ -1,26 +1,26 @@
 bin/grap
-share/grap/README
-share/grap/CHANGES
-share/grap/COPYRIGHT
-share/grap/grap.defines
-share/grap/grap.tex.defines
-share/grap/grap.man
-share/grap/examples/400mpairs.d
-share/grap/examples/400mtimes.d
-share/grap/examples/400wpairs.d
-share/grap/examples/Makefile
-share/grap/examples/army.d
-share/grap/examples/boyhts.d
-share/grap/examples/example.ms
-share/grap/examples/internet.d
-share/grap/examples/prof2.d
-share/grap/examples/states.d
-share/grap/examples/states2.d
-share/grap/examples/states3.d
-share/grap/examples/usapop.d
-share/grap/examples/cy_fatal.d
-share/grap/examples/result.SQ_MESH.Fail1.S3.R0.Global.Random1500.succ.result
-share/grap/examples/result.SQ_MESH.Fail1.S3.R0.Local.Random1500.succ.result
-share/grap/examples/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result
-@dirrm share/grap/examples
-@dirrm share/grap
+%%PORTDOCS%%share/doc/grap/README
+%%PORTDOCS%%share/doc/grap/CHANGES
+%%PORTDOCS%%share/doc/grap/COPYRIGHT
+%%PORTDOCS%%share/doc/grap/grap.defines
+%%PORTDOCS%%share/doc/grap/grap.tex.defines
+%%PORTDOCS%%share/doc/grap/grap.man
+share/examples/grap/400mpairs.d
+share/examples/grap/400mtimes.d
+share/examples/grap/400wpairs.d
+share/examples/grap/Makefile
+share/examples/grap/army.d
+share/examples/grap/boyhts.d
+share/examples/grap/example.ms
+share/examples/grap/internet.d
+share/examples/grap/prof2.d
+share/examples/grap/states.d
+share/examples/grap/states2.d
+share/examples/grap/states3.d
+share/examples/grap/usapop.d
+share/examples/grap/cy_fatal.d
+share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Global.Random1500.succ.result
+share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Local.Random1500.succ.result
+share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result
+@dirrm share/examples/grap
+%%PORTDOCS%%@dirrm share/doc/grap