- Allow this port to be compiled with CC set to something containing a

path component. [1]
- Add the usual MAKE_ENV=LANG=C workaround in order to prevent problems
  from bad interactions of gmake, the Schily makefile system and certain
  locales.

Requested by:	kris [1]
Approved by:	netchild

sysutils/sformat/Makefile

@@ -19,23 +19,23 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	Allows formatting/partitioning/analysis/repairing of SCSI disks
 
+LIBSCHILY=	libschily-2.01.01a07.tar.gz
 USE_GMAKE=	yes
-
 MAN1=		sformat.1
 
-LIBSCHILY=	libschily-2.01.01a07.tar.gz
-MAKE_ENV=	CCOM=${CC}
-SFMTTARGET=	${ARCH}-freebsd-${CC}
-
 .include <bsd.port.pre.mk>
 
+CCOM!=		${BASENAME} ${CC}
+MAKE_ENV=	CCOM=${CCOM} LANG=C
+SFMTTARGET=	${ARCH}-freebsd-${CCOM}
+
 post-extract:
 	@cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${LIBSCHILY} ${EXTRACT_AFTER_ARGS}
 .for i in config.guess config.sub
 	@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf
 .endfor
-.if ${ARCH} != "i386" || ${CC} != "cc"
+.if ${SFMTTARGET} != "i386-freebsd-cc"
 	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
 		${WRKSRC}/RULES/${SFMTTARGET}.rul
 .endif

sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul

@@ -10,7 +10,7 @@
  
  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
  COPTS=
-@@ -57,14 +58,13 @@
+@@ -57,14 +58,14 @@
  
  FLOAT_OPTIONS=	
  
@@ -18,8 +18,9 @@
 -LDCC=		@echo "	==> LINKING \"$@\""; gcc
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
 -RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+LDCC=		$(CCOM)
-+DYNLD=		$(CCOM)
++CCCOM=		$(CC)
++LDCC=		$(CCCOM)
++DYNLD=		$(CCCOM)
 +RANLIB=		ranlib
  ARFLAGS=	cr
  LORDER=		lorder
@@ -27,5 +28,5 @@
  
  RMDEP=		:
 -MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		$(CCOM) -M
++MKDEP=		$(CCCOM) -M
  MKDEP_OUT=