Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Dec 2016 09:39:49 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429884 - head/graphics/lcdtest
Message-ID:  <201612290939.uBT9dnv7017562@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Dec 29 09:39:48 2016
New Revision: 429884
URL: https://svnweb.freebsd.org/changeset/ports/429884

Log:
  - Add LICENSE_FILE
  - Simplify building
  - Switch to options helpers

Modified:
  head/graphics/lcdtest/Makefile

Modified: head/graphics/lcdtest/Makefile
==============================================================================
--- head/graphics/lcdtest/Makefile	Thu Dec 29 09:11:57 2016	(r429883)
+++ head/graphics/lcdtest/Makefile	Thu Dec 29 09:39:48 2016	(r429884)
@@ -15,20 +15,19 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LCD monitor test pattern generator
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	liberation-fonts-ttf>0:x11-fonts/liberation-fonts-ttf
 
 USE_SDL=	sdl image ttf
 
-CFLAGS+=	-I${LOCALBASE}/include -DRELEASE=1.18
-LDFLAGS+=	-L${LOCALBASE}/lib -lpthread -lSDL -lSDL_image -lSDL_ttf
-
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.png
 
 PORTDOCS=	README
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
@@ -37,8 +36,11 @@ post-patch:
 		${WRKSRC}/src/lcdtest.c
 
 do-build:
-	(cd ${WRKSRC}/src && ${CC} ${CFLAGS} -o lcdtest.o -c lcdtest.c)
-	(cd ${WRKSRC}/src && ${CC} ${LDFLAGS} -o lcdtest lcdtest.o)
+	cd ${WRKSRC}/src && \
+		${CC} ${CFLAGS} ${LDFLAGS} `sdl-config --cflags --libs` \
+			-DRELEASE=${PORTVERSION} \
+			-lSDL_image -lSDL_ttf \
+			-o lcdtest lcdtest.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
@@ -48,6 +50,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/desktop/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 



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