Attachment 125449 Details for Bug 169063 – optipng-0.7.1.patch

[patch] optipng-0.7.1.patch

optipng-0.7.1.patch (text/plain), 7.05 KB, created by fumifumi on 2012-06-14 11:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fumifumi

Created: 2012-06-14 11:50:01 UTC

Size: 7.05 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/graphics/optipng/Makefile ./Makefile
>--- /usr/ports/graphics/optipng/Makefile	2012-06-01 14:20:26.000000000 +0900
>+++ ./Makefile	2012-06-14 19:21:35.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	optipng
>-PORTVERSION=	0.6.5
>+PORTVERSION=	0.7.1
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION}
> 
>@@ -17,20 +17,17 @@
> 		BUNDLED_ZLIB	"Use bundled zlib"	off
> 
> HAS_CONFIGURE=	yes
>-BUILD_WRKSRC=	${WRKSRC}/src
>-MAKEFILE=	scripts/unix.mak
>-ALL_TARGET=	${PORTNAME}
> PLIST_FILES=	bin/optipng
> MAN1=		optipng.1
>-PORTDOCS=	caveat.txt history.txt manual.html manual.pdf manual.txt \
>-		png_optimization_guide.html thanks.html todo.txt
>+PORTDOCS=	history.txt optipng.man.html optipng.man.pdf optipng.man.txt \
>+		png_optimization.html todo.txt
> 
> .include <bsd.port.options.mk>
> 
> .ifndef(WITH_BUNDLED_LIBPNG)
>-BROKEN=		does not build with libpng 1.5.x
> CONFIGURE_ARGS+=	--with-system-libpng
> CFLAGS+=	"-I${LOCALBASE}/include"
>+LDFLAGS+=	"-L${LOCALBASE}/lib"
> LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
> .endif
> 
>@@ -39,8 +36,8 @@
> .endif
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/
>-	${INSTALL_MAN} ${WRKSRC}/man/optipng.1 ${MAN1PREFIX}/man/man1/
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${PREFIX}/bin/
>+	${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${MAN1PREFIX}/man/man1/
> 
> post-install:
> .ifndef NOPORTDOCS
>diff -ruN --exclude=CVS /usr/ports/graphics/optipng/distinfo ./distinfo
>--- /usr/ports/graphics/optipng/distinfo	2011-12-29 23:07:56.000000000 +0900
>+++ ./distinfo	2012-06-14 18:23:57.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (optipng-0.6.5.tar.gz) = 2998e203941cdb95eb97587a44b02b3b765e85a7d62fe2df076b0123a7ba5b44
>-SIZE (optipng-0.6.5.tar.gz) = 1534271
>+SHA256 (optipng-0.7.1.tar.gz) = 6d28cd194729f6c806df24cb604355f27c4badd4457fffcbeeca23d9b6106b76
>+SIZE (optipng-0.7.1.tar.gz) = 1608280
>diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std ./files/patch-lib-libpng-scripts-makefile.std
>--- /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std	2011-12-29 23:07:57.000000000 +0900
>+++ ./files/patch-lib-libpng-scripts-makefile.std	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in ./files/patch-lib-pngxtern-scripts-unix.mak.in
>--- /usr/ports/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in	2011-12-29 23:07:57.000000000 +0900
>+++ ./files/patch-lib-pngxtern-scripts-unix.mak.in	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in ./files/patch-lib-zlib-Makefile.in
>--- /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in	2011-12-29 23:07:57.000000000 +0900
>+++ ./files/patch-lib-zlib-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-opngreduc.c ./files/patch-src-opngreduc.c
>--- /usr/ports/graphics/optipng/files/patch-src-opngreduc.c	2011-12-29 23:07:57.000000000 +0900
>+++ ./files/patch-src-opngreduc.c	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-optipng-osys.c ./files/patch-src-optipng-osys.c
>--- /usr/ports/graphics/optipng/files/patch-src-optipng-osys.c	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/patch-src-optipng-osys.c	2012-06-14 18:53:22.000000000 +0900
>@@ -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 -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in ./files/patch-src-scripts-unix.mak.in
>--- /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in	2011-12-29 23:07:57.000000000 +0900
>+++ ./files/patch-src-scripts-unix.mak.in	1970-01-01 09:00:00.000000000 +0900
>@@ -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

Actions: View | Diff

Attachments on bug 169063: 125449