[136514] trunk/dports/devel/codeblocks
mojca at macports.org
mojca at macports.org
Tue May 19 23:03:25 PDT 2015
Revision: 136514
https://trac.macports.org/changeset/136514
Author: mojca at macports.org
Date: 2015-05-19 23:03:24 -0700 (Tue, 19 May 2015)
Log Message:
-----------
codeblocks: upgrade to the latest version from SVN (patches integrated upstream)
Modified Paths:
--------------
trunk/dports/devel/codeblocks/Portfile
trunk/dports/devel/codeblocks/files/README
trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp
Removed Paths:
-------------
trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff
trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/Portfile 2015-05-20 06:03:24 UTC (rev 136514)
@@ -2,24 +2,25 @@
# $Id$
PortSystem 1.0
+PortGroup github 1.0
PortGroup wxWidgets 1.0
+# alternative unofficial mirror to allow fetching from a tarball
+# or: https://cgit.jenslody.de/codeblocks/snapshot/codeblocks-<checksum>.tar.xz
+github.setup obfuscated codeblocks_sf 33d975c
name codeblocks
version 13.12
-# set release 1
-revision 2
+revision 3
-fetch.type svn
-svn.url https://svn.code.sf.net/p/codeblocks/code/trunk
-svn.revision 10251
-worksrcdir trunk
+# fetch.type svn
+# svn.url https://svn.code.sf.net/p/codeblocks/code/trunk
+# svn.revision 10305
+# 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+
+license_noconflict boost
# I'm looking for a volunteer to take the port over
maintainers mojca openmaintainer
description Open Source, Cross-platform, Free C/C++/D IDE
@@ -29,13 +30,10 @@
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
+checksums rmd160 9af61b95628df2cbab91335f51f2402444c1e64c \
+ sha256 730be0560e57e9b3de8e7ad29f90e6794b6ba78bfc6429e49439c4975b178d02
+
depends_build port:autoconf \
port:automake \
port:libtool \
@@ -44,12 +42,8 @@
depends_lib port:boost \
port:hunspell
-patchfiles patch-configure-malloc.diff \
- patch-src-include-Makefile.diff
+patchfiles patch-sdk-configmanager.cpp
-# not sure what this patch was used for
-# patch-sdk-configmanager.cpp
-
use_autoconf yes
autoconf.cmd ./bootstrap
@@ -118,21 +112,15 @@
variant wxwidgets30 conflicts wxwidgets28 wxgtk30 wxgtk28 description {Use Cocoa-based wxWidgets 3.0} {
wxWidgets.use wxWidgets-3.0
depends_lib-append port:${wxWidgets.port}
- post-patch {
- file mkdir "${worksrcpath}/m4"
- file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
- }
+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
configure.args-append --with-wxdir=${wxWidgets.wxdir}
}
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}
+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
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}
@@ -142,20 +130,14 @@
variant wxgtk30 conflicts wxwidgets30 wxwidgets28 wxgtk28 description {Use wxWidgets 3.0 with GTK} {
wxWidgets.use wxGTK-3.0
depends_lib-append port:${wxWidgets.port}
+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
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"
- }
+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
configure.args-append --with-wxdir=${wxWidgets.wxdir}
}
Modified: trunk/dports/devel/codeblocks/files/README
===================================================================
--- trunk/dports/devel/codeblocks/files/README 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/README 2015-05-20 06:03:24 UTC (rev 136514)
@@ -1,10 +1,7 @@
Summary of issues that need to be properly fixed upstream:
- * https://sourceforge.net/p/codeblocks/tickets/11/
- patch-configure-malloc.diff
- * test for sys/malloc.h instead of malloc.h
+ (currently none)
-Patches written by afb (review and submit upstream):
- * patch-src-include-Makefile.diff
+Patches written by afb (submit upstream):
* patch-sdk-configmanager.cpp
See also:
Deleted: trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2015-05-20 06:03:24 UTC (rev 136514)
@@ -1,24 +0,0 @@
-https://sourceforge.net/p/codeblocks/tickets/11/
-
-#--- 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])
-
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
Modified: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2015-05-20 06:03:24 UTC (rev 136514)
@@ -1,16 +1,18 @@
written by afb
+properly sets the directory where CB looks for plugins
+
--- src/sdk/configmanager.cpp.orig
+++ src/sdk/configmanager.cpp
-@@ -1442,8 +1442,10 @@ void ConfigManager::InitPaths()
+@@ -1504,8 +1504,10 @@ void ConfigManager::InitPaths()
#ifdef CB_AUTOCONF
if (plugin_path_global.IsEmpty())
{
-- if(platform::windows || platform::macosx)
-+ if(platform::windows)
+- if (platform::windows || platform::macosx)
++ if (platform::windows)
ConfigManager::plugin_path_global = data_path_global;
-+ else if(platform::macosx)
++ else if (platform::macosx)
+ ConfigManager::plugin_path_global = res_path + _T("/lib/codeblocks/plugins");
else
{
- ConfigManager::plugin_path_global = wxStandardPathsBase::Get().GetPluginsDir() + _T("/plugins");
+ // It seems we can not longer rely on wxStandardPathsBase::Get().GetPluginsDir(),
Deleted: trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff 2015-05-20 06:03:24 UTC (rev 136514)
@@ -1,88 +0,0 @@
-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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150519/8b27f641/attachment.html>
More information about the macports-changes
mailing list