dev-lang/swig/swig-2.0.11.recipe

@@ -22,49 +22,38 @@ COPYRIGHT="1995-1998 University of Utah and the Regents of the University of Cal
 		2005-2006 Arizona Board of Regents (University of Arizona)
 		1995-2013 The SWIG Developers"
 HOMEPAGE="http://www.swig.org/"
-SOURCE_URI="http://sourceforge.net/projects/swig/files/swig/swig-2.0.11/swig-2.0.11.tar.gz"
+SOURCE_URI="http://sourceforge.net/projects/swig/files/swig/swig-$portVersion/swig-$portVersion.tar.gz"
 CHECKSUM_SHA256="63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e"
-REVISION="1"
-ARCHITECTURES="?x86 ?x86_gcc2"
+REVISION="2"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 
 PROVIDES="
 	swig${secondaryArchSuffix} = $portVersion
-	cmd:swig${secondaryArchSuffix} = $portVersion
+	cmd:swig${secondaryArchSuffix} = $portVersion compat >= 2
 	cmd:ccache_swig${secondaryArchSuffix} = $portVersion
 	"
 
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libpcre${secondaryArchSuffix}
+	lib:libz${secondaryArchSuffix}
 	"
 
-#TODO add ruby and chicken when they get updated recipes
-#TODO fix lua and tcl detection
 BUILD_REQUIRES="
-	devel:libtclstub8.5
-	devel:libpython2.7
-	devel:liblua
 	devel:libpcre${secondaryArchSuffix}
+	devel:libz${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:libtoolize
+	cmd:libtoolize${secondaryArchSuffix}
 	cmd:make
 	cmd:gcc${secondaryArchSuffix}
 	cmd:g++${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:bison
-	cmd:python
-	cmd:perl
-	cmd:lua
-	ocaml${secondaryArchSuffix}
-	ruby${secondaryArchSuffix}
-	openjdk${secondaryArchSuffix}
-	boost${secondaryArchSuffix}_devel
-	golang${secondaryArchSuffix}
 	"
 
 BUILD()

dev-python/httplib2/python3_httplib2-0.9.2.recipe

@@ -0,0 +1,47 @@
+SUMMARY="A comprehensive HTTP library for the Python platform"
+DESCRIPTION="httplib2 supports many features left out of other HTTP \
+libraries."
+HOMEPAGE="https://pypi.python.org/pypi/httplib2"
+COPYRIGHT="2006 Joe Gregorio"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/h/httplib2/httplib2-$portVersion.tar.gz"
+CHECKSUM_SHA256="c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988"
+SOURCE_DIR="httplib2-$portVersion"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	python3_httplib2 = $portVersion
+	"
+REQUIRES="
+	haiku
+	cmd:python3
+	"
+
+BUILD_REQUIRES="
+	python3_setuptools
+	"
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:python3
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python3/bin/python3
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--prefix=$prefix
+}

dev-python/httplib2/python_httplib2-0.9.2.recipe

@@ -0,0 +1,47 @@
+SUMMARY="A comprehensive HTTP library for the Python platform"
+DESCRIPTION="httplib2 supports many features left out of other HTTP \
+libraries."
+HOMEPAGE="https://pypi.python.org/pypi/httplib2"
+COPYRIGHT="2006 Joe Gregorio"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/h/httplib2/httplib2-$portVersion.tar.gz"
+CHECKSUM_SHA256="c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988"
+SOURCE_DIR="httplib2-$portVersion"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	python_httplib2 = $portVersion
+	"
+REQUIRES="
+	haiku
+	cmd:python2
+	"
+
+BUILD_REQUIRES="
+	python_setuptools
+	"
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:python2
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python2/bin/python2
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--prefix=$prefix
+}

dev-qt/qt5/qt5-5.5.1.recipe

@@ -13,7 +13,7 @@ SOURCE_DIR="qt-everywhere-opensource-src-$portVersion"
 PATCHES="qt5-5.5.1.patchset"
 
 REVISION="3"
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

media-gfx/imagemagick/imagemagick-6.8.9_8.recipe → media-gfx/imagemagick/imagemagick-6.9.4.1.recipe

@@ -6,16 +6,16 @@ SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear \
 and transform images, adjust image colors, apply various special effects, or \
 draw text, lines, polygons, ellipses and Bézier curves."
 HOMEPAGE="http://www.imagemagick.org"
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-LICENSE="IMAGEMAGICK"
 COPYRIGHT="1999-2014 ImageMagick Studio LLC"
+LICENSE="IMAGEMAGICK"
 REVISION="1"
+SOURCE_URI="http://www.imagemagick.org/download/ImageMagick-6.9.4-1.tar.xz"
+CHECKSUM_SHA256="2ea0fef839cd5d6f134502b7cf7ee0e57a3f230b19771515d4aa44354f4c6b3b"
+SOURCE_DIR="ImageMagick-6.9.4-1"
+PATCHES="imagemagick-$portVersion.patchset"
 
-SOURCE_URI="http://www.imagemagick.org/download/releases/ImageMagick-6.8.9-8.tar.gz"
-CHECKSUM_SHA256="31e14dc50c65947c3eb75fd540d94b8bbecba9e5f9a0b11a917bb01290491a5f"
-SOURCE_DIR="ImageMagick-6.8.9-8"
-PATCHES="imagemagick-6.8.9_8.patchset"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	imagemagick$secondaryArchSuffix = $portVersion
@@ -35,50 +35,59 @@ PROVIDES="
 	cmd:mogrify
 	cmd:montage
 	cmd:stream
-	lib:libMagick++_6.Q16 = 5.0.0 compat >= 5
+	lib:libMagick++_6.Q16 = 6.0.0 compat >= 6
 	lib:libMagickCore_6.Q16 = 2.0.0 compat >= 2
 	lib:libMagickWand_6.Q16 = 2.0.0 compat >= 2
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libbz2
 	lib:libfreetype
 	lib:libjpeg
 	lib:libltdl
-	lib:libpng15
+	lib:libpng16
 	lib:libtiff
 	lib:libwebp
 	lib:libz
-"
+	"
+
+PROVIDES_devel="
+	imagemagick${secondaryArchSuffix}_devel = $portVersion
+	devel:libMagick++_6.Q16 = 6.0.0 compat >= 6
+	devel:libMagickCore_6.Q16 = 2.0.0 compat >= 2
+	devel:libMagickWand_6.Q16 = 2.0.0 compat >= 2
+	"
+REQUIRES_devel="
+	imagemagick${secondaryArchSuffix} == $portVersion base
+	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libltdl$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 #	devel:libopenexr
 #	devel:libcms
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
 	cmd:svnversion
-"
+	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/ImageMagick-6/coder.xml keep-old
@@ -94,7 +103,7 @@ GLOBAL_WRITABLE_FILES="
 	settings/ImageMagick-6/type-ghostscript.xml keep-old
 	settings/ImageMagick-6/type-windows.xml keep-old
 	settings/ImageMagick-6/type.xml keep-old
-"
+	"
 
 BUILD()
 {
@@ -114,14 +123,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	imagemagick${secondaryArchSuffix}_devel = $portVersion
-	devel:libMagick++_6.Q16 = 5.0.0 compat >= 5
-	devel:libMagickCore_6.Q16 = 2.0.0 compat >= 2
-	devel:libMagickWand_6.Q16 = 2.0.0 compat >= 2
-"
-
-REQUIRES_devel="
-	imagemagick${secondaryArchSuffix} == $portVersion base
-"