[135776] trunk/dports/devel/codeblocks

mojca at macports.org mojca at macports.org
Sat May 2 12:22:21 PDT 2015


Revision: 135776
          https://trac.macports.org/changeset/135776
Author:   mojca at macports.org
Date:     2015-05-02 12:22:21 -0700 (Sat, 02 May 2015)
Log Message:
-----------
codeblocks: upgrade to the latest SVN revision with many patches integrated upstream (#40390)

Modified Paths:
--------------
    trunk/dports/devel/codeblocks/Portfile
    trunk/dports/devel/codeblocks/files/README
    trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff
    trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp

Added Paths:
-----------
    trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff

Removed Paths:
-------------
    trunk/dports/devel/codeblocks/files/patch-Makefile.diff
    trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff
    trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff
    trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
    trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff
    trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff

Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/Portfile	2015-05-02 19:22:21 UTC (rev 135776)
@@ -6,8 +6,17 @@
 
 name                codeblocks
 version             13.12
-set release         1
-revision            1
+# set release       1
+revision            2
+
+fetch.type          svn
+svn.url             https://svn.code.sf.net/p/codeblocks/code/trunk
+svn.revision        10251
+worksrcdir          trunk
+
+# alternative unofficial mirror to allow fetching from a tarball
+# github.setup      obfuscated codeblocks_sf ...
+
 platforms           darwin freebsd
 categories          devel aqua x11
 license             GPL-3+
@@ -20,28 +29,30 @@
                     extensible and configurable.
 
 homepage            http://www.codeblocks.org/
-master_sites        http://download.berlios.de/codeblocks/ \
-                    sourceforge:codeblocks
-distname            ${name}_${version}-${release}
-worksrcdir          ${name}-${version}
-checksums           rmd160  e5e469431b792687ba029689b1107a0d735bce8b \
-                    sha256  772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610
+# master_sites      http://download.berlios.de/codeblocks/ \
+#                   sourceforge:codeblocks
+# distname          ${name}_${version}-${release}
+# worksrcdir        ${name}-${version}
+# checksums         rmd160  e5e469431b792687ba029689b1107a0d735bce8b \
+#                   sha256  772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610
 
-# TODO: maybe more dependencies are needed in this version, please help complete the list (see also the list below)
-depends_build       path:bin/pkg-config:pkgconfig
+depends_build       port:autoconf \
+                    port:automake \
+                    port:libtool \
+                    port:pkgconfig
+
 depends_lib         port:boost \
                     port:hunspell
 
-patchfiles          patch-Makefile.diff \
-                    patch-src-src-Makefile.in.diff \
-                    patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff \
-                    patch-configure-hunspell.diff \
-                    patch-configure-nodebug.diff \
-                    patch-configure-malloc.diff
+patchfiles          patch-configure-malloc.diff \
+                    patch-src-include-Makefile.diff
 
 # not sure what this patch was used for
 #                   patch-sdk-configmanager.cpp
 
+use_autoconf        yes
+autoconf.cmd        ./bootstrap
+
 # FileManager requires "gamin" to be installed when using wxGTK,
 # not sure whether it works with Carbon/Cocoa at all,
 # so it was disabled for now
@@ -104,26 +115,51 @@
 variant aqua {}
 variant x11 {}
 
-variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use wxWidgets 3.0 (experimental)} {
+variant wxwidgets30 conflicts wxwidgets28 wxgtk30 wxgtk28 description {Use Cocoa-based wxWidgets 3.0} {
     wxWidgets.use           wxWidgets-3.0
     depends_lib-append      port:${wxWidgets.port}
-    patchfiles-append       patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
+    post-patch {
+        file mkdir  "${worksrcpath}/m4"
+        file copy   "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+    }
     configure.args-append   --with-wxdir=${wxWidgets.wxdir}
 }
 
-variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
+variant wxwidgets28 conflicts wxwidgets30 wxgtk30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
     wxWidgets.use           wxWidgets-2.8
     depends_lib-append      port:${wxWidgets.port}
-    patchfiles-append       patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
     configure.args-append   --with-wxdir=${wxWidgets.wxdir}
+    post-patch {
+        file mkdir  "${worksrcpath}/m4"
+        file copy   "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+    }
 
     if {${wxWidgets.sdk} ne ""} {
         configure.sdkroot ${wxWidgets.sdk}
     }
 }
-variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
+
+variant wxgtk30 conflicts wxwidgets30 wxwidgets28 wxgtk28 description {Use wxWidgets 3.0 with GTK} {
+    wxWidgets.use           wxGTK-3.0
+    depends_lib-append      port:${wxWidgets.port}
+    configure.args-append   --with-wxdir=${wxWidgets.wxdir}
+    post-patch {
+        file mkdir  "${worksrcpath}/m4"
+        file copy   "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+    }
+}
+
+variant wxgtk28 conflicts wxwidgets30 wxwidgets28 wxgtk30 description {Use wxWidgets 2.8 with GTK} {
     wxWidgets.use           wxGTK-2.8
+    depends_lib-append      port:${wxWidgets.port}
+    post-patch {
+        file mkdir  "${worksrcpath}/m4"
+        file copy   "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+    }
+    configure.args-append   --with-wxdir=${wxWidgets.wxdir}
+}
 
+if {[variant_isset wxgtk28] || [variant_isset wxgtk30]} {
     # TODO: someone needs to do a careful check of this list of dependencies
     # codeblocks ends up linking against these, but it is quite possible that
     # some of them are also needed when liking against Carbon/Cocoa-based wxWidgets
@@ -146,12 +182,10 @@
                             port:xorg-libXi \
                             port:xorg-libXinerama \
                             port:xorg-libXrandr \
-                            port:xrender \
-                            port:${wxWidgets.port}
-    configure.args-append   --with-wxdir=${wxWidgets.wxdir}
+                            port:xrender
 }
 
-if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
+if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk30] && ![variant_isset wxgtk28]} {
     if {[variant_isset aqua]} {
         default_variants +wxwidgets28
     } elseif {[variant_isset x11]} {

Modified: trunk/dports/devel/codeblocks/files/README
===================================================================
--- trunk/dports/devel/codeblocks/files/README	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/README	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,30 +1,13 @@
 Summary of issues that need to be properly fixed upstream:
-  * http://forums.codeblocks.org/index.php/topic,18394.0.html
-  * https://trac.macports.org/ticket/40390
-
-
-  * https://sourceforge.net/p/codeblocks/tickets/12/
-    http://developer.berlios.de/bugs/?func=detailbug&bug_id=19136&group_id=5358
-    patch-src-src-Makefile.in.diff
-    * hardcoded libcodeblocks.la -> libcodeblocks.dylib
-  * https://sourceforge.net/p/codeblocks/tickets/9/
-    http://developer.berlios.de/bugs/?func=detailbug&bug_id=19110&group_id=5358
-    patch-nodebug.diff
-    * remove LDFLAGS="-Wl,--no-undefined" (which also overwrites other LDFLAGS)
-      it should be LDFLAGS="... $LDFLAGS"
   * https://sourceforge.net/p/codeblocks/tickets/11/
-    http://developer.berlios.de/bugs/?func=detailbug&bug_id=19114&group_id=5358
-    patch-malloc.diff
+    patch-configure-malloc.diff
     * test for sys/malloc.h instead of malloc.h
-  * https://sourceforge.net/p/codeblocks/tickets/10/
-    http://developer.berlios.de/bugs/?func=detailbug&bug_id=19135&group_id=5358
-    reinplace "s|CB_HUNSPELL_LIBS =|CB_HUNSPELL_LIBS = -lhunspell-1.3.0|"
-    * missing support for detection of hunspell on Mac
-  * https://sourceforge.net/p/codeblocks/tickets/8/
-    http://developer.berlios.de/bugs/?func=detailbug&bug_id=19139&group_id=5358
-    patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
-    * wxIcon doesn't work on Mac
 
-  * patch-Makefile.diff
+Patches written by afb (review and submit upstream):
+  * patch-src-include-Makefile.diff
   * patch-sdk-configmanager.cpp
 
+See also:
+  * http://forums.codeblocks.org/index.php/topic,18394.0.html
+  * http://forums.codeblocks.org/index.php/topic,18727.0.html
+  * https://trac.macports.org/ticket/40390

Deleted: trunk/dports/devel/codeblocks/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-Makefile.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-Makefile.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,87 +0,0 @@
-sent by afb
-#--- src/include/Makefile.am.orig
-#+++ src/include/Makefile.am
-#@@ -1,13 +1,14 @@
-# SUBDIRS = scripting tinyxml
-# 
-# if PRECOMPILE_HEADERS
-#-BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
-#-		$(top_builddir)/src/include/sdk_precomp.h.gch
-#+BUILT_SOURCES = sdk.h.gch \
-#+		sdk_precomp.h.gch
-# else
-# BUILT_SOURCES =
-# endif
-# 
-# AM_CPPFLAGS = $(WX_CXXFLAGS) \
-#+			-I$(top_builddir)/src/include \
-# 			-I$(top_srcdir)/src/include \
-# 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
-# 			-I$(top_srcdir)/src/include/tinyxml \
-#@@ -176,16 +177,16 @@ ALLHEADERS = annoyingdialog.h \
-# 
-# sdk_HEADERS = $(ALLHEADERS)
-# 
-#-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
-#-	-rm -f $(top_builddir)/src/include/sdk.h.gch
-#-	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
-#+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
-#+	-rm -f sdk.h.gch
-#+	$(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
-# 
-#-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
-#-	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-#-	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-#+sdk_precomp.h.gch: $(ALLHEADERS)
-#+	-rm -f sdk_precomp.h.gch
-#+	$(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-# 
-# clean-local:
-#-	-rm -f $(top_builddir)/src/include/sdk.h.gch
-#-	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-#+	-rm -f sdk.h.gch
-#+	-rm -f sdk_precomp.h.gch
-# 
-# EXTRA_DIST = autorevision.h
---- src/include/Makefile.in.orig
-+++ src/include/Makefile.in
-@@ -362,10 +362,11 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = scripting tinyxml
- @PRECOMPILE_HEADERS_FALSE at BUILT_SOURCES = 
-- at PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
-- at PRECOMPILE_HEADERS_TRUE@		$(top_builddir)/src/include/sdk_precomp.h.gch
-+ at PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = sdk.h.gch \
-+ at PRECOMPILE_HEADERS_TRUE@		sdk_precomp.h.gch
- 
- AM_CPPFLAGS = $(WX_CXXFLAGS) \
-+			-I$(top_builddir)/src/include \
- 			-I$(top_srcdir)/src/include \
- 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 			-I$(top_srcdir)/src/include/tinyxml \
-@@ -929,17 +930,17 @@ uninstall-am: uninstall-sdkHEADERS
- 	uninstall-sdkHEADERS
- 
- 
--$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
--	-rm -f $(top_builddir)/src/include/sdk.h.gch
--	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
-+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
-+	-rm -f sdk.h.gch
-+	$(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
- 
--$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
--	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
--	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-+sdk_precomp.h.gch: $(ALLHEADERS)
-+	-rm -f sdk_precomp.h.gch
-+	$(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
- 
- clean-local:
--	-rm -f $(top_builddir)/src/include/sdk.h.gch
--	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-+	-rm -f sdk.h.gch
-+	-rm -f sdk_precomp.h.gch
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

Deleted: trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,305 +0,0 @@
-https://sourceforge.net/p/codeblocks/tickets/10/
-http://developer.berlios.de/bugs/?group_id=5358&func=detailbug&bug_id=19135
-
---- configure.orig
-+++ configure
-@@ -21530,6 +21530,269 @@ fi
- 
-         MACSETFILE="\$(SETFILE)"
-     ;;
-+    *wx_osx*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxOSX" >&5
-+$as_echo "wxOSX" >&6; }
-+
-+        if test "x$BUILD_SPELLCHECKER_TRUE" = "x" ; then
-+
-+            # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_HAVE_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$HAVE_PKG_CONFIG"; then
-+  ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_HAVE_PKG_CONFIG="yes"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_prog_HAVE_PKG_CONFIG" && ac_cv_prog_HAVE_PKG_CONFIG="no"
-+fi
-+fi
-+HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
-+if test -n "$HAVE_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5
-+$as_echo "$HAVE_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
-+else
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	else
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		PKG_CONFIG=""
-+	fi
-+fi
-+
-+            if test "x$HAVE_PKG_CONFIG" = "xyes"; then
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HUNSPELL" >&5
-+$as_echo_n "checking for HUNSPELL... " >&6; }
-+
-+if test -n "$HUNSPELL_CFLAGS"; then
-+    pkg_cv_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$HUNSPELL_LIBS"; then
-+    pkg_cv_HUNSPELL_LIBS="$HUNSPELL_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hunspell" 2>&1`
-+        else
-+	        HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hunspell" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$HUNSPELL_PKG_ERRORS" >&5
-+
-+	as_fn_error $? "Package requirements (hunspell) were not met:
-+
-+$HUNSPELL_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables HUNSPELL_CFLAGS
-+and HUNSPELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables HUNSPELL_CFLAGS
-+and HUNSPELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+	HUNSPELL_CFLAGS=$pkg_cv_HUNSPELL_CFLAGS
-+	HUNSPELL_LIBS=$pkg_cv_HUNSPELL_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+            fi
-+        fi
-+        CB_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
-+        CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
-+    ;;
-     *)
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: other" >&5
- $as_echo "other" >&6; }
-#--- configure.ac.orig
-#+++ configure.ac
-#@@ -223,6 +223,27 @@ case $WX_BASENAME in
-#         AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
-#         MACSETFILE="\$(SETFILE)"
-#     ;;
-#+    *wx_osx*)
-#+        AC_MSG_RESULT(wxOSX)
-#+
-#+        if test "x$BUILD_SPELLCHECKER_TRUE" = "x" ; then
-#+
-#+            AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
-#+            ifdef([PKG_CHECK_MODULES],[],[
-#+                define([PKG_CHECK_MODULES],
-#+                [ echo "You don't have pkg.m4 properly installed" >&2
-#+                    exit 1
-#+                ])
-#+            ])
-#+            PKG_PROG_PKG_CONFIG
-#+
-#+            if test "x$HAVE_PKG_CONFIG" = "xyes"; then
-#+                PKG_CHECK_MODULES([HUNSPELL], [hunspell])
-#+            fi
-#+        fi
-#+        CB_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
-#+        CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
-#+    ;;
-#     *)
-#         AC_MSG_RESULT(other)
-#     ;;

Modified: trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,24 +1,24 @@
 https://sourceforge.net/p/codeblocks/tickets/11/
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19114&group_id=5358
---- configure.orig
-+++ configure
-@@ -16967,7 +16967,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+#--- configure.orig
+#+++ configure
+#@@ -16967,7 +16967,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
+# 
+# fi
+# 
+#-for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h
+#+for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h
+# do :
+#   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+# ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+--- configure.ac.orig
++++ configure.ac
+@@ -41,7 +41,7 @@ AC_PROG_LIBTOOL
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
++AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h sys/malloc.h malloc/malloc.h])
  
- fi
- 
--for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h
-+for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-#--- configure.ac.orig
-#+++ configure.ac
-#@@ -36,7 +36,7 @@ AC_PROG_LIBTOOL
-# dnl Checks for header files.
-# AC_HEADER_DIRENT
-# AC_HEADER_STDC
-#-AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
-#+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h])
-# 
-# dnl Checks for typedefs, structures, and compiler characteristics.
-# AC_HEADER_STDBOOL
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL

Deleted: trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,38 +0,0 @@
-https://sourceforge.net/p/codeblocks/tickets/9/
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19110&group_id=5358
-
-the files where these LDFLAGS would cause problems:
-* src/build_tools/autorevision/Makefile
-* src/sdk/Makefile
-* src/src/Makefile
-#--- acinclude.m4.orig
-#+++ acinclude.m4
-#@@ -69,12 +69,10 @@ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (defau
-#     if test "x$enable_debug" = "xyes"; then
-#         CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
-#         CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-#-        LDFLAGS="-Wl,--no-undefined"
-#         AC_MSG_RESULT(yes)
-#     else
-#         CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
-#         CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-#-        LDFLAGS="-Wl,--no-undefined"
-#         AC_MSG_RESULT(no)
-#     fi
-# ])
---- configure.orig
-+++ configure
-@@ -11932,13 +11932,11 @@ fi
-     if test "x$enable_debug" = "xyes"; then
-         CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
-         CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
--        LDFLAGS="-Wl,--no-undefined"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-     else
-         CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
-         CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
--        LDFLAGS="-Wl,--no-undefined"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     fi

Modified: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,3 +1,5 @@
+written by afb
+
 --- src/sdk/configmanager.cpp.orig
 +++ src/sdk/configmanager.cpp
 @@ -1442,8 +1442,10 @@ void ConfigManager::InitPaths()

Copied: trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff (from rev 135597, trunk/dports/devel/codeblocks/files/patch-Makefile.diff)
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -0,0 +1,88 @@
+written by afb
+
+--- src/include/Makefile.am.orig
++++ src/include/Makefile.am
+@@ -1,13 +1,14 @@
+ SUBDIRS = scripting tinyxml
+ 
+ if PRECOMPILE_HEADERS
+-BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
+-		$(top_builddir)/src/include/sdk_precomp.h.gch
++BUILT_SOURCES = sdk.h.gch \
++		sdk_precomp.h.gch
+ else
+ BUILT_SOURCES =
+ endif
+ 
+ AM_CPPFLAGS = $(WX_CXXFLAGS) \
++			-I$(top_builddir)/src/include \
+ 			-I$(top_srcdir)/src/include \
+ 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
+ 			-I$(top_srcdir)/src/include/tinyxml \
+@@ -175,16 +176,16 @@ ALLHEADERS = annoyingdialog.h \
+ 
+ sdk_HEADERS = $(ALLHEADERS)
+ 
+-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
+-	-rm -f $(top_builddir)/src/include/sdk.h.gch
+-	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
++sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
++	-rm -f sdk.h.gch
++	$(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
+ 
+-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
+-	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+-	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
++sdk_precomp.h.gch: $(ALLHEADERS)
++	-rm -f sdk_precomp.h.gch
++	$(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+ 
+ clean-local:
+-	-rm -f $(top_builddir)/src/include/sdk.h.gch
+-	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
++	-rm -f sdk.h.gch
++	-rm -f sdk_precomp.h.gch
+ 
+ EXTRA_DIST = autorevision.h
+#--- src/include/Makefile.in.orig
+#+++ src/include/Makefile.in
+#@@ -362,10 +362,11 @@ top_builddir = @top_builddir@
+# top_srcdir = @top_srcdir@
+# SUBDIRS = scripting tinyxml
+# @PRECOMPILE_HEADERS_FALSE at BUILT_SOURCES = 
+#- at PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
+#- at PRECOMPILE_HEADERS_TRUE@		$(top_builddir)/src/include/sdk_precomp.h.gch
+#+ at PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = sdk.h.gch \
+#+ at PRECOMPILE_HEADERS_TRUE@		sdk_precomp.h.gch
+# 
+# AM_CPPFLAGS = $(WX_CXXFLAGS) \
+#+			-I$(top_builddir)/src/include \
+# 			-I$(top_srcdir)/src/include \
+# 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
+# 			-I$(top_srcdir)/src/include/tinyxml \
+#@@ -929,17 +930,17 @@ uninstall-am: uninstall-sdkHEADERS
+# 	uninstall-sdkHEADERS
+# 
+# 
+#-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
+#-	-rm -f $(top_builddir)/src/include/sdk.h.gch
+#-	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
+#+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
+#+	-rm -f sdk.h.gch
+#+	$(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
+# 
+#-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
+#-	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+#-	$(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+#+sdk_precomp.h.gch: $(ALLHEADERS)
+#+	-rm -f sdk_precomp.h.gch
+#+	$(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+# 
+# clean-local:
+#-	-rm -f $(top_builddir)/src/include/sdk.h.gch
+#-	-rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+#+	-rm -f sdk.h.gch
+#+	-rm -f sdk_precomp.h.gch
+# 
+# # Tell versions [3.59,3.63) of GNU make to not export all variables.
+# # Otherwise a system limit (for SysV at least) may be exceeded.

Deleted: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,25 +0,0 @@
-https://sourceforge.net/p/codeblocks/tickets/8/
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19139&group_id=5358
-
-This patch might not work with wxGTK, but it's needed for wxMAC and wxOSX (2.8 and 3.0).
-It needs to be fixed upstream, but a better patch is needed to deal with the problem.
-See also http://docs.wxwidgets.org/2.9.5/overview_bitmap.html
-
---- src/plugins/contrib/NassiShneiderman/NassiView.cpp.orig
-+++ src/plugins/contrib/NassiShneiderman/NassiView.cpp
-@@ -1048,15 +1048,9 @@
- 
-     if ( dataptr )
-     {
--        #if defined(__WXMSW__)
-             wxCursor copycursor(dnd_copy_cur_xpm);
-             wxCursor movecursor(dnd_move_cur_xpm);
-             wxCursor nonecursor(dnd_none_cur_xpm);
--        #else
--            wxIcon copycursor(dnd_copy_cur_xpm);
--            wxIcon movecursor(dnd_move_cur_xpm);
--            wxIcon nonecursor(dnd_none_cur_xpm);
--        #endif
-         //wxDragResult result;
- 
-         wxDropSource dndSource(m_diagramwindow, copycursor, movecursor, nonecursor);

Deleted: trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,12 +0,0 @@
-Fixed upstream in https://sourceforge.net/p/codeblocks/code/9504/
---- src/sdk/wxscintilla/src/scintilla/src/CallTip.h.orig
-+++ src/sdk/wxscintilla/src/scintilla/src/CallTip.h
-@@ -8,6 +8,8 @@
- #ifndef CALLTIP_H
- #define CALLTIP_H
- 
-+#include <string>
-+
- #ifdef SCI_NAMESPACE
- namespace Scintilla {
- #endif

Deleted: trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff	2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff	2015-05-02 19:22:21 UTC (rev 135776)
@@ -1,14 +0,0 @@
-https://sourceforge.net/p/codeblocks/tickets/12/
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=19136&group_id=5358
-https://trac.macports.org/ticket/40531
---- src/src/Makefile.in.orig
-+++ src/src/Makefile.in
-@@ -416,7 +416,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
- 
- # wxAUI uses GTK+ libraries on wxGTK
- # codeblocks_LDFLAGS = $(WX_GTK2_LIBS)
--codeblocks_LDADD = ../sdk/libcodeblocks.la \
-+codeblocks_LDADD = ../sdk/.libs/libcodeblocks.dylib \
- 			$(WX_LIBS) \
- 			$(WX_GTK2_LIBS)
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150502/e2fb1111/attachment-0001.html>


More information about the macports-changes mailing list