ports/70171: Update port: misc/wmx10

[KATO Tsuguru]

>Number:         70171
>Category:       ports
>Synopsis:       Update port: misc/wmx10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 08 14:10:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on -current after gcc 3.4 import
- Support CC/CFLAGS properly

New file:
files/patch-wmx.10.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/misc/wmx10/Makefile misc/wmx10/Makefile
--- /usr/ports/misc/wmx10/Makefile	Thu Apr 29 20:18:08 2004
+++ misc/wmx10/Makefile	Sat Aug  7 19:57:22 2004
@@ -14,11 +14,12 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Remote control for X10 devices
 
-PLIST_FILES=	bin/wmx10
 WRKSRC=		${WRKDIR}/wmx10.app/wmx10
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GMAKE=	yes
+
+PLIST_FILES=	bin/wmx10
 
 .include <bsd.port.mk>
diff -urN /usr/ports/misc/wmx10/files/patch-aa misc/wmx10/files/patch-aa
--- /usr/ports/misc/wmx10/files/patch-aa	Mon Apr  9 20:09:54 2001
+++ misc/wmx10/files/patch-aa	Fri Aug  6 17:40:29 2004
@@ -1,19 +1,29 @@
---- Makefile.orig	Sun Oct 17 14:25:17 1999
-+++ Makefile	Mon Apr  9 00:27:38 2001
-@@ -1,5 +1,5 @@
+--- Makefile.orig	Mon Oct 18 06:25:17 1999
++++ Makefile	Fri Aug  6 17:40:19 2004
+@@ -1,12 +1,12 @@
 -INCDIR	=	-I/usr/X11R6/include
 -LIBDIR	=	-L/usr/X11R6/lib
 +INCDIR	=	-I${X11BASE}/include
 +LIBDIR	=	-L${X11BASE}/lib
  LIBS	=	-lXpm -lXext -lX11
  OBJS	=	br_cmd.o wmx10.o ../wmgeneral/wmgeneral.o
- CFLAGS  = 	-D$(shell echo `uname -s`) #-DDEBUG
-@@ -19,6 +19,6 @@
+-CFLAGS  = 	-D$(shell echo `uname -s`) #-DDEBUG
+-CC      =       gcc
++CFLAGS  += 	-D$(shell echo `uname -s`) #-DDEBUG
++CC      ?=       gcc
+ 
+ .c.o:
+-	$(CC) -c -O2 -Wall $(CFLAGS) $< -o $*.o $(INCDIR)
++	$(CC) -c $(CFLAGS) $< -o $*.o $(INCDIR)
+ 
+ all: wmx10
+ 
+@@ -19,6 +19,5 @@
  	done
  	rm -f wmx10 *~
  
 -install:
-+install:	wmx10
- 	strip wmx10
+-	strip wmx10
 -	mv wmx10 /usr/local/bin
-+	mv wmx10 ${X11BASE}/bin
++install:	wmx10
++	${BSD_INSTALL_PROGRAM} wmx10 ${X11BASE}/bin
diff -urN /usr/ports/misc/wmx10/files/patch-wmx.10.c misc/wmx10/files/patch-wmx.10.c
--- /usr/ports/misc/wmx10/files/patch-wmx.10.c	Thu Jan  1 09:00:00 1970
+++ misc/wmx10/files/patch-wmx.10.c	Fri Aug  6 17:45:14 2004
@@ -0,0 +1,10 @@
+--- wmx10.c.orig	Fri Dec 24 12:11:19 1999
++++ wmx10.c	Fri Aug  6 17:40:57 2004
+@@ -429,6 +429,7 @@
+ 		  updateNumDisplay(lampNum);
+ 		  break;
+ 	      default:
++		  ;
+ 	      }
+ 	  }
+       case ButtonRelease:
>Release-Note:
>Audit-Trail:
>Unformatted: