aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-10-13 20:26:38 +0800
committervs <vs@FreeBSD.org>2005-10-13 20:26:38 +0800
commit2a32bf87a038741ed6c3be8b25440dabff184724 (patch)
treecd0c6b7e710b5e0807504063b2c849c881b6276f /audio
parent23d654765d63b0eb3a348d7ae848e922c75c898f (diff)
downloadfreebsd-ports-gnome-2a32bf87a038741ed6c3be8b25440dabff184724.tar.gz
freebsd-ports-gnome-2a32bf87a038741ed6c3be8b25440dabff184724.tar.zst
freebsd-ports-gnome-2a32bf87a038741ed6c3be8b25440dabff184724.zip
Use MAKE_ARGS
Diffstat (limited to 'audio')
-rw-r--r--audio/xvmixer/Makefile5
-rw-r--r--audio/xvmixer/files/patch-Makefile25
2 files changed, 2 insertions, 28 deletions
diff --git a/audio/xvmixer/Makefile b/audio/xvmixer/Makefile
index 2a1d2b2b6559..f4919f4f9cd1 100644
--- a/audio/xvmixer/Makefile
+++ b/audio/xvmixer/Makefile
@@ -15,11 +15,10 @@ COMMENT= Open Look-based audio mixer
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include -DUSE_XBM_ICON" \
+ LDFLAGS="-L${X11BASE}/lib" LIBRARIES="-lxview -lolgx -lX11"
PLIST_FILES= bin/xvmixer
-USE_REINPLACE= yes
-post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xvmixer ${LOCALBASE}/bin
diff --git a/audio/xvmixer/files/patch-Makefile b/audio/xvmixer/files/patch-Makefile
deleted file mode 100644
index d27729fcbc77..000000000000
--- a/audio/xvmixer/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig Mon Mar 17 04:43:11 1997
-+++ Makefile Wed Jul 23 17:00:50 2003
-@@ -1,17 +1,12 @@
--#CC = gcc
--CC = cc
--#LD = gcc
--LD = cc
--CFLAGS = -pipe -O2 -DUSE_XBM_ICON
--#LDFLAGS =
--LIBRARIES= -L/usr/X11R6/lib -L/usr/openwin/lib -lxview -lolgx -lX11
--
--#.c.o: $(CC) -c $(CFLAGS) $@
-+CC?= cc
-+INCLUDES= -I. -I%%X11BASE%%/include
-+CFLAGS+= -DUSE_XBM_ICON $(INCLUDES)
-+LIBRARIES= -L%%X11BASE%%/lib -L/usr/lib -lxview -lolgx -lX11
-
- all: xvmixer
-
- xvmixer: xvmixer.o
-- $(LD) $(LDFLAGS) -o $@ xvmixer.o $(LIBRARIES)
-+ $(CC) -o $@ xvmixer.o $(LIBRARIES)
-
- xvmixer.o: locked.bit unlocked.bit rec.bit
-