From 8210a4274c024b82dbfe7067466707bc1f105804 Mon Sep 17 00:00:00 2001 From: fjoe Date: Wed, 31 Aug 2005 18:20:06 +0000 Subject: Update to 2.6.1. PR: 85216 --- x11-toolkits/Makefile | 1 - x11-toolkits/wxgtk26-common/pkg-plist | 1 - x11-toolkits/wxgtk26-contrib-utils/Makefile | 25 ------------------------- x11-toolkits/wxgtk26-contrib-utils/pkg-plist | 2 -- x11-toolkits/wxgtk26-contrib/Makefile | 2 -- x11-toolkits/wxgtk26-unicode-contrib/Makefile | 2 -- x11-toolkits/wxgtk26/Makefile | 3 +-- x11-toolkits/wxgtk26/distinfo | 4 ++-- x11-toolkits/wxgtk26/files/patch-configure | 21 +++++++++++++++------ x11-toolkits/wxgtk28-common/pkg-plist | 1 - x11-toolkits/wxgtk28-contrib/Makefile | 2 -- x11-toolkits/wxgtk28-unicode-contrib/Makefile | 2 -- x11-toolkits/wxgtk28/Makefile | 3 +-- x11-toolkits/wxgtk28/distinfo | 4 ++-- x11-toolkits/wxgtk28/files/patch-configure | 21 +++++++++++++++------ x11-toolkits/wxgtk29-common/pkg-plist | 1 - x11-toolkits/wxgtk29-contrib/Makefile | 2 -- x11-toolkits/wxgtk29-unicode-contrib/Makefile | 2 -- x11-toolkits/wxgtk29/Makefile | 3 +-- x11-toolkits/wxgtk29/distinfo | 4 ++-- x11-toolkits/wxgtk29/files/patch-configure | 21 +++++++++++++++------ 21 files changed, 54 insertions(+), 73 deletions(-) delete mode 100644 x11-toolkits/wxgtk26-contrib-utils/Makefile delete mode 100644 x11-toolkits/wxgtk26-contrib-utils/pkg-plist diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index dd0eea31a30a..2a9012f6a28c 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -210,7 +210,6 @@ SUBDIR += wxgtk26-common SUBDIR += wxgtk26-contrib SUBDIR += wxgtk26-contrib-common - SUBDIR += wxgtk26-contrib-utils SUBDIR += wxgtk26-unicode SUBDIR += wxgtk26-unicode-contrib SUBDIR += wxmozilla diff --git a/x11-toolkits/wxgtk26-common/pkg-plist b/x11-toolkits/wxgtk26-common/pkg-plist index 2cfee8986833..5a1b454b7595 100644 --- a/x11-toolkits/wxgtk26-common/pkg-plist +++ b/x11-toolkits/wxgtk26-common/pkg-plist @@ -43,7 +43,6 @@ include/wx-2.6/wx/dataobj.h include/wx-2.6/wx/datectrl.h include/wx-2.6/wx/dateevt.h include/wx-2.6/wx/datetime.h -include/wx-2.6/wx/datetime.inl include/wx-2.6/wx/datstrm.h include/wx-2.6/wx/db.h include/wx-2.6/wx/dbgrid.h diff --git a/x11-toolkits/wxgtk26-contrib-utils/Makefile b/x11-toolkits/wxgtk26-contrib-utils/Makefile deleted file mode 100644 index 93b80dd2d22d..000000000000 --- a/x11-toolkits/wxgtk26-contrib-utils/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# New ports collection makefile for: wxgtk26-contrib-utils -# Date created: June 27, 2004 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 2 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit utils - -.if defined(WITH_UNICODE) -WXGTK_FLAVOR= gtk2-unicode-contrib-utils -LIB_DEPENDS= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib -.else -WXGTK_FLAVOR= gtk2-contrib-utils -LIB_DEPENDS= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib -.endif - -BUILD_WRKSRC= ${WRKSRC}/contrib/utils -INSTALL_WRKSRC= ${BUILD_WRKSRC} -MASTERDIR= ${.CURDIR}/../wxgtk26 - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk26-contrib-utils/pkg-plist b/x11-toolkits/wxgtk26-contrib-utils/pkg-plist deleted file mode 100644 index b1daae745572..000000000000 --- a/x11-toolkits/wxgtk26-contrib-utils/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/convertrc -bin/wxrcedit diff --git a/x11-toolkits/wxgtk26-contrib/Makefile b/x11-toolkits/wxgtk26-contrib/Makefile index 2b32010ca382..1eba77011e9f 100644 --- a/x11-toolkits/wxgtk26-contrib/Makefile +++ b/x11-toolkits/wxgtk26-contrib/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk26-unicode-contrib/Makefile b/x11-toolkits/wxgtk26-unicode-contrib/Makefile index e2d5469ec06a..62f0029a5019 100644 --- a/x11-toolkits/wxgtk26-unicode-contrib/Makefile +++ b/x11-toolkits/wxgtk26-unicode-contrib/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode) diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index e5584dc99d90..4be8d8741115 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wx -PORTVERSION= 2.6.0 -PORTREVISION?= 1 +PORTVERSION= 2.6.1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxwindows diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo index 56d766416f01..141c24089db1 100644 --- a/x11-toolkits/wxgtk26/distinfo +++ b/x11-toolkits/wxgtk26/distinfo @@ -1,2 +1,2 @@ -MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b -SIZE (wxGTK-2.6.0.tar.bz2) = 7281025 +MD5 (wxGTK-2.6.1.tar.bz2) = dd348a6f825d502b497a085b190b7a27 +SIZE (wxGTK-2.6.1.tar.bz2) = 7205374 diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure index 2b3d5be8d5c5..33327df196a0 100644 --- a/x11-toolkits/wxgtk26/files/patch-configure +++ b/x11-toolkits/wxgtk26/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Apr 21 00:32:34 2005 -+++ configure Thu May 5 16:17:57 2005 -@@ -33918,7 +33918,7 @@ +--- configure.orig Thu Jun 2 23:03:05 2005 ++++ configure Wed Aug 31 23:48:02 2005 +@@ -34396,7 +34396,7 @@ fi ;; *-*-freebsd*) @@ -9,7 +9,7 @@ ;; *-*-darwin* | *-*-cygwin* ) THREAD_OPTS="" -@@ -33955,6 +33955,12 @@ +@@ -34433,6 +34433,12 @@ echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 ;; @@ -22,7 +22,16 @@ -*) echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 -@@ -35210,6 +35216,7 @@ +@@ -34515,7 +34521,7 @@ + { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5 + echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} + else +- LDFLAGS="$THREADS_CFLAGS $LDFLAGS" ++ LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS" + LIBS="$THREADS_LINK $LIBS" + + echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 +@@ -35701,6 +35707,7 @@ fi fi fi @@ -30,7 +39,7 @@ if test "$WXGTK20" = 1 ; then cat >>confdefs.h <<_ACEOF -@@ -35330,7 +35337,7 @@ +@@ -35823,7 +35830,7 @@ OPTIMISE="-O" fi fi diff --git a/x11-toolkits/wxgtk28-common/pkg-plist b/x11-toolkits/wxgtk28-common/pkg-plist index 2cfee8986833..5a1b454b7595 100644 --- a/x11-toolkits/wxgtk28-common/pkg-plist +++ b/x11-toolkits/wxgtk28-common/pkg-plist @@ -43,7 +43,6 @@ include/wx-2.6/wx/dataobj.h include/wx-2.6/wx/datectrl.h include/wx-2.6/wx/dateevt.h include/wx-2.6/wx/datetime.h -include/wx-2.6/wx/datetime.inl include/wx-2.6/wx/datstrm.h include/wx-2.6/wx/db.h include/wx-2.6/wx/dbgrid.h diff --git a/x11-toolkits/wxgtk28-contrib/Makefile b/x11-toolkits/wxgtk28-contrib/Makefile index 2b32010ca382..1eba77011e9f 100644 --- a/x11-toolkits/wxgtk28-contrib/Makefile +++ b/x11-toolkits/wxgtk28-contrib/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk28-unicode-contrib/Makefile b/x11-toolkits/wxgtk28-unicode-contrib/Makefile index e2d5469ec06a..62f0029a5019 100644 --- a/x11-toolkits/wxgtk28-unicode-contrib/Makefile +++ b/x11-toolkits/wxgtk28-unicode-contrib/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode) diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index e5584dc99d90..4be8d8741115 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wx -PORTVERSION= 2.6.0 -PORTREVISION?= 1 +PORTVERSION= 2.6.1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxwindows diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo index 56d766416f01..141c24089db1 100644 --- a/x11-toolkits/wxgtk28/distinfo +++ b/x11-toolkits/wxgtk28/distinfo @@ -1,2 +1,2 @@ -MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b -SIZE (wxGTK-2.6.0.tar.bz2) = 7281025 +MD5 (wxGTK-2.6.1.tar.bz2) = dd348a6f825d502b497a085b190b7a27 +SIZE (wxGTK-2.6.1.tar.bz2) = 7205374 diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure index 2b3d5be8d5c5..33327df196a0 100644 --- a/x11-toolkits/wxgtk28/files/patch-configure +++ b/x11-toolkits/wxgtk28/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Apr 21 00:32:34 2005 -+++ configure Thu May 5 16:17:57 2005 -@@ -33918,7 +33918,7 @@ +--- configure.orig Thu Jun 2 23:03:05 2005 ++++ configure Wed Aug 31 23:48:02 2005 +@@ -34396,7 +34396,7 @@ fi ;; *-*-freebsd*) @@ -9,7 +9,7 @@ ;; *-*-darwin* | *-*-cygwin* ) THREAD_OPTS="" -@@ -33955,6 +33955,12 @@ +@@ -34433,6 +34433,12 @@ echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 ;; @@ -22,7 +22,16 @@ -*) echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 -@@ -35210,6 +35216,7 @@ +@@ -34515,7 +34521,7 @@ + { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5 + echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} + else +- LDFLAGS="$THREADS_CFLAGS $LDFLAGS" ++ LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS" + LIBS="$THREADS_LINK $LIBS" + + echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 +@@ -35701,6 +35707,7 @@ fi fi fi @@ -30,7 +39,7 @@ if test "$WXGTK20" = 1 ; then cat >>confdefs.h <<_ACEOF -@@ -35330,7 +35337,7 @@ +@@ -35823,7 +35830,7 @@ OPTIMISE="-O" fi fi diff --git a/x11-toolkits/wxgtk29-common/pkg-plist b/x11-toolkits/wxgtk29-common/pkg-plist index 2cfee8986833..5a1b454b7595 100644 --- a/x11-toolkits/wxgtk29-common/pkg-plist +++ b/x11-toolkits/wxgtk29-common/pkg-plist @@ -43,7 +43,6 @@ include/wx-2.6/wx/dataobj.h include/wx-2.6/wx/datectrl.h include/wx-2.6/wx/dateevt.h include/wx-2.6/wx/datetime.h -include/wx-2.6/wx/datetime.inl include/wx-2.6/wx/datstrm.h include/wx-2.6/wx/db.h include/wx-2.6/wx/dbgrid.h diff --git a/x11-toolkits/wxgtk29-contrib/Makefile b/x11-toolkits/wxgtk29-contrib/Makefile index 2b32010ca382..1eba77011e9f 100644 --- a/x11-toolkits/wxgtk29-contrib/Makefile +++ b/x11-toolkits/wxgtk29-contrib/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk29-unicode-contrib/Makefile b/x11-toolkits/wxgtk29-unicode-contrib/Makefile index e2d5469ec06a..62f0029a5019 100644 --- a/x11-toolkits/wxgtk29-unicode-contrib/Makefile +++ b/x11-toolkits/wxgtk29-unicode-contrib/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode) diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index e5584dc99d90..4be8d8741115 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wx -PORTVERSION= 2.6.0 -PORTREVISION?= 1 +PORTVERSION= 2.6.1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxwindows diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo index 56d766416f01..141c24089db1 100644 --- a/x11-toolkits/wxgtk29/distinfo +++ b/x11-toolkits/wxgtk29/distinfo @@ -1,2 +1,2 @@ -MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b -SIZE (wxGTK-2.6.0.tar.bz2) = 7281025 +MD5 (wxGTK-2.6.1.tar.bz2) = dd348a6f825d502b497a085b190b7a27 +SIZE (wxGTK-2.6.1.tar.bz2) = 7205374 diff --git a/x11-toolkits/wxgtk29/files/patch-configure b/x11-toolkits/wxgtk29/files/patch-configure index 2b3d5be8d5c5..33327df196a0 100644 --- a/x11-toolkits/wxgtk29/files/patch-configure +++ b/x11-toolkits/wxgtk29/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Apr 21 00:32:34 2005 -+++ configure Thu May 5 16:17:57 2005 -@@ -33918,7 +33918,7 @@ +--- configure.orig Thu Jun 2 23:03:05 2005 ++++ configure Wed Aug 31 23:48:02 2005 +@@ -34396,7 +34396,7 @@ fi ;; *-*-freebsd*) @@ -9,7 +9,7 @@ ;; *-*-darwin* | *-*-cygwin* ) THREAD_OPTS="" -@@ -33955,6 +33955,12 @@ +@@ -34433,6 +34433,12 @@ echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 ;; @@ -22,7 +22,16 @@ -*) echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 -@@ -35210,6 +35216,7 @@ +@@ -34515,7 +34521,7 @@ + { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5 + echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} + else +- LDFLAGS="$THREADS_CFLAGS $LDFLAGS" ++ LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS" + LIBS="$THREADS_LINK $LIBS" + + echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 +@@ -35701,6 +35707,7 @@ fi fi fi @@ -30,7 +39,7 @@ if test "$WXGTK20" = 1 ; then cat >>confdefs.h <<_ACEOF -@@ -35330,7 +35337,7 @@ +@@ -35823,7 +35830,7 @@ OPTIMISE="-O" fi fi -- cgit