diff options
| author | adam <adam@pkgsrc.org> | 2014-05-20 19:11:07 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2014-05-20 19:11:07 +0000 |
| commit | 8e32a8ef710a39a7d3d5a8202666f24c06b62e2c (patch) | |
| tree | 083f9884ec6dfd8bbf4cf66ede5352b9e34aae4f | |
| parent | b89e68d1744a18487c963eb808a4058dc9440db6 (diff) | |
| download | pkgsrc-8e32a8ef710a39a7d3d5a8202666f24c06b62e2c.tar.gz | |
Fix building with newer giflib.
| -rw-r--r-- | net/driftnet/Makefile | 9 | ||||
| -rw-r--r-- | net/driftnet/distinfo | 4 | ||||
| -rw-r--r-- | net/driftnet/patches/patch-gif.c | 24 |
3 files changed, 28 insertions, 9 deletions
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile index 2f3d30bc357..cacbc56c360 100644 --- a/net/driftnet/Makefile +++ b/net/driftnet/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.29 2012/10/23 17:18:18 asau Exp $ -# +# $NetBSD: Makefile,v 1.30 2014/05/20 19:11:07 adam Exp $ DISTNAME= driftnet-0.1.6 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= net graphics MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/ COMMENT= Real-time image sniffer +LICENSE= gnu-gpl-v2 DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 @@ -25,8 +25,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/giflib.buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" - +.include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/driftnet/distinfo b/net/driftnet/distinfo index bc3ac10a12e..c51850902b4 100644 --- a/net/driftnet/distinfo +++ b/net/driftnet/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2013/08/13 10:23:25 joerg Exp $ +$NetBSD: distinfo,v 1.8 2014/05/20 19:11:07 adam Exp $ SHA1 (driftnet-0.1.6.tar.gz) = 279cb3a596f354e7e9c6ac3cc456b3d11dced2ff RMD160 (driftnet-0.1.6.tar.gz) = 01057f3cb992faa537a8b188e116c6f21016cfac Size (driftnet-0.1.6.tar.gz) = 36989 bytes SHA1 (patch-aa) = 4e995c7c7c811429bc4f4f6481104a899df707d4 SHA1 (patch-ab) = 5b6bc10901295c58d5607deab9bd25effbbbf950 -SHA1 (patch-gif.c) = 2d8a3eb735109f44d9da39b397813a9a6f2b1034 +SHA1 (patch-gif.c) = e006d37c739334f1b1e50428e0bbd34b1dbca12c diff --git a/net/driftnet/patches/patch-gif.c b/net/driftnet/patches/patch-gif.c index d39e8e1bedb..45ee425c744 100644 --- a/net/driftnet/patches/patch-gif.c +++ b/net/driftnet/patches/patch-gif.c @@ -1,6 +1,8 @@ -$NetBSD: patch-gif.c,v 1.1 2013/08/13 10:23:26 joerg Exp $ +$NetBSD: patch-gif.c,v 1.2 2014/05/20 19:11:07 adam Exp $ ---- gif.c.orig 2013-08-12 16:49:30.000000000 +0000 +Fix building with newer giflib. + +--- gif.c.orig 2002-07-09 19:26:41.000000000 +0000 +++ gif.c @@ -20,7 +20,7 @@ static const char rcsid[] = "$Id: gif.c, */ @@ -11,3 +13,21 @@ $NetBSD: patch-gif.c,v 1.1 2013/08/13 10:23:26 joerg Exp $ if (!I->us) { I->err = IE_HDRFORMAT; return 0; +@@ -36,7 +36,7 @@ int gif_load_hdr(img I) { + * Abort loading a GIF file after the header is done. + */ + int gif_abort_load(img I) { +- DGifCloseFile((GifFileType*)I->us); ++ DGifCloseFile((GifFileType*)I->us, NULL); + return 1; + } + +@@ -114,7 +114,7 @@ int gif_load_img(img I) { + ret = 1; + fail: + +- DGifCloseFile(g); ++ DGifCloseFile(g, NULL); + + return ret; + } |