summaryrefslogtreecommitdiff
path: root/audio/wmrecord
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-10-13 12:16:25 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-10-13 12:16:25 +0000
commit5f69a82c4832e81909c49f2ccc3d65f1326f5972 (patch)
tree87443da8fafb3b434a4b6d115c9f4665771c85f0 /audio/wmrecord
parent- Update to 2.1 (diff)
Use MAKE_ARGS
Diffstat (limited to 'audio/wmrecord')
-rw-r--r--audio/wmrecord/Makefile2
-rw-r--r--audio/wmrecord/files/patch-Makefile54
2 files changed, 2 insertions, 54 deletions
diff --git a/audio/wmrecord/Makefile b/audio/wmrecord/Makefile
index ee599c482cf6..6226d7bfb5a2 100644
--- a/audio/wmrecord/Makefile
+++ b/audio/wmrecord/Makefile
@@ -15,6 +15,8 @@ COMMENT= General purpose audio recording utility for the WindowMaker dock
USE_XPM= YES
USE_X_PREFIX= YES
+MAKE_ARGS= LIBS="-L${X11BASE}/lib -lXpm -lX11 -lXext" \
+ CFLAGS="${CFLAGS} -I${X11BASE}/include" LIBDIR=""
MAN1= wmrecord.1
PLIST_FILES= bin/wmrecord
diff --git a/audio/wmrecord/files/patch-Makefile b/audio/wmrecord/files/patch-Makefile
deleted file mode 100644
index 1b278c6a431d..000000000000
--- a/audio/wmrecord/files/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-*** Makefile.orig Mon Apr 2 03:42:10 2001
---- Makefile Mon Apr 2 03:44:45 2001
-***************
-*** 1,28 ****
-! BINDIR = /usr/local/bin
-! MANDIR = /usr/local/man/man1
-! LIBDIR = -L/usr/X11R6/lib
-! LIBS = -lXpm -lX11 -lXext
-! CFLAGS = -O2 -Wall
- CC = cc
- RM = rm -f
-
- all:: wmrecord
-
- wmrecord: wmrecord.o wmgeneral.o
-! $(CC) -o $@ wmrecord.o wmgeneral.o $(LIBDIR) $(LIBS)
-
- wmrecord.o: wmrecord.c wmrecord.xpm
-! $(CC) -c $(CFLAGS) wmrecord.c
-
- wmgeneral.o: wmgeneral/wmgeneral.c
-! $(CC) -c $(CFLAGS) wmgeneral/wmgeneral.c
-
- clean:
- $(RM) *.o wmrecord core
-
- tidy:
- $(RM) *.o core
--
-- install: wmrecord
-- install -s -o root -g root -m 0755 wmrecord $(BINDIR)
-- install -o root -g root -m 0644 man/wmrecord.1 $(MANDIR)
---- 1,21 ----
-! LDFLAGS= -L/usr/local/lib -L/usr/X11R6/lib -lXpm -lX11 -lXext
-! CFLAGS+= -Wall -I/usr/local/include -I/usr/X11R6/include
- CC = cc
- RM = rm -f
-
- all:: wmrecord
-
- wmrecord: wmrecord.o wmgeneral.o
-! $(CC) $(LDFLAGS) -o $@ wmrecord.o wmgeneral.o
-
- wmrecord.o: wmrecord.c wmrecord.xpm
-! $(CC) $(CFLAGS) -c wmrecord.c
-
- wmgeneral.o: wmgeneral/wmgeneral.c
-! $(CC) $(CFLAGS) -c wmgeneral/wmgeneral.c
-
- clean:
- $(RM) *.o wmrecord core
-
- tidy:
- $(RM) *.o core