svn commit: r338467 - head/graphics/lcdtest

[Rusmir Dusko]

Author: nemysis
Date: Thu Jan  2 19:28:05 2014
New Revision: 338467
URL: http://svnweb.freebsd.org/changeset/ports/338467

Log:
  - Bump PORTREVISION
  - Change master sites, icon
  - Use PLIST_FILES instead of pkg-plist
  - Support STAGEDIR
  - Simplify Option DOCS handling
  
  Approved by:	pawel / wg (mentors, implicit)

Deleted:
  head/graphics/lcdtest/pkg-plist
Modified:
  head/graphics/lcdtest/Makefile
  head/graphics/lcdtest/distinfo   (contents, props changed)

Modified: head/graphics/lcdtest/Makefile
==============================================================================
--- head/graphics/lcdtest/Makefile	Thu Jan  2 19:16:50 2014	(r338466)
+++ head/graphics/lcdtest/Makefile	Thu Jan  2 19:28:05 2014	(r338467)
@@ -3,9 +3,13 @@
 
 PORTNAME=	lcdtest
 PORTVERSION=	1.18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.brouhaha.com/~eric/software/lcdtest/download/
+MASTER_SITES=	http://www.brouhaha.com/~eric/software/lcdtest/download/ \
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	LCD monitor test pattern generator
@@ -19,21 +23,15 @@ USE_SDL=	sdl image ttf
 CFLAGS+=	-I${LOCALBASE}/include -DRELEASE=1.18
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lSDL -lSDL_image -lSDL_ttf
 
-PORTDOCS=	README
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz \
+		share/applications/${PORTNAME}.desktop \
+		share/pixmaps/${PORTNAME}.png
 
-MAN1=	lcdtest.1
+PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=	PORTDOCS=""
-.else
-PLIST_SUB+=	PORTDOCS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/fonts/liberation/|${LOCALBASE}/lib/X11/fonts/Liberation/|' \
 		${WRKSRC}/src/lcdtest.c
@@ -43,14 +41,14 @@ do-build:
 	(cd ${WRKSRC}/src && ${CC} ${LDFLAGS} -o lcdtest lcdtest.o)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MAN1PREFIX}/man/man1/
-	${INSTALL_DATA} ${WRKSRC}/desktop/${PORTNAME}.svg ${PREFIX}/share/pixmaps/
-	${INSTALL_DATA} ${WRKSRC}/desktop/${PORTNAME}.desktop ${PREFIX}/share/applications/
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/desktop/${PORTNAME}.desktop \
+		${STAGEDIR}${DESKTOPDIR}
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/lcdtest/distinfo
==============================================================================
--- head/graphics/lcdtest/distinfo	Thu Jan  2 19:16:50 2014	(r338466)
+++ head/graphics/lcdtest/distinfo	Thu Jan  2 19:28:05 2014	(r338467)
@@ -1,2 +1,4 @@
 SHA256 (lcdtest-1.18.tar.gz) = f0b3fa9c5a4bc86eb2713f85f422d328a673ca8f541a6403bfe156afd631200e
 SIZE (lcdtest-1.18.tar.gz) = 26886
+SHA256 (lcdtest.png) = bab95d97f827fd03bb3b31bdb27a5ed9fbe68dea0090ebbb4ad32b10c74345e0
+SIZE (lcdtest.png) = 2361