diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 876bc4a2a53f..ab7c5b0d24ba 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2013/10/11 14:54:05 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2014/01/27 20:12:05 wiz Exp $ -DISTNAME= jpegsrc.v9 +DISTNAME= jpegsrc.v9a PKGNAME= ${DISTNAME:S/src.v/-/} -PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.ijg.org/files/ diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo index 5dfd091d49e3..eb13f4a4f611 100644 --- a/graphics/jpeg/distinfo +++ b/graphics/jpeg/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.17 2013/10/11 14:54:05 joerg Exp $ +$NetBSD: distinfo,v 1.18 2014/01/27 20:12:05 wiz Exp $ -SHA1 (jpegsrc.v9.tar.gz) = 724987e7690ca3d74d6ab7c1f1b6854e88ca204b -RMD160 (jpegsrc.v9.tar.gz) = 048e52334f6341424bd684458799d9c72254e8ec -Size (jpegsrc.v9.tar.gz) = 987900 bytes +SHA1 (jpegsrc.v9a.tar.gz) = d65ed6f88d318f7380a3a5f75d578744e732daca +RMD160 (jpegsrc.v9a.tar.gz) = 885898b3db086ad3b65169d0149bf1f270dff1b5 +Size (jpegsrc.v9a.tar.gz) = 1000034 bytes SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4 SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812 -SHA1 (patch-jmorecfg.h) = 153694c30f466222240275a7c9f525d6df60bda5 SHA1 (patch-jpeglib.h) = 635453c5a2b1223ef5af729edcbfcfa3ed78a8b5 diff --git a/graphics/jpeg/patches/patch-jmorecfg.h b/graphics/jpeg/patches/patch-jmorecfg.h deleted file mode 100644 index 40a353c62b9d..000000000000 --- a/graphics/jpeg/patches/patch-jmorecfg.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-jmorecfg.h,v 1.1 2013/01/24 22:10:43 adam Exp $ - -Avoid problems when FALSE and TRUE are defined as preprocessor macros. - ---- jmorecfg.h.orig 2012-08-08 14:23:20.000000000 +0000 -+++ jmorecfg.h -@@ -252,15 +252,14 @@ typedef void noreturn_t; - * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. - */ - --#ifdef HAVE_BOOLEAN - #ifndef FALSE /* in case these macros already exist */ - #define FALSE 0 /* values of boolean */ - #endif - #ifndef TRUE - #define TRUE 1 - #endif --#else --typedef enum { FALSE = 0, TRUE = 1 } boolean; -+#ifndef HAVE_BOOLEAN -+typedef int boolean; - #endif - -