head	1.3;
access;
symbols
	RELEASE_4_3_0:1.1
	RELEASE_4_2_0:1.1
	RELEASE_4_1_1:1.1
	RELEASE_4_1_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2001.07.29.04.35.01;	author demon;	state dead;
branches;
next	1.2;

1.2
date	2001.04.27.13.45.19;	author olgeni;	state Exp;
branches;
next	1.1;

1.1
date	2000.07.07.19.07.04;	author steve;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Upgrade to 4.4.5
@
text
@--- image/makefile.in.orig	Wed Apr 25 20:12:34 2001
+++ image/makefile.in	Wed Apr 25 20:14:32 2001
@@@@ -31,34 +31,34 @@@@
 all:: libie.a $(PNGDEP) $(ZDEP)
 
 24to8.o: 24to8.c
-	 $(CC) -c 24to8.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c 24to8.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 jpeg.o: jpeg.c
-	 $(CC) -c jpeg.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c jpeg.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 accel.o: accel.c
-	 $(CC) -c accel.c $(CXXOPT) $(CXXINCLUDES)
+	 $(CC) -c accel.c $(CXXOPT) $(CXXINCLUDES) $(CPPFLAGS)
 
 pcdr.o: pcdr.c
-	 $(CC) -c pcdr.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c pcdr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 inter.o: inter.c
-	 $(CC) -c inter.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c inter.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 huff.o: huff.c
-	 $(CC) -c huff.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c huff.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 file.o: file.c
-	 $(CC) -c file.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c file.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 yuv2rgb.o: yuv2rgb.c
-	 $(CC) -c yuv2rgb.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c yuv2rgb.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 tiffr.o: tiffr.c
-	 $(CC) -c tiffr.c $(CXXOPT)  $(INCLUDES) -I/usr/local/include -I/usr/include/gr
+	 $(CC) -c tiffr.c $(CXXOPT)  $(INCLUDES) $(CPPFLAGS)
 
 png.o: png.c
-	 $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(ZINC) $(PNGINC)
+	 $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(ZINC) $(PNGINC) $(CPPFLAGS)
 
 ../zlib/libz.a:
 	cd ../zlib && make
@@@@ -67,7 +67,7 @@@@
 	cd ../libpng && make
 
 pcxr.o: pcxr.c
-	 $(CC) -c pcxr.c $(CXXOPT) $(INCLUDES)
+	 $(CC) -c pcxr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
 
 libie.a: $(IOBJS)
 	 $(RM) -f libie.a
@


1.2
log
@Update port to version 4.4.4.

Add support for PORTDOCS in pkg-plist.

Patches in files/ have been regenerated for this release, but they do the
same things as before.
@
text
@@


1.1
log
@Use the jpeg and png libraries from the port's collection.

PR:		19527
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>
@
text
@d1 3
a3 3
--- image/makefile.in.orig	Tue Jan 18 17:35:15 2000
+++ image/makefile.in	Sat Jun 24 15:56:50 2000
@@@@ -31,31 +31,31 @@@@
d14 4
d44 1
a44 1
+	 $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) $(ZINC) $(PNGINC)
d48 1
a48 1
@@@@ -64,10 +64,10 @@@@
a53 4
 
 accel.o: accel.c
-	 $(CC) -c accel.c $(CFLAGS)
+	 $(CC) -c accel.c $(CFLAGS) $(CPPFLAGS)
@

