From nobody@FreeBSD.org  Thu Jan  7 06:32:02 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E6261065679
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  7 Jan 2010 06:32:02 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BF008FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  7 Jan 2010 06:32:02 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o076W2au082037
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 7 Jan 2010 06:32:02 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o076W2PT082036;
	Thu, 7 Jan 2010 06:32:02 GMT
	(envelope-from nobody)
Message-Id: <201001070632.o076W2PT082036@www.freebsd.org>
Date: Thu, 7 Jan 2010 06:32:02 GMT
From: Rob Farmer <rfarmer@predatorlabs.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] graphics/lcdtest Update to 1.08, take maintainership
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142414
>Category:       ports
>Synopsis:       [PATCH] graphics/lcdtest Update to 1.08, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 07 06:40:03 UTC 2010
>Closed-Date:    Mon Jan 11 21:11:50 UTC 2010
>Last-Modified:  Tue Jan 12 06:00:02 UTC 2010
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD peridot.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r201657: Wed Jan 6 09:49:06 PST 2010 robert@peridot.predatorlabs.net:/usr/obj/usr/src/sys/PERIDOT i386
>Description:
* Update to 1.08
* Switch to scons
* Add a MASTER_SITE
* Take maintainership
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

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 <bsd.port.mk>
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)

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Jan 7 07:28:17 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142414 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Fri Jan 8 01:35:32 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142414 
State-Changed-From-To: closed->open 
State-Changed-By: pgollucci 
State-Changed-When: Mon Jan 11 08:15:10 UTC 2010 
State-Changed-Why:  
re-open, mumble 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142414 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Mon Jan 11 21:11:49 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142414 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142414: commit references a PR
Date: Mon, 11 Jan 2010 21:12:29 +0000 (UTC)

 pgollucci    2010-01-11 21:11:43 UTC
 
   FreeBSD ports repository
 
   Added files:
     graphics/lcdtest/files patch-SConstruct patch-src-SConscript 
   Log:
   * Update to 1.08
   * Switch to scons
   * Add a MASTER_SITE
   * Submitter is now MAINTAINER
   
   PR:             ports/142414
   Submitted by:   Rob Farmer <rfarmer@predatorlabs.net>
   
   Revision  Changes    Path
   1.1       +11 -0     ports/graphics/lcdtest/files/patch-SConstruct (new)
   1.1       +11 -0     ports/graphics/lcdtest/files/patch-src-SConscript (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142414: commit references a PR
Date: Mon, 11 Jan 2010 21:31:54 +0000 (UTC)

 pgollucci    2010-01-11 21:31:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/lcdtest     Makefile distinfo 
     graphics/lcdtest/files patch-SConstruct patch-src-SConscript 
   Log:
   * Update to 1.08
   * Switch to scons
   * Add a MASTER_SITE
   
   PR:                             ports/142414
   
   Pointyhat to:   pgollucci, my local cvs repo was corrupted in this dir
   
   Revision  Changes    Path
   1.6       +14 -16    ports/graphics/lcdtest/Makefile
   1.2       +3 -3      ports/graphics/lcdtest/distinfo
   1.2       +11 -0     ports/graphics/lcdtest/files/patch-SConstruct
   1.2       +11 -0     ports/graphics/lcdtest/files/patch-src-SConscript
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Rob Farmer <rfarmer@predatorlabs.net>
To: pgollucci@freebsd.org, bug-followup@freebsd.org
Cc:  
Subject: Re: ports/142414: [PATCH] graphics/lcdtest Update to 1.08, take 
	maintainership
Date: Mon, 11 Jan 2010 21:56:37 -0800

 It looks like the patches got doubled during the commit and tinderbox
 complains about this.
 
 -- 
 Rob Farmer
>Unformatted:
