diff options
author | Alex Kozlov <ak@FreeBSD.org> | 2012-06-29 06:33:22 +0000 |
---|---|---|
committer | Alex Kozlov <ak@FreeBSD.org> | 2012-06-29 06:33:22 +0000 |
commit | 9fe45c1cbd6f4fb3a2d3cffd98a2c0403856e40d (patch) | |
tree | ca16370ae20465aaf78aa4411966e6ef6f9deb66 /graphics/optipng/files | |
parent | 29ffd9f6522218d0831eeee12d9e68a8d01401c8 (diff) | |
download | ports-9fe45c1cbd6f4fb3a2d3cffd98a2c0403856e40d.tar.gz ports-9fe45c1cbd6f4fb3a2d3cffd98a2c0403856e40d.zip |
- Update to 0.7.1 [1]
- Convert to optionsNG
PR: ports/169063 [1]
Submitted by: Fumiyuki Shimizu <fumifumi@abacustech.jp>
Approved by: maintainer timeout (14 days)
Notes
Notes:
svn path=/head/; revision=300202
Diffstat (limited to 'graphics/optipng/files')
6 files changed, 11 insertions, 132 deletions
diff --git a/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std b/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std deleted file mode 100644 index 3b2712557019..000000000000 --- a/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std +++ /dev/null @@ -1,25 +0,0 @@ ---- lib/libpng/scripts/makefile.std.orig 2010-12-09 16:48:13.000000000 +0300 -+++ lib/libpng/scripts/makefile.std 2011-04-13 20:38:46.000000000 +0400 -@@ -27,12 +27,16 @@ - ZLIBLIB=../zlib - ZLIBINC=../zlib - --CC=cc --AR_RC=ar rc --MKDIR_P=mkdir --LN_SF=ln -sf --RANLIB=ranlib --RM_F=rm -f -+CC?=cc -+AR?=ar -+AR_RC=${AR} rc -+MKDIR?=mkdir -+MKDIR_P=${MKDIR} -+LN?=ln -+LN_SF=${LN} -sf -+RANLIB?=ranlib -+RM?=rm -+RM_F=${RM} -f - - CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 - LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm diff --git a/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in b/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in deleted file mode 100644 index 3491874e1fbd..000000000000 --- a/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/pngxtern/scripts/unix.mak.in.orig 2008-06-18 03:29:00.000000000 +0400 -+++ lib/pngxtern/scripts/unix.mak.in 2011-04-13 21:06:00.000000000 +0400 -@@ -8,8 +8,8 @@ - PNGDIR = ../libpng - - # Compiler, linker, librarian and other tools --CC = cc --LD = $(CC) -+CC ?= cc -+LD ?= $(CC) - AR_RC = ar rcs - RANLIB = ranlib - RM_F = rm -f -@@ -18,9 +18,9 @@ - LDDEBUG = - CRELEASE = -O - LDRELEASE = -s --CFLAGS = $(CRELEASE) --LDFLAGS = $(LDRELEASE) --INCS = -I$(ZDIR) -I$(PNGDIR) -+CFLAGS ?= $(CRELEASE) -+LDFLAGS ?= $(LDRELEASE) -+INCS = -I$(ZDIR) -I$(PNGDIR) -I${LOCALBASE}/include - LIBS = -lpng -lz -lm - - # File extensions diff --git a/graphics/optipng/files/patch-lib-zlib-Makefile.in b/graphics/optipng/files/patch-lib-zlib-Makefile.in deleted file mode 100644 index f30a82029ef0..000000000000 --- a/graphics/optipng/files/patch-lib-zlib-Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ ---- lib/zlib/Makefile.in.orig 2011-04-14 15:10:39.000000000 +0400 -+++ lib/zlib/Makefile.in 2011-04-14 15:11:57.000000000 +0400 -@@ -16,9 +16,9 @@ - # 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 \ -@@ -36,11 +36,12 @@ - SHAREDLIBM=libz.so.1 - LIBS=$(STATICLIB) $(SHAREDLIBV) - --AR=ar rc --RANLIB=ranlib -+AR?=ar -+ARFLAGS?=rc -+RANLIB?=ranlib - LDCONFIG=ldconfig - LDSHAREDLIBC=-lc --TAR=tar -+TAR?=tar - SHELL=/bin/sh - EXE= - -@@ -108,7 +109,7 @@ - -@rm -f foo.gz - - libz.a: $(OBJS) -- $(AR) $@ $(OBJS) -+ $(AR) $(ARFLAGS) $@ $(OBJS) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - - match.o: match.S diff --git a/graphics/optipng/files/patch-src-opngreduc.c b/graphics/optipng/files/patch-src-opngreduc.c deleted file mode 100644 index 22dffa3b300e..000000000000 --- a/graphics/optipng/files/patch-src-opngreduc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/opngreduc.c.orig 2011-12-29 14:47:34.000000000 +0100 -+++ src/opngreduc.c 2011-12-29 14:48:52.000000000 +0100 -@@ -27,6 +27,8 @@ - #if PNG_LIBPNG_VER >= 10400 - #ifdef PNG_USER_PRIVATEBUILD - #include "pngpriv.h" -+#else -+#include "libpng/pngpriv.h" - #endif - #endif - diff --git a/graphics/optipng/files/patch-src-optipng-osys.c b/graphics/optipng/files/patch-src-optipng-osys.c new file mode 100644 index 000000000000..5f409f63e1b8 --- /dev/null +++ b/graphics/optipng/files/patch-src-optipng-osys.c @@ -0,0 +1,11 @@ +--- src/optipng/osys.c.orig 2011-07-22 13:49:00.000000000 +0900 ++++ src/optipng/osys.c 2012-06-14 18:51:09.000000000 +0900 +@@ -435,7 +435,7 @@ + if (chmod(dest_path, mode) != 0) + return -1; + +-#ifdef AT_FDCWD ++#if 0 /* def AT_FDCWD */ + { + struct timespec times[2]; + diff --git a/graphics/optipng/files/patch-src-scripts-unix.mak.in b/graphics/optipng/files/patch-src-scripts-unix.mak.in deleted file mode 100644 index 1065f02d2c9a..000000000000 --- a/graphics/optipng/files/patch-src-scripts-unix.mak.in +++ /dev/null @@ -1,31 +0,0 @@ ---- src/scripts/unix.mak.in.orig 2011-04-14 15:07:03.000000000 +0400 -+++ src/scripts/unix.mak.in 2011-04-14 15:08:29.000000000 +0400 -@@ -4,16 +4,16 @@ - # Usage: make -f scripts/unix.mak - - --prefix=/usr/local -+prefix=${PREFIX} - exec_prefix=$(prefix) - bindir=$(exec_prefix)/bin - mandir=$(prefix)/man - man1dir=$(mandir)/man1 - --CC = cc -+CC ?= cc - LD = $(CC) --CFLAGS = -O --LDFLAGS = -s -+CFLAGS ?= -O -+LDFLAGS += -s -L${LOCALBASE}/lib - - OPTIPNG = optipng - ZLIB = libz.a -@@ -28,7 +28,7 @@ - BACKDIR = ../../src - - OBJS = optipng.o opngoptim.o opngreduc.o cbitset.o osys.o --INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) -+INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) -I${LOCALBASE}/include - LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB) - SYSLIBS = -lm |