- Update to 1.18

PR:		143993
Submitted by:	Rob Farmer <rfarmer@predatorlabs.net> (maintainer)

4 files changed, 19 insertions, 35 deletions

diff --git a/graphics/lcdtest/Makefile b/graphics/lcdtest/Makefile
index 76a895836733..1b07ab4aa40d 100644
--- a/graphics/lcdtest/Makefile
+++ b/graphics/lcdtest/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lcdtest
-PORTVERSION=	1.08
-PORTREVISION=	2
+PORTVERSION=	1.18
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.brouhaha.com/~eric/software/lcdtest/download/ \
 		http://www.predatorlabs.net/dl/
@@ -15,23 +14,29 @@ MASTER_SITES=	http://www.brouhaha.com/~eric/software/lcdtest/download/ \
 MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	LCD monitor test pattern generator
 
-BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
 
-USE_SDL=	sdl image
+USE_SDL=	sdl image ttf
 
-CFLAGS=		-I${LOCALBASE}/include
-LINKFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-USE_SCONS=     yes
-SCONS_ENV=     CFLAGS="${CFLAGS}" LINKFLAGS="${LINKFLAGS}" CC="${CC}"
-SCONS_ARGS=    bindir=${PREFIX}/bin mandir=${PREFIX}/man/man1
+CFLAGS+=	-I${LOCALBASE}/include -DRELEASE=1.18
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lSDL -lSDL_image -lSDL_ttf
 
 PLIST_FILES=	bin/lcdtest
 PORTDOCS=	README
 
 MAN1=	lcdtest.1
 
-post-install:
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/share/fonts/liberation/|${LOCALBASE}/lib/X11/fonts/Liberation/|' \
+		${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)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/lcdtest ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/lcdtest.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
diff --git a/graphics/lcdtest/distinfo b/graphics/lcdtest/distinfo
index e2a81241240e..cba4c63f15eb 100644
--- a/graphics/lcdtest/distinfo
+++ b/graphics/lcdtest/distinfo
@@ -1,3 +1,3 @@
-MD5 (lcdtest-1.08.tar.gz) = 0e73a7e25645e79ddbc84560f40e2738
-SHA256 (lcdtest-1.08.tar.gz) = f4cc00b90505ccc2f379d0f481a761ca11f7622abbb078430b595cf3aa287d29
-SIZE (lcdtest-1.08.tar.gz) = 30762
+MD5 (lcdtest-1.18.tar.gz) = d94f242f0ff35c75d6f4be89d3bc13d6
+SHA256 (lcdtest-1.18.tar.gz) = f0b3fa9c5a4bc86eb2713f85f422d328a673ca8f541a6403bfe156afd631200e
+SIZE (lcdtest-1.18.tar.gz) = 26886
diff --git a/graphics/lcdtest/files/patch-SConstruct b/graphics/lcdtest/files/patch-SConstruct
deleted file mode 100644
index 9b3558977332..000000000000
--- a/graphics/lcdtest/files/patch-SConstruct
+++ /dev/null
@@ -1,10 +0,0 @@
---- SConstruct.orig    2007-06-05 16:38:23.000000000 -0700
-+++ SConstruct 2009-10-26 14:22:35.000000000 -0700
-@@ -50,7 +50,7 @@
- # Cache options
- #-----------------------------------------------------------------------------
-
--env = Environment (options = opts)
-+env = Environment (**ARGUMENTS)
- opts.Update (env)
- opts.Save (conf_file, env)
diff --git a/graphics/lcdtest/files/patch-src-SConscript b/graphics/lcdtest/files/patch-src-SConscript
deleted file mode 100644
index 5be25705a62d..000000000000
--- a/graphics/lcdtest/files/patch-src-SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/SConscript.orig        2009-10-26 15:30:35.000000000 -0700
-+++ src/SConscript     2009-10-26 15:30:53.000000000 -0700
-@@ -40,7 +40,7 @@
-                  src_suffix = '.ppm')
-
- env.Append (BUILDERS = { 'PPM2C': PPM2C },
--            PPM2CCOM = "ppmtoxpm -name `basename $SOURCE .ppm`_xpm $SOURCE | sed 's/static //;s/black/#000000/;s/magenta/#FF00FF/;s/#E40808/#009900/' >$TARGET")
-+            PPM2CCOM = "ppmtoxpm -name `basename $SOURCE .ppm`_xpm $SOURCE -hexonly | sed 's/static //;s/black/#000000/;s/magenta/#FF00FF/;s/#E40808/#009900/' >$TARGET")
-
- env.PNG2PNM (target = 'help_font.ppm',
-              source = help_font_png)