diff options
| -rw-r--r-- | graphics/optipng/Makefile | 23 | ||||
| -rw-r--r-- | graphics/optipng/distinfo | 6 | ||||
| -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 | ||||
| -rw-r--r-- | graphics/optipng/files/patch-src__scripts__gcc-syslib.mak | 26 | ||||
| -rw-r--r-- | graphics/optipng/pkg-descr | 13 | ||||
| -rw-r--r-- | graphics/optipng/pkg-plist | 11 |
7 files changed, 52 insertions, 110 deletions
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index 2e640e1d23d5..097c774ac7ba 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -6,26 +6,29 @@ # PORTNAME= optipng -PORTVERSION= 0.4.3 +PORTVERSION= 0.5.3 CATEGORIES= graphics -MASTER_SITES= http://www.cs.toronto.edu/~cosmin/pngtech/optipng/ +MASTER_SITES= SF MAINTAINER= freaky@aagh.net COMMENT= An optimizer for PNG files BUILD_WRKSRC= ${WRKSRC}/src -MAKEFILE= scripts/Makefile.gcc +MAKEFILE= scripts/gcc-syslib.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 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/man/optipng.1 ${MAN1PREFIX}/man/man1/ post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - -.for i in CAVEAT DESIGN FEATURES HISTORY LICENSE README TODO USAGE index.html - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR} -.endfor +.ifndef NOPORTDOCS + ${INSTALL} -d ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/ .endif .include <bsd.port.mk> diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo index 0b69348430eb..2df2bc94f15d 100644 --- a/graphics/optipng/distinfo +++ b/graphics/optipng/distinfo @@ -1,3 +1,3 @@ -MD5 (optipng-0.4.3.tar.gz) = 3ed23ff9c204d7ffbd0fa6b3c53d830e -SHA256 (optipng-0.4.3.tar.gz) = 6950b5c506df4d57791870e5704c9766c8efe6e37f3073215d1c960e05d1dd8a -SIZE (optipng-0.4.3.tar.gz) = 555842 +MD5 (optipng-0.5.3.tar.gz) = a6f3234a47464ecc1f455b52f0769492 +SHA256 (optipng-0.5.3.tar.gz) = fa910c7dc8dbe29323494097255f034d374f8ef0e42ace3e3855408e014319e5 +SIZE (optipng-0.5.3.tar.gz) = 1090872 diff --git a/graphics/optipng/files/patch-lib-cos-zlib-Makefile.in b/graphics/optipng/files/patch-lib-cos-zlib-Makefile.in deleted file mode 100644 index b4671ec7f192..000000000000 --- a/graphics/optipng/files/patch-lib-cos-zlib-Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 deleted file mode 100644 index 235e5cb147b5..000000000000 --- a/graphics/optipng/files/patch-src-scripts-Makefile.gcc +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 diff --git a/graphics/optipng/files/patch-src__scripts__gcc-syslib.mak b/graphics/optipng/files/patch-src__scripts__gcc-syslib.mak new file mode 100644 index 000000000000..b37cbb39e323 --- /dev/null +++ b/graphics/optipng/files/patch-src__scripts__gcc-syslib.mak @@ -0,0 +1,26 @@ +--- ./src/scripts/gcc-syslib.mak.orig Mon Jul 24 20:49:09 2006 ++++ ./src/scripts/gcc-syslib.mak Mon Jul 24 20:53:49 2006 +@@ -15,18 +15,16 @@ + # Usage: make -f scripts/gcc-syslib.mak + + +-prefix=/usr/local ++prefix=${PREFIX} + exec_prefix=${prefix} + bindir=${exec_prefix}/bin +-mandir=${prefix}/man +-man1dir=${mandir}/man1 ++man1dir=${MAN1PREFIX}/man/man1 + +-CC = gcc + LD = $(CC) +-CFLAGS = -O2 -Wall +-LDFLAGS = -s ++CFLAGS ?= -O2 -Wall ++LDFLAGS += -s + +-OPTIPNG = optipng$(EXE) ++OPTIPNG = optipng + PNGLIB = libpng.a + PNGXLIB = pngxtern.a + PNGMAK = scripts/makefile.gcc diff --git a/graphics/optipng/pkg-descr b/graphics/optipng/pkg-descr index a01b3894bbe3..4b91f9a24d96 100644 --- a/graphics/optipng/pkg-descr +++ b/graphics/optipng/pkg-descr @@ -1,7 +1,14 @@ -OptiPNG is a PNG optimizer that recompresses the image files to a -smaller size, without losing any information. +OptiPNG is a PNG optimizer that recompresses image files to a smaller +size, without losing any information. This program also converts +external formats (BMP, GIF, PNM; TIFF support is coming up) to optimized +PNG, and performs PNG integrity checks and corrections. -WWW: http://www.cs.toronto.edu/~cosmin/pngtech/optipng/ +The idea has been inspired from pngcrush, and is explained in detail in +the PNG-Tech article "A guide to PNG optimization". The implementation +is carried forward in OptiPNG, which offers a faster execution per +trial, and a wider search space. + +WWW: http://optipng.sourceforge.net/ - Thomas Hurst <freaky@aagh.net> diff --git a/graphics/optipng/pkg-plist b/graphics/optipng/pkg-plist deleted file mode 100644 index 2a34b7082a58..000000000000 --- a/graphics/optipng/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/optipng -%%PORTDOCS%%%%DOCSDIR%%/CAVEAT -%%PORTDOCS%%%%DOCSDIR%%/DESIGN -%%PORTDOCS%%%%DOCSDIR%%/FEATURES -%%PORTDOCS%%%%DOCSDIR%%/HISTORY -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/USAGE -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% |