From fda46f9f9ac90e0f1a475a770de3bd2f16659f5a Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 26 Jun 2014 12:38:57 +0000
Subject: [PATCH] - 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

---
 palm/ppmtoTbmp/Makefile  | 12 +++++-------
 palm/ppmtoTbmp/pkg-descr |  2 +-
 palm/ppmtoTbmp/pkg-plist |  2 --
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index 841e4f9df968..a3bd39c98dd9 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -15,19 +15,17 @@ LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
 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>
diff --git a/palm/ppmtoTbmp/pkg-descr b/palm/ppmtoTbmp/pkg-descr
index 63ae4dc8b1cd..f2087f2de31f 100644
--- a/palm/ppmtoTbmp/pkg-descr
+++ b/palm/ppmtoTbmp/pkg-descr
@@ -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/
diff --git a/palm/ppmtoTbmp/pkg-plist b/palm/ppmtoTbmp/pkg-plist
index f37c3c8bc65c..8ac89c8d27b0 100644
--- a/palm/ppmtoTbmp/pkg-plist
+++ b/palm/ppmtoTbmp/pkg-plist
@@ -3,5 +3,3 @@ bin/Tbmptopnm
 %%DATADIR%%/q2.map
 %%DATADIR%%/q4.map
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%