ping...
On Mon, Nov 7, 2011 at 4:43 PM, Amit Kulkarni <[email protected]> wrote:
> this update removes all patches...
>
> i sent it to maintainer a few weeks ago, but he is busy with dpb work, so
> i thought to send to ports@ :-)
>
> tested with x11/xfe daily which uses devel/fox on amd64.
>
> thanks
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/fox/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 4 Nov 2011 09:18:43 -0000 1.22
> +++ Makefile 7 Nov 2011 22:33:47 -0000
> @@ -3,12 +3,11 @@
> COMMENT = C++ toolkit for GUI
> CATEGORIES = devel
>
> -DISTNAME = fox-1.6.37
> -REVISION = 0
> +DISTNAME = fox-1.6.44
>
> SHARED_LIBS += FOX-1.6 2.0 # .0.37
> SHARED_LIBS += CHART-1.6 1.0 # .0.28
> -MASTER_SITES = ${HOMEPAGE}/ftp/
> +MASTER_SITES = ftp://ftp.fox-toolkit.org/pub/
> HOMEPAGE = http://www.fox-toolkit.org/
> MAINTAINER = Marc Espie <[email protected]>
>
> @@ -20,7 +19,8 @@ LIB_DEPENDS = archivers/bzip2 \
> graphics/tiff
>
> CONFIGURE_ENV += \
> - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
> + CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng \
> + -I${X11BASE}/include/freetype2" \
> LDFLAGS="-L${LOCALBASE}/lib"
> CONFIGURE_ARGS += \
> --x-includes=${X11BASE}/include \
> @@ -38,8 +38,8 @@ USE_GROFF = Yes
> FOX = fox-1.6
> SUBST_VARS = FOX
>
> -WANTLIB = GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xrender Xrandr c m \
> - stdc++ z pthread Xft expat fontconfig freetype \
> - pthread-stubs xcb bz2 jpeg png tiff Xdamage Xxf86vm drm
> +WANTLIB = GL GLU X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xrender \
> + Xrandr Xxf86vm c bz2 drm expat fontconfig freetype jpeg \
> + m png pthread pthread-stubs stdc++ tiff xcb z
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/fox/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 26 Apr 2010 09:15:00 -0000 1.8
> +++ distinfo 7 Nov 2011 22:33:47 -0000
> @@ -1,5 +1,5 @@
> -MD5 (fox-1.6.37.tar.gz) = 5JnmLDrE74KgMrxn+of5rw==
> -RMD160 (fox-1.6.37.tar.gz) = 7Vge7fFf0PgNXDaMXK6RrzJ+jr4=
> -SHA1 (fox-1.6.37.tar.gz) = lxlDgD6imfoX91puPxntGw5mX0Q=
> -SHA256 (fox-1.6.37.tar.gz) = rJkcWGlMAKu8nHCYt36OqGmY/2yfxbby7lRUIbOrRcc=
> -SIZE (fox-1.6.37.tar.gz) = 4345645
> +MD5 (fox-1.6.44.tar.gz) = bMyMvPpuTItuTe7rOcNkNA==
> +RMD160 (fox-1.6.44.tar.gz) = wCkCBLm+g32h/aladurrN6qVfCo=
> +SHA1 (fox-1.6.44.tar.gz) = wDS/0rjfo6hQ0Y6PzbcXks2IjU0=
> +SHA256 (fox-1.6.44.tar.gz) = 0m3dK8lhquuZkdWCGCYsgsxebsCLC1vBzQNmD86fMOI=
> +SIZE (fox-1.6.44.tar.gz) = 4372589
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 26 Apr 2010 09:15:00 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-configure,v 1.2 2010/04/26 09:15:00 stephan Exp $
> ---- configure.orig Thu Apr 8 15:40:14 2010
> -+++ configure Thu Apr 8 15:42:14 2010
> -@@ -23078,13 +23078,13 @@ fi
> -
> - PTHREAD_LIBS=notfound
> - if test "x$PTHREAD_LIBS" = xnotfound; then
> --{ echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
> --echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6; }
> -+{ echo "$as_me:$LINENO: checking for pthread_exit in -pthread" >&5
> -+echo $ECHO_N "checking for pthread_exit in -pthread... $ECHO_C" >&6; }
> - if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
> - echo $ECHO_N "(cached) $ECHO_C" >&6
> - else
> - ac_check_lib_save_LIBS=$LIBS
> --LIBS="-lpthread $LIBS"
> -+LIBS="-pthread $LIBS"
> - cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h. */
> - _ACEOF
> -@@ -23140,7 +23140,7 @@ fi
> - { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5
> - echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6; }
> - if test $ac_cv_lib_pthread_pthread_exit = yes; then
> -- PTHREAD_LIBS="-lpthread"
> -+ PTHREAD_LIBS="-pthread"
> - fi
> -
> - fi
> Index: patches/patch-src_fxpngio_cpp
> ===================================================================
> RCS file: patches/patch-src_fxpngio_cpp
> diff -N patches/patch-src_fxpngio_cpp
> --- patches/patch-src_fxpngio_cpp 8 Jul 2011 20:38:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,33 +0,0 @@
> -$OpenBSD: patch-src_fxpngio_cpp,v 1.1 2011/07/08 20:38:02 naddy Exp $
> -
> -Fix build with png-1.5.
> -
> ---- src/fxpngio.cpp.orig Mon Jul 4 22:42:45 2011
> -+++ src/fxpngio.cpp Mon Jul 4 22:49:30 2011
> -@@ -75,7 +75,7 @@ static void user_flush_fn(png_structp ){ }
> - static void user_error_fn(png_structp png_ptr,png_const_charp){
> - FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
> - store->setError(FXStreamFormat); // Flag this as a
> format error in FXStream
> -- longjmp(png_ptr->jmpbuf,1); // Bail out
> -+ png_longjmp(png_ptr,1); // Bail out
> - }
> -
> -
> -@@ -118,7 +118,7 @@ bool fxloadPNG(FXStream& store,FXColor*& data,FXint& w
> - }
> -
> - // 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);
> -@@ -231,7 +231,7 @@ bool fxsavePNG(FXStream& store,const FXColor* data,FXi
> - }
> -
> - // Set error handling.
> -- if(setjmp(png_ptr->jmpbuf)){
> -+ if(setjmp(png_jmpbuf(png_ptr))){
> - png_destroy_write_struct(&png_ptr,&info_ptr);
> - return false;
> - }
>
