diff -ruN lcdtest.old/Makefile lcdtest/Makefile --- lcdtest.old/Makefile 2010-01-06 20:39:39.000000000 -0800 +++ lcdtest/Makefile 2010-01-06 20:40:49.000000000 -0800 @@ -6,34 +6,33 @@ # PORTNAME= lcdtest -PORTVERSION= 1.04 -PORTREVISION= 2 +PORTVERSION= 1.08 CATEGORIES= graphics MASTER_SITES= http://www.brouhaha.com/~eric/software/lcdtest/download/ \ - CENKES + http://www.predatorlabs.net/dl/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rfarmer@predatorlabs.net COMMENT= LCD monitor test pattern generator BUILD_DEPENDS= pngtopnm:${PORTSDIR}/graphics/netpbm -USE_GMAKE= yes USE_SDL= sdl image -CFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -MAKE_ENV= LDFLAGS="${LDFLAGS}" -MAKE_ARGS= -o SDL/SDL.h -o SDL/SDL_image.h + +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 + PLIST_FILES= bin/lcdtest PORTDOCS= README +MAN1= lcdtest.1 -post-patch: - @${REINPLACE_CMD} -e '/^CFLAGS =/s|=|+=|' ${WRKSRC}/Makefile - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/lcdtest ${PREFIX}/bin/ -.ifndef NOPORTDOCS - @${INSTALL} -d ${DOCSDIR}/ - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}/ +post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include diff -ruN lcdtest.old/distinfo lcdtest/distinfo --- lcdtest.old/distinfo 2010-01-06 20:39:39.000000000 -0800 +++ lcdtest/distinfo 2010-01-06 20:40:27.000000000 -0800 @@ -1,3 +1,3 @@ -MD5 (lcdtest-1.04.tar.gz) = 7a5a34206438b628b8e5aea3da2ed84a -SHA256 (lcdtest-1.04.tar.gz) = 265327fb4a6e8b816966f858bfa882bae30bf44ab186b7bb1dc7da6b41b680f8 -SIZE (lcdtest-1.04.tar.gz) = 27018 +MD5 (lcdtest-1.08.tar.gz) = 0e73a7e25645e79ddbc84560f40e2738 +SHA256 (lcdtest-1.08.tar.gz) = f4cc00b90505ccc2f379d0f481a761ca11f7622abbb078430b595cf3aa287d29 +SIZE (lcdtest-1.08.tar.gz) = 30762 diff -ruN lcdtest.old/files/patch-SConstruct lcdtest/files/patch-SConstruct --- lcdtest.old/files/patch-SConstruct 1969-12-31 16:00:00.000000000 -0800 +++ lcdtest/files/patch-SConstruct 2010-01-06 20:40:27.000000000 -0800 @@ -0,0 +1,11 @@ +--- 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 -ruN lcdtest.old/files/patch-src-SConscript lcdtest/files/patch-src-SConscript --- lcdtest.old/files/patch-src-SConscript 1969-12-31 16:00:00.000000000 -0800 +++ lcdtest/files/patch-src-SConscript 2010-01-06 20:40:27.000000000 -0800 @@ -0,0 +1,11 @@ +--- 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)