It was still adding "d" all over the place :(

Same thing for unicode ("WXUNICODEFLAG = u").

Shame on me for not noticing this before... 

Ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile    2 Nov 2010 13:10:51 -0000       1.28
+++ Makefile    4 Nov 2010 10:04:15 -0000
@@ -7,6 +7,7 @@ COMMENT =       c++ cross-platform GUI toolkit
 V =            2.8.11
 DISTNAME =     wxWidgets-${V}
 PKGNAME =      wxWidgets-gtk2-${V}
+REVISION =     0
 
 SHARED_LIBS =  wx_base                 2.0     \
                wx_base_net             2.0     \
@@ -85,6 +86,10 @@ CONFIGURE_ARGS =--with-expat=sys \
                --enable-unicode \
                --disable-backtrace \
                --disable-stl
+
+.ifdef DEBUG
+CONFIGURE_ARGS += --enable-debug
+.endif
 
 .for _l _v in ${SHARED_LIBS}
 MAKE_ENV +=    LIB${_l}_VERSION=${_v}
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-Makefile_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-Makefile_in
--- patches/patch-Makefile_in   2 Nov 2010 13:10:51 -0000       1.8
+++ patches/patch-Makefile_in   4 Nov 2010 10:04:15 -0000
@@ -1,6 +1,19 @@
 $OpenBSD: patch-Makefile_in,v 1.8 2010/11/02 13:10:51 dcoppa Exp $
 --- Makefile.in.orig   Thu Apr 15 11:03:41 2010
-+++ Makefile.in        Wed Oct 27 13:47:32 2010
++++ Makefile.in        Thu Nov  4 08:35:42 2010
+@@ -1585,9 +1585,9 @@ LOCALE_MSW_LINGUAS =  it
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
+ @cond_platform_win3...@wxdllnameprefix = wx_base$(WXBASEPORT)
+ @cond_platform_win3...@wxdllnameprefix = \
 @@ -1595,7 +1595,7 @@ LOCALE_MSW_LINGUAS =  it
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
@@ -10,6 +23,20 @@ $OpenBSD: patch-Makefile_in,v 1.8 2010/1
  @cond_platform_win3...@wxdllversiontag = 
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
        
$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@@ -1660,10 +1660,10 @@ COND_wxUSE_EXPAT_builtin___wxexpat___depname = \
+ @cond_platform_uni...@plugin_version0 = $(WX_RELEASE)
+ @cond_platform_uni...@plugverdelim = 
+ @cond_platform_uni...@plugverdelim = -
+...@cond_build_debug_unicode_0@PLUGINSUFFIX = d
+...@cond_build_debug_unicode_1@PLUGINSUFFIX = ud
+...@cond_build_debug_unicode_0@PLUGINSUFFIX =
+...@cond_build_debug_unicode_1@PLUGINSUFFIX =
+ @cond_build_release_unicod...@pluginsuffix = 
+...@cond_build_release_unicode_1@PLUGINSUFFIX = u
+...@cond_build_release_unicode_1@PLUGINSUFFIX =
+ @cond_toolkit_wi...@base_wince_src = src/msw/wince/time.cpp
+ @cond_toolkit_wi...@base_wince_hdr = wx/msw/wince/time.h \
+ @COND_TOOLKIT_WINCE@  wx/msw/wince/chkconf.h
 @@ -6833,7 +6833,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
  @cond_platform_unix_1_use_plugin...@__plugin_adv_src_objects_1 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@  = monolib_sound_sdl.o
Index: patches/patch-contrib_src_fl_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_fl_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_src_fl_Makefile_in
--- patches/patch-contrib_src_fl_Makefile_in    2 Nov 2010 13:10:51 -0000       
1.5
+++ patches/patch-contrib_src_fl_Makefile_in    4 Nov 2010 10:04:15 -0000
@@ -1,7 +1,17 @@
 $OpenBSD: patch-contrib_src_fl_Makefile_in,v 1.5 2010/11/02 13:10:51 dcoppa 
Exp $
 --- contrib/src/fl/Makefile.in.orig    Thu Apr 15 11:03:43 2010
-+++ contrib/src/fl/Makefile.in Wed Oct 27 12:36:07 2010
-@@ -124,14 +124,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
++++ contrib/src/fl/Makefile.in Thu Nov  4 10:39:23 2010
+@@ -117,21 +117,21 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
  @COND_PLATFORM_WIN32_1@       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
Index: patches/patch-contrib_src_gizmos_Makefile_in
===================================================================
RCS file: 
/cvs/ports/x11/wxWidgets/patches/patch-contrib_src_gizmos_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_src_gizmos_Makefile_in
--- patches/patch-contrib_src_gizmos_Makefile_in        2 Nov 2010 13:10:51 
-0000       1.5
+++ patches/patch-contrib_src_gizmos_Makefile_in        4 Nov 2010 10:04:16 
-0000
@@ -1,7 +1,17 @@
 $OpenBSD: patch-contrib_src_gizmos_Makefile_in,v 1.5 2010/11/02 13:10:51 
dcoppa Exp $
 --- contrib/src/gizmos/Makefile.in.orig        Thu Apr 15 11:03:43 2010
-+++ contrib/src/gizmos/Makefile.in     Wed Oct 27 12:36:07 2010
-@@ -121,14 +121,14 @@ GIZMOS_XRCLIB_ODEP = \
++++ contrib/src/gizmos/Makefile.in     Thu Nov  4 10:42:21 2010
+@@ -114,21 +114,21 @@ GIZMOS_XRCLIB_ODEP = \
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
  @COND_PLATFORM_WIN32_1@       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
Index: patches/patch-contrib_src_ogl_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_ogl_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_src_ogl_Makefile_in
--- patches/patch-contrib_src_ogl_Makefile_in   2 Nov 2010 13:10:51 -0000       
1.5
+++ patches/patch-contrib_src_ogl_Makefile_in   4 Nov 2010 10:04:16 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-contrib_src_ogl_Makefile_in,v 1.5 2010/11/02 13:10:51 dcoppa 
Exp $
 --- contrib/src/ogl/Makefile.in.orig   Thu Apr 15 11:03:57 2010
-+++ contrib/src/ogl/Makefile.in        Thu Oct 28 10:02:00 2010
++++ contrib/src/ogl/Makefile.in        Thu Nov  4 10:44:15 2010
 @@ -61,7 +61,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
  OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) 
\
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -10,7 +10,17 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
  OGLDLL_OBJECTS =  \
        $(__ogldll___win32rc) \
        ogldll_basic2.o \
-@@ -114,14 +114,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
+@@ -107,21 +107,21 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
  @COND_PLATFORM_WIN32_1@       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
Index: patches/patch-contrib_src_plot_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_plot_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_src_plot_Makefile_in
--- patches/patch-contrib_src_plot_Makefile_in  2 Nov 2010 13:10:51 -0000       
1.5
+++ patches/patch-contrib_src_plot_Makefile_in  4 Nov 2010 10:04:16 -0000
@@ -1,7 +1,17 @@
 $OpenBSD: patch-contrib_src_plot_Makefile_in,v 1.5 2010/11/02 13:10:51 dcoppa 
Exp $
 --- contrib/src/plot/Makefile.in.orig  Thu Apr 15 11:03:43 2010
-+++ contrib/src/plot/Makefile.in       Wed Oct 27 12:36:07 2010
-@@ -93,14 +93,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
++++ contrib/src/plot/Makefile.in       Thu Nov  4 10:46:41 2010
+@@ -86,21 +86,21 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
  @COND_PLATFORM_WIN32_1@       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
Index: patches/patch-contrib_src_stc_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_stc_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_src_stc_Makefile_in
--- patches/patch-contrib_src_stc_Makefile_in   2 Nov 2010 13:10:51 -0000       
1.5
+++ patches/patch-contrib_src_stc_Makefile_in   4 Nov 2010 10:04:16 -0000
@@ -1,7 +1,17 @@
 $OpenBSD: patch-contrib_src_stc_Makefile_in,v 1.5 2010/11/02 13:10:51 dcoppa 
Exp $
 --- contrib/src/stc/Makefile.in.orig   Thu Apr 15 11:03:43 2010
-+++ contrib/src/stc/Makefile.in        Wed Oct 27 12:36:07 2010
-@@ -257,14 +257,14 @@ STCLIB_OBJECTS =  \
++++ contrib/src/stc/Makefile.in        Thu Nov  4 10:48:54 2010
+@@ -250,21 +250,21 @@ STCLIB_OBJECTS =  \
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
  @COND_PLATFORM_WIN32_1@       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
Index: patches/patch-contrib_src_svg_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_svg_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_src_svg_Makefile_in
--- patches/patch-contrib_src_svg_Makefile_in   2 Nov 2010 13:10:52 -0000       
1.5
+++ patches/patch-contrib_src_svg_Makefile_in   4 Nov 2010 10:04:17 -0000
@@ -1,7 +1,17 @@
 $OpenBSD: patch-contrib_src_svg_Makefile_in,v 1.5 2010/11/02 13:10:52 dcoppa 
Exp $
 --- contrib/src/svg/Makefile.in.orig   Thu Apr 15 11:03:43 2010
-+++ contrib/src/svg/Makefile.in        Wed Oct 27 12:36:07 2010
-@@ -92,14 +92,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
++++ contrib/src/svg/Makefile.in        Thu Nov  4 10:49:13 2010
+@@ -85,21 +85,21 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
+ @cond_platform_win3...@wxcompiler = _gcc
+ @cond_official_build_0_platform_win3...@vendortag = _$(VENDOR)
+ @cond_official_build_1_platform_win3...@vendortag = 
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
  @cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
  @cond_platform_win3...@wxdllnameprefixgui = \
  @COND_PLATFORM_WIN32_1@       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
Index: patches/patch-utils_wxrc_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-utils_wxrc_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-utils_wxrc_Makefile_in
--- patches/patch-utils_wxrc_Makefile_in        10 Sep 2009 21:23:28 -0000      
1.3
+++ patches/patch-utils_wxrc_Makefile_in        4 Nov 2010 10:04:17 -0000
@@ -1,6 +1,19 @@
 $OpenBSD: patch-utils_wxrc_Makefile_in,v 1.3 2009/09/10 21:23:28 landry Exp $
---- utils/wxrc/Makefile.in.orig        Fri Mar  6 13:11:16 2009
-+++ utils/wxrc/Makefile.in     Fri Sep  4 23:57:40 2009
+--- utils/wxrc/Makefile.in.orig        Thu Apr 15 11:03:42 2010
++++ utils/wxrc/Makefile.in     Thu Nov  4 09:59:48 2010
+@@ -54,9 +54,9 @@ WXRC_OBJECTS =  \
+ @cond_use_gu...@portname = base
+ @cond_use_gu...@portname = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+ @cond_toolkit_...@wxbaseport = _carbon
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG = d
+...@cond_debug_flag_1@WXDEBUGFLAG = d
+...@cond_unicode_1@WXUNICODEFLAG = u
+...@cond_build_debug_debug_flag_default@WXDEBUGFLAG =
+...@cond_debug_flag_1@WXDEBUGFLAG =
+...@cond_unicode_1@WXUNICODEFLAG =
+ @cond_wxuni...@wxunivname = univ
+ @cond_monolithi...@extralibs_for_base = $(EXTRALIBS)
+ @cond_monolithi...@extralibs_for_base = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @@ -70,15 +70,15 @@ WXRC_OBJECTS =  \
  @cond_use_thread...@__thread_define_p = -DwxNO_THREADS
  @cond_share...@__dllflag_p = -DWXUSINGDLL

Reply via email to