pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

codelite: First functional version on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jun 15 22:16:49 2016 +0200
Changeset:	7367607310745b441d728326bd95ef18e684b481

Modified Files:
	codelite/Makefile
	codelite/PLIST
	codelite/distinfo
	qtcreator/Makefile
Added Files:
	codelite/patches/patch-CMakeLists.txt
	codelite/patches/patch-CodeLite_CMakeLists.txt
	codelite/patches/patch-CodeLite_unixprocess__impl.cpp
	codelite/patches/patch-LiteEditor_CMakeLists.txt
	codelite/patches/patch-Plugin_CMakeLists.txt
	codelite/patches/patch-Plugin_wxterminal.cpp
	codelite/patches/patch-codelite__terminal_MainFrame.cpp
	codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp

Log Message:
codelite: First functional version on NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7367607310745b441d728326bd95ef18e684b481

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 codelite/Makefile                                  |  39 ++-
 codelite/PLIST                                     | 286 +++++++++++++++++++++
 codelite/distinfo                                  |   8 +
 codelite/patches/patch-CMakeLists.txt              |  21 ++
 codelite/patches/patch-CodeLite_CMakeLists.txt     |  13 +
 .../patches/patch-CodeLite_unixprocess__impl.cpp   |  15 ++
 codelite/patches/patch-LiteEditor_CMakeLists.txt   |  32 +++
 codelite/patches/patch-Plugin_CMakeLists.txt       |  13 +
 codelite/patches/patch-Plugin_wxterminal.cpp       |  24 ++
 .../patches/patch-codelite__terminal_MainFrame.cpp |  16 ++
 .../patch-codelite__terminal_unixprocess__impl.cpp |  15 ++
 qtcreator/Makefile                                 |   6 +-
 12 files changed, 484 insertions(+), 4 deletions(-)

diffs:
diff --git a/codelite/Makefile b/codelite/Makefile
index f0064a5..53b916f 100644
--- a/codelite/Makefile
+++ b/codelite/Makefile
@@ -12,8 +12,45 @@ LICENSE=	gnu-gpl-v2
 USE_CMAKE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config bash
 
+CMAKE_ARGS+=		-DPREFIX:STRING=${PREFIX}
+#CMAKE_ARGS.FreeBSD+=	-DIS_FREEBSD:STRING=1
+#CMAKE_ARGS.NetBSD+=	-DIS_NETBSD:STRING=1
+#CMAKE_ARGS+=		-DIS_NETBSD:BOOL=ON
+
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Enable NetBSD
+SUBST_FILES.fix-paths=		CMakeLists.txt
+SUBST_SED.fix-paths+=		-e 's,IS_NETBSD 0,IS_NETBSD 1,g'
+
+SUBST_CLASSES+=			fix-bash
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fix bash path
+SUBST_FILES.fix-paths=		CodeLite/TerminalEmulator.cpp CodeLite/fileextmanager.cpp Runtime/codelite_xterm cmake/Modules/OSXInstall.cmake
+SUBST_SED.fix-paths+=		-e 's,/bin/bash,${BASH},g'
+
+REPLACE_BASH+=		Runtime/clg++
+REPLACE_BASH+=		Runtime/clgcc
+REPLACE_BASH+=		Runtime/codelite_xterm
+REPLACE_BASH+=		codelite-icons-dark/pack-icons.sh
+REPLACE_BASH+=		codelite-icons-fresh-farm/pack-icons.sh
+REPLACE_BASH+=		codelite-icons/pack-icons.sh
+REPLACE_BASH+=		codelitephp/resources/pack-resources.sh
+REPLACE_BASH+=		make-weekly
+REPLACE_BASH+=		svgs/code-completion/convert-svg-to-png.sh
+REPLACE_BASH+=		svgs/convert-single-file.sh
+REPLACE_BASH+=		svgs/convert-svg-to-png.sh
+REPLACE_BASH+=		svgs/create-logo-root.sh
+REPLACE_BASH+=		svgs/create-logo.sh
+REPLACE_BASH+=		svgs/find-bar/convert-svg-to-png.sh
+
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/codelite
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
 .include "../../security/libssh/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/codelite/PLIST b/codelite/PLIST
index 48d96a5..7c0a226 100644
--- a/codelite/PLIST
+++ b/codelite/PLIST
@@ -1 +1,287 @@
 @comment $NetBSD$
+bin/codelite
+bin/codelite-cc
+bin/codelite-echo
+bin/codelite-make
+bin/codelite-terminal
+bin/codelite_cppcheck
+bin/codelite_exec
+bin/codelite_fix_files
+bin/codelite_indexer
+bin/codelite_kill_children
+bin/codelite_xterm
+lib/codelite/CMakePlugin.so
+lib/codelite/CallGraph.so
+lib/codelite/CodeFormatter.so
+lib/codelite/CodeLiteDiff.so
+lib/codelite/ContinuousBuild.so
+lib/codelite/Copyright.so
+lib/codelite/DatabaseExplorer.so
+lib/codelite/ExternalTools.so
+lib/codelite/HelpPlugin.so
+lib/codelite/MemCheck.so
+lib/codelite/Outline.so
+lib/codelite/QMakePlugin.so
+lib/codelite/SFTP.so
+lib/codelite/SnipWiz.so
+lib/codelite/SpellCheck.so
+lib/codelite/Subversion.so
+lib/codelite/Tweaks.so
+lib/codelite/UnitTestsPP.so
+lib/codelite/WebTools.so
+lib/codelite/Wizards.so
+lib/codelite/WordCompletion.so
+lib/codelite/ZoomNavigator.so
+lib/codelite/abbreviation.so
+lib/codelite/codelitephp.so
+lib/codelite/cppchecker.so
+lib/codelite/cscope.so
+lib/codelite/debuggers/DebuggerGDB.so
+lib/codelite/git.so
+lib/codelite/libdatabaselayersqlite.so
+lib/codelite/liblibcodelite.so
+lib/codelite/libplugin.so
+lib/codelite/libwxshapeframework.so
+lib/codelite/libwxsqlite3.so
+lib/codelite/wxFormBuilder.so
+man/man1/codelite-make.1
+man/man1/codelite.1
+man/man1/codelite_fix_files.1
+share/applications/codelite.desktop
+share/codelite/LICENSE
+share/codelite/PHP.zip
+share/codelite/astyle.sample
+share/codelite/codelite-bitmaps.zip
+share/codelite/codelite-icons-dark.zip
+share/codelite/codelite-icons-fresh-farm.zip
+share/codelite/codelite-icons.zip
+share/codelite/config/accelerators.conf.default
+share/codelite/config/build_settings.xml.default
+share/codelite/config/cfg/avr.cfg
+share/codelite/config/cfg/gtk.cfg
+share/codelite/config/cfg/posix.cfg
+share/codelite/config/cfg/qt.cfg
+share/codelite/config/cfg/sdl.cfg
+share/codelite/config/cfg/std.cfg
+share/codelite/config/cfg/windows.cfg
+share/codelite/config/codelite.xml.default
+share/codelite/config/debuggers.xml.default
+share/codelite/dics/en_GB.aff
+share/codelite/dics/en_GB.dic
+share/codelite/dics/en_US.aff
+share/codelite/dics/en_US.dic
+share/codelite/gdb_printers/boost/__init__.py
+share/codelite/gdb_printers/boost/printers.py
+share/codelite/gdb_printers/helper.py
+share/codelite/gdb_printers/libstdcxx/__init__.py
+share/codelite/gdb_printers/libstdcxx/v6/__init__.py
+share/codelite/gdb_printers/libstdcxx/v6/printers.py
+share/codelite/gdb_printers/qt4.py
+share/codelite/gdb_printers/wx.py
+share/codelite/images/common_tasks.png
+share/codelite/images/cubes.png
+share/codelite/images/help_earth.png
+share/codelite/images/plugin_not_ok.png
+share/codelite/images/plugin_ok.png
+share/codelite/images/recent_files.png
+share/codelite/images/recent_workspaces.png
+share/codelite/images/splashscreen.png
+share/codelite/images/splashscreen%2x.png@localhost
+share/codelite/javascript.zip
+share/codelite/lexers/lexers.json
+share/codelite/rc/menu.xrc
+share/codelite/resources/abbrev.png
+share/codelite/resources/compfile.png
+share/codelite/resources/connect_no.png
+share/codelite/resources/cppcheck.png
+share/codelite/resources/qt16_new.png
+share/codelite/resources/qt16_preferences.png
+share/codelite/resources/qt24_new.png
+share/codelite/resources/qt24_preferences.png
+share/codelite/resources/svn_diff.png
+share/codelite/resources/svn_settings.png
+share/codelite/resources/svn_ssh.png
+share/codelite/resources/wxfb_conflict.png
+share/codelite/resources/wxfb_modified.png
+share/codelite/resources/wxfb_ok.png
+share/codelite/templates/codedesigner/CDTemplate.cdp
+share/codelite/templates/codedesigner/HSCHTemplate.cdp
+share/codelite/templates/codedesigner/HSCHTemplateWithMain.cdp
+share/codelite/templates/codedesigner/SCHTemplate.cdp
+share/codelite/templates/codedesigner/SCHTemplateWithMain.cdp
+share/codelite/templates/databaselayer/dataClass.ctmp
+share/codelite/templates/databaselayer/dataClass.htmp
+share/codelite/templates/databaselayer/dataClass_dba.ctmp
+share/codelite/templates/databaselayer/dataClass_dba.htmp
+share/codelite/templates/databaselayer/dataClass_dbl.ctmp
+share/codelite/templates/databaselayer/dataClass_dbl.htmp
+share/codelite/templates/databaselayer/dataClass_wxdba.ctmp
+share/codelite/templates/databaselayer/dataClass_wxdba.htmp
+share/codelite/templates/databaselayer/viewClass.ctmp
+share/codelite/templates/databaselayer/viewClass.htmp
+share/codelite/templates/databaselayer/viewClass_dba.ctmp
+share/codelite/templates/databaselayer/viewClass_dba.htmp
+share/codelite/templates/databaselayer/viewClass_dbl.ctmp
+share/codelite/templates/databaselayer/viewClass_dbl.htmp
+share/codelite/templates/databaselayer/viewClass_wxdba.ctmp
+share/codelite/templates/databaselayer/viewClass_wxdba.htmp
+share/codelite/templates/formbuilder/DialogTemplate.fbp
+share/codelite/templates/formbuilder/DialogTemplateWithButtons.fbp
+share/codelite/templates/formbuilder/FrameTemplate.fbp
+share/codelite/templates/formbuilder/PanelTemplate.fbp
+share/codelite/templates/gizmos/CMakeLists.txt.plugin.wizard
+share/codelite/templates/gizmos/app.cpp.wizard
+share/codelite/templates/gizmos/app.h.wizard
+share/codelite/templates/gizmos/gui-dialog.cpp.wizard
+share/codelite/templates/gizmos/gui-dialog.fbp.wizard
+share/codelite/templates/gizmos/gui-dialog.h.wizard
+share/codelite/templates/gizmos/gui-frame.cpp.wizard
+share/codelite/templates/gizmos/gui-frame.fbp.wizard
+share/codelite/templates/gizmos/gui-frame.h.wizard
+share/codelite/templates/gizmos/liteeditor-plugin.project.wizard
+share/codelite/templates/gizmos/main-dialog.cpp.wizard
+share/codelite/templates/gizmos/main-dialog.h.wizard
+share/codelite/templates/gizmos/main-frame.cpp.wizard
+share/codelite/templates/gizmos/main-frame.h.wizard
+share/codelite/templates/gizmos/main.cpp.wizard
+share/codelite/templates/gizmos/mainframe.cpp.wizard
+share/codelite/templates/gizmos/mainframe.h.wizard
+share/codelite/templates/gizmos/plugin.cpp.wizard
+share/codelite/templates/gizmos/plugin.h.wizard
+share/codelite/templates/gizmos/resources.rc.wizard
+share/codelite/templates/gizmos/wx_pch.h.wizard
+share/codelite/templates/gizmos/wxmain.project.wizard
+share/codelite/templates/gizmos/wxproject-fb.project.wizard
+share/codelite/templates/gizmos/wxproject.project.wizard
+share/codelite/templates/projects/CMake_Executable/CMakeLists.txt
+share/codelite/templates/projects/CMake_Executable/CMake_Executable.project
+share/codelite/templates/projects/CMake_Executable/icon.png
+share/codelite/templates/projects/CMake_Executable/main.cpp
+share/codelite/templates/projects/ConsoleClang++/ConsoleClang++.project
+share/codelite/templates/projects/ConsoleClang++/main.cpp
+share/codelite/templates/projects/ConsoleClang/ConsoleClang.project
+share/codelite/templates/projects/ConsoleClang/main.c
+share/codelite/templates/projects/UnitTest++/UnitTest++.project
+share/codelite/templates/projects/UnitTest++/icon.png
+share/codelite/templates/projects/UnitTest++/main.cpp
+share/codelite/templates/projects/c_gtk24_template/c_gtk24_template.project
+share/codelite/templates/projects/c_gtk24_template/icon.png
+share/codelite/templates/projects/c_gtk24_template/main.c
+share/codelite/templates/projects/c_gtk3_template/c_gtk3_template.project
+share/codelite/templates/projects/c_gtk3_template/icon.png
+share/codelite/templates/projects/c_gtk3_template/main.c
+share/codelite/templates/projects/cobra-executableU/build-file
+share/codelite/templates/projects/cobra-executableU/cobra-executableU.project
+share/codelite/templates/projects/cobra-libraryU/cobra-library.project
+share/codelite/templates/projects/cobra-libraryU/lib-build-files
+share/codelite/templates/projects/cobra-staticU/build-file
+share/codelite/templates/projects/cobra-staticU/cobra-staticU.project
+share/codelite/templates/projects/cpp_gtkmm24_template/cpp_gtkmm24_template.project
+share/codelite/templates/projects/cpp_gtkmm24_template/icon.png
+share/codelite/templates/projects/cpp_gtkmm24_template/main.cpp
+share/codelite/templates/projects/cpp_gtkmm24_template/mainwindow.cpp
+share/codelite/templates/projects/cpp_gtkmm24_template/mainwindow.h
+share/codelite/templates/projects/cpp_gtkmm3_template/cpp_gtkmm3_template.project
+share/codelite/templates/projects/cpp_gtkmm3_template/icon.png
+share/codelite/templates/projects/cpp_gtkmm3_template/main.cpp
+share/codelite/templates/projects/cpp_gtkmm3_template/mainwindow.cpp
+share/codelite/templates/projects/cpp_gtkmm3_template/mainwindow.h
+share/codelite/templates/projects/custom-makefile/custom-makefile.project
+share/codelite/templates/projects/custom-makefile/icon.png
+share/codelite/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project
+share/codelite/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project.windows
+share/codelite/templates/projects/dynamic-library-wx-enabled/icon.png
+share/codelite/templates/projects/dynamic-library/dynamic-library.project
+share/codelite/templates/projects/dynamic-library/dynamic-library.project.windows
+share/codelite/templates/projects/dynamic-library/icon.png
+share/codelite/templates/projects/executable-cobra/executable-cobra.project
+share/codelite/templates/projects/executable-cobra/main.cobra
+share/codelite/templates/projects/executable-console-wx-enabled/executable-console-wx-enabled.project
+share/codelite/templates/projects/executable-console-wx-enabled/icon.png
+share/codelite/templates/projects/executable-console-wx-enabled/main.cpp
+share/codelite/templates/projects/executable-gcc/executable-gcc.project
+share/codelite/templates/projects/executable-gcc/icon.png
+share/codelite/templates/projects/executable-gcc/main.c
+share/codelite/templates/projects/executable-qt-enabled/executable-qt-enabled.project
+share/codelite/templates/projects/executable-qt-enabled/icon.png
+share/codelite/templates/projects/executable-qt-enabled/main.cpp
+share/codelite/templates/projects/executable-qt-qmake-enabled/executable-qt-qmake-enabled.project
+share/codelite/templates/projects/executable-qt-qmake-enabled/icon.png
+share/codelite/templates/projects/executable-qt-qmake-enabled/main.cpp
+share/codelite/templates/projects/executable-wx-dialog/executable-wx-dialog.project
+share/codelite/templates/projects/executable-wx-dialog/gui.cpp
+share/codelite/templates/projects/executable-wx-dialog/gui.fbp
+share/codelite/templates/projects/executable-wx-dialog/gui.h
+share/codelite/templates/projects/executable-wx-dialog/icon.png
+share/codelite/templates/projects/executable-wx-dialog/main.cpp
+share/codelite/templates/projects/executable-wx-dialog/main.h
+share/codelite/templates/projects/executable-wx-dialog/win_resources.rc
+share/codelite/templates/projects/executable-wx-enabled/executable-wx-enabled.project
+share/codelite/templates/projects/executable-wx-enabled/icon.png
+share/codelite/templates/projects/executable-wx-enabled/main.cpp
+share/codelite/templates/projects/executable-wx-frame/executable-wx-frame.project
+share/codelite/templates/projects/executable-wx-frame/gui.cpp
+share/codelite/templates/projects/executable-wx-frame/gui.fbp
+share/codelite/templates/projects/executable-wx-frame/gui.h
+share/codelite/templates/projects/executable-wx-frame/icon.png
+share/codelite/templates/projects/executable-wx-frame/main.cpp
+share/codelite/templates/projects/executable-wx-frame/main.h
+share/codelite/templates/projects/executable-wx-frame/win_resources.rc
+share/codelite/templates/projects/executable-wx-xrc/executable-wx-xrc.project
+share/codelite/templates/projects/executable-wx-xrc/gui.wxcp
+share/codelite/templates/projects/executable-wx-xrc/gui.xrc
+share/codelite/templates/projects/executable-wx-xrc/icon.png
+share/codelite/templates/projects/executable-wx-xrc/main.cpp
+share/codelite/templates/projects/executable-wx-xrc/main.h
+share/codelite/templates/projects/executable-wxcrafter-dialog/MainDialog.cpp
+share/codelite/templates/projects/executable-wxcrafter-dialog/MainDialog.h
+share/codelite/templates/projects/executable-wxcrafter-dialog/icon.png
+share/codelite/templates/projects/executable-wxcrafter-dialog/main.cpp
+share/codelite/templates/projects/executable-wxcrafter-dialog/win_resources.rc
+share/codelite/templates/projects/executable-wxcrafter-dialog/wxCrafter_MainDialog.project
+share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp
+share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.h
+share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.wxcp
+share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter_bitmaps.cpp
+share/codelite/templates/projects/executable-wxcrafter-frame/MainFrame.cpp
+share/codelite/templates/projects/executable-wxcrafter-frame/MainFrame.h
+share/codelite/templates/projects/executable-wxcrafter-frame/icon.png
+share/codelite/templates/projects/executable-wxcrafter-frame/main.cpp
+share/codelite/templates/projects/executable-wxcrafter-frame/win_resources.rc
+share/codelite/templates/projects/executable-wxcrafter-frame/wxCrafter_MainFrame.project
+share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp
+share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.h
+share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.wxcp
+share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter_bitmaps.cpp
+share/codelite/templates/projects/executable/executable.project
+share/codelite/templates/projects/executable/icon.png
+share/codelite/templates/projects/executable/main.cpp
+share/codelite/templates/projects/non-code-project/icon.png
+share/codelite/templates/projects/non-code-project/non-code.project
+share/codelite/templates/projects/static-library-wx-enabled/icon.png
+share/codelite/templates/projects/static-library-wx-enabled/main.cpp
+share/codelite/templates/projects/static-library-wx-enabled/static-library-wx-enabled.project
+share/codelite/templates/projects/static-library/icon.png
+share/codelite/templates/projects/static-library/static-library.project
+share/codelite/templates/projects/vc-dynamic-library/icon.png
+share/codelite/templates/projects/vc-dynamic-library/vc-dynamic-library.project
+share/codelite/templates/projects/vc-executable/icon.png
+share/codelite/templates/projects/vc-executable/vc-executable.project
+share/codelite/templates/projects/vc-static-lib/icon.png
+share/codelite/templates/projects/vc-static-lib/vc-static-lib.project
+share/codelite/templates/projects/wxWidgets_ConsoleApp/icon.png
+share/codelite/templates/projects/wxWidgets_ConsoleApp/main_app.cpp
+share/codelite/templates/projects/wxWidgets_ConsoleApp/main_app.h
+share/codelite/templates/projects/wxWidgets_ConsoleApp/wxWidgets_ConsoleApp.project
+share/codelite/templates/qmake/qmake.project
+share/codelite/unittest++1.3.tar.gz
+share/icons/hicolor/128x128/apps/codelite.png
+share/icons/hicolor/128x128@2x/apps/codelite.png
+share/icons/hicolor/256x256/apps/codelite.png
+share/icons/hicolor/256x256@2x/apps/codelite.png
+share/icons/hicolor/32x32/apps/codelite.png
+share/icons/hicolor/32x32@2x/apps/codelite.png
+share/icons/hicolor/64x64/apps/codelite.png
+share/icons/hicolor/64x64@2x/apps/codelite.png
+share/locale/cs/LC_MESSAGES/codelite.mo
+share/locale/zh_CN/LC_MESSAGES/codelite.mo
diff --git a/codelite/distinfo b/codelite/distinfo
index 9f05502..aa92ffd 100644
--- a/codelite/distinfo
+++ b/codelite/distinfo
@@ -4,5 +4,13 @@ SHA1 (codelite-9.1.tar.gz) = a177e3c04612d96918361fcaae226e23f68be90a
 RMD160 (codelite-9.1.tar.gz) = b0ccb31eeadc5a342eba3a562044131868f7ceca
 SHA512 (codelite-9.1.tar.gz) = e7caa895c5ba62def98a50a46132940f7135c77ebe3d2fce7f1d83755ed6ce7dfc6aeb013a665b28eb969afcc1004f49284a253297d2317e72bda5f3945ce978
 Size (codelite-9.1.tar.gz) = 90366396 bytes
+SHA1 (patch-CMakeLists.txt) = 36ad3d4f4e7a5a403efd4ca4423bd24a68d8d6f5
+SHA1 (patch-CodeLite_CMakeLists.txt) = 1b0dcb63554e870cdaf9e50e2c62f0fa6924c1ff
+SHA1 (patch-CodeLite_unixprocess__impl.cpp) = 9be6ddaf272cd640f526f0e48a6719f4bf263951
+SHA1 (patch-LiteEditor_CMakeLists.txt) = fd76ae1859ee11fbb1005d68acedef8eba9447c2
+SHA1 (patch-Plugin_CMakeLists.txt) = 26f12d9c6eb45dc952c24347de22fe4107e85706
+SHA1 (patch-Plugin_wxterminal.cpp) = 563a79a304c75a5ea145a413d2e9ec037d3b5f28
+SHA1 (patch-codelite__terminal_MainFrame.cpp) = d1383b2a98b73cb4fb870a3699253e203c2110e6
+SHA1 (patch-codelite__terminal_unixprocess__impl.cpp) = 3eea7daede60595e1a561bfdf190832250719176
 SHA1 (patch-sdk_codelite__indexer_libctags_read.c) = 058871e134c0a5e112104a5095d3bed62e70f42a
 SHA1 (patch-sdk_wxsqlite3_configure) = 212eb522fe97a9d44f04fe183087210ac8c34372
diff --git a/codelite/patches/patch-CMakeLists.txt b/codelite/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..a1dc2ba
--- /dev/null
+++ b/codelite/patches/patch-CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2016-01-30 10:49:18.000000000 +0000
++++ CMakeLists.txt
+@@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 2.8 FATAL
+ ##      -DENABLE_LLDB=1|0                          // When set to 0 codelite won't try to build or link to the lldb debugger. Default is 1 on Unix platforms    #
+ #################################################################################################################################################################
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
++set (CMAKE_MODULE_PATH "/tmp/pkgsrc-tmp/wip/codelite/work/.buildlink/cmake-Modules" "/tmp/pkgsrc-tmp/wip/codelite/work/.buildlink/cmake-Modules" "/tmp/pkgsrc-tmp/wip/codelite/work/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+ 
+ #############################################
+ ## Defaults
+@@ -59,6 +59,7 @@ endif()
+ 
+ set( USE_CLANG 1 )
+ set( IS_FREEBSD 0 )
++set( IS_NETBSD 1 )
+ set( BUILD_WXC 0 )
+ set( CL_COPY_WX_LIBS 0 )
+ set( WITH_SFTP 1 )
diff --git a/codelite/patches/patch-CodeLite_CMakeLists.txt b/codelite/patches/patch-CodeLite_CMakeLists.txt
new file mode 100644
index 0000000..0a11732
--- /dev/null
+++ b/codelite/patches/patch-CodeLite_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- CodeLite/CMakeLists.txt.orig	2016-01-30 10:49:18.000000000 +0000
++++ CodeLite/CMakeLists.txt
+@@ -60,6 +60,8 @@ set( ADDITIONAL_LIBRARIES "" )
+ if (UNIX)
+     if ( IS_FREEBSD )
+         set(ADDITIONAL_LIBRARIES "-lkvm")
++    elseif ( IS_NETBSD )
++        set(ADDITIONAL_LIBRARIES "")
+     elseif ( UNIX AND NOT APPLE )
+         set(ADDITIONAL_LIBRARIES "-ldl -lutil")
+     else ( )
diff --git a/codelite/patches/patch-CodeLite_unixprocess__impl.cpp b/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
new file mode 100644
index 0000000..f6e570b
--- /dev/null
+++ b/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- CodeLite/unixprocess_impl.cpp.orig	2016-01-30 10:49:18.000000000 +0000
++++ CodeLite/unixprocess_impl.cpp
+@@ -44,6 +44,10 @@
+ #include <sys/ioctl.h>
+ #include <termios.h>
+ #include <libutil.h>
++#elif defined(__NetBSD__)
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <util.h>
+ #else
+ #include <pty.h>
+ #include <utmp.h>
diff --git a/codelite/patches/patch-LiteEditor_CMakeLists.txt b/codelite/patches/patch-LiteEditor_CMakeLists.txt
new file mode 100644
index 0000000..dc74deb
--- /dev/null
+++ b/codelite/patches/patch-LiteEditor_CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD$
+
+--- LiteEditor/CMakeLists.txt.orig	2016-01-30 10:49:18.000000000 +0000
++++ LiteEditor/CMakeLists.txt
+@@ -14,6 +14,9 @@ include( "${wxWidgets_USE_FILE}" )
+ # Include paths
+ include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
+ 
++# GNU dirs
++include(GNUInstallDirs)
++
+ ## On UNIX we require GTK
+ if (UNIX AND NOT APPLE)
+     if (GTK_VERSION EQUAL 3)
+@@ -68,6 +71,8 @@ set( ADDITIONAL_LIBRARIES "" )
+ if (UNIX)
+     if ( IS_FREEBSD )
+         set(ADDITIONAL_LIBRARIES "-lkvm")
++    elseif ( IS_NETBSD )
++        set(ADDITIONAL_LIBRARIES "")
+     elseif ( UNIX AND NOT APPLE )
+         set(ADDITIONAL_LIBRARIES "-ldl -lutil -lgobject-2.0")
+     else ( )
+@@ -112,7 +117,7 @@ if(NOT APPLE)
+ 
+     ## Manual pages
+     if(UNIX AND NOT APPLE)
+-        install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_PREFIX}/share/man)
++        install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_PREFIX}/${CMAKE_INSTALL_MANDIR})
+     endif()
+ 
+     ## Copy default configuration files
diff --git a/codelite/patches/patch-Plugin_CMakeLists.txt b/codelite/patches/patch-Plugin_CMakeLists.txt
new file mode 100644
index 0000000..ba4c6c9
--- /dev/null
+++ b/codelite/patches/patch-Plugin_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Plugin/CMakeLists.txt.orig	2016-01-30 10:49:18.000000000 +0000
++++ Plugin/CMakeLists.txt
+@@ -64,6 +64,8 @@ set( ADDITIONAL_LIBRARIES "" )
+ if (UNIX)
+     if ( IS_FREEBSD )
+         set(ADDITIONAL_LIBRARIES "-lkvm")
++    elseif ( IS_NETBSD )
++        set(ADDITIONAL_LIBRARIES "")
+     elseif ( UNIX AND NOT APPLE )
+         set(ADDITIONAL_LIBRARIES "-ldl -lutil")
+     else ( )
diff --git a/codelite/patches/patch-Plugin_wxterminal.cpp b/codelite/patches/patch-Plugin_wxterminal.cpp
new file mode 100644
index 0000000..65b1763
--- /dev/null
+++ b/codelite/patches/patch-Plugin_wxterminal.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- Plugin/wxterminal.cpp.orig	2016-01-30 10:49:18.000000000 +0000
++++ Plugin/wxterminal.cpp
+@@ -39,7 +39,7 @@
+ #define SHELL_WRAPPER wxT("")
+ #else
+ 
+-#if defined(__WXMAC__) || defined(__FreeBSD__)
++#if defined(__WXMAC__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/wait.h>
+ #else
+ #include <wait.h>
+@@ -55,6 +55,10 @@
+ #include <sys/ioctl.h>
+ #include <termios.h>
+ #include <libutil.h>
++#elif defined(__NetBSD__)
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <util.h>
+ #else
+ #include <pty.h>
+ #endif
diff --git a/codelite/patches/patch-codelite__terminal_MainFrame.cpp b/codelite/patches/patch-codelite__terminal_MainFrame.cpp
new file mode 100644
index 0000000..c7dd4ca
--- /dev/null
+++ b/codelite/patches/patch-codelite__terminal_MainFrame.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- codelite_terminal/MainFrame.cpp.orig	2016-01-30 10:49:18.000000000 +0000
++++ codelite_terminal/MainFrame.cpp
+@@ -16,6 +16,11 @@
+ #include <sys/ioctl.h>
+ #include <termios.h>
+ #include <libutil.h>
++#elif defined(__NetBSD__)
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <util.h>
+ #elif defined(__WXGTK__)
+ #include <pty.h>
+ #else
diff --git a/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp b/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp
new file mode 100644
index 0000000..b8da20a
--- /dev/null
+++ b/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- codelite_terminal/unixprocess_impl.cpp.orig	2016-01-30 10:49:18.000000000 +0000
++++ codelite_terminal/unixprocess_impl.cpp
+@@ -18,6 +18,10 @@
+ #    include <sys/ioctl.h>
+ #    include <termios.h>
+ #    include <libutil.h>
++#elif defined(__NetBSD__)
++#    include <sys/ioctl.h>
++#    include <termios.h>
++#    include <util.h>
+ #else
+ #    include <pty.h>
+ #    include <utmp.h>
diff --git a/qtcreator/Makefile b/qtcreator/Makefile
index ecef716..56014a9 100644
--- a/qtcreator/Makefile
+++ b/qtcreator/Makefile
@@ -57,11 +57,11 @@ REPLACE_PERL+=	scripts/updateCopyright.pl
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}/${PREFIX}
 INSTALL_TARGET=		install install_inst_qch_docs
 
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${QTDIR}/lib
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
+#LDFLAGS+=	${COMPILER_RPATH_FLAG}${QTDIR}/lib
+#LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
 
 do-configure:
-	${RUN} cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake QMAKE_LFLAGS=${LDFLAGS:Q} -o Makefile
+	${RUN} cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake QMAKE_RPATHDIR+=${QTDIR}/lib QMAKE_RPATHDIR+=${X11BASE}/lib -o Makefile
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"


Home | Main Index | Thread Index | Old Index