ports/143993: [MAINTAINER] [PATCH] graphics/lcdtest Update to 1.18
Rob Farmer
rfarmer at predatorlabs.net
Tue Feb 16 10:10:03 UTC 2010
>Number: 143993
>Category: ports
>Synopsis: [MAINTAINER] [PATCH] graphics/lcdtest Update to 1.18
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 16 10:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Rob Farmer
>Release: 9.0-CURRENT
>Organization:
>Environment:
FreeBSD coretwo.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r203910: Sun Feb 14 21:00:22 PST 2010 rfarmer at coretwo.predatorlabs.net:/usr/obj/usr/src/sys/CORETWO amd64
>Description:
Update to 1.18
I got rid of scons and just made a do-build target since there is only one file to compile and it was too much of a pain trying to make scons respect CC, CFLAGS, etc.
Changes:
Release 1.18 uses SDL_ttf to render text, rather than SFont, and uses the free LiberationMono-Regular TrueType font. Updated build system to use SCons 1.20, and eliminate use of some deprecated SCons features. Changed license to GPLv3.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/lcdtest/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 5 Feb 2010 11:38:53 -0000 1.9
+++ Makefile 16 Feb 2010 09:54:58 -0000
@@ -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 @@
MAINTAINER= rfarmer at 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}/
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/lcdtest/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 11 Jan 2010 21:31:39 -0000 1.2
+++ distinfo 16 Feb 2010 07:40:47 -0000
@@ -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
Index: files/patch-SConstruct
===================================================================
RCS file: files/patch-SConstruct
diff -N files/patch-SConstruct
--- files/patch-SConstruct 12 Jan 2010 06:01:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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)
Index: files/patch-src-SConscript
===================================================================
RCS file: files/patch-src-SConscript
diff -N files/patch-src-SConscript
--- files/patch-src-SConscript 12 Jan 2010 05:58:59 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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)
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list