Date: Fri, 14 Nov 2008 19:21:25 +0000 From: Thomas Hurst <tom@hur.st> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/128877: [PATCH] graphics/optipng: update to 0.6.2, take maintainership Message-ID: <E1L14EP-000Q0U-5F@voi.aagh.net> Resent-Message-ID: <200811141940.mAEJe3RV013862@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 128877 >Category: ports >Synopsis: [PATCH] graphics/optipng: update to 0.6.2, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Nov 14 19:40:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thomas Hurst >Release: FreeBSD 7.0-STABLE amd64 >Organization: >Environment: System: FreeBSD voi.nightsdawn.sf 7.0-STABLE FreeBSD 7.0-STABLE #0: Sun Jul 13 21:32:30 BST 2008 >Description: - Update to 0.6.2 - Add support for using the bundled patched zlib and libpng, both off by default. - Update my email address. Added file(s): - files/patch-configure - files/patch-lib-libpng-scripts-makefile.std - files/patch-lib-zlib-Makefile.in - files/patch-src-scripts-unix.mak.in Removed file(s): - files/patch-src__scripts__unix-secure.mak Port maintainer (freaky@aagh.net) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- optipng-0.6.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/optipng/Makefile /usr/home/freaky/work/ports/graphics/optipng/Makefile --- /usr/ports/graphics/optipng/Makefile 2006-08-25 20:20:42.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/Makefile 2008-11-14 19:16:49.000000000 +0000 @@ -6,22 +6,38 @@ # PORTNAME= optipng -PORTVERSION= 0.5.4 +PORTVERSION= 0.6.2 CATEGORIES= graphics MASTER_SITES= SF -MAINTAINER= freaky@aagh.net +MAINTAINER= tom@hur.st COMMENT= An optimizer for PNG files -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png +OPTIONS= BUNDLED_LIBPNG "Use bundled libpng" off \ + BUNDLED_ZLIB "Use bundled zlib" off + +.include <bsd.port.pre.mk> + +CONFIGURE_ARGS= # +.ifndef(WITH_BUNDLED_LIBPNG) +CONFIGURE_ARGS+= --with-system-libpng +LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png +.endif + +.ifndef(WITH_BUNDLED_ZLIB) +CONFIGURE_ARGS+= --with-system-zlib +.endif BUILD_WRKSRC= ${WRKSRC}/src -MAKEFILE= scripts/unix-secure.mak +MAKEFILE= scripts/unix.mak ALL_TARGET= ${PORTNAME} PLIST_FILES= bin/optipng MAN1= optipng.1 -PORTDOCS= CAVEAT.txt HISTORY.txt TODO.txt USAGE.txt \ - design.html features.html guide.html thanks.html +PORTDOCS= caveat.txt history.txt manual.html manual.pdf manual.txt \ + png_optimization_guide.html thanks.html todo.txt + +do-configure: + (cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/ @@ -33,4 +49,4 @@ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/graphics/optipng/distinfo /usr/home/freaky/work/ports/graphics/optipng/distinfo --- /usr/ports/graphics/optipng/distinfo 2006-08-25 20:20:43.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/distinfo 2008-11-14 17:38:53.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (optipng-0.5.4.tar.gz) = 8d989971e674a06b55e17fc5b70c41aa -SHA256 (optipng-0.5.4.tar.gz) = 3074f7ebac74683c12b805d58f836400cbec51355fad13f47d46775792ad35ab -SIZE (optipng-0.5.4.tar.gz) = 1094572 +MD5 (optipng-0.6.2.tar.gz) = 08b6195bb5895a7fe167fab16dcdf6d5 +SHA256 (optipng-0.6.2.tar.gz) = 84312506ea0c683a4e7675b3c8278067222762520016cc61e53c2b0e679120ca +SIZE (optipng-0.6.2.tar.gz) = 1052509 diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-configure /usr/home/freaky/work/ports/graphics/optipng/files/patch-configure --- /usr/ports/graphics/optipng/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-configure 2008-11-14 18:58:59.000000000 +0000 @@ -0,0 +1,11 @@ +--- configure.orig 2008-07-21 03:32:00.000000000 +0100 ++++ configure 2008-11-14 18:58:23.000000000 +0000 +@@ -49,7 +49,7 @@ + then + sed -e "$zlib_inc_del" -e "$libpng_inc_del" \ + -e "$zlib_lib_del" -e "$libpng_lib_del" \ +- -e "$zlib_sys_ins" -e "$libpng_sys_ins" \ ++ -e "$libpng_sys_ins" -e "$zlib_sys_ins" \ + src/scripts/unix.mak.in > src/scripts/unix.mak + sed -e "$zlib_inc_del" -e "$libpng_inc_del" \ + -e "$zlib_lib_del" -e "$libpng_lib_del" \ diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std --- /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std 2008-11-14 18:16:25.000000000 +0000 @@ -0,0 +1,25 @@ +--- lib/libpng/scripts/makefile.std.orig 2006-03-06 17:06:28.000000000 +0000 ++++ lib/libpng/scripts/makefile.std 2008-11-14 18:00:09.000000000 +0000 +@@ -24,12 +24,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-zlib-Makefile.in /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in --- /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in 2008-11-14 18:16:55.000000000 +0000 @@ -0,0 +1,37 @@ +--- lib/zlib/Makefile.in.orig 2005-07-18 03:25:21.000000000 +0100 ++++ lib/zlib/Makefile.in 2008-11-14 18:07:42.000000000 +0000 +@@ -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 \ +@@ -33,9 +33,10 @@ + SHAREDLIBV=libz.so.1.2.3 + SHAREDLIBM=libz.so.1 + +-AR=ar rc +-RANLIB=ranlib +-TAR=tar ++AR?=ar ++ARFLAGS?=rc ++RANLIB?=ranlib ++TAR?=tar + SHELL=/bin/sh + EXE= + +@@ -68,7 +69,7 @@ + fi + + libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) ++ $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) + -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 + + match.o: match.S diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in /usr/home/freaky/work/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in --- /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in 2008-11-14 18:59:49.000000000 +0000 @@ -0,0 +1,33 @@ +--- src/scripts/unix.mak.in.orig 2008-09-03 23:56:00.000000000 +0100 ++++ src/scripts/unix.mak.in 2008-11-14 18:29:12.000000000 +0000 +@@ -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 +-LD = $(CC) +-CFLAGS = -O +-LDFLAGS = -s ++CC ?= cc ++LD = $(CC) ++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 strutil.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 = + diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak /usr/home/freaky/work/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak --- /usr/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak 2006-08-25 20:20:43.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ ---- ./src/scripts/unix-secure.mak.orig Fri Aug 11 19:08:00 2006 -+++ ./src/scripts/unix-secure.mak Sat Aug 12 10:56:39 2006 -@@ -12,17 +12,14 @@ - # Usage: make -f scripts/unix-secure.mak - - --prefix=/usr/local -+prefix=${PREFIX} - exec_prefix=${prefix} - bindir=${exec_prefix}/bin --mandir=${prefix}/man --man1dir=${mandir}/man1 -+man1dir=${MAN1PREFIX}/man/man1 - --CC = cc --LD = $(CC) --MAKE = make --CFLAGS = -O --LDFLAGS = -s -+CFLAGS ?= -O -+LDFLAGS += -s -L${LOCALBASE}/lib -+CFLAGS += -I${LOCALBASE}/include - - OPTIPNG = optipng - PNGXLIB = pngxtern.a -@@ -35,7 +32,7 @@ - - - $(OPTIPNG): $(OBJS) $(LIBS) -- $(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz -+ $(CC) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz - - - .c.o: diff -ruN --exclude=CVS /usr/ports/graphics/optipng/pkg-descr /usr/home/freaky/work/ports/graphics/optipng/pkg-descr --- /usr/ports/graphics/optipng/pkg-descr 2006-08-09 11:19:16.000000000 +0100 +++ /usr/home/freaky/work/ports/graphics/optipng/pkg-descr 2008-11-14 19:11:51.000000000 +0000 @@ -11,4 +11,4 @@ WWW: http://optipng.sourceforge.net/ - Thomas Hurst - <freaky@aagh.net> + <tom@hur.st> --- optipng-0.6.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1L14EP-000Q0U-5F>