From owner-svn-ports-all@FreeBSD.ORG  Mon Sep  3 19:22:01 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30BD2106566C;
	Mon,  3 Sep 2012 19:22:01 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 167FB8FC1A;
	Mon,  3 Sep 2012 19:22:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q83JM0Rn031782;
	Mon, 3 Sep 2012 19:22:00 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q83JM0P1031779;
	Mon, 3 Sep 2012 19:22:00 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201209031922.q83JM0P1031779@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Mon, 3 Sep 2012 19:22:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303613 - head/textproc/grap
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Sep 2012 19:22:01 -0000

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%%