Wed Mar 7 15:29:52 2012 UTC ()
png-license is just a zlib with many authors. Use zlib here (as already
done in png package).


(wiz)
diff -r1.40 -r1.41 pkgsrc/graphics/gif2png/Makefile
diff -r1.54 -r1.55 pkgsrc/graphics/pngcrush/Makefile
cvs diff -r1.40 -r1.41 pkgsrc/graphics/gif2png/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gif2png/Makefile 2012/03/07 15:28:12 1.40
+++ pkgsrc/graphics/gif2png/Makefile 2012/03/07 15:29:52 1.41
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.40 2012/03/07 15:28:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2012/03/07 15:29:52 wiz Exp $
2 2
3DISTNAME= gif2png-2.5.5 3DISTNAME= gif2png-2.5.5
4CATEGORIES= graphics converters 4CATEGORIES= graphics converters
5MASTER_SITES= http://www.catb.org/~esr/gif2png/ 5MASTER_SITES= http://www.catb.org/~esr/gif2png/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.catb.org/~esr/gif2png/ 8HOMEPAGE= http://www.catb.org/~esr/gif2png/
9COMMENT= Convert GIF files to PNG 9COMMENT= Convert GIF files to PNG
10LICENSE= png-license 10LICENSE= zlib
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15 15
16PYTHON_PATCH_SCRIPTS+= web2png 16PYTHON_PATCH_SCRIPTS+= web2png
17 17
18.include "../../graphics/png/buildlink3.mk" 18.include "../../graphics/png/buildlink3.mk"
19.include "../../lang/python/application.mk" 19.include "../../lang/python/application.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.55 pkgsrc/graphics/pngcrush/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/pngcrush/Makefile 2012/02/20 17:27:24 1.54
+++ pkgsrc/graphics/pngcrush/Makefile 2012/03/07 15:29:52 1.55
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.54 2012/02/20 17:27:24 adam Exp $ 1# $NetBSD: Makefile,v 1.55 2012/03/07 15:29:52 wiz Exp $
2 2
3DISTNAME= pngcrush-1.7.25-nolib 3DISTNAME= pngcrush-1.7.25-nolib
4PKGNAME= ${DISTNAME:C/-nolib//} 4PKGNAME= ${DISTNAME:C/-nolib//}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html 10HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html
11COMMENT= Optimizer for PNG (Portable Network Graphics) files 11COMMENT= Optimizer for PNG (Portable Network Graphics) files
12LICENSE= png-license 12LICENSE= zlib
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16NO_CONFIGURE= yes 16NO_CONFIGURE= yes
17INSTALLATION_DIRS= bin 17INSTALLATION_DIRS= bin
18 18
19do-build: 19do-build:
20 cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ 20 cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \
21 ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ 21 ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \
22 ${LDFLAGS} `libpng-config --ldflags` -lz 22 ${LDFLAGS} `libpng-config --ldflags` -lz
23 23
24do-install: 24do-install:
25 ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin 25 ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin