Tue May 20 19:11:07 2014 UTC ()
Fix building with newer giflib.


(adam)
diff -r1.29 -r1.30 pkgsrc/net/driftnet/Makefile
diff -r1.7 -r1.8 pkgsrc/net/driftnet/distinfo
diff -r1.1 -r1.2 pkgsrc/net/driftnet/patches/patch-gif.c
cvs diff -r1.29 -r1.30 pkgsrc/net/driftnet/Makefile (expand / switch to unified diff)

--- pkgsrc/net/driftnet/Makefile 2012/10/23 17:18:18 1.29
+++ pkgsrc/net/driftnet/Makefile 2014/05/20 19:11:07 1.30
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: Makefile,v 1.29 2012/10/23 17:18:18 asau Exp $ 1# $NetBSD: Makefile,v 1.30 2014/05/20 19:11:07 adam Exp $
2# 
3 2
4DISTNAME= driftnet-0.1.6 3DISTNAME= driftnet-0.1.6
5PKGREVISION= 10 4PKGREVISION= 11
6CATEGORIES= net graphics 5CATEGORIES= net graphics
7MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/ 6MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/ 9HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/
11COMMENT= Real-time image sniffer 10COMMENT= Real-time image sniffer
 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 13DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
14 14
15MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
16 16
17BUILD_TARGET= default 17BUILD_TARGET= default
18MAKE_ENV+= CAT=${CAT:Q} TRUE=${TRUE:Q} 18MAKE_ENV+= CAT=${CAT:Q} TRUE=${TRUE:Q}
19USE_TOOLS+= makedepend 19USE_TOOLS+= makedepend
20 20
21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
22 22
23do-install: 23do-install:
24 ${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${DESTDIR}${PREFIX}/bin
25 ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 25 ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
26 26
27.include "../../mk/giflib.buildlink3.mk" 27.include "../../mk/giflib.buildlink3.mk"
28.include "../../x11/gtk/buildlink3.mk" 
29.include "../../mk/jpeg.buildlink3.mk" 28.include "../../mk/jpeg.buildlink3.mk"
30.include "../../mk/pthread.buildlink3.mk" 29.include "../../mk/pthread.buildlink3.mk"
31 30.include "../../x11/gtk/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/net/driftnet/distinfo (expand / switch to unified diff)

--- pkgsrc/net/driftnet/distinfo 2013/08/13 10:23:25 1.7
+++ pkgsrc/net/driftnet/distinfo 2014/05/20 19:11:07 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2013/08/13 10:23:25 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2014/05/20 19:11:07 adam Exp $
2 2
3SHA1 (driftnet-0.1.6.tar.gz) = 279cb3a596f354e7e9c6ac3cc456b3d11dced2ff 3SHA1 (driftnet-0.1.6.tar.gz) = 279cb3a596f354e7e9c6ac3cc456b3d11dced2ff
4RMD160 (driftnet-0.1.6.tar.gz) = 01057f3cb992faa537a8b188e116c6f21016cfac 4RMD160 (driftnet-0.1.6.tar.gz) = 01057f3cb992faa537a8b188e116c6f21016cfac
5Size (driftnet-0.1.6.tar.gz) = 36989 bytes 5Size (driftnet-0.1.6.tar.gz) = 36989 bytes
6SHA1 (patch-aa) = 4e995c7c7c811429bc4f4f6481104a899df707d4 6SHA1 (patch-aa) = 4e995c7c7c811429bc4f4f6481104a899df707d4
7SHA1 (patch-ab) = 5b6bc10901295c58d5607deab9bd25effbbbf950 7SHA1 (patch-ab) = 5b6bc10901295c58d5607deab9bd25effbbbf950
8SHA1 (patch-gif.c) = 2d8a3eb735109f44d9da39b397813a9a6f2b1034 8SHA1 (patch-gif.c) = e006d37c739334f1b1e50428e0bbd34b1dbca12c
cvs diff -r1.1 -r1.2 pkgsrc/net/driftnet/patches/patch-gif.c (expand / switch to unified diff)

--- pkgsrc/net/driftnet/patches/patch-gif.c 2013/08/13 10:23:26 1.1
+++ pkgsrc/net/driftnet/patches/patch-gif.c 2014/05/20 19:11:07 1.2
@@ -1,13 +1,33 @@ @@ -1,13 +1,33 @@
1$NetBSD: patch-gif.c,v 1.1 2013/08/13 10:23:26 joerg Exp $ 1$NetBSD: patch-gif.c,v 1.2 2014/05/20 19:11:07 adam Exp $
2 2
3--- gif.c.orig 2013-08-12 16:49:30.000000000 +0000 3Fix building with newer giflib.
 4
 5--- gif.c.orig 2002-07-09 19:26:41.000000000 +0000
4+++ gif.c 6+++ gif.c
5@@ -20,7 +20,7 @@ static const char rcsid[] = "$Id: gif.c, 7@@ -20,7 +20,7 @@ static const char rcsid[] = "$Id: gif.c,
6 */ 8 */
7 int gif_load_hdr(img I) { 9 int gif_load_hdr(img I) {
8 GifFileType *g; 10 GifFileType *g;
9- g = I->us = DGifOpenFileHandle(fileno(I->fp)); 11- g = I->us = DGifOpenFileHandle(fileno(I->fp));
10+ g = I->us = DGifOpenFileHandle(fileno(I->fp), NULL); 12+ g = I->us = DGifOpenFileHandle(fileno(I->fp), NULL);
11 if (!I->us) { 13 if (!I->us) {
12 I->err = IE_HDRFORMAT; 14 I->err = IE_HDRFORMAT;
13 return 0; 15 return 0;
 16@@ -36,7 +36,7 @@ int gif_load_hdr(img I) {
 17 * Abort loading a GIF file after the header is done.
 18 */
 19 int gif_abort_load(img I) {
 20- DGifCloseFile((GifFileType*)I->us);
 21+ DGifCloseFile((GifFileType*)I->us, NULL);
 22 return 1;
 23 }
 24
 25@@ -114,7 +114,7 @@ int gif_load_img(img I) {
 26 ret = 1;
 27 fail:
 28
 29- DGifCloseFile(g);
 30+ DGifCloseFile(g, NULL);
 31
 32 return ret;
 33 }