mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-02 13:08:53 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -5,7 +5,8 @@ REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="dev-libs/libpcre >= 8.02"
|
||||
CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc"
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd Paladin-1.3.src/Paladin
|
||||
chmod 755 buildhaikugcc2.sh
|
||||
chmod 755 buildhaikugcc4.sh
|
||||
@@ -24,7 +25,8 @@ BUILD {
|
||||
jam
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd Paladin-1.3.src
|
||||
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin
|
||||
cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
|
||||
@@ -5,7 +5,8 @@ REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
#CHECKSUM_MD5=""
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd paladin-1.3-hg
|
||||
# ./buildsuite.sh 1
|
||||
cd Paladin
|
||||
@@ -26,7 +27,8 @@ BUILD {
|
||||
jam
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd paladin-1.3-hg
|
||||
mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin
|
||||
cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
|
||||
@@ -158,3 +158,24 @@ diff -up Paladin-1.3.src/SymbolFinder/Makefile.orig Paladin-1.3.src/SymbolFinder
|
||||
+
|
||||
+## include the makefile-engine
|
||||
+include $(BUILDHOME)/etc/makefile-engine
|
||||
diff -urN Paladin-1.3.src/Paladin/buildhaikugcc2.sh Paladin-1.3.src/Paladin/buildhaikugcc2.sh-
|
||||
--- Paladin-1.3.src/Paladin/buildhaikugcc2.sh 2013-07-19 18:41:25.292028416 +0200
|
||||
+++ Paladin-1.3.src/Paladin/buildhaikugcc2.sh- 2013-07-19 18:38:29.508035072 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre -llocale
|
||||
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre
|
||||
xres -o Paladin Paladin.rsrc
|
||||
mimeset -all Paladin
|
||||
|
||||
diff -urN Paladin-1.3.src/Paladin/buildhaikugcc4.sh Paladin-1.3.src/Paladin/buildhaikugcc4.sh-
|
||||
--- Paladin-1.3.src/Paladin/buildhaikugcc4.sh 2013-07-19 18:41:14.299368448 +0200
|
||||
+++ Paladin-1.3.src/Paladin/buildhaikugcc4.sh- 2013-07-19 18:38:34.475004928 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre -llocale
|
||||
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre
|
||||
xres -o Paladin Paladin.rsrc
|
||||
mimeset -all Paladin
|
||||
|
||||
Reference in New Issue
Block a user