aboutsummaryrefslogtreecommitdiff
path: root/sysutils/sformat
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2006-05-07 16:39:29 +0000
committerMarius Strobl <marius@FreeBSD.org>2006-05-07 16:39:29 +0000
commitf5f1ee4bcc2351f6ba0ec804c29561372b0fa0eb (patch)
treea9db18e3af8c6707f2acf7fa1d0447902980f13f /sysutils/sformat
parentf1de23c3fa96383dc2fdcf134166318ab313804c (diff)
downloadports-f5f1ee4bcc2351f6ba0ec804c29561372b0fa0eb.tar.gz
ports-f5f1ee4bcc2351f6ba0ec804c29561372b0fa0eb.zip
Notes
Diffstat (limited to 'sysutils/sformat')
-rw-r--r--sysutils/sformat/Makefile12
-rw-r--r--sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul9
2 files changed, 11 insertions, 10 deletions
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 029ae87bd3c4..a8b125c2d1da 100644
--- a/sysutils/sformat/Makefile
+++ b/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
diff --git a/sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul b/sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul
index fe40bd525bc9..1b76323e1ac7 100644
--- a/sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul
+++ b/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=