From 892ce38c933930f8e89561d116424b30dc960b4e Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Tue, 10 Jun 2014 02:57:50 +0000
Subject: 1: Stagify. 2: convert to new format of LIB_DEPENDS.

---
 palm/ppmtoTbmp/Makefile  | 13 ++++++-------
 palm/ppmtoTbmp/pkg-plist | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'palm')

diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index a5066a5f36c9..cfe4a2ae179f 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -10,23 +10,22 @@ MASTER_SITES=	http://www.isaac.cs.berkeley.edu/pilot/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PPM to Pilot bitmap converter
 
-LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/^#include "ppmcmap.h"/d' ${WRKSRC}/ppmtoTbmp.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ppmtoTbmp ${WRKSRC}/Tbmptopnm \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ppmtoTbmp
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ppmtoTbmp
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
-	${MKDIR} ${PREFIX}/share/ppmtoTbmp
-	${INSTALL_DATA} ${WRKSRC}/q?.map ${PREFIX}/share/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/q?.map ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/palm/ppmtoTbmp/pkg-plist b/palm/ppmtoTbmp/pkg-plist
index f043befcedf1..f37c3c8bc65c 100644
--- a/palm/ppmtoTbmp/pkg-plist
+++ b/palm/ppmtoTbmp/pkg-plist
@@ -1,7 +1,7 @@
 bin/ppmtoTbmp
 bin/Tbmptopnm
-share/ppmtoTbmp/q2.map
-share/ppmtoTbmp/q4.map
-@dirrm share/ppmtoTbmp
-%%PORTDOCS%%share/doc/ppmtoTbmp/README
-%%PORTDOCS%%@dirrm share/doc/ppmtoTbmp
+%%DATADIR%%/q2.map
+%%DATADIR%%/q4.map
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit v1.2.3