Hi ports --
Here's an update for devel/fox to 1.6.49
Needed for a new port.
Works for me on amd64, loongson, and macppc.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/fox/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 21 Mar 2013 08:45:14 -0000 1.24
+++ Makefile 4 May 2013 17:15:55 -0000
@@ -3,12 +3,11 @@
COMMENT = C++ toolkit for GUI
CATEGORIES = devel
-DISTNAME = fox-1.6.37
-REVISION = 0
+DISTNAME = fox-1.6.49
-SHARED_LIBS += FOX-1.6 2.0 # .0.37
-SHARED_LIBS += CHART-1.6 1.0 # .0.28
-MASTER_SITES = ${HOMEPAGE}/ftp/
+SHARED_LIBS += FOX-1.6 2.1 # .0.49
+SHARED_LIBS += CHART-1.6 1.1 # .0.49
+MASTER_SITES = http://ftp.fox-toolkit.org/pub/
HOMEPAGE = http://www.fox-toolkit.org/
MAINTAINER = Marc Espie <[email protected]>
@@ -23,7 +22,7 @@ CONFIGURE_ENV += \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS += \
- --x-includes=${X11BASE}/include \
+ --x-includes="${X11BASE}/include -I${X11BASE}/include/freetype2" \
--x-libraries=${X11BASE}/lib \
--with-xft
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 4 May 2013 17:15:55 -0000
@@ -1,5 +1,2 @@
-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
+SHA256 (fox-1.6.49.tar.gz) = Nnns0jBklYJZ++9YmKq7BI1jsty3lt4diAH+C1HlqQ4=
+SIZE (fox-1.6.49.tar.gz) = 4383152
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;
- }
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 27 Feb 2007 10:46:00 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2007/02/27 10:46:00 espie Exp $
-@lib lib/libCHART-1.6.so.${LIBCHART-1.6_VERSION}
-@lib lib/libFOX-1.6.so.${LIBFOX-1.6_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/fox/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 24 Jan 2009 15:34:10 -0000 1.5
+++ pkg/PLIST 4 May 2013 17:15:55 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2009/01/24 15:34:10 ajacoutot Exp $
-%%SHARED%%
bin/Adie.stx
@bin bin/PathFinder
@bin bin/adie
@@ -297,8 +296,10 @@ include/${FOX}/fxver.h
include/${FOX}/xincs.h
lib/libCHART-1.6.a
lib/libCHART-1.6.la
+@lib lib/libCHART-1.6.so.${LIBCHART-1.6_VERSION}
lib/libFOX-1.6.a
lib/libFOX-1.6.la
+@lib lib/libFOX-1.6.so.${LIBFOX-1.6_VERSION}
lib/pkgconfig/
lib/pkgconfig/fox.pc
@man man/man1/PathFinder.1
