diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-08-08 17:13:17 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-08-08 17:13:17 +0000 |
| commit | 7398eb9f932728fa0782c1785a8ecc31b74eab72 (patch) | |
| tree | 6ff15043e5da0f844be88f8daac15ff65534aa56 /misc/wmx10 | |
| parent | Update to version 11.1 (diff) | |
Fix build with gcc-3.4
Support CC/CFLAGS properly
PR: ports/70171
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=115666
Diffstat (limited to 'misc/wmx10')
| -rw-r--r-- | misc/wmx10/Makefile | 5 | ||||
| -rw-r--r-- | misc/wmx10/files/patch-aa | 26 | ||||
| -rw-r--r-- | misc/wmx10/files/patch-wmx.10.c | 10 |
3 files changed, 31 insertions, 10 deletions
diff --git a/misc/wmx10/Makefile b/misc/wmx10/Makefile index dc1f3c582053..6f9044dc995e 100644 --- a/misc/wmx10/Makefile +++ b/misc/wmx10/Makefile @@ -14,11 +14,12 @@ MASTER_SITES= http://www.cs.uml.edu/~jhawkins/wmx10/ MAINTAINER= ports@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 --git a/misc/wmx10/files/patch-aa b/misc/wmx10/files/patch-aa index 408151ee324e..e8d848dd4c53 100644 --- a/misc/wmx10/files/patch-aa +++ b/misc/wmx10/files/patch-aa @@ -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 --git a/misc/wmx10/files/patch-wmx.10.c b/misc/wmx10/files/patch-wmx.10.c new file mode 100644 index 000000000000..232462fdc323 --- /dev/null +++ b/misc/wmx10/files/patch-wmx.10.c @@ -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: |