From d715e6a4815902e5e002618bfc74ecefb88c2071 Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Thu, 13 Oct 2005 10:26:08 +0000
Subject: [PATCH] Use MAKE_ARGS

---
 archivers/nulib/Makefile              |  2 ++
 archivers/nulib/files/patch-Makefile  | 21 ---------------------
 archivers/rvm/Makefile                |  2 ++
 archivers/rvm/files/patch-Makefile.in | 11 -----------
 audio/cpige/Makefile                  |  2 ++
 audio/cpige/files/patch-Makefile      | 12 ------------
 6 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 archivers/nulib/files/patch-Makefile
 delete mode 100644 archivers/rvm/files/patch-Makefile.in
 delete mode 100644 audio/cpige/files/patch-Makefile

diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index 546c9d256deb..603f1bd238de 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -17,6 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NuFX archive utility
 
 WRKSRC=		${WRKDIR}/nulib
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 MAN1=		nulib.1
 PLIST_FILES=	bin/nulib
 
diff --git a/archivers/nulib/files/patch-Makefile b/archivers/nulib/files/patch-Makefile
deleted file mode 100644
index 68af0ecaa20e..000000000000
--- a/archivers/nulib/files/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Sun Oct 19 01:04:35 2003
-+++ Makefile	Sun Oct 19 01:04:55 2003
-@@ -36,16 +36,15 @@
- #	HPUX			cc (v10.10)
- #
- 
--CC	= cc
-+CC	?= cc
- 
- # Select appropriate flag... -g for debugging, -O for optimized.
- #OPTIMIZE	= -g
- #OPTIMIZE	= -p
--OPTIMIZE	= -O
- GCC_PARANOIA	= -Wall -Wtraditional \
- 		  -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith 
- DEFINES		=
--CFLAGS		= $(DEFINES) $(OPTIMIZE) $(EFT) # $(GCC_PARANOIA)
-+CFLAGS		+= $(DEFINES) $(EFT) # $(GCC_PARANOIA)
- 
- LDFLAGS	=
- LIBS	=
diff --git a/archivers/rvm/Makefile b/archivers/rvm/Makefile
index f8cd4deddb08..18aba426ff86 100644
--- a/archivers/rvm/Makefile
+++ b/archivers/rvm/Makefile
@@ -21,8 +21,10 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 NO_LATEST_LINK=	yes
 
 USE_GNOME=	gnometarget
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-default-config-file=${PREFIX}/etc/rvm.conf
+MAKE_ARGS=	CXXFLAGS="${CXXFLAGS}"
 
 MAN1=		rvm.1
 PLIST_FILES=	bin/rvm
diff --git a/archivers/rvm/files/patch-Makefile.in b/archivers/rvm/files/patch-Makefile.in
deleted file mode 100644
index 9eed7d96a0c2..000000000000
--- a/archivers/rvm/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Mar 25 00:19:43 2004
-+++ Makefile.in	Sat Apr  3 21:35:46 2004
-@@ -75,7 +75,7 @@
- install_sh = @install_sh@
- local_rsync = @local_rsync@
- 
--CXXFLAGS = -g -Wall
-+CXXFLAGS = @CXXFLAGS@
- 
- bin_PROGRAMS = rvm
- 
diff --git a/audio/cpige/Makefile b/audio/cpige/Makefile
index f8e89433ddb4..c1d830f53fc0 100644
--- a/audio/cpige/Makefile
+++ b/audio/cpige/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://ed.zehome.com/cpige/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Icecast/Shoutcast stream ripper
 
+MAKE_ARGS=	CC="${CC}" CLIBS="${LDFLAGS}" CFLAGS="${CFLAGS}"
+
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
diff --git a/audio/cpige/files/patch-Makefile b/audio/cpige/files/patch-Makefile
deleted file mode 100644
index 3c761ef4ffe1..000000000000
--- a/audio/cpige/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	Sun Mar 27 14:57:32 2005
-+++ Makefile	Sun Mar 27 14:57:58 2005
-@@ -1,6 +1,6 @@
--CC=gcc
--CLIBS=
--CFLAGS=-Wall
-+CC?=gcc
-+CLIBS=${LDFLAGS}
-+CFLAGS+=-Wall
- 
- all: debug
- 	$(CC) $(CLIBS) $(CFLAGS) debug.o cpige.c -o cpige