Merged haikuports/haikuports into master

haiku-apps/pe/pe-2.4.3_hg615.recipe

@@ -1,5 +1,7 @@
 SUMMARY="A programmer's editor"
-DESCRIPTION="A programmer's editor"
+DESCRIPTION="Pe is a native programmer's editor for Haiku. It features syntax
+highlighting and a structural view for several programming language, as well
+as basic support for Makefile and Jamfile project management."
 HOMEPAGE="http://pe-editor.berlios.de/"
 LICENSE="
 	BSD (4-clause)
@@ -12,12 +14,12 @@ COPYRIGHT="
 	"
 
 SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#615"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	pe = $portVersion
-	cmd:Pe = $portVersion compat >= 2
+	app:Pe = $portVersion compat >= 2
 	cmd:lpe = $portVersion compat >= 2
 	"
 
@@ -28,12 +30,12 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libpcre
 	devel:libpcreposix
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:bison
 	cmd:flex
 	cmd:gcc
@@ -45,8 +47,6 @@ USER_SETTINGS_FILES="
 	settings/pe directory
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	jam -q

haiku-libs/libsanta/libsanta-0.0.1.recipe

@@ -1,12 +1,12 @@
 SUMMARY="Custom widget library"
-DESCRIPTION="libsanta has some useful custom widgets."
+DESCRIPTION="libsanta has some useful custom widgets (color picker, column list view, scroll view etc.)"
 HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag"
 COPYRIGHT="briant@timelinevista.com"
 LICENSE="libsanta"
 SRC_URI="git+https://github.com/HaikuArchives/SantasGiftBag#4b62541"
-REVISION="1"
+REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libsanta$secondaryArchSuffix = $portVersion
@@ -25,38 +25,63 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:mkdepend
 	"
 
+PATCHES="libsanta-0.0.1.patchset"
+
 BUILD()
 {
 	make TYPE=STATIC \
-		OBJ_DIR=build \
+		OBJ_DIR=obj-static \
 		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 	
 	make TYPE=SHARED \
-		OBJ_DIR=build \
+		OBJ_DIR=obj-shared \
 		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	mkdir -p $developLibDir $libDir
+	mkdir -p $developLibDir $developDocDir $includeDir/santa $libDir
 	
-	cp -R Documentation $developLibDir
+	cp -R Documentation/* $developDocDir
 	
-	cd build
+	cd obj-static
 	cp libsanta.a $developLibDir
+	
+	cd ../obj-shared
 	cp libsanta $libDir/libsanta.so
 	
+	cd ..
+	
+	# Copy header files to $includeDir
+	
+	cp ./BetterScrollView/BetterScrollView.h \
+	   ./Colors.h \
+	   ./ColumnListView/CLVColumn.h \
+	   ./ColumnListView/CLVColumnLabelView.h \
+	   ./ColumnListView/CLVEasyItem.h \
+	   ./ColumnListView/CLVListItem.h \
+	   ./ColumnListView/ColumnListView.h \
+	   ./Cursors/Cursors.h \
+	   ./NewStrings/NewStrings.h \
+	   ./PrefilledBitmap/PrefilledBitmap.h \
+	   ./ScrollViewCorner/ScrollViewCorner.h  $includeDir/santa
+	
+	symlinkRelative -s $libDir/libsanta.so $developLibDir
+	
 	packageEntries devel \
-		$developLibDir
+		$developLibDir \
+		$developDocDir \
+		$includeDir
 }
 
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
 	libsanta${secondaryArchSuffix}_devel = $portVersion
-	libsanta$secondaryArchSuffix = $portVersion
+	devel:libsanta$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	libsanta$secondaryArchSuffix == $portVersion base

haiku-libs/libsanta/patches/libsanta-0.0.1.patchset

@@ -0,0 +1,22 @@
+From 459e758be3720ec93b1029eea0db2af14db38121 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Fri, 13 Dec 2013 00:03:52 -0700
+Subject: Fix stdc++ libs on gcc4
+
+
+diff --git a/Makefile b/Makefile
+index 57c3914..2719e8d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,7 @@ RSRCS=
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS= be root stdc++.r4
++LIBS= be root $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+-- 
+1.8.3.4
+

sys-apps/which/which-2.20.recipe

@@ -5,7 +5,7 @@ LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/which/which-2.20.tar.gz"
 CHECKSUM_MD5="95be0501a466e515422cde4af46b2744"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="which-2.20.patch"
 

sys-devel/binutils/binutils-2.17_2013_04_21.recipe

@@ -1,6 +1,6 @@
 SUMMARY="The GNU assembler, linker and binary utilities"
 HOMEPAGE="http://www.gnu.org/software/binutils"
-SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ab0f66e"
+SRC_URI="git+git://github.com/haiku/buildtools.git#ab0f66e"
 REVISION="2"
 LICENSE="
 	GNU GPL v2

sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe

@@ -2,7 +2,7 @@ SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}"
 HOMEPAGE="http://www.gnu.org/software/binutils"
 
 SRC_URI="
-	git+git://github.com/haiku/BuildtoolsPM.git#db2a6d28f6c6a92cfb1c619b0828dfbf6b87ca30"
+	git+git://github.com/haiku/buildtools.git#db2a6d28f6c6a92cfb1c619b0828dfbf6b87ca30"
 REVISION="2"
 LICENSE="
 	GNU GPL v2

sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe

@@ -7,8 +7,8 @@ LICENSE="
 	"
 COPYRIGHT="1988-2000 Free Software Foundation, Inc."
 SRC_URI="
-	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
+	git+file://$portBaseDir/../binutils/download/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
-	git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
+	git+git://github.com/haiku/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
 	"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"

sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe

@@ -7,8 +7,8 @@ LICENSE="
 	"
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 SRC_URI="
-	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
+	git+file://$portBaseDir/../binutils/download/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
-	git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
+	git+git://github.com/haiku/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c
 	"
 REVISION="4"
 ARCHITECTURES="x86 x86_64"

sys-devel/jam/jam-2.5_2012_10_12.recipe

@@ -19,8 +19,8 @@ HOMEPAGE="http://www.perforce.com/jam/jam.html"
 LICENSE="Jam"
 COPYRIGHT="1993-2003 Christopher Seiwald"
 SRC_URI="
-	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462
+	git+file://$portBaseDir/../binutils/download/buildtools.git#278de7bc9243876c2e08f8d6a243d510c5000462
-	git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462
+	git+git://github.com/haiku/buildtools.git#278de7bc9243876c2e08f8d6a243d510c5000462
 	"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"

www-client/links/links-2.8.recipe

@@ -0,0 +1,69 @@
+SUMMARY="links web browser" 
+DESCRIPTION="links web browser" 
+HOMEPAGE="http://links.twibright.com/" 
+SRC_URI="http://links.twibright.com/download/links-2.8.tar.gz"
+REVISION="1"
+CHECKSUM_MD5="34c67f980105643fc6cd63a14acc626f"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1999 - 2011 Mikulas Patocka
+	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
+
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	links$secondaryArchSuffix = $portVersion
+	cmd:links$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	openssl$secondaryArchSuffix >= 1.0.0
+	"
+
+BUILD_REQUIRES="
+#	devel:libGL$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+#	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	openssl${secondaryArchSuffix}_devel >= 1.0.0
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCHES="links-2.8.patch"
+
+BUILD()
+{
+	aclocal
+	automake --add-missing
+	autoheader
+	automake
+	autoconf
+	runConfigure ./configure \
+		--without-x \
+		--enable-graphics
+	make
+}
+
+INSTALL()
+{
+	make install
+	addAppDeskbarSymlink $binDir/links Links
+}
+