Attachment #91514 for bug #128877

View | Details | Raw Unified | Return to bug 128877
Collapse All | Expand All




#

PORTNAME=	optipng
PORTVERSION=	0.6.2
CATEGORIES=	graphics
MASTER_SITES=	SF

MAINTAINER=	tom@hur.st
COMMENT=	An optimizer for PNG files

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.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

do-configure:
	(cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS})

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/

	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/distinfo (-3 / +3 lines)
1	MD5 (optipng-0.5.4.tar.gz) = 8d989971e674a06b55e17fc5b70c41aa	1	MD5 (optipng-0.6.2.tar.gz) = 08b6195bb5895a7fe167fab16dcdf6d5
2	SHA256 (optipng-0.5.4.tar.gz) = 3074f7ebac74683c12b805d58f836400cbec51355fad13f47d46775792ad35ab	2	SHA256 (optipng-0.6.2.tar.gz) = 84312506ea0c683a4e7675b3c8278067222762520016cc61e53c2b0e679120ca
3	SIZE (optipng-0.5.4.tar.gz) = 1094572	3	SIZE (optipng-0.6.2.tar.gz) = 1052509

Line 0 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/files/patch-configure (+11 lines)
	1	--- configure.orig 2008-07-21 03:32:00.000000000 +0100
	2	+++ configure 2008-11-14 18:58:23.000000000 +0000
	3	@@ -49,7 +49,7 @@
	4	then
	5	sed -e "$zlib_inc_del" -e "$libpng_inc_del" \
	6	-e "$zlib_lib_del" -e "$libpng_lib_del" \
	7	- -e "$zlib_sys_ins" -e "$libpng_sys_ins" \
	8	+ -e "$libpng_sys_ins" -e "$zlib_sys_ins" \
	9	src/scripts/unix.mak.in > src/scripts/unix.mak
	10	sed -e "$zlib_inc_del" -e "$libpng_inc_del" \
	11	-e "$zlib_lib_del" -e "$libpng_lib_del" \

Line 0 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std (+25 lines)
	1	--- lib/libpng/scripts/makefile.std.orig 2006-03-06 17:06:28.000000000 +0000
	2	+++ lib/libpng/scripts/makefile.std 2008-11-14 18:00:09.000000000 +0000
	3	@@ -24,12 +24,16 @@
	4	ZLIBLIB=../zlib
	5	ZLIBINC=../zlib
	6
	7	-CC=cc
	8	-AR_RC=ar rc
	9	-MKDIR_P=mkdir
	10	-LN_SF=ln -sf
	11	-RANLIB=ranlib
	12	-RM_F=rm -f
	13	+CC?=cc
	14	+AR?=ar
	15	+AR_RC=${AR} rc
	16	+MKDIR?=mkdir
	17	+MKDIR_P=${MKDIR}
	18	+LN?=ln
	19	+LN_SF=${LN} -sf
	20	+RANLIB?=ranlib
	21	+RM?=rm
	22	+RM_F=${RM} -f
	23
	24	CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
	25	LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm




--- 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




--- 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 =
 




--- ./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:

Lines 11-14 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/pkg-descr (-1 / +1 lines)
11	WWW: http://optipng.sourceforge.net/	11	WWW: http://optipng.sourceforge.net/
12		12
13	- Thomas Hurst	13	- Thomas Hurst
14	<freaky@aagh.net>	14	<tom@hur.st>

Return to bug 128877

Lines 6-27 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/Makefile (-7 / +23 lines)
6	#	6	#
7		7
8	PORTNAME= optipng	8	PORTNAME= optipng
9	PORTVERSION= 0.5.4	9	PORTVERSION= 0.6.2
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
13	MAINTAINER= freaky@aagh.net	13	MAINTAINER= tom@hur.st
14	COMMENT= An optimizer for PNG files	14	COMMENT= An optimizer for PNG files
15		15
16	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png	16	OPTIONS= BUNDLED_LIBPNG "Use bundled libpng" off \
		17	BUNDLED_ZLIB "Use bundled zlib" off
		18
		19	.include <bsd.port.pre.mk>
		20
		21	CONFIGURE_ARGS= #
		22	.ifndef(WITH_BUNDLED_LIBPNG)
		23	CONFIGURE_ARGS+= --with-system-libpng
		24	LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
		25	.endif
		26
		27	.ifndef(WITH_BUNDLED_ZLIB)
		28	CONFIGURE_ARGS+= --with-system-zlib
		29	.endif
17		30
18	BUILD_WRKSRC= ${WRKSRC}/src	31	BUILD_WRKSRC= ${WRKSRC}/src
19	MAKEFILE= scripts/unix-secure.mak	32	MAKEFILE= scripts/unix.mak
20	ALL_TARGET= ${PORTNAME}	33	ALL_TARGET= ${PORTNAME}
21	PLIST_FILES= bin/optipng	34	PLIST_FILES= bin/optipng
22	MAN1= optipng.1	35	MAN1= optipng.1
23	PORTDOCS= CAVEAT.txt HISTORY.txt TODO.txt USAGE.txt \	36	PORTDOCS= caveat.txt history.txt manual.html manual.pdf manual.txt \
24	design.html features.html guide.html thanks.html	37	png_optimization_guide.html thanks.html todo.txt
		38
		39	do-configure:
		40	(cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS})
25		41
26	do-install:	42	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/	43	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/
Lines 33-36 Link Here
33	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/	49	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
34	.endif	50	.endif
35		51
36	.include <bsd.port.mk>	52	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in (+37 lines)
	1	--- lib/zlib/Makefile.in.orig 2005-07-18 03:25:21.000000000 +0100
	2	+++ lib/zlib/Makefile.in 2008-11-14 18:07:42.000000000 +0000
	3	@@ -16,9 +16,9 @@
	4	# To install in $HOME instead of /usr/local, use:
	5	# make install prefix=$HOME
	6
	7	-CC=cc
	8	+CC?=cc
	9
	10	-CFLAGS=-O
	11	+CFLAGS?=-O
	12	#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
	13	#CFLAGS=-g -DDEBUG
	14	#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
	15	@@ -33,9 +33,10 @@
	16	SHAREDLIBV=libz.so.1.2.3
	17	SHAREDLIBM=libz.so.1
	18
	19	-AR=ar rc
	20	-RANLIB=ranlib
	21	-TAR=tar
	22	+AR?=ar
	23	+ARFLAGS?=rc
	24	+RANLIB?=ranlib
	25	+TAR?=tar
	26	SHELL=/bin/sh
	27	EXE=
	28
	29	@@ -68,7 +69,7 @@
	30	fi
	31
	32	libz.a: $(OBJS) $(OBJA)
	33	- $(AR) $@ $(OBJS) $(OBJA)
	34	+ $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
	35	-@ ($(RANLIB) $@ \|\| true) >/dev/null 2>&1
	36
	37	match.o: match.S

Line 0 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in (+33 lines)
	1	--- src/scripts/unix.mak.in.orig 2008-09-03 23:56:00.000000000 +0100
	2	+++ src/scripts/unix.mak.in 2008-11-14 18:29:12.000000000 +0000
	3	@@ -4,16 +4,16 @@
	4	# Usage: make -f scripts/unix.mak
	5
	6
	7	-prefix=/usr/local
	8	+prefix=${PREFIX}
	9	exec_prefix=$(prefix)
	10	bindir=$(exec_prefix)/bin
	11	mandir=$(prefix)/man
	12	man1dir=$(mandir)/man1
	13
	14	-CC = cc
	15	-LD = $(CC)
	16	-CFLAGS = -O
	17	-LDFLAGS = -s
	18	+CC ?= cc
	19	+LD = $(CC)
	20	+CFLAGS ?= -O
	21	+LDFLAGS += -s -L${LOCALBASE}/lib
	22
	23	OPTIPNG = optipng
	24	ZLIB = libz.a
	25	@@ -28,7 +28,7 @@
	26	BACKDIR = ../../src
	27
	28	OBJS = optipng.o opngoptim.o opngreduc.o cbitset.o osys.o strutil.o
	29	-INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR)
	30	+INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) -I${LOCALBASE}/include
	31	LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
	32	SYSLIBS =
	33

Lines 1-34 Link Here

(-)/usr/home/freaky/work/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak (-34 lines)
1	--- ./src/scripts/unix-secure.mak.orig Fri Aug 11 19:08:00 2006
2	+++ ./src/scripts/unix-secure.mak Sat Aug 12 10:56:39 2006
3	@@ -12,17 +12,14 @@
4	# Usage: make -f scripts/unix-secure.mak
5
6
7	-prefix=/usr/local
8	+prefix=${PREFIX}
9	exec_prefix=${prefix}
10	bindir=${exec_prefix}/bin
11	-mandir=${prefix}/man
12	-man1dir=${mandir}/man1
13	+man1dir=${MAN1PREFIX}/man/man1
14
15	-CC = cc
16	-LD = $(CC)
17	-MAKE = make
18	-CFLAGS = -O
19	-LDFLAGS = -s
20	+CFLAGS ?= -O
21	+LDFLAGS += -s -L${LOCALBASE}/lib
22	+CFLAGS += -I${LOCALBASE}/include
23
24	OPTIPNG = optipng
25	PNGXLIB = pngxtern.a
26	@@ -35,7 +32,7 @@
27
28
29	$(OPTIPNG): $(OBJS) $(LIBS)
30	- $(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
31	+ $(CC) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
32
33
34	.c.o: