4 files changed, 51 insertions, 44 deletions

diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index 1cbc01bd831a..f1f271cfacd1 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -3,7 +3,6 @@
 # Whom:			Christian Weisgerber <naddy@mips.rhein-neckar.de>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	sdd
 PORTVERSION=	1.31
@@ -13,7 +12,7 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/sdd/
 MAINTAINER=	naddy@FreeBSD.org
 
 USE_GMAKE=	yes
-MAKE_ENV=	MAKEPROG=gmake CCOM=${CC}
+MAKE_ENV=	MAKEPROG="${GMAKE}" CCOM="${CC}" COPTX="${CFLAGS}"
 MAN1=		sdd.1
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/sdd/files/patch-RULES_i386-freebsd-cc.rul b/sysutils/sdd/files/patch-RULES_i386-freebsd-cc.rul
new file mode 100644
index 000000000000..d3c42d6f23ce
--- /dev/null
+++ b/sysutils/sdd/files/patch-RULES_i386-freebsd-cc.rul
@@ -0,0 +1,33 @@
+
+$FreeBSD$
+
+--- RULES/i386-freebsd-cc.rul.orig	Sun Jul 21 02:46:53 2002
++++ RULES/i386-freebsd-cc.rul	Sun Jul 21 02:48:18 2002
+@@ -30,7 +30,7 @@
+ COPTS=
+ CWOPTS=		-Wall -Wtraditional \
+ 		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
+-COPTOPT=	-O
++COPTOPT=
+ KDEFINES=	-DKERNEL -D_KERNEL
+ COPTDYN=	-fpic
+ COPTGPROF=	-pg
+@@ -57,14 +57,14 @@
+ 
+ FLOAT_OPTIONS=	
+ 
+-CC=		@echo "	==> COMPILING \"$@\""; gcc
+-LDCC=		@echo "	==> LINKING \"$@\""; gcc
+-DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
++CC=		@echo "	==> COMPILING \"$@\""; $(CCOM)
++LDCC=		@echo "	==> LINKING \"$@\""; $(CCOM)
++DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; $(CCOM)
+ RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
+ ARFLAGS=	cr
+ LORDER=		lorder
+ TSORT=		tsort
+ 
+ RMDEP=		:
+-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CCOM) -M
+ MKDEP_OUT=
diff --git a/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul b/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul
deleted file mode 100644
index cc97f666aec1..000000000000
--- a/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$FreeBSD$
-
---- RULES/i386-openbsd-cc.rul.orig	Sun Aug 29 16:09:56 1999
-+++ RULES/i386-openbsd-cc.rul	Fri Jul 20 00:51:13 2001
-@@ -24,7 +24,7 @@
- ###########################################################################
- 
- CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
--CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-+CFLAGS+=	$(COPTS) $(CWARNOPTS) $(COPTX)
- 
- CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
- COPTS=
-@@ -47,7 +47,7 @@
- 
- LIBS_PATH=	-L$(OLIBSDIR)
- 
--LDFLAGS=	$(LDOPTS) $(LDOPTX)
-+LDFLAGS+=	$(LDOPTS) $(LDOPTX)
- LDLIBS=		$(LIBS) $(LIBX)
- 
- #LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
-@@ -57,14 +57,14 @@
- 
- FLOAT_OPTIONS=	
- 
--CC=		@echo "	==> COMPILING \"$@\""; gcc
--LDCC=		@echo "	==> LINKING \"$@\""; gcc
--DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
-+CC=		@echo "	==> COMPILING \"$@\""; ${CCOM}
-+LDCC=		@echo "	==> LINKING \"$@\""; ${CCOM}
-+DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; ${CCOM}
- RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
- ARFLAGS=	cr
- LORDER=		lorder
- TSORT=		tsort
- 
- RMDEP=		:
--MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		@echo "	==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); ${CCOM} -M
- MKDEP_OUT=
diff --git a/sysutils/sdd/files/patch-RULES_rules.cnf b/sysutils/sdd/files/patch-RULES_rules.cnf
new file mode 100644
index 000000000000..914eb9523558
--- /dev/null
+++ b/sysutils/sdd/files/patch-RULES_rules.cnf
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- RULES/rules.cnf.orig	Sun Jul 21 02:51:42 2002
++++ RULES/rules.cnf	Sun Jul 21 02:52:14 2002
+@@ -33,8 +33,9 @@
+ #
+ # Hack until the <mach>-<os>-*cc.rul files are updated
+ #
+-_HCCCOM=	$(OARCH:%-gcc=gcc)
+-HCCCOM=		$(_HCCCOM:%-cc=cc)
++#_HCCCOM=	$(OARCH:%-gcc=gcc)
++#HCCCOM=	$(_HCCCOM:%-cc=cc)
++HCCCOM=		$(C_ARCH)
+ 
+ _CCCOM=		$(_UNIQ)$(CCCOM)
+ __CCCOM=	$(_CCCOM:$(_UNIQ)=$(HCCCOM))