Fix build with clang.

5 files changed, 52 insertions, 21 deletions

diff --git a/devel/elfsh/files/patch-libelfsh::Makefile b/devel/elfsh/files/patch-libelfsh::Makefile
index 4b85e869bd57..d4fbc43b566b 100644
--- a/devel/elfsh/files/patch-libelfsh::Makefile
+++ b/devel/elfsh/files/patch-libelfsh::Makefile
@@ -1,7 +1,11 @@
---- libelfsh/Makefile	Wed Aug 13 16:31:55 2003
-+++ libelfsh/Makefile.patch	Sat Aug 16 01:48:30 2003
-@@ -8,7 +8,7 @@
- CC			= gcc
+--- libelfsh/Makefile.orig	2003-08-21 09:11:03.000000000 +0800
++++ libelfsh/Makefile	2011-10-03 16:33:33.000000000 +0800
+@@ -5,10 +5,10 @@
+ ## Last update Tue Jun  3 09:30:50 2003 mayhem
+ ##
+ 
+-CC			= gcc
++CC			?= gcc
  RM			= rm -f 
  AR			= ar rc
 -CFLAGS			= -rdynamic -Iinclude -Wall -fPIC -g3 -O2 -DELFSH_INTERN
diff --git a/devel/elfsh/files/patch-libhash::Makefile b/devel/elfsh/files/patch-libhash::Makefile
index daea1d2e8202..c928d0690ffd 100644
--- a/devel/elfsh/files/patch-libhash::Makefile
+++ b/devel/elfsh/files/patch-libhash::Makefile
@@ -1,11 +1,13 @@
---- libhash/Makefile	Wed Aug 13 16:31:55 2003
-+++ libhash/Makefile.patch	Sat Aug 16 01:52:22 2003
-@@ -7,7 +7,7 @@
+--- libhash/Makefile.orig	2003-08-21 09:11:03.000000000 +0800
++++ libhash/Makefile	2011-10-03 16:33:58.000000000 +0800
+@@ -7,8 +7,8 @@
  
  SRC	= hash.c
  OBJ	= hash.o
 -CFLAGS	= -Wall -g3 -Iinclude -I../libelfsh/include/ -I../elfsh/include/ -DELFSH_INTERN
+-CC	= gcc
 +CFLAGS	+= -Wall -g3 -Iinclude -I../libelfsh/include/ -I../elfsh/include/ -DELFSH_INTERN
- CC	= gcc
++CC	?= gcc
  AR	= ar rc
  RANLIB	= ranlib
+ NAME	= libhashelfsh
diff --git a/devel/elfsh/files/patch-modules::Makefile b/devel/elfsh/files/patch-modules::Makefile
index d253ddee0bcf..052a30c81230 100644
--- a/devel/elfsh/files/patch-modules::Makefile
+++ b/devel/elfsh/files/patch-modules::Makefile
@@ -1,13 +1,15 @@
---- modules/Makefile	Wed Aug 13 16:31:56 2003
-+++ modules/Makefile.patch	Sat Aug 16 01:51:05 2003
-@@ -18,8 +18,8 @@
+--- modules/Makefile.orig	2003-08-21 09:11:03.000000000 +0800
++++ modules/Makefile	2011-10-03 16:34:46.000000000 +0800
+@@ -18,9 +18,9 @@ SRC3	= modremap.c
  OBJ3	= $(SRC3:.c=.o)
  NAM3	= modremap.so
  
 -CFLAGS	= -I../vm/include/ -I../libhash/include/ -I../libelfsh/include/ \
 -	-Wall -g3 -O2 -fPIC -rdynamic -DELFSH_INTERN
+-CC	= gcc
 +CFLAGS	+= -I../vm/include/ -I../libhash/include/ -I../libelfsh/include/ \
 +	-Wall -g3 -fPIC -rdynamic -DELFSH_INTERN
- CC	= gcc
++CC	?= gcc
  
  all	: test remap #flow
+ 
diff --git a/devel/elfsh/files/patch-vm::Makefile b/devel/elfsh/files/patch-vm::Makefile
index 78da8d9c6f4e..30e1c39b8295 100644
--- a/devel/elfsh/files/patch-vm::Makefile
+++ b/devel/elfsh/files/patch-vm::Makefile
@@ -1,5 +1,5 @@
---- vm/Makefile	Thu Aug 21 04:23:17 2003
-+++ vm/Makefile.patch	Thu Sep 25 00:26:25 2003
+--- vm/Makefile.orig	2003-08-21 09:23:17.000000000 +0800
++++ vm/Makefile	2011-10-03 16:34:23.000000000 +0800
 @@ -19,8 +19,8 @@
  #LDASMOPT		= -lasm
  
@@ -11,7 +11,12 @@
  
  
  # End of configurable Makefile
-@@ -40,7 +40,7 @@
+@@ -36,11 +36,11 @@ SRC			= grammar.c disasm.c dyn.c hdr.c m
+ OBJ			= $(SRC:.c=.o)
+ SRC_DYN			= elfsh_etdyn.c
+ OBJ_DYN			= $(SRC_DYN:.c=.o)
+-CC			= gcc
++CC			?= gcc
  RM			= rm -f
  NAME			= elfsh
  
diff --git a/www/elog/files/patch-Makefile b/www/elog/files/patch-Makefile
index b53214124b1a..6c940f09e666 100644
--- a/www/elog/files/patch-Makefile
+++ b/www/elog/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Jul  9 16:26:32 2006
-+++ Makefile	Tue Jul 11 20:03:40 2006
-@@ -16,10 +16,11 @@
+--- Makefile.orig	2006-07-11 16:25:55.000000000 +0800
++++ Makefile	2011-10-04 10:04:32.000000000 +0800
+@@ -16,10 +16,11 @@ ifndef MANDIR
  MANDIR     = $(ROOT)$(PREFIX)/man
  endif
  
@@ -14,7 +14,25 @@
  
  #############################################################
  
-@@ -80,8 +81,9 @@
+@@ -27,7 +28,7 @@ RCDIR      = $(ROOT)/etc/rc.d/init.d
+ # Add "-DHAVE_CRYPT" and "-lcrypt" to use crypt() function.
+ CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall
+ 
+-CC = gcc
++CC ?= gcc
+ IFLAGS = -kr -nut -i3 -l110
+ EXECS = elog elogd elconv
+ MXMLDIR = ../mxml
+@@ -58,7 +59,7 @@ BINGROUP = admin
+ endif
+ 
+ ifeq ($(OSTYPE),FreeBSD)
+-CC = gcc
++CC ?= gcc
+ BINOWNER = root
+ BINGROUP = wheel
+ endif
+@@ -80,8 +81,9 @@ mxml.o: $(MXMLDIR)/mxml.c $(MXMLDIR)/mxm
  strlcpy.o: $(MXMLDIR)/strlcpy.c $(MXMLDIR)/strlcpy.h
  	$(CC) $(CFLAGS) -c -o strlcpy.o $(MXMLDIR)/strlcpy.c
  
@@ -25,7 +43,7 @@
  
  debug: src/elogd.c regex.o mxml.o strlcpy.o
  	$(CC) -g -I$(MXMLDIR) -o elogd src/elogd.c regex.o mxml.o strlcpy.o $(LIBS)
-@@ -106,7 +108,6 @@
+@@ -113,7 +115,6 @@ update: $(EXECS)
  install: $(EXECS)
  	@$(INSTALL) -m 0755 -d $(DESTDIR) $(SDESTDIR) $(MANDIR)/man1/ $(MANDIR)/man8/
  	@$(INSTALL) -m 0755 -d $(ELOGDIR)/scripts/ $(ELOGDIR)/resources/ $(ELOGDIR)/themes/default/icons 
@@ -33,7 +51,7 @@
  	@$(INSTALL) -v -m 0755 -o ${BINOWNER} -g ${BINGROUP} elog elconv $(DESTDIR)
  	@$(INSTALL) -v -m 0755 -o ${BINOWNER} -g ${BINGROUP} elogd $(SDESTDIR)
  	@$(INSTALL) -v -m 0644 man/elog.1 man/elconv.1 $(MANDIR)/man1/
-@@ -121,23 +122,20 @@
+@@ -128,23 +129,20 @@ install: $(EXECS)
  	@$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/
  	@for file in `find themes/default -type f | grep -v .svn` ; \
            do \