summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-10-13 10:26:08 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-10-13 10:26:08 +0000
commitd715e6a4815902e5e002618bfc74ecefb88c2071 (patch)
tree0bba6b3b163c39007d3c09eb0712344441f31247 /archivers
parentUse MAKE_ARGS (diff)
Use MAKE_ARGS
Notes
Notes: svn path=/head/; revision=145236
Diffstat (limited to 'archivers')
-rw-r--r--archivers/nulib/Makefile2
-rw-r--r--archivers/nulib/files/patch-Makefile21
-rw-r--r--archivers/rvm/Makefile2
-rw-r--r--archivers/rvm/files/patch-Makefile.in11
4 files changed, 4 insertions, 32 deletions
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
-