head	1.5;
access;
symbols
	RELEASE_8_3_0:1.5
	RELEASE_9_0_0:1.5
	RELEASE_7_4_0:1.5
	RELEASE_8_2_0:1.5
	RELEASE_6_EOL:1.5
	RELEASE_8_1_0:1.5
	RELEASE_7_3_0:1.5
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.4
	RELEASE_6_4_0:1.4
	RELEASE_5_EOL:1.4
	RELEASE_7_0_0:1.4
	RELEASE_6_3_0:1.4
	PRE_XORG_7:1.4
	RELEASE_4_EOL:1.4
	RELEASE_6_2_0:1.4
	RELEASE_6_1_0:1.4
	RELEASE_5_5_0:1.4
	RELEASE_6_0_0:1.4
	RELEASE_5_4_0:1.4
	RELEASE_4_11_0:1.4
	RELEASE_5_3_0:1.4
	RELEASE_4_10_0:1.2
	RELEASE_5_2_1:1.2
	RELEASE_5_2_0:1.2
	RELEASE_4_9_0:1.2
	RELEASE_5_1_0:1.2
	RELEASE_4_8_0:1.2
	RELEASE_5_0_0:1.2
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.1;
locks; strict;
comment	@# @;


1.5
date	2009.10.26.13.27.24;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	2004.06.23.11.53.00;	author vs;	state Exp;
branches;
next	1.3;

1.3
date	2004.05.26.17.57.30;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	2000.05.31.10.14.33;	author sobomax;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.23.02.40.23;	author kris;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Upgrade to 6.0

PR:             139971
@
text
@--- unix/Makefile.orig	2009-01-19 01:41:18.000000000 +0300
+++ unix/Makefile	2009-10-26 13:15:47.000000000 +0300
@@@@ -42,12 +42,12 @@@@
 # such as -DDOSWILD).
 
 # UnZip flags
-CC = cc#	try using "gcc" target rather than changing this (CC and LD
+CC ?= cc#	try using "gcc" target rather than changing this (CC and LD
 LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
 AS = as
 LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
 AF = $(LOC)
-CFLAGS = -O
+#CFLAGS = -O
 CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
 CF = $(CFLAGS) $(CF_NOOPT)
 LFLAGS1 =
@@@@ -763,8 +763,8 @@@@
 # FreeBSD on Intel:
 freebsd:		unix_make
 	@@echo 'NOTE:  use bsd target for non-Intel FreeBSD compiles (if any).'
-	$(MAKE) unzips CC=gcc LD=gcc AS=gcc\
-	 CFLAGS="-O3 -Wall -DASM_CRC -DBSD"\
+	$(MAKE) unzips CC="$(CC)" LD="$(CC)" AS="$(CC)"\
+	 CF="$(CF) -Wall -DASM_CRC -DBSD"\
 	 AF="-Di386 $(AF)" CRCA_O=crc_gcc$O
 
 # Generic BSDish Unix gcc.  ``The -O3 only works with later versions of gcc;
@


1.4
log
@Quote $(CC) for better interoperability e.g. with CC="ccache gcc"

PR:		ports/66320
Submitted by:	Michael Johnson
Approved by:	maintainer timeout
@
text
@d1 3
a3 3
--- unix/Makefile.orig	Mon Mar  1 20:37:24 2004
+++ unix/Makefile	Wed May 26 21:43:04 2004
@@@@ -42,7 +42,7 @@@@
d11 8
a18 2
 LOC = $(LOCAL_UNZIP)
@@@@ -727,8 +727,8 @@@@
d23 1
a23 1
-	 CF="-O3 -Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)"\
d25 2
a26 2
+	 CF="-Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)"\
 	 AF="-Di386 $(AF)" CRC32=crc_gcc
@


1.3
log
@Upgrade to 5.51
@
text
@d18 1
a18 1
+	$(MAKE) unzips CC=$(CC) LD=$(CC) AS=$(CC)\
@


1.2
log
@From Kato's PR:
- Support CFLAGS/ARCH properly
- Support NOPORTDOCS

Plus my own:
- Remove ftp://... line from the comments section of Makefile
- Adjust WWW line to be http:// instead of ftp://

PR:		18904
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>
@
text
@d1 2
a2 2
--- unix/Makefile.orig	Sun Apr 16 12:27:18 2000
+++ unix/Makefile	Wed May 31 03:30:22 2000
d12 1
a12 1
@@@@ -679,8 +679,8 @@@@
d17 1
a17 1
-	 CF="-O3 -Wall -I. -DASM_CRC -DBSD $(LOC)"\
d19 1
a19 1
+	 CF="-I. -DASM_CRC -DBSD $(LOC)"\
@


1.1
log
@Respect CC
@
text
@d1 2
a2 2
--- unix/Makefile.orig	Thu Nov 19 13:59:08 1998
+++ unix/Makefile	Sat Jan 22 17:23:42 2000
d12 1
a12 1
@@@@ -680,7 +680,7 @@@@
d17 1
d19 1
a19 1
 	 CF="-O3 -Wall -I. -DASM_CRC -DBSD $(LOC)"\
d22 1
@

