Allow the value of CC to be overridden.

PR:		15473
Submitted by:	Jame Andariese <james@ja.ath.cx>

3 files changed, 100 insertions, 4 deletions

diff --git a/lang/squeak3/Makefile b/lang/squeak3/Makefile
index ce8f460187ad..c800079fb64a 100644
--- a/lang/squeak3/Makefile
+++ b/lang/squeak3/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/unix/ \
 		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/unix/image/ \
 		http://www.nectar.com/distfiles/squeak/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} image/${SQUEAK_SRC}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
@@ -25,7 +25,13 @@ SQUEAK_SRC=	SqueakV2.sources
 MAKEFILE=	GNUmakefile
 VMBUILD=	freebsd
 MAKE_ARGS=	VMBUILD=${VMBUILD}
-PORTMAKE=	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+.ifdef (CC)
+MAKE_ARGS+=	CC=${CC}
+.endif
+.ifdef (CFLAGS)
+MAKE_ARGS+=	CCFLAGS="${CFLAGS}"
+.endif
+PORTMAKE=	${SETENV} ${MAKE_ENV} ${GMAKE} -e ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS}
 
 do-build:
@@ -39,7 +45,7 @@ do-install:
 .for f in Squeak2.4.changes Squeak2.4.image
 	(cd ${WRKSRC}/image && ${INSTALL_DATA} $f ${PREFIX}/share/squeak/$f)
 .endfor
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/image/${SQUEAK_SRC} \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC} \
 		${PREFIX}/share/squeak/${SQUEAK_SRC}
 
 .include <bsd.port.mk>
diff --git a/lang/squeak3/distinfo b/lang/squeak3/distinfo
index e3c2d58d3887..4405a83b0cae 100644
--- a/lang/squeak3/distinfo
+++ b/lang/squeak3/distinfo
@@ -1,2 +1,2 @@
 MD5 (squeak/2.4.tar.gz) = db8a90c127ba98496f159e9ea0e4320d
-MD5 (squeak/image/SqueakV2.sources) = af0663f5112faa78635462dbb6fd3367
+MD5 (squeak/SqueakV2.sources) = af0663f5112faa78635462dbb6fd3367
diff --git a/lang/squeak3/files/patch-aa b/lang/squeak3/files/patch-aa
new file mode 100644
index 000000000000..a9cc01b0cf04
--- /dev/null
+++ b/lang/squeak3/files/patch-aa
@@ -0,0 +1,90 @@
+--- src/GNUmakefile.conf.orig	Thu Apr 22 08:01:59 1999
++++ src/GNUmakefile.conf	Thu Dec  9 13:27:03 1999
+@@ -93,13 +93,13 @@
+ #			START OF CONFIGURATION SECTION			   #
+ #									   #
+ ifeq ($(SYSTEM),					linux)
+-  CC=		gcc
++  CC:=		gcc
+   CCFLAGS:=	-O2 -g $(PROFILE) # -fomit-frame-pointer
+ ifeq ($(UTSMAC),i386)
+   CCFLAGS+=	-malign-functions=2 -malign-jumps=3 -malign-loops=2
+ endif
+   LDO=		ld -r
+-  LD=		gcc -rdynamic
++  LD=		$(CC) -rdynamic
+   LDFLAGS:=	 $(PROFILE)
+   SHCFLAGS:=	-O2 -g -fPIC
+   SHLDFLAGS:=	-rdynamic -shared
+@@ -110,11 +110,11 @@
+ endif
+ 
+ ifeq ($(SYSTEM),					freebsd)
+-  CC=		gcc
++  CC:=		gcc
+   CCFLAGS:=	-O3 -fexpensive-optimizations -fomit-frame-pointer $(PROFILE)
+   INCDIRS:=	-I/usr/X11R6/include
+   LDO=		ld -r
+-  LD=		gcc
++  LD=		$(CC)
+   LDFLAGS:=	$(PROFILE)
+   SHCFLAGS:=	-O2 -g -fPIC
+   SHLDFLAGS:=	-rdynamic -shared
+@@ -125,7 +125,7 @@
+ endif
+ 
+ ifeq ($(MACHINE)-$(SYSTEM),				alpha-osf1)
+-  CC=		$(UTIL)decgcc
++  CC:=		$(UTIL)decgcc
+   CCFLAGS:=	-O2 -g $(PROFILE)
+   LDO=		ld -taso -r
+   LD=		cc
+@@ -138,11 +138,11 @@
+ endif
+ 
+ ifeq ($(MACHINE)-$(SYSTEM),				sparc-solaris)
+-  CC=		gcc
++  CC:=		gcc
+   CCFLAGS:=	-O2 -g $(PROFILE)
+   INCDIRS=	-I/usr/openwin/include
+   LDO=		ld -r
+-  LD=		gcc
++  LD=		$(CC)
+   LDFLAGS:=	$(PROFILE)
+   SHCFLAGS:=	-O2 -g -fPIC
+   SHLDFLAGS:=	-G
+@@ -153,10 +153,10 @@
+ endif
+ 
+ ifeq ($(MACHINE)-$(SYSTEM),				sparc-sunos)
+-  CC=		gcc
++  CC:=		gcc
+   CCFLAGS:=	-O2 -g $(PROFILE)
+   LDO=		ld -r
+-  LD=		gcc
++  LD=		$(CC)
+   LDFLAGS:=	$(PROFILE)
+   SHCFLAGS:=	-O2 -g -fPIC
+   SHLDFLAGS:=	-rdynamic -shared
+@@ -166,10 +166,10 @@
+ endif
+ 
+ ifeq ($(MACHINE)-$(SYSTEM),				hppa-hpux)
+-  CC=		gcc
++  CC:=		gcc
+   CCFLAGS:=	-O6 -g $(PROFILE)
+   LDO=		ld -r
+-  LD=		gcc
++  LD=		$(CC)
+   LDFLAGS:=	$(PROFILE)
+   SHCFLAGS:=	-O2 -g -fPIC
+   SHLDFLAGS:=	-rdynamic -shared
+@@ -179,7 +179,7 @@
+ endif
+ 
+ ifeq ($(SYSTEM),					irix) 
+-  CC=		cc -32 -mips2
++  CC:=		cc -32 -mips2
+   CCFLAGS:=	-O3 $(PROFILE) 
+   LDO=		ld -32 -mips2 -r
+   LD=		cc