From owner-svn-ports-all@FreeBSD.ORG  Thu Jun 26 12:38:59 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 00A0C4AC;
 Thu, 26 Jun 2014 12:38:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C890A246E;
 Thu, 26 Jun 2014 12:38:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QCcwEX069523;
 Thu, 26 Jun 2014 12:38:58 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QCcwJt069520;
 Thu, 26 Jun 2014 12:38:58 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201406261238.s5QCcwJt069520@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 26 Jun 2014 12:38:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359348 - head/palm/ppmtoTbmp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 26 Jun 2014 12:38:59 -0000

Author: danfe
Date: Thu Jun 26 12:38:57 2014
New Revision: 359348
URL: http://svnweb.freebsd.org/changeset/ports/359348
QAT: https://qat.redports.org/buildarchive/r359348/

Log:
  - Remove conditional on ${PORT_OPTIONS:MDOCS} and simplify the Makefile
  - Offload documentation from pkg-plist into PORTDOCS variable, tighten
    sed(1) regexp, mute MKDIR's; fix spelling and EOL spaces in pkg-descr

Modified:
  head/palm/ppmtoTbmp/Makefile
  head/palm/ppmtoTbmp/pkg-descr
  head/palm/ppmtoTbmp/pkg-plist

Modified: head/palm/ppmtoTbmp/Makefile
==============================================================================
--- head/palm/ppmtoTbmp/Makefile	Thu Jun 26 12:29:26 2014	(r359347)
+++ head/palm/ppmtoTbmp/Makefile	Thu Jun 26 12:38:57 2014	(r359348)
@@ -15,19 +15,17 @@ LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/gr
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^#include "ppmcmap.h"/d' ${WRKSRC}/ppmtoTbmp.c
+PORTDOCS=	README
 
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -e '/^#include "ppmcmap\.h"/d' ${WRKSRC}/ppmtoTbmp.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ppmtoTbmp ${WRKSRC}/Tbmptopnm \
 		${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/q?.map ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>

Modified: head/palm/ppmtoTbmp/pkg-descr
==============================================================================
--- head/palm/ppmtoTbmp/pkg-descr	Thu Jun 26 12:29:26 2014	(r359347)
+++ head/palm/ppmtoTbmp/pkg-descr	Thu Jun 26 12:38:57 2014	(r359348)
@@ -1,4 +1,4 @@
-The ppmtoTbmp and Tbmptopnm programs convert between ppm and Pilot bitmap 
+The ppmtoTbmp and Tbmptopnm programs convert between PPM and Pilot bitmap
 formats.
 
 WWW: http://www.isaac.cs.berkeley.edu/pilot/

Modified: head/palm/ppmtoTbmp/pkg-plist
==============================================================================
--- head/palm/ppmtoTbmp/pkg-plist	Thu Jun 26 12:29:26 2014	(r359347)
+++ head/palm/ppmtoTbmp/pkg-plist	Thu Jun 26 12:38:57 2014	(r359348)
@@ -3,5 +3,3 @@ bin/Tbmptopnm
 %%DATADIR%%/q2.map
 %%DATADIR%%/q4.map
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%