diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /x11-toolkits | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
| download | ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip | |
Notes
Diffstat (limited to 'x11-toolkits')
205 files changed, 560 insertions, 168 deletions
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile index 2b5bb1007ea8..ee3ced43de61 100644 --- a/x11-toolkits/SoXt/Makefile +++ b/x11-toolkits/SoXt/Makefile @@ -7,6 +7,7 @@ PORTNAME= SoXt PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index 6dce075fb240..5fa4ae71cd6e 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -8,7 +8,7 @@ PORTNAME= bakery PORTVERSION= 2.6.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile index 588e2462a368..d1b1ea68a76a 100644 --- a/x11-toolkits/c++-gtk-utils/Makefile +++ b/x11-toolkits/c++-gtk-utils/Makefile @@ -7,6 +7,7 @@ PORTNAME= c++-gtk-utils PORTVERSION= 2.0.9 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/cxx-gtk-utils/cxx-gtk-utils/${PORTVERSION}/ DISTNAME= c%2B%2B-gtk-utils-${PORTVERSION} diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile index c5a3c8740315..8b4857025c96 100644 --- a/x11-toolkits/easygtk/Makefile +++ b/x11-toolkits/easygtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= easygtk PORTVERSION= 1.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= sobomax diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index c46a7a5fd25d..e1e135dea13b 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -8,7 +8,7 @@ PORTNAME= eel PORTVERSION= 2.26.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile index 24c12b5769e9..459d7c04e18e 100644 --- a/x11-toolkits/efltk/Makefile +++ b/x11-toolkits/efltk/Makefile @@ -7,14 +7,14 @@ PORTNAME= efltk PORTVERSION= 2.0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= SF/ede/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Extended Fast Light Toolkit -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${PORTNAME} @@ -31,6 +31,7 @@ MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp b/x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp new file mode 100644 index 000000000000..63b1230db5db --- /dev/null +++ b/x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp @@ -0,0 +1,37 @@ +--- src/images/Fl_Png.cpp.orig 2009-04-22 13:51:33.000000000 +0200 ++++ src/images/Fl_Png.cpp 2012-05-06 21:06:13.000000000 +0200 +@@ -3,6 +3,7 @@ + #if HAVE_PNG + + #include <png.h> ++#include <pngpriv.h> + #include <stdlib.h> + + #include <efltk/Fl_Image.h> +@@ -28,7 +29,7 @@ + png_last_error = (volatile char*)"PNG: Unknown (ERROR!)"; + if (png_ptr != NULL && png_ptr->error_ptr != NULL) + png_last_error = (volatile char*)message; +- longjmp(png_ptr->jmpbuf, 0); ++ longjmp(png_jmpbuf(png_ptr), 0); + } + + static bool png_is_valid_file(const char *filename) +@@ -81,7 +82,7 @@ + if(!end_info_ptr) { return_error(); } + + png_bytepp rows = 0; +- if(setjmp(png_ptr->jmpbuf)) { ++ if(setjmp(png_jmpbuf(png_ptr))) { + if(rows) free(rows); + if(png_ptr) png_destroy_read_struct (&png_ptr, &info_ptr, &end_info_ptr); + fputs((const char *)png_last_error, stderr); +@@ -318,7 +319,7 @@ + + bool allocated = false; + uint8 *wr_data = (uint8*)data; +- if(setjmp(png_ptr->jmpbuf)) { ++ if(setjmp(png_jmpbuf(png_ptr))) { + if(png_ptr) png_destroy_write_struct(&png_ptr, &info_ptr); + if(allocated && wr_data) free(wr_data); + return false; diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile index 483a32deb86d..857274abaa68 100644 --- a/x11-toolkits/elementary/Makefile +++ b/x11-toolkits/elementary/Makefile @@ -7,6 +7,7 @@ PORTNAME= elementary PORTVERSION= 0.7.0.55225 +PORTREVISION= 1 CATEGORIES= x11-toolkits enlightenment MASTER_SITES= http://download.enlightenment.org/snapshots/2010-12-03/ \ http://files.roorback.net/e17/2010-12-03/base/ diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile index d163325b76bc..0193303612e8 100644 --- a/x11-toolkits/fl_editor/Makefile +++ b/x11-toolkits/fl_editor/Makefile @@ -7,7 +7,7 @@ PORTNAME= fl_editor PORTVERSION= 0.4.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= http://source.robertk.com/fl_editor/ EXTRACT_SUFX= .tgz diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile index 451ac207361c..d00f424c6351 100644 --- a/x11-toolkits/flowcanvas/Makefile +++ b/x11-toolkits/flowcanvas/Makefile @@ -7,6 +7,7 @@ PORTNAME= flowcanvas PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://download.drobilla.net/ diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index afa45fba8240..aa8d405f2cf6 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= fltk/${PORTVERSION} @@ -15,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gahr@FreeBSD.org COMMENT= Cross-platform C++ graphical user interface toolkit -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_LDCONFIG= yes diff --git a/x11-toolkits/fltk11/Makefile b/x11-toolkits/fltk11/Makefile index f78bdf04e088..a1dd83cec849 100644 --- a/x11-toolkits/fltk11/Makefile +++ b/x11-toolkits/fltk11/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk11 PORTVERSION= 1.1.10 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= fltk/${PORTVERSION} @@ -15,7 +16,7 @@ DISTNAME= ${OPORTNAME}-${PORTVERSION}-source MAINTAINER= db@FreeBSD.org COMMENT= Cross-platform C++ graphical user interface toolkit -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes @@ -29,7 +30,7 @@ CONFIGURE_ARGS+=--enable-threads \ --libdir=${PREFIX}/lib/${PORTNAME} \ --bindir=${PREFIX}/bin/${PORTNAME} \ --includedir=${PREFIX}/include/${PORTNAME} -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib OPORTNAME= fltk diff --git a/x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx b/x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx new file mode 100644 index 000000000000..66abec38b6ac --- /dev/null +++ b/x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx @@ -0,0 +1,19 @@ +--- src/Fl_PNG_Image.cxx.orig 2006-06-09 18:16:34.000000000 +0200 ++++ src/Fl_PNG_Image.cxx 2012-05-26 13:55:30.000000000 +0200 +@@ -46,6 +46,7 @@ + # include <zlib.h> + # ifdef HAVE_PNG_H + # include <png.h> ++# include <pngpriv.h> + # else + # include <libpng/png.h> + # endif // HAVE_PNG_H +@@ -75,7 +76,7 @@ + pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + info = png_create_info_struct(pp); + +- if (setjmp(pp->jmpbuf)) ++ if (setjmp(png_jmpbuf(pp))) + { + Fl::warning("PNG file \"%s\" contains errors!\n", png); + return; diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile index fd708047c7ea..37720634cd57 100644 --- a/x11-toolkits/fltk2/Makefile +++ b/x11-toolkits/fltk2/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk PORTVERSION= 2.0.${SNAPSHOT} +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= fltk/snapshots @@ -31,7 +32,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept # If xprop cannot connect to an X server of if xprop cannot be found, X overlay # support will be disabled without breaking the build. BUILD_DEPENDS= xprop:${PORTSDIR}/x11/xprop -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg SNAPSHOT= r9166 diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile index fd690fdfab41..9cac31409de3 100644 --- a/x11-toolkits/flu/Makefile +++ b/x11-toolkits/flu/Makefile @@ -7,7 +7,7 @@ PORTNAME= flu PORTVERSION= 2.14 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= http://www.osc.edu/archive/FLU/ DISTNAME= FLU_${PORTVERSION} diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile index 09a6e5be0448..05899a40f68a 100644 --- a/x11-toolkits/flvw/Makefile +++ b/x11-toolkits/flvw/Makefile @@ -7,7 +7,7 @@ PORTNAME= flvw PORTVERSION= 20000224 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-toolkits MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Febrary%20beta EXTRACT_SUFX= .tgz diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index cb5f570741e2..38f810c52c57 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -7,7 +7,7 @@ PORTNAME= fox PORTVERSION= ${MAJORVER}.${SHVER} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ \ @@ -17,7 +17,7 @@ MAINTAINER?= gahr@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/x11-toolkits/fox14/files/patch-src-fxpngio.cpp b/x11-toolkits/fox14/files/patch-src-fxpngio.cpp new file mode 100644 index 000000000000..b1854671bad9 --- /dev/null +++ b/x11-toolkits/fox14/files/patch-src-fxpngio.cpp @@ -0,0 +1,46 @@ +--- src/fxpngio.cpp.orig 2005-11-19 21:22:25.000000000 +0100 ++++ src/fxpngio.cpp 2012-05-07 07:11:22.000000000 +0200 +@@ -21,13 +21,13 @@ + ********************************************************************************* + * $Id: fxpngio.cpp,v 1.35.2.1 2005/11/19 20:22:25 fox Exp $ * + ********************************************************************************/ ++#ifdef HAVE_PNG_H ++#include "png.h" ++#endif + #include "fxver.h" + #include "fxdefs.h" + #include "FXHash.h" + #include "FXStream.h" +-#ifdef HAVE_PNG_H +-#include "png.h" +-#endif + + /* + Notes: +@@ -76,7 +76,7 @@ + FXStream* store=(FXStream*)png_get_error_ptr(png_ptr); + store->setError(FXStreamFormat); // Flag this as a format error in FXStream + FXTRACE((100,"Error in png: %s\n",message)); +- longjmp(png_ptr->jmpbuf,1); // Bail out ++ longjmp(png_jmpbuf(png_ptr),1); // Bail out + } + + +@@ -121,7 +121,7 @@ + } + + // Set error handling +- if(setjmp(png_ptr->jmpbuf)){ ++ if(setjmp(png_jmpbuf(png_ptr))){ + + // Free all of the memory associated with the png_ptr and info_ptr + png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL); +@@ -234,7 +234,7 @@ + } + + // Set error handling. +- if(setjmp(png_ptr->jmpbuf)){ ++ if(setjmp(png_jmpbuf(png_ptr))){ + png_destroy_write_struct(&png_ptr,&info_ptr); + return FALSE; + } diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile index 3b55abb04e9d..0cf82328207a 100644 --- a/x11-toolkits/fox16/Makefile +++ b/x11-toolkits/fox16/Makefile @@ -7,6 +7,7 @@ PORTNAME= fox PORTVERSION= ${MAJORVER}.${SHVER} +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.fox-toolkit.org/pub/ @@ -14,7 +15,7 @@ MAINTAINER= gahr@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.6 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile index 4ba0ab1942e8..2674a9c6e64f 100644 --- a/x11-toolkits/fox17/Makefile +++ b/x11-toolkits/fox17/Makefile @@ -7,6 +7,7 @@ PORTNAME= fox PORTVERSION= 1.7.33 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \ ftp://ftp.fox-toolkit.org/pub/ @@ -57,7 +58,7 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg .if defined(WITHOUT_PNG) CONFIGURE_ARGS+=--disable-png .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif .if defined(WITHOUT_TIFF) diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile index 375a2c100f79..0b5c08a9073d 100644 --- a/x11-toolkits/fpc-gtk2/Makefile +++ b/x11-toolkits/fpc-gtk2/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-toolkits lang PKGNAMESUFFIX= -gtk2 diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile index 47c35827d123..91a6c57c554e 100644 --- a/x11-toolkits/fxscintilla/Makefile +++ b/x11-toolkits/fxscintilla/Makefile @@ -7,7 +7,7 @@ PORTNAME= fxscintilla PORTVERSION= 2.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= SAVANNAH diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index c230fea648f0..6279df22ad16 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -8,7 +8,7 @@ PORTNAME= gai PORTVERSION= 0.5.10 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-toolkits gnome MASTER_SITES= SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION} diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 9d3b9e1baf6f..eecd86311661 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -7,7 +7,7 @@ PORTNAME= gal PORTVERSION= 0.24 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES?= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 104a82115a80..edfe131c8251 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gal2 PORTVERSION= 2.5.3 -PORTREVISION?= 9 +PORTREVISION?= 10 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 72a0d8ee0031..da6093fbbb13 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -8,6 +8,7 @@ PORTNAME= gdl PORTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile index 2278b2f431ad..7663bc818fb4 100644 --- a/x11-toolkits/gigi/Makefile +++ b/x11-toolkits/gigi/Makefile @@ -7,7 +7,7 @@ PORTNAME= gigi PORTVERSION= 0.8.0.1048 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index 59c0424e3235..380285f566dc 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnocl DISTVERSION= ${BASE_VERSION}-${NIGHTLY_BUILD} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits devel MASTER_SITES= SF/${PORTNAME}/Gnocl-Nightly-Build/ diff --git a/x11-toolkits/gnome-desktop-sharp20/Makefile b/x11-toolkits/gnome-desktop-sharp20/Makefile index 36953ad77c02..b05e94340b05 100644 --- a/x11-toolkits/gnome-desktop-sharp20/Makefile +++ b/x11-toolkits/gnome-desktop-sharp20/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-desktop-sharp PORTVERSION= 2.26.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits MASTER_SITES= GNOME diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile index 001c30697445..a4f02a184500 100644 --- a/x11-toolkits/gnome-sharp20/Makefile +++ b/x11-toolkits/gnome-sharp20/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnome-sharp PORTVERSION= 2.24.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index f518c2c30645..51aed7f50eaa 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -10,7 +10,7 @@ PORTNAME= gnustep-back PORTVERSION= 0.20.0 .else PORTVERSION= 0.17.1 -PORTREVISION= 3 +PORTREVISION= 4 .endif CATEGORIES= x11-toolkits gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index e505dc5f8d5e..a9918cdfbf8b 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -10,7 +10,7 @@ PORTNAME= gnustep-gui PORTVERSION= 0.20.0 .else PORTVERSION= 0.17.1 -PORTREVISION= 2 +PORTREVISION= 3 .endif CATEGORIES= x11-toolkits gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} @@ -21,7 +21,7 @@ COMMENT= GNUstep GUI library LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib .if defined(WITH_GNUSTEP_DEVEL) LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile @@ -56,6 +56,8 @@ MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM BREAKS_IF_PEDANTIC= yes PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} +ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include/libpng15 + .if defined(WITH_GNUSTEP_DEVEL) EXTRA_PATCHES+= ${FILESDIR}/AudioOutputSink.m.patch .endif @@ -93,6 +95,9 @@ PLIST_SUB+= WITH_ASPELL="" PLIST_SUB+= WITH_ASPELL="@comment " .endif +post-patch: + ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure + pre-configure: .for file in config.guess config.sub install-sh @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} diff --git a/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m new file mode 100644 index 000000000000..8432441cfac2 --- /dev/null +++ b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m @@ -0,0 +1,15 @@ +--- Source/NSBitmapImageRep+PNG.m.orig 2009-02-17 00:23:41.000000000 +0100 ++++ Source/NSBitmapImageRep+PNG.m 2012-04-27 18:54:35.000000000 +0200 +@@ -33,9 +33,11 @@ + #if HAVE_LIBPNG + + #ifdef HAVE_LIBPNG_PNG_H +-#include <libpng/png.h> ++#include <png.h> ++#include <pngpriv.h> + #else + #include <png.h> ++#include <pngpriv.h> + #endif + + #include <Foundation/NSData.h> diff --git a/x11-toolkits/gstreamer-plugins-pango/Makefile b/x11-toolkits/gstreamer-plugins-pango/Makefile index a06c6e5e4ba7..1e3c380c2a43 100644 --- a/x11-toolkits/gstreamer-plugins-pango/Makefile +++ b/x11-toolkits/gstreamer-plugins-pango/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11-toolkits/gstreamer-plugins-pango/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-toolkits COMMENT= Gstreamer pango textoverlay plugin diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile index c3f6d55e89ed..59c585617359 100644 --- a/x11-toolkits/gtk-sharp10/Makefile +++ b/x11-toolkits/gtk-sharp10/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk-sharp PORTVERSION= 1.0.10 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/ diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile index 7b800737e5b2..8bc8eaafeaf7 100644 --- a/x11-toolkits/gtk-sharp20/Makefile +++ b/x11-toolkits/gtk-sharp20/Makefile @@ -8,6 +8,7 @@ PORTNAME= gtk-sharp PORTVERSION= 2.12.10 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 7483e51a0426..581ea098bd00 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -9,7 +9,7 @@ PORTNAME= gtk PORTVERSION= 2.24.6 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 718e1668f954..cc1cd9385d17 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 3.0.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index 17fe2467356d..cc1fdc2be78c 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtkada PORTVERSION= 2.22 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://downloads.dragonlace.net/src/ \ http://dragonlace.mirrors.ada.cx/src/ diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile index 0c27270ba029..b1e14f072227 100644 --- a/x11-toolkits/gtkdatabox/Makefile +++ b/x11-toolkits/gtkdatabox/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkdatabox PORTVERSION= 0.9.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= SF http://www.eudoxos.de/gtk/gtkdatabox/download/ DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index bd0284e55fd1..c959b056420a 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtkextra PORTVERSION= 2.1.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile index b00cf92ee438..ea4645317ab2 100644 --- a/x11-toolkits/gtkglarea2/Makefile +++ b/x11-toolkits/gtkglarea2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglarea PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DISTNAME= gtkglarea-${PORTVERSION} diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index 8004b7bd7276..9da0fbf0539d 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglext PORTVERSION= 1.2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= SF DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile index 53a4a2ffe3f3..81bf617fe87c 100644 --- a/x11-toolkits/gtkglextmm/Makefile +++ b/x11-toolkits/gtkglextmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglextmm PORTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits MASTER_SITES= SF/gtkglext/${PORTNAME}/${PORTVERSION} diff --git a/x11-toolkits/gtkimageview/Makefile b/x11-toolkits/gtkimageview/Makefile index ecc7786e89b4..8d82ed0b8f57 100644 --- a/x11-toolkits/gtkimageview/Makefile +++ b/x11-toolkits/gtkimageview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkimageview PORTVERSION= 1.6.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= LOCAL/kwm # http://trac.bjourne.webfactional.com/ diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile index df7a91d861ff..0b96de220861 100644 --- a/x11-toolkits/gtkmathview/Makefile +++ b/x11-toolkits/gtkmathview/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkmathview PORTVERSION= 0.8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/ diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile index 7e80c8eedd36..ba8df81f3ea8 100644 --- a/x11-toolkits/gtkmm20-reference/Makefile +++ b/x11-toolkits/gtkmm20-reference/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 6 +PORTREVISION= 7 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20 diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index 4dd2a5452342..ced7785a2a60 100644 --- a/x11-toolkits/gtkmm20/Makefile +++ b/x11-toolkits/gtkmm20/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkmm PORTVERSION= 2.2.12 -PORTREVISION?= 12 +PORTREVISION?= 13 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile index a261797dabb7..135a1ea47199 100644 --- a/x11-toolkits/gtkmm24-reference/Makefile +++ b/x11-toolkits/gtkmm24-reference/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24 \ glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index f23528b3bcdc..a84386a8824d 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkmm PORTVERSION= 2.24.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile index feab756ad4ec..32e503a514bc 100644 --- a/x11-toolkits/gtkmm30-reference/Makefile +++ b/x11-toolkits/gtkmm30-reference/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc:${PORTSDIR}/x11-toolkits/gtkmm30 \ glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 9faf1e21d642..6e378a0ebe62 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkmm PORTVERSION= 3.0.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile index eb960f49aa26..ea1d70c0b5a2 100644 --- a/x11-toolkits/gtksourceview-sharp/Makefile +++ b/x11-toolkits/gtksourceview-sharp/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview-sharp PORTVERSION= 0.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp-2.0/ DISTNAME= ${PORTNAME}-2.0-${PORTVERSION} diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index a2af7d0d3883..83b33cb14970 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview PORTVERSION= 1.8.5 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index ed09a63c96a5..55e6b4320819 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview2 PORTVERSION= 2.10.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile index b6fd4f345015..4c6f5f851f3d 100644 --- a/x11-toolkits/gtkunique/Makefile +++ b/x11-toolkits/gtkunique/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkunique PORTVERSION= 0.9.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile index 4b088ea1964a..60849a675502 100644 --- a/x11-toolkits/guile-gtk/Makefile +++ b/x11-toolkits/guile-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= guile-gtk PORTVERSION= 0.60 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits scheme MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile index 98bf48a6e173..04dcb7550126 100644 --- a/x11-toolkits/hippo-canvas/Makefile +++ b/x11-toolkits/hippo-canvas/Makefile @@ -7,7 +7,7 @@ PORTNAME= hippo-canvas PORTVERSION= 0.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile index 4c026144bcc1..70153704ba09 100644 --- a/x11-toolkits/hs-gtk/Makefile +++ b/x11-toolkits/hs-gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtk PORTVERSION= 0.12.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile index 8f671969ea26..ebdcea8e8f8d 100644 --- a/x11-toolkits/hs-gtkglext/Makefile +++ b/x11-toolkits/hs-gtkglext/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtkglext PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile index b0ef2ab37560..46c9ef9c82b8 100644 --- a/x11-toolkits/hs-gtksourceview2/Makefile +++ b/x11-toolkits/hs-gtksourceview2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtksourceview2 PORTVERSION= 0.12.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile index 383ade33a0bd..82626a79cad8 100644 --- a/x11-toolkits/hs-pango/Makefile +++ b/x11-toolkits/hs-pango/Makefile @@ -7,6 +7,7 @@ PORTNAME= pango PORTVERSION= 0.12.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile index 632f33d577f4..4b65cc43d8c0 100644 --- a/x11-toolkits/hs-vte/Makefile +++ b/x11-toolkits/hs-vte/Makefile @@ -7,6 +7,7 @@ PORTNAME= vte PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile index 2648bc878019..f2dbaf73498e 100644 --- a/x11-toolkits/hs-wx/Makefile +++ b/x11-toolkits/hs-wx/Makefile @@ -7,6 +7,7 @@ PORTNAME= wx PORTVERSION= 0.13.2.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile index 65888ac952b8..7cfa90ae1432 100644 --- a/x11-toolkits/hs-wxcore/Makefile +++ b/x11-toolkits/hs-wxcore/Makefile @@ -7,6 +7,7 @@ PORTNAME= wxcore PORTVERSION= 0.13.2.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 0f5038543f70..aa78017db6d8 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -7,6 +7,7 @@ PORTNAME= irrlicht PORTVERSION= 1.7.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION} @@ -14,13 +15,14 @@ MAINTAINER= acm@FreeBSD.org COMMENT= High performance realtime 3D engine LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_ZIP= yes USE_DOS2UNIX= Makefile *.cpp *.h *.txt USE_GMAKE= yes USE_GL= yes USE_LDCONFIG= yes +CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER} PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER} @@ -66,8 +68,6 @@ post-extract: @${RM} ${WRKSRC}/media/Thumbs.db post-patch: - @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/source/Irrlicht/CImageLoaderPNG.cpp @${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \ -e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \ -e '/#define.*_IRR_USE_NON_SYSTEM_ZLIB_/ d' \ diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp new file mode 100644 index 000000000000..ac80dbe8964f --- /dev/null +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp @@ -0,0 +1,28 @@ +--- source/Irrlicht/CImageLoaderPNG.cpp.orig 2012-05-26 13:57:05.000000000 +0200 ++++ source/Irrlicht/CImageLoaderPNG.cpp 2012-05-26 13:58:05.000000000 +0200 +@@ -12,6 +12,7 @@ + #else // _IRR_USE_NON_SYSTEM_LIB_PNG_ + #include "libpng/png.h" // use irrlicht included lib png + #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_ ++ #include <pngpriv.h> + #endif // _IRR_COMPILE_WITH_LIBPNG_ + + #include "CImage.h" +@@ -28,7 +29,7 @@ + static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg) + { + os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + // PNG function for file reading +@@ -162,7 +163,7 @@ + if (BitDepth < 8) + { + if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + else + png_set_packing(png_ptr); + } diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp new file mode 100644 index 000000000000..b8b0b273af26 --- /dev/null +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp @@ -0,0 +1,19 @@ +--- source/Irrlicht/CImageWriterPNG.cpp.orig 2012-05-26 13:57:05.000000000 +0200 ++++ source/Irrlicht/CImageWriterPNG.cpp 2012-05-26 14:39:25.000000000 +0200 +@@ -15,6 +15,7 @@ + #ifdef _IRR_COMPILE_WITH_LIBPNG_ + #ifndef _IRR_USE_NON_SYSTEM_LIB_PNG_ + #include <png.h> // use system lib png ++ #include <pngpriv.h> + #else // _IRR_USE_NON_SYSTEM_LIB_PNG_ + #include "libpng/png.h" // use irrlicht included lib png + #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_ +@@ -35,7 +36,7 @@ + static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg) + { + os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + // PNG function for file writing diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index efe7c69cdfd9..1407c60e85d0 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -8,7 +8,7 @@ PORTNAME= libbonoboui PORTVERSION= 2.24.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile index a1025c6d81e1..e41484dc7979 100644 --- a/x11-toolkits/libbonobouimm/Makefile +++ b/x11-toolkits/libbonobouimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libbonobouimm PORTVERSION= 1.3.7 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 9b048e9a8cbd..c53afb4a73a1 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgail-gnome PORTVERSION= 1.20.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile index 01c16f14ee52..c3bd6bf0959f 100644 --- a/x11-toolkits/libgdiplus/Makefile +++ b/x11-toolkits/libgdiplus/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgdiplus PORTVERSION= 2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/ @@ -16,7 +16,7 @@ COMMENT= GDI+ API for System.Windows.Forms in Mono LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ cairo.2:${PORTSDIR}/graphics/cairo GNU_CONFIGURE= yes @@ -25,7 +25,7 @@ USE_GNOME= gnomehack glib20 USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= x11 -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= lib/libgdiplus.a \ diff --git a/x11-toolkits/libgdiplus/files/patch-pngcodec.c b/x11-toolkits/libgdiplus/files/patch-pngcodec.c new file mode 100644 index 000000000000..2c8c9c79119d --- /dev/null +++ b/x11-toolkits/libgdiplus/files/patch-pngcodec.c @@ -0,0 +1,10 @@ +--- src/pngcodec.c.orig 2011-01-13 23:28:19.000000000 +0100 ++++ src/pngcodec.c 2012-04-27 12:33:01.000000000 +0200 +@@ -35,6 +35,7 @@ + #ifdef HAVE_LIBPNG + + #include <png.h> ++#include <pngpriv.h> + #include "gdiplus-private.h" + #include "pngcodec.h" + #include <setjmp.h> diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 1d4cc642ae01..81bd23bff645 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomeprintui PORTVERSION= 2.18.6 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile index 844fa6ea5982..16971c71c8fc 100644 --- a/x11-toolkits/libgnomeprintuimm/Makefile +++ b/x11-toolkits/libgnomeprintuimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnomeprintuimm PORTVERSION= 2.5.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index a6f81b78330b..a3ad217a65bf 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgnomeui PORTVERSION= 2.24.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile index 450ce3f3364b..c9cf9d882c58 100644 --- a/x11-toolkits/libgnomeuimm/Makefile +++ b/x11-toolkits/libgnomeuimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnomeuimm PORTVERSION= 2.0.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-toolkits gnome MASTER_SITES= SF/gtkmm/OldFiles DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index a6e4a1c3ebc8..c94e36098e63 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgnomeuimm PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index 19c9e4ee4d04..39a2700d98ee 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgtk-java PORTVERSION= 2.10.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile index dde385d35389..5dbe37bc0d6d 100644 --- a/x11-toolkits/libgtksourceviewmm/Makefile +++ b/x11-toolkits/libgtksourceviewmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgtksourceviewmm PORTVERSION= 1.9.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile index 0b1aea366b7f..5bf696f3180e 100644 --- a/x11-toolkits/libpanelappletmm/Makefile +++ b/x11-toolkits/libpanelappletmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libpanelappletmm PORTVERSION= 2.26.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile index 5e69aee19b10..8d15df9b7217 100644 --- a/x11-toolkits/libsexy/Makefile +++ b/x11-toolkits/libsexy/Makefile @@ -7,7 +7,7 @@ PORTNAME= libsexy PORTVERSION= 0.1.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits devel MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ http://releases.chipx86.com/libsexy/libsexy/ diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile index 8818eb311c36..dc3b2213bdb6 100644 --- a/x11-toolkits/libsexymm/Makefile +++ b/x11-toolkits/libsexymm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libsexymm PORTVERSION= 0.1.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits devel MASTER_SITES= http://releases.chipx86.com/libsexy/libsexymm/ diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 1c2db6e8862d..5427129f79a1 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -8,7 +8,7 @@ PORTNAME= libwnck PORTVERSION= 2.30.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile index cc9de525868f..4872b44c2b71 100644 --- a/x11-toolkits/libxfce4gui/Makefile +++ b/x11-toolkits/libxfce4gui/Makefile @@ -7,6 +7,7 @@ PORTNAME= libxfce4gui PORTVERSION= 4.10.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/archive/libxfcegui4/${PORTVERSION:R} diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 1250ed0ac10d..94be4964bc4b 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -7,7 +7,7 @@ PORTNAME= libzvt PORTVERSION= 2.0.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile index 3e7fb7a5c87a..b6d3c75f8c4b 100644 --- a/x11-toolkits/linux-f10-gtk2/Makefile +++ b/x11-toolkits/linux-f10-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk2 PORTVERSION= 2.14.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- diff --git a/x11-toolkits/linux-f10-qt33/Makefile b/x11-toolkits/linux-f10-qt33/Makefile index fd997d03beaf..9f1313914b49 100644 --- a/x11-toolkits/linux-f10-qt33/Makefile +++ b/x11-toolkits/linux-f10-qt33/Makefile @@ -7,7 +7,7 @@ PORTNAME= ${LINUX_NAME}3 PORTVERSION= 3.3.8b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile index f339d0f2438a..7450c6f81e0a 100644 --- a/x11-toolkits/linux-gtk2/Makefile +++ b/x11-toolkits/linux-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk2 PORTVERSION= 2.6.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \ diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile index 0654c784a1a3..be0198f0e1f3 100644 --- a/x11-toolkits/linux-qt33/Makefile +++ b/x11-toolkits/linux-qt33/Makefile @@ -7,7 +7,7 @@ PORTNAME= qt33 PORTVERSION= 3.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits linux DISTNAME= qt-${PORTVERSION}-${RPMVERSION} diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile index de7e425fced0..4c229acd6c27 100644 --- a/x11-toolkits/nucleo/Makefile +++ b/x11-toolkits/nucleo/Makefile @@ -7,7 +7,7 @@ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ @@ -18,7 +18,7 @@ LICENSE= LGPL21 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ exif.12:${PORTSDIR}/graphics/libexif USE_BZIP2= yes @@ -83,10 +83,4 @@ CONFIGURE_ARGS+= --without-gd PLIST_SUB+= GD="@comment " .endif -post-patch: -# Fix for libpng 1.4 - @${REINPLACE_CMD} -e \ - 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/nucleo/image/encoding/PNGenc.cxx - .include <bsd.port.post.mk> diff --git a/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx b/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx new file mode 100644 index 000000000000..004549d63585 --- /dev/null +++ b/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx @@ -0,0 +1,19 @@ +--- nucleo/image/encoding/PNGenc.cxx.orig 2008-06-05 14:52:33.000000000 +0200 ++++ nucleo/image/encoding/PNGenc.cxx 2012-05-05 08:40:18.000000000 +0200 +@@ -16,6 +16,7 @@ + #include <nucleo/image/encoding/PNGenc.H> + + #include <png.h> ++#include <pngpriv.h> + + namespace nucleo { + +@@ -170,7 +171,7 @@ + &compression_type, &filter_type) ; + + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha(png_ptr); diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile index 993d506304b9..3f6a28cb108a 100644 --- a/x11-toolkits/ocaml-lablgtk2/Makefile +++ b/x11-toolkits/ocaml-lablgtk2/Makefile @@ -6,7 +6,7 @@ PORTNAME= lablgtk2 PORTVERSION= 2.14.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/561/ \ ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \ diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 361e5834a6e3..f33e747d5421 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -8,6 +8,7 @@ PORTNAME= open-motif PORTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.ics.com/openmotif/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/ DISTNAME= openmotif-${PORTVERSION} @@ -16,7 +17,7 @@ DIST_SUBDIR= openmotif MAINTAINER= m.tsatsenko@gmail.com COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295)) -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg MAKE_JOBS_UNSAFE= yes diff --git a/x11-toolkits/p5-Alien-wxWidgets/Makefile b/x11-toolkits/p5-Alien-wxWidgets/Makefile index 39ae94f6d3b5..376e3062002d 100644 --- a/x11-toolkits/p5-Alien-wxWidgets/Makefile +++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile @@ -7,6 +7,7 @@ PORTNAME= Alien-wxWidgets PORTVERSION= 0.51 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile index b18f6195fe5c..74e3a2208309 100644 --- a/x11-toolkits/p5-GdkImlib/Makefile +++ b/x11-toolkits/p5-GdkImlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= GdkImlib PORTVERSION= 0.7009 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= CPAN/Gtk PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile index 948d73e8ead5..34bae5b2bb55 100644 --- a/x11-toolkits/p5-Glade2/Makefile +++ b/x11-toolkits/p5-Glade2/Makefile @@ -7,7 +7,7 @@ PORTNAME= Glade PORTVERSION= 1.007 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits gnome perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:TSCH diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile index 590a129d1a68..607091e2ec01 100644 --- a/x11-toolkits/p5-Gnome2-Canvas/Makefile +++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile @@ -8,7 +8,7 @@ PORTNAME= Gnome2-Canvas PORTVERSION= 1.002 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits gnome perl5 MASTER_SITES= CPAN/Gnome2 \ SF/gtk2-perl/Gnome2_Canvas/${PORTVERSION} diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile index 1e92b73203fe..f6ab8f3ac3cd 100644 --- a/x11-toolkits/p5-Gnome2-VFS/Makefile +++ b/x11-toolkits/p5-Gnome2-VFS/Makefile @@ -8,7 +8,7 @@ PORTNAME= Gnome2-VFS PORTVERSION= 1.081 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits gnome perl5 MASTER_SITES= SF/gtk2-perl/Gnome2_VFS/${PORTVERSION} PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile index 98f450d13f64..69aa46859c74 100644 --- a/x11-toolkits/p5-Gnome2/Makefile +++ b/x11-toolkits/p5-Gnome2/Makefile @@ -8,7 +8,7 @@ PORTNAME= Gnome2 PORTVERSION= 1.042 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits gnome perl5 MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-Chmod/Makefile b/x11-toolkits/p5-Gtk2-Chmod/Makefile index 96be375606f4..fa2be17ea8d3 100644 --- a/x11-toolkits/p5-Gtk2-Chmod/Makefile +++ b/x11-toolkits/p5-Gtk2-Chmod/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-Chmod PORTVERSION= 0.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:VVELOX diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile index a68c46d89bde..ef44991253a7 100644 --- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile +++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-Ex-Dialogs PORTVERSION= 0.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile index c09d003a44bc..f8c746939f20 100644 --- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile +++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile @@ -7,6 +7,7 @@ PORTNAME= Gtk2-Ex-FormFactory PORTVERSION= 0.67 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile index ad55ffe57c38..0e80c2d14315 100644 --- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile +++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-Ex-PodViewer PORTVERSION= 0.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile index 68dddfde0684..971e032bdc1d 100644 --- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile +++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-Ex-Simple-List PORTVERSION= 0.50 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile index 9a462ba8c2db..fe047e54f12d 100644 --- a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile +++ b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-Ex-Utils PORTVERSION= 0.09 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-GladeXML/Makefile b/x11-toolkits/p5-Gtk2-GladeXML/Makefile index 13be9bee60a0..9ff973c386a6 100644 --- a/x11-toolkits/p5-Gtk2-GladeXML/Makefile +++ b/x11-toolkits/p5-Gtk2-GladeXML/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-GladeXML PORTVERSION= 1.007 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile index 5be9f8a5005d..30fe0cef613e 100644 --- a/x11-toolkits/p5-Gtk2-Html2/Makefile +++ b/x11-toolkits/p5-Gtk2-Html2/Makefile @@ -8,7 +8,7 @@ PORTNAME= Gtk2-Html2 PORTVERSION= 0.03 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits perl5 MASTER_SITES= http://asofyet.org/muppet/software/gtk2-perl/ PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Gtk2-ImageView/Makefile b/x11-toolkits/p5-Gtk2-ImageView/Makefile index 7a5b8ebc22b8..f544a7195daf 100644 --- a/x11-toolkits/p5-Gtk2-ImageView/Makefile +++ b/x11-toolkits/p5-Gtk2-ImageView/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-ImageView PORTVERSION= 0.05 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:RATCLIFFE diff --git a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile index 836a8813d977..fac81a382fe8 100644 --- a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile +++ b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-PathButtonBar PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:VVELOX diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile index f6a61b1629df..1c8dad18a8c8 100644 --- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile +++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-TrayIcon PORTVERSION= 0.06 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:BORUP diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile index dc9bdf6cdce4..a269453dfc66 100644 --- a/x11-toolkits/p5-Gtk2/Makefile +++ b/x11-toolkits/p5-Gtk2/Makefile @@ -7,6 +7,7 @@ PORTNAME= Gtk2 PORTVERSION= 1.242 +PORTREVISION= 1 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= CPAN SF/${PORTNAME:L}-perl/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Pango/Makefile b/x11-toolkits/p5-Pango/Makefile index f48e15ef9040..798ff3829828 100644 --- a/x11-toolkits/p5-Pango/Makefile +++ b/x11-toolkits/p5-Pango/Makefile @@ -7,6 +7,7 @@ PORTNAME= Pango PORTVERSION= 1.223 +PORTREVISION= 1 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:XAOC diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index fa69e9c4f821..d5a61e1b9c56 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -7,6 +7,7 @@ PORTNAME= Prima PORTVERSION= 1.31 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 graphics MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,7 +16,7 @@ MAINTAINER= dmitry@karasik.eu.org COMMENT= An extensible Perl toolkit for multi-platform GUI development LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile index 3372c2fddd00..b8233873a33b 100644 --- a/x11-toolkits/p5-Tk-Autoscroll/Makefile +++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-Autoscroll PORTVERSION= 1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile index 054f8b03e49d..09488fa741e8 100644 --- a/x11-toolkits/p5-Tk-ColourChooser/Makefile +++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-ColourChooser PORTVERSION= 1.52 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile index ceb12bfee041..cf6f29bc6916 100644 --- a/x11-toolkits/p5-Tk-Contrib/Makefile +++ b/x11-toolkits/p5-Tk-Contrib/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-Contrib PORTVERSION= 0.07 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 tk MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-CursorControl/Makefile b/x11-toolkits/p5-Tk-CursorControl/Makefile index 28245e41e83b..73ce1faf33ad 100644 --- a/x11-toolkits/p5-Tk-CursorControl/Makefile +++ b/x11-toolkits/p5-Tk-CursorControl/Makefile @@ -7,6 +7,7 @@ PORTNAME= Tk-CursorControl PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits tk perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile index e42c9b36612e..f06b41e0d60b 100644 --- a/x11-toolkits/p5-Tk-DKW/Makefile +++ b/x11-toolkits/p5-Tk-DKW/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-DKW PORTVERSION= 0.03 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 tk MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile index 4f0301c52904..2657d8d9e88a 100644 --- a/x11-toolkits/p5-Tk-Date/Makefile +++ b/x11-toolkits/p5-Tk-Date/Makefile @@ -7,6 +7,7 @@ PORTNAME= Tk-Date PORTVERSION= 0.44 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile index 8e70ea29159c..a6c386e332aa 100644 --- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile +++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-DynaTabFrame PORTVERSION= 0.23 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 tk MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile index c8d602e2a0e4..8f6e771f95a2 100644 --- a/x11-toolkits/p5-Tk-Enscript/Makefile +++ b/x11-toolkits/p5-Tk-Enscript/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-Enscript PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile index 6899f3636ac4..cecabd295405 100644 --- a/x11-toolkits/p5-Tk-FileDialog/Makefile +++ b/x11-toolkits/p5-Tk-FileDialog/Makefile @@ -6,7 +6,7 @@ PORTNAME= Tk-FileDialog PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN diff --git a/x11-toolkits/p5-Tk-FontDialog/Makefile b/x11-toolkits/p5-Tk-FontDialog/Makefile index 9f9908acd5c3..a22c1bd3991f 100644 --- a/x11-toolkits/p5-Tk-FontDialog/Makefile +++ b/x11-toolkits/p5-Tk-FontDialog/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-FontDialog PORTVERSION= 0.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 tk MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile index 7823c56cd042..d772f4d582e2 100644 --- a/x11-toolkits/p5-Tk-GBARR/Makefile +++ b/x11-toolkits/p5-Tk-GBARR/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-GBARR PORTVERSION= 2.08 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile index 553ef04b3e38..7103cc6026e7 100644 --- a/x11-toolkits/p5-Tk-Getopt/Makefile +++ b/x11-toolkits/p5-Tk-Getopt/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-Getopt PORTVERSION= 0.50 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile index d53b6761ef67..3ace29610040 100644 --- a/x11-toolkits/p5-Tk-HistEntry/Makefile +++ b/x11-toolkits/p5-Tk-HistEntry/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-HistEntry PORTVERSION= 0.43 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile index 03a97edab4eb..078cfda0ac89 100644 --- a/x11-toolkits/p5-Tk-JComboBox/Makefile +++ b/x11-toolkits/p5-Tk-JComboBox/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-JComboBox PORTVERSION= 1.14 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits perl5 tk MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile index e3e39b860292..aa746b500dd5 100644 --- a/x11-toolkits/p5-Tk-ResizeButton/Makefile +++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-ResizeButton PORTVERSION= 0.01 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-Role-Dialog/Makefile b/x11-toolkits/p5-Tk-Role-Dialog/Makefile index 31df5a6545e4..e7ed6ad9ad71 100644 --- a/x11-toolkits/p5-Tk-Role-Dialog/Makefile +++ b/x11-toolkits/p5-Tk-Role-Dialog/Makefile @@ -7,6 +7,7 @@ PORTNAME= Tk-Role-Dialog PORTVERSION= 1.112.380 +PORTREVISION= 1 CATEGORIES= x11-toolkits tk perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile index 8b2ccdede62c..3821346a988c 100644 --- a/x11-toolkits/p5-Tk-Splashscreen/Makefile +++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-Splashscreen PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile index 29f5c3551c37..635b9f6b65b6 100644 --- a/x11-toolkits/p5-Tk-TableMatrix/Makefile +++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-TableMatrix PORTVERSION= 1.23 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile index 7d761fd89d43..ddc49d9d8804 100644 --- a/x11-toolkits/p5-Tk-ToolBar/Makefile +++ b/x11-toolkits/p5-Tk-ToolBar/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-ToolBar PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits tk perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index 64ca82e65087..099d506d7fa1 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -7,6 +7,7 @@ PORTNAME= Tk PORTVERSION= 804.030 +PORTREVISION= 1 CATEGORIES= x11-toolkits tk perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,7 +16,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= A re-port of a perl5 interface to Tk8.4 LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png OPTIONS_DEFINE= XFT XFT_DESC= Client-side fonts via libXft (experimental) diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile index a7621f25dced..af4298eb9b53 100644 --- a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile +++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile @@ -7,6 +7,7 @@ PORTNAME= Wx-Perl-ProcessStream PORTVERSION= 0.27 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile index 232dd698eef2..4fa789f14d14 100644 --- a/x11-toolkits/p5-Wx/Makefile +++ b/x11-toolkits/p5-Wx/Makefile @@ -7,6 +7,7 @@ PORTNAME= Wx PORTVERSION= 0.97 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index cfc0786d7d1d..98a5fcbd92ca 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -8,7 +8,7 @@ PORTNAME= pango PORTVERSION= 1.28.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME \ ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index fbba2a59270d..ba08cc950ea6 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -8,7 +8,7 @@ PORTNAME= pangomm PORTVERSION= 2.28.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile index a9a9b387f368..202002aa2739 100644 --- a/x11-toolkits/pangoxsl/Makefile +++ b/x11-toolkits/pangoxsl/Makefile @@ -7,7 +7,7 @@ PORTNAME= pangoxsl PORTVERSION= 1.6.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= SF/pangopdf/${PORTNAME}/${PORTVERSION} diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile index 939727cf0050..2cf54c99b6b5 100644 --- a/x11-toolkits/paragui-devel/Makefile +++ b/x11-toolkits/paragui-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= paragui PORTVERSION= 1.1.8 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile index c2293a1d4779..39e5611082be 100644 --- a/x11-toolkits/paragui/Makefile +++ b/x11-toolkits/paragui/Makefile @@ -8,7 +8,7 @@ PORTNAME= paragui PORTVERSION= 1.0.4 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile index 7c20648cfb29..d6ba46fbb58e 100644 --- a/x11-toolkits/phat/Makefile +++ b/x11-toolkits/phat/Makefile @@ -7,7 +7,7 @@ PORTNAME= phat PORTVERSION= 0.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= phat diff --git a/x11-toolkits/pure-gtk/Makefile b/x11-toolkits/pure-gtk/Makefile index 939092685144..8652a89ab0cf 100644 --- a/x11-toolkits/pure-gtk/Makefile +++ b/x11-toolkits/pure-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= pure-gtk PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MAINTAINER= lichray@gmail.com diff --git a/x11-toolkits/py-SciParam/Makefile b/x11-toolkits/py-SciParam/Makefile index 28e214f4162d..53bf31b1d767 100644 --- a/x11-toolkits/py-SciParam/Makefile +++ b/x11-toolkits/py-SciParam/Makefile @@ -8,7 +8,7 @@ PORTNAME= SciParam PORTVERSION= 1.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits python MASTER_SITES= ftp://ftp.intevation.de/great-er/sciparam/ \ http://ftp.intevation.de/great-er/sciparam/ \ diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile index d267aa3829c8..ea9b1900b242 100644 --- a/x11-toolkits/py-fltk/Makefile +++ b/x11-toolkits/py-fltk/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits python #MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION} MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${DISTNAME} diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index 29a8ff2d6ffa..bdd7346a9cd1 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-desktop PORTVERSION= 2.32.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 6cea8e1711cb..a619455d62e6 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-extras PORTVERSION= 2.25.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 4da9cb42bc7d..a970ec8855fa 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index dce5dbf53662..802db2844480 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 0.6.11 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-toolkits python MASTER_SITES= GNOME PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 53d07082d7a4..e3c6a10d92cf 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -8,6 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.24.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile index 26c3bc6f68e7..d0d1b200206d 100644 --- a/x11-toolkits/py-gtkglext/Makefile +++ b/x11-toolkits/py-gtkglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglext PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits python MASTER_SITES= SF/${PORTNAME}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile index f7f09178d1f4..9d2a768d97b7 100644 --- a/x11-toolkits/py-gtksourceview/Makefile +++ b/x11-toolkits/py-gtksourceview/Makefile @@ -8,6 +8,7 @@ PORTNAME= gtksourceview PORTVERSION= 2.10.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile index 4de3590b049c..52f9fc3e4994 100644 --- a/x11-toolkits/py-gui/Makefile +++ b/x11-toolkits/py-gui/Makefile @@ -6,7 +6,7 @@ PORTNAME= gui PORTVERSION= 1.7.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.cosc.canterbury.ac.nz/~greg/python_gui/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile index df18781852b6..ff7b6ad64db1 100644 --- a/x11-toolkits/py-kiwi/Makefile +++ b/x11-toolkits/py-kiwi/Makefile @@ -7,7 +7,7 @@ PORTNAME= kiwi PORTVERSION= 1.9.29 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= http://download.gnome.org/sources/${PORTNAME}/1.9/ \ http://nivi.interfree.it/distfiles/${PORTNAME}/ diff --git a/x11-toolkits/py-pyqwt/Makefile b/x11-toolkits/py-pyqwt/Makefile index 9afd459c0f75..d83240db4479 100644 --- a/x11-toolkits/py-pyqwt/Makefile +++ b/x11-toolkits/py-pyqwt/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyqwt PORTVERSION= 5.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits python MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION} diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile index 924b9b3528c0..d5a4490fccc1 100644 --- a/x11-toolkits/py-qt/Makefile +++ b/x11-toolkits/py-qt/Makefile @@ -6,7 +6,7 @@ PORTNAME= qt PORTVERSION= 3.18.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt3/ \ diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index 769d44392a42..9e62ab332546 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -6,6 +6,7 @@ PORTNAME= gui PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits devel python MASTER_SITES= ${MASTER_SITES_PYQT4} diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile index 7a6ab1201fc8..4a3585726018 100644 --- a/x11-toolkits/py-sexy/Makefile +++ b/x11-toolkits/py-sexy/Makefile @@ -7,7 +7,7 @@ PORTNAME= sexy PORTVERSION= 0.1.9 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONPREFIX= python- CATEGORIES= x11-toolkits python MASTER_SITES= http://releases.chipx86.com/libsexy/sexy-python/ CENKES diff --git a/x11-toolkits/py-traitsbackendwx/Makefile b/x11-toolkits/py-traitsbackendwx/Makefile index b95be3ee0729..7a69180f8e9d 100644 --- a/x11-toolkits/py-traitsbackendwx/Makefile +++ b/x11-toolkits/py-traitsbackendwx/Makefile @@ -7,7 +7,7 @@ PORTNAME= traitsbackendwx PORTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-traitsgui/Makefile b/x11-toolkits/py-traitsgui/Makefile index c902171ee743..54fb59c55510 100644 --- a/x11-toolkits/py-traitsgui/Makefile +++ b/x11-toolkits/py-traitsgui/Makefile @@ -7,7 +7,7 @@ PORTNAME= traitsgui PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile index 24a2ed1028cf..82fa27c484f5 100644 --- a/x11-toolkits/py-vte/Makefile +++ b/x11-toolkits/py-vte/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.5 2010/09/30 09:15:43 kwm Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile index 700f5312c9ca..cb6ca2abd74b 100644 --- a/x11-toolkits/py-wxPython24/Makefile +++ b/x11-toolkits/py-wxPython24/Makefile @@ -7,7 +7,7 @@ PORTNAME= wxPython PORTVERSION= 2.4.2.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11-toolkits python MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-wxPython26-common/Makefile b/x11-toolkits/py-wxPython26-common/Makefile index ff585f15e618..48c771641520 100644 --- a/x11-toolkits/py-wxPython26-common/Makefile +++ b/x11-toolkits/py-wxPython26-common/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 5 +PORTREVISION= 6 WITH_COMMON_ONLY= yes diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 6d431dec2d52..038714ce26b7 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -7,7 +7,7 @@ PORTNAME= wxPython PORTVERSION= 2.6.3.3 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-wxPython28-common/Makefile b/x11-toolkits/py-wxPython28-common/Makefile index 67943e58a280..f9e86e1abe1b 100644 --- a/x11-toolkits/py-wxPython28-common/Makefile +++ b/x11-toolkits/py-wxPython28-common/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 WITH_COMMON_ONLY= yes diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index 6d6bcacaad96..4c0fd5de7fe2 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -7,7 +7,7 @@ PORTNAME= wxPython PORTVERSION= 2.8.12.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile index db3b8070b897..bd1fc047dc78 100644 --- a/x11-toolkits/qscintilla/Makefile +++ b/x11-toolkits/qscintilla/Makefile @@ -6,7 +6,7 @@ PORTNAME= qscintilla PORTVERSION= 1.7.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-toolkits MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/QScintilla1/ \ http://ns.ael.ru/~fluffy.khv/pyqt/QScintilla1/ diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 5478936d1de6..172864af376b 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.3.8 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES?= x11-toolkits ipv6 MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -20,7 +20,7 @@ COMMENT= Multiplatform C++ application framework BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng \ - png:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg EXTRA_PATCHES= ${PATCHDIR}/0081-format-string-fixes.diff @@ -110,7 +110,8 @@ CONFIGURE_ARGS+=-disable-opengl .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client -CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include +.elif defined(WITHOUT_CUPS) +CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 .else CUPS= .endif diff --git a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp index c7f38b818d3f..11917c55197b 100644 --- a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp +++ b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp @@ -1,6 +1,14 @@ --- src/kernel/qpngio.cpp.orig 2007-02-02 15:01:15.000000000 +0100 -+++ src/kernel/qpngio.cpp 2010-03-28 14:00:46.000000000 +0200 -@@ -159,7 +159,7 @@ ++++ src/kernel/qpngio.cpp 2012-04-27 10:52:06.000000000 +0200 +@@ -43,6 +43,7 @@ + #include "qiodevice.h" + + #include <png.h> ++#include <pngpriv.h> + + + #ifdef Q_OS_TEMP +@@ -159,7 +160,7 @@ image.setColor( i, qRgba(c,c,c,0xff) ); } if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { @@ -9,7 +17,7 @@ if (g < ncols) { image.setAlphaBuffer(TRUE); image.setColor(g, image.color(g) & RGB_MASK); -@@ -187,7 +187,7 @@ +@@ -187,7 +188,7 @@ info_ptr->palette[i].red, info_ptr->palette[i].green, info_ptr->palette[i].blue, @@ -18,3 +26,39 @@ ) ); i++; +@@ -284,7 +285,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + iio->setStatus(-4); + return; +@@ -469,7 +470,7 @@ + return FALSE; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return FALSE; + } +@@ -1030,7 +1031,7 @@ + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -1057,7 +1058,7 @@ + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; diff --git a/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp b/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp new file mode 100644 index 000000000000..18993718fbbc --- /dev/null +++ b/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp @@ -0,0 +1,10 @@ +--- tools/qvfb/qanimationwriter.cpp.orig 2007-01-11 14:39:56.000000000 +0100 ++++ tools/qvfb/qanimationwriter.cpp 2012-04-27 11:57:18.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <qfile.h> + + #include <png.h> ++#include <pngpriv.h> + #include <netinet/in.h> // for htonl + + class QAnimationWriterData { diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 9da4ad0afb53..2ce5f8e689d2 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -8,13 +8,14 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= x11-toolkits PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface library -LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile index 78f4260dd89a..539a754a8e27 100644 --- a/x11-toolkits/qwt4/Makefile +++ b/x11-toolkits/qwt4/Makefile @@ -7,7 +7,7 @@ PORTNAME= qwt PORTVERSION= 4.2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= SF diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile index 26238059e407..fc4cb55d297b 100644 --- a/x11-toolkits/qwt5-designerplugin/Makefile +++ b/x11-toolkits/qwt5-designerplugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 5.2.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits devel MASTER_SITES= SF PKGNAMESUFFIX= -designerplugin diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile index bc340c19b821..a1084b4c4ada 100644 --- a/x11-toolkits/qwt5/Makefile +++ b/x11-toolkits/qwt5/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 5.2.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile index 1fffee1bf3b5..bbea19803fcb 100644 --- a/x11-toolkits/qwt6-designerplugin/Makefile +++ b/x11-toolkits/qwt6-designerplugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 6.0.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits devel MASTER_SITES= SF PKGNAMESUFFIX= -designerplugin diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile index 0ac2c3b42ac6..b6b575911566 100644 --- a/x11-toolkits/qwt6/Makefile +++ b/x11-toolkits/qwt6/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 6.0.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index 8a145df4ead0..4d5415fa0c2c 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -7,6 +7,7 @@ PORTNAME= rep-gtk2 PORTVERSION= 0.90.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://download.tuxfamily.org/librep/rep-gtk/ diff --git a/x11-toolkits/ruby-fox16/Makefile b/x11-toolkits/ruby-fox16/Makefile index c03c518cf682..28816a9e533d 100644 --- a/x11-toolkits/ruby-fox16/Makefile +++ b/x11-toolkits/ruby-fox16/Makefile @@ -7,7 +7,7 @@ PORTNAME= fox PORTVERSION= 1.6.19 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-toolkits ruby MASTER_SITES= RF MASTER_SITE_SUBDIR= fxruby @@ -19,7 +19,7 @@ MAINTAINER= lercordeiro@gmail.com COMMENT= Ruby extension module to use FOX 1.6, aka FXRuby LIB_DEPENDS= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ fxscintilla.23:${PORTSDIR}/x11-toolkits/fxscintilla diff --git a/x11-toolkits/ruby-goocanvas/Makefile b/x11-toolkits/ruby-goocanvas/Makefile index 40cb1baf135a..aad5bfb52d6a 100644 --- a/x11-toolkits/ruby-goocanvas/Makefile +++ b/x11-toolkits/ruby-goocanvas/Makefile @@ -7,6 +7,7 @@ PORTNAME= goocanvas PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 6c47e8007ce1..ca76491f4471 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -8,6 +8,7 @@ PORTNAME= gtk2 PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/x11-toolkits/ruby-gtksourceview2/Makefile b/x11-toolkits/ruby-gtksourceview2/Makefile index 26f06b983607..38784517d564 100644 --- a/x11-toolkits/ruby-gtksourceview2/Makefile +++ b/x11-toolkits/ruby-gtksourceview2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtksourceview2 PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile index d81a18146b12..b8a6cfe65637 100644 --- a/x11-toolkits/ruby-pango/Makefile +++ b/x11-toolkits/ruby-pango/Makefile @@ -8,6 +8,7 @@ PORTNAME= pango PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/x11-toolkits/ruby-poppler/Makefile b/x11-toolkits/ruby-poppler/Makefile index d41a248c778d..e22fb8542f70 100644 --- a/x11-toolkits/ruby-poppler/Makefile +++ b/x11-toolkits/ruby-poppler/Makefile @@ -7,6 +7,7 @@ PORTNAME= poppler PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/x11-toolkits/ruby-vte/Makefile b/x11-toolkits/ruby-vte/Makefile index 7bcae870b6aa..dc83bbb591d4 100644 --- a/x11-toolkits/ruby-vte/Makefile +++ b/x11-toolkits/ruby-vte/Makefile @@ -7,6 +7,7 @@ PORTNAME= vte PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} diff --git a/x11-toolkits/sakura/Makefile b/x11-toolkits/sakura/Makefile index b4e94165d2e6..9ab7b4a47696 100644 --- a/x11-toolkits/sakura/Makefile +++ b/x11-toolkits/sakura/Makefile @@ -7,6 +7,7 @@ PORTNAME= sakura PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= http://www.pleyades.net/david/projects/sakura/ diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index 4a653f160e8d..738ab84c5dd6 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -7,6 +7,7 @@ PORTNAME= scintilla PORTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile index 2d183d919bcf..ccd411ef7e97 100644 --- a/x11-toolkits/sdl_pango/Makefile +++ b/x11-toolkits/sdl_pango/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdl_pango PORTVERSION= 0.1.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits MASTER_SITES= SF/sdlpango/SDL_Pango/${PORTVERSION} DISTNAME= SDL_Pango-${PORTVERSION} diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index 313e62cb0cdb..7c8280e06e66 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -7,7 +7,7 @@ PORTNAME= SoQt PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \ ftp://ftp.coin3d.org/pub/coin/src/all/ diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile index a9a445f7472b..5df2fd386257 100644 --- a/x11-toolkits/swt-devel/Makefile +++ b/x11-toolkits/swt-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= swt DISTVERSION= 3.7.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits devel java MASTER_SITES= ECLIPSE diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile index 89af558d26cf..5926f1b6d4fe 100644 --- a/x11-toolkits/swt/Makefile +++ b/x11-toolkits/swt/Makefile @@ -7,6 +7,7 @@ PORTNAME= swt DISTVERSION= 3.5.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits devel java #MASTER_SITES= ${MASTER_SITE_ECLIPSE} MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops/${MASTER_SITE_SUBDIR}/ diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile index 81341dcb4e58..5a2009660923 100644 --- a/x11-toolkits/termit/Makefile +++ b/x11-toolkits/termit/Makefile @@ -7,6 +7,7 @@ PORTNAME= termit PORTVERSION= 2.9.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= http://cloud.github.com/downloads/nonstop/termit/ diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile index 09512a49b84d..6ccefdb77ba2 100644 --- a/x11-toolkits/unique/Makefile +++ b/x11-toolkits/unique/Makefile @@ -8,7 +8,7 @@ PORTNAME= unique PORTVERSION= 1.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/ DISTNAME= lib${PORTNAME}-${PORTVERSION} diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile index 38ce5c96c3e5..ab2bdf1834fc 100644 --- a/x11-toolkits/vdk/Makefile +++ b/x11-toolkits/vdk/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdk PORTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/${PORTNAME}lib/VDK%20for%20both%20Linux%20and%20Windows%20%28this%20is%20the%20new%20version%29/VDKLIB%20%28C%2B%2B%20wrapper%20for%20GTK%2B%29 diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile index 6f9a1d3c7679..2589e86d0fe6 100644 --- a/x11-toolkits/vdkbuilder/Makefile +++ b/x11-toolkits/vdkbuilder/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdkbuilder PORTVERSION= 2.5.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF DISTNAME= ${PORTNAME}2-${PORTVERSION} diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 149251245e6d..f565468147c5 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -8,7 +8,7 @@ PORTNAME= vte PORTVERSION= 0.26.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/wxd/Makefile b/x11-toolkits/wxd/Makefile index f732b571913e..30836b7efacf 100644 --- a/x11-toolkits/wxd/Makefile +++ b/x11-toolkits/wxd/Makefile @@ -7,7 +7,7 @@ PORTNAME= wxd PORTVERSION= 0.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits devel MASTER_SITES= SF/${PORTNAME}/wxD/${PORTVERSION} EXTRACT_SUFX= .tgz diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile index 8115938871b2..169558e79dd3 100644 --- a/x11-toolkits/wxgtk24-contrib/Makefile +++ b/x11-toolkits/wxgtk24-contrib/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 12 +PORTREVISION= 13 MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 571d7e23c828..336f4176d2c6 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 20 +PORTREVISION?= 21 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} @@ -16,7 +16,7 @@ DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp b/x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp new file mode 100644 index 000000000000..9c0bd30beb19 --- /dev/null +++ b/x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp @@ -0,0 +1,44 @@ +--- src/common/imagpng.cpp.orig 2003-09-21 13:31:39.000000000 +0200 ++++ src/common/imagpng.cpp 2012-05-06 07:07:48.000000000 +0200 +@@ -30,6 +30,7 @@ + #include "wx/log.h" + #include "wx/app.h" + #include "png.h" ++#include "pngpriv.h" + #include "wx/filefn.h" + #include "wx/wfstream.h" + #include "wx/intl.h" +@@ -127,7 +128,7 @@ + #ifdef USE_FAR_KEYWORD + { + jmp_buf jmpbuf; +- png_memcpy(jmpbuf,info->jmpbuf,sizeof(jmp_buf)); ++ png_memcpy(jmpbuf,png_jmpbuf(info),sizeof(jmp_buf)); + longjmp(jmpbuf, 1); + } + #else +@@ -167,13 +168,13 @@ + image->Destroy(); + + png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, +- (voidp) NULL, ++ NULL, + (png_error_ptr) NULL, + (png_error_ptr) NULL ); + if (!png_ptr) + goto error_nolines; + +- png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning); ++ png_set_error_fn(png_ptr, NULL, wx_png_error, wx_png_warning); + + // NB: please see the comment near wxPNGInfoStruct declaration for + // explanation why this line is mandatory +@@ -349,7 +350,7 @@ + return FALSE; + } + +- png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning); ++ png_set_error_fn(png_ptr, NULL, wx_png_error, wx_png_warning); + + png_infop info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index f5eee7e03819..a5a5da26419a 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.6.4 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -16,7 +16,7 @@ DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png\ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\ jpeg.11:${PORTSDIR}/graphics/jpeg\ tiff.4:${PORTSDIR}/graphics/tiff\ expat.6:${PORTSDIR}/textproc/expat2\ diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp new file mode 100644 index 000000000000..82ef39ee5b90 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp @@ -0,0 +1,11 @@ +--- src/common/imagpng.cpp.orig 2007-03-20 16:50:01.000000000 +0100 ++++ src/common/imagpng.cpp 2012-05-06 07:15:11.000000000 +0200 +@@ -528,7 +528,7 @@ + png_structp png_ptr = png_create_read_struct + ( + PNG_LIBPNG_VER_STRING, +- (voidp) NULL, ++ NULL, + wx_png_error, + wx_png_warning + ); diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 09c87ab6fcd8..fb13a4e44e0c 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.8.12 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -16,7 +16,7 @@ DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png\ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\ jpeg.11:${PORTSDIR}/graphics/jpeg\ tiff.4:${PORTSDIR}/graphics/tiff\ expat.6:${PORTSDIR}/textproc/expat2 diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index 0bb2d5eacfbb..a101fc6abaa5 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.9.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= gtk2 @@ -16,7 +16,7 @@ DISTNAME= wxWidgets-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png\ +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\ jpeg.11:${PORTSDIR}/graphics/jpeg\ tiff.4:${PORTSDIR}/graphics/tiff\ expat.6:${PORTSDIR}/textproc/expat2 diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile index 271aa17fbe49..541322ac14b1 100644 --- a/x11-toolkits/xmhtml/Makefile +++ b/x11-toolkits/xmhtml/Makefile @@ -7,20 +7,22 @@ PORTNAME= XmHTML PORTVERSION= 1.1.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-toolkits www MASTER_SITES= ${MASTER_SITE_NETBSD} MAINTAINER= ports@FreeBSD.org COMMENT= A Motif widget set for displaying HTML 3.2 documents -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg USE_AUTOTOOLS= libtool:env USE_MOTIF= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_XORG= xmu +CFLAGS+= -I${LOCALBASE}/include/libpng15 do-configure: @${DO_NADA} diff --git a/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c b/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c new file mode 100644 index 000000000000..5bbffea2ef9e --- /dev/null +++ b/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c @@ -0,0 +1,28 @@ +--- lib/common/readPNG.c.orig 1998-11-16 23:56:19.000000000 +0100 ++++ lib/common/readPNG.c 2012-05-26 14:16:45.000000000 +0200 +@@ -82,6 +82,7 @@ + + #ifdef HAVE_LIBPNG + #include <png.h> ++#include <pngpriv.h> + #include <setjmp.h> + #include <math.h> /* required for full alpha channel processing */ + #endif +@@ -132,7 +133,7 @@ + + _XmHTMLWarning(__WFUNC__(NULL, "png_error"), XMHTML_MSG_121, "png", + ib->file, msg); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + /***** +@@ -232,7 +233,7 @@ + return((XmHTMLRawImageData*)NULL); + } + /* now set error handler */ +- if(setjmp(png_ptr->jmpbuf)) ++ if(setjmp(png_jmpbuf(png_ptr))) + { + /* + * PNG signalled an error. Destroy image data, free any allocated |