- Add USES=libtool and INSTALL_TARGET=install-strip

- Use USE_CXXSTD

2 files changed, 18 insertions, 73 deletions

diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 7c5261b3f7ea..a3cd3597e415 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	codeblocks
 PORTVERSION=	13.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/Sources/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}-1
@@ -19,23 +19,24 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		librsync.so:${PORTSDIR}/net/librsync
 
-USES=		compiler desktop-file-utils fam:gamin pathfix pkgconfig shared-mime-info
+USES=		compiler desktop-file-utils fam:gamin libtool pathfix \
+		pkgconfig shared-mime-info
 USE_WX=		2.8
 WANT_UNICODE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG} --with-contrib-plugins=all
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 .if ${CHOSEN_COMPILER_TYPE} == clang
-CXXFLAGS+=	-std=c++0x
+USE_CXXSTD=	c++11
 .endif
 
-CONFIGURE_ARGS+=	--with-wx-config=${WX_CONFIG} --with-contrib-plugins=all
-
 .include <bsd.port.post.mk>
diff --git a/devel/codeblocks/pkg-plist b/devel/codeblocks/pkg-plist
index 50582db5dee5..14fda2608067 100644
--- a/devel/codeblocks/pkg-plist
+++ b/devel/codeblocks/pkg-plist
@@ -325,148 +325,92 @@ include/wxsmith/wxwidgets/wxwidgetsguiappadoptingdlg.h
 include/wxsmith/wxwidgets/wxwidgetsguiconfigpanel.h
 include/wxsmith/wxwidgets/wxwidgetsres.h
 include/wxsmith/wxwidgets/wxwidgetsresfactory.h
-lib/codeblocks/plugins/libAutoVersioning.la
 lib/codeblocks/plugins/libAutoVersioning.so
-lib/codeblocks/plugins/libBrowseTracker.la
 lib/codeblocks/plugins/libBrowseTracker.so
-lib/codeblocks/plugins/libCccc.la
 lib/codeblocks/plugins/libCccc.so
-lib/codeblocks/plugins/libCppCheck.la
 lib/codeblocks/plugins/libCppCheck.so
-lib/codeblocks/plugins/libCscope.la
 lib/codeblocks/plugins/libCscope.so
-lib/codeblocks/plugins/libDoxyBlocks.la
 lib/codeblocks/plugins/libDoxyBlocks.so
-lib/codeblocks/plugins/libEditorConfig.la
 lib/codeblocks/plugins/libEditorConfig.so
-lib/codeblocks/plugins/libEditorTweaks.la
 lib/codeblocks/plugins/libEditorTweaks.so
-lib/codeblocks/plugins/libFileManager.la
 lib/codeblocks/plugins/libFileManager.so
-lib/codeblocks/plugins/libHexEditor.la
 lib/codeblocks/plugins/libHexEditor.so
-lib/codeblocks/plugins/libIncrementalSearch.la
 lib/codeblocks/plugins/libIncrementalSearch.so
-lib/codeblocks/plugins/libMouseSap.la
 lib/codeblocks/plugins/libMouseSap.so
-lib/codeblocks/plugins/libNassiShneiderman.la
 lib/codeblocks/plugins/libNassiShneiderman.so
-lib/codeblocks/plugins/libProfiler.la
 lib/codeblocks/plugins/libProfiler.so
-lib/codeblocks/plugins/libRegExTestbed.la
 lib/codeblocks/plugins/libRegExTestbed.so
-lib/codeblocks/plugins/libReopenEditor.la
 lib/codeblocks/plugins/libReopenEditor.so
-lib/codeblocks/plugins/libSmartIndentCpp.la
 lib/codeblocks/plugins/libSmartIndentCpp.so
-lib/codeblocks/plugins/libSmartIndentFortran.la
 lib/codeblocks/plugins/libSmartIndentFortran.so
-lib/codeblocks/plugins/libSmartIndentHDL.la
 lib/codeblocks/plugins/libSmartIndentHDL.so
-lib/codeblocks/plugins/libSmartIndentLua.la
 lib/codeblocks/plugins/libSmartIndentLua.so
-lib/codeblocks/plugins/libSmartIndentPascal.la
 lib/codeblocks/plugins/libSmartIndentPascal.so
-lib/codeblocks/plugins/libSmartIndentPython.la
 lib/codeblocks/plugins/libSmartIndentPython.so
-lib/codeblocks/plugins/libSmartIndentXML.la
 lib/codeblocks/plugins/libSmartIndentXML.so
-lib/codeblocks/plugins/libSpellChecker.la
 lib/codeblocks/plugins/libSpellChecker.so
-lib/codeblocks/plugins/libSymTab.la
 lib/codeblocks/plugins/libSymTab.so
-lib/codeblocks/plugins/libThreadSearch.la
 lib/codeblocks/plugins/libThreadSearch.so
-lib/codeblocks/plugins/libToolsPlus.la
 lib/codeblocks/plugins/libToolsPlus.so
-lib/codeblocks/plugins/libValgrind.la
 lib/codeblocks/plugins/libValgrind.so
-lib/codeblocks/plugins/libabbreviations.la
 lib/codeblocks/plugins/libabbreviations.so
-lib/codeblocks/plugins/libastyle.la
 lib/codeblocks/plugins/libastyle.so
-lib/codeblocks/plugins/libautosave.la
 lib/codeblocks/plugins/libautosave.so
-lib/codeblocks/plugins/libbyogames.la
 lib/codeblocks/plugins/libbyogames.so
-lib/codeblocks/plugins/libcb_koders.la
 lib/codeblocks/plugins/libcb_koders.so
-lib/codeblocks/plugins/libclasswizard.la
 lib/codeblocks/plugins/libclasswizard.so
-lib/codeblocks/plugins/libcodecompletion.la
 lib/codeblocks/plugins/libcodecompletion.so
-lib/codeblocks/plugins/libcodesnippets.la
 lib/codeblocks/plugins/libcodesnippets.so
-lib/codeblocks/plugins/libcodestat.la
 lib/codeblocks/plugins/libcodestat.so
-lib/codeblocks/plugins/libcompiler.la
 lib/codeblocks/plugins/libcompiler.so
-lib/codeblocks/plugins/libcopystrings.la
 lib/codeblocks/plugins/libcopystrings.so
-lib/codeblocks/plugins/libdebugger.la
 lib/codeblocks/plugins/libdebugger.so
-lib/codeblocks/plugins/libdefaultmimehandler.la
 lib/codeblocks/plugins/libdefaultmimehandler.so
-lib/codeblocks/plugins/libdragscroll.la
 lib/codeblocks/plugins/libdragscroll.so
-lib/codeblocks/plugins/libenvvars.la
 lib/codeblocks/plugins/libenvvars.so
-lib/codeblocks/plugins/libexporter.la
 lib/codeblocks/plugins/libexporter.so
-lib/codeblocks/plugins/libheaderfixup.la
 lib/codeblocks/plugins/libheaderfixup.so
-lib/codeblocks/plugins/libhelp_plugin.la
 lib/codeblocks/plugins/libhelp_plugin.so
-lib/codeblocks/plugins/libkeybinder.la
 lib/codeblocks/plugins/libkeybinder.so
-lib/codeblocks/plugins/liblib_finder.la
 lib/codeblocks/plugins/liblib_finder.so
-lib/codeblocks/plugins/liboccurrenceshighlighting.la
 lib/codeblocks/plugins/liboccurrenceshighlighting.so
-lib/codeblocks/plugins/libopenfileslist.la
 lib/codeblocks/plugins/libopenfileslist.so
-lib/codeblocks/plugins/libprojectsimporter.la
 lib/codeblocks/plugins/libprojectsimporter.so
-lib/codeblocks/plugins/libscriptedwizard.la
 lib/codeblocks/plugins/libscriptedwizard.so
-lib/codeblocks/plugins/libtodo.la
 lib/codeblocks/plugins/libtodo.so
-lib/codeblocks/plugins/libwxSmithAui.la
 lib/codeblocks/plugins/libwxSmithAui.so
-lib/codeblocks/plugins/libwxsmith.la
 lib/codeblocks/plugins/libwxsmith.so
-lib/codeblocks/plugins/libwxsmithcontribitems.la
 lib/codeblocks/plugins/libwxsmithcontribitems.so
-lib/codeblocks/wxContribItems/libwxchartctrl.la
 lib/codeblocks/wxContribItems/libwxchartctrl.so
 lib/codeblocks/wxContribItems/libwxchartctrl.so.0
-lib/codeblocks/wxContribItems/libwxcustombutton.la
+lib/codeblocks/wxContribItems/libwxchartctrl.so.0.0.1
 lib/codeblocks/wxContribItems/libwxcustombutton.so
 lib/codeblocks/wxContribItems/libwxcustombutton.so.0
-lib/codeblocks/wxContribItems/libwxflatnotebook.la
+lib/codeblocks/wxContribItems/libwxcustombutton.so.0.0.1
 lib/codeblocks/wxContribItems/libwxflatnotebook.so
 lib/codeblocks/wxContribItems/libwxflatnotebook.so.0
-lib/codeblocks/wxContribItems/libwximagepanel.la
+lib/codeblocks/wxContribItems/libwxflatnotebook.so.0.0.1
 lib/codeblocks/wxContribItems/libwximagepanel.so
 lib/codeblocks/wxContribItems/libwximagepanel.so.0
-lib/codeblocks/wxContribItems/libwxkwic.la
+lib/codeblocks/wxContribItems/libwximagepanel.so.0.0.1
 lib/codeblocks/wxContribItems/libwxkwic.so
 lib/codeblocks/wxContribItems/libwxkwic.so.0
-lib/codeblocks/wxContribItems/libwxled.la
+lib/codeblocks/wxContribItems/libwxkwic.so.0.0.1
 lib/codeblocks/wxContribItems/libwxled.so
 lib/codeblocks/wxContribItems/libwxled.so.0
-lib/codeblocks/wxContribItems/libwxspeedbutton.la
+lib/codeblocks/wxContribItems/libwxled.so.0.0.1
 lib/codeblocks/wxContribItems/libwxspeedbutton.so
 lib/codeblocks/wxContribItems/libwxspeedbutton.so.0
-lib/codeblocks/wxContribItems/libwxtreelist.la
+lib/codeblocks/wxContribItems/libwxspeedbutton.so.0.0.1
 lib/codeblocks/wxContribItems/libwxtreelist.so
 lib/codeblocks/wxContribItems/libwxtreelist.so.0
-lib/libcodeblocks.la
+lib/codeblocks/wxContribItems/libwxtreelist.so.0.0.1
 lib/libcodeblocks.so
 lib/libcodeblocks.so.0
-lib/libwxsmithlib.la
+lib/libcodeblocks.so.0.0.1
 lib/libwxsmithlib.so
 lib/libwxsmithlib.so.0
+lib/libwxsmithlib.so.0.0.1
 libdata/pkgconfig/cb_wxKWIC.pc
 libdata/pkgconfig/cb_wxchartctrl.pc
 libdata/pkgconfig/cb_wxcontrib.pc