svn commit: r303613 - head/textproc/grap

[Chris Rees]

Author: crees
Date: Mon Sep  3 19:22:00 2012
New Revision: 303613
URL: http://svn.freebsd.org/changeset/ports/303613

Log:
  Fix plist issues by choosing which files to install, rather than trying to
  delete them afterwards.
  
  Submitted by:	pointyhat (beat)

Modified:
  head/textproc/grap/Makefile
  head/textproc/grap/pkg-plist

Modified: head/textproc/grap/Makefile
==============================================================================
--- head/textproc/grap/Makefile	Mon Sep  3 19:16:57 2012	(r303612)
+++ head/textproc/grap/Makefile	Mon Sep  3 19:22:00 2012	(r303613)
@@ -19,12 +19,24 @@ CONFIGURE_ARGS=--with-freebsd-ports
 CONFLICTS_INSTALL=heirloom-doctools-[0-9]*
 
 MAN1=		grap.1
+PORTDOCS=	README CHANGES COPYRIGHT grap.man
 
 .include <bsd.port.options.mk>
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.doc \
+		${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/grap.defines ${WRKSRC}/grap.tex.defines \
+		${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${RM} -rf ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+.  for d in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/$d ${DOCSDIR}
+.  endfor
 .endif
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 
 .include <bsd.port.mk>

Modified: head/textproc/grap/pkg-plist
==============================================================================
--- head/textproc/grap/pkg-plist	Mon Sep  3 19:16:57 2012	(r303612)
+++ head/textproc/grap/pkg-plist	Mon Sep  3 19:22:00 2012	(r303613)
@@ -1,8 +1,4 @@
 bin/grap
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/grap.man
 %%DATADIR%%/grap.defines
 %%DATADIR%%/grap.tex.defines
 %%EXAMPLESDIR%%/400mpairs.d
@@ -24,4 +20,3 @@ bin/grap
 %%EXAMPLESDIR%%/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%