Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jun 2014 12:38:58 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359348 - head/palm/ppmtoTbmp
Message-ID:  <201406261238.s5QCcwJt069520@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406261238.s5QCcwJt069520>