diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-07-23 22:04:26 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-07-23 22:04:26 +0000 |
| commit | 11bd228fd1c21cd084f2b277783b8124a6fbcc27 (patch) | |
| tree | 3dfc28d7cd2ceddf7a79139dcc9c8e930b1d4f52 /graphics/optipng/files | |
| parent | c6e2c51beb1002dd25a1e0e1a5260a3092b5343a (diff) | |
| download | ports-11bd228fd1c21cd084f2b277783b8124a6fbcc27.tar.gz ports-11bd228fd1c21cd084f2b277783b8124a6fbcc27.zip | |
Notes
Diffstat (limited to 'graphics/optipng/files')
| -rw-r--r-- | graphics/optipng/files/patch-lib-cos-zlib-Makefile.in | 40 | ||||
| -rw-r--r-- | graphics/optipng/files/patch-src-scripts-Makefile.gcc | 43 |
2 files changed, 83 insertions, 0 deletions
diff --git a/graphics/optipng/files/patch-lib-cos-zlib-Makefile.in b/graphics/optipng/files/patch-lib-cos-zlib-Makefile.in new file mode 100644 index 000000000000..b4671ec7f192 --- /dev/null +++ b/graphics/optipng/files/patch-lib-cos-zlib-Makefile.in @@ -0,0 +1,40 @@ +--- lib-cos/zlib/Makefile.in.orig Mon Mar 11 18:58:30 2002 ++++ lib-cos/zlib/Makefile.in Wed Jul 9 02:36:33 2003 +@@ -12,28 +12,28 @@ + # To install in $HOME instead of /usr/local, use: + # make install prefix=$HOME + +-CC=cc ++CC?=cc + +-CFLAGS=-O ++CFLAGS?=-O + #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 + #CFLAGS=-g -DDEBUG + #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + # -Wstrict-prototypes -Wmissing-prototypes + +-LDFLAGS=-L. -lz ++LDFLAGS=-L. -lz + LDSHARED=$(CC) +-CPP=$(CC) -E ++CPP?=$(CC) -E + + VER=1.1.4 + LIBS=libz.a + SHAREDLIB=libz.so + +-AR=ar rc +-RANLIB=ranlib +-TAR=tar +-SHELL=/bin/sh ++AR+= rc ++RANLIB?=ranlib ++TAR?=tar ++SHELL?=/bin/sh + +-prefix = /usr/local ++prefix ?= /usr/local + exec_prefix = ${prefix} + libdir = ${exec_prefix}/lib + includedir = ${prefix}/include diff --git a/graphics/optipng/files/patch-src-scripts-Makefile.gcc b/graphics/optipng/files/patch-src-scripts-Makefile.gcc new file mode 100644 index 000000000000..235e5cb147b5 --- /dev/null +++ b/graphics/optipng/files/patch-src-scripts-Makefile.gcc @@ -0,0 +1,43 @@ +--- src/scripts/Makefile.gcc.orig Mon May 12 22:11:56 2003 ++++ src/scripts/Makefile.gcc Wed Jul 9 13:29:49 2003 +@@ -1,21 +1,25 @@ + # ** OptiPNG + # ** Quick and dirty makefile for GCC + ++CC?= gcc ++CFLAGS?= -pipe -O2 -g ++CP?= cp ++ + all: optipng + + optipng: optipng.o opngio.o opngreduc.o cbitset.o \ + wildargs.o libpng.a libz.a +- gcc -s -o optipng optipng.o opngio.o opngreduc.o cbitset.o \ ++ ${CC} ${CFLAGS} -o optipng optipng.o opngio.o opngreduc.o cbitset.o \ + wildargs.o libpng.a libz.a + + .c.o: #png.h opng.h +- gcc -c -O2 -I../lib-cos/zlib -I../lib-cos/libpng -Wall $*.c ++ ${CC} ${CFLAGS} -c -I../lib-cos/zlib -I../lib-cos/libpng -Wall $*.c + + cbitset.o: cbitset.c cbitset.h +- gcc -c -O2 -Wall $*.c ++ ${CC} ${CFLAGS} -c -Wall $*.c + + wildargs.o: xtra/wildargs.c +- gcc -c -O2 xtra/wildargs.c ++ ${CC} ${CFLAGS} -c xtra/wildargs.c + + libpng.a: ../lib-cos/libpng/libpng.a + cp ../lib-cos/libpng/libpng.a libpng.a +@@ -24,7 +28,8 @@ + cp ../lib-cos/zlib/libz.a libz.a + + ../lib-cos/libpng/libpng.a: ../lib-cos/zlib/libz.a +- cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcc; cd ../../src ++ cd ../lib-cos/libpng; ${MAKE} CFLAGS="-I../zlib ${CFLAGS}" -f scripts/makefile.freebsd libpng.a; cd ../../src + + ../lib-cos/zlib/libz.a: +- cd ../lib-cos/zlib; ./configure; ${MAKE}; cd ../../src ++# gcc 2.95 seems to break when using -O w/ x86. Force -O2 over -O0. ++ cd ../lib-cos/zlib; ./configure; ${MAKE} CFLAGS="${CFLAGS} -O2"; cd ../../src |