diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..15aca119b --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +packages +repository +*/*/download +*/*/work-* diff --git a/app-admin/pwgen/pwgen-2.06.bep b/app-admin/pwgen/pwgen-2.06.recipe similarity index 94% rename from app-admin/pwgen/pwgen-2.06.bep rename to app-admin/pwgen/pwgen-2.06.recipe index 209ad42d1..36dcee239 100644 --- a/app-admin/pwgen/pwgen-2.06.bep +++ b/app-admin/pwgen/pwgen-2.06.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pwgen-2.06 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd pwgen-2.06 make install } diff --git a/app-admin/pwgen/pwgen-2.06.sh b/app-admin/pwgen/pwgen-2.06.sh deleted file mode 100755 index 030f4ada5..000000000 --- a/app-admin/pwgen/pwgen-2.06.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -PACKAGE="app-admin/pwgen" -VERSION="2.06" -HOMEPAGE="http://sourceforge.net/projects/pwgen/" -URL="http://voxel.dl.sourceforge.net/sourceforge/pwgen/" -FILE="pwgen-2.06.tar.gz" - -PREFIX=--prefix=/boot/common -HAIKUPORTS="http://ports.haiku-files.org/wiki" -CWD=`pwd` - -if [ ! -d ${PACKAGE}/${VERSION} ] ; then - mkdir -p ${PACKAGE}/${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}/${VERSION} -tar xvf ${CWD}/${FILE} -cd pwgen-2.06 -configure ${PREFIX} -`make && make install && echo && echo " Installation complete."` || echo " Installation FAILED !" - -echo " For more information, see ${HAIKUPORTS}/${PACKAGE}" -echo \ No newline at end of file diff --git a/app-arch/arc/arc-5.21o.bep b/app-arch/arc/arc-5.21o.recipe similarity index 96% rename from app-arch/arc/arc-5.21o.bep rename to app-arch/arc/arc-5.21o.recipe index a27d79533..7da918287 100644 --- a/app-arch/arc/arc-5.21o.bep +++ b/app-arch/arc/arc-5.21o.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="3b30c739b42b2fe8ac4ec0a05f34f284" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd arc-5.21o make } -INSTALL { +INSTALL() +{ cd arc-5.21o install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` diff --git a/app-arch/bzip2/bzip2-1.0.5-1.build b/app-arch/bzip2/bzip2-1.0.5-1.build deleted file mode 100644 index 5070a0134..000000000 --- a/app-arch/bzip2/bzip2-1.0.5-1.build +++ /dev/null @@ -1,3 +0,0 @@ -cd bzip2-1.0.5 -make -make -f Makefile-libbz2_so diff --git a/app-arch/bzip2/bzip2-1.0.5-1.install b/app-arch/bzip2/bzip2-1.0.5-1.install deleted file mode 100644 index f4e4734f1..000000000 --- a/app-arch/bzip2/bzip2-1.0.5-1.install +++ /dev/null @@ -1,4 +0,0 @@ -cd bzip2-1.0.5 -make install PREFIX=/boot/common -cp libbz2.so.1.0.4 /boot/common/lib -cp libbz2.so.1.0 /boot/common/lib diff --git a/app-arch/bzip2/bzip2-1.0.5.bep b/app-arch/bzip2/bzip2-1.0.5.bep deleted file mode 100644 index 1cb918a1b..000000000 --- a/app-arch/bzip2/bzip2-1.0.5.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="bzip2" -HOMEPAGE="http://www.bzip.org/" -SRC_URI="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz" -CHECKSUM_MD5="3c15a0c8d1d3ee1c46a1634d00617b1a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd bzip2-1.0.5 - make - make -f Makefile-libbz2_so -} - -INSTALL { - cd bzip2-1.0.5 - make install PREFIX=/boot/common - cp libbz2.so.1.0.4 /boot/common/lib - cp libbz2.so.1.0 /boot/common/lib -} -LICENSE="bzip2" -COPYRIGHT="1996-2007 Julian R Seward" diff --git a/app-arch/bzip2/bzip2-1.0.5.sh b/app-arch/bzip2/bzip2-1.0.5.sh deleted file mode 100755 index f14d9bbcf..000000000 --- a/app-arch/bzip2/bzip2-1.0.5.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -HOMEPAGE="http://www.bzip.org/" -PACKAGE="app-arch/bzip2/" -VERSION="1.0.5" -URL="http://www.bzip.org/1.0.5/" -FILE="bzip2-1.0.5.tar.gz" - -# ------- This should not be edited ------- -PFX=/boot/common/ -HAIKUPORTS="http://ports.haiku-files.org/wiki/" -CWD=`pwd`/ -if [ ! -d ${PACKAGE}${VERSION} ] ; then - mkdir -p ${PACKAGE}${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}${VERSION} -if [ ${FILE:(-7)} = "tar.bz2" ] ; then - tar -jxvf ${CWD}${FILE} -elif [ ${FILE:(-7)} = ".tar.gz" ] ; then - tar xvf ${CWD}${FILE} -fi -# ------- Begin Instructions ------- -cd bzip2-1.0.5 -make PREFIX=${PFX} && make install PREFIX=${PFX} && echo && echo " Installation complete." || echo " Installation FAILED !" - - -echo " For more information, see:" -echo " ${HAIKUPORTS}${PACKAGE}" -echo " ${HOMEPAGE}" -echo diff --git a/app-arch/bzip2/bzip2-1.0.6.bep b/app-arch/bzip2/bzip2-1.0.6.bep deleted file mode 100644 index 615a0df08..000000000 --- a/app-arch/bzip2/bzip2-1.0.6.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="bzip2" -HOMEPAGE="http://www.bzip.org/" -SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" -CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd bzip2-1.0.6 - make - make -f Makefile-libbz2_so -} - -INSTALL { - cd bzip2-1.0.6 - make install PREFIX=/boot/common - cp libbz2.so.1.0.6 /boot/common/lib - cp libbz2.so.1.0 /boot/common/lib -} -LICENSE="bzip2" -COPYRIGHT="1996-2010 Julian R Seward" diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe new file mode 100644 index 000000000..9a16b40a6 --- /dev/null +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -0,0 +1,83 @@ +SUMMARY="bzip2 data compression utilities and libraries" +DESCRIPTION="bzip2 is a freely available, patent free (see below), high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression." +HOMEPAGE="http://www.bzip.org/" +LICENSE="bzip2" +COPYRIGHT="1996-2010 Julian R Seward" +SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" +CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + bzip2 = $portVersion compat >= 1 + cmd:bzcat = $portVersion compat >= 1 + cmd:bzcmp = $portVersion compat >= 1 + cmd:bzdiff = $portVersion compat >= 1 + cmd:bzegrep = $portVersion compat >= 1 + cmd:bzfgrep = $portVersion compat >= 1 + cmd:bzgrep = $portVersion compat >= 1 + cmd:bzip2 = $portVersion compat >= 1 + cmd:bzip2recover = $portVersion compat >= 1 + cmd:bzless = $portVersion compat >= 1 + cmd:bzmore = $portVersion compat >= 1 + cmd:bunzip2 = $portVersion compat >= 1 + lib:libbz2 = $portVersion compat >= 1.0 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:ar + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + make $jobArgs + make $jobArgs -f Makefile-libbz2_so + # shared libary not built by default +} + +INSTALL() +{ + make install PREFIX=$prefix + + # also install shared lib + cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir + + # move man pages + mkdir -p $manDir + mv $prefix/man/* $manDir + rmdir $prefix/man + + # move headers + bzip2IncludeDir=$includeDir + mkdir -p $bzip2IncludeDir + mv $prefix/include/* $bzip2IncludeDir + rmdir $prefix/include + + # prepare development lib links + prepareInstalledDevelLibs libbz2 + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + bzip2_devel = $portVersion compat >= 1 + devel:libbz2 = $portVersion compat >= 1.0 + " +REQUIRES_devel=" + bzip2 == $portVersion base + " diff --git a/app-arch/bzip2/patches/bzip2-1.0.5.patch b/app-arch/bzip2/patches/bzip2-1.0.5.patch deleted file mode 100644 index b53f738cc..000000000 --- a/app-arch/bzip2/patches/bzip2-1.0.5.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile ---- bzip2-1.0.5/Makefile 2008-02-14 12:39:18.000000000 +0000 -+++ bzip2-1.0.5-haiku/Makefile 2009-12-27 00:29:38.000000000 +0000 -@@ -24,7 +24,8 @@ - CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) - - # Where you want it installed when you do 'make install' --PREFIX=/usr/local -+PREFIX=/boot/common -+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - - - OBJS= blocksort.o \ -@@ -70,43 +70,46 @@ - @cat words3 - - install: bzip2 bzip2recover -- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi -- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi -- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi -- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi -- cp -f bzip2 $(PREFIX)/bin/bzip2 -- cp -f bzip2 $(PREFIX)/bin/bunzip2 -- cp -f bzip2 $(PREFIX)/bin/bzcat -- cp -f bzip2recover $(PREFIX)/bin/bzip2recover -- chmod a+x $(PREFIX)/bin/bzip2 -- chmod a+x $(PREFIX)/bin/bunzip2 -- chmod a+x $(PREFIX)/bin/bzcat -- chmod a+x $(PREFIX)/bin/bzip2recover -- cp -f bzip2.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzip2.1 -- cp -f bzlib.h $(PREFIX)/include -- chmod a+r $(PREFIX)/include/bzlib.h -- cp -f libbz2.a $(PREFIX)/lib -- chmod a+r $(PREFIX)/lib/libbz2.a -- cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep -- chmod a+x $(PREFIX)/bin/bzgrep -- cp -f bzmore $(PREFIX)/bin/bzmore -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless -- chmod a+x $(PREFIX)/bin/bzmore -- cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp -- chmod a+x $(PREFIX)/bin/bzdiff -- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzgrep.1 -- chmod a+r $(PREFIX)/man/man1/bzmore.1 -- chmod a+r $(PREFIX)/man/man1/bzdiff.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 -- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 -- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 -+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat -+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1 -+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include -+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h -+ cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a -+ cp -f libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib -+ ln -s -f $(PREFIX)/lib/libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0 -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.4 -+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep -+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore -+ ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore -+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff -+ ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1 -+ echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1 -+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1 - - clean: - rm -f *.o libbz2.a bzip2 bzip2recover \ diff --git a/app-arch/bzip2/patches/bzip2-1.0.6.patch b/app-arch/bzip2/patches/bzip2-1.0.6.patch deleted file mode 100644 index 1ccb075d5..000000000 --- a/app-arch/bzip2/patches/bzip2-1.0.6.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -urN work/bzip2-1.0.6/Makefile work-haiku/bzip2-1.0.6/Makefile ---- bzip2-1.0.6/Makefile 2008-02-14 12:39:18.000000000 +0000 -+++ bzip2-1.0.6-haiku/Makefile 2009-12-27 00:29:38.000000000 +0000 -@@ -24,7 +24,8 @@ - CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) - - # Where you want it installed when you do 'make install' --PREFIX=/usr/local -+PREFIX=/boot/common -+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - - - OBJS= blocksort.o \ -@@ -70,43 +70,46 @@ - @cat words3 - - install: bzip2 bzip2recover -- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi -- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi -- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi -- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi -- cp -f bzip2 $(PREFIX)/bin/bzip2 -- cp -f bzip2 $(PREFIX)/bin/bunzip2 -- cp -f bzip2 $(PREFIX)/bin/bzcat -- cp -f bzip2recover $(PREFIX)/bin/bzip2recover -- chmod a+x $(PREFIX)/bin/bzip2 -- chmod a+x $(PREFIX)/bin/bunzip2 -- chmod a+x $(PREFIX)/bin/bzcat -- chmod a+x $(PREFIX)/bin/bzip2recover -- cp -f bzip2.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzip2.1 -- cp -f bzlib.h $(PREFIX)/include -- chmod a+r $(PREFIX)/include/bzlib.h -- cp -f libbz2.a $(PREFIX)/lib -- chmod a+r $(PREFIX)/lib/libbz2.a -- cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep -- chmod a+x $(PREFIX)/bin/bzgrep -- cp -f bzmore $(PREFIX)/bin/bzmore -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless -- chmod a+x $(PREFIX)/bin/bzmore -- cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp -- chmod a+x $(PREFIX)/bin/bzdiff -- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzgrep.1 -- chmod a+r $(PREFIX)/man/man1/bzmore.1 -- chmod a+r $(PREFIX)/man/man1/bzdiff.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 -- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 -- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 -+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat -+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1 -+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include -+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h -+ cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a -+ cp -f libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib -+ ln -s -f $(PREFIX)/lib/libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0 -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.6 -+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep -+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore -+ ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore -+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff -+ ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1 -+ echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1 -+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1 - - clean: - rm -f *.o libbz2.a bzip2 bzip2recover \ diff --git a/app-arch/cabextract/cabextract-1.2.bep b/app-arch/cabextract/cabextract-1.2.recipe similarity index 95% rename from app-arch/cabextract/cabextract-1.2.bep rename to app-arch/cabextract/cabextract-1.2.recipe index 5e6df8e4c..1897cb9c0 100644 --- a/app-arch/cabextract/cabextract-1.2.bep +++ b/app-arch/cabextract/cabextract-1.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="dc421a690648b503265c82ade84e143e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cabextract-1.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cabextract-1.2 make install } diff --git a/app-arch/cabextract/cabextract-1.3.bep b/app-arch/cabextract/cabextract-1.3.recipe similarity index 95% rename from app-arch/cabextract/cabextract-1.3.bep rename to app-arch/cabextract/cabextract-1.3.recipe index be5f7b460..9a711b005 100644 --- a/app-arch/cabextract/cabextract-1.3.bep +++ b/app-arch/cabextract/cabextract-1.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="cb9a4a38470d2a71a0275968e7eb64d3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cabextract-1.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cabextract-1.3 make install } diff --git a/app-arch/cpio/cpio-2.10.bep b/app-arch/cpio/cpio-2.10.recipe similarity index 96% rename from app-arch/cpio/cpio-2.10.bep rename to app-arch/cpio/cpio-2.10.recipe index f0971c4c3..c22619dc0 100644 --- a/app-arch/cpio/cpio-2.10.bep +++ b/app-arch/cpio/cpio-2.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="351ab3d38d8949913e478cc23b9d6ad4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cpio-2.10 sed -i 's/restrict//g' gnu/string.in.h ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cpio-2.10 make install } -TEST { +TEST() +{ cd cpio-2.10 make check } diff --git a/app-arch/cpio/cpio-2.11.bep b/app-arch/cpio/cpio-2.11.recipe similarity index 96% rename from app-arch/cpio/cpio-2.11.bep rename to app-arch/cpio/cpio-2.11.recipe index 4b5e8d0bb..cbcda6e09 100644 --- a/app-arch/cpio/cpio-2.11.bep +++ b/app-arch/cpio/cpio-2.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd cpio-2.11 # sed -i 's/restrict//g' gnu/string.in.h ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cpio-2.11 make install } -TEST { +TEST() +{ cd cpio-2.11 make check } diff --git a/app-arch/fastjar/fastjar-0.97.sh b/app-arch/fastjar/fastjar-0.97.sh deleted file mode 100755 index bfa0b84b4..000000000 --- a/app-arch/fastjar/fastjar-0.97.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -HOMEPAGE="https://savannah.nongnu.org/projects/fastjar/" -PACKAGE="app-arch/fastjar/" -VERSION="0.97" -URL="http://mirror.its.uidaho.edu/pub/savannah/fastjar/" -FILE="fastjar-0.97.tar.gz" - -# ------- This should not be edited ------- -PFX=/boot/common/ -HAIKUPORTS="http://ports.haiku-files.org/wiki/" -CWD=`pwd`/ -if [ ! -d ${PACKAGE}${VERSION} ] ; then - mkdir -p ${PACKAGE}${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}${VERSION} -if [ ${FILE:(-7)} = "tar.bz2" ] ; then - tar -jxvf ${CWD}${FILE} -elif [ ${FILE:(-7)} = ".tar.gz" ] ; then - tar xvf ${CWD}${FILE} -fi -# ------- Begin Instructions ------- -cd fastjar-0.97 -libtoolize --force --install -aclocal --force -automake --force-missing -autoconf --force -configure --prefix=${PREFIX} -make && make install && echo && echo " Installation complete." || echo " Installation FAILED !" - -echo " For more information, see:" -echo " ${HAIKUPORTS}${PACKAGE}" -echo " ${HOMEPAGE}" -echo - diff --git a/app-arch/fastjar/fastjar-0.98.bep b/app-arch/fastjar/fastjar-0.98.recipe similarity index 96% rename from app-arch/fastjar/fastjar-0.98.bep rename to app-arch/fastjar/fastjar-0.98.recipe index d1d6e50f3..b881de5aa 100644 --- a/app-arch/fastjar/fastjar-0.98.bep +++ b/app-arch/fastjar/fastjar-0.98.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="d2d264d343d4d0e1575832cc1023c3bf" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd fastjar-0.98 autoreconf -vfi configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd fastjar-0.98 make install } diff --git a/app-arch/gzip/gzip-1.2.4a.bep b/app-arch/gzip/gzip-1.2.4a.recipe similarity index 93% rename from app-arch/gzip/gzip-1.2.4a.bep rename to app-arch/gzip/gzip-1.2.4a.recipe index df43f1de9..a48ec2e18 100644 --- a/app-arch/gzip/gzip-1.2.4a.bep +++ b/app-arch/gzip/gzip-1.2.4a.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd gzip-1.2.4a ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gzip-1.2.4a make install } diff --git a/app-arch/gzip/gzip-1.3.12.bep b/app-arch/gzip/gzip-1.3.12.recipe similarity index 93% rename from app-arch/gzip/gzip-1.3.12.bep rename to app-arch/gzip/gzip-1.3.12.recipe index b5a35d4ef..e3fb7a487 100644 --- a/app-arch/gzip/gzip-1.3.12.bep +++ b/app-arch/gzip/gzip-1.3.12.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd gzip-1.3.12 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gzip-1.3.12 make install } diff --git a/app-arch/gzip/gzip-1.3.12.sh b/app-arch/gzip/gzip-1.3.12.sh deleted file mode 100755 index 13285332d..000000000 --- a/app-arch/gzip/gzip-1.3.12.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -HOMEPAGE="http://www.gnu.org/software/gzip/" -PACKAGE="app-arch/gzip/" -VERSION="1.3.12" -URL="http://ftp.gnu.org/gnu/gzip/" -FILE="gzip-1.3.12.tar.gz" -PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/" -PATCH_FILE="gzip-1.3.12-downstream.patch" - -# ------- This should not be edited ------- -PFX=/boot/common/ -HAIKUPORTS="http://ports.haiku-files.org/wiki/" -CWD=`pwd`/ -if [ ! -d ${PACKAGE}${VERSION} ] ; then - mkdir -p ${PACKAGE}${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}${VERSION} -if [ ${FILE:(-7)} = "tar.bz2" ] ; then - tar -jxvf ${CWD}${FILE} -elif [ ${FILE:(-7)} = ".tar.gz" ] ; then - tar xvf ${CWD}${FILE} -fi -# ------- Begin Instructions ------- -cd gzip-1.3.12 -wget ${PATCH_URL}${PACKAGE}/${PATCH_FILE} -patch -p1 -i ${PATCH_FILE} -libtoolize --force --install -configure --prefix=${PFX} -make && make install && echo && echo " Installation complete." || echo " Installation FAILED !" - -echo " For more information, see:" -echo " ${HAIKUPORTS}${PACKAGE}" -echo " ${HOMEPAGE}" -echo - diff --git a/app-arch/gzip/gzip-1.4.bep b/app-arch/gzip/gzip-1.4.recipe similarity index 95% rename from app-arch/gzip/gzip-1.4.bep rename to app-arch/gzip/gzip-1.4.recipe index 555edcd22..0dbe2f094 100644 --- a/app-arch/gzip/gzip-1.4.bep +++ b/app-arch/gzip/gzip-1.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="e381b8506210c794278f5527cba0e765" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd gzip-1.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gzip-1.4 make install } diff --git a/app-arch/gzip/gzip-1.3.12-downstream.patch b/app-arch/gzip/patches/gzip-1.3.12-downstream.patch similarity index 100% rename from app-arch/gzip/gzip-1.3.12-downstream.patch rename to app-arch/gzip/patches/gzip-1.3.12-downstream.patch diff --git a/app-arch/gzip/patches/gzip-1.4.patch b/app-arch/gzip/patches/gzip-1.4.patch index 8b7051d87..d682f553e 100644 --- a/app-arch/gzip/patches/gzip-1.4.patch +++ b/app-arch/gzip/patches/gzip-1.4.patch @@ -1,5 +1,5 @@ ---- ./gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 -+++ ./gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 +--- gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 ++++ gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 @@ -588,6 +588,7 @@ /* do the copy */ do { diff --git a/app-arch/ha/ha-0999.bep b/app-arch/ha/ha-0999.recipe similarity index 95% rename from app-arch/ha/ha-0999.bep rename to app-arch/ha/ha-0999.recipe index 6e95afa56..04b3d130f 100644 --- a/app-arch/ha/ha-0999.bep +++ b/app-arch/ha/ha-0999.recipe @@ -5,11 +5,13 @@ REVISION="1" CHECKSUM_MD5="77f3266a451712bec55d60df67f61486" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ make -f makefile.nix } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` cp ha ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/ha } diff --git a/app-arch/lha/lha-1.14i.bep b/app-arch/lha/lha-1.14i.recipe similarity index 95% rename from app-arch/lha/lha-1.14i.bep rename to app-arch/lha/lha-1.14i.recipe index 1219ed066..4052ba216 100644 --- a/app-arch/lha/lha-1.14i.bep +++ b/app-arch/lha/lha-1.14i.recipe @@ -5,20 +5,23 @@ CHECKSUM_MD5="9f52430410928ba4390a73a41a36d56f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lha-1.14i-ac20050924p1 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY`/ make } -INSTALL { +INSTALL() +{ cd lha-1.14i-ac20050924p1 make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd lha-1.14i-ac20050924p1 make check } diff --git a/app-arch/libarchive/libarchive-2.8.3.bep b/app-arch/libarchive/libarchive-2.8.3.recipe similarity index 95% rename from app-arch/libarchive/libarchive-2.8.3.bep rename to app-arch/libarchive/libarchive-2.8.3.recipe index 2ff868cd4..27e342a7c 100644 --- a/app-arch/libarchive/libarchive-2.8.3.bep +++ b/app-arch/libarchive/libarchive-2.8.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e4fb38b224f623e1cf1122631bf35b82" -BUILD { +BUILD() +{ cd libarchive-2.8.3 libtoolize --force --copy --install aclocal -I build/autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-2.8.3 make install } -TEST { +TEST() +{ cd libarchive-2.8.3 make check } diff --git a/app-arch/libarchive/libarchive-2.8.4.bep b/app-arch/libarchive/libarchive-2.8.4.recipe similarity index 95% rename from app-arch/libarchive/libarchive-2.8.4.bep rename to app-arch/libarchive/libarchive-2.8.4.recipe index b859d62ba..01d29a599 100644 --- a/app-arch/libarchive/libarchive-2.8.4.bep +++ b/app-arch/libarchive/libarchive-2.8.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="83b237a542f27969a8d68ac217dc3796" -BUILD { +BUILD() +{ cd libarchive-2.8.4 libtoolize --force --copy --install aclocal -I build/autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-2.8.4 make install } -TEST { +TEST() +{ cd libarchive-2.8.4 make check } diff --git a/app-arch/libarchive/libarchive-2.8.5.bep b/app-arch/libarchive/libarchive-2.8.5.recipe similarity index 96% rename from app-arch/libarchive/libarchive-2.8.5.bep rename to app-arch/libarchive/libarchive-2.8.5.recipe index d44ecd1b8..4a816b54f 100644 --- a/app-arch/libarchive/libarchive-2.8.5.bep +++ b/app-arch/libarchive/libarchive-2.8.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="58d1b202b4878e9da45cfe6d2a740881" -BUILD { +BUILD() +{ cd libarchive-2.8.5 libtoolize --force --copy --install aclocal -I build/autoconf @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-2.8.5 make install } -TEST { +TEST() +{ cd libarchive-2.8.5 make check } diff --git a/app-arch/libarchive/libarchive-3.0.3.bep b/app-arch/libarchive/libarchive-3.0.3.recipe similarity index 96% rename from app-arch/libarchive/libarchive-3.0.3.bep rename to app-arch/libarchive/libarchive-3.0.3.recipe index b5d4644a6..6f782a822 100644 --- a/app-arch/libarchive/libarchive-3.0.3.bep +++ b/app-arch/libarchive/libarchive-3.0.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="ca4090f0099432a9ac5a8b6618dc3892" -BUILD { +BUILD() +{ cd libarchive-3.0.3 libtoolize --force --copy --install aclocal -I build/autoconf @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-3.0.3 make install } -TEST { +TEST() +{ cd libarchive-3.0.3 make check } diff --git a/app-arch/p7zip/additional-files/p7zip-expander-rules b/app-arch/p7zip/additional-files/p7zip-expander-rules new file mode 100644 index 000000000..42e093864 --- /dev/null +++ b/app-arch/p7zip/additional-files/p7zip-expander-rules @@ -0,0 +1 @@ +"application/x-7z-compressed" .7z "7za l %s" "7za x -y %s" diff --git a/app-arch/p7zip/p7zip-9.04.bep b/app-arch/p7zip/p7zip-9.04.bep deleted file mode 100644 index 26ae736bb..000000000 --- a/app-arch/p7zip/p7zip-9.04.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="p7zip" -HOMEPAGE="http://p7zip.sourceforge.net" -SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.04/p7zip_9.04_src_all.tar.bz2?use_mirror=cdnetworks-us-2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="9194ebf9a2b3735d236aed001de5f6f8" -BUILD { - cd p7zip_9.04 - cp makefile.beos makefile.machine - make -} - -INSTALL { - cd p7zip_9.04 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install DEST_DIR=${DESTDIR} \ - DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ - DEST_MAN=$COMMON_DOCS/man -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2009 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.13.bep b/app-arch/p7zip/p7zip-9.13.bep deleted file mode 100644 index a2b44e7f1..000000000 --- a/app-arch/p7zip/p7zip-9.13.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="p7zip" -HOMEPAGE="http://p7zip.sourceforge.net" -SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779" -BUILD { - cd p7zip_9.13 - cp makefile.haiku makefile.machine - make -} - -INSTALL { - cd p7zip_9.13 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ - DEST_MAN=$COMMON_DOCS/man -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2010 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe new file mode 100644 index 000000000..be3ab5200 --- /dev/null +++ b/app-arch/p7zip/p7zip-9.13.recipe @@ -0,0 +1,41 @@ +SUMMARY="7-zip file compression program" +DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga." +HOMEPAGE="http://p7zip.sourceforge.net" +SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2" +CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2010 7-Zip Igor Pavlov." +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="p7zip-9.13.patch" + +PROVIDES=" + p7zip = $portVersion + cmd:7za = $portVersion compat >= 9 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="p7zip_9.13" + +BUILD() +{ + cp makefile.haiku makefile.machine + make +} + +INSTALL() +{ + make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ + DEST_MAN=$manDir +} diff --git a/app-arch/p7zip/p7zip-9.20.1.bep b/app-arch/p7zip/p7zip-9.20.1.bep deleted file mode 100644 index a011b20e1..000000000 --- a/app-arch/p7zip/p7zip-9.20.1.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="p7zip" -HOMEPAGE="http://p7zip.sourceforge.net" -SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" -BUILD { - cd p7zip_9.20.1 - cp makefile.haiku makefile.machine - make -} - -INSTALL { - cd p7zip_9.20.1 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ - DEST_MAN=$COMMON_DOCS/man -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2011 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe new file mode 100644 index 000000000..27974a978 --- /dev/null +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -0,0 +1,48 @@ +SUMMARY="7-zip file compression program" +DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga." +HOMEPAGE="http://p7zip.sourceforge.net" +SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2" +CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2011 7-Zip Igor Pavlov." +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="p7zip-9.20.1.patch" + +ADDITIONAL_FILES="p7zip-expander-rules" + +PROVIDES=" + p7zip = $portVersion + cmd:7za = $portVersion compat >= 9 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="p7zip_9.20.1" + +BUILD() +{ + cp makefile.haiku makefile.machine + make +} + +INSTALL() +{ + make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ + DEST_MAN=$manDir + + expanderRulesDir=$dataDir/expander/rules + mkdir -p $expanderRulesDir + cp "$portDir/additional-files/p7zip-expander-rules" \ + "$expanderRulesDir/p7zip" +} diff --git a/app-arch/p7zip/patches/p7zip-9.04.patch b/app-arch/p7zip/patches/p7zip-9.04.patch deleted file mode 100644 index 7fb6cac22..000000000 --- a/app-arch/p7zip/patches/p7zip-9.04.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -up p7zip_9.04/install.sh.orig p7zip_9.04/install.sh ---- p7zip_9.04/install.sh.orig 2010-04-23 23:59:47.153092096 -0600 -+++ p7zip_9.04/install.sh 2010-04-24 00:00:57.560201728 -0600 -@@ -56,10 +56,10 @@ then - cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7za" - strip "${DEST_DIR}${DEST_SHARE}/7za" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7za" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7za" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za" - echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" - fi - - if [ -x bin/7zr ] -@@ -68,10 +68,10 @@ then - cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr" - strip "${DEST_DIR}${DEST_SHARE}/7zr" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr" - echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" - fi - - if [ -x bin/7zCon.sfx ] -@@ -80,7 +80,7 @@ then - cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - fi - - if [ -x bin/7z ] -@@ -89,14 +89,14 @@ then - cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7z" - strip "${DEST_DIR}${DEST_SHARE}/7z" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z" - cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/" -- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/* -+ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/* - cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z" - echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7z" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7z" - fi - - else -@@ -105,7 +105,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7za" - mkdir -p "${DEST_DIR}${DEST_BIN}" - cp bin/7za "${DEST_DIR}${DEST_BIN}/7za" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" - fi - - if [ -x bin/7zr ] -@@ -113,7 +113,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" - mkdir -p "${DEST_DIR}${DEST_BIN}" - cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" - fi - fi - -@@ -122,27 +122,27 @@ if [ -d DOCS ] - then - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" - else - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" - fi - - if [ -f README ] -@@ -150,7 +150,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp README "${DEST_DIR}${DEST_SHARE_DOC}/README" -- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README" -+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README" - fi - - if [ -f ChangeLog ] -@@ -158,7 +158,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" -- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" -+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - fi - - if [ -d DOCS ] -@@ -166,7 +166,7 @@ then - echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \; -- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \; -+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \; -+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \; - fi - diff --git a/app-arch/pigz/pigz-2.1.6.bep b/app-arch/pigz/pigz-2.1.6.recipe similarity index 94% rename from app-arch/pigz/pigz-2.1.6.bep rename to app-arch/pigz/pigz-2.1.6.recipe index 1ef41604a..5beb18652 100644 --- a/app-arch/pigz/pigz-2.1.6.bep +++ b/app-arch/pigz/pigz-2.1.6.recipe @@ -5,21 +5,24 @@ CHECKSUM_MD5="cbe9030c4be3d0ef2438ee5f8b169ca4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pigz-2.1.6 sed -i 's/-lpthread/ /g' Makefile sed -i 's/ln -f pigz unpigz/cp pigz unpigz/' Makefile make } -INSTALL { +INSTALL() +{ cd pigz-2.1.6 mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp pigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/pigz cp unpigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unpigz } -TEST { +TEST() +{ cd pigz-2.1.6 make test } diff --git a/app-arch/sharutils/sharutils-4.10.bep b/app-arch/sharutils/sharutils-4.10.recipe similarity index 96% rename from app-arch/sharutils/sharutils-4.10.bep rename to app-arch/sharutils/sharutils-4.10.recipe index 9c30b836d..c81ae0831 100644 --- a/app-arch/sharutils/sharutils-4.10.bep +++ b/app-arch/sharutils/sharutils-4.10.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd sharutils-4.10 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sharutils-4.10 make install } diff --git a/app-arch/sharutils/sharutils-4.6.3.bep b/app-arch/sharutils/sharutils-4.6.3.recipe similarity index 94% rename from app-arch/sharutils/sharutils-4.6.3.bep rename to app-arch/sharutils/sharutils-4.6.3.recipe index e940d99d5..9adb9d2ee 100644 --- a/app-arch/sharutils/sharutils-4.6.3.bep +++ b/app-arch/sharutils/sharutils-4.6.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sharutils-4.6.3 ./configure --prefix=/boot/home/common make } -INSTALL { +INSTALL() +{ cd sharutils-4.6.3 make install } diff --git a/app-arch/tar/patches/tar-1.22.patch b/app-arch/tar/patches/tar-1.22.patch deleted file mode 100644 index cf426cb3b..000000000 --- a/app-arch/tar/patches/tar-1.22.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up tar-1.22/lib/string.in.h.orig tar-1.22/lib/string.in.h ---- tar-1.22/lib/string.in.h.orig 2009-12-29 20:13:44.000000000 -0700 -+++ tar-1.22/lib/string.in.h 2009-12-29 20:14:22.000000000 -0700 -@@ -39,6 +39,7 @@ - /* The attribute __pure__ was added in gcc 2.96. */ - # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) - # define __pure__ /* empty */ -+# define restrict __restrict - # endif - #endif - diff --git a/app-arch/tar/patches/tar-1.23.patch b/app-arch/tar/patches/tar-1.23.patch deleted file mode 100644 index d9e7d909d..000000000 --- a/app-arch/tar/patches/tar-1.23.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up tar-1.22/lib/string.in.h.orig tar-1.22/lib/string.in.h ---- tar-1.23/gnu/string.in.h.orig 2009-12-29 20:13:44.000000000 -0700 -+++ tar-1.23/gnu/string.in.h 2009-12-29 20:14:22.000000000 -0700 -@@ -39,6 +39,7 @@ - /* The attribute __pure__ was added in gcc 2.96. */ - # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) - # define __pure__ /* empty */ -+# define restrict __restrict - # endif - #endif - diff --git a/app-arch/tar/tar-1.22.bep b/app-arch/tar/tar-1.22.bep deleted file mode 100644 index c27dcb404..000000000 --- a/app-arch/tar/tar-1.22.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.22.tar.bz2" -CHECKSUM_MD5="07fa517027f426bb80f5f5ff91b63585" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd tar-1.22 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` - make -} - -INSTALL { - cd tar-1.22 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2010 Free Software Foundation, Inc." diff --git a/app-arch/tar/tar-1.23.bep b/app-arch/tar/tar-1.23.bep deleted file mode 100644 index 8b61cc573..000000000 --- a/app-arch/tar/tar-1.23.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.23.tar.bz2" -CHECKSUM_MD5="41e2ca4b924ec7860e51b43ad06cdb7e" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd tar-1.23 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd tar-1.23 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2010 Free Software Foundation, Inc." diff --git a/app-arch/tar/tar-1.25.bep b/app-arch/tar/tar-1.25.bep deleted file mode 100644 index 28fecf0bf..000000000 --- a/app-arch/tar/tar-1.25.bep +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.25.tar.bz2" -CHECKSUM_MD5="6e497f861c77bbba2f7da4e10270995b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/gnulib = 9999" -BUILD { - cd tar-1.25 - if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then - echo "gnulib not found, so updating it now..." - haikuporter -i gnulib - fi - echo "Copying gnulib to tar work directory..." - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fseek* gnu/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/iswblank* gnu/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fcntl* gnu/ - sed -i 's/@GNULIB_NONBLOCKING@/0/' gnu/fcntl* - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --disable-nls \ - LDFLAGS="-lnetwork" \ - FORCE_UNSAFE_CONFIGURE=1 - make -} - -INSTALL { - cd tar-1.25 - make install -} - -TEST { - cd tar-1.25 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2010 Free Software Foundation, Inc." diff --git a/app-arch/tar/tar-1.26.bep b/app-arch/tar/tar-1.26.bep deleted file mode 100644 index ee941c03c..000000000 --- a/app-arch/tar/tar-1.26.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" -CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd tar-1.26 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --disable-nls \ - LDFLAGS="-lnetwork" \ - FORCE_UNSAFE_CONFIGURE=1 - make -} - -INSTALL { - cd tar-1.26 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2011 Free Software Foundation, Inc." diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe new file mode 100644 index 000000000..4bb2b7dd7 --- /dev/null +++ b/app-arch/tar/tar-1.26.recipe @@ -0,0 +1,62 @@ +SUMMARY="Saves and restores files to/from a tape or disk archive." +DESCRIPTION=" + The Tar program provides the ability to create tar archives, as well as + various other kinds of manipulation. For example, you can use Tar on + previously created archives to extract files, to store additional files, + or to update or list files which were already stored. + + Initially, tar archives were used to store files conveniently on magnetic + tape. The name "Tar" comes from this use; it stands for tape archiver. + Despite the utility's name, Tar can direct its output to available + devices, files, or other programs (using pipes), it can even access remote + devices or files (as archives). + " +HOMEPAGE="http://www.gnu.org/software/tar/" +COPYRIGHT="1990-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" +CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="tar-1.26.patch" + +PROVIDES=" + tar = $portVersion compat >= 1 + cmd:tar = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:automake + cmd:autoreconf + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +defineDebugInfoPackage tar \ + $binDir/tar + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure \ + --disable-nls \ + LDFLAGS="-lnetwork" \ + FORCE_UNSAFE_CONFIGURE=1 + make $jobArgs +} + +INSTALL() +{ + make install + + rm $libDir/charset.alias +} diff --git a/app-arch/unrar/patches/unrar-4.2.4.patchset b/app-arch/unrar/patches/unrar-4.2.4.patchset new file mode 100644 index 000000000..f2e6779cf --- /dev/null +++ b/app-arch/unrar/patches/unrar-4.2.4.patchset @@ -0,0 +1,285 @@ +From 8f6a22fb6cb4dcaf80049a7c82973251ffd07f80 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 2 Oct 2013 18:45:05 +0200 +Subject: Convert existing patch to patchset format. + + +diff --git a/arcread.cpp b/arcread.cpp +index a524a96..19cca29 100644 +--- a/arcread.cpp ++++ b/arcread.cpp +@@ -666,7 +666,7 @@ void Archive::ConvertUnknownHeader() + { + if (*s=='/' || *s=='\\') + *s=CPATHDIVIDER; +-#if defined(_APPLE) && !defined(UNICODE_SUPPORTED) ++#if (defined(_APPLE) || defined(_BEOS)) && !defined(UNICODE_SUPPORTED) + if ((byte)*s<32 || (byte)*s>127) + *s='_'; + #endif +diff --git a/consio.cpp b/consio.cpp +index 42b72a6..90d22c9 100644 +--- a/consio.cpp ++++ b/consio.cpp +@@ -141,7 +141,7 @@ void GetPasswordText(wchar *Str,uint MaxLength) + SetConsoleMode(hConOut,ConOutMode); + #else + char StrA[MAXPASSWORD]; +-#if defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS) ++#if defined(_EMX) || defined(__sparc) || defined(sparc) || defined (__VMS) + fgets(StrA,ASIZE(StrA)-1,stdin); + #else + strncpyz(StrA,getpass(""),ASIZE(StrA)); +diff --git a/extract.cpp b/extract.cpp +index ddd71a0..adccadf 100644 +--- a/extract.cpp ++++ b/extract.cpp +@@ -311,7 +311,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,size_t HeaderS + bool WideName=false; + #endif + +-#ifdef _APPLE ++#if defined(_APPLE) || defined(_BEOS) + if (WideName) + { + // Prepare UTF-8 name for OS X. Since we are sure that destination +diff --git a/file.cpp b/file.cpp +index dcf4e61..7a26155 100644 +--- a/file.cpp ++++ b/file.cpp +@@ -304,6 +304,8 @@ void File::Write(const void *Data,size_t Size) + hFile=stderr; + #endif + break; ++ default: ++ break; + } + #endif + while (1) +diff --git a/find.cpp b/find.cpp +index 7ba14c0..0f7c3c0 100644 +--- a/find.cpp ++++ b/find.cpp +@@ -104,7 +104,7 @@ bool FindFile::Next(struct FindData *fd,bool GetSymLink) + } + } + *fd->NameW=0; +-#ifdef _APPLE ++#if defined(_APPLE) || defined(_BEOS) + if (!LowAscii(fd->Name)) + UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW)); + #elif defined(UNICODE_SUPPORTED) +@@ -170,7 +170,7 @@ bool FindFile::FastFind(const char *FindMask,const wchar *FindMaskW,FindData *fd + strcpy(fd->Name,FindMask); + + *fd->NameW=0; +-#ifdef _APPLE ++#if defined(_APPLE) || defined(_BEOS) + if (!LowAscii(fd->Name)) + UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW)); + #elif defined(UNICODE_SUPPORTED) +diff --git a/makefile.unix b/makefile.unix +index bd06092..b5e3815 100644 +--- a/makefile.unix ++++ b/makefile.unix +@@ -7,7 +7,11 @@ CXXFLAGS=-O2 + LIBFLAGS=-fPIC + DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + STRIP=strip +-DESTDIR=/usr ++LDFLAGS=-lbsd ++RC=rc ++XRES=xres ++MIMESET=mimeset ++DESTDIR=$(shell finddir B_COMMON_DIRECTORY) + + # Linux using LCC + #CXX=lcc +@@ -114,12 +118,14 @@ install: install-unrar + uninstall: uninstall-unrar + + clean: +- @rm -f *.o *.bak *~ ++ @rm -f *.o *.bak *~ *.rsrc + + unrar: clean $(OBJECTS) $(UNRAR_OBJ) + @rm -f unrar + $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) +- $(STRIP) unrar ++ $(RC) -o unrar.rsrc unrar.rdef ++ $(XRES) -o unrar unrar.rsrc ++ $(MIMESET) unrar + + sfx: WHAT=SFX_MODULE + sfx: clean $(OBJECTS) +@@ -144,3 +150,29 @@ install-lib: + + uninstall-lib: + rm -f $(DESTDIR)/lib/libunrar.so ++ ++MACHINE=$(shell uname -m) ++ifeq ($(MACHINE), BePC) ++ MACHINE = x86-gcc$(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion)))) ++endif ++ ++VERSION=4.2.4 ++DATE := `date +%F` ++PACKAGE_NAME := unrar-$(VERSION)-$(MACHINE)-$(DATE) ++COMMENT = .OptionalPackageDescription ++DESCRIPTION = dist/$(COMMENT) ++ ++haiku_package: unrar ++ -rm -rf dist/common ++ -mkdir -p dist/common/bin ++ -cp unrar dist/common/bin ++ -mkdir -p dist/common/data/licenses ++ -cp license.txt dist/common/data/licenses/UnRAR ++ echo "Package: UnRAR" > $(DESCRIPTION) ++ echo "Version: $(VERSION)-$(MACHINE)-$(DATE)" >> $(DESCRIPTION) ++ echo "Copyright: Alexander Roshal." >> $(DESCRIPTION) ++ echo "Description: Utility to list, test and expand RAR archives." >> $(DESCRIPTION) ++ echo "License: UnRAR" >> $(DESCRIPTION) ++ echo "URL: http://www.rarlab.com/" >> $(DESCRIPTION) ++ cd dist && zip -9 -r -z -y $(PACKAGE_NAME).zip common $(COMMENT) < $(COMMENT) ++ +diff --git a/os.hpp b/os.hpp +index 21488a8..ae2d0be 100644 +--- a/os.hpp ++++ b/os.hpp +@@ -134,8 +134,9 @@ + #define NM 1024 + + #ifdef _BEOS +-#include +-#include ++#include ++#include ++#include + #endif + + #include +@@ -206,6 +207,16 @@ + #endif + #endif + ++#ifdef _BEOS ++#if LITTLE_ENDIAN ++ #undef BIG_ENDIAN ++#elif BIG_ENDIAN ++ #undef LITTLE_ENDIAN ++#else ++ #error "Byte order must be defined!" ++#endif ++#endif ++ + #if defined(__sparc) || defined(sparc) || defined(__hpux) + #ifndef BIG_ENDIAN + #define BIG_ENDIAN +diff --git a/raros.hpp b/raros.hpp +index ce853bd..b63d0f0 100644 +--- a/raros.hpp ++++ b/raros.hpp +@@ -29,7 +29,7 @@ + #endif + #endif + +-#ifdef __BEOS__ ++#if defined(__BEOS__) || defined(__HAIKU__) + #define _UNIX + #define _BEOS + #endif +diff --git a/rartypes.hpp b/rartypes.hpp +index a2d8b44..d8249b1 100644 +--- a/rartypes.hpp ++++ b/rartypes.hpp +@@ -7,6 +7,7 @@ typedef unsigned int uint; // 32 bits or more + + #define PRESENT_INT32 // undefine if signed 32 bits is not available + ++#ifndef _BEOS + typedef unsigned int uint32; // 32 bits exactly + typedef signed int int32; // signed 32 bits exactly + +@@ -20,6 +21,7 @@ typedef signed __int64 int64; // signed 64 bits + typedef unsigned long long uint64; // unsigned 64 bits + typedef signed long long int64; // signed 64 bits + #endif ++#endif // #ifndef _BEOS + + + #if defined(_WIN_ALL) || defined(__GNUC__) || defined(__sgi) || defined(_AIX) || defined(__sun) || defined(__hpux) || defined(_OSF_SOURCE) +diff --git a/rarvm.cpp b/rarvm.cpp +index 8b85800..1f06581 100644 +--- a/rarvm.cpp ++++ b/rarvm.cpp +@@ -792,6 +792,8 @@ void RarVM::Optimize(VM_PreparedProgram *Prg) + case VM_CMP: + Cmd->OpCode=Cmd->ByteMode ? VM_CMPB:VM_CMPD; + continue; ++ default: ++ break; + } + if ((VM_CmdFlags[Cmd->OpCode] & VMCF_CHFLAGS)==0) + continue; +@@ -835,6 +837,8 @@ void RarVM::Optimize(VM_PreparedProgram *Prg) + case VM_NEG: + Cmd->OpCode=Cmd->ByteMode ? VM_NEGB:VM_NEGD; + continue; ++ default: ++ break; + } + } + } +@@ -1102,6 +1106,8 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType) + SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize); + } + break; ++ default: ++ break; + } + } + +diff --git a/unicode.cpp b/unicode.cpp +index a3022d2..3e29127 100644 +--- a/unicode.cpp ++++ b/unicode.cpp +@@ -13,7 +13,7 @@ bool WideToChar(const wchar *Src,char *Dest,size_t DestSize) + if (WideCharToMultiByte(CP_ACP,0,Src,-1,Dest,(int)DestSize,NULL,NULL)==0) + RetCode=false; + +-#elif defined(_APPLE) ++#elif defined(_APPLE) || defined(_BEOS) + WideToUtf(Src,Dest,DestSize); + + #elif defined(MBFUNCTIONS) +@@ -73,7 +73,7 @@ bool CharToWide(const char *Src,wchar *Dest,size_t DestSize) + if (MultiByteToWideChar(CP_ACP,0,Src,-1,Dest,(int)DestSize)==0) + RetCode=false; + +-#elif defined(_APPLE) ++#elif defined(_APPLE) || defined(_BEOS) + UtfToWide(Src,Dest,DestSize); + + #elif defined(MBFUNCTIONS) +diff --git a/unrar.rdef b/unrar.rdef +new file mode 100644 +index 0000000..ab085d2 +--- /dev/null ++++ b/unrar.rdef +@@ -0,0 +1,13 @@ ++ ++resource app_signature "application/x-vnd.Roshal-UnRAR"; ++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP; ++ ++resource app_version { ++ major = 4, ++ middle = 2, ++ minor = 4, ++ variety = 0, ++ internal = 0, ++ short_info = "4.2.4", ++ long_info = "4.2.4 Alexander Roshal" ++}; +-- +1.8.3.4 + diff --git a/app-arch/unrar/unrar-4.2.4.bep b/app-arch/unrar/unrar-4.2.4.bep deleted file mode 100644 index 1b697795b..000000000 --- a/app-arch/unrar/unrar-4.2.4.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="unrar" -HOMEPAGE="http://www.rarlab.com/" -SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4" -BUILD { - cd unrar - make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` -} - -INSTALL { - cd unrar - make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` install -} - -LICENSE="UnRAR" -COPYRIGHT="Alexander Roshal" diff --git a/app-arch/unrar/unrar-4.2.4.recipe b/app-arch/unrar/unrar-4.2.4.recipe new file mode 100644 index 000000000..661ff0454 --- /dev/null +++ b/app-arch/unrar/unrar-4.2.4.recipe @@ -0,0 +1,34 @@ +SUMMARY="Uncompress rar files" +HOMEPAGE="http://www.rarlab.com/" +SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" +CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4" + +PROVIDES=" + unrar = $portVersion + cmd:unrar = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:make + cmd:g++ + " + +SOURCE_DIR="unrar" +BUILD() +{ + LDFLAGS=-lbsd make -f makefile.unix DESTDIR=$prefix +} + +INSTALL() +{ + make -f makefile.unix DESTDIR=$prefix install +} + +LICENSE="UnRAR" +COPYRIGHT="Alexander Roshal" +DESCRIPTION="Uncompress rar files" diff --git a/app-arch/unzip/unzip-6.0.bep b/app-arch/unzip/unzip-6.0.recipe similarity index 94% rename from app-arch/unzip/unzip-6.0.bep rename to app-arch/unzip/unzip-6.0.recipe index 868411e99..b2cd86962 100644 --- a/app-arch/unzip/unzip-6.0.bep +++ b/app-arch/unzip/unzip-6.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="62b490407489521db863b523a7f86375" -BUILD { +BUILD() +{ cd unzip60 make -f beos/Makefile \ PREFIX=`finddir B_COMMON_DIRECTORY` \ @@ -13,12 +14,14 @@ BUILD { } -INSTALL { +INSTALL() +{ cd unzip60 make -f beos/Makefile install } -TEST { +TEST() +{ cd unzip60 # make test # make check diff --git a/app-arch/xar/xar-1.5.2.bep b/app-arch/xar/xar-1.5.2.recipe similarity index 95% rename from app-arch/xar/xar-1.5.2.bep rename to app-arch/xar/xar-1.5.2.recipe index 5eddcd68b..2835e1565 100644 --- a/app-arch/xar/xar-1.5.2.bep +++ b/app-arch/xar/xar-1.5.2.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd xar-1.5.2 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xar-1.5.2 make install } diff --git a/app-arch/xz-utils/xz-utils-4.999.9.bep b/app-arch/xz-utils/xz-utils-4.999.9.bep deleted file mode 100644 index a692dc832..000000000 --- a/app-arch/xz-utils/xz-utils-4.999.9.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." -HOMEPAGE="http://tukaani.org/xz/" -SRC_URI="http://tukaani.org/xz/xz-4.999.9beta.tar.bz2" -CHECKSUM_MD5="cc4044fcc073b8bcf3164d1d0df82161" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="" -BUILD { - cd xz-4.999.9beta - cp -f `finddir B_COMMON_BIN_DIRECTORY`/libtool . - libtoolize -c -f - aclocal -I m4 - autoconf - autoheader - automake -acf --foreign - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd xz-4.999.9beta - make install -} - -TEST { - cd xz-4.999.9beta - make check -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - GNU GPL v3" -COPYRIGHT="2005-2009 Lasse Collin" diff --git a/app-arch/xz-utils/xz-utils-5.0.1.bep b/app-arch/xz-utils/xz-utils-5.0.1.bep deleted file mode 100644 index cfec88a3c..000000000 --- a/app-arch/xz-utils/xz-utils-5.0.1.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." -HOMEPAGE="http://tukaani.org/xz/" -SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2" -CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4." -DEPEND="" -BUILD { - cd xz-5.0.1 - touch po/t-cs.gmo - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/xz \ - --mandir=$COMMON_DOCS/man \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale - make -} - -INSTALL { - cd xz-5.0.1 - make install -} - -TEST { - cd xz-5.0.1 - make check -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - GNU GPL v3" -COPYRIGHT="2005-2011 Lasse Collin" diff --git a/app-arch/xz-utils/xz-utils-5.0.4.bep b/app-arch/xz-utils/xz-utils-5.0.4.bep deleted file mode 100644 index efeaeaeb8..000000000 --- a/app-arch/xz-utils/xz-utils-5.0.4.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." -HOMEPAGE="http://tukaani.org/xz/" -SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2" -CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4." -DEPEND="" -BUILD { - cd xz-5.0.4 - touch po/t-cs.gmo - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/xz \ - --mandir=$COMMON_DOCS/man \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale - make -} - -INSTALL { - cd xz-5.0.4 - make install -} - -TEST { - cd xz-5.0.4 - make check -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - GNU GPL v3" -COPYRIGHT="2005-2012 Lasse Collin" diff --git a/app-arch/xz_utils/additional-files/xz_utils-expander-rules b/app-arch/xz_utils/additional-files/xz_utils-expander-rules new file mode 100644 index 000000000..5645ec272 --- /dev/null +++ b/app-arch/xz_utils/additional-files/xz_utils-expander-rules @@ -0,0 +1,3 @@ +"application/x-xz" .tar.xz "tar -Jtvf %s" "tar -Jxvf %s" +"application/x-xz" .txz "tar -Jtvf %s" "tar -Jxvf %s" +"application/x-xz" .xz "echo %s | sed 's/.xz$//g'" "xz -df %s" diff --git a/app-arch/xz_utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe new file mode 100644 index 000000000..2985e36de --- /dev/null +++ b/app-arch/xz_utils/xz_utils-5.0.1.recipe @@ -0,0 +1,91 @@ +SUMMARY="Free general-purpose data compression software" +HOMEPAGE="http://tukaani.org/xz/" +SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2" +CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6" +LICENSE=" + GNU LGPL v2.1 + GNU GPL v2 + GNU GPL v3 + " +COPYRIGHT="2005-2011 Lasse Collin" +REVISION="3" +ARCHITECTURES="!x86_gcc2 ?x86" + +PROVIDES=" + xz_utils = $portVersion compat >= 5 + cmd:lzcat = 5.0.1 compat >= 5 + cmd:lzcmp = 5.0.1 compat >= 5 + cmd:lzdiff = 5.0.1 compat >= 5 + cmd:lzegrep = 5.0.1 compat >= 5 + cmd:lzfgrep = 5.0.1 compat >= 5 + cmd:lzgrep = 5.0.1 compat >= 5 + cmd:lzless = 5.0.1 compat >= 5 + cmd:lzma = 5.0.1 compat >= 5 + cmd:lzmadec = 5.0.1 compat >= 5 + cmd:lzmainfo = 5.0.1 compat >= 5 + cmd:lzmore = 5.0.1 compat >= 5 + cmd:unlzma = 5.0.1 compat >= 5 + cmd:unxz = 5.0.1 compat >= 5 + cmd:xz = 5.0.1 compat >= 5 + cmd:xzcat = 5.0.1 compat >= 5 + cmd:xzcmp = 5.0.1 compat >= 5 + cmd:xzdec = 5.0.1 compat >= 5 + cmd:xzdiff = 5.0.1 compat >= 5 + cmd:xzegrep = 5.0.1 compat >= 5 + cmd:xzfgrep = 5.0.1 compat >= 5 + cmd:xzgrep = 5.0.1 compat >= 5 + cmd:xzless = 5.0.1 compat >= 5 + cmd:xzmore = 5.0.1 compat >= 5 + lib:liblzma = 5.0.1 compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="xz-5.0.1" + +BUILD() +{ + touch po/t-cs.gmo + libtoolize --force --copy --install + ./configure $configureDirArgs +# --localedir=$dataRootDir/locale + make +} + +INSTALL() +{ + make install + + expanderRulesDir=$dataDir/expander/rules + mkdir -p $expanderRulesDir + cp "$portDir/sources/xz_utils-expander-rules" "$expanderRulesDir/xz_utils" +} + +TEST() +{ + make check +} + +DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils. + +The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2. + +XZ Utils consist of several components: + + * liblzma is a compression library with API similar to that of zlib. + * xz is a command line tool with syntax similar to that of gzip. + * xzdec is a decompression-only tool smaller than the full-featured xz tool. + * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files. + * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils. + +While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API." diff --git a/app-arch/xz_utils/xz_utils-5.0.4.recipe b/app-arch/xz_utils/xz_utils-5.0.4.recipe new file mode 100644 index 000000000..182e5ca37 --- /dev/null +++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe @@ -0,0 +1,111 @@ +SUMMARY="Free general-purpose data compression software" +HOMEPAGE="http://tukaani.org/xz/" +SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2" +CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715" +LICENSE=" + GNU LGPL v2.1 + GNU GPL v2 + GNU GPL v3 + " +COPYRIGHT="2005-2012 Lasse Collin" +REVISION="2" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +ADDITIONAL_FILES="xz_utils-expander-rules" + +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + xz_utils$secondaryArchSuffix = $portVersion compat >= 5 + cmd:lzcat$commandSuffix = $portVersion compat >= 5 + cmd:lzcmp$commandSuffix = $portVersion compat >= 5 + cmd:lzdiff$commandSuffix = $portVersion compat >= 5 + cmd:lzegrep$commandSuffix = $portVersion compat >= 5 + cmd:lzfgrep$commandSuffix = $portVersion compat >= 5 + cmd:lzgrep$commandSuffix = $portVersion compat >= 5 + cmd:lzless$commandSuffix = $portVersion compat >= 5 + cmd:lzma$commandSuffix = $portVersion compat >= 5 + cmd:lzmadec$commandSuffix = $portVersion compat >= 5 + cmd:lzmainfo$commandSuffix = $portVersion compat >= 5 + cmd:lzmore$commandSuffix = $portVersion compat >= 5 + cmd:unlzma$commandSuffix = $portVersion compat >= 5 + cmd:unxz$commandSuffix = $portVersion compat >= 5 + cmd:xz$commandSuffix = $portVersion compat >= 5 + cmd:xzcat$commandSuffix = $portVersion compat >= 5 + cmd:xzcmp$commandSuffix = $portVersion compat >= 5 + cmd:xzdec$commandSuffix = $portVersion compat >= 5 + cmd:xzdiff$commandSuffix = $portVersion compat >= 5 + cmd:xzegrep$commandSuffix = $portVersion compat >= 5 + cmd:xzfgrep$commandSuffix = $portVersion compat >= 5 + cmd:xzgrep$commandSuffix = $portVersion compat >= 5 + cmd:xzless$commandSuffix = $portVersion compat >= 5 + cmd:xzmore$commandSuffix = $portVersion compat >= 5 + lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5 + devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="xz-$portVersion" + +BUILD() +{ + touch po/t-cs.gmo + runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir + make $jobArgs +} + +INSTALL() +{ + make install + + expanderRulesDir=$dataDir/expander/rules + mkdir -p $expanderRulesDir + cp "$portDir/additional-files/xz_utils-expander-rules" \ + "$expanderRulesDir/xz_utils" + + prepareInstalledDevelLibs liblzma +} + +TEST() +{ + make check +} + +DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils. + +The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2. + +XZ Utils consist of several components: + + * liblzma is a compression library with API similar to that of zlib. + * xz is a command line tool with syntax similar to that of gzip. + * xzdec is a decompression-only tool smaller than the full-featured xz tool. + * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files. + * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils. + +While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API." diff --git a/app-arch/zip/zip-3.0.bep b/app-arch/zip/zip-3.0.recipe similarity index 94% rename from app-arch/zip/zip-3.0.bep rename to app-arch/zip/zip-3.0.recipe index 132af02e8..5b68a26d1 100644 --- a/app-arch/zip/zip-3.0.bep +++ b/app-arch/zip/zip-3.0.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37" -BUILD { +BUILD() +{ cd zip30 make -f beos/Makefile \ PREFIX=`finddir B_COMMON_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -INSTALL { +INSTALL() +{ cd zip30 make -f beos/Makefile install } -TEST { +TEST() +{ cd zip30 # make test # make check diff --git a/app-arch/zoo/zoo-2.10.bep b/app-arch/zoo/zoo-2.10.recipe similarity index 93% rename from app-arch/zoo/zoo-2.10.bep rename to app-arch/zoo/zoo-2.10.recipe index 96f3dc0f9..b6f401a28 100644 --- a/app-arch/zoo/zoo-2.10.bep +++ b/app-arch/zoo/zoo-2.10.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="70a0a785ecc8f7f747be1421e495d837" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ make haiku } -INSTALL { +INSTALL() +{ make inst_prod } LICENSE="zoo" diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.bep b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe similarity index 95% rename from app-benchmarks/bonnie++/bonnie++-1.03e.bep rename to app-benchmarks/bonnie++/bonnie++-1.03e.recipe index bb6fb950f..d6ecb6b1a 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.03e.bep +++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe @@ -1,11 +1,12 @@ DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python" HOMEPAGE="http://www.coker.com.au/bonnie++/" SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz" -REVISION= "1" +REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968" -BUILD { +BUILD() +{ cd bonnie++-1.03e COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` @@ -15,7 +16,8 @@ BUILD { --sbindir=$COMMON_BIN make } -INSTALL { +INSTALL() +{ cd bonnie++-1.03e make install DESTDIR=${DESTDIR} diff --git a/app-benchmarks/ffsb/ffsb-6.0-rc2.bep b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe similarity index 96% rename from app-benchmarks/ffsb/ffsb-6.0-rc2.bep rename to app-benchmarks/ffsb/ffsb-6.0_rc2.recipe index bcf3b899d..b4a80b504 100644 --- a/app-benchmarks/ffsb/ffsb-6.0-rc2.bep +++ b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="cabfc1021c2ec6c6b168fefc84210891" -BUILD { +BUILD() +{ cd ffsb-6.0-rc2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ffsb-6.0-rc2 make install } diff --git a/app-benchmarks/iozone/iozone-3.326.bep b/app-benchmarks/iozone/iozone-3.326.recipe similarity index 96% rename from app-benchmarks/iozone/iozone-3.326.bep rename to app-benchmarks/iozone/iozone-3.326.recipe index 73b7b44f4..e95216033 100644 --- a/app-benchmarks/iozone/iozone-3.326.bep +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="e80f06da89d314f7fc08fcef4046d367" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd iozone3_326/src/current/ make haiku } -INSTALL { +INSTALL() +{ cd iozone3_326/src/current/ mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` cp iozone ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/iozone diff --git a/app-benchmarks/libmicro/libmicro-0.4.1.bep b/app-benchmarks/libmicro/libmicro-0.4.1.recipe similarity index 93% rename from app-benchmarks/libmicro/libmicro-0.4.1.bep rename to app-benchmarks/libmicro/libmicro-0.4.1.recipe index db2d7b796..065421c1c 100644 --- a/app-benchmarks/libmicro/libmicro-0.4.1.bep +++ b/app-benchmarks/libmicro/libmicro-0.4.1.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="2b6e1ff22164e4ae0c21c11e6c28f7ed" -BUILD { +BUILD() +{ cd libMicro-0.4.1 make } -INSTALL { +INSTALL() +{ cd libMicro-0.4.1 cd bin-BePC ls } -TEST { +TEST() +{ cd libMicro-0.4.1 # make test # make check diff --git a/app-benchmarks/piozone/piozone-1.0.bep b/app-benchmarks/piozone/piozone-1.0.recipe similarity index 95% rename from app-benchmarks/piozone/piozone-1.0.bep rename to app-benchmarks/piozone/piozone-1.0.recipe index c8069b088..fc6399b29 100644 --- a/app-benchmarks/piozone/piozone-1.0.bep +++ b/app-benchmarks/piozone/piozone-1.0.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd piozone-1.0 make } -INSTALL { +INSTALL() +{ cd piozone-1.0 mkdir -p $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY` cp -a piozone $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`/piozone diff --git a/app-cdr/bchunk/bchunk-1.2.0.bep b/app-cdr/bchunk/bchunk-1.2.0.recipe similarity index 97% rename from app-cdr/bchunk/bchunk-1.2.0.bep rename to app-cdr/bchunk/bchunk-1.2.0.recipe index 0e4d80adb..001e94823 100644 --- a/app-cdr/bchunk/bchunk-1.2.0.bep +++ b/app-cdr/bchunk/bchunk-1.2.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231" -BUILD { +BUILD() +{ cd bchunk-1.2.0 make } -INSTALL { +INSTALL() +{ cd bchunk-1.2.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` diff --git a/app-cdr/cdrdao/cdrdao-1.2.3.bep b/app-cdr/cdrdao/cdrdao-1.2.3.recipe similarity index 95% rename from app-cdr/cdrdao/cdrdao-1.2.3.bep rename to app-cdr/cdrdao/cdrdao-1.2.3.recipe index 560f0daf2..e88cea319 100644 --- a/app-cdr/cdrdao/cdrdao-1.2.3.bep +++ b/app-cdr/cdrdao/cdrdao-1.2.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8d15ba6280bb7ba2f4d6be31d28b3c0c" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd cdrdao-1.2.3 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cdrdao-1.2.3 make install } diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep b/app-cdr/cdrtools/cdrtools-2.01.01a66.bep deleted file mode 100644 index ee394e382..000000000 --- a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a66.tar.gz" -CHECKSUM_MD5="b9d40bddf1ce75989d0a36b939f0c3fb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cdrtools-2.01.01 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd cdrtools-2.01.01 - make install -} diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep b/app-cdr/cdrtools/cdrtools-2.01.01a77.bep deleted file mode 100644 index ea13e679c..000000000 --- a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a77.tar.gz" -CHECKSUM_MD5="d0b4c56f1215be636996b8e1e3d2b284" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cdrtools-2.01.01 - make -} - -INSTALL { - cd cdrtools-2.01.01 - make install -} diff --git a/app-cdr/cdrtools/cdrtools-3.00.bep b/app-cdr/cdrtools/cdrtools-3.00.bep deleted file mode 100644 index 801cfa10f..000000000 --- a/app-cdr/cdrtools/cdrtools-3.00.bep +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-3.00.tar.bz2" -CHECKSUM_MD5="f9fbab08fbd458b0d2312976d8c5f558" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cdrtools-3.00 - make GMAKE_NOWARN=true -} - -INSTALL { - cd cdrtools-3.00 - make install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01a01.bep b/app-cdr/cdrtools/cdrtools-3.01a01.bep deleted file mode 100644 index 146935807..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01a01.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a01.tar.bz2" -CHECKSUM_MD5="6c81803b1e2bedefc1ad75fabd1c8474" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cdrtools-3.01 - sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc - sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* - sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* - sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/sbin/bin/' rscsi/Makefile - make GMAKE_NOWARN=true -} - -INSTALL { - cd cdrtools-3.01 - make GMAKE_NOWARN=true DEFMANBASE=documentation install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01a06.bep b/app-cdr/cdrtools/cdrtools-3.01a06.bep deleted file mode 100644 index b4e4171fe..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01a06.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a06.tar.bz2" -CHECKSUM_MD5="00b6c2128023186e712cf27e629ed246" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cdrtools-3.01 - sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc - sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* - sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* - sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/sbin/bin/' rscsi/Makefile - make GMAKE_NOWARN=true -} - -INSTALL { - cd cdrtools-3.01 - make GMAKE_NOWARN=true DEFMANBASE=documentation install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01a07.bep b/app-cdr/cdrtools/cdrtools-3.01a07.bep deleted file mode 100644 index 819664d1f..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01a07.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" -CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cdrtools-3.01 - sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc - sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* - sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* - sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/sbin/bin/' rscsi/Makefile - make GMAKE_NOWARN=true -} - -INSTALL { - cd cdrtools-3.01 - make GMAKE_NOWARN=true DEFMANBASE=documentation install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe new file mode 100644 index 000000000..34eaf72a4 --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -0,0 +1,157 @@ +SUMMARY="A highly portable CD/DVD/BluRay command line recording software" +DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media. + +The suite includes the following programs: + + cdrecord A CD/DVD/BD recording program + readcd A program to read CD/DVD/BD media with CD-clone features + cdda2wav The most evolved CD-audio extraction program with paranoia support + mkisofs A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes + isodebug A program to print mkisofs debug information from media + isodump A program to dump ISO-9660 media + isoinfo A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems + isovfy A program to verify the ISO-9660 structures + rscsi A Remote SCSI enabling daemon + " +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2012 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" +CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES='cdrtools-3.01~a07.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cdrtools_devel = $portVersion + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe new file mode 100644 index 000000000..5d78afffe --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe @@ -0,0 +1,157 @@ +SUMMARY="A highly portable CD/DVD/BluRay command line recording software" +DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media. + +The suite includes the following programs: + + cdrecord A CD/DVD/BD recording program + readcd A program to read CD/DVD/BD media with CD-clone features + cdda2wav The most evolved CD-audio extraction program with paranoia support + mkisofs A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes + isodebug A program to print mkisofs debug information from media + isodump A program to dump ISO-9660 media + isoinfo A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems + isovfy A program to verify the ISO-9660 structures + rscsi A Remote SCSI enabling daemon + " +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2013 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2" +CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PATCHES='cdrtools-3.01~a17.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cdrtools_devel = $portVersion + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe new file mode 100644 index 000000000..60aa374fd --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe @@ -0,0 +1,157 @@ +SUMMARY="A highly portable CD/DVD/BluRay command line recording software" +DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media. + +The suite includes the following programs: + + cdrecord A CD/DVD/BD recording program + readcd A program to read CD/DVD/BD media with CD-clone features + cdda2wav The most evolved CD-audio extraction program with paranoia support + mkisofs A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes + isodebug A program to print mkisofs debug information from media + isodump A program to dump ISO-9660 media + isoinfo A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems + isovfy A program to verify the ISO-9660 structures + rscsi A Remote SCSI enabling daemon + " +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2013 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2" +CHECKSUM_MD5="cf3e5dc49c654a87c20b9fa55eb84ed4" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PATCHES='cdrtools-3.01~a18.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cdrtools_devel = $portVersion + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/cdrtools.OptionalPackageDescription b/app-cdr/cdrtools/cdrtools.OptionalPackageDescription deleted file mode 100644 index ff1ba9702..000000000 --- a/app-cdr/cdrtools/cdrtools.OptionalPackageDescription +++ /dev/null @@ -1,12 +0,0 @@ -Package: cdrecord -Version: 3.00 -Copyright: 1995-2010 J. Schilling -License: CDDL v1 -URL: http://cdrecord.berlios.de - -Package: mkisofs -Version: 3.00 -Copyright: 1993-1997 Eric Youngdale, 1997-2010 J. Schilling -License: GNU GPL v2 -License: CDDL v1 -URL: http://cdrecord.berlios.de diff --git a/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch b/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch deleted file mode 100644 index 24ac6871c..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_APPS_DIRECTORY)/cdrtools - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch b/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch deleted file mode 100644 index 24ac6871c..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_APPS_DIRECTORY)/cdrtools - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.00.patch b/app-cdr/cdrtools/patches/cdrtools-3.00.patch deleted file mode 100644 index 3c6a198ac..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.00.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-3.00/DEFAULTS/Defaults.haiku cdrtools-3.00-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-3.00/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-3.00-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_COMMON_DIRECTORY) - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch new file mode 100644 index 000000000..e11110e03 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch @@ -0,0 +1,139 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_COMMON_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch new file mode 100644 index 000000000..8fca82f12 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch @@ -0,0 +1,170 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c +--- cdrtools-3.01/libscg/scsi-beos.c.orig 2009-06-30 12:34:03.022282240 -0600 ++++ cdrtools-3.01/libscg/scsi-beos.c 2012-07-19 18:25:01.146800640 -0600 +@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno) + char buf[128]; + + if (busno < 8) ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno); ++#else + js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno); ++#endif + else + #ifdef __HAIKU__ + js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8); +@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun) + return (f->fd); + } + if (busno < 8) { ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), ++ "/dev/disk/scsi/%d/%d/%d/raw", ++ busno, tgt, tlun); ++#else + js_snprintf(buf, sizeof (buf), + "/dev/bus/scsi/%d/%d/%d/raw", + busno, tgt, tlun); ++#endif + } else { + char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy"; + js_snprintf(buf, sizeof (buf), diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch new file mode 100644 index 000000000..8fca82f12 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch @@ -0,0 +1,170 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c +--- cdrtools-3.01/libscg/scsi-beos.c.orig 2009-06-30 12:34:03.022282240 -0600 ++++ cdrtools-3.01/libscg/scsi-beos.c 2012-07-19 18:25:01.146800640 -0600 +@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno) + char buf[128]; + + if (busno < 8) ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno); ++#else + js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno); ++#endif + else + #ifdef __HAIKU__ + js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8); +@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun) + return (f->fd); + } + if (busno < 8) { ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), ++ "/dev/disk/scsi/%d/%d/%d/raw", ++ busno, tgt, tlun); ++#else + js_snprintf(buf, sizeof (buf), + "/dev/bus/scsi/%d/%d/%d/raw", + busno, tgt, tlun); ++#endif + } else { + char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy"; + js_snprintf(buf, sizeof (buf), diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.bep b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe similarity index 95% rename from app-cdr/daa2iso/daa2iso-0.1.7e.bep rename to app-cdr/daa2iso/daa2iso-0.1.7e.recipe index c98e0db64..d3685840c 100644 --- a/app-cdr/daa2iso/daa2iso-0.1.7e.bep +++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe @@ -6,12 +6,14 @@ DEPEND="" STATUS_HAIKU="stable" CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481" -BUILD { +BUILD() +{ cd src make CFLAGS="-DNOLFS -O2 -s" } -INSTALL { +INSTALL() +{ cd src make install PREFIX=${DESTDIR}/$(finddir B_COMMON_DIRECTORY) } diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.bep b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe similarity index 95% rename from app-cdr/uif2iso/uif2iso-0.1.7c.bep rename to app-cdr/uif2iso/uif2iso-0.1.7c.recipe index c9bf0a10b..0803678b7 100644 --- a/app-cdr/uif2iso/uif2iso-0.1.7c.bep +++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe @@ -6,12 +6,14 @@ DEPEND="" STATUS_HAIKU="stable" CHECKSUM_MD5="2eb9797ec463c38253014d45591a7043" -BUILD { +BUILD() +{ cd src make CFLAGS="-DNOLFS -O2 -s" } -INSTALL { +INSTALL() +{ cd src make install prefix=$(finddir B_COMMON_DIRECTORY) DESTDIR="${DESTDIR}" } diff --git a/app-crypt/gnupg/gnupg-1.4.10.bep b/app-crypt/gnupg/gnupg-1.4.10.recipe similarity index 95% rename from app-crypt/gnupg/gnupg-1.4.10.bep rename to app-crypt/gnupg/gnupg-1.4.10.recipe index 8ec90e2c8..04e8e6e99 100644 --- a/app-crypt/gnupg/gnupg-1.4.10.bep +++ b/app-crypt/gnupg/gnupg-1.4.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="dcf7ed712997888d616e029637bfc303" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gnupg-1.4.10 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gnupg-1.4.10 make install } diff --git a/app-crypt/gnupg/gnupg-1.4.11.bep b/app-crypt/gnupg/gnupg-1.4.11.bep deleted file mode 100644 index 9e6bf53b1..000000000 --- a/app-crypt/gnupg/gnupg-1.4.11.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement." -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2" -CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd gnupg-1.4.11 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd gnupg-1.4.11 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1998-2010 Free Software Foundation, Inc." diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe new file mode 100644 index 000000000..4455dfae3 --- /dev/null +++ b/app-crypt/gnupg/gnupg-1.4.11.recipe @@ -0,0 +1,50 @@ +SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard." +DESCRIPTION="GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data and communication, features a versatile key management system as well as access modules for all kinds of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications." +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2" +CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="1998-2010 Free Software Foundation, Inc." + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES="gnupg = $portVersion + cmd:gpg = $portVersion compat >= 1.4 + cmd:gpg_zip = $portVersion compat >= 1.4 + cmd:gpgsplit = $portVersion compat >= 1.4 + cmd:gpgv = $portVersion compat >= 1.4 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libz + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +PATCHES="gnupg-1.4.11.patch" + +BUILD() +{ + libtoolize --force --copy --install + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} diff --git a/app-doc/doxygen/doxygen-1.6.1.bep b/app-doc/doxygen/doxygen-1.6.1.bep deleted file mode 100644 index 85346e8d9..000000000 --- a/app-doc/doxygen/doxygen-1.6.1.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." -HOMEPAGE="http://www.doxygen.org" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.1.src.tar.gz" -CHECKSUM_MD5="2ec343643e134f0d3ce2069420bcb4f0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd doxygen-1.6.1 - ./configure --prefix /boot/common - make -} - -INSTALL { - cd doxygen-1.6.1 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2010 Dimitri van Heesch" diff --git a/app-doc/doxygen/doxygen-1.6.2.bep b/app-doc/doxygen/doxygen-1.6.2.bep deleted file mode 100644 index 39efbbab9..000000000 --- a/app-doc/doxygen/doxygen-1.6.2.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." -HOMEPAGE="http://www.doxygen.org" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.2.src.tar.gz" -CHECKSUM_MD5="70260101ef60952cb99484700241c99e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd doxygen-1.6.2 - ./configure --prefix /boot/common - make -} - -INSTALL { - cd doxygen-1.6.2 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2010 Dimitri van Heesch" diff --git a/app-doc/doxygen/doxygen-1.6.3.bep b/app-doc/doxygen/doxygen-1.6.3.bep deleted file mode 100644 index 946585e34..000000000 --- a/app-doc/doxygen/doxygen-1.6.3.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." -HOMEPAGE="http://www.doxygen.org" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" -CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd doxygen-1.6.3 - sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in - ./configure --prefix `finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd doxygen-1.6.3 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2010 Dimitri van Heesch" diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe new file mode 100644 index 000000000..cc4ac12bf --- /dev/null +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -0,0 +1,58 @@ +SUMMARY="Generate documentation from source code" +DESCRIPTION="Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. + +Doxygen can help you in three ways: + + 1. It can generate an on-line documentation browser (in HTML) and/or an off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source files. There is also support for generating output in RTF (MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The documentation is extracted directly from the sources, which makes it much easier to keep the documentation consistent with the source code. + 2. You can configure doxygen to extract the code structure from undocumented source files. This is very useful to quickly find your way in large source distributions. Doxygen can also visualize the relations between the various elements by means of include dependency graphs, inheritance diagrams, and collaboration diagrams, which are all generated automatically. + 3. You can also use doxygen for creating normal documentation (as I did for the doxygen user manual and web-site)." +HOMEPAGE="http://www.doxygen.org" +COPYRIGHT="1997-2010 Dimitri van Heesch" +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" +CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="doxygen-1.6.3.patchset" + +PROVIDES=" + doxygen = $portVersion compat >= 1.6 + cmd:doxygen = $portVersion compat >= 1.6 + cmd:doxytag = $portVersion compat >= 1.6 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + " +BUILD_REQUIRES=" + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in +} + +BUILD() +{ + ./configure --prefix $prefix --docdir $docDir + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/app-doc/doxygen/doxygen-1.7.4.bep b/app-doc/doxygen/doxygen-1.7.4.recipe similarity index 96% rename from app-doc/doxygen/doxygen-1.7.4.bep rename to app-doc/doxygen/doxygen-1.7.4.recipe index 1f00fc066..f1597e8ea 100644 --- a/app-doc/doxygen/doxygen-1.7.4.bep +++ b/app-doc/doxygen/doxygen-1.7.4.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd doxygen-1.7.4 sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in ./configure --prefix `finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd doxygen-1.7.4 make install } diff --git a/app-doc/doxygen/patches/doxygen-1.6.1.patch b/app-doc/doxygen/patches/doxygen-1.6.1.patch deleted file mode 100644 index 1bf4d37f7..000000000 --- a/app-doc/doxygen/patches/doxygen-1.6.1.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur doxygen-1.6.1/PLATFORMS doxygen-1.6.1-haiku/PLATFORMS ---- doxygen-1.6.1/PLATFORMS 2007-11-24 09:12:35.000000000 -0700 -+++ doxygen-1.6.1-haiku/PLATFORMS 2009-11-07 13:02:41.000000000 -0700 -@@ -4,6 +4,7 @@ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff -Naur doxygen-1.6.1/configure doxygen-1.6.1-haiku/configure ---- doxygen-1.6.1/configure 2009-08-25 03:49:10.000000000 -0600 -+++ doxygen-1.6.1-haiku/configure 2009-11-07 13:01:31.000000000 -0700 -@@ -180,6 +180,9 @@ - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff -Naur doxygen-1.6.1/qtools/qglobal.h doxygen-1.6.1-haiku/qtools/qglobal.h ---- doxygen-1.6.1/qtools/qglobal.h 2008-12-06 06:16:20.000000000 -0700 -+++ doxygen-1.6.1-haiku/qtools/qglobal.h 2009-11-07 13:09:09.000000000 -0700 -@@ -147,6 +147,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff -Naur doxygen-1.6.1/src/doxygen.pro.in doxygen-1.6.1-haiku/src/doxygen.pro.in ---- doxygen-1.6.1/src/doxygen.pro.in 2009-08-02 07:55:02.000000000 -0600 -+++ doxygen-1.6.1-haiku/src/doxygen.pro.in 2009-11-07 13:19:57.000000000 -0700 -@@ -19,6 +19,7 @@ - HEADERS = doxygen.h - SOURCES = main.cpp - unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/app.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.1/tmake/lib/haiku-g++/app.t 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t 2009-11-07 13:04:20.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/lib.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.1/tmake/lib/haiku-g++/lib.t 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t 2009-11-07 13:04:20.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t 2009-11-07 13:04:20.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf 2009-11-07 13:09:42.000000000 -0700 -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f diff --git a/app-doc/doxygen/patches/doxygen-1.6.2.patch b/app-doc/doxygen/patches/doxygen-1.6.2.patch deleted file mode 100644 index f0692e0bc..000000000 --- a/app-doc/doxygen/patches/doxygen-1.6.2.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -up doxygen-1.6.2/PLATFORMS.orig doxygen-1.6.2/PLATFORMS ---- doxygen-1.6.2/PLATFORMS.orig 2007-11-24 09:12:35.000000000 -0700 -+++ doxygen-1.6.2/PLATFORMS 2010-01-06 17:27:33.000000000 -0700 -@@ -4,6 +4,7 @@ beos-g++ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff -up doxygen-1.6.2/configure.orig doxygen-1.6.2/configure ---- doxygen-1.6.2/configure.orig 2009-12-29 05:57:53.000000000 -0700 -+++ doxygen-1.6.2/configure 2010-01-06 17:27:33.000000000 -0700 -@@ -180,6 +180,9 @@ if test -z "$f_platform"; then - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff -up doxygen-1.6.2/qtools/qglobal.h.orig doxygen-1.6.2/qtools/qglobal.h ---- doxygen-1.6.2/qtools/qglobal.h.orig 2009-10-25 09:44:29.000000000 -0600 -+++ doxygen-1.6.2/qtools/qglobal.h 2010-01-06 17:27:33.000000000 -0700 -@@ -150,6 +150,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff -up doxygen-1.6.2/src/doxygen.pro.in.orig doxygen-1.6.2/src/doxygen.pro.in ---- doxygen-1.6.2/src/doxygen.pro.in.orig 2009-08-02 07:55:02.000000000 -0600 -+++ doxygen-1.6.2/src/doxygen.pro.in 2010-01-06 17:27:33.000000000 -0700 -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt - HEADERS = doxygen.h - SOURCES = main.cpp - unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/app.t 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/lib.t 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f diff --git a/app-doc/doxygen/patches/doxygen-1.6.3.patch b/app-doc/doxygen/patches/doxygen-1.6.3.patchset similarity index 53% rename from app-doc/doxygen/patches/doxygen-1.6.3.patch rename to app-doc/doxygen/patches/doxygen-1.6.3.patchset index e087c2974..68b9cf3e8 100644 --- a/app-doc/doxygen/patches/doxygen-1.6.3.patch +++ b/app-doc/doxygen/patches/doxygen-1.6.3.patchset @@ -1,6 +1,13 @@ -diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in ---- doxygen-1.6.3/Makefile.in.orig 2010-03-18 22:18:10.189005824 -0600 -+++ doxygen-1.6.3/Makefile.in 2010-03-18 22:18:16.079953920 -0600 +From 9612cfcd716d5924547e90229bd6e3cb51c950e9 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Wed, 21 Aug 2013 12:02:33 +0200 +Subject: add support for Haiku + + +diff --git a/Makefile.in b/Makefile.in +index 781d359..9cd43eb 100644 +--- a/Makefile.in ++++ b/Makefile.in @@ -2,7 +2,7 @@ # cd qtools ; $(MAKE) # cd src ; $(MAKE) @@ -10,9 +17,10 @@ diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in clean: FORCE cd examples ; $(MAKE) clean -diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS ---- doxygen-1.6.3/PLATFORMS.orig 2007-11-24 09:12:35.009437184 -0700 -+++ doxygen-1.6.3/PLATFORMS 2010-03-18 22:17:57.002097152 -0600 +diff --git a/PLATFORMS b/PLATFORMS +index c358a1d..18c4ed5 100644 +--- a/PLATFORMS ++++ b/PLATFORMS @@ -4,6 +4,7 @@ beos-g++ dgux-g++ freebsd-g++ @@ -21,9 +29,10 @@ diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS hpux-acc hpux-cc hpux-g++ -diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure ---- doxygen-1.6.3/configure.orig 2010-02-20 15:19:31.059244544 -0700 -+++ doxygen-1.6.3/configure 2010-03-18 22:17:57.024903680 -0600 +diff --git a/configure b/configure +index c0db1c6..d631e47 100755 +--- a/configure ++++ b/configure @@ -180,6 +180,9 @@ if test -z "$f_platform"; then f_insttool=/usr/bin/install fi @@ -34,9 +43,10 @@ diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure HP-UX:*) f_platform=hpux-g++ if test "$f_insttool" = NO; then -diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h ---- doxygen-1.6.3/qtools/qglobal.h.orig 2009-10-25 09:44:29.014680064 -0600 -+++ doxygen-1.6.3/qtools/qglobal.h 2010-03-18 22:17:57.054001664 -0600 +diff --git a/qtools/qglobal.h b/qtools/qglobal.h +index 700cb80..259446d 100644 +--- a/qtools/qglobal.h ++++ b/qtools/qglobal.h @@ -150,6 +150,8 @@ #define _OS_CYGWIN_ #elif defined(__BEOS__) @@ -46,10 +56,11 @@ diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h #elif defined(__MINT__) #define _OS_MINT_ #else -diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in ---- doxygen-1.6.3/src/doxygen.pro.in.orig 2010-01-01 04:53:11.034078720 -0700 -+++ doxygen-1.6.3/src/doxygen.pro.in 2010-03-18 22:17:57.078381056 -0600 -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt +diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in +index cc93820..c8a8d50 100644 +--- a/src/doxygen.pro.in ++++ b/src/doxygen.pro.in +@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopts HEADERS = doxygen.h SOURCES = main.cpp unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 @@ -57,27 +68,35 @@ diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in win32:INCLUDEPATH += . win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig 2010-03-18 22:17:57.103284736 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/app.t 2010-03-18 22:17:57.105119744 -0600 +diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t +new file mode 100644 +index 0000000..867725e +--- /dev/null ++++ b/tmake/lib/haiku-g++/app.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig 2010-03-18 22:17:57.126615552 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/lib.t 2010-03-18 22:17:57.128188416 -0600 +diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t +new file mode 100644 +index 0000000..2523b2f +--- /dev/null ++++ b/tmake/lib/haiku-g++/lib.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig 2010-03-18 22:17:57.152043520 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t 2010-03-18 22:17:57.153354240 -0600 +diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t +new file mode 100644 +index 0000000..5e888af +--- /dev/null ++++ b/tmake/lib/haiku-g++/subdirs.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig 2010-03-18 22:17:57.175112192 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf 2010-03-18 22:17:57.176685056 -0600 +diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf +new file mode 100644 +index 0000000..23a2738 +--- /dev/null ++++ b/tmake/lib/haiku-g++/tmake.conf @@ -0,0 +1,51 @@ +# +# @@ -130,3 +149,29 @@ diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/l + +TMAKE_TAR = tar -cf +TMAKE_GZIP = gzip -9f +-- +1.8.3.4 + + +From 2e7199416501ace72e5ab2a548cc07ab25ef910e Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Wed, 21 Aug 2013 12:21:09 +0200 +Subject: qvaluestack.h: fix gcc 4 build + + +diff --git a/qtools/qvaluestack.h b/qtools/qvaluestack.h +index 3fb61fd..7438fcb 100644 +--- a/qtools/qvaluestack.h ++++ b/qtools/qvaluestack.h +@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QValueList + public: + QValueStack() {} + ~QValueStack() {} +- void push( const T& d ) { append(d); } ++ void push( const T& d ) { this->append(d); } + T pop() + { + T elem( this->last() ); +-- +1.8.3.4 + diff --git a/app-editors/jed/jed-0.99-19.bep b/app-editors/jed/jed-0.99_19.recipe similarity index 96% rename from app-editors/jed/jed-0.99-19.bep rename to app-editors/jed/jed-0.99_19.recipe index 28e7ed07f..405e19c38 100644 --- a/app-editors/jed/jed-0.99-19.bep +++ b/app-editors/jed/jed-0.99_19.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="ncurses >= 5.7 slang >= 2.2.2" CHECKSUM_MD5="c9b2f58a3defc6f61faa1ce7d6d629ea" -BUILD { +BUILD() +{ cd jed-0.99-19 cd autoconf cp /boot/common/share/libtool/config/config.guess . @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jed-0.99-19 touch src/objs/xjed make install DESTDIR=${DESTDIR} diff --git a/app-editors/joe/joe-3.8-hg.bep b/app-editors/joe/joe-3.8_hg.recipe similarity index 96% rename from app-editors/joe/joe-3.8-hg.bep rename to app-editors/joe/joe-3.8_hg.recipe index c187bada5..a1954b5f8 100644 --- a/app-editors/joe/joe-3.8-hg.bep +++ b/app-editors/joe/joe-3.8_hg.recipe @@ -5,7 +5,8 @@ REVISION="2" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="66de1b073e869ba12abbfcde3885c577" -BUILD { +BUILD() +{ cd joe-3.8-hg autojoe COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd joe-3.8-hg make install } diff --git a/app-editors/nano/nano-2.2.3.bep b/app-editors/nano/nano-2.2.3.recipe similarity index 95% rename from app-editors/nano/nano-2.2.3.bep rename to app-editors/nano/nano-2.2.3.recipe index 77247c1bf..4bc904ada 100644 --- a/app-editors/nano/nano-2.2.3.bep +++ b/app-editors/nano/nano-2.2.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50" -BUILD { +BUILD() +{ cd nano-2.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd nano-2.2.3 make install } diff --git a/app-editors/nano/nano-2.2.5.bep b/app-editors/nano/nano-2.2.5.recipe similarity index 95% rename from app-editors/nano/nano-2.2.5.bep rename to app-editors/nano/nano-2.2.5.recipe index 216e4fc4f..ce7a97840 100644 --- a/app-editors/nano/nano-2.2.5.bep +++ b/app-editors/nano/nano-2.2.5.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="77a10a49589f975ce98350a4527a2ebf" -BUILD { +BUILD() +{ cd nano-2.2.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd nano-2.2.5 make install } diff --git a/app-editors/nano/nano-2.2.6.bep b/app-editors/nano/nano-2.2.6.bep deleted file mode 100644 index 074d13d35..000000000 --- a/app-editors/nano/nano-2.2.6.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/" -SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/ncurses >= 5.6 - sys-apps/groff >= 1.20.1" -CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" -BUILD { - cd nano-2.2.6 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd nano-2.2.6 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1999-2010 Free Software Foundation, Inc. " diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe new file mode 100644 index 000000000..4d099ea3c --- /dev/null +++ b/app-editors/nano/nano-2.2.6.recipe @@ -0,0 +1,48 @@ +SUMMARY="GNU GPL'd Pico clone with more functionality" +DESCRIPTION="GNU GPL'd Pico clone with more functionality." +HOMEPAGE="http://www.nano-editor.org/" +SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" +CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" +LICENSE="GNU GPL v3" +COPYRIGHT="1999-2010 Free Software Foundation, Inc. " +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="nano-2.2.6.patchset" + +PROVIDES=" + nano = $portVersion compat >= 2 + cmd:nano = $portVersion compat >= 2 + cmd:rnano = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:groff + lib:libncurses + " +BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoreconf + cmd:gcc + cmd:groff + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + autoreconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/app-editors/nano/nano-2.3.1.bep b/app-editors/nano/nano-2.3.1.recipe similarity index 96% rename from app-editors/nano/nano-2.3.1.bep rename to app-editors/nano/nano-2.3.1.recipe index 572854138..f44f95d4b 100644 --- a/app-editors/nano/nano-2.3.1.bep +++ b/app-editors/nano/nano-2.3.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6 sys-apps/groff >= 1.20.1" -BUILD { +BUILD() +{ cd nano-2.3.1 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd nano-2.3.1 make install } diff --git a/app-editors/nano/patches/nano-2.2.6.patchset b/app-editors/nano/patches/nano-2.2.6.patchset new file mode 100644 index 000000000..eb3f5435b --- /dev/null +++ b/app-editors/nano/patches/nano-2.2.6.patchset @@ -0,0 +1,22 @@ +From 46be39445685504279a76f9eb09a961708d7e497 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 22:50:15 +0200 +Subject: doc/Makefile.am: use docdir instead of hard-coded path + + +diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am +index fbcdce8..2d7ad47 100644 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -19,7 +19,7 @@ endif + nano_man_mans = nano.1 nanorc.5 rnano.1 + if GROFF_HTML + htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html +-htmlmandir = $(datadir)/nano/man-html ++htmlmandir = $(docdir) + nano_built_sources = nano.1.html nanorc.5.html rnano.1.html + + nano.1.html: nano.1 +-- +1.7.5 + diff --git a/app-editors/ne/ne-2.1.bep b/app-editors/ne/ne-2.1.recipe similarity index 95% rename from app-editors/ne/ne-2.1.bep rename to app-editors/ne/ne-2.1.recipe index 474e9206a..1c7dd6bbc 100644 --- a/app-editors/ne/ne-2.1.bep +++ b/app-editors/ne/ne-2.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://ne.dsi.unimi.it/ne-2.1.tar.gz" REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="9f76652f6349721cfe0e8dc2aec9c767" -BUILD { +BUILD() +{ cd ne-2.1 make PREFIX=`finddir B_COMMON_DIRECTORY` NE_ANSI=1 haiku } -INSTALL { +INSTALL() +{ cd ne-2.1 make PREFIX=`finddir B_COMMON_DIRECTORY` haiku } diff --git a/app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch b/app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch new file mode 100644 index 000000000..c04011406 --- /dev/null +++ b/app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch @@ -0,0 +1,1558 @@ +Index: Makefile +=================================================================== +RCS file: /sources/qemacs/qemacs/Makefile,v +retrieving revision 1.50 +diff -u -r1.50 Makefile +--- qemacs-0.3.2dev-cvs/Makefile 5 Jun 2008 07:14:12 -0000 1.50 ++++ qemacs-0.3.2dev-cvs/Makefile 14 Mar 2013 23:32:46 -0000 +@@ -63,7 +63,7 @@ + endif + + ifdef CONFIG_DLL +- LIBS+=-ldl ++ LIBS+=$(DLLIBS) + # export some qemacs symbols + LDFLAGS+=-Wl,-E + endif +@@ -72,6 +72,11 @@ + TARGETS+= qe-doc.html + endif + ++ifdef CONFIG_HAIKU ++ OBJS+= haiku.o ++ LIBS+= -lbe ++endif ++ + ifdef CONFIG_WIN32 + OBJS+= unix.o + TOBJS+= unix.o +@@ -84,7 +89,7 @@ + else + OBJS+= unix.o tty.o + TOBJS+= unix.o tty.o +- LIBS+= -lm ++ LIBS+= $(EXTRALIBS) + endif + + ifdef CONFIG_QSCRIPT +@@ -143,7 +148,7 @@ + OBJS+= video.o image.o + DEP_LIBS+= $(FFMPEG_LIBDIR)/libavcodec/libavcodec.a $(FFMPEG_LIBDIR)/libavformat/libavformat.a + LIBS+= -L$(FFMPEG_LIBDIR)/libavcodec -L$(FFMPEG_LIBDIR)/libavformat -lavformat -lavcodec -lz -lpthread +- DEFINES+= -I$(FFMPEG_SRCDIR)/libavcodec -I$(FFMPEG_SRCDIR)/libavformat ++ DEFINES+= -I$(FFMPEG_SRCDIR) -I$(FFMPEG_SRCDIR)/libavcodec -I$(FFMPEG_SRCDIR)/libavformat + TARGETS+= ffplay$(EXE) + endif + +@@ -226,6 +231,9 @@ + $(OBJS_DIR)/%.o: %.c qe.h qestyles.h config.h config.mak Makefile + $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $< + ++$(OBJS_DIR)/haiku.o: haiku.cpp qe.h qestyles.h config.h config.mak Makefile ++ g++ $(DEFINES) $(CFLAGS) -Wno-multichar -o $@ -c $< ++ + # + # Test for bidir algorithm + # +@@ -391,7 +399,8 @@ + charsetjis.def charsetmore.c clang.c config.eg config.h \ + configure cptoqe.c cutils.c cutils.h dired.c display.c \ + display.h docbook.c extras.c fbffonts.c fbfrender.c \ +- fbfrender.h fbftoqe.c hex.c html.c html2png.c htmlsrc.c \ ++ fbfrender.h fbftoqe.c haiku.cpp hex.c html.c html2png.c \ ++ htmlsrc.c \ + image.c indic.c input.c jistoqe.c kmap.c kmaptoqe.c \ + latex-mode.c libfbf.c libfbf.h ligtoqe.c list.c makemode.c \ + mpeg.c perl.c qe-doc.html qe-doc.texi qe.1 qe.c qe.h qe.tcc \ +Index: cfb.c +=================================================================== +RCS file: /sources/qemacs/qemacs/cfb.c,v +retrieving revision 1.8 +diff -u -r1.8 cfb.c +--- qemacs-0.3.2dev-cvs/cfb.c 8 Apr 2008 06:55:44 -0000 1.8 ++++ qemacs-0.3.2dev-cvs/cfb.c 14 Mar 2013 23:32:46 -0000 +@@ -50,7 +50,7 @@ + static void cfb16_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *dest, *d; + int y, n; + unsigned int col; +@@ -101,7 +101,7 @@ + static void cfb32_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *dest, *d; + int y, n; + unsigned int col; +@@ -145,7 +145,7 @@ + int x1, int y1, int w, int h, QEColor color, + unsigned char *glyph, int glyph_wrap) + { +- CFBContext *cfb = s1->private; ++ CFBContext *cfb = s1->priv_data; + unsigned char *dest, *d, *s, *src; + int n; + unsigned int col; +@@ -189,7 +189,7 @@ + int x1, int y1, int w, int h, QEColor color, + unsigned char *glyph, int glyph_wrap) + { +- CFBContext *cfb = s1->private; ++ CFBContext *cfb = s1->priv_data; + unsigned char *dest, *d, *s, *src; + int n; + unsigned int col; +@@ -233,7 +233,7 @@ + int x_start, int y, const unsigned int *str, int len, + QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + GlyphCache *g; + unsigned char *glyph_ptr; + int i, x1, y1, x2, y2, wrap, x; +@@ -309,7 +309,7 @@ + int cfb_init(QEditScreen *s, + void *base, int wrap, int depth, const char *font_path) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + cfb->base = base; + cfb->wrap = wrap; +Index: configure +=================================================================== +RCS file: /sources/qemacs/qemacs/configure,v +retrieving revision 1.15 +diff -u -r1.15 configure +--- qemacs-0.3.2dev-cvs/configure 17 Apr 2008 15:06:44 -0000 1.15 ++++ qemacs-0.3.2dev-cvs/configure 14 Mar 2013 23:32:46 -0000 +@@ -45,9 +45,11 @@ + ptsname="yes" + gprof="no" + network="yes" ++haiku="no" + win32="no" + cygwin="no" + lshared="no" ++dllibs="-ldl" + extralibs="" + simpleidct="yes" + bigendian="no" +@@ -79,10 +81,10 @@ + # no need for libm, but the inet stuff + # Check for BONE + if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then +- extralibs="-lbind -lsocket -lm" ++ extralibs="-lbind -lsocket" + else + echo "Not sure building for net_server will succeed... good luck." +- extralibs="-lsocket -lm" ++ extralibs="-lsocket" + fi + ;; + BSD/OS) +@@ -102,6 +104,19 @@ + CYGWIN*) + cygwin="yes" + ;; ++ Haiku) ++ prefix="`finddir B_COMMON_DIRECTORY`" ++ # no need for libm, but the network stuff ++ extralibs="-lnetwork" ++ # dlopen() is in libroot already ++ dllibs="" ++ # use Haiku GUI; avoid building for X11 even if there are headers around ++ haiku="yes" ++ html="yes" ++ png="yes" ++ x11="no" ++ xv="no" ++ ;; + *) + extralibs="-lm" + unlockio="yes" +@@ -256,8 +271,11 @@ + if test "$x11" = "no" ; then + xv="no" + xrender="no" +- png="no" ++fi ++ ++if test "$x11" = "no" -a "$haiku" = "no" ; then + ffmpeg="no" ++ png="no" + html="no" + fi + +@@ -439,6 +457,7 @@ + echo "BUILD_SHARED=yes" >> config.mak + echo "PIC=-fPIC" >> config.mak + fi ++echo "DLLIBS=$dllibs" >> config.mak + echo "EXTRALIBS=$extralibs" >> config.mak + echo -n "VERSION=" >>config.mak + echo -n `head $source_path/VERSION` >> config.mak +@@ -451,6 +470,11 @@ + echo "CONFIG_NETWORK=yes" >> config.mak + fi + ++if test "$haiku" = "yes" ; then ++ echo "#define CONFIG_HAIKU 1" >> $TMPH ++ echo "CONFIG_HAIKU=yes" >> config.mak ++fi ++ + if test "$win32" = "yes" ; then + echo "#define CONFIG_WIN32 1" >> $TMPH + echo "CONFIG_WIN32=yes" >> config.mak +Index: display.h +=================================================================== +RCS file: /sources/qemacs/qemacs/display.h,v +retrieving revision 1.11 +diff -u -r1.11 display.h +--- qemacs-0.3.2dev-cvs/display.h 11 Jan 2008 11:29:28 -0000 1.11 ++++ qemacs-0.3.2dev-cvs/display.h 14 Mar 2013 23:32:46 -0000 +@@ -53,7 +53,7 @@ + int refcount; + int ascent; + int descent; +- void *private; ++ void *priv_data; + int system_font; /* TRUE if system font */ + /* cache data */ + int style; +@@ -148,12 +148,12 @@ + QECharset *charset; /* the charset of the TTY, XXX: suppress that, + use a system in fonts instead */ + int media; /* media type (see CSS_MEDIA_xxx) */ +- int bitmap_format; /* supported bitmap format */ +- int video_format; /* supported video format */ ++ QEBitmapFormat bitmap_format; /* supported bitmap format */ ++ QEBitmapFormat video_format; /* supported video format */ + /* clip region handling */ + int clip_x1, clip_y1; + int clip_x2, clip_y2; +- void *private; ++ void *priv_data; + }; + + int qe_register_display(QEDisplay *dpy); +Index: fbfrender.c +=================================================================== +RCS file: /sources/qemacs/qemacs/fbfrender.c,v +retrieving revision 1.10 +diff -u -r1.10 fbfrender.c +--- qemacs-0.3.2dev-cvs/fbfrender.c 8 Jan 2008 16:37:54 -0000 1.10 ++++ qemacs-0.3.2dev-cvs/fbfrender.c 14 Mar 2013 23:32:46 -0000 +@@ -124,7 +124,7 @@ + + static GlyphCache *fbf_decode_glyph1(QEFont *font, int code) + { +- UniFontData *uf = font->private; ++ UniFontData *uf = font->priv_data; + int glyph_index, size, src_width, src_height; + GlyphCache *glyph_cache; + GlyphEntry *fbf_glyph_entry; +@@ -270,7 +270,7 @@ + } + } + } +- font->private = uf_found; ++ font->priv_data = uf_found; + font->ascent = uf_found->ascent; + font->descent = uf_found->descent; + return font; +Index: html2png.c +=================================================================== +RCS file: /sources/qemacs/qemacs/html2png.c,v +retrieving revision 1.12 +diff -u -r1.12 html2png.c +--- qemacs-0.3.2dev-cvs/html2png.c 11 Jan 2008 11:29:28 -0000 1.12 ++++ qemacs-0.3.2dev-cvs/html2png.c 14 Mar 2013 23:32:47 -0000 +@@ -135,7 +135,7 @@ + /* realloc ppm bitmap */ + static int ppm_resize(QEditScreen *s, int w, int h) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + /* alloc bitmap */ + if (!qe_realloc(&cfb->base, w * h * sizeof(int))) { +@@ -160,7 +160,7 @@ + if (!cfb) + return -1; + +- s->private = cfb; ++ s->priv_data = cfb; + s->media = CSS_MEDIA_SCREEN; + + if (cfb_init(s, NULL, w * sizeof(int), 32, ".") < 0) +@@ -169,7 +169,7 @@ + if (ppm_resize(s, w, h) < 0) { + fail: + qe_free(&cfb->base); +- qe_free(&s->private); ++ qe_free(&s->priv_data); + return -1; + } + return 0; +@@ -177,15 +177,15 @@ + + static void ppm_close(QEditScreen *s) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + qe_free(&cfb->base); +- qe_free(&s->private); ++ qe_free(&s->priv_data); + } + + static int ppm_save(QEditScreen *s, const char *filename) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + int w, h, x, y; + unsigned int r, g, b, v; + unsigned int *data; +@@ -219,7 +219,7 @@ + + static int png_save(QEditScreen *s, const char *filename) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + struct png_save_data { + FILE *f; + png_structp png_ptr; +Index: qe.h +=================================================================== +RCS file: /sources/qemacs/qemacs/qe.h,v +retrieving revision 1.96 +diff -u -r1.96 qe.h +--- qemacs-0.3.2dev-cvs/qe.h 4 May 2008 15:54:39 -0000 1.96 ++++ qemacs-0.3.2dev-cvs/qe.h 14 Mar 2013 23:32:48 -0000 +@@ -267,11 +267,11 @@ + int ustristart(const unsigned int *str, const char *val, const unsigned int **ptr); + static inline unsigned int *umemmove(unsigned int *dest, + unsigned int *src, int count) { +- return memmove(dest, src, count * sizeof(unsigned int)); ++ return (unsigned int *)memmove(dest, src, count * sizeof(unsigned int)); + } + static inline unsigned int *umemcpy(unsigned int *dest, + unsigned int *src, int count) { +- return memcpy(dest, src, count * sizeof(unsigned int)); ++ return (unsigned int *)memcpy(dest, src, count * sizeof(unsigned int)); + } + int umemcmp(const unsigned int *s1, const unsigned int *s2, int count); + +Index: tty.c +=================================================================== +RCS file: /sources/qemacs/qemacs/tty.c,v +retrieving revision 1.50 +diff -u -r1.50 tty.c +--- qemacs-0.3.2dev-cvs/tty.c 23 Apr 2008 15:30:33 -0000 1.50 ++++ qemacs-0.3.2dev-cvs/tty.c 14 Mar 2013 23:32:49 -0000 +@@ -118,7 +118,7 @@ + + tty_screen = s; + ts = &tty_state; +- s->private = ts; ++ s->priv_data = ts; + s->media = CSS_MEDIA_TTY; + + /* Derive some settings from the TERM environment variable */ +@@ -263,7 +263,7 @@ + static void tty_term_exit(void) + { + QEditScreen *s = tty_screen; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + + tcsetattr(fileno(s->STDIN), TCSANOW, &ts->oldtty); + } +@@ -271,7 +271,7 @@ + static void tty_resize(__unused__ int sig) + { + QEditScreen *s = tty_screen; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + struct winsize ws; + int i, count, size; + TTYChar tc; +@@ -318,7 +318,7 @@ + static void tty_term_cursor_at(QEditScreen *s, int x1, int y1, + __unused__ int w, __unused__ int h) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + ts->cursor_x = x1; + ts->cursor_y = y1; + } +@@ -380,7 +380,7 @@ + { + QEditScreen *s = opaque; + QEmacsState *qs = &qe_state; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int ch; + QEEvent ev1, *ev = &ev1; + +@@ -425,6 +425,7 @@ + ts->input_param = 0; + } else if (ch == 'O') { + ts->input_state = IS_ESC2; ++ ts->input_param = 0; + } else { + ch = KEY_META(ch); + ts->input_state = IS_NORM; +@@ -826,7 +827,7 @@ + static void tty_term_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int x2 = x1 + w; + int y2 = y1 + h; + int x, y; +@@ -869,7 +870,7 @@ + + font->ascent = 0; + font->descent = 1; +- font->private = NULL; ++ font->priv_data = NULL; + return font; + } + +@@ -958,7 +959,7 @@ + int x, int y, const unsigned int *str, int len, + QEColor color) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + TTYChar *ptr; + int fgcolor, w, n; + unsigned int cc; +@@ -1021,7 +1022,7 @@ + + static void tty_term_flush(QEditScreen *s) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + TTYChar *ptr, *ptr1, *ptr2, *ptr3, *ptr4, cc, blankcc; + int y, shadow, ch, bgcolor, fgcolor, shifted; + +Index: win32.c +=================================================================== +RCS file: /sources/qemacs/qemacs/win32.c,v +retrieving revision 1.15 +diff -u -r1.15 win32.c +--- qemacs-0.3.2dev-cvs/win32.c 23 Apr 2008 15:29:35 -0000 1.15 ++++ qemacs-0.3.2dev-cvs/win32.c 14 Mar 2013 23:32:49 -0000 +@@ -139,7 +139,7 @@ + if (!_hPrev) + init_application(); + +- s->private = NULL; ++ s->priv_data = NULL; + s->media = CSS_MEDIA_SCREEN; + + win_ctx.font = CreateFont(-12, 0, 0, 0, 0 , 0, 0, 0, 0, 0, 0, 0, +@@ -452,7 +452,7 @@ + GetTextMetrics(win_ctx.hdc, &tm); + font->ascent = tm.tmAscent; + font->descent = tm.tmDescent; +- font->private = NULL; ++ font->priv_data = NULL; + return font; + } + +Index: x11.c +=================================================================== +RCS file: /sources/qemacs/qemacs/x11.c,v +retrieving revision 1.28 +diff -u -r1.28 x11.c +--- qemacs-0.3.2dev-cvs/x11.c 15 Apr 2008 23:24:04 -0000 1.28 ++++ qemacs-0.3.2dev-cvs/x11.c 14 Mar 2013 23:32:49 -0000 +@@ -194,7 +194,7 @@ + QEStyleDef default_style; + XGCValues gc_val; + +- s->private = NULL; ++ s->priv_data = NULL; + s->media = CSS_MEDIA_SCREEN; + + if (!display_str) +@@ -564,13 +564,13 @@ + } + font->ascent = renderFont->ascent; + font->descent = renderFont->descent; +- font->private = renderFont; ++ font->priv_data = renderFont; + return font; + } + + static void term_close_font(QEditScreen *s, QEFont *font) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + + XftFontClose(display, renderFont); + /* Clear structure to force crash if font is still used after +@@ -582,7 +582,7 @@ + + static int term_glyph_width(QEditScreen *s, QEFont *font, unsigned int cc) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + XGlyphInfo gi; + + XftTextExtents32(display, renderFont, &cc, 1, &gi); +@@ -593,7 +593,7 @@ + int x, int y, const unsigned int *str, int len, + QEColor color) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + XftColor col; + int r, g, b, a; + +@@ -764,7 +764,7 @@ + + font->ascent = xfont->ascent; + font->descent = xfont->descent; +- font->private = xfont; ++ font->priv_data = xfont; + return font; + fail: + XFreeFontNames(list); +@@ -774,7 +774,7 @@ + + static void term_close_font(__unused__ QEditScreen *s, QEFont *font) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + + XFreeFont(display, xfont); + /* Clear structure to force crash if font is still used after +@@ -788,7 +788,7 @@ + associated. */ + static XCharStruct *get_char_struct(QEFont *font, int cc) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + int b1, b2; + XCharStruct *cs; + +@@ -856,7 +856,7 @@ + + /* really no glyph : use default char in current font */ + /* Should have half-width and full-width default char patterns */ +- xfont = font->private; ++ xfont = font->priv_data; + cs = get_char_struct(font, xfont->default_char); + *out_font = lock_font(s, font); + return cs; +@@ -928,13 +928,13 @@ + cs = handle_fallback(s, &font1, font, cc); + if (!cs) { + /* still no char: use default glyph */ +- xfont = font->private; ++ xfont = font->priv_data; + cc = xfont->default_char; + } + } + /* flush previous chars if font change needed */ + if (font1 != last_font && q > x11_str) { +- xfont = last_font->private; ++ xfont = last_font->priv_data; + l = q - x11_str; + XSetFont(display, gc, xfont->fid); + XDrawString16(display, dbuffer, gc, x_start, y, x11_str, l); +@@ -950,7 +950,7 @@ + } + if (q > x11_str) { + /* flush remaining chars (more common case) */ +- xfont = last_font->private; ++ xfont = last_font->priv_data; + l = q - x11_str; + XSetFont(display, gc, xfont->fid); + XDrawString16(display, dbuffer, gc, x_start, y, x11_str, l); +--- qemacs-0.3.2dev-cvs//dev/null 2013-03-14 16:10:28.351668000 +0100 ++++ qemacs-0.3.2dev-cvs/haiku.cpp 2013-03-14 20:51:17.995622912 +0100 +@@ -0,0 +1,883 @@ ++/* ++ * Haiku driver for QEmacs ++ * Copyright (c) 2013 François Revol. ++ * Copyright (c) 2002 Fabrice Bellard. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++extern "C" { ++#include "qe.h" ++} ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern QEDisplay haiku_dpy; ++ ++static int force_tty = 0; ++ ++static int font_xsize; ++ ++class QEWindow; ++class QEView; ++ ++/* state of a single window */ ++typedef struct WindowState { ++ BWindow *w; ++ BView *v; ++ BFont font; ++ int events_rd; ++ int events_wr; ++} WindowState; ++ ++WindowState haiku_ctx; ++static thread_id bapp_thid; ++static int bapp_ref_count = 0; ++static int events_wr; ++ ++/* count of pending repaints */ ++static vint32 repaints = 0; ++//TODO:use double-buffering with a BBitmap ++ ++static void haiku_handle_event(void *opaque); ++ ++static status_t bmessage_input(QEWindow *win, QEView *view, BMessage *message) ++{ ++ if (!message) ++ return EINVAL; ++ /* push the message into the pipe */ ++ if (write(events_wr, &message, sizeof(BMessage *)) < 0) ++ return errno; ++ return B_OK; ++} ++ ++class QEWindow: public BWindow ++{ ++public: ++ QEWindow(BRect frame, const char *name, QEView *view) ++ :BWindow(frame, name, B_TITLED_WINDOW, 0) ++ ,fView(view) ++ {} ++ ++ virtual ~QEWindow() {} ++ ++//virtual void Show(); ++//virtual void Hide(); ++//virtual void Minimize(bool minimize); ++virtual bool QuitRequested(); ++virtual void DispatchMessage(BMessage *message, BHandler *handler); ++ ++private: ++ QEView *fView; ++}; ++ ++class QEView: public BView ++{ ++public: ++ QEView(BRect frame, const char *name); ++ virtual ~QEView(); ++ ++virtual void MouseDown(BPoint where); ++virtual void MouseUp(BPoint where); ++virtual void MouseMoved(BPoint where, uint32 code, const BMessage *a_message); ++virtual void KeyDown(const char *bytes, int32 numBytes); ++virtual void KeyUp(const char *bytes, int32 numBytes); ++virtual void Draw(BRect updateRect); ++virtual void FrameResized(float new_width, float new_height); ++#if 0 ++virtual void WindowActivated(bool state); ++virtual void MessageReceived(BMessage *message); ++#endif ++}; ++ ++ ++bool QEWindow::QuitRequested() ++{ ++ BMessage *message = new BMessage(B_QUIT_REQUESTED); ++ bmessage_input(this, NULL, message); ++ return false; ++} ++ ++void QEWindow::DispatchMessage(BMessage *message, BHandler *handler) ++{ ++ uint32 mods; ++ switch (message->what) { ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ BMessage *message = DetachCurrentMessage(); ++ bmessage_input(this, NULL, message); ++ } ++ break; ++ case B_KEY_DOWN: ++ if ((message->FindInt32("modifiers", (int32 *)&mods) == B_OK) && ++ (mods & B_COMMAND_KEY)) { ++ /* BWindow swallows KEY_DOWN when ALT is down... ++ * so this hack is needed. ++ */ ++ fView->KeyDown(NULL, 0); ++ return; ++ } ++ break; ++ case B_UNMAPPED_KEY_DOWN: ++ case B_UNMAPPED_KEY_UP: ++ case B_KEY_UP: ++ //message->PrintToStream(); ++ break; ++ } ++ BWindow::DispatchMessage(message, handler); ++} ++ ++QEView::QEView(BRect frame, const char *name) ++ :BView(frame, name, B_FOLLOW_ALL_SIDES, B_WILL_DRAW|B_FRAME_EVENTS) ++{ ++ SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR)); ++ //SetViewColor(0, 255, 0); ++} ++ ++QEView::~QEView() ++{ ++} ++ ++void QEView::MouseDown(BPoint where) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::MouseUp(BPoint where) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::MouseMoved(BPoint where, uint32 code, const BMessage *a_message) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::KeyDown(const char *bytes, int32 numBytes) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ //message->PrintToStream(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::KeyUp(const char *bytes, int32 numBytes) ++{ ++ uint32 mods; ++ BMessage *message = Window()->DetachCurrentMessage(); ++ //message->PrintToStream(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::Draw(BRect updateRect) ++{ ++ BMessage *message; ++ message = new BMessage(_UPDATE_); ++ message->AddRect("update_rect", updateRect); ++ atomic_add(&repaints, 1); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::FrameResized(float new_width, float new_height) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ atomic_set(&repaints, 0); ++ bmessage_input(NULL, this, message); ++ BView::FrameResized(new_width, new_height); ++} ++ ++ ++static int haiku_probe(void) ++{ ++ if (force_tty) ++ return 0; ++ return 2; ++} ++ ++static int32 bapp_quit_thread(void *arg) ++{ ++ be_app->Lock(); ++ be_app->Quit(); ++ return 0; ++} ++ ++ ++static int32 bapp_thread(void *arg) ++{ ++ be_app->Lock(); ++ be_app->Run(); ++ return 0; ++} ++ ++ ++ ++static void init_application(void) ++{ ++ bapp_ref_count++; ++ if (be_app) ++ return; /* done already! */ ++ new BApplication("application/x-vnd.Bellard-QEmacs"); ++ //new XEmacsApp; ++ bapp_thid = spawn_thread(bapp_thread, "BApplication(QEmacs)", B_NORMAL_PRIORITY, (void *)find_thread(NULL)); ++ if (bapp_thid < B_OK) ++ return; /* #### handle errors */ ++ if (resume_thread(bapp_thid) < B_OK) ++ return; ++ // This way we ensure we don't create BWindows before be_app is created ++ // (creating it in the thread doesn't ensure this) ++ be_app->Unlock(); ++} ++ ++static void uninit_application(void) ++{ ++ status_t err; ++ if (--bapp_ref_count) ++ return; ++ be_app->Lock(); ++ be_app->Quit(); ++ //XXX:HACK ++ be_app->Unlock(); ++ //be_app_messenger.SendMessage(B_QUIT_REQUESTED); ++ wait_for_thread(bapp_thid, &err); ++ //FIXME:leak or crash ++ //delete be_app; ++ be_app = NULL; ++} ++ ++static int haiku_init(QEditScreen *s, int w, int h) ++{ ++ int xsize, ysize, font_ysize; ++ WindowState *ctx; ++ ++ if (!be_app) ++ init_application(); ++ ++ memcpy(&s->dpy, &haiku_dpy, sizeof(QEDisplay)); ++ ++ ctx = (WindowState *)malloc(sizeof(WindowState)); ++ if (ctx == NULL) ++ return -1; ++ s->priv_data = ctx; ++ s->media = CSS_MEDIA_SCREEN; ++ ++ s->bitmap_format = QEBITMAP_FORMAT_RGBA32; ++ /* BBitmap supports overlay, but not planar data */ ++ //s->video_format = QEBITMAP_FORMAT_RGBA32; ++ ++ int event_pipe[2]; ++ if (pipe(event_pipe) < 0) ++ return -1; ++ fcntl(event_pipe[0], F_SETFD, FD_CLOEXEC); ++ fcntl(event_pipe[1], F_SETFD, FD_CLOEXEC); ++ ++ ctx->events_rd = event_pipe[0]; ++ ctx->events_wr = events_wr = event_pipe[1]; ++ ++ set_read_handler(event_pipe[0], haiku_handle_event, s); ++ ++ ++ ctx->font = BFont(be_fixed_font); ++ ++ font_height height; ++ ctx->font.GetHeight(&height); ++ ++ font_xsize = (int)ctx->font.StringWidth("n"); ++ font_ysize = (int)(height.ascent + height.descent + height.leading + 1); ++ ++ if (w == 0) ++ w = 80; ++ if (h == 0) ++ h = 25; ++ xsize = w * font_xsize; ++ ysize = h * font_ysize; ++ ++ s->width = xsize; ++ s->height = ysize; ++ s->charset = &charset_utf8; ++ ++ s->clip_x1 = 0; ++ s->clip_y1 = 0; ++ s->clip_x2 = s->width; ++ s->clip_y2 = s->height; ++ ++ BRect frame(0, 0, s->width - 1, s->height - 1); ++ ++ QEView *v = new QEView(frame, "qemacs"); ++ ctx->v = v; ++ ++ frame.OffsetTo(200, 200); ++ ++ ctx->w = new QEWindow(frame, "qemacs", v); ++ ctx->w->AddChild(ctx->v); ++ ctx->v->MakeFocus(); ++ //ctx->v->SetViewColor(B_TRANSPARENT_COLOR); ++ ctx->v->SetDrawingMode(B_OP_OVER); ++ ++ ctx->w->Show(); ++ ++ return 0; ++} ++ ++static void haiku_close(QEditScreen *s) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ ctx->w->Lock(); ++ ctx->w->Quit(); ++ free(s->priv_data); ++} ++ ++static void haiku_flush(QEditScreen *s) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ ++ ctx->v->LockLooper(); ++ ++ // doesn't really help ++ ctx->v->Sync(); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static int haiku_is_user_input_pending(QEditScreen *s) ++{ ++ /* XXX: do it */ ++ return 0; ++} ++ ++/* called when an BMessage is forwarded. dispatch events to qe_handle_event() */ ++static void haiku_handle_event(void *opaque) ++{ ++ QEditScreen *s = (QEditScreen *)opaque; ++ WindowState *ctx = (WindowState *)s->priv_data; ++ unsigned char buf[16]; ++ bigtime_t timestamp_ms; ++ BMessage *event; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++/* ++ KeySym keysym; ++*/ ++ int shift, ctrl, meta, len, key = 0; ++ QEEvent ev1, *ev = &ev1; ++ ++ if (read(ctx->events_rd, &event, sizeof(BMessage *)) < sizeof(BMessage *)) ++ return; ++ //event->PrintToStream(); ++ ++ switch(event->what) { ++ case B_QUIT_REQUESTED: ++ ++ // cancel pending operation ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('g'); ++ qe_handle_event(ev); ++ ++ // simulate C-x C-c ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('x'); ++ qe_handle_event(ev); ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('c'); ++ qe_handle_event(ev); ++ break; ++ ++ case _UPDATE_: ++ // flush queued repaints ++ if (atomic_set(&repaints, 0)) { ++ ev->expose_event.type = QE_EXPOSE_EVENT; ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_VIEW_RESIZED: ++ { ++ int32 width, height; ++ int columns, rows; ++ //event->PrintToStream(); ++/* ++ if (event->FindInt32("width", &width) < B_OK) ++ break; ++ if (event->FindInt32("height", &height) < B_OK) ++ break; ++*/ ++ ++ ctx->v->LockLooper(); ++ ++ width = ctx->v->Bounds().IntegerWidth() + 1; ++ height = ctx->v->Bounds().IntegerHeight() + 1; ++ ++ if (width != s->width || height != s->height) ++ ctx->v->Invalidate(ctx->v->Bounds()); ++ ++ s->width = width; ++ s->height = height; ++ ++ ctx->v->UnlockLooper(); ++ ++ //ev->expose_event.type = QE_EXPOSE_EVENT; ++ //qe_handle_event(ev); ++ } ++ break; ++ ++ case B_MOUSE_MOVED: ++ { ++ BPoint pt; ++ ++ ev->button_event.type = QE_MOTION_EVENT; ++ ev->button_event.x = (int)pt.x; ++ ev->button_event.y = (int)pt.y; ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_MOUSE_DOWN: ++ case B_MOUSE_UP: ++ { ++ BPoint pt; ++ uint32 buttons; ++ ++ if (event->what == B_MOUSE_DOWN) ++ ev->button_event.type = QE_BUTTON_PRESS_EVENT; ++ else ++ ev->button_event.type = QE_BUTTON_RELEASE_EVENT; ++ ++ if (event->FindPoint("where", &pt) < B_OK) ++ pt = BPoint(0,0); ++ ev->button_event.x = (int)pt.x; ++ ev->button_event.y = (int)pt.y; ++ ++ if (event->FindInt32("buttons", (int32 *)&buttons) < B_OK) ++ buttons = (event->what == B_MOUSE_UP)?0:B_PRIMARY_MOUSE_BUTTON; ++ ++ ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ ev->button_event.button = QE_BUTTON_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ ev->button_event.button = QE_BUTTON_MIDDLE; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ ev->button_event.button = QE_BUTTON_RIGHT; ++ ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ float delta; ++ ++ ev->button_event.type = QE_BUTTON_PRESS_EVENT; ++ ++ if (event->FindFloat("be:wheel_delta_y", &delta) < B_OK) ++ delta = 0.0; ++ ++ if (delta > 0) ++ ev->button_event.button = QE_WHEEL_DOWN; ++ else if (delta < 0) ++ ev->button_event.button = QE_WHEEL_UP; ++ else ++ break; ++ ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_KEY_UP: ++ break; ++ ++ case B_KEY_DOWN: ++ { ++ unsigned int mods = 0; ++ uint32 state; ++ //event->PrintToStream(); ++ uint32 scancode; ++ uint32 raw_char; ++ const char *bytes; ++ char buff[6]; ++ int numbytes = 0; ++ int i; ++ ++ if (event->FindInt64("when", ×tamp_ms) < B_OK) ++ timestamp_ms = 0LL; ++ if (event->FindInt32("modifiers", (int32 *)&state) < B_OK) ++ state = modifiers(); ++ if (event->FindInt32("key", (int32 *)&scancode) < B_OK) ++ scancode = 0; ++ if (event->FindInt32("raw_char", (int32 *)&raw_char) < B_OK) ++ raw_char = 0; ++ ++ /* check for byte[] first, ++ because C-space gives bytes="" (and byte[0] = '\0') */ ++ for (i = 0; i < 5; i++) { ++ buff[i] = '\0'; ++ if (event->FindInt8("byte", i, (int8 *)&buff[i]) < B_OK) ++ break; ++ } ++ ++ if (i) { ++ bytes = buff; ++ numbytes = i; ++ } else if (event->FindString("bytes", &bytes) < B_OK) ++ bytes = ""; ++ ++ if (!numbytes) ++ numbytes = strlen(bytes); ++ ++ shift = (state & B_SHIFT_KEY); ++ ctrl = (state & B_CONTROL_KEY); ++ meta = (state & (B_LEFT_OPTION_KEY | B_COMMAND_KEY)); ++ ++ //fprintf(stderr, "%cshift %cctrl %cmeta numbytes %d \n", shift ? ' ' : '!', ctrl ? ' ' : '!', meta ? ' ' : '!', numbytes); ++ ++ char byte = 0; ++ if (numbytes == 1) { ++ byte = bytes[0]; ++ if (state & B_CONTROL_KEY) ++ byte = (char)raw_char; ++ switch (byte) { ++ case B_BACKSPACE: ++ key = KEY_BS; ++ if (meta) ++ key = KEY_META(KEY_BS); ++ break; ++ case B_TAB: ++ key = KEY_TAB; ++ break; ++ case B_ENTER: ++ key = KEY_RET; ++ break; ++ case B_ESCAPE: ++ key = KEY_ESC; ++ break; ++ case B_SPACE: ++ key = KEY_SPC; ++ break; ++ case B_DELETE: ++ key = KEY_DELETE; ++ break; ++ case B_INSERT: ++ key = KEY_INSERT; ++ break; ++ case B_HOME: ++ key = ctrl ? KEY_CTRL_HOME : KEY_HOME; ++ break; ++ case B_END: ++ key = ctrl ? KEY_CTRL_END : KEY_END; ++ break; ++ case B_PAGE_UP: ++ key = KEY_PAGEUP; ++ break; ++ case B_PAGE_DOWN: ++ key = KEY_PAGEDOWN; ++ break; ++ case B_LEFT_ARROW: ++ key = ctrl ? KEY_CTRL_LEFT : KEY_LEFT; ++ break; ++ case B_RIGHT_ARROW: ++ key = ctrl ? KEY_CTRL_RIGHT : KEY_RIGHT; ++ break; ++ case B_UP_ARROW: ++ key = KEY_UP; ++ break; ++ case B_DOWN_ARROW: ++ key = KEY_DOWN; ++ break; ++ case B_FUNCTION_KEY: ++ switch (scancode) { ++ case B_F1_KEY: ++ case B_F2_KEY: ++ case B_F3_KEY: ++ case B_F4_KEY: ++ case B_F5_KEY: ++ case B_F6_KEY: ++ case B_F7_KEY: ++ case B_F8_KEY: ++ case B_F9_KEY: ++ case B_F10_KEY: ++ case B_F11_KEY: ++ case B_F12_KEY: ++ key = KEY_F1 + scancode - B_F1_KEY; ++ break; ++ case B_PRINT_KEY: ++ case B_SCROLL_KEY: ++ case B_PAUSE_KEY: ++ default: ++ break; ++ } ++ break; ++ case 0: ++ break; ++ default: ++ if (byte >= ' ' && byte <= '~') ++ if (meta) ++ key = KEY_META(' ') + byte - ' '; ++ else if (ctrl) ++ key = KEY_CTRL(byte); ++ else ++ key = byte; ++ ++ } ++ } else { ++ const char *p = bytes; ++ key = utf8_decode(&p); ++ } ++ ++ got_key: ++ if (key) { ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = key; ++ qe_handle_event(ev); ++ } ++ } ++ break; ++ } ++ ++ delete event; ++} ++ ++static void haiku_fill_rectangle(QEditScreen *s, ++ int x1, int y1, int w, int h, QEColor color) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ drawing_mode oldMode; ++ ++ BRect r(x1, y1, x1 + w - 1, y1 + h - 1); ++ rgb_color c = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff, ++ 0xff}; ++ ++ ctx->v->LockLooper(); ++ ++ oldMode = ctx->v->DrawingMode(); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ ctx->v->SetDrawingMode(B_OP_INVERT); ++ else ++ ctx->v->SetHighColor(c); ++ ctx->v->FillRect(r); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ ctx->v->SetDrawingMode(oldMode); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static QEFont *haiku_open_font(QEditScreen *s, int style, int size) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ QEFont *font; ++ ++ font = (QEFont *)malloc(sizeof(QEFont)); ++ if (!font) ++ return NULL; ++ ++ // TODO: use style / size ++ BFont *f = new BFont(ctx->font); ++ ++ font_height height; ++ f->GetHeight(&height); ++ font->ascent = (int)height.ascent; ++ font->descent = (int)(height.descent + height.leading + 1); ++ font->priv_data = f; ++ return font; ++} ++ ++static void haiku_close_font(QEditScreen *s, QEFont *font) ++{ ++ BFont *f = (BFont *)font->priv_data; ++ delete f; ++ free(font); ++} ++ ++static void haiku_text_metrics(QEditScreen *s, QEFont *font, ++ QECharMetrics *metrics, ++ const unsigned int *str, int len) ++{ ++ //TODO: use BFont::GetEscapements() or StringWidth() ++ int i, x; ++ metrics->font_ascent = font->ascent; ++ metrics->font_descent = font->descent; ++ x = 0; ++ for(i=0;iwidth = x; ++} ++ ++static void haiku_draw_text(QEditScreen *s, QEFont *font, ++ int x1, int y, const unsigned int *str, int len, ++ QEColor color) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ BFont *f = (BFont *)(font->priv_data); ++ int i; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ color = QERGB(0xff, 0xff, 0xff); ++ ++ rgb_color c = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff, ++ 0xff}; ++ ++ ctx->v->LockLooper(); ++ ++ ctx->v->SetHighColor(c); ++ ctx->v->SetLowColor(B_TRANSPARENT_COLOR); ++ ctx->v->SetFont(f); ++ ctx->v->MovePenTo(x1, y - 1); ++ ++ char buf[10]; ++ unsigned int cc; ++ ++ BString text; ++ for(i=0;iv->DrawString(buf); ++ } ++ ctx->v->DrawString(text.String()); ++ ++ ctx->v->UnlockLooper(); ++ ++ //TextOutW(haiku_ctx.hdc, x1, y - font->ascent, buf, len); ++} ++ ++static void haiku_set_clip(QEditScreen *s, ++ int x, int y, int w, int h) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s(,%d, %d, %d, %d)\n", __FUNCTION__, x, y, w, h); ++ ++ BRegion clip(BRect(x, y, x + w - 1, y + h - 1)); ++ ++ ctx->v->LockLooper(); ++ ++ ctx->v->ConstrainClippingRegion(&clip); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static int haiku_bmp_alloc(QEditScreen *s, QEBitmap *b) ++{ ++ BBitmap *bitmap; ++ color_space space = B_RGBA32; ++ uint32 flags = 0; ++ ++ b->format = s->bitmap_format; ++ if (b->flags & QEBITMAP_FLAG_VIDEO) { ++ b->format = s->video_format; ++ } ++fprintf(stderr, "%s(, [w %d, h %d])\n", __FUNCTION__, b->width, b->height); ++ switch (b->format) { ++ case QEBITMAP_FORMAT_RGB565: ++ space = B_RGB16; ++ break; ++ case QEBITMAP_FORMAT_RGB555: ++ space = B_RGB15; ++ break; ++ case QEBITMAP_FORMAT_RGB24: ++ space = B_RGB24; ++ break; ++ case QEBITMAP_FORMAT_RGBA32: ++ space = B_RGBA32; ++ break; ++ case QEBITMAP_FORMAT_YUV420P: ++ // we don't support planar overlays ++ default: ++ return -1; ++ } ++ ++ BRect bounds(0, 0, b->width - 1, b->height - 1); ++ bitmap = new BBitmap(bounds, flags, space); ++ if (bitmap->InitCheck() != B_OK) { ++ delete bitmap; ++ return -1; ++ } ++ b->priv_data = bitmap; ++ ++ return 0; ++} ++ ++static void haiku_bmp_free(__unused__ QEditScreen *s, QEBitmap *b) ++{ ++ BBitmap *bitmap = (BBitmap *)b->priv_data; ++ delete bitmap; ++} ++ ++extern QEDisplay haiku_dpy = { ++ "haiku", ++ haiku_probe, ++ haiku_init, ++ haiku_close, ++ haiku_flush, ++ haiku_is_user_input_pending, ++ haiku_fill_rectangle, ++ haiku_open_font, ++ haiku_close_font, ++ haiku_text_metrics, ++ haiku_draw_text, ++ haiku_set_clip, ++ NULL, /* no selection handling */ ++ NULL, /* no selection handling */ ++ NULL, /* dpy_invalidate */ ++ NULL, /* dpy_cursor_at */ ++ haiku_bmp_alloc, /* dpy_bmp_alloc */ ++ haiku_bmp_free, /* dpy_bmp_free */ ++ NULL, /* dpy_bmp_draw */ ++ NULL, /* dpy_bmp_lock */ ++ NULL, /* dpy_bmp_unlock */ ++ NULL, /* dpy_full_screen */ ++ NULL, /* next */ ++}; ++ ++static CmdOptionDef cmd_options[] = { ++ { "no-windows", "nw", NULL, CMD_OPT_BOOL, "force tty terminal usage", ++ { int_ptr: &force_tty }}, ++ { NULL, NULL, NULL, 0, NULL, { NULL }} ++}; ++ ++static int haiku_init(void) ++{ ++ QEmacsState *qs = &qe_state; ++ ++ /* override default res path, to find config file at native location */ ++ BPath path; ++ BString old(":"); ++ old << qs->res_path; ++ qs->res_path[0] = '\0'; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) { ++ path.Append("qemacs"); ++ pstrcat(qs->res_path, sizeof(qs->res_path), path.Path()); ++ } ++ pstrcat(qs->res_path, sizeof(qs->res_path), old.String()); ++ ++ qe_register_cmd_line_options(cmd_options); ++ return qe_register_display(&haiku_dpy); ++} ++ ++qe_module_init(haiku_init); +--- qemacs-0.3.2dev-cvs//dev/null 2013-03-14 16:10:28.351668000 +0100 ++++ qemacs-0.3.2dev-cvs/contrib/haiku-pe2qe.sh 2013-03-14 19:17:29.552599552 +0100 +@@ -0,0 +1,85 @@ ++#!/bin/sh ++ ++pesettings=`finddir B_USER_SETTINGS_DIRECTORY`/pe/settings ++ ++fgmap=( ++"alt comment:" ++"alt error:" ++"alt keyword:" ++"alt number:" ++"alt operator:" ++"alt separator:" ++"altprocessor:" ++"attribute:" ++"char constant:html-entity" ++"comment:comment html-comment" ++"error:" ++"highlight:highlight" ++"invisibles:" ++"keyword:keyword preprocess" ++"low:window-border" ++"mark:status" ++"number:number" ++"operator:function" ++"preprocessor:" ++"selection:selection" ++"separator:" ++"string:string string-q html-string" ++"system identifier:type" ++"tag:tag" ++"tagstring:html-tag" ++"text:default mode-line minibuf" ++"user identifier:variable" ++) ++ ++bgmap=( ++"low:default" ++"selection:mode-line window-border region-hilite" ++) ++ ++map_pe_fg () { ++ for item in "${fgmap[@]}"; do ++ if [ "$1" = "${item%:*}" ]; then ++ echo "${item#*:}" ++ return ++ fi ++ done ++} ++ ++map_pe_bg () { ++ for item in "${bgmap[@]}"; do ++ if [ "$1" = "${item%:*}" ]; then ++ echo "${item#*:}" ++ return ++ fi ++ done ++} ++ ++out_style () { ++ echo "set_style(\"$1\", \"$2\", \"$3\")" ++} ++ ++echo "// map Pe settings to QEmacs" ++echo "// generated by $(basename "$0") on `date`" ++ ++while read line; do ++ token="${line%=*}" ++ value="${line#*=}" ++ case "$token" in ++ *color) ++ name="${token% color}" ++ qenames="$(map_pe_fg "$name")" ++ for qename in ${qenames}; do ++ #echo "color: $name -> $qename" >&2 ++ out_style "$qename" "color" "$value" ++ done ++ qenames="$(map_pe_bg "$name")" ++ for qename in ${qenames}; do ++ #echo "bgcolor: $name -> $qename" >&2 ++ out_style "$qename" "background-color" "$value" ++ done ++ ;; ++ *) ++ ;; ++ esac ++done < "$pesettings" diff --git a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep b/app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe similarity index 95% rename from app-editors/qemacs/qemacs-0.3.2dev-cvs.bep rename to app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe index 61a3b25fb..1d224709c 100644 --- a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep +++ b/app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe @@ -5,13 +5,15 @@ SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs REVISION="1" STATUS_HAIKU="broken" DEPEND="app-text/texi2html >= 1.82" -BUILD { +BUILD() +{ cd qemacs-0.3.2dev-cvs ./configure make } -INSTALL { +INSTALL() +{ cd qemacs-0.3.2dev-cvs make install } diff --git a/app-editors/qemacs/qemacs-0.3.3.bep b/app-editors/qemacs/qemacs-0.3.3.recipe similarity index 95% rename from app-editors/qemacs/qemacs-0.3.3.bep rename to app-editors/qemacs/qemacs-0.3.3.recipe index 6f08ac38a..250da5505 100644 --- a/app-editors/qemacs/qemacs-0.3.3.bep +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990" REVISION="1" STATUS_HAIKU="broken" DEPEND="app-text/texi2html >= 1.82" -BUILD { +BUILD() +{ cd qemacs-0.3.3 ./configure make } -INSTALL { +INSTALL() +{ cd qemacs-0.3.3 make install } diff --git a/app-editors/se/se-3.0.bep b/app-editors/se/se-3.0.recipe similarity index 96% rename from app-editors/se/se-3.0.bep rename to app-editors/se/se-3.0.recipe index fbb4eef2a..397b8aefe 100644 --- a/app-editors/se/se-3.0.bep +++ b/app-editors/se/se-3.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6" -BUILD { +BUILD() +{ cd se-3.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd se-3.0 make install } diff --git a/app-editors/vim/licenses/Vim b/app-editors/vim/licenses/Vim new file mode 100644 index 000000000..e445bcb9a --- /dev/null +++ b/app-editors/vim/licenses/Vim @@ -0,0 +1,76 @@ +I) There are no restrictions on distributing unmodified copies of Vim except + that they must include this license text. You can also distribute + unmodified parts of Vim, likewise unrestricted except that they must + include this license text. You are also allowed to include executables + that you made from the unmodified Vim sources, plus your own usage + examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, + including executables and/or source code, when the following four + conditions are met: + 1) This license text must be included unmodified. + 2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + - The license that applies to the changes permits you to distribute + the changes to the Vim maintainer without fee or restriction, and + permits the Vim maintainer to include the changes in the official + version of Vim without fee or restriction. + - You keep the changes for at least three years after last + distributing the corresponding modified Vim. When the maintainer + or someone who you distributed the modified Vim to asks you (in + any way) for the changes within this period, you must make them + available to him. + - You clearly describe in the distribution how to contact you. This + contact information must remain valid for at least three years + after last distributing the corresponding modified Vim, or as long + as possible. + e) When the GNU General Public License (GPL) applies to the changes, + you can distribute the modified Vim under the GNU GPL version 2 or + any later version. + 3) A message must be added, at least in the output of the ":version" + command and in the intro screen, such that the user of the modified Vim + is able to see that it was modified. When distributing as mentioned + under 2)e) adding the message is only required for as far as this does + not conflict with the license used for the changes. + 4) The contact information as required under 2)a) and 2)d) must not be + removed or changed, except that the person himself can make + corrections. + +III) If you distribute a modified version of Vim, you are encouraged to use + the Vim license for your changes and make them available to the + maintainer, including the source code. The preferred way to do this is + by e-mail or by uploading the files to a server and e-mailing the URL. + If the number of changes is small (e.g., a modified Makefile) e-mailing a + context diff will do. The e-mail address to be used is + + +IV) It is not allowed to remove this license from the distribution of the Vim + sources, parts of it or from a modified version. You may use this + license for previous Vim releases instead of the license that they came + with, at your option. diff --git a/app-editors/vim/patches/vim-7.3.patch b/app-editors/vim/patches/vim-7.3.patchset similarity index 89% rename from app-editors/vim/patches/vim-7.3.patch rename to app-editors/vim/patches/vim-7.3.patchset index 09e8c002c..f297d4fc1 100644 --- a/app-editors/vim/patches/vim-7.3.patch +++ b/app-editors/vim/patches/vim-7.3.patchset @@ -1,7 +1,14 @@ -diff -Naur vim73/Makefile vim73.haiku/Makefile ---- vim73/Makefile 2010-08-15 12:23:34.047710208 +0000 -+++ vim73.haiku/Makefile 2010-08-20 23:30:35.620756992 +0000 -@@ -196,6 +196,15 @@ +From b97ce2e9738d5704064d1f1e44294a453cbf040c Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 30 Sep 2013 16:06:53 +0200 +Subject: Reformat the existing haikuports patch to git format. + + +diff --git a/Makefile b/Makefile +index bf2b309..7902c56 100644 +--- a/Makefile ++++ b/Makefile +@@ -196,6 +196,15 @@ DOSBIN_S = dosbin_s # - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy # them to here. # - "make os2bin". @@ -17,7 +24,7 @@ diff -Naur vim73/Makefile vim73.haiku/Makefile VIMVER = vim-$(MAJOR).$(MINOR) VERSION = $(MAJOR)$(MINOR) -@@ -576,3 +585,37 @@ +@@ -576,3 +585,37 @@ html: dist dist/$(COMMENT_HTML) farsi: dist dist/$(COMMENT_FARSI) -rm -f dist/farsi$(VERSION).zip zip -9 -rD -z dist/farsi$(VERSION).zip farsi < dist/$(COMMENT_FARSI) @@ -55,10 +62,11 @@ diff -Naur vim73/Makefile vim73.haiku/Makefile + echo "URL: http://www.vim.org/" >> $(DESCRIPTION) + cd dist/boot && zip -9 -r -z -y ../$(PACKAGE_NAME).zip * $(COMMENT) < $(COMMENT) + -diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt ---- vim73/runtime/doc/eval.txt 2010-08-15 14:23:20.045088768 +0200 -+++ vim73.haiku/runtime/doc/eval.txt 2012-09-15 21:37:50.934019072 +0200 -@@ -6081,7 +6081,7 @@ +diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt +index 5403551..6f79962 100644 +--- a/runtime/doc/eval.txt ++++ b/runtime/doc/eval.txt +@@ -6081,7 +6081,7 @@ arp Compiled with ARP support (Amiga). autocmd Compiled with autocommand support. |autocommand| balloon_eval Compiled with |balloon-eval| support. balloon_multiline GUI supports multiline balloons. @@ -67,7 +75,7 @@ diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt browse Compiled with |:browse| support, and browse() will work. builtin_terms Compiled with some builtin terminals. -@@ -6133,6 +6133,7 @@ +@@ -6133,6 +6133,7 @@ gui_mac Compiled with Macintosh GUI. gui_motif Compiled with Motif GUI. gui_photon Compiled with Photon GUI. gui_win32 Compiled with MS Windows Win32 GUI. @@ -75,10 +83,11 @@ diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt gui_win32s idem, and Win32s system being used (Windows 3.1) gui_running Vim is running in the GUI, or it will start soon. hangul_input Compiled with Hangul input support. |hangul| -diff -Naur vim73/runtime/doc/gui.txt vim73.haiku/runtime/doc/gui.txt ---- vim73/runtime/doc/gui.txt 2010-08-15 14:23:20.046661632 +0200 -+++ vim73.haiku/runtime/doc/gui.txt 2012-09-16 21:58:25.748158976 +0200 -@@ -97,6 +97,7 @@ +diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt +index f9bbf78..7649e35 100644 +--- a/runtime/doc/gui.txt ++++ b/runtime/doc/gui.txt +@@ -97,6 +97,7 @@ Recommended place for your personal GUI initializations: OS/2 $HOME/.gvimrc or $VIM/.gvimrc MS-DOS and Win32 $HOME/_gvimrc or $VIM/_gvimrc Amiga s:.gvimrc or $VIM/.gvimrc @@ -86,10 +95,11 @@ diff -Naur vim73/runtime/doc/gui.txt vim73.haiku/runtime/doc/gui.txt There are a number of options which only have meaning in the GUI version of Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are -diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt ---- vim73/runtime/doc/help.txt 2010-08-15 14:23:20.047448064 +0200 -+++ vim73.haiku/runtime/doc/help.txt 2012-09-16 22:03:00.902823936 +0200 -@@ -155,6 +155,7 @@ +diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt +index 4860eb2..be4c464 100644 +--- a/runtime/doc/help.txt ++++ b/runtime/doc/help.txt +@@ -155,6 +155,7 @@ GUI ~ |gui_w16.txt| Windows 3.1 GUI |gui_w32.txt| Win32 GUI |gui_x11.txt| X11 GUI @@ -97,7 +107,7 @@ diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt Interfaces ~ |if_cscop.txt| using Cscope with Vim -@@ -181,7 +182,7 @@ +@@ -181,7 +182,7 @@ Versions ~ Remarks about specific systems ~ |os_390.txt| OS/390 Unix |os_amiga.txt| Amiga @@ -106,10 +116,11 @@ diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt |os_dos.txt| MS-DOS and MS-Windows NT/95 common items |os_mac.txt| Macintosh |os_mint.txt| Atari MiNT -diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt ---- vim73/runtime/doc/options.txt 2010-08-15 14:23:21.051642368 +0200 -+++ vim73.haiku/runtime/doc/options.txt 2012-05-28 12:06:04.016777216 +0200 -@@ -3528,7 +3528,8 @@ +diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt +index 1282a90..1fdbdd0 100644 +--- a/runtime/doc/options.txt ++++ b/runtime/doc/options.txt +@@ -3528,7 +3528,8 @@ A jump table for the options with a short description can be found at |Q_op|. 'guitablabel' can be used to change the text in the labels. When 'e' is missing a non-GUI tab pages line may be used. The GUI tabs are only supported on some systems, currently @@ -119,7 +130,7 @@ diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt *'go-f'* 'f' Foreground: Don't use fork() to detach the GUI from the shell where it was started. Use this for programs that wait for the -@@ -5567,7 +5568,12 @@ +@@ -5567,7 +5568,12 @@ A jump table for the options with a short description can be found at |Q_op|. $VIM/vimfiles, $VIMRUNTIME, $VIM/vimfiles/after, @@ -133,7 +144,7 @@ diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt global {not in Vi} This is a list of directories which will be searched for runtime -@@ -6920,6 +6926,7 @@ +@@ -6920,6 +6926,7 @@ A jump table for the options with a short description can be found at |Q_op|. in the GUI: "builtin_gui" on Amiga: "amiga" on BeOS: "beos-ansi" @@ -141,337 +152,11 @@ diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt on Mac: "mac-ansi" on MiNT: "vt52" on MS-DOS: "pcterm" -diff -Naur vim73/runtime/doc/os_haiku.txt vim73.haiku/runtime/doc/os_haiku.txt ---- vim73/runtime/doc/os_haiku.txt 1970-01-01 01:00:00.000000000 +0100 -+++ vim73.haiku/runtime/doc/os_haiku.txt 2012-09-17 20:45:04.675807232 +0200 -@@ -0,0 +1,323 @@ -+*os_haiku.txt* For Vim version 7.4. Last change: 2012 May 28 -+ -+ -+ VIM REFERENCE MANUAL by Bram Moolenaar -+ -+// TODO - bring to correspondence with Haiku circumstances! -+ -+ *Haiku* -+This is a port of Vim 7.4 to the Haiku A4 or later. -+ -+This file contains the particularities for the Haiku version of Vim. For -+matters not discussed in this file, Vim behaves very much like the Unix -+|os_unix.txt| version. -+ -+ 1. General |beos-general| -+ 2. Compiling Vim |beos-compiling| -+ 3. Timeout in the Terminal |beos-timeout| -+ 4. Unicode vs. Latin1 |beos-unicode| -+ 5. The BeOS GUI |beos-gui| -+ 6. The $VIM directory |beos-vimdir| -+ 6+. The $BE_USER_SETTINGS directory |haiku-user-settings-dir| -+ 7. Drag & Drop |beos-dragndrop| -+ 8. Single Launch vs. Multiple -+ Launch |beos-launch| -+ 9. Fonts |beos-fonts| -+10. The meta key modifier |beos-meta| -+11. Mouse key mappings |beos-mouse| -+12. Color names |beos-colors| -+13. Compiling with Perl |beos-perl| -+ -+ -+1. General *beos-general* -+ -+The default syntax highlighting mostly works with different foreground colors -+to highlight items. This works best if you set your Terminal window to a -+darkish background and light letters. Some middle-grey background (for -+instance (r,g,b)=(168,168,168)) with black letters also works nicely. If you -+use the default light background and dark letters, it may look better to -+simply reverse the notion of foreground and background color settings. To do -+this, add this to your .vimrc file (where may need to be replaced with -+the escape character): > -+ -+ :if &term == "beos-ansi" -+ : set t_AB=[3%dm -+ : set t_AF=[4%dm -+ :endif -+ -+ -+2. Compiling Vim *beos-compiling* -+ -+From the Advanced Access Preview Release (AAPR) on, Vim can be configured with -+the standard configure script. To get the compiler and its flags right, use -+the following command-line in the shell (you can cut and paste it in one go): -+ -+CC=$BE_C_COMPILER CFLAGS="$BE_DEFAULT_C_FLAGS -O7" \ -+ ./configure --prefix=/boot/home/config -+ -+$BE_C_COMPILER is usually "mwcc", $BE_DEFAULT_C_FLAGS is usually "-I- -I." -+ -+When configure has run, and you wish to enable GUI support, you must edit the -+config.mk file so that the lines with GUI_xxx refer to $(BEOSGUI_xxx) instead -+of $(NONE_xxx). -+Alternatively you can make this change in the Makefile; it will have a -+more permanent effect. Search for "NONE_". -+ -+After compilation you need to add the resources to the binary. Add the -+following few lines near the end (before the line with "exit $exit_value") of -+the link.sh script to do this automatically. -+ -+ rmattr BEOS:TYPE vim -+ copyres os_beos.rsrc vim -+ mimeset vim -+ -+Also, create a dummy file "strip": -+ -+ #!/bin/sh -+ mimeset $1 -+ exit 0 -+ -+You will need it when using "make install" to install Vim. -+ -+Now type "make" to compile Vim, then "make install" to install it. -+ -+If you want to install Vim by hand, you must copy Vim to $HOME/config/bin, and -+create a bunch of symlinks to it ({g,r,rg}{vim,ex,view}). Furthermore you must -+copy Vim's configuration files to $HOME/config/share/vim: -+vim-5.0s/{*.vim,doc,syntax}. For completeness, you should also copy the nroff -+manual pages to $HOME/config/man/man1. Don't forget ctags/ctags and xxd/xxd! -+ -+Obviously, you need the unlimited linker to actually link Vim. See -+http://www.metrowerks.com for purchasing the CodeWarrior compiler for BeOS. -+There are currently no other linkers that can do the job. -+ -+This won't be able to include the Perl or Python interfaces even if -+you have the appropriate files installed. |beos-perl| -+ -+ -+3. Timeout in the Terminal *beos-timeout* -+ -+Because some POSIX/UNIX features are still missing[1], there is no direct OS -+support for read-with-timeout in the Terminal. This would mean that you cannot -+use :mappings of more than one character, unless you also :set notimeout. -+|'timeout'| -+ -+To circumvent this problem, I added a workaround to provide the necessary -+input with timeout by using an extra thread which reads ahead one character. -+As a side effect, it also makes Vim recognize when the Terminal window -+resizes. -+ -+Function keys are not supported in the Terminal since they produce very -+indistinctive character sequences. -+ -+These problems do not exist in the GUI. -+ -+[1]: there is no select() on file descriptors; also the termios VMIN and VTIME -+settings do not seem to work properly. This has been the case since DR7 at -+least and still has not been fixed as of PR2. -+ -+ *beos-unicode* -+4. Unicode vs. Latin1 *beos-utf8* -+ -+BeOS uses Unicode and UTF-8 for text strings (16-bit characters encoded to -+8-bit characters). Vim assumes ISO-Latin1 or other 8-bit character codes. -+This does not produce the desired results for non-ASCII characters. Try the -+command :digraphs to see. If they look messed up, use :set isprint=@ to -+(slightly) improve the display of ISO-Latin1 characters 128-255. This works -+better in the GUI, depending on which font you use (below). -+ -+You may also use the /boot/bin/xtou command to convert UTF-8 files from (xtou -+-f iso1 filename) or to (xtou -t iso1 filename) ISO-Latin1 characters. -+ -+ -+5. The BeOS GUI *beos-gui* -+ -+The BeOS GUI is no longer included. It was not maintained for a while and -+most likely didn't work. If you want to work on this: get the Vim 6.x version -+and merge it back in. -+ -+ -+6. The $VIM directory *beos-vimdir* -+ -+$VIM is the symbolic name for the place where Vims support files are stored. -+The default value for $VIM is set at compile time and can be determined with > -+ -+ :version -+ -+The normal value is /boot/home/config/share/vim. If you don't like it you can -+set the VIM environment variable to override this, or set 'helpfile' in your -+.vimrc: > -+ -+ :if version >= 500 -+ : set helpfile=~/vim/vim54/doc/help.txt -+ : syntax on -+ :endif -+ -+ -+6a. The $USER_SETTINGS_DIR directory *haiku-user-settings-dir* -+ -+ -+7. Drag & Drop *beos-dragndrop* -+ -+You can drop files and directories on either the Vim icon (starts a new Vim -+session, unless you use the File Types application to set Vim to be "Single -+Launch") or on the Vim window (starts editing the files). Dropping a folder -+sets Vim's current working directory. |:cd| |:pwd| If you drop files or -+folders with either SHIFT key pressed, Vim changes directory to the folder -+that contains the first item dropped. When starting Vim, there is no need to -+press shift: Vim behaves as if you do. -+ -+Files dropped set the current argument list. |argument-list| -+ -+ -+8. Single Launch vs. Multiple Launch *beos-launch* -+ -+As distributed Vim's Application Flags (as seen in the FileTypes preference) -+are set to Multiple Launch. If you prefer, you can set them to Single Launch -+instead. Attempts to start a second copy of Vim will cause the first Vim to -+open the files instead. This works from the Tracker but also from the command -+line. In the latter case, non-file (option) arguments are not supported. -+ -+NB: Only the GUI version has a BApplication (and hence Application Flags). -+This section does not apply to the GUI-less version, should you compile one. -+ -+ -+9. Fonts *beos-fonts* -+ -+Set fonts with > -+ -+ :set guifont=Courier10_BT/Roman/10 -+ -+where the first part is the font family, the second part the style, and the -+third part the size. You can use underscores instead of spaces in family and -+style. -+ -+Best results are obtained with monospaced fonts (such as Courier). Vim -+attempts to use all fonts in B_FIXED_SPACING mode but apparently this does not -+work for proportional fonts (despite what the BeBook says). -+ -+Vim also tries to use the B_ISO8859_1 encoding, also known as ISO Latin 1. -+This also does not work for all fonts. It does work for Courier, but not for -+ProFontISOLatin1/Regular (strangely enough). You can verify this by giving the > -+ -+ :digraphs -+ -+command, which lists a bunch of characters with their ISO Latin 1 encoding. -+If, for instance, there are "box" characters among them, or the last character -+isn't a dotted-y, then for this font the encoding does not work. -+ -+If the font you specify is unavailable, you get the system fixed font. -+ -+Standard fixed-width system fonts are: -+ -+ ProFontISOLatin1/Regular -+ Courier10_BT/Roman -+ Courier10_BT/Italic -+ Courier10_BT/Bold -+ Courier10_BT/Bold_Italic -+ -+Standard proportional system fonts are: -+ -+ Swis721_BT/Roman -+ Swis721_BT/Italic -+ Swis721_BT/Bold -+ Swis721_BT/Bold_Italic -+ Dutch801_Rm_BT/Roman -+ Dutch801_Rm_BT/Italic -+ Dutch801_Rm_BT/Bold -+ Dutch801_Rm_BT/Bold_Italic -+ Baskerville/Roman -+ Baskerville/Italic -+ Baskerville/Bold -+ Baskerville/Bold_Italic -+ SymbolProp_BT/Regular -+ -+Try some of them, just for fun. -+ -+ -+10. The meta key modifier *beos-meta* -+ -+The META key modifier is obtained by the left or right OPTION keys. This is -+because the ALT (aka COMMAND) keys are not passed to applications. -+ -+ -+11. Mouse key mappings *beos-mouse* -+ -+Vim calls the various mouse buttons LeftMouse, MiddleMouse and RightMouse. If -+you use the default Mouse preference settings these names indeed correspond to -+reality. Vim uses this mapping: -+ -+ Button 1 -> LeftMouse, -+ Button 2 -> RightMouse, -+ Button 3 -> MiddleMouse. -+ -+If your mouse has fewer than 3 buttons you can provide your own mapping from -+mouse clicks with modifier(s) to other mouse buttons. See the file -+vim-5.x/macros/swapmous.vim for an example. |gui-mouse-mapping| -+ -+ -+12. Color names *beos-colors* -+ -+Vim has a number of color names built-in. Additional names are read from the -+file $VIMRUNTIME/rgb.txt, if present. This file is basically the color -+database from X. Names used from this file are cached for efficiency. -+ -+ -+13. Compiling with Perl *beos-perl* -+ -+Compiling with Perl support enabled is slightly tricky. The Metrowerks -+compiler has some strange ideas where to search for include files. Since -+several include files with Perl have the same names as some Vim header -+files, the wrong ones get included. To fix this, run the following Perl -+script while in the vim-5.0/src directory: > -+ -+ preproc.pl > perl.h -+ -+ #!/bin/env perl -+ # Simple #include expander, just good enough for the Perl header files. -+ -+ use strict; -+ use IO::File; -+ use Config; -+ -+ sub doinclude -+ { -+ my $filename = $_[0]; -+ my $fh = new IO::File($filename, "r"); -+ if (defined $fh) { -+ print "/* Start of $filename */\n"; -+ -+ while (<$fh>) { -+ if (/^#include "(.*)"/) { -+ doinclude($1); -+ print "/* Back in $filename */\n"; -+ } else { -+ print $_; -+ } -+ } -+ print "/* End of $filename */\n"; -+ -+ undef $fh; -+ } else { -+ print "/* Cannot open $filename */\n"; -+ print "#include \"$filename\"\n"; -+ } -+ } -+ -+ chdir $Config{installarchlib}."/CORE"; -+ doinclude "perl.h"; -+ -+It expands the "perl.h" header file, using only other Perl header files. -+ -+Now you can configure & make Vim with the --enable-perlinterp option. -+Be warned though that this adds about 616 kilobytes to the size of Vim! -+Without Perl, Vim with default features and GUI is about 575K, with Perl -+it is about 1191K. -+ -+-Olaf Seibert -+ -+[Note: these addresses no longer work:] -+ -+http://polder.ubc.kun.nl/~rhialto/be -+ -+ vim:tw=78:ts=8:ft=help:norl: -diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt ---- vim73/runtime/doc/starting.txt 2010-08-15 14:23:22.056360960 +0200 -+++ vim73.haiku/runtime/doc/starting.txt 2012-09-16 22:03:00.965476352 +0200 -@@ -756,6 +756,7 @@ +diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt +index 0632e8c..87c2181 100644 +--- a/runtime/doc/starting.txt ++++ b/runtime/doc/starting.txt +@@ -756,6 +756,7 @@ accordingly. Vim proceeds in this order: OS/2 $HOME/.vimrc or $VIM/.vimrc (or _vimrc) MS-DOS and Win32 $HOME/_vimrc or $VIM/_vimrc Amiga s:.vimrc or $VIM/.vimrc @@ -479,7 +164,7 @@ diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt If Vim was started with "-u filename", the file "filename" is used. All following initializations until 4. are skipped. -@@ -791,6 +792,7 @@ +@@ -791,6 +792,7 @@ accordingly. Vim proceeds in this order: "$VIM/.vimrc" (for OS/2 and Amiga) (*) "$HOME/_vimrc" (for MS-DOS and Win32) (*) "$VIM/_vimrc" (for MS-DOS and Win32) (*) @@ -487,7 +172,7 @@ diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist, "_vimrc" is also tried, in case an MS-DOS compatible file system is used. For MS-DOS and Win32 ".vimrc" is checked -@@ -880,6 +882,7 @@ +@@ -880,6 +882,7 @@ sessions. Put it in a place so that it will be found by 3b: ~/.vimrc (Unix and OS/2) s:.vimrc (Amiga) $VIM\_vimrc (MS-DOS and Win32) @@ -495,10 +180,11 @@ diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt Note that creating a vimrc file will cause the 'compatible' option to be off by default. See |compatible-default|. -diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt ---- vim73/runtime/doc/vi_diff.txt 2010-08-15 14:23:23.066322432 +0200 -+++ vim73.haiku/runtime/doc/vi_diff.txt 2012-05-13 20:55:51.593494016 +0200 -@@ -139,6 +139,7 @@ +diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt +index 5d6706b..074acb6 100644 +--- a/runtime/doc/vi_diff.txt ++++ b/runtime/doc/vi_diff.txt +@@ -139,6 +139,7 @@ Support for different systems. - Atari MiNT - VMS - BeOS @@ -506,7 +192,7 @@ diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt - Macintosh - Risc OS - IBM OS/390 -@@ -163,7 +164,7 @@ +@@ -163,7 +164,7 @@ Graphical User Interface (GUI). |gui| define your own menus. Better support for CTRL/SHIFT/ALT keys in combination with special keys and mouse. Supported for various platforms, such as X11 (with Motif and Athena interfaces), GTK, Win32 @@ -515,9 +201,10 @@ diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt Multiple windows and buffers. |windows.txt| Vim can split the screen into several windows, each editing a -diff -Naur vim73/runtime/gvimrc_example.vim vim73.haiku/runtime/gvimrc_example.vim ---- vim73/runtime/gvimrc_example.vim 2010-05-15 11:03:31.008650752 +0000 -+++ vim73.haiku/runtime/gvimrc_example.vim 2010-08-20 23:25:03.942407680 +0000 +diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim +index 5a5197e..e7e2538 100644 +--- a/runtime/gvimrc_example.vim ++++ b/runtime/gvimrc_example.vim @@ -9,6 +9,7 @@ " for Amiga: s:.gvimrc " for MS-DOS and Win32: $VIM\_gvimrc @@ -526,9 +213,10 @@ diff -Naur vim73/runtime/gvimrc_example.vim vim73.haiku/runtime/gvimrc_example.v " Make external commands work through a pipe instead of a pseudo-tty "set noguipty -diff -Naur vim73/runtime/vimrc_example.vim vim73.haiku/runtime/vimrc_example.vim ---- vim73/runtime/vimrc_example.vim 2010-05-15 11:03:57.023855104 +0000 -+++ vim73.haiku/runtime/vimrc_example.vim 2010-08-20 23:25:41.794034176 +0000 +diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim +index b35100c..f5518d1 100644 +--- a/runtime/vimrc_example.vim ++++ b/runtime/vimrc_example.vim @@ -8,6 +8,7 @@ " for Amiga: s:.vimrc " for MS-DOS and Win32: $VIM\_vimrc @@ -537,10 +225,11 @@ diff -Naur vim73/runtime/vimrc_example.vim vim73.haiku/runtime/vimrc_example.vim " When started as "evim", evim.vim will already have done these settings. if v:progname =~? "evim" -diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile ---- vim73/src/Makefile 2010-08-15 12:56:15.017301504 +0000 -+++ vim73.haiku/src/Makefile 2010-08-20 23:27:51.707264512 +0000 -@@ -1242,6 +1242,23 @@ +diff --git a/src/Makefile b/src/Makefile +index e582eed..985dfd2 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1242,6 +1242,23 @@ NEXTAW_BUNDLE = # too: #EXTRA_LIBS = /usr/openwin/lib/libXmu.sa -lm @@ -564,7 +253,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile # PHOTON GUI PHOTONGUI_SRC = gui.c gui_photon.c pty.c PHOTONGUI_OBJ = objects/gui.o objects/gui_photon.o objects/pty.o -@@ -2458,6 +2475,9 @@ +@@ -2458,6 +2475,9 @@ objects/gui_at_sb.o: gui_at_sb.c objects/gui_athena.o: gui_athena.c $(CCC) -o $@ gui_athena.c @@ -574,7 +263,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile objects/gui_beval.o: gui_beval.c $(CCC) -o $@ gui_beval.c -@@ -2585,6 +2605,9 @@ +@@ -2585,6 +2605,9 @@ objects/option.o: option.c objects/os_beos.o: os_beos.c $(CCC) -o $@ os_beos.c @@ -584,7 +273,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile objects/os_qnx.o: os_qnx.c $(CCC) -o $@ os_qnx.c -@@ -2738,6 +2761,56 @@ +@@ -2738,6 +2761,56 @@ $(APPDIR)/Contents: ############################################################################### @@ -641,10 +330,11 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile ### (automatically generated by 'make depend') ### Dependencies: objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \ -diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in ---- vim73/src/configure.in 2010-08-13 14:15:17.029884416 +0000 -+++ vim73.haiku/src/configure.in 2010-08-20 23:24:07.536870912 +0000 -@@ -69,11 +69,13 @@ +diff --git a/src/configure.in b/src/configure.in +index 152313b..9161849 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -69,11 +69,13 @@ fi OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" @@ -660,7 +350,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in *) BEOS=no; AC_MSG_RESULT(no);; esac -@@ -1406,7 +1408,7 @@ +@@ -1406,7 +1408,7 @@ AC_ARG_ENABLE(netbeans, if test "$enable_netbeans" = "yes"; then AC_MSG_RESULT(no) dnl On Solaris we need the socket and nsl library. @@ -669,7 +359,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in AC_CHECK_LIB(nsl, gethostbyname) AC_MSG_CHECKING(whether compiling netbeans integration is possible) AC_TRY_LINK([ -@@ -1614,11 +1616,11 @@ +@@ -1614,11 +1616,11 @@ else fi fi @@ -683,7 +373,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in dnl Canonicalize the --enable-gui= argument so that it can be easily compared. dnl Do not use character classes for portability with old tools. -@@ -1632,10 +1634,24 @@ +@@ -1632,10 +1634,24 @@ SKIP_MOTIF=YES SKIP_ATHENA=YES SKIP_NEXTAW=YES SKIP_PHOTON=YES @@ -709,7 +399,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in SKIP_PHOTON= case "$enable_gui_canon" in no) AC_MSG_RESULT(no GUI support) -@@ -1786,6 +1802,7 @@ +@@ -1786,6 +1802,7 @@ if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then SKIP_ATHENA=YES; SKIP_NEXTAW=YES; SKIP_PHOTON=YES; @@ -717,7 +407,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in SKIP_CARBON=YES fi -@@ -2277,6 +2294,11 @@ +@@ -2277,6 +2294,11 @@ if test "x$GUITYPE:$enable_fontset" = "xGTK:yes"; then enable_fontset="no" fi @@ -729,10 +419,11 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in if test -z "$SKIP_PHOTON"; then GUITYPE=PHOTONGUI fi -diff -Naur vim73/src/eval.c vim73.haiku/src/eval.c ---- vim73/src/eval.c 2010-08-09 20:12:14.062128128 +0000 -+++ vim73.haiku/src/eval.c 2010-08-20 22:32:14.677642240 +0000 -@@ -11722,6 +11722,9 @@ +diff --git a/src/eval.c b/src/eval.c +index fc01006..44c02e9 100644 +--- a/src/eval.c ++++ b/src/eval.c +@@ -11722,6 +11722,9 @@ f_has(argvars, rettv) #ifdef __BEOS__ "beos", #endif @@ -742,7 +433,7 @@ diff -Naur vim73/src/eval.c vim73.haiku/src/eval.c #ifdef MSDOS # ifdef DJGPP "dos32", -@@ -11894,6 +11897,9 @@ +@@ -11894,6 +11897,9 @@ f_has(argvars, rettv) #ifdef FEAT_GUI_GNOME "gui_gnome", #endif @@ -752,10 +443,11 @@ diff -Naur vim73/src/eval.c vim73.haiku/src/eval.c #ifdef FEAT_GUI_MAC "gui_mac", #endif -diff -Naur vim73/src/ex_docmd.c vim73.haiku/src/ex_docmd.c ---- vim73/src/ex_docmd.c 2010-08-07 14:59:47.016252928 +0000 -+++ vim73.haiku/src/ex_docmd.c 2010-08-20 22:33:08.046923776 +0000 -@@ -6841,6 +6841,7 @@ +diff --git a/src/ex_docmd.c b/src/ex_docmd.c +index b338ed5..07f631b 100644 +--- a/src/ex_docmd.c ++++ b/src/ex_docmd.c +@@ -6841,6 +6841,7 @@ ex_shell(eap) || (defined(FEAT_GUI_GTK) && defined(FEAT_DND)) \ || defined(FEAT_GUI_MSWIN) \ || defined(FEAT_GUI_MAC) \ @@ -763,9 +455,10 @@ diff -Naur vim73/src/ex_docmd.c vim73.haiku/src/ex_docmd.c || defined(PROTO) /* -diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h ---- vim73/src/feature.h 2010-07-27 19:45:42.064749568 +0000 -+++ vim73.haiku/src/feature.h 2010-08-20 22:38:17.466354176 +0000 +diff --git a/src/feature.h b/src/feature.h +index ea79758..577e7c0 100644 +--- a/src/feature.h ++++ b/src/feature.h @@ -659,6 +659,14 @@ /* #define FEAT_MBYTE_IME */ # endif @@ -826,10 +519,11 @@ diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h # define FEAT_GUI_TEXTDIALOG #endif -diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c ---- vim73/src/gui.c 2010-08-08 13:01:18.035651584 +0000 -+++ vim73.haiku/src/gui.c 2010-08-20 23:05:36.517210112 +0000 -@@ -59,7 +59,7 @@ +diff --git a/src/gui.c b/src/gui.c +index 87930c6..537bd7b 100644 +--- a/src/gui.c ++++ b/src/gui.c +@@ -59,7 +59,7 @@ static int can_update_cursor = TRUE; /* can display the cursor */ gui_start() { char_u *old_term; @@ -838,7 +532,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c # define MAY_FORK int dofork = TRUE; #endif -@@ -275,7 +275,7 @@ +@@ -275,7 +275,7 @@ gui_init_check() gui.menu_width = 0; # endif #endif @@ -847,7 +541,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui.toolbar_height = 0; #endif #if defined(FEAT_FOOTER) && defined(FEAT_GUI_MOTIF) -@@ -1167,10 +1167,10 @@ +@@ -1167,10 +1167,10 @@ gui_position_components(total_width) text_area_y += gui.tabline_height; #endif @@ -860,7 +554,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui_mch_set_toolbar_pos(0, text_area_y, gui.menu_width, gui.toolbar_height); # endif -@@ -1178,6 +1178,13 @@ +@@ -1178,6 +1178,13 @@ gui_position_components(total_width) } #endif @@ -874,7 +568,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c text_area_width = gui.num_cols * gui.char_width + gui.border_offset * 2; text_area_height = gui.num_rows * gui.char_height + gui.border_offset * 2; -@@ -1249,7 +1256,7 @@ +@@ -1249,7 +1256,7 @@ gui_get_base_height() # endif # endif # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \ @@ -883,7 +577,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c if (gui_has_tabline()) base_height += gui.tabline_height; # endif -@@ -1292,7 +1299,11 @@ +@@ -1292,7 +1299,11 @@ gui_resize_shell(pixel_width, pixel_height) again: busy = TRUE; @@ -896,7 +590,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c out_flush(); gui.num_cols = (pixel_width - gui_get_base_width()) / gui.char_width; -@@ -1314,7 +1325,11 @@ +@@ -1314,7 +1325,11 @@ again: || gui.num_rows != Rows || gui.num_cols != Columns) shell_resized(); @@ -909,7 +603,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui_update_cursor(FALSE, TRUE); #if defined(FEAT_XIM) && !defined(FEAT_GUI_GTK) xim_set_status_area(); -@@ -4055,9 +4070,9 @@ +@@ -4055,9 +4070,9 @@ gui_update_scrollbars(force) y += gui.menu_height; #endif @@ -921,7 +615,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c y += gui.toolbar_height; # else # ifdef FEAT_GUI_MSWIN -@@ -4066,7 +4081,8 @@ +@@ -4066,7 +4081,8 @@ gui_update_scrollbars(force) # endif #endif @@ -931,7 +625,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c if (gui_has_tabline()) y += gui.tabline_height; #endif -@@ -4811,7 +4827,8 @@ +@@ -4811,7 +4827,8 @@ ex_gui(eap) } #if ((defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) \ @@ -941,9 +635,10 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c /* * This is shared between Athena, Motif and GTK. */ -diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h ---- vim73/src/gui.h 2010-07-17 19:40:58.051642368 +0000 -+++ vim73.haiku/src/gui.h 2010-08-20 23:07:23.085983232 +0000 +diff --git a/src/gui.h b/src/gui.h +index 149603c..9feee3a 100644 +--- a/src/gui.h ++++ b/src/gui.h @@ -33,6 +33,10 @@ # include #endif @@ -964,7 +659,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h # define HAVE_DROP_FILE #endif -@@ -216,6 +220,9 @@ +@@ -216,6 +220,9 @@ typedef struct GuiScrollbar scroll_shift is set to the number of shifts to reduce the count. */ #endif @@ -974,7 +669,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h #ifdef FEAT_GUI_MAC ControlHandle id; /* A handle to the scrollbar */ #endif -@@ -412,7 +419,7 @@ +@@ -412,7 +419,7 @@ typedef struct Gui #if defined(FEAT_GUI_TABLINE) \ && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ @@ -983,7 +678,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h int tabline_height; #endif -@@ -421,7 +428,7 @@ +@@ -421,7 +428,7 @@ typedef struct Gui #endif #if defined(FEAT_TOOLBAR) \ @@ -992,7 +687,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h int toolbar_height; /* height of the toolbar */ #endif -@@ -442,6 +449,14 @@ +@@ -442,6 +449,14 @@ typedef struct Gui guicolor_T currSpColor; /* Current special text color */ #endif @@ -1007,9 +702,11 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h #ifdef FEAT_GUI_MAC WindowPtr VimWindow; MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */ -diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc ---- vim73/src/gui_beos.cc 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/gui_beos.cc 2010-08-20 23:43:35.727711744 +0000 +diff --git a/src/gui_beos.cc b/src/gui_beos.cc +new file mode 100644 +index 0000000..ceafd40 +--- /dev/null ++++ b/src/gui_beos.cc @@ -0,0 +1,4868 @@ +/* vi:set ts=8 sts=4 sw=4: + * @@ -5879,10 +5576,11 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +} + +#endif //FEAT_GUI_TABLINE -+ -diff -Naur vim73/src/gui_beos.h vim73.haiku/src/gui_beos.h ---- vim73/src/gui_beos.h 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/gui_beos.h 2010-08-20 22:25:02.562298880 +0000 +diff --git a/src/gui_beos.h b/src/gui_beos.h +new file mode 100644 +index 0000000..7f323cd +--- /dev/null ++++ b/src/gui_beos.h @@ -0,0 +1,51 @@ +/* vi:set ts=8 sts=4 sw=4: + * @@ -5935,9 +5633,10 @@ diff -Naur vim73/src/gui_beos.h vim73.haiku/src/gui_beos.h +typedef struct VimScrollBar VimScrollBar; + +#endif -diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c ---- vim73/src/misc1.c 2010-08-15 11:24:05.015466496 +0000 -+++ vim73.haiku/src/misc1.c 2010-08-20 22:43:17.718798848 +0000 +diff --git a/src/misc1.c b/src/misc1.c +index fd178c9..b8c838a 100644 +--- a/src/misc1.c ++++ b/src/misc1.c @@ -14,6 +14,10 @@ #include "vim.h" #include "version.h" @@ -5949,7 +5648,7 @@ diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c static char_u *vim_version_dir __ARGS((char_u *vimdir)); static char_u *remove_tail __ARGS((char_u *p, char_u *pend, char_u *name)); static int copy_indent __ARGS((int size, char_u *src)); -@@ -3902,7 +3906,18 @@ +@@ -3902,7 +3906,18 @@ vim_getenv(name, mustfree) vimruntime = (STRCMP(name, "VIMRUNTIME") == 0); if (!vimruntime && STRCMP(name, "VIM") != 0) @@ -5969,10 +5668,11 @@ diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c /* * When expanding $VIMRUNTIME fails, try using $VIM/vim or $VIM. -diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c ---- vim73/src/normal.c 2010-07-31 13:25:19.021233664 +0000 -+++ vim73.haiku/src/normal.c 2010-08-20 22:44:36.301203456 +0000 -@@ -2599,6 +2599,7 @@ +diff --git a/src/normal.c b/src/normal.c +index b76e40d..d8ef2f1 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -2599,6 +2599,7 @@ do_mouse(oap, c, dir, count, fixindent) * shift-left button -> right button * alt-left button -> alt-right button */ @@ -5980,7 +5680,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c if (mouse_model_popup()) { if (which_button == MOUSE_RIGHT -@@ -2613,13 +2614,14 @@ +@@ -2613,13 +2614,14 @@ do_mouse(oap, c, dir, count, fixindent) if (!is_click) return FALSE; #endif @@ -5997,7 +5697,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c if (gui.in_use) { jump_flags = 0; -@@ -5385,7 +5387,8 @@ +@@ -5385,7 +5387,8 @@ nv_clear(cap) { if (!checkclearop(cap->oap)) { @@ -6007,7 +5707,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c /* * Right now, the BeBox doesn't seem to have an easy way to detect * window resizing, so we cheat and make the user detect it -@@ -5393,6 +5396,7 @@ +@@ -5393,6 +5396,7 @@ nv_clear(cap) */ ui_get_shellsize(); #endif @@ -6015,9 +5715,10 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c #ifdef FEAT_SYN_HL /* Clear all syntax states to force resyncing. */ syn_stack_free_all(curwin->w_s); -diff -Naur vim73/src/option.h vim73.haiku/src/option.h ---- vim73/src/option.h 2010-07-25 14:15:02.038535168 +0000 -+++ vim73.haiku/src/option.h 2010-08-20 22:45:31.003407872 +0000 +diff --git a/src/option.h b/src/option.h +index 0f697c2..a4121b9 100644 +--- a/src/option.h ++++ b/src/option.h @@ -9,7 +9,8 @@ /* * option.h: definition of global variables for settable options @@ -6028,14 +5729,15 @@ diff -Naur vim73/src/option.h vim73.haiku/src/option.h /* * Default values for 'errorformat'. * The "%f|%l| %m" one is used for when the contents of the quickfix window is -@@ -1095,3 +1096,4 @@ +@@ -1095,3 +1096,4 @@ enum , WV_WRAP , WV_COUNT /* must be the last one */ }; +#endif //_OPTION_H_ -diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c ---- vim73/src/os_beos.c 2010-05-15 11:04:09.032768000 +0000 -+++ vim73.haiku/src/os_beos.c 2010-08-20 23:15:48.089915392 +0000 +diff --git a/src/os_beos.c b/src/os_beos.c +index 10135aa..e46c1ca 100644 +--- a/src/os_beos.c ++++ b/src/os_beos.c @@ -23,8 +23,8 @@ #define thread_id int #endif @@ -6047,7 +5749,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c sem_id character_present; sem_id character_wanted; thread_id read_thread_id; -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ read_thread(void *dummy) for (;;) { if (acquire_sem(character_wanted) != B_NO_ERROR) break; @@ -6056,7 +5758,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c release_sem(character_present); } -@@ -70,13 +70,18 @@ +@@ -70,13 +70,18 @@ beos_cleanup_read_thread(void) #endif @@ -6076,7 +5778,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c beos_select(int nbits, struct fd_set *rbits, struct fd_set *wbits, -@@ -84,7 +89,11 @@ +@@ -84,7 +89,11 @@ beos_select(int nbits, struct timeval *timeout) { bigtime_t tmo; @@ -6089,7 +5791,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c if (nbits == 0) { /* select is purely being used for delay */ snooze(timeout->tv_sec * 1e6 + timeout->tv_usec); -@@ -153,13 +162,15 @@ +@@ -153,13 +162,15 @@ beos_select(int nbits, acquired = acquire_sem(character_present); if (acquired == B_NO_ERROR) { if (charcount > 0) { @@ -6106,7 +5808,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c #if !TRY_ABORT release_sem(character_wanted); #endif -@@ -183,7 +194,7 @@ +@@ -183,7 +194,7 @@ beos_select(int nbits, if (acquired == B_TIMED_OUT) acquire_sem(character_present); if (charcount > 0) { @@ -6115,7 +5817,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c return 1; } return 0; -@@ -192,6 +203,19 @@ +@@ -192,6 +203,19 @@ beos_select(int nbits, } #endif @@ -6135,9 +5837,10 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c +#endif /* __BEOS__ */ + -diff -Naur vim73/src/os_beos.h vim73.haiku/src/os_beos.h ---- vim73/src/os_beos.h 2010-05-15 11:04:11.065273856 +0000 -+++ vim73.haiku/src/os_beos.h 2010-08-20 23:16:40.791937024 +0000 +diff --git a/src/os_beos.h b/src/os_beos.h +index 260834e..c6da995 100644 +--- a/src/os_beos.h ++++ b/src/os_beos.h @@ -20,6 +20,18 @@ #undef BEOS_DR8 #define BEOS_PR_OR_BETTER @@ -6159,9 +5862,11 @@ diff -Naur vim73/src/os_beos.h vim73.haiku/src/os_beos.h +#endif -#include /* for typedefs and #defines only */ -diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef ---- vim73/src/os_beos.rdef 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/os_beos.rdef 2010-05-02 14:29:42.040894464 +0000 +diff --git a/src/os_beos.rdef b/src/os_beos.rdef +new file mode 100644 +index 0000000..004ed05 +--- /dev/null ++++ b/src/os_beos.rdef @@ -0,0 +1,205 @@ +/* + * Vim.rdef @@ -6368,10 +6073,11 @@ diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef + $"FF17F6CF36F92F1B9E631E8B8F3FBC0000000049454E44AE426082" +}; + -diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c ---- vim73/src/os_unix.c 2010-08-08 13:14:04.061079552 +0000 -+++ vim73.haiku/src/os_unix.c 2010-08-20 22:41:48.458489856 +0000 -@@ -1131,7 +1131,7 @@ +diff --git a/src/os_unix.c b/src/os_unix.c +index a82c65d..823fa74 100644 +--- a/src/os_unix.c ++++ b/src/os_unix.c +@@ -1131,7 +1131,7 @@ sigcont_handler SIGDEFARG(sigarg) mch_suspend() { /* BeOS does have SIGTSTP, but it doesn't work. */ @@ -6380,7 +6086,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c out_flush(); /* needed to make cursor visible on some systems */ settmode(TMODE_COOK); out_flush(); /* needed to disable mouse on some systems */ -@@ -2017,6 +2017,11 @@ +@@ -2017,6 +2017,11 @@ mch_settitle(title, icon) if (gui.in_use) type = 1; # endif @@ -6392,7 +6098,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c #endif /* -@@ -2041,7 +2046,7 @@ +@@ -2041,7 +2046,7 @@ mch_settitle(title, icon) # endif set_x11_title(title); /* x11 */ #endif @@ -6401,7 +6107,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC) else gui_mch_settitle(title, icon); -@@ -3088,7 +3093,9 @@ +@@ -3088,7 +3093,9 @@ mch_exit(r) ml_close_all(TRUE); /* remove all memfiles */ may_core_dump(); #ifdef FEAT_GUI @@ -6411,7 +6117,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c gui_exit(r); #endif -@@ -3918,7 +3925,7 @@ +@@ -3918,7 +3925,7 @@ mch_call_shell(cmd, options) if (!pipe_error) /* pty or pipe opened or not used */ { @@ -6420,10 +6126,11 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c beos_cleanup_read_thread(); # endif -diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h ---- vim73/src/os_unix.h 2010-05-23 14:16:14.034865152 +0200 -+++ vim73.haiku/src/os_unix.h 2011-02-21 23:18:13.038797312 +0100 -@@ -388,6 +388,8 @@ +diff --git a/src/os_unix.h b/src/os_unix.h +index 5fd28af..a371c4e 100644 +--- a/src/os_unix.h ++++ b/src/os_unix.h +@@ -388,6 +388,8 @@ typedef struct dsc$descriptor DESC; #define DFLT_ERRORFILE "errors.err" @@ -6432,7 +6139,7 @@ diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h #ifdef OS2 # define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after" #else -@@ -402,6 +404,8 @@ +@@ -402,6 +404,8 @@ typedef struct dsc$descriptor DESC; # endif #endif @@ -6441,9 +6148,34 @@ diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h #ifdef OS2 /* * Try several directories to put the temp files. -diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro ---- vim73/src/proto/gui_beos.pro 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/proto/gui_beos.pro 2010-08-20 23:42:00.825229312 +0000 +diff --git a/src/proto.h b/src/proto.h +index 40fb2a9..036bb72 100644 +--- a/src/proto.h ++++ b/src/proto.h +@@ -59,7 +59,7 @@ extern int _stricoll __ARGS((char *a, char *b)); + # ifdef VMS + # include "os_vms.pro" + # endif +-# ifdef __BEOS__ ++# if defined(__BEOS__) || defined(__HAIKU__) + # include "os_beos.pro" + # endif + # ifdef RISCOS +@@ -239,6 +239,9 @@ extern char_u *vimpty_getenv __ARGS((const char_u *string)); /* from pty.c */ + extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path, int (*show_entry)(), int x, int y, guicolor_T fg, guicolor_T bg, guicolor_T scroll_fg, guicolor_T scroll_bg)); + # endif + # endif ++# ifdef FEAT_GUI_BEOS ++# include "gui_beos.pro" ++# endif + # ifdef FEAT_GUI_MAC + # include "gui_mac.pro" + # endif +diff --git a/src/proto/gui_beos.pro b/src/proto/gui_beos.pro +new file mode 100644 +index 0000000..b74cd20 +--- /dev/null ++++ b/src/proto/gui_beos.pro @@ -0,0 +1,90 @@ +/* gui_beos.cc - hand crafted */ +void gui_mch_prepare __ARGS((int *argc, char **argv)); @@ -6535,40 +6267,21 @@ diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro +int gui_mch_showing_tabline __ARGS((void)); +void gui_mch_update_tabline __ARGS((void)); +void gui_mch_set_curtab __ARGS((int nr)); -diff -Naur vim73/src/proto/os_beos.pro vim73.haiku/src/proto/os_beos.pro ---- vim73/src/proto/os_beos.pro 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/proto/os_beos.pro 2009-05-16 16:18:36.066846720 +0000 +diff --git a/src/proto/os_beos.pro b/src/proto/os_beos.pro +new file mode 100644 +index 0000000..c537101 +--- /dev/null ++++ b/src/proto/os_beos.pro @@ -0,0 +1,4 @@ +/* os_beos.c */ +void beos_cleanup_read_thread __ARGS((void)); +int beos_select __ARGS((int nbits, struct fd_set *rbits, struct fd_set *wbits, struct fd_set *ebits, struct timeval *timeout)); +/* vim: set ft=c : */ -diff -Naur vim73/src/proto.h vim73.haiku/src/proto.h ---- vim73/src/proto.h 2010-07-17 15:28:51.056623104 +0000 -+++ vim73.haiku/src/proto.h 2010-08-20 22:46:57.833617920 +0000 -@@ -59,7 +59,7 @@ - # ifdef VMS - # include "os_vms.pro" - # endif --# ifdef __BEOS__ -+# if defined(__BEOS__) || defined(__HAIKU__) - # include "os_beos.pro" - # endif - # ifdef RISCOS -@@ -239,6 +239,9 @@ - extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path, int (*show_entry)(), int x, int y, guicolor_T fg, guicolor_T bg, guicolor_T scroll_fg, guicolor_T scroll_bg)); - # endif - # endif -+# ifdef FEAT_GUI_BEOS -+# include "gui_beos.pro" -+# endif - # ifdef FEAT_GUI_MAC - # include "gui_mac.pro" - # endif -diff -Naur vim73/src/pty.c vim73.haiku/src/pty.c ---- vim73/src/pty.c 2010-07-24 18:23:01.037748736 +0000 -+++ vim73.haiku/src/pty.c 2010-08-20 22:48:03.131858432 +0000 -@@ -353,7 +353,7 @@ +diff --git a/src/pty.c b/src/pty.c +index 944eccf..a5c5d59 100644 +--- a/src/pty.c ++++ b/src/pty.c +@@ -353,7 +353,7 @@ OpenPTY(ttyn) static char PtyProto[] = "/dev/ptym/ptyXY"; static char TtyProto[] = "/dev/pty/ttyXY"; # else @@ -6577,10 +6290,11 @@ diff -Naur vim73/src/pty.c vim73.haiku/src/pty.c static char PtyProto[] = "/dev/pt/XY"; static char TtyProto[] = "/dev/tt/XY"; # else -diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c ---- vim73/src/screen.c 2010-08-13 13:21:27.004194304 +0000 -+++ vim73.haiku/src/screen.c 2010-08-20 22:54:49.930349056 +0000 -@@ -7917,6 +7917,10 @@ +diff --git a/src/screen.c b/src/screen.c +index 380eb8b..b696b68 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -7917,6 +7917,10 @@ retry: win_new_shellsize(); /* fit the windows in the new sized shell */ @@ -6591,7 +6305,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c comp_col(); /* recompute columns for shown command and ruler */ /* -@@ -8160,6 +8164,9 @@ +@@ -8160,6 +8164,9 @@ give_up: } #endif @@ -6601,7 +6315,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c entered = FALSE; --RedrawingDisabled; -@@ -9023,6 +9030,9 @@ +@@ -9023,6 +9030,9 @@ screen_ins_lines(off, row, line_count, end, wp) clip_scroll_selection(-line_count); #endif @@ -6611,7 +6325,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c #ifdef FEAT_GUI /* Don't update the GUI cursor here, ScreenLines[] is invalid until the * scrolling is actually carried out. */ -@@ -9075,6 +9085,10 @@ +@@ -9075,6 +9085,10 @@ screen_ins_lines(off, row, line_count, end, wp) } } @@ -6622,7 +6336,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c screen_stop_highlight(); windgoto(cursor_row, 0); -@@ -9244,6 +9258,9 @@ +@@ -9244,6 +9258,9 @@ screen_del_lines(off, row, line_count, end, force, wp) clip_scroll_selection(line_count); #endif @@ -6632,7 +6346,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c #ifdef FEAT_GUI /* Don't update the GUI cursor here, ScreenLines[] is invalid until the * scrolling is actually carried out. */ -@@ -9303,6 +9320,10 @@ +@@ -9303,6 +9320,10 @@ screen_del_lines(off, row, line_count, end, force, wp) } } @@ -6643,10 +6357,11 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c screen_stop_highlight(); #ifdef FEAT_VERTSPLIT -diff -Naur vim73/src/structs.h vim73.haiku/src/structs.h ---- vim73/src/structs.h 2010-08-07 14:59:27.033292288 +0000 -+++ vim73.haiku/src/structs.h 2010-08-20 22:56:00.936640512 +0000 -@@ -2330,6 +2330,13 @@ +diff --git a/src/structs.h b/src/structs.h +index 884d6a9..690cf4d 100644 +--- a/src/structs.h ++++ b/src/structs.h +@@ -2330,6 +2330,13 @@ struct VimMenu HMENU submenu_id; /* If this is submenu, add children here */ HWND tearoff_handle; /* hWnd of tearoff if created */ #endif @@ -6660,10 +6375,11 @@ diff -Naur vim73/src/structs.h vim73.haiku/src/structs.h #ifdef FEAT_GUI_MAC /* MenuHandle id; */ /* short index; */ /* the item index within the father menu */ -diff -Naur vim73/src/term.c vim73.haiku/src/term.c ---- vim73/src/term.c 2010-07-25 13:30:31.000262144 +0000 -+++ vim73.haiku/src/term.c 2010-08-20 22:56:43.414711808 +0000 -@@ -1436,6 +1436,11 @@ +diff --git a/src/term.c b/src/term.c +index 8c42662..bd6c7b7 100644 +--- a/src/term.c ++++ b/src/term.c +@@ -1436,6 +1436,11 @@ static struct builtin_term builtin_termcaps[] = # define DEFAULT_TERM (char_u *)"beos-ansi" #endif @@ -6675,10 +6391,11 @@ diff -Naur vim73/src/term.c vim73.haiku/src/term.c #ifndef DEFAULT_TERM # define DEFAULT_TERM (char_u *)"dumb" #endif -diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c ---- vim73/src/ui.c 2010-08-08 13:17:30.061865984 +0000 -+++ vim73.haiku/src/ui.c 2010-08-20 22:57:17.743440384 +0000 -@@ -269,7 +269,7 @@ +diff --git a/src/ui.c b/src/ui.c +index 9a04476..0886244 100644 +--- a/src/ui.c ++++ b/src/ui.c +@@ -269,7 +269,7 @@ ui_suspend() mch_suspend(); } @@ -6687,7 +6404,7 @@ diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c /* * When the OS can't really suspend, call this function to start a shell. * This is never called in the GUI. -@@ -3000,7 +3000,7 @@ +@@ -3000,7 +3000,7 @@ mouse_find_win(rowp, colp) #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) \ || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \ @@ -6696,10 +6413,11 @@ diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c /* * Translate window coordinates to buffer position without any side effects */ -diff -Naur vim73/src/version.c vim73.haiku/src/version.c ---- vim73/src/version.c 2010-08-01 13:45:48.052953088 +0000 -+++ vim73.haiku/src/version.c 2010-08-20 22:58:43.417333248 +0000 -@@ -949,6 +949,9 @@ +diff --git a/src/version.c b/src/version.c +index 79522a4..298b0e6 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -949,6 +949,9 @@ list_version() MSG_PUTS(_("with X11-Athena GUI.")); # endif # else @@ -6709,7 +6427,7 @@ diff -Naur vim73/src/version.c vim73.haiku/src/version.c # ifdef FEAT_GUI_PHOTON MSG_PUTS(_("with Photon GUI.")); # else -@@ -966,6 +969,7 @@ +@@ -966,6 +969,7 @@ list_version() # endif # endif # endif @@ -6717,9 +6435,10 @@ diff -Naur vim73/src/version.c vim73.haiku/src/version.c # endif # endif # endif -diff -Naur vim73/src/vim.h vim73.haiku/src/vim.h ---- vim73/src/vim.h 2010-07-29 18:46:39.058720256 +0000 -+++ vim73.haiku/src/vim.h 2010-08-20 23:00:06.199753728 +0000 +diff --git a/src/vim.h b/src/vim.h +index b9ce325..aaa407a 100644 +--- a/src/vim.h ++++ b/src/vim.h @@ -115,6 +115,7 @@ || defined(FEAT_GUI_MAC) \ || defined(FEAT_GUI_W32) \ @@ -6737,7 +6456,7 @@ diff -Naur vim73/src/vim.h vim73.haiku/src/vim.h # include "os_beos.h" # define __ARGS(x) x #endif -@@ -1903,6 +1904,9 @@ +@@ -1903,6 +1904,9 @@ typedef struct VimClipboard int_u format; /* Vim's own special clipboard format */ int_u format_raw; /* Vim's raw text clipboard format */ # endif @@ -6747,3 +6466,6 @@ diff -Naur vim73/src/vim.h vim73.haiku/src/vim.h } VimClipboard; #else typedef int VimClipboard; /* This is required for the prototypes. */ +-- +1.8.3.4 + diff --git a/app-editors/vim/vim-7.2.bep b/app-editors/vim/vim-7.2.recipe similarity index 94% rename from app-editors/vim/vim-7.2.bep rename to app-editors/vim/vim-7.2.recipe index 7b6d90625..8d7496e91 100644 --- a/app-editors/vim/vim-7.2.bep +++ b/app-editors/vim/vim-7.2.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="c368894a65c09605517fd56ced57fb12" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd vim72 cd src make autoconf @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd vim72 make install } diff --git a/app-editors/vim/vim-7.3.bep b/app-editors/vim/vim-7.3.bep deleted file mode 100644 index 52c00432d..000000000 --- a/app-editors/vim/vim-7.3.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Vim is highly configurable text editor." -HOMEPAGE="http://www.vim.org" -SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2" -REVISION="1" -CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2" -STATUS_HAIKU="unstable" -DEPEND="" -BUILD { - cd vim73 - cd src - make autoconf - cd ../ - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-features=big - make -} - -INSTALL { - cd vim73 - make install -} diff --git a/app-editors/vim/vim-7.3.recipe b/app-editors/vim/vim-7.3.recipe new file mode 100644 index 000000000..507f4fd26 --- /dev/null +++ b/app-editors/vim/vim-7.3.recipe @@ -0,0 +1,69 @@ +SUMMARY="Vim is highly configurable text editor." +DESCRIPTION=" + Vim is a highly configurable text editor built to enable efficient text + editing. It is an improved version of the vi editor distributed with most + UNIX systems. + + Vim is often called a \"programmer's editor,\" and so useful for programming + that many consider it an entire IDE. It's not just for programmers, though. + Vim is perfect for all kinds of text editing, from composing email to editing + configuration files. + + Despite what the above comic suggests, Vim can be configured to work in a very + simple (Notepad-like) way, called evim or Easy Vim. + " +HOMEPAGE="http://www.vim.org" +SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2" +COPYRIGHT="Bram Moleenar et al." +LICENSE="Vim" +REVISION="1" +CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + vim = $portVersion + cmd:ex = $portVersion + cmd:gview = $portVersion + cmd:gvim = $portVersion + cmd:gvimdiff = $portVersion + cmd:rgview = $portVersion + cmd:rgvim = $portVersion + cmd:rview = $portVersion + cmd:rvim = $portVersion + cmd:vim = $portVersion + cmd:vimdiff = $portVersion + cmd:vimtutor = $portVersion + cmd:view = $portVersion + cmd:xxd = $portVersion +" +REQUIRES=" + haiku + lib:libncurses +" +BUILD_REQUIRES=" + ncurses_devel +" +BUILD_PREREQUIRES=" + cmd:make + cmd:autoconf + cmd:gcc +" + +SOURCE_DIR="vim73" +PATCHES=" + vim-7.3.patchset +" + +BUILD() +{ + cd src + make autoconf + cd ../ + runConfigure ./configure --with-features=big + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/app-emulation/aranym/aranym-0.9.11-cvs.bep b/app-emulation/aranym/aranym-0.9.11_cvs.recipe similarity index 96% rename from app-emulation/aranym/aranym-0.9.11-cvs.bep rename to app-emulation/aranym/aranym-0.9.11_cvs.recipe index d5866162a..b1900a133 100644 --- a/app-emulation/aranym/aranym-0.9.11-cvs.bep +++ b/app-emulation/aranym/aranym-0.9.11_cvs.recipe @@ -7,14 +7,16 @@ DEPEND="dev-libs/libcdio >= 0.82 media-libs/libsdl >= 1.2.10" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd aranym ./autogen.sh --help >/dev/null ./configure --prefix=/boot/apps/ARAnyM make } -INSTALL { +INSTALL() +{ cd aranym make install } diff --git a/app-emulation/libdsk/libdsk-1.3.3.bep b/app-emulation/libdsk/libdsk-1.3.3.bep deleted file mode 100644 index b9217604b..000000000 --- a/app-emulation/libdsk/libdsk-1.3.3.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="LibDSK is a library for manipulating disk image files" -HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/" -SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -#CHECKSUM_MD5="" - -BUILD { - cd libdsk-1.3.3 - # Need to update the libtools in the package to build shared libraries - libtoolize - # We need a makefile to run make distclean... - ./configure --prefix=/boot/common - # Make sure autotools know about the updated libtools... - make distclean - # ... and run configure again - ./configure --prefix=/boot/common - make -} - -INSTALL { - cd libdsk-1.3.3 - make install -} - -COPYRIGHT="2010 John Elliott" -LICENSE="GNU GPL v2" diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe new file mode 100644 index 000000000..1bfc83d9d --- /dev/null +++ b/app-emulation/libdsk/libdsk-1.3.3.recipe @@ -0,0 +1,79 @@ +SUMMARY="LibDSK is a library for manipulating disk image files" +HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/" +SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz" +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" +CHECKSUM_MD5="2cce41b4b1325d697183e34afcae2a9c" + +PROVIDES=" + libdsk$secondaryArchSuffix = $portVersion + lib:libdsk$secondaryArchSuffix = $portVersion + devel:libdsk$secondaryArchSuffix = $portVersion + " + + +if [ -z "$secondaryArchSuffix" ]; then +PROVIDES="$PROVIDES + cmd:apriboot + cmd:dskdump + cmd:dskform + cmd:dskid + cmd:dskscan + cmd:dsktrans + cmd:dskutil + cmd:md3serial + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:libtoolize + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + # Need to update the libtools in the package to build shared libraries + libtoolize --install --copy --force + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + + prepareInstalledDevelLib libdsk +} + +COPYRIGHT="2010 John Elliott" +LICENSE="GNU GPL v2" +DESCRIPTION=" + LIBDSK is a library for accessing discs and disc image files. It is + intended for use in: + + * Emulator tools - converting between real floppy discs and disc images, as + CPCTRANS / PCWTRANS do under DOS. + * Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus + allowing the use of CPMTOOLS on emulator .DSK images. To do this, install + LIBDSK and then build CPMTOOLS, using \"./configure --with-libdsk\". For + CPMTOOLS 1.9 or 2.0, you will also need to apply this patch. + * Emulators - it is possible to use LIBDSK as part of an emulator's floppy + controller emulation, thus giving the emulator transparent access to .DSK + files or real discs. + " diff --git a/app-emulation/mednafen/mednafen-0.9.26.bep b/app-emulation/mednafen/mednafen-0.9.26.recipe similarity index 95% rename from app-emulation/mednafen/mednafen-0.9.26.bep rename to app-emulation/mednafen/mednafen-0.9.26.recipe index a273028a5..9e33fb29e 100644 --- a/app-emulation/mednafen/mednafen-0.9.26.bep +++ b/app-emulation/mednafen/mednafen-0.9.26.recipe @@ -9,18 +9,21 @@ DEPEND="media-libs/libsdl >= 1.2.15, dev-libs/libcdio >= 0.82, media-libs/libsndfile >= 1.0.21" -BUILD { +BUILD() +{ cd mednafen ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd mednafen make install } -TEST { +TEST() +{ cd mednafen make check } diff --git a/app-emulation/oricutron/oricutron-0.9-svn.bep b/app-emulation/oricutron/oricutron-0.9_svn.recipe similarity index 94% rename from app-emulation/oricutron/oricutron-0.9-svn.bep rename to app-emulation/oricutron/oricutron-0.9_svn.recipe index 702d1bf26..ca7088f5b 100644 --- a/app-emulation/oricutron/oricutron-0.9-svn.bep +++ b/app-emulation/oricutron/oricutron-0.9_svn.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="untested" DEPEND="media-libs/libsdl >= 1.2.10" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd trunk make } -INSTALL { +INSTALL() +{ cd trunk make install } diff --git a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep b/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe similarity index 95% rename from app-emulation/pearpc/pearpc-0.5.0-cvs.bep rename to app-emulation/pearpc/pearpc-0.5.0_cvs.recipe index e8b8f682f..f742be56e 100644 --- a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep +++ b/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="untested" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd pearpc-0.5.0-cvs ./autogen.sh >/dev/null ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd pearpc-0.5.0-cvs make install } diff --git a/app-emulation/qemu/qemu-0.12.4.bep b/app-emulation/qemu/qemu-0.12.4.recipe similarity index 95% rename from app-emulation/qemu/qemu-0.12.4.bep rename to app-emulation/qemu/qemu-0.12.4.recipe index e97a8f4f4..7e97ecfc0 100644 --- a/app-emulation/qemu/qemu-0.12.4.bep +++ b/app-emulation/qemu/qemu-0.12.4.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="93e6b134dff89b2799f57b7d9e0e0fc5" -BUILD { +BUILD() +{ cd qemu-0.12.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd qemu-0.12.4 make install } diff --git a/app-emulation/qemu/qemu-0.15.1.bep b/app-emulation/qemu/qemu-0.15.1.recipe similarity index 100% rename from app-emulation/qemu/qemu-0.15.1.bep rename to app-emulation/qemu/qemu-0.15.1.recipe diff --git a/app-i18n/anthy/anthy-9100.bep b/app-i18n/anthy/anthy-9100.recipe similarity index 96% rename from app-i18n/anthy/anthy-9100.bep rename to app-i18n/anthy/anthy-9100.recipe index 58d79885e..8d3365daa 100644 --- a/app-i18n/anthy/anthy-9100.bep +++ b/app-i18n/anthy/anthy-9100.recipe @@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2Fanthy%2F37536%2Fant REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd anthy-9100h libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd anthy-9100h make install } diff --git a/app-misc/colordiff/colordiff-1.0.10.bep b/app-misc/colordiff/colordiff-1.0.10.recipe similarity index 96% rename from app-misc/colordiff/colordiff-1.0.10.bep rename to app-misc/colordiff/colordiff-1.0.10.recipe index 1f73f2885..8f8393bc7 100644 --- a/app-misc/colordiff/colordiff-1.0.10.bep +++ b/app-misc/colordiff/colordiff-1.0.10.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/perl >= 5.10.1 sys-apps/diffutils >= 2.8.1" -BUILD { +BUILD() +{ # Nothing to see here cd colordiff-1.0.10 } -INSTALL { +INSTALL() +{ cd colordiff-1.0.10 make INSTALL_DIR="$(finddir B_COMMON_BIN_DIRECTORY)" \ MAN_DIR="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1" \ diff --git a/app-misc/figlet/figlet-222.bep b/app-misc/figlet/figlet-222.recipe similarity index 97% rename from app-misc/figlet/figlet-222.bep rename to app-misc/figlet/figlet-222.recipe index 93ba4a04b..b889537e4 100644 --- a/app-misc/figlet/figlet-222.bep +++ b/app-misc/figlet/figlet-222.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="5f84ad52d092d5db4ad5916df767646b" -BUILD { +BUILD() +{ cd figlet222 make } -INSTALL { +INSTALL() +{ cd figlet222 DISTRODIR=${DESTDIR} MANDIR=${DISTRODIR}/`finddir B_APPS_DIRECTORY`/figlet/share/man diff --git a/app-misc/getopt/getopt-1.1.4.bep b/app-misc/getopt/getopt-1.1.4.recipe similarity index 95% rename from app-misc/getopt/getopt-1.1.4.bep rename to app-misc/getopt/getopt-1.1.4.recipe index 2ae2b7510..28028bab7 100644 --- a/app-misc/getopt/getopt-1.1.4.bep +++ b/app-misc/getopt/getopt-1.1.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="02188ca68da27c4175d6e9f3da732101" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd getopt-1.1.4 make } -INSTALL { +INSTALL() +{ cd getopt-1.1.4 make install prefix=`finddir B_COMMON_DIRECTORY` DESTDIR="${DESTDIR}" } diff --git a/app-office/abiword/abiword-2.8.6.bep b/app-office/abiword/abiword-2.8.6.recipe similarity index 94% rename from app-office/abiword/abiword-2.8.6.bep rename to app-office/abiword/abiword-2.8.6.recipe index a973c4127..21de67380 100644 --- a/app-office/abiword/abiword-2.8.6.bep +++ b/app-office/abiword/abiword-2.8.6.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="broken" DEPEND="media-libs/jpeg >= 6b media-libs/libpng >= 1.2" CHECKSUM_MD5="f883b0a7f26229a9c66fd6a1a94381aa" -BUILD { +BUILD() +{ cd abiword-2.8.6 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd abiword-2.8.6 make install } -TEST { +TEST() +{ cd abiword-2.8.6 # make test # make check diff --git a/app-shells/bash/bash-4.1.bep b/app-shells/bash/bash-4.1.recipe similarity index 95% rename from app-shells/bash/bash-4.1.bep rename to app-shells/bash/bash-4.1.recipe index 8d09bbf5d..9bd5889c1 100644 --- a/app-shells/bash/bash-4.1.bep +++ b/app-shells/bash/bash-4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="9800d8724815fd84994d9be65ab5e7b8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bash-4.1 ./configure make } -INSTALL { +INSTALL() +{ cd bash-4.1 make install DESTDIR=${DESTDIR} } diff --git a/app-shells/fish/fish-1.23.1-git.bep b/app-shells/fish/fish-1.23.1_git.recipe similarity index 95% rename from app-shells/fish/fish-1.23.1-git.bep rename to app-shells/fish/fish-1.23.1_git.recipe index db9e1bea1..d79dff6f6 100644 --- a/app-shells/fish/fish-1.23.1-git.bep +++ b/app-shells/fish/fish-1.23.1_git.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="untested" DEPEND="app-doc/doxygen >= 1.7.4 sys-libs/ncurses >= 5.9" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd fish-1.23.1-git libtoolize --force --copy --install autoconf @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fish-1.23.1-git make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd fish-1.23.1-git make test } diff --git a/app-shells/fish/patches/fish-1.23.1_git.patch b/app-shells/fish/patches/fish-1.23.1_git.patch new file mode 100644 index 000000000..4548969ba --- /dev/null +++ b/app-shells/fish/patches/fish-1.23.1_git.patch @@ -0,0 +1,152 @@ +diff --git a/configure.ac fish-1.23.1-git/configure.ac +index 377ab5e..672d34b 100644 +--- a/configure.ac ++++ fish-1.23.1-git/configure.ac +@@ -105,7 +105,7 @@ fi + # tree and doesn't update CFLAGS. + # + +-for i in /usr/pkg /sw /opt /opt/local; do ++for i in /usr/pkg /sw /opt /opt/local /boot/common; do + + AC_MSG_CHECKING([for $i/include include directory]) + if test -d $i/include; then +@@ -119,7 +119,8 @@ for i in /usr/pkg /sw /opt /opt/local; do + AC_MSG_CHECKING([for $i/lib library directory]) + if test -d $i/lib; then + AC_MSG_RESULT(yes) +- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/" ++ LDFLAGS="$LDFLAGS -L$i/lib/" ++ #LDFLAGS="$LDFLAGS -R$i/lib/" + else + AC_MSG_RESULT(no) + fi +@@ -142,6 +143,12 @@ AC_CONFIG_HEADERS(config.h) + + + # ++# Ask autoconf to detect the platform type ++# ++AC_CANONICAL_TARGET ++ ++ ++# + # This adds markup to the code that results in a few extra compile + # time checks on recent GCC versions. It helps stop a few common bugs. + # +@@ -306,7 +313,13 @@ if test "$GCC" = yes; then + # bug has been verified to not exist on Linux using GCC 3.3.3. + # + +- CFLAGS="$CFLAGS -fno-optimize-sibling-calls" ++ case $target_os in ++ beos*|haiku*) ++ ;; ++ *) ++ CFLAGS="$CFLAGS -fno-optimize-sibling-calls" ++ ;; ++ esac + + + # +@@ -319,7 +332,13 @@ if test "$GCC" = yes; then + # This is needed in order to get the really cool backtraces + # + +- LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" ++ case $target_os in ++ beos*|haiku*) ++ ;; ++ *) ++ LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" ++ ;; ++ esac + + fi + +@@ -378,8 +397,6 @@ fi + # seems that tputs is never really needed. + # + +-AC_CANONICAL_TARGET +- + if test $target_cpu = powerpc; then + AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work]) + fi +@@ -510,7 +527,7 @@ AC_DEFINE( + # Check for os dependant libraries for all binaries. + LIBS_COMMON=$LIBS + LIBS="" +-AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] ) ++AC_SEARCH_LIBS( connect, network socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] ) + AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) + AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] ) + AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] ) +@@ -555,7 +572,7 @@ LIBS="$LIBS_SHARED" + if test x$local_gettext != xno; then + AC_SEARCH_LIBS( gettext, intl,,) + fi +-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) ++AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) + LIBS_FISH_PAGER=$LIBS + LIBS=$LIBS_COMMON + +@@ -568,7 +585,7 @@ LIBS="$LIBS_SHARED" + if test x$local_gettext != xno; then + AC_SEARCH_LIBS( gettext, intl,,) + fi +-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) ++AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) + LIBS_FISHD=$LIBS + LIBS=$LIBS_COMMON + +diff --git a/proc.c fish-1.23.1-git/proc.c +index edcc7c6..30dd96f 100644 +--- a/proc.c ++++ fish-1.23.1-git/proc.c +@@ -482,8 +482,11 @@ static void handle_child_status( pid_t pid, int status ) + return; + } + +- ++#ifdef SA_SIGINFO + void job_handle_signal ( int signal, siginfo_t *info, void *con ) ++#else ++void job_handle_signal ( int signal ) ++#endif + { + + int status; +diff --git a/proc.h fish-1.23.1-git/proc.h +index dd46bc0..3618956 100644 +--- a/proc.h ++++ fish-1.23.1-git/proc.h +@@ -427,7 +427,9 @@ int job_reap( int interactive ); + Signal handler for SIGCHLD. Mark any processes with relevant + information. + */ ++#ifdef SA_SIGINFO + void job_handle_signal( int signal, siginfo_t *info, void *con ); ++#endif + + /** + Send the specified signal to all processes in the specified job. +diff --git a/signal.c fish-1.23.1-git/signal.c +index 2ac38aa..3ff1d38 100644 +--- a/signal.c ++++ fish-1.23.1-git/signal.c +@@ -29,6 +29,14 @@ The library for various signal related issues + #include "reader.h" + #include "proc.h" + ++#ifdef __HAIKU__ ++#ifndef SA_SIGINFO ++#define SA_SIGINFO 0 ++typedef struct { ++} siginfo_t; ++#define sa_sigaction sa_handler ++#endif ++#endif + + /** + Struct describing an entry for the lookup table used to convert diff --git a/app-shells/zsh/zsh-4.3.10.bep b/app-shells/zsh/zsh-4.3.10.recipe similarity index 96% rename from app-shells/zsh/zsh-4.3.10.bep rename to app-shells/zsh/zsh-4.3.10.recipe index dda63358d..8fc1a7402 100644 --- a/app-shells/zsh/zsh-4.3.10.bep +++ b/app-shells/zsh/zsh-4.3.10.recipe @@ -5,14 +5,16 @@ REVISION="1" CHECKSUM_MD5="74c5b275544400082a1cde806c98682a" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd zsh-4.3.10 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd zsh-4.3.10 make install } diff --git a/app-shells/zsh/zsh-5.0.0.bep b/app-shells/zsh/zsh-5.0.0.recipe similarity index 97% rename from app-shells/zsh/zsh-5.0.0.bep rename to app-shells/zsh/zsh-5.0.0.recipe index 107a8d4ed..55e8661bd 100644 --- a/app-shells/zsh/zsh-5.0.0.bep +++ b/app-shells/zsh/zsh-5.0.0.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="e8484468925cec8d9a84b8b04797e764" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd zsh-5.0.0 autoconf COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd zsh-5.0.0 make install } diff --git a/app-text/antiword/antiword-0.37.bep b/app-text/antiword/antiword-0.37.recipe similarity index 95% rename from app-text/antiword/antiword-0.37.bep rename to app-text/antiword/antiword-0.37.recipe index 1f1fe561e..7d9e8bf75 100644 --- a/app-text/antiword/antiword-0.37.bep +++ b/app-text/antiword/antiword-0.37.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f868e2a269edcbc06bf77e89a55898d1" -BUILD { +BUILD() +{ cd antiword-0.37 make --makefile Makefile.haiku } -INSTALL { +INSTALL() +{ cd antiword-0.37 make --makefile Makefile.haiku global_install } diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe new file mode 100644 index 000000000..b95ef81bf --- /dev/null +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -0,0 +1,51 @@ +SUMMARY="Highly configurable text format for writing documentation" +DESCRIPTION=" + AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. AsciiDoc files can be translated to many formats including HTML, PDF, EPUB, man page. + + AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user." +HOMEPAGE="http://asciidoc.org" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2011 Stuart Rackham" +SRC_URI="http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.8/asciidoc-8.6.8.tar.gz" +CHECKSUM_MD5="6ffff1ab211f30481741ce4d1e4b12bf" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + asciidoc = $portVersion compat >= 8.6.8 + cmd:a2x = $portVersion compat >= 8 + cmd:asciidoc = $portVersion compat >= 8 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i -e 's|/usr/bin/env|/bin/env|' *.py +} + +BUILD() +{ + # TODO: separate data and configuration files. + runConfigure ./configure \ + --sysconfdir=$dataDir/asciidoc + make +} + +INSTALL() +{ + make install +} diff --git a/app-text/aspell/aspell-0.60.6.bep b/app-text/aspell/aspell-0.60.6.recipe similarity index 95% rename from app-text/aspell/aspell-0.60.6.bep rename to app-text/aspell/aspell-0.60.6.recipe index 04b35f516..b6c56f112 100644 --- a/app-text/aspell/aspell-0.60.6.bep +++ b/app-text/aspell/aspell-0.60.6.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="bc80f0198773d5c05086522be67334eb" -BUILD { +BUILD() +{ cd aspell-0.60.6 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd aspell-0.60.6 make install } diff --git a/app-text/convmv/convmv-1.15.bep b/app-text/convmv/convmv-1.15.recipe similarity index 95% rename from app-text/convmv/convmv-1.15.bep rename to app-text/convmv/convmv-1.15.recipe index 8846ecc96..2f318f0d0 100644 --- a/app-text/convmv/convmv-1.15.bep +++ b/app-text/convmv/convmv-1.15.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/perl >= 5.8" CHECKSUM_MD5="b1bb703c08c6355868d15890ff193f7d" -BUILD { +BUILD() +{ cd convmv-1.15 sed -i "s#/usr/bin/perl#`finddir B_COMMON_BIN_DIRECTORY`/perl#" convmv make \ @@ -13,14 +14,16 @@ BUILD { MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -INSTALL { +INSTALL() +{ cd convmv-1.15 make install \ PREFIX=`finddir B_COMMON_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -TEST { +TEST() +{ cd convmv-1.15 make test } diff --git a/app-text/discount/discount-2.1.3.bep b/app-text/discount/discount-2.1.3.recipe similarity index 96% rename from app-text/discount/discount-2.1.3.bep rename to app-text/discount/discount-2.1.3.recipe index 0dbba6cc7..0671c341d 100644 --- a/app-text/discount/discount-2.1.3.bep +++ b/app-text/discount/discount-2.1.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98" -BUILD { +BUILD() +{ cd discount-2.1.3 ./configure.sh --prefix=$(finddir B_COMMON_DIRECTORY) \ --mandir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd discount-2.1.3 make install.everything } diff --git a/app-text/dos2unix/dos2unix-1.0.bep b/app-text/dos2unix/dos2unix-1.0.bep deleted file mode 100644 index 474299688..000000000 --- a/app-text/dos2unix/dos2unix-1.0.bep +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="dos2unix and unix2dos end of line file converters." -HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx" -SRC_URI="svn+http://ports.haiku-files.org/svn/haikuports/trunk/app-text/dos2unix" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd dos2unix-1.0 - gcc -O -o dos2unix DOS2UNIX.C - gcc -O -o unix2dos UNIX2DOS.C -} - -INSTALL { - cd dos2unix-1.0 - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp dos2unix ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dos2unix - cp unix2dos ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unix2dos -} diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe new file mode 100644 index 000000000..aba387621 --- /dev/null +++ b/app-text/dos2unix/dos2unix-1.0.recipe @@ -0,0 +1,39 @@ +SUMMARY="dos2unix and unix2dos end of line file convertors." +DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have just LF. Dos2unix and unix2dos are simple parser/converter command line programs to convert between the two formats." +HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx" +SRC_URI="http://ports-space.haiku-files.org/source/dos2unix-1.0.zip" +CHECKSUM_MD5="76c4991341219d71072474255714b010" +REVISION="1" +COPYRIGHT="Public Domain" +LICENSE="Public Domain" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + dos2unix = 1.0 compat >= 1 + cmd:dos2unix + cmd:unix2dos + " + +REQUIRES=" + lib:libroot >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + gcc -O -o dos2unix DOS2UNIX.C + gcc -O -o unix2dos UNIX2DOS.C +} + +INSTALL() +{ + mkdir -p $binDir + cp dos2unix $binDir/dos2unix + cp unix2dos $binDir/unix2dos +} diff --git a/app-text/dos2unix/DOS2UNIX.C b/app-text/dos2unix/sources/DOS2UNIX.C similarity index 100% rename from app-text/dos2unix/DOS2UNIX.C rename to app-text/dos2unix/sources/DOS2UNIX.C diff --git a/app-text/dos2unix/UNIX2DOS.C b/app-text/dos2unix/sources/UNIX2DOS.C similarity index 100% rename from app-text/dos2unix/UNIX2DOS.C rename to app-text/dos2unix/sources/UNIX2DOS.C diff --git a/app-text/ebook-tools/ebook-tools-0.2.1.bep b/app-text/ebook_tools/ebook_tools-0.2.1.recipe similarity index 96% rename from app-text/ebook-tools/ebook-tools-0.2.1.bep rename to app-text/ebook_tools/ebook_tools-0.2.1.recipe index b991c058e..bf9675b0f 100644 --- a/app-text/ebook-tools/ebook-tools-0.2.1.bep +++ b/app-text/ebook_tools/ebook_tools-0.2.1.recipe @@ -7,14 +7,16 @@ STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="libzip >= 0.10" -BUILD { +BUILD() +{ cd ebook-tools-0.2.1 sed -i 's/-Wmissing-format-attribute//' CMakeLists.txt cmake . make } -INSTALL { +INSTALL() +{ cd ebook-tools-0.2.1 make install } diff --git a/app-text/enchant/enchant-1.6.0.bep b/app-text/enchant/enchant-1.6.0.recipe similarity index 95% rename from app-text/enchant/enchant-1.6.0.bep rename to app-text/enchant/enchant-1.6.0.recipe index 2a099a927..2cf91f8be 100644 --- a/app-text/enchant/enchant-1.6.0.bep +++ b/app-text/enchant/enchant-1.6.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Generic spell-checking dictionary library" HOMEPAGE="http://abisource.com/projects/enchant/" SRC_URI="http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz" -REVISION= "2" +REVISION="2" STATUS_HAIKU="broken" @@ -12,7 +12,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 CHECKSUM_MD5="de11011aff801dc61042828041fb59c7" -BUILD { +BUILD() +{ cd enchant-1.6.0 cp /boot/common/share/libtool/config/config.* . libtoolize --force --copy @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd enchant-1.6.0 make install DESTDIR=${DESTDIR} } diff --git a/app-text/gocr/gocr-0.49.bep b/app-text/gocr/gocr-0.49.recipe similarity index 96% rename from app-text/gocr/gocr-0.49.bep rename to app-text/gocr/gocr-0.49.recipe index cd25998ec..5b1361012 100644 --- a/app-text/gocr/gocr-0.49.bep +++ b/app-text/gocr/gocr-0.49.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="4e527bc4bdd97c2be15fdd818857507f" -BUILD { +BUILD() +{ cd gocr-0.49 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gocr-0.49 make install DESTDIR=${DESTDIR} } diff --git a/app-text/gpp/gpp-2.4.bep b/app-text/gpp/gpp-2.4.recipe similarity index 97% rename from app-text/gpp/gpp-2.4.bep rename to app-text/gpp/gpp-2.4.recipe index 24a5a82b8..0aa221569 100644 --- a/app-text/gpp/gpp-2.4.bep +++ b/app-text/gpp/gpp-2.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f04c2a23312ab3d0c462c7972d1c6aa6" -BUILD { +BUILD() +{ cd gpp-2.24 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gpp-2.24 make install } diff --git a/app-text/htmldoc/htmldoc-1.8.27.bep b/app-text/htmldoc/htmldoc-1.8.27.bep deleted file mode 100644 index 617dbd975..000000000 --- a/app-text/htmldoc/htmldoc-1.8.27.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or Adobe Portable Documenrt Format files (pdf)." -HOMEPAGE="http://www.htmldoc.org" -SRC_URI="http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072" -BUILD { - cd htmldoc-1.8.27 - autoconf - chmod 755 configure - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd htmldoc-1.8.27 - make install -} - -TEST { - cd htmldoc-1.8.27 -# make test -# make check -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe new file mode 100644 index 000000000..f597e02da --- /dev/null +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -0,0 +1,59 @@ +SUMMARY="HTML file processor and converter" +DESCRIPTION=" + HTMLDOC converts HTML files and web pages into index HTML, Adobe + Postscript or Adobe Portable Document Format files (pdf). + " +HOMEPAGE="http://www.msweet.org/projects.php?Z1" +LICENSE="GNU GPL v2" +COPYRIGHT="1997-2006 Easy Software Products" +SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2" +CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="htmldoc-1.8.27.patchset" + +PROVIDES=" + htmldoc = $portVersion compat >= 1.8 + cmd:htmldoc = $portVersion compat >= 1.8 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libjpeg + lib:libpng + lib:libz + " +BUILD_REQUIRES=" + devel:libjpeg + devel:libpng + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + autoconf + chmod 755 configure + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # move html documentation out of man-dir + mkdir -p $docDir + mv $manDir/doc/htmldoc/* $docDir/ + rm -r $manDir/doc +} diff --git a/app-text/htmldoc/patches/htmldoc-1.8.27.patchset b/app-text/htmldoc/patches/htmldoc-1.8.27.patchset new file mode 100644 index 000000000..750c0a19a --- /dev/null +++ b/app-text/htmldoc/patches/htmldoc-1.8.27.patchset @@ -0,0 +1,273 @@ +From 71b6617cdb5042458030b3aec5bfce81273e6de0 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Mon May 23 16:13:13 2011 +0000 +Subject: Fixed directories for htmldoc. + + +diff --git a/configure.in b/configure.in +index 640f8ac..5ef51a8 100644 +--- a/configure.in ++++ b/configure.in +@@ -109,7 +109,7 @@ LDFLAGS="${LDFLAGS:=}" + AC_SUBST(LDFLAGS) + + AC_CHECK_LIB(m,pow) +-AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(socket, network socket) + AC_SEARCH_LIBS(gethostbyaddr, nsl) + AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO)) + AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO)) +@@ -316,8 +316,8 @@ if test "$bindir" = "\${exec_prefix}/bin"; then + bindir="$exec_prefix/bin" + fi + +-AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc") +-AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc") ++AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/data/doc/htmldoc") ++AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/data/htmldoc") + + dnl Update compiler options... + if test -n "$GXX"; then +diff --git a/data/Makefile b/data/Makefile +index ee9b7de..f416fad 100644 +--- a/data/Makefile ++++ b/data/Makefile +@@ -53,11 +53,11 @@ all: + # + + install: +- if [ ! -d $(datadir)/htmldoc/data ]; then\ +- $(MKDIR) $(datadir)/htmldoc/data;\ ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ + fi +- $(CP) $(FILES) $(datadir)/htmldoc/data +- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* ++ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* + + + # +diff --git a/doc/Makefile b/doc/Makefile +index 87292f6..666c80d 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -57,16 +57,16 @@ all: $(DOCUMENTS) + # + + install: $(DOCUMENTS) +- if [ ! -d $(datadir)/doc/htmldoc ]; then\ +- $(MKDIR) $(datadir)/doc/htmldoc;\ ++ if [ ! -d $(DESTDIR)$(mandir)/doc/htmldoc ]; then\ ++ $(MKDIR) $(DESTDIR)$(mandir)/doc/htmldoc;\ + fi +- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc +- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* +- if [ ! -d $(mandir)/man1 ]; then\ +- $(MKDIR) $(mandir)/man1;\ ++ $(CP) $(DOCFILES) $(DESTDIR)/$(mandir)/doc/htmldoc ++ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/doc/htmldoc/* ++ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\ ++ $(MKDIR) $(DESTDIR)/$(mandir)/man1;\ + fi +- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 +- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 ++ $(CP) htmldoc.man $(DESTDIR)/$(mandir)/man1/htmldoc.1 ++ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/man1/htmldoc.1 + + + # +diff --git a/fonts/Makefile b/fonts/Makefile +index 3afefa3..a0a396a 100644 +--- a/fonts/Makefile ++++ b/fonts/Makefile +@@ -75,14 +75,14 @@ all: + + install: + echo "Installing font files in $(datadir)/htmldoc/fonts..." +- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ +- $(MKDIR) $(datadir)/htmldoc/fonts;\ ++ if [ ! -d $(DESTDIR)/$(datadir)/htmldoc/fonts ]; then\ ++ $(MKDIR) $(DESTDIR)/$(datadir)/htmldoc/fonts;\ + fi + for font in $(FONTS); do \ +- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ +- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.afm $(DESTDIR)/$(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.pfa $(DESTDIR)/$(datadir)/htmldoc/fonts; \ + done +- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/* ++ $(CHMOD) ugo+r $(DESTDIR)/$(datadir)/htmldoc/fonts/* + + + # +diff --git a/htmldoc/Makefile b/htmldoc/Makefile +index 9ebc412..c17b6d0 100644 +--- a/htmldoc/Makefile ++++ b/htmldoc/Makefile +@@ -50,11 +50,11 @@ all: htmldoc$(EXEEXT) + # + + install: all +- if [ ! -d $(bindir) ]; then\ +- $(MKDIR) $(bindir);\ ++ if [ ! -d $(DESTDIR)/$(bindir) ]; then\ ++ $(MKDIR) $(DESTDIR)/$(bindir);\ + fi +- cp htmldoc$(EXEEXT) $(bindir) +- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT) ++ cp htmldoc$(EXEEXT) $(DESTDIR)/$(bindir) ++ chmod ugo+rx $(DESTDIR)/$(bindir)/htmldoc$(EXEEXT) + + + # +diff --git a/htmldoc/http.h b/htmldoc/http.h +index 4012f92..b3b9b09 100644 +--- a/htmldoc/http.h ++++ b/htmldoc/http.h +@@ -102,6 +102,8 @@ extern "C" { + # define s6_addr32 _S6_un._S6_u32 + # elif defined(__FreeBSD__) || defined(__APPLE__) + # define s6_addr32 __u6_addr.__u6_addr32 ++# elif defined(__HAIKU__) ++# define s6_addr32 s6_addr + # elif defined(__osf__) + # define s6_addr32 s6_un.sa6_laddr + # elif defined(WIN32) +-- +1.7.5 + + +From 33b0369d77315b32c03d311112add0df8eb63fad Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 02:59:17 +0200 +Subject: image.cxx: libpng 1.5 fixes + + +diff --git a/htmldoc/image.cxx b/htmldoc/image.cxx +index 574ff7c..9a35db2 100644 +--- a/htmldoc/image.cxx ++++ b/htmldoc/image.cxx +@@ -55,6 +55,7 @@ extern "C" { /* Workaround for JPEG header problems... */ + #include /* JPEG/JFIF image definitions */ + } + ++#define PNG_SETJMP_SUPPORTED + #include /* Portable Network Graphics (PNG) definitions */ + + +@@ -1472,6 +1473,9 @@ image_load_png(image_t *img, /* I - Image pointer */ + png_bytep *rows; /* PNG row pointers */ + uchar *inptr, /* Input pixels */ + *outptr; /* Output pixels */ ++ png_bytep trans_alpha; ++ png_color_16p trans_color; ++ int num_trans = 0; + + + /* +@@ -1499,7 +1503,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + + rows = NULL; + +- if (setjmp(pp->jmpbuf)) ++ if (setjmp(png_jmpbuf(pp))) + { + progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!"); + +@@ -1526,7 +1530,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + + png_read_info(pp, info); + +- if (info->color_type & PNG_COLOR_MASK_PALETTE) ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) + { + png_set_expand(pp); + +@@ -1535,15 +1539,15 @@ image_load_png(image_t *img, /* I - Image pointer */ + if (Encryption) + img->use ++; + } +- else if (info->bit_depth < 8) ++ else if (png_get_bit_depth(pp, info) < 8) + { + png_set_packing(pp); + png_set_expand(pp); + } +- else if (info->bit_depth == 16) ++ else if (png_get_bit_depth(pp, info) == 16) + png_set_strip_16(pp); + +- if (info->color_type & PNG_COLOR_MASK_COLOR) ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) + { + depth = 3; + img->depth = gray ? 1 : 3; +@@ -1554,10 +1558,12 @@ image_load_png(image_t *img, /* I - Image pointer */ + img->depth = 1; + } + +- img->width = info->width; +- img->height = info->height; ++ img->width = png_get_image_width(pp, info); ++ img->height = png_get_image_height(pp, info); + +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color); ++ ++ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) + { + if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3) + image_need_mask(img, 8); +@@ -1571,14 +1577,14 @@ image_load_png(image_t *img, /* I - Image pointer */ + + #ifdef DEBUG + printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d, img->depth=%d\n", +- info->color_type, depth, img->width, img->height, img->depth); +- if (info->color_type & PNG_COLOR_MASK_COLOR) ++ png_get_color_type(pp, info), depth, img->width, img->height, img->depth); ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) + puts(" COLOR"); + else + puts(" GRAYSCALE"); +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) + puts(" ALPHA"); +- if (info->color_type & PNG_COLOR_MASK_PALETTE) ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) + puts(" PALETTE"); + #endif // DEBUG + +@@ -1594,9 +1600,9 @@ image_load_png(image_t *img, /* I - Image pointer */ + * Allocate pointers... + */ + +- rows = (png_bytep *)calloc(info->height, sizeof(png_bytep)); ++ rows = (png_bytep *)calloc(img->height, sizeof(png_bytep)); + +- for (i = 0; i < (int)info->height; i ++) ++ for (i = 0; i < (int)img->height; i ++) + rows[i] = img->pixels + i * img->width * depth; + + /* +@@ -1610,7 +1616,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + * Generate the alpha mask as necessary... + */ + +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) + { + #ifdef DEBUG + for (inptr = img->pixels, i = 0; i < img->height; i ++) +@@ -1639,7 +1645,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + * Reformat the data as necessary for the reader... + */ + +- if (gray && info->color_type & PNG_COLOR_MASK_COLOR) ++ if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) + { + /* + * Greyscale output needed... +-- +1.7.5 + diff --git a/app-text/htmltidy/htmltidy-20092812.bep b/app-text/htmltidy/htmltidy-20092812.recipe similarity index 95% rename from app-text/htmltidy/htmltidy-20092812.bep rename to app-text/htmltidy/htmltidy-20092812.recipe index 567430299..8a584fc01 100644 --- a/app-text/htmltidy/htmltidy-20092812.bep +++ b/app-text/htmltidy/htmltidy-20092812.recipe @@ -6,11 +6,13 @@ STATUS_HAIKU="stable" DEPEND="" LICENSE="MIT" COPYRIGHT="1998-2008 World Wide Web Consortium" -BUILD { +BUILD() +{ cd htmltidy-20092812/build/gmake make } -INSTALL { +INSTALL() +{ cd htmltidy-20092812/build/gmake make installexes installhdrs installib } diff --git a/app-text/hunspell/hunspell-1.3.2.bep b/app-text/hunspell/hunspell-1.3.2.recipe similarity index 97% rename from app-text/hunspell/hunspell-1.3.2.bep rename to app-text/hunspell/hunspell-1.3.2.recipe index 39cc9e780..a4e26881a 100644 --- a/app-text/hunspell/hunspell-1.3.2.bep +++ b/app-text/hunspell/hunspell-1.3.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8" -BUILD { +BUILD() +{ cd hunspell-1.3.2 libtoolize --force --copy --install aclocal -I m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd hunspell-1.3.2 make install } diff --git a/app-text/libpaper/libpaper-1.1.23.bep b/app-text/libpaper/libpaper-1.1.23.bep deleted file mode 100644 index b26f9c558..000000000 --- a/app-text/libpaper/libpaper-1.1.23.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Library for handling paper characteristics" -HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" -SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.23+nmu2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="30e58b56c0b891b89e7d8c287be368b8" -BUILD { - cd libpaper-1.1.23+nmu2 - libtoolize --force --copy --install - aclocal -# automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpaper-1.1.23+nmu2 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1996 Yves Arrouye - 2000 Adrian Bunk" diff --git a/app-text/libpaper/libpaper-1.1.24.bep b/app-text/libpaper/libpaper-1.1.24.bep deleted file mode 100644 index fd1521d8f..000000000 --- a/app-text/libpaper/libpaper-1.1.24.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="Library for handling paper characteristics" -HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" -SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" -BUILD { - cd libpaper-1.1.24 - mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy --install - aclocal --install -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS/man \ - --sbindir=$COMMON_BIN - make -} - -INSTALL { - cd libpaper-1.1.24 - make install - -} -LICENSE="GNU GPL v2" -COPYRIGHT="1996 Yves Arrouye - 2000 Adrian Bunk" diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe new file mode 100644 index 000000000..4401d0adc --- /dev/null +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -0,0 +1,73 @@ +SUMMARY="Library for handling paper characteristics" +DESCRIPTION="The libpaper paper-handling library automates recognition of many different paper types and sizes for programs that need to deal with printed output." +HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" +SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz" + +LICENSE="GNU GPL v2" +COPYRIGHT="1996 Yves Arrouye + 2000 Adrian Bunk" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" + +CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" + +REQUIRES=" + lib:libroot >= $haikuVersion + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:ld + cmd:libtool + cmd:aclocal + cmd:autoconf + cmd:make + cmd:sed + " + +PROVIDES=" + cmd:paperconf + cmd:paperconfig + lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + " + +BUILD() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac + echo "AM_PROG_CC_C_O" >> configure.ac + libtoolize --force --copy --install + aclocal --install -I m4 + autoconf + touch NEWS + touch AUTHORS + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libpaper + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + devel:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + " + +REQUIRES_devel=" + libpaper$secondaryArchSuffix == $portVersion base + " diff --git a/app-text/libwpd/libwpd-0.9.6.bep b/app-text/libwpd/libwpd-0.9.6.recipe similarity index 96% rename from app-text/libwpd/libwpd-0.9.6.bep rename to app-text/libwpd/libwpd-0.9.6.recipe index bc7a7bfbb..9f95286e3 100644 --- a/app-text/libwpd/libwpd-0.9.6.bep +++ b/app-text/libwpd/libwpd-0.9.6.recipe @@ -6,7 +6,8 @@ CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c" REVISION="1" DEPEND="glib >= 2.0.0 libgsf >= 1.6.0" -BUILD { +BUILD() +{ cd libwpd-0.9.6 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libwpd-0.9.6 make install } diff --git a/app-text/libwpg/libwpg-0.2.1.bep b/app-text/libwpg/libwpg-0.2.1.recipe similarity index 96% rename from app-text/libwpg/libwpg-0.2.1.bep rename to app-text/libwpg/libwpg-0.2.1.recipe index 972a5f7c4..7ff6df5ed 100644 --- a/app-text/libwpg/libwpg-0.2.1.bep +++ b/app-text/libwpg/libwpg-0.2.1.recipe @@ -6,7 +6,8 @@ CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6" REVISION="1" DEPEND="pkg-config >= 0.2 libwpd >= 0.8" -BUILD { +BUILD() +{ cd libwpg-0.2.1 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libwpg-0.2.1 make install } diff --git a/app-text/psiconv/psiconv-0.9.8.bep b/app-text/psiconv/psiconv-0.9.8.recipe similarity index 95% rename from app-text/psiconv/psiconv-0.9.8.bep rename to app-text/psiconv/psiconv-0.9.8.recipe index 349302576..02fe07f4a 100644 --- a/app-text/psiconv/psiconv-0.9.8.bep +++ b/app-text/psiconv/psiconv-0.9.8.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8d7548e3c6b9cd408544736133728acd" -BUILD { +BUILD() +{ cd psiconv-0.9.8 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd psiconv-0.9.8 make install } diff --git a/app-text/rman/rman-3.2.bep b/app-text/rman/rman-3.2.bep deleted file mode 100644 index 5111df686..000000000 --- a/app-text/rman/rman-3.2.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" -HOMEPAGE="http://www.sourceforge.net/project/polyglotman" -SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" -BUILD { - cd rman-3.2 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - make BINDIR=$COMMON_BIN MANDIR=$COMMON_DOCS/man -} - -INSTALL { - cd rman-3.2 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - mkdir -p ${DESTDIR}/$COMMON_BIN - mkdir -p ${DESTDIR}/$COMMON_DOCS/man - make install BINDIR=${DESTDIR}/$COMMON_BIN MANDIR=${DESTDIR}/$COMMON_DOCS/man -} -LICENSE="Artistic" -COPYRIGHT="2003 Thomas A. Phelps" diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe new file mode 100644 index 000000000..8eedc8590 --- /dev/null +++ b/app-text/rman/rman-3.2.recipe @@ -0,0 +1,42 @@ +SUMMARY="Man page viewer and translator" +DESCRIPTION=" + Parse formatted man pages and man page source from most flavors of UNIX. + Convert to HTML, ASCII, TkMan, DocBook, and other formats. + " +HOMEPAGE="http://www.sourceforge.net/project/polyglotman" +LICENSE="Artistic" +COPYRIGHT="2003 Thomas A. Phelps" +SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz" +CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" +PATCHES="rman-3.2.patch" +SOURCE_DIR="$portVersionedName" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + rman = $portVersion + cmd:rman = $portVersion compat >= 3 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:ld + " + +BUILD() +{ + make BINDIR=$binDir MANDIR=$manDir +} + +INSTALL() +{ + mkdir -p $binDir $manDir + make install BINDIR=$binDir MANDIR=$manDir +} diff --git a/app-text/sablotron/sablotron-1.0.3.bep b/app-text/sablotron/sablotron-1.0.3.recipe similarity index 96% rename from app-text/sablotron/sablotron-1.0.3.bep rename to app-text/sablotron/sablotron-1.0.3.recipe index bac92023e..b13e7d4bc 100644 --- a/app-text/sablotron/sablotron-1.0.3.bep +++ b/app-text/sablotron/sablotron-1.0.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="72654c4b832e7562f8240ea675577f5e" -BUILD { +BUILD() +{ cd Sablot-1.0.3 touch NEWS touch AUTHORS @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Sablot-1.0.3 make install } diff --git a/app-text/tesseract/tesseract-3.x-svn.bep b/app-text/tesseract/tesseract-3.x_svn.recipe similarity index 94% rename from app-text/tesseract/tesseract-3.x-svn.bep rename to app-text/tesseract/tesseract-3.x_svn.recipe index 3b0cade1c..de89df11c 100644 --- a/app-text/tesseract/tesseract-3.x-svn.bep +++ b/app-text/tesseract/tesseract-3.x_svn.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" #CHECKSUM_MD5="cc812a261088ea0c3d2da735be35d09f" -BUILD { +BUILD() +{ cd tesseract-3.x-svn ./runautoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd tesseract-3.x-svn make install } -TEST { +TEST() +{ cd tesseract-ocr-3.x # make test # make check diff --git a/app-text/texi2html/patches/texi2html-1.82.patchset b/app-text/texi2html/patches/texi2html-1.82.patchset new file mode 100644 index 000000000..168b71776 --- /dev/null +++ b/app-text/texi2html/patches/texi2html-1.82.patchset @@ -0,0 +1,22 @@ +From 280524560a17d59215d9641b50abaf0e87ca296a Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 30 Jun 2013 10:24:11 +0200 +Subject: doc/Makefile.am: fix location of HTML documentation + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index f27b3bf..4567c56 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -5,7 +5,7 @@ info_TEXINFOS = texi2html.texi + # texi2html.ascii + # + texinfodata = $(datadir)/texinfo +-texinfohtmldir = $(texinfodata)/html ++texinfohtmldir = $(htmldir)/html + texinfohtml_DATA = texi2html.html + + # use the script out of the distribution NOT +-- +1.7.10.2 + diff --git a/app-text/texi2html/texi2html-1.82.bep b/app-text/texi2html/texi2html-1.82.bep deleted file mode 100644 index 4fa7ae502..000000000 --- a/app-text/texi2html/texi2html-1.82.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Perl script that converts Texinfo to HTML" -HOMEPAGE="http://www.nongnu.org/texi2html/" -SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb" -BUILD { - cd texi2html-1.82 - libtoolize --force --copy --install - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd texi2html-1.82 - make install -} - -TEST { - cd texi2html-1.82 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others." diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe new file mode 100644 index 000000000..60e23953b --- /dev/null +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -0,0 +1,54 @@ +SUMMARY="Perl script that converts Texinfo to HTML" +DESCRIPTION="Texi2HTML is a Perl script which converts Texinfo source files to HTML output, licensed under the GNU General Public License, version 3, or any later version. + +This is an evolving version of the script originally developed by Lionel Cons and later maintained for a time by Olaf Bachmann. It now supports many advanced features, such as internationalization and extremely configurable output formats. Development of Texi2HTML moved to the GNU Texinfo repository in 2010, since it was meant to replace the makeinfo implementation in GNU Texinfo. There was no release of GNU Texinfo with makeinfo based on Texi2HTML, however, because the implementation based on Texi2HTML was abandoned in favor of the current program in GNU Texinfo, which parses the Texinfo input into a tree for processing and supports nearly all the features of Texi2HTML. Latest Texi2HTML sources are thus in the GNU Texinfo repository, although development of Texi2HTML and of the Texi2HTML based makeinfo implementation stopped in 2011. + +There are some differences between Texi2HTML and the GNU Texinfo makeinfo/texi2any implementation, even in the Texi2HTML compatibility mode, they are documented in the GNU Texinfo manual. Nevertheless, the route forward for authors is, in most cases, to alter manuals and build processes as necessary to use the new features of the makeinfo/texi2any implementation of GNU Texinfo. The Texi2HTML maintainers (one of whom is the principal author of the GNU Texinfo implementation) do not intend to make further releases of Texi2HTML. If you have difficulties using the new implementation, you could try to ask on the GNU Texinfo mailing lists." +HOMEPAGE="http://www.nongnu.org/texi2html/" +COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others." +LICENSE="GNU GPL v2" +SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2" +CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb" +REVISION="2" +ARCHITECTURES="any" + +PATCHES="texi2html-1.82.patchset" + +PROVIDES=" + texi2html = $portVersion compat >= 1.82 + cmd:texi2html = $portVersion compat >= 1.82 + " +REQUIRES=" + cmd:perl + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:libtoolize + cmd:make + cmd:perl + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + ./autogen.sh + PERL="$portPackageLinksDir/cmd~perl/bin/perl" runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} diff --git a/app-text/tree/tree-1.6.0.bep b/app-text/tree/tree-1.6.0.recipe similarity index 93% rename from app-text/tree/tree-1.6.0.bep rename to app-text/tree/tree-1.6.0.recipe index fc016e3c0..4f1f9ab9e 100644 --- a/app-text/tree/tree-1.6.0.bep +++ b/app-text/tree/tree-1.6.0.recipe @@ -5,21 +5,19 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="04e967a3f4108d50cde3b4b0e89e970a" -BUILD { +BUILD() +{ cd tree-1.6.0 make } -INSTALL { +INSTALL() +{ cd tree-1.6.0 make install \ BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` \ MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -TEST { - # none -} - LICENSE="GNU GPL v2" COPYRIGHT="1996-2011 Steve Baker" diff --git a/dev-cpp/eigen/eigen-3.1.2.bep b/dev-cpp/eigen/eigen-3.1.2.recipe similarity index 94% rename from dev-cpp/eigen/eigen-3.1.2.bep rename to dev-cpp/eigen/eigen-3.1.2.recipe index 3f4bab9a0..7b554d33e 100644 --- a/dev-cpp/eigen/eigen-3.1.2.bep +++ b/dev-cpp/eigen/eigen-3.1.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e9c081360dde5e7dcb8eba3c8430fde2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd eigen-eigen-5097c01bcdc4 mkdir build cd build @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd eigen-eigen-5097c01bcdc4/build make install } -TEST { +TEST() +{ cd eigen-eigen-5097c01bcdc4/build make check } diff --git a/dev-cpp/glog/glog-0.3.3.bep b/dev-cpp/glog/glog-0.3.3.recipe similarity index 97% rename from dev-cpp/glog/glog-0.3.3.bep rename to dev-cpp/glog/glog-0.3.3.recipe index 381e22ec0..48d065e92 100644 --- a/dev-cpp/glog/glog-0.3.3.bep +++ b/dev-cpp/glog/glog-0.3.3.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd glog-0.3.3 sed -i 's/docdir = $(prefix)\/share/docdir = \/boot\/common\/documentation/g' Makefile.am libtoolize --force --copy --install @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glog-0.3.3 make install } diff --git a/dev-cpp/mm-common/mm-common-0.9.2.bep b/dev-cpp/mm_common/mm_common-0.9.2.recipe similarity index 95% rename from dev-cpp/mm-common/mm-common-0.9.2.bep rename to dev-cpp/mm_common/mm_common-0.9.2.recipe index de0845cf9..1c88a8a8f 100644 --- a/dev-cpp/mm-common/mm-common-0.9.2.bep +++ b/dev-cpp/mm_common/mm_common-0.9.2.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="87dedc889b8d642b616813f23ed8c9f9" -BUILD { +BUILD() +{ cd mm-common-0.9.2 autoreconf --force --install --verbose ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd mm-common-0.9.2 make install } diff --git a/dev-cpp/mxml/mxml-2.6.bep b/dev-cpp/mxml/mxml-2.6.recipe similarity index 96% rename from dev-cpp/mxml/mxml-2.6.bep rename to dev-cpp/mxml/mxml-2.6.recipe index eef7b918a..9370a586d 100644 --- a/dev-cpp/mxml/mxml-2.6.bep +++ b/dev-cpp/mxml/mxml-2.6.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="68977789ae64985dddbd1a1a1652642e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd mxml-2.6 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared make } -INSTALL { +INSTALL() +{ cd mxml-2.6 make install } diff --git a/dev-db/mysql/mysql-5.0.83.bep b/dev-db/mysql/mysql-5.0.83.recipe similarity index 96% rename from dev-db/mysql/mysql-5.0.83.bep rename to dev-db/mysql/mysql-5.0.83.recipe index 85a0b2dac..628e61b55 100644 --- a/dev-db/mysql/mysql-5.0.83.bep +++ b/dev-db/mysql/mysql-5.0.83.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="sys-libs/readline >= 5.2" -BUILD { +BUILD() +{ cd mysql-5.0.83 libtoolize --force --install --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mysql-5.0.83 make install } diff --git a/dev-db/postgresql/postgresql-9.0.4.bep b/dev-db/postgresql/postgresql-9.0.4.recipe similarity index 95% rename from dev-db/postgresql/postgresql-9.0.4.bep rename to dev-db/postgresql/postgresql-9.0.4.recipe index dc88cb0b8..baf721faa 100644 --- a/dev-db/postgresql/postgresql-9.0.4.bep +++ b/dev-db/postgresql/postgresql-9.0.4.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/libedit >= 20100424" CHECKSUM_MD5="80390514d568a7af5ab61db1cda27e29" -BUILD { +BUILD() +{ cd postgresql-9.0.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku make } -INSTALL { +INSTALL() +{ cd postgresql-9.0.4 make install } -TEST { +TEST() +{ cd postgresql-9.0.4 # make test # make check diff --git a/dev-db/postgresql/postgresql-9.2.3.bep b/dev-db/postgresql/postgresql-9.2.3.recipe similarity index 95% rename from dev-db/postgresql/postgresql-9.2.3.bep rename to dev-db/postgresql/postgresql-9.2.3.recipe index 6f12c132d..61dfce44c 100644 --- a/dev-db/postgresql/postgresql-9.2.3.bep +++ b/dev-db/postgresql/postgresql-9.2.3.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/libedit >= 20100424" CHECKSUM_MD5="59f42a93695b0186ed5eb03c2653a7d4" -BUILD { +BUILD() +{ cd postgresql-9.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku make } -INSTALL { +INSTALL() +{ cd postgresql-9.2.3 make install } -TEST { +TEST() +{ cd postgresql-9.2.3 # make test # make check diff --git a/dev-db/redis/patches/redis-2.9.0_git.patch b/dev-db/redis/patches/redis-2.9.0_git.patch new file mode 100644 index 000000000..3d0bb4f81 --- /dev/null +++ b/dev-db/redis/patches/redis-2.9.0_git.patch @@ -0,0 +1,105 @@ +diff --git redis-2.9.0-git/deps/hiredis/Makefile redis-2.9.0-git/deps/hiredis/Makefile +index 2a84b9b..1225539 100644 +--- redis-2.9.0-git/deps/hiredis/Makefile ++++ redis-2.9.0-git/deps/hiredis/Makefile +@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin) + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ} + else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ LDFLAGS?=-L. -Wl,-rpath,. ++ DYLIBNAME?=libhiredis.so ++ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ} ++ STLIBNAME?=libhiredis.a ++ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} ++else + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) + CCLINK?=-lm -pthread + LDFLAGS?=-L. -Wl,-rpath,. +@@ -35,6 +44,7 @@ else + STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} + endif + endif ++endif + + CCOPT= $(CFLAGS) $(CCLINK) + DEBUG?= -g -ggdb +diff --git redis-2.9.0-git/src/Makefile redis-2.9.0-git/src/Makefile +index 292255c..e6a6d87 100644 +--- redis-2.9.0-git/src/Makefile ++++ redis-2.9.0-git/src/Makefile +@@ -15,12 +15,18 @@ endif + ifeq ($(uname_S),SunOS) + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 + CCLINK?=-ldl -lnsl -lsocket -lm -lpthread +- DEBUG?=-g -ggdb ++ DEBUG?=-g -ggdb ++else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ DEBUG?=-g -ggdb + else + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) + CCLINK?=-lm -pthread + DEBUG?=-g -rdynamic -ggdb + endif ++endif + + ifeq ($(USE_TCMALLOC),yes) + ALLOD_DEPS= +diff --git redis-2.9.0-git/src/aof.c redis-2.9.0-git/src/aof.c +index dbd0468..7a5d21f 100644 +--- redis-2.9.0-git/src/aof.c ++++ redis-2.9.0-git/src/aof.c +@@ -25,7 +25,7 @@ void stopAppendOnly(void) { + int statloc; + + if (kill(server.bgrewritechildpid,SIGKILL) != -1) +- wait3(&statloc,0,NULL); ++ waitpid(&statloc,0,NULL); + /* reset the buffer accumulating changes while the child saves */ + sdsfree(server.bgrewritebuf); + server.bgrewritebuf = sdsempty(); +diff --git redis-2.9.0-git/src/redis.c redis-2.9.0-git/src/redis.c +index 1a1f84f..4ecc873 100644 +--- redis-2.9.0-git/src/redis.c ++++ redis-2.9.0-git/src/redis.c +@@ -646,7 +646,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { + int statloc; + pid_t pid; + +- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) { ++ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) { + int exitcode = WEXITSTATUS(statloc); + int bysignal = 0; + +diff --git redis-2.9.0-git/src/sha1.c redis-2.9.0-git/src/sha1.c +index 26a5565..e90812e 100644 +--- redis-2.9.0-git/src/sha1.c ++++ redis-2.9.0-git/src/sha1.c +@@ -27,6 +27,9 @@ A million repetitions of "a" + #if defined(__sun) + #include "solarisfixes.h" + #endif ++#ifdef __HAIKU__ ++#include ++#endif + #include "sha1.h" + #include "config.h" + +diff --git redis-2.9.0-git/src/util.c redis-2.9.0-git/src/util.c +index f5a23af..2a6d18d 100644 +--- redis-2.9.0-git/src/util.c ++++ redis-2.9.0-git/src/util.c +@@ -317,7 +317,7 @@ int d2string(char *buf, size_t len, double value) { + * integer printing function that is much faster. */ + double min = -4503599627370495; /* (2^52)-1 */ + double max = 4503599627370496; /* -(2^52) */ +- if (val > min && val < max && value == ((double)((long long)value))) ++ if (value > min && value < max && value == ((double)((long long)value))) + len = ll2string(buf,len,(long long)value); + else + #endif diff --git a/dev-db/redis/redis-2.2.11.bep b/dev-db/redis/redis-2.2.11.recipe similarity index 67% rename from dev-db/redis/redis-2.2.11.bep rename to dev-db/redis/redis-2.2.11.recipe index 86f637606..fb63186b5 100644 --- a/dev-db/redis/redis-2.2.11.bep +++ b/dev-db/redis/redis-2.2.11.recipe @@ -1,20 +1,22 @@ -HOMEPAGE= "http://redis.io/" +HOMEPAGE="http://redis.io/" DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets." -SRC_URI= "http://redis.googlecode.com/files/redis-2.2.11.tar.gz" -REVISION = "1" +SRC_URI="http://redis.googlecode.com/files/redis-2.2.11.tar.gz" +REVISION="1" DEPEND="" -CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" +CHECKSUM_MD5="5501c90ca02ae7ea93c34f067b3e0619" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd redis-2.2.11 make PREFIX=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd redis-2.2.11 make install PREFIX=`finddir B_COMMON_DIRECTORY` } LICENSE="BSD (3-clause)" -COPYRIGHT="2006-2010 Salvatore Sanfilippo" \ No newline at end of file +COPYRIGHT="2006-2010 Salvatore Sanfilippo" diff --git a/dev-db/redis/redis-2.9.0-git.bep b/dev-db/redis/redis-2.9.0_git.recipe similarity index 77% rename from dev-db/redis/redis-2.9.0-git.bep rename to dev-db/redis/redis-2.9.0_git.recipe index c4b1ac78a..66322690b 100644 --- a/dev-db/redis/redis-2.9.0-git.bep +++ b/dev-db/redis/redis-2.9.0_git.recipe @@ -1,20 +1,22 @@ -HOMEPAGE= "http://redis.io/" +HOMEPAGE="http://redis.io/" DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets." -SRC_URI= "git://github.com/antirez/redis.git" -REVISION = "1" +SRC_URI="git://github.com/antirez/redis.git" +REVISION="1" DEPEND="" STATUS_HAIKU="stable" # CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd redis-2.9.0-git make PREFIX=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd redis-2.9.0-git make install PREFIX=`finddir B_COMMON_DIRECTORY` } LICENSE="BSD (3-clause)" -COPYRIGHT="2006-2010 Salvatore Sanfilippo" \ No newline at end of file +COPYRIGHT="2006-2010 Salvatore Sanfilippo" diff --git a/dev-db/sqlite/sqlite-3.6.22.bep b/dev-db/sqlite/sqlite-3.6.22.bep deleted file mode 100644 index 5095f9226..000000000 --- a/dev-db/sqlite/sqlite-3.6.22.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="b683b3903e79ab8a6d928dc9d4a56937" -BUILD { - cd sqlite-3.6.22 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd sqlite-3.6.22 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.6.23.bep b/dev-db/sqlite/sqlite-3.6.23.bep deleted file mode 100644 index 407412de8..000000000 --- a/dev-db/sqlite/sqlite-3.6.23.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8f1e86b3909a27f8122b0981afd16fcd" -BUILD { - cd sqlite-3.6.23 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd sqlite-3.6.23 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.13.bep b/dev-db/sqlite/sqlite-3.7.13.bep deleted file mode 100644 index f7a717d95..000000000 --- a/dev-db/sqlite/sqlite-3.7.13.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" -BUILD { - cd sqlite-autoconf-3071300 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd sqlite-autoconf-3071300 - make install -} - -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe new file mode 100644 index 000000000..91ec55170 --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -0,0 +1,85 @@ +SUMMARY="An SQL database engine in a C library" +DESCRIPTION=" + SQLite is a software library that implements a self-contained, + serverless, zero-configuration, transactional SQL database engine. + + SQLite is the most widely deployed SQL database engine in the world. + The source code for SQLite is in the public domain. + " +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" +CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" +LICENSE="SQLite" +COPYRIGHT="Public Domain" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="sqlite-3.7.13.patch" + +PROVIDES=" + sqlite$secondaryArchSuffix = $portVersion compat >= 3 + lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:sqlite3 = $portVersion compat >= 3 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="sqlite-autoconf-3071300" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libsqlite3 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + sqlite${secondaryArchSuffix}_devel = $portVersion + devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 + " +REQUIRES_devel=" + sqlite$secondaryArchSuffix == $portVersion base + " diff --git a/dev-db/sqlite/sqlite-3.7.15.1.bep b/dev-db/sqlite/sqlite-3.7.15.1.recipe similarity index 97% rename from dev-db/sqlite/sqlite-3.7.15.1.bep rename to dev-db/sqlite/sqlite-3.7.15.1.recipe index b8c740e4f..5d30c8b64 100644 --- a/dev-db/sqlite/sqlite-3.7.15.1.bep +++ b/dev-db/sqlite/sqlite-3.7.15.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="a67c25afa199a11f0a37aff7ed9d2c14" -BUILD { +BUILD() +{ cd sqlite-autoconf-3071501 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-autoconf-3071501 make install } diff --git a/dev-db/sqlite/sqlite-3.7.16.1.bep b/dev-db/sqlite/sqlite-3.7.16.1.bep deleted file mode 100644 index ce19c5938..000000000 --- a/dev-db/sqlite/sqlite-3.7.16.1.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a" -BUILD { - cd sqlite-autoconf-3071601 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd sqlite-autoconf-3071601 - make install -} - -LICENSE="SQLite" -COPYRIGHT="2013 Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe new file mode 100644 index 000000000..700c17163 --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -0,0 +1,45 @@ +SUMMARY="A SQL Database Engine in a C Library" +DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz" +CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a" +REVISION="2" +ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES="sqlite = $portVersion compat >= 3 + cmd:sqlite3 = $portVersion compat >= 3 + lib:libsqlite = $portVersion compat >= 3 + lib:libsqlite3 = $portVersion compat >= 3" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="sqlite-autoconf-3071601" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure $configureDirArgs + make +} + +INSTALL() +{ + make install +} + +LICENSE="SQLite" +COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.2.bep b/dev-db/sqlite/sqlite-3.7.2.bep deleted file mode 100644 index 9741f2403..000000000 --- a/dev-db/sqlite/sqlite-3.7.2.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.7.2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="bd9586208f48ba840467bcfd066a6fa9" -BUILD { - cd sqlite-3.7.2 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd sqlite-3.7.2 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.3.bep b/dev-db/sqlite/sqlite-3.7.3.bep deleted file mode 100644 index 77252fc92..000000000 --- a/dev-db/sqlite/sqlite-3.7.3.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.7.3.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="74fe78b264f1c434c4b159d45b78e9b7" -BUILD { - cd sqlite-3.7.3 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd sqlite-3.7.3 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.4.bep b/dev-db/sqlite/sqlite-3.7.4.bep deleted file mode 100644 index 81686d062..000000000 --- a/dev-db/sqlite/sqlite-3.7.4.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070400.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8f0c690bfb33c3cbbc2471c3d9ba0158" -BUILD { - cd sqlite-autoconf-3070400 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd sqlite-autoconf-3070400 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.5.bep b/dev-db/sqlite/sqlite-3.7.5.bep deleted file mode 100644 index f1adc1863..000000000 --- a/dev-db/sqlite/sqlite-3.7.5.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" -BUILD { - cd sqlite-autoconf-3070500 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd sqlite-autoconf-3070500 - make install -} - -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe new file mode 100644 index 000000000..498618e68 --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -0,0 +1,57 @@ +SUMMARY="An SQL database engine in a C library" +DESCRIPTION=" + SQLite is a software library that implements a self-contained, + serverless, zero-configuration, transactional SQL database engine. + + SQLite is the most widely deployed SQL database engine in the world. + The source code for SQLite is in the public domain. + " +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" +CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" +LICENSE="SQLite" +COPYRIGHT="Public Domain" +REVISION="7" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + sqlite = $portVersion compat >= 3 + cmd:sqlite3 = $portVersion compat >= 3 + lib:libsqlite3 = 0.8.6 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="sqlite-autoconf-3070500" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure $configureDirArgs + make +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libsqlite3 + fixPkgconfig +} diff --git a/dev-db/sqlite/sqlite-3.7.6.2.bep b/dev-db/sqlite/sqlite-3.7.6.2.bep deleted file mode 100644 index 55cf7dd3c..000000000 --- a/dev-db/sqlite/sqlite-3.7.6.2.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="f16c08617968b4087b3d591fd575f59f" -BUILD { - cd sqlite-autoconf-3070602 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd sqlite-autoconf-3070602 - make install -} - -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.7.1.bep b/dev-db/sqlite/sqlite-3.7.7.1.bep deleted file mode 100644 index a46b764d7..000000000 --- a/dev-db/sqlite/sqlite-3.7.7.1.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="554026fe7fac47b1cf61c18d5fe43419" -BUILD { - cd sqlite-autoconf-3070701 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd sqlite-autoconf-3070701 - make install -} - -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.8.0.2.recipe b/dev-db/sqlite/sqlite-3.8.0.2.recipe new file mode 100644 index 000000000..255f1a9c6 --- /dev/null +++ b/dev-db/sqlite/sqlite-3.8.0.2.recipe @@ -0,0 +1,83 @@ +SUMMARY="An SQL Database Engine in a C Library" +DESCRIPTION=" + SQLite is a software library that implements a self-contained, + serverless, zero-configuration, transactional SQL database engine. + + SQLite is the most widely deployed SQL database engine in the world. + The source code for SQLite is in the public domain. + " +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz" +CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +LICENSE="SQLite" +COPYRIGHT="Public Domain" + +PROVIDES=" + sqlite$secondaryArchSuffix = $portVersion compat >= 3 + lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:sqlite3 = $portVersion compat >= 3 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="sqlite-autoconf-3080002" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libsqlite3 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + sqlite${secondaryArchSuffix}_devel = $portVersion + devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 + " +REQUIRES_devel=" + sqlite$secondaryArchSuffix == $portVersion base + " diff --git a/dev-dotnet/pnet/pnet-0.8.0.bep b/dev-dotnet/pnet/pnet-0.8.0.recipe similarity index 95% rename from dev-dotnet/pnet/pnet-0.8.0.bep rename to dev-dotnet/pnet/pnet-0.8.0.recipe index 1c6acc7d7..0f5f62432 100644 --- a/dev-dotnet/pnet/pnet-0.8.0.bep +++ b/dev-dotnet/pnet/pnet-0.8.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-util/treecc" CHECKSUM_MD5="84cb3612d7175bd9e476c88e66fe19f9" -BUILD { +BUILD() +{ cd pnet-0.8.0 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pnet-0.8.0 make install } diff --git a/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch b/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch new file mode 100644 index 000000000..fc0aff4d6 --- /dev/null +++ b/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch @@ -0,0 +1,120 @@ +diff -ur u-boot-2012.10/common/image.c tmp/u-boot-2012.10/common/image.c +--- u-boot-2012.10/common/image.c 2012-11-08 10:52:02.774111232 +0100 ++++ tmp/u-boot-2012.10/common/image.c 2012-10-15 17:14:08.046399488 +0200 +@@ -71,7 +71,7 @@ + #include "mkimage.h" + #include + #include +-#include ++#include + #endif /* !USE_HOSTCC*/ + + static const table_entry_t uimage_arch[] = { +diff -ur u-boot-2012.10/tools/aisimage.c tmp/u-boot-2012.10/tools/aisimage.c +--- u-boot-2012.10/tools/aisimage.c 2012-11-08 10:48:20.923271168 +0100 ++++ tmp/u-boot-2012.10/tools/aisimage.c 2012-10-15 17:14:08.063176704 +0200 +@@ -26,7 +26,7 @@ + + #include "mkimage.h" + #include "aisimage.h" +-#include ++#include + + #define IS_FNC_EXEC(c) (cmd_table[c].AIS_cmd == AIS_CMD_FNLOAD) + #define WORD_ALIGN0 4 +diff -ur u-boot-2012.10/tools/default_image.c tmp/u-boot-2012.10/tools/default_image.c +--- u-boot-2012.10/tools/default_image.c 2012-11-08 10:48:39.345505792 +0100 ++++ tmp/u-boot-2012.10/tools/default_image.c 2012-10-15 17:14:08.066060288 +0200 +@@ -28,7 +28,7 @@ + */ + + #include "mkimage.h" +-#include ++#include + #include + + static image_header_t header; +diff -ur u-boot-2012.10/tools/fit_image.c tmp/u-boot-2012.10/tools/fit_image.c +--- u-boot-2012.10/tools/fit_image.c 2012-11-08 10:48:56.498860032 +0100 ++++ tmp/u-boot-2012.10/tools/fit_image.c 2012-10-15 17:14:08.000786432 +0200 +@@ -28,7 +28,7 @@ + */ + + #include "mkimage.h" +-#include ++#include + #include + + static image_header_t header; +diff -ur u-boot-2012.10/tools/imximage.c tmp/u-boot-2012.10/tools/imximage.c +--- u-boot-2012.10/tools/imximage.c 2012-11-08 10:52:34.872677376 +0100 ++++ tmp/u-boot-2012.10/tools/imximage.c 2012-10-15 17:14:08.003145728 +0200 +@@ -29,7 +29,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "imximage.h" + + /* +diff -ur u-boot-2012.10/tools/kwbimage.c tmp/u-boot-2012.10/tools/kwbimage.c +--- u-boot-2012.10/tools/kwbimage.c 2012-11-08 10:52:53.073662464 +0100 ++++ tmp/u-boot-2012.10/tools/kwbimage.c 2012-10-15 17:14:08.003407872 +0200 +@@ -26,7 +26,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "kwbimage.h" + + /* +diff -ur u-boot-2012.10/tools/mkimage.c tmp/u-boot-2012.10/tools/mkimage.c +--- u-boot-2012.10/tools/mkimage.c 2012-11-08 10:55:06.533463040 +0100 ++++ tmp/u-boot-2012.10/tools/mkimage.c 2012-10-15 17:14:08.005505024 +0200 +@@ -22,7 +22,7 @@ + */ + + #include "mkimage.h" +-#include ++#include + #include + + static void copy_file(int, const char *, int); +diff -ur u-boot-2012.10/tools/omapimage.c tmp/u-boot-2012.10/tools/omapimage.c +--- u-boot-2012.10/tools/omapimage.c 2012-11-08 10:55:39.680525824 +0100 ++++ tmp/u-boot-2012.10/tools/omapimage.c 2012-10-15 17:14:08.006291456 +0200 +@@ -34,7 +34,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "omapimage.h" + + /* Header size is CH header rounded up to 512 bytes plus GP header */ +diff -ur u-boot-2012.10/tools/pblimage.c tmp/u-boot-2012.10/tools/pblimage.c +--- u-boot-2012.10/tools/pblimage.c 2012-11-08 10:53:09.547356672 +0100 ++++ tmp/u-boot-2012.10/tools/pblimage.c 2012-10-15 17:14:08.008126464 +0200 +@@ -22,7 +22,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "pblimage.h" + + /* +diff -ur u-boot-2012.10/tools/ublimage.c tmp/u-boot-2012.10/tools/ublimage.c +--- u-boot-2012.10/tools/ublimage.c 2012-11-08 10:55:59.951844864 +0100 ++++ tmp/u-boot-2012.10/tools/ublimage.c 2012-10-15 17:14:08.009175040 +0200 +@@ -33,7 +33,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "ublimage.h" + + /* diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe similarity index 95% rename from dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep rename to dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe index 5f038a90f..ef0172941 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep +++ b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe @@ -4,13 +4,15 @@ SRC_URI="http://ftp.denx.de/pub/u-boot/u-boot-2012.10.tar.bz2" REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd u-boot-2012.10 mv include/image.h include/uimage.h make tools } -INSTALL { +INSTALL() +{ cd u-boot-2012.10 cp -r /tools/mkimage /boot/common/bin/ cp -r /tools/mkenvimage /boot/common/bin/ diff --git a/dev-games/box2d/box2d-2.1.2.bep b/dev-games/box2d/box2d-2.1.2.recipe similarity index 95% rename from dev-games/box2d/box2d-2.1.2.bep rename to dev-games/box2d/box2d-2.1.2.recipe index 19d75a42e..3740e7c64 100644 --- a/dev-games/box2d/box2d-2.1.2.bep +++ b/dev-games/box2d/box2d-2.1.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="59d142cd8d4d73e8832c7b67591f590c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd Box2D_v2.1.2/Box2D cmake . -DOPENGL_INCLUDE_DIR:=/boot/develop/headers/os/opengl/GL \ -DHAIKU:=TRUE make } -INSTALL { +INSTALL() +{ cd Box2D_v2.1.2/Box2D make install } diff --git a/dev-games/flatzebra/flatzebra-0.1.3.bep b/dev-games/flatzebra/flatzebra-0.1.3.recipe similarity index 96% rename from dev-games/flatzebra/flatzebra-0.1.3.bep rename to dev-games/flatzebra/flatzebra-0.1.3.recipe index d65b12935..807077409 100644 --- a/dev-games/flatzebra/flatzebra-0.1.3.bep +++ b/dev-games/flatzebra/flatzebra-0.1.3.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.4 media-libs/libsdl_image >= 1.2.2 media-libs/libsdl_mixer >= 1.2.4" -BUILD { +BUILD() +{ cd flatzebra-0.1.3 libtoolize --force --copy --install aclocal -I macros @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd flatzebra-0.1.3 make install } diff --git a/dev-games/libggz/libggz-0.99.5.bep b/dev-games/libggz/libggz-0.99.5.recipe similarity index 96% rename from dev-games/libggz/libggz-0.99.5.bep rename to dev-games/libggz/libggz-0.99.5.recipe index 894a5bb2f..bd526ab24 100644 --- a/dev-games/libggz/libggz-0.99.5.bep +++ b/dev-games/libggz/libggz-0.99.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd ggz-base-libs-snapshot-0.99.5 libtoolize -fci aclocal -I m4 -I m4/ggz @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ggz-base-libs-snapshot-0.99.5 make install } diff --git a/dev-games/ode/ode-0.12.bep b/dev-games/ode/ode-0.12.recipe similarity index 96% rename from dev-games/ode/ode-0.12.bep rename to dev-games/ode/ode-0.12.recipe index b6209a625..06df78601 100644 --- a/dev-games/ode/ode-0.12.bep +++ b/dev-games/ode/ode-0.12.recipe @@ -6,12 +6,14 @@ COPYRIGHT="2001-2004 Russell L. Smith" LICENSE="GNU LGPL v3 BSD (3-clause)" CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" -BUILD { +BUILD() +{ cd ode-0.12 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ode-0.12 make install } diff --git a/dev-games/physfs/physfs-2.0.1.bep b/dev-games/physfs/physfs-2.0.1.recipe similarity index 97% rename from dev-games/physfs/physfs-2.0.1.bep rename to dev-games/physfs/physfs-2.0.1.recipe index dfc030b5a..6ca2c54d8 100644 --- a/dev-games/physfs/physfs-2.0.1.bep +++ b/dev-games/physfs/physfs-2.0.1.recipe @@ -7,13 +7,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 dev-util/mercurial >= 1.4" -BUILD { +BUILD() +{ cd physfs-2.0.1 cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd physfs-2.0.1 make install if [ -n "$(setgcc | grep '4')" ]; then diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98.bep b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe similarity index 97% rename from dev-java/gnu-classpath/gnu-classpath-0.98.bep rename to dev-java/gnu_classpath/gnu_classpath-0.98.recipe index 5c3ae52ea..56d07ee1d 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98.bep +++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9" -BUILD { +BUILD() +{ cd classpath-0.98 libtoolize --force --copy --install aclocal -I m4 @@ -23,12 +24,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd classpath-0.98 make install } -TEST { +TEST() +{ cd classpath-0.98 # make test # make check diff --git a/dev-java/gnu-classpath/licenses/GNU GPL v2 with classpath exceptions b/dev-java/gnu_classpath/licenses/GNU GPL v2 with classpath exceptions similarity index 100% rename from dev-java/gnu-classpath/licenses/GNU GPL v2 with classpath exceptions rename to dev-java/gnu_classpath/licenses/GNU GPL v2 with classpath exceptions diff --git a/dev-java/gnu-classpath/patches/gnu-classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch similarity index 100% rename from dev-java/gnu-classpath/patches/gnu-classpath-0.98.patch rename to dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch diff --git a/dev-java/jamvm/jamvm-1.5.4.bep b/dev-java/jamvm/jamvm-1.5.4.recipe similarity index 96% rename from dev-java/jamvm/jamvm-1.5.4.bep rename to dev-java/jamvm/jamvm-1.5.4.recipe index 056ddf8a3..771a21d35 100644 --- a/dev-java/jamvm/jamvm-1.5.4.bep +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -7,7 +7,8 @@ DEPEND="" CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd jamvm-1.5.4 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jamvm-1.5.4 make install } diff --git a/dev-lang/camlp5/camlp5-6.06.bep b/dev-lang/camlp5/camlp5-6.06.recipe similarity index 97% rename from dev-lang/camlp5/camlp5-6.06.bep rename to dev-lang/camlp5/camlp5-6.06.recipe index ec5a58d26..088012815 100644 --- a/dev-lang/camlp5/camlp5-6.06.bep +++ b/dev-lang/camlp5/camlp5-6.06.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8de69094d73d24768844a5017a2bd04b" REVISION="1" STATUS_HAIKU="untested" DEPEND="ocaml" -BUILD { +BUILD() +{ cd camlp5-6.06 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --strict --prefix `finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make world.opt } -INSTALL { +INSTALL() +{ cd camlp5-6.06 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ diff --git a/dev-lang/dmd-bin/dmd-bin-1.064.bep b/dev-lang/dmd_bin/dmd_bin-1.064.recipe similarity index 96% rename from dev-lang/dmd-bin/dmd-bin-1.064.bep rename to dev-lang/dmd_bin/dmd_bin-1.064.recipe index f24e02ef8..7a024771d 100644 --- a/dev-lang/dmd-bin/dmd-bin-1.064.bep +++ b/dev-lang/dmd_bin/dmd_bin-1.064.recipe @@ -6,13 +6,15 @@ CHECKSUM_MD5="3d73758a7006397c2e66021532e2ff73" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ./dmd/src/dmd make -f haiku.mak strip dmd } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp dmd/src/dmd/dmd ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dmd diff --git a/dev-lang/dmd-bin/licenses/Digital Mars b/dev-lang/dmd_bin/licenses/Digital Mars similarity index 100% rename from dev-lang/dmd-bin/licenses/Digital Mars rename to dev-lang/dmd_bin/licenses/Digital Mars diff --git a/dev-lang/dmd-bin/patches/dmd-bin-1.064.patch b/dev-lang/dmd_bin/patches/dmd_bin-1.064.patch similarity index 100% rename from dev-lang/dmd-bin/patches/dmd-bin-1.064.patch rename to dev-lang/dmd_bin/patches/dmd_bin-1.064.patch diff --git a/dev-lang/erlang/erlang-R14B.bep b/dev-lang/erlang/erlang-R14B.recipe similarity index 99% rename from dev-lang/erlang/erlang-R14B.bep rename to dev-lang/erlang/erlang-R14B.recipe index ac71683aa..0865f3e9c 100644 --- a/dev-lang/erlang/erlang-R14B.bep +++ b/dev-lang/erlang/erlang-R14B.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="5292a04556d17ad528d570e02357dfbb" -BUILD { +BUILD() +{ cd otp_src_R14B mkdir -p m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" @@ -50,7 +51,8 @@ BUILD { make -s } -INSTALL { +INSTALL() +{ cd otp_src_R14B make -s install } diff --git a/dev-lang/fpc/fpc-2.4.0.bep b/dev-lang/fpc/fpc-2.4.0.recipe similarity index 93% rename from dev-lang/fpc/fpc-2.4.0.bep rename to dev-lang/fpc/fpc-2.4.0.recipe index 87b1b7a36..ec36300e6 100644 --- a/dev-lang/fpc/fpc-2.4.0.bep +++ b/dev-lang/fpc/fpc-2.4.0.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd fpc-2.4.0 make } -INSTALL { +INSTALL() +{ cd fpc-2.4.0 make install diff --git a/dev-lang/fpc/fpc-2.6.0.bep b/dev-lang/fpc/fpc-2.6.0.recipe similarity index 97% rename from dev-lang/fpc/fpc-2.6.0.bep rename to dev-lang/fpc/fpc-2.6.0.recipe index 6ef4f70bc..137083d32 100644 --- a/dev-lang/fpc/fpc-2.6.0.bep +++ b/dev-lang/fpc/fpc-2.6.0.recipe @@ -14,12 +14,14 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/fpc" -BUILD { +BUILD() +{ cd fpc-2.6.0 make build } -INSTALL { +INSTALL() +{ cd fpc-2.6.0 make install INSTALL_PREFIX=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY` \ FPCDIR=${DESTDIR}`finddir B_USER_LIB_DIRECTORY`/fpc/2.6.0 @@ -28,7 +30,8 @@ INSTALL { ${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin } -TEST { +TEST() +{ cd fpc-2.6.0/tests make full TEST_FPC=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin/fpc } diff --git a/dev-lang/lua/lua-5.1.4-3.bep b/dev-lang/lua/lua-5.1.4-3.bep deleted file mode 100644 index 525e47545..000000000 --- a/dev-lang/lua/lua-5.1.4-3.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." -HOMEPAGE="http://www.lua.org" -SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" -CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.25" -BUILD { - cd lua-5.1.4 - make haiku -} - -INSTALL { - cd lua-5.1.4 - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" - mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig - cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc -} -LICENSE="MIT" -COPYRIGHT="1994-2009, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/lua-5.1.4.bep b/dev-lang/lua/lua-5.1.4.bep deleted file mode 100644 index 525e47545..000000000 --- a/dev-lang/lua/lua-5.1.4.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." -HOMEPAGE="http://www.lua.org" -SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" -CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.25" -BUILD { - cd lua-5.1.4 - make haiku -} - -INSTALL { - cd lua-5.1.4 - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" - mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig - cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc -} -LICENSE="MIT" -COPYRIGHT="1994-2009, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe new file mode 100644 index 000000000..853e92677 --- /dev/null +++ b/dev-lang/lua/lua-5.1.4.recipe @@ -0,0 +1,50 @@ +SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language." +HOMEPAGE="http://www.lua.org" +SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" +CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" +REVISION="3" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lua = $portVersion compat = 5.1 + cmd:lua = $portVersion compat = 5.1 + cmd:luac = $portVersion + lib:liblua = $portVersion compat = 5.2 + devel:liblua = $portVersion compat = 5.2 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:make + cmd:gcc + " + +PATCHES="lua-5.1.4.patchset" +BUILD() +{ + make haiku +} + +INSTALL() +{ + make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \ + INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V" + mkdir -p $libDir/pkgconfig + cp etc/lua.pc $libDir/pkgconfig/lua.pc + + prepareInstalledDevelLib liblua + fixPkgconfig +} +LICENSE="MIT" +COPYRIGHT="1994-2009, Lua.org, PUC-Rio" +DESCRIPTION=" + Lua combines simple procedural syntax with powerful data description + constructs based on associative arrays and extensible semantics. Lua is + dynamically typed, runs by interpreting bytecode for a register-based + virtual machine, and has automatic memory management with incremental + garbage collection, making it ideal for configuration, scripting, and rapid + prototyping. + " diff --git a/dev-lang/lua/lua-5.2.1.bep b/dev-lang/lua/lua-5.2.1.bep deleted file mode 100644 index 6e4dd9fcf..000000000 --- a/dev-lang/lua/lua-5.2.1.bep +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." -HOMEPAGE="http://www.lua.org" -SRC_URI="http://www.lua.org/ftp/lua-5.2.1.tar.gz" -CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3" -REVISION="3" -STATUS_HAIKU="stable" -BUILD { - cd lua-5.2.1 - make haiku -} - -INSTALL { - cd lua-5.2.1 - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" -} -LICENSE="MIT" -COPYRIGHT="1994-2012, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe new file mode 100644 index 000000000..3f089d918 --- /dev/null +++ b/dev-lang/lua/lua-5.2.1.recipe @@ -0,0 +1,46 @@ +SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language." +HOMEPAGE="http://www.lua.org" +SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz" +CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3" +REVISION="3" +ARCHITECTURES="x86 x86_gcc2" +PROVIDES=" + lua = $portVersion compat = 5.2 + cmd:lua = $portVersion compat = 5.2 + cmd:luac = $portVersion + lib:liblua = $portVersion compat = 5.2 + devel:liblua = $portVersion compat = 5.2 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:make + cmd:gcc + " + +PATCHES="lua-$portVersion.patchset" +BUILD() +{ + make haiku +} + +INSTALL() +{ + make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \ + INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V" + + prepareInstalledDevelLib liblua +} +LICENSE="MIT" +COPYRIGHT="1994-2012, Lua.org, PUC-Rio" +DESCRIPTION=" + Lua combines simple procedural syntax with powerful data description + constructs based on associative arrays and extensible semantics. Lua is + dynamically typed, runs by interpreting bytecode for a register-based + virtual machine, and has automatic memory management with incremental + garbage collection, making it ideal for configuration, scripting, and rapid + prototyping. + " diff --git a/dev-lang/lua/patches/lua-5.1.4.patch b/dev-lang/lua/patches/lua-5.1.4.patch deleted file mode 100644 index 5a6957180..000000000 --- a/dev-lang/lua/patches/lua-5.1.4.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile ---- lua-5.1.4/Makefile.orig 2010-04-27 22:29:15.068419584 -0600 -+++ lua-5.1.4/Makefile 2010-04-27 22:29:20.697303040 -0600 -@@ -38,12 +38,12 @@ RANLIB= ranlib - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - - # Convenience platforms targets. --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris - - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua.a liblua.so - TO_MAN= lua.1 luac.1 - - # Lua version and release. -diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile ---- lua-5.1.4/src/Makefile.orig 2010-04-27 22:29:26.027787264 -0600 -+++ lua-5.1.4/src/Makefile 2010-04-27 22:29:38.680525824 -0600 -@@ -20,9 +20,10 @@ MYLIBS= - - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ LUAC_T= luac - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS) -+ - clean: - $(RM) $(ALL_T) $(ALL_O) - -@@ -95,6 +99,9 @@ freebsd: - generic: - $(MAKE) all MYCFLAGS= - -+haiku: -+ $(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS= -+ - linux: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" - -diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h ---- lua-5.1.4/src/luaconf.h.orig 2010-04-27 22:29:48.387448832 -0600 -+++ lua-5.1.4/src/luaconf.h 2010-04-27 22:29:58.184025088 -0600 -@@ -33,6 +33,13 @@ - #define LUA_WIN - #endif - -+#if defined(LUA_USE_HAIKU) -+#define LUA_USE_MKSTEMP -+#define LUA_USE_ISATTY -+#define LUA_USE_POPEN -+#define LUA_USE_DLOPEN -+#endif -+ - #if defined(LUA_USE_LINUX) - #define LUA_USE_POSIX - #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ -@@ -94,7 +101,11 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+# if defined(LUA_USE_HAIKU) -+# define LUA_ROOT "/boot/common/" -+# else -+# define LUA_ROOT "/usr/local/" -+# endif - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ diff --git a/dev-lang/lua/patches/lua-5.1.4.patchset b/dev-lang/lua/patches/lua-5.1.4.patchset new file mode 100644 index 000000000..c5bf0f4f4 --- /dev/null +++ b/dev-lang/lua/patches/lua-5.1.4.patchset @@ -0,0 +1,295 @@ +From 5944289e129f60d26f71646bc4e3404f93de138f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 22:01:42 +0200 +Subject: Import existing haikuport patch. + + +diff --git a/Makefile b/Makefile +index 6e78f66..8b8fbfc 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,11 +13,11 @@ INSTALL_TOP= /usr/local + INSTALL_BIN= $(INSTALL_TOP)/bin + INSTALL_INC= $(INSTALL_TOP)/include + INSTALL_LIB= $(INSTALL_TOP)/lib +-INSTALL_MAN= $(INSTALL_TOP)/man/man1 ++INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 + # + # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with + # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). +-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V ++INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V + INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + + # How to install. If your install program does not support "-p", then you +@@ -38,12 +38,12 @@ RANLIB= ranlib + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + + # Convenience platforms targets. +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so + TO_MAN= lua.1 luac.1 + + # Lua version and release. +diff --git a/src/Makefile b/src/Makefile +index e4a3cd6..86bd1ce 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -20,9 +20,10 @@ MYLIBS= + + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ + lundump.o lvm.o lzio.o +@@ -36,7 +37,7 @@ LUAC_T= luac + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + default: $(PLAT) +@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$V $(MYLDFLAGS) $? $(LIBS) ++ + clean: + $(RM) $(ALL_T) $(ALL_O) + +@@ -95,6 +99,9 @@ freebsd: + generic: + $(MAKE) all MYCFLAGS= + ++haiku: ++ $(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS= ++ + linux: + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" + +diff --git a/src/lcode.c b/src/lcode.c +index cff626b..679cb9c 100644 +--- a/src/lcode.c ++++ b/src/lcode.c +@@ -1,5 +1,5 @@ + /* +-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $ + ** Code generator for Lua + ** See Copyright Notice in lua.h + */ +@@ -544,10 +544,6 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) { + pc = NO_JUMP; /* always true; do nothing */ + break; + } +- case VFALSE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + invertjump(fs, e); + pc = e->u.s.info; +@@ -572,10 +568,6 @@ static void luaK_goiffalse (FuncState *fs, expdesc *e) { + pc = NO_JUMP; /* always false; do nothing */ + break; + } +- case VTRUE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + pc = e->u.s.info; + break; +diff --git a/src/ldblib.c b/src/ldblib.c +index 67de122..2027eda 100644 +--- a/src/ldblib.c ++++ b/src/ldblib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $ ++** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $ + ** Interface from Lua to its debug API + ** See Copyright Notice in lua.h + */ +@@ -45,6 +45,7 @@ static int db_setmetatable (lua_State *L) { + + + static int db_getfenv (lua_State *L) { ++ luaL_checkany(L, 1); + lua_getfenv(L, 1); + return 1; + } +diff --git a/src/liolib.c b/src/liolib.c +index e79ed1c..649f9a5 100644 +--- a/src/liolib.c ++++ b/src/liolib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $ ++** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $ + ** Standard I/O (and system) library + ** See Copyright Notice in lua.h + */ +@@ -276,7 +276,10 @@ static int read_number (lua_State *L, FILE *f) { + lua_pushnumber(L, d); + return 1; + } +- else return 0; /* read fails */ ++ else { ++ lua_pushnil(L); /* "result" to be removed */ ++ return 0; /* read fails */ ++ } + } + + +diff --git a/src/llex.c b/src/llex.c +index 6dc3193..88c6790 100644 +--- a/src/llex.c ++++ b/src/llex.c +@@ -1,5 +1,5 @@ + /* +-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ ++** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $ + ** Lexical Analyzer + ** See Copyright Notice in lua.h + */ +@@ -118,8 +118,10 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) { + lua_State *L = ls->L; + TString *ts = luaS_newlstr(L, str, l); + TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ +- if (ttisnil(o)) ++ if (ttisnil(o)) { + setbvalue(o, 1); /* make sure `str' will not be collected */ ++ luaC_checkGC(L); ++ } + return ts; + } + +diff --git a/src/loadlib.c b/src/loadlib.c +index 0d401eb..6158c53 100644 +--- a/src/loadlib.c ++++ b/src/loadlib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ ++** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $ + ** Dynamic library loader for Lua + ** See Copyright Notice in lua.h + ** +@@ -639,7 +639,7 @@ LUALIB_API int luaopen_package (lua_State *L) { + lua_pushvalue(L, -1); + lua_replace(L, LUA_ENVIRONINDEX); + /* create `loaders' table */ +- lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1); ++ lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0); + /* fill it with pre-defined loaders */ + for (i=0; loaders[i] != NULL; i++) { + lua_pushcfunction(L, loaders[i]); +diff --git a/src/lstrlib.c b/src/lstrlib.c +index 1b4763d..7a03489 100644 +--- a/src/lstrlib.c ++++ b/src/lstrlib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ ++** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $ + ** Standard library for string operations and pattern-matching + ** See Copyright Notice in lua.h + */ +@@ -754,6 +754,7 @@ static void addintlen (char *form) { + + + static int str_format (lua_State *L) { ++ int top = lua_gettop(L); + int arg = 1; + size_t sfl; + const char *strfrmt = luaL_checklstring(L, arg, &sfl); +@@ -768,7 +769,8 @@ static int str_format (lua_State *L) { + else { /* format item */ + char form[MAX_FORMAT]; /* to store the format (`%...') */ + char buff[MAX_ITEM]; /* to store the formatted item */ +- arg++; ++ if (++arg > top) ++ luaL_argerror(L, arg, "no value"); + strfrmt = scanformat(L, strfrmt, form); + switch (*strfrmt++) { + case 'c': { +diff --git a/src/luaconf.h b/src/luaconf.h +index e2cb261..9f28f41 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -33,6 +33,13 @@ + #define LUA_WIN + #endif + ++#if defined(LUA_USE_HAIKU) ++#define LUA_USE_MKSTEMP ++#define LUA_USE_ISATTY ++#define LUA_USE_POPEN ++#define LUA_USE_DLOPEN ++#endif ++ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +@@ -94,7 +101,11 @@ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + + #else +-#define LUA_ROOT "/usr/local/" ++# if defined(LUA_USE_HAIKU) ++# define LUA_ROOT "/boot/common/" ++# else ++# define LUA_ROOT "/usr/local/" ++# endif + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_PATH_DEFAULT \ +diff --git a/src/lvm.c b/src/lvm.c +index ee3256a..8aeafda 100644 +--- a/src/lvm.c ++++ b/src/lvm.c +@@ -1,5 +1,5 @@ + /* +-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $ + ** Lua virtual machine + ** See Copyright Notice in lua.h + */ +@@ -133,6 +133,7 @@ void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { + + void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + int loop; ++ TValue temp; + for (loop = 0; loop < MAXTAGLOOP; loop++) { + const TValue *tm; + if (ttistable(t)) { /* `t' is a table? */ +@@ -152,7 +153,9 @@ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + callTM(L, tm, t, key, val); + return; + } +- t = tm; /* else repeat with `tm' */ ++ /* else repeat with `tm' */ ++ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ ++ t = &temp; + } + luaG_runerror(L, "loop in settable"); + } +-- +1.8.3.4 + diff --git a/dev-lang/lua/patches/lua-5.2.1.patchset b/dev-lang/lua/patches/lua-5.2.1.patchset new file mode 100644 index 000000000..80b575808 --- /dev/null +++ b/dev-lang/lua/patches/lua-5.2.1.patchset @@ -0,0 +1,127 @@ +From 4130bdecfcb78e60b64a8ade8689aa02158eda46 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Oct 2013 10:13:45 +0200 +Subject: Import existing patch. + + +diff --git a/Makefile b/Makefile +index bd9515f..22d3a62 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,12 +36,12 @@ RM= rm -f + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + + # Convenience platforms targets. +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so + TO_MAN= lua.1 luac.1 + + # Lua version and release. +diff --git a/src/Makefile b/src/Makefile +index 8c9ee67..2f7065c 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -26,9 +26,10 @@ MYOBJS= + + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) ++ + clean: + $(RM) $(ALL_T) $(ALL_O) + +@@ -102,6 +106,9 @@ freebsd: + + generic: $(ALL) + ++haiku: ++ $(MAKE) all MUCFLAGS=-DLUA_USE_HAIKU LIBS= ++ + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses" + +diff --git a/src/luaconf.h b/src/luaconf.h +index e4335df..cef74a7 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -40,6 +40,13 @@ + + + ++#if defined(LUA_USE_HAIKU) ++#define LUA_USE_MKSTEMP ++#define LUA_USE_ISATTY ++#define LUA_USE_POPEN ++#define LUA_USE_DLOPEN ++#endif ++ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +@@ -100,7 +107,11 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" ++#if defined(LUA_USE_HAIKU) ++#define LUA_ROOT "/boot/common/" ++#else + #define LUA_ROOT "/usr/local/" ++#endif + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ +-- +1.8.3.4 + + +From 5fbc99c965898e393a34cff6bfb14b29dc77426b Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Oct 2013 10:25:23 +0200 +Subject: Set the library soname + + * prepareInstalledDevelLib will fail if there is no soname. + +diff --git a/src/Makefile b/src/Makefile +index 2f7065c..b279d4b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -67,7 +67,7 @@ $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + + $(LUA_SO): $(CORE_O) $(LIB_O) +- $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) ++ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$V $(LDFLAGS) $? $(LIBS) + + clean: + $(RM) $(ALL_T) $(ALL_O) +-- +1.8.3.4 + diff --git a/dev-lang/nasm/nasm-2.08.01.bep b/dev-lang/nasm/nasm-2.08.01.bep deleted file mode 100644 index f1c59328d..000000000 --- a/dev-lang/nasm/nasm-2.08.01.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="nasm assembler" -HOMEPAGE="http://www.nasm.us/" -SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2" -CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD { - cd nasm-2.08.01 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd nasm-2.08.01 - make install INSTALLROOT=${DESTDIR} -} -LICENSE="BSD (2-clause)" -COPYRIGHT="1996 Simon Tatham and Julian Hall." diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe new file mode 100644 index 000000000..7c47d5cab --- /dev/null +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -0,0 +1,41 @@ +SUMMARY="The Nasm assembler" +DESCRIPTION="The Nasm assembler" +HOMEPAGE="http://www.nasm.us/" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2" +CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211" +LICENSE="BSD (2-clause)" +COPYRIGHT="1996 Simon Tatham and Julian Hall." +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + nasm = $portVersion compat >= 1 + cmd:nasm = $portVersion compat >= 1 + cmd:ndisasm = $portVersion compat >= 1 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-lang/nasm/patches/nasm-2.03.01-haiku.diff b/dev-lang/nasm/patches/nasm-2.03.01.patch similarity index 100% rename from dev-lang/nasm/patches/nasm-2.03.01-haiku.diff rename to dev-lang/nasm/patches/nasm-2.03.01.patch diff --git a/dev-lang/ocaml/ocaml-4.00.0.bep b/dev-lang/ocaml/ocaml-4.00.0.recipe similarity index 97% rename from dev-lang/ocaml/ocaml-4.00.0.bep rename to dev-lang/ocaml/ocaml-4.00.0.recipe index 5e462e5d4..98e48d772 100644 --- a/dev-lang/ocaml/ocaml-4.00.0.bep +++ b/dev-lang/ocaml/ocaml-4.00.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fa11560a45793bd9fa45c1295a6f4a91" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd ocaml-4.00.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix `finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make world.opt } -INSTALL { +INSTALL() +{ cd ocaml-4.00.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ diff --git a/dev-lang/openjdk/openjdk-1.7.bep b/dev-lang/openjdk/openjdk-1.7.recipe similarity index 100% rename from dev-lang/openjdk/openjdk-1.7.bep rename to dev-lang/openjdk/openjdk-1.7.recipe diff --git a/dev-lang/orc/orc-0.4.16.bep b/dev-lang/orc/orc-0.4.16.recipe similarity index 96% rename from dev-lang/orc/orc-0.4.16.bep rename to dev-lang/orc/orc-0.4.16.recipe index d86af92c5..e7fa5a9b5 100644 --- a/dev-lang/orc/orc-0.4.16.bep +++ b/dev-lang/orc/orc-0.4.16.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e482932e544c847761449b106ecbc483" -BUILD { +BUILD() +{ cd orc-0.4.16 autoconf COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd orc-0.4.16 make install } diff --git a/dev-lang/perl/patches/perl-5.10.0.patch b/dev-lang/perl/patches/perl-5.10.0.patch deleted file mode 100644 index 832efc29c..000000000 --- a/dev-lang/perl/patches/perl-5.10.0.patch +++ /dev/null @@ -1,659 +0,0 @@ -diff -urN perl-5.10.0.orig/Configure perl-5.10.0/Configure ---- perl-5.10.0.orig/Configure 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/Configure 2008-10-25 22:26:22.000000000 +0000 -@@ -7864,6 +7864,7 @@ - case "$lddlflags" in - '') case "$osname" in - beos) dflt='-nostart' ;; -+ haiku) dflt='-shared' ;; - hpux) dflt='-b'; - case "$gccversion" in - '') dflt="$dflt +vnocompatwarnings" ;; -@@ -7946,7 +7947,7 @@ - ;; - *) case "$useshrplib" in - '') case "$osname" in -- svr4*|nonstopux|dgux|dynixptx|esix|powerux|beos|cygwin*) -+ svr4*|nonstopux|dgux|dynixptx|esix|powerux|beos|cygwin*|haiku) - dflt=y - also='Building a shared libperl is required for dynamic loading to work on your system.' - ;; -@@ -8109,6 +8110,9 @@ - beos) - # beos doesn't like the default, either. - ;; -+ haiku) -+ # Haiku doesn't like the default, either. -+ ;; - hpux*) - # hpux doesn't like the default, either. - tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\"" -diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST ---- perl-5.10.0.orig/MANIFEST 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/MANIFEST 2008-10-28 15:56:53.000000000 +0000 -@@ -664,6 +664,9 @@ - ext/GDBM_File/Makefile.PL GDBM extension makefile writer - ext/GDBM_File/t/gdbm.t See if GDBM_File works - ext/GDBM_File/typemap GDBM extension interface types -+ext/Haiku/Haiku.pm Haiku extension Perl module -+ext/Haiku/Haiku.xs Haiku extension external subroutines -+ext/Haiku/Makefile.PL Haiku extension makefile writer - ext/Hash/Util/Changes Change history of Hash::Util - ext/Hash/Util/FieldHash/Changes Changes for Hash::Util::FieldHash - ext/Hash/Util/FieldHash/FieldHash.xs XS portion -@@ -1272,6 +1275,7 @@ - h2pl/README How to turn .ph files into .pl files - h2pl/tcbreak cbreak test routine using .ph - h2pl/tcbreak2 cbreak test routine using .pl -+haiku/haikuish.h Header for the Haiku port - handy.h Handy definitions - hints/3b1cc Hints for named architecture - hints/3b1.sh Hints for named architecture -@@ -1307,6 +1311,7 @@ - hints/gnuknetbsd.sh Hints for named architecture - hints/gnu.sh Hints for named architecture - hints/greenhills.sh Hints for named architecture -+hints/haiku.sh Hints for named architecture - hints/hpux.sh Hints for named architecture - hints/i386.sh Hints for named architecture - hints/interix.sh Hints for named architecture -@@ -1763,6 +1768,7 @@ - lib/ExtUtils/MM_BeOS.pm MakeMaker methods for BeOS - lib/ExtUtils/MM_Cygwin.pm MakeMaker methods for Cygwin - lib/ExtUtils/MM_DOS.pm MakeMaker methods for DOS -+lib/ExtUtils/MM_Haiku.pm MakeMaker methods for Haiku - lib/ExtUtils/MM_MacOS.pm MakeMaker methods for MacOS - lib/ExtUtils/MM_NW5.pm MakeMaker methods for NetWare - lib/ExtUtils/MM_OS2.pm MakeMaker methods for OS/2 -@@ -3282,6 +3288,7 @@ - README.dos Perl notes for DOS - README.epoc Perl notes for EPOC - README.freebsd Perl notes for FreeBSD -+README.haiku Perl notes for Haiku - README.hpux Perl notes for HP-UX - README.hurd Perl notes for Hurd - README.irix Perl notes for Irix -diff -urN perl-5.10.0.orig/README.haiku perl-5.10.0/README.haiku ---- perl-5.10.0.orig/README.haiku 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/README.haiku 2008-10-28 15:33:37.000000000 +0000 -@@ -0,0 +1,64 @@ -+If you read this file _as_is_, just ignore the funny characters you see. -+It is written in the POD format (see pod/perlpod.pod) which is specially -+designed to be readable as is. -+ -+=head1 NAME -+ -+README.haiku - Perl version 5.10+ on Haiku -+ -+=head1 DESCRIPTION -+ -+This file contains instructions how to build Perl for Haiku and lists -+known problems. -+ -+=head1 BUILD AND INSTALL -+ -+The build procedure is completely standard: -+ -+ ./Configure -de -+ make -+ make install -+ -+Make perl executable and create a symlink for libperl: -+ -+ chmod a+x /boot/common/bin/perl -+ cd /boot/common/lib; ln -s perl5/5.10.0/BePC-haiku/CORE/libperl.so . -+ -+Replace C<5.10.0> with your respective version of Perl. -+ -+=head1 KNOWN PROBLEMS -+ -+The following problems are encountered with Haiku revision 28311: -+ -+=over 4 -+ -+=item * -+ -+Perl cannot be compiled with threading support ATM. -+ -+=item * -+ -+The C test fails. More precisely: the subtests -+using datagram sockets fail. Unix datagram sockets aren't implemented in -+Haiku yet. -+ -+=item * -+ -+A subtest of the C test fails. This is due to Haiku -+not implementing C support yet. -+ -+=item * -+ -+The tests C and C -+fail. This is due to bugs in Haiku's network stack implementation. -+ -+=back -+ -+=head1 CONTACT -+ -+For Haiku specific problems contact the HaikuPorts developers: -+http://ports.haiku-files.org/ -+ -+The initial Haiku port was done by Ingo Weinhold . -+ -+Last update: 2008-10-29 -diff -urN perl-5.10.0.orig/ext/Errno/Errno_pm.PL perl-5.10.0/ext/Errno/Errno_pm.PL ---- perl-5.10.0.orig/ext/Errno/Errno_pm.PL 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/ext/Errno/Errno_pm.PL 2008-10-25 20:30:48.000000000 +0000 -@@ -155,7 +155,7 @@ - # we might miss out on compiler-specific ones - $file{"$ENV{GUSI}include:sys:errno.h"} = 1; - -- } elsif ($^O eq 'beos') { -+ } elsif ($^O eq 'beos' || $^O eq 'haiku') { - # hidden in a special place - $file{'/boot/develop/headers/posix/errno.h'} = 1; - -diff -urN perl-5.10.0.orig/ext/Haiku/Haiku.pm perl-5.10.0/ext/Haiku/Haiku.pm ---- perl-5.10.0.orig/ext/Haiku/Haiku.pm 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/ext/Haiku/Haiku.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,54 @@ -+package Haiku; -+ -+BEGIN { -+ use strict; -+ use vars qw|$VERSION $XS_VERSION @ISA @EXPORT @EXPORT_OK|; -+ -+ require Exporter; -+ require DynaLoader; -+ -+ @ISA = qw|Exporter DynaLoader|; -+ $VERSION = '0.34'; -+ $XS_VERSION = $VERSION; -+ $VERSION = eval $VERSION; -+ -+ @EXPORT = qw( -+ ); -+ @EXPORT_OK = qw( -+ ); -+} -+ -+bootstrap Haiku; -+ -+1; -+ -+__END__ -+ -+=head1 NAME -+ -+Haiku - Interfaces to some Haiku API Functions -+ -+=head1 DESCRIPTION -+ -+The Haiku module contains functions to access Haiku APIs. -+ -+=head2 Alphabetical Listing of Haiku Functions -+ -+=over -+ -+=item Haiku::debug_printf(FORMAT,...) -+ -+Similar to printf, but prints to system debug output. -+ -+=item Haiku::debugger(FORMAT,...) -+ -+Drops the program into the debugger. The printf like arguments define the -+debugger message. -+ -+=item Haiku::ktrace_printf(FORMAT,...) -+ -+Similar to printf, but prints to a kernel tracing entry. -+ -+=back -+ -+=cut -diff -urN perl-5.10.0.orig/ext/Haiku/Haiku.xs perl-5.10.0/ext/Haiku/Haiku.xs ---- perl-5.10.0.orig/ext/Haiku/Haiku.xs 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/ext/Haiku/Haiku.xs 2008-10-25 20:33:27.000000000 +0000 -@@ -0,0 +1,137 @@ -+#define PERL_NO_GET_CONTEXT -+#include "EXTERN.h" -+#include "perl.h" -+#include "XSUB.h" -+ -+#include -+ -+#include -+ -+static void -+haiku_do_debugger(const char* format,...) -+{ -+ char buffer[1024]; -+ va_list args; -+ va_start(args, format); -+ my_vsnprintf(buffer, sizeof(buffer), format, args); -+ va_end(args); -+ -+ debugger(buffer); -+} -+ -+static void -+haiku_do_debug_printf(pTHX_ register SV *sv, -+ void (*printfFunc)(const char*,...)) -+{ -+ dVAR; -+ -+ if (!sv) -+ return; -+ if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) { -+ assert(!SvGMAGICAL(sv)); -+ if (SvIsUV(sv)) -+ (*printfFunc)("%"UVuf, (UV)SvUVX(sv)); -+ else -+ (*printfFunc)("%"IVdf, (IV)SvIVX(sv)); -+ return; -+ } -+ else { -+ STRLEN len; -+ /* Do this first to trigger any overloading. */ -+ const char *tmps = SvPV_const(sv, len); -+ U8 *tmpbuf = NULL; -+ -+ if (!SvUTF8(sv)) { -+ /* We don't modify the original scalar. */ -+ tmpbuf = bytes_to_utf8((const U8*) tmps, &len); -+ tmps = (char *) tmpbuf; -+ } -+ -+ if (len) -+ (*printfFunc)("%.*s", (int)len, tmps); -+ Safefree(tmpbuf); -+ } -+} -+ -+XS(haiku_debug_printf) -+{ -+ dVAR; -+ dXSARGS; -+ dORIGMARK; -+ SV *sv; -+ -+ if (items < 1) -+ Perl_croak(aTHX_ "usage: Haiku::debug_printf($format,...)"); -+ -+ sv = newSV(0); -+ -+ if (SvTAINTED(MARK[1])) -+ TAINT_PROPER("debug_printf"); -+ do_sprintf(sv, SP - MARK, MARK + 1); -+ -+ haiku_do_debug_printf(sv, &debug_printf); -+ -+ SvREFCNT_dec(sv); -+ SP = ORIGMARK; -+ PUSHs(&PL_sv_yes); -+} -+ -+XS(haiku_ktrace_printf) -+{ -+ dVAR; -+ dXSARGS; -+ dORIGMARK; -+ SV *sv; -+ -+ if (items < 1) -+ Perl_croak(aTHX_ "usage: Haiku::debug_printf($format,...)"); -+ -+ sv = newSV(0); -+ -+ if (SvTAINTED(MARK[1])) -+ TAINT_PROPER("ktrace_printf"); -+ do_sprintf(sv, SP - MARK, MARK + 1); -+ -+ haiku_do_debug_printf(sv, &ktrace_printf); -+ -+ SvREFCNT_dec(sv); -+ SP = ORIGMARK; -+ PUSHs(&PL_sv_yes); -+} -+ -+XS(haiku_debugger) -+{ -+ dVAR; -+ dXSARGS; -+ dORIGMARK; -+ SV *sv; -+ -+ if (items < 1) -+ Perl_croak(aTHX_ "usage: Haiku::debugger($format,...)"); -+ -+ sv = newSV(0); -+ -+ if (SvTAINTED(MARK[1])) -+ TAINT_PROPER("debugger"); -+ do_sprintf(sv, SP - MARK, MARK + 1); -+ -+ haiku_do_debug_printf(sv, &haiku_do_debugger); -+ -+ SvREFCNT_dec(sv); -+ SP = ORIGMARK; -+ PUSHs(&PL_sv_yes); -+} -+ -+MODULE = Haiku PACKAGE = Haiku -+ -+PROTOTYPES: DISABLE -+ -+BOOT: -+{ -+ char *file = __FILE__; -+ -+ newXS("Haiku::debug_printf", haiku_debug_printf, file); -+ newXS("Haiku::ktrace_printf", haiku_ktrace_printf, file); -+ newXS("Haiku::debugger", haiku_debugger, file); -+ XSRETURN_YES; -+} -diff -urN perl-5.10.0.orig/ext/Haiku/Makefile.PL perl-5.10.0/ext/Haiku/Makefile.PL ---- perl-5.10.0.orig/ext/Haiku/Makefile.PL 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/ext/Haiku/Makefile.PL 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,20 @@ -+use 5.006; -+use ExtUtils::MakeMaker; -+ -+unless ($^O eq "haiku") { -+ die "OS unsupported\n"; -+} -+ -+#my @libs; -+#push @libs, '-L/lib/w32api -lole32 -lversion' if $^O eq "cygwin"; -+ -+WriteMakefile( -+ NAME => 'Haiku', -+ VERSION_FROM => 'Haiku.pm', -+# LIBS => \@libs, -+ INSTALLDIRS => ($] >= 5.008004 ? 'perl' : 'site'), -+ NO_META => 1, -+ -+ AUTHOR => 'Ingo Weinhold ', -+ ABSTRACT_FROM => 'Haiku.pm', -+); -diff -urN perl-5.10.0.orig/ext/POSIX/POSIX.xs perl-5.10.0/ext/POSIX/POSIX.xs ---- perl-5.10.0.orig/ext/POSIX/POSIX.xs 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/ext/POSIX/POSIX.xs 2008-10-25 23:00:29.000000000 +0000 -@@ -379,7 +379,7 @@ - * to follow the traditional. However, to make the POSIX - * wait W*() macros to work in BeOS, we need to unbend the - * reality back in place. --jhi */ --#ifdef __BEOS__ -+#if defined(__BEOS__) || defined(__HAIKU__) - # define WMUNGE(x) (((x) & 0xFF00) >> 8 | ((x) & 0x00FF) << 8) - #else - # define WMUNGE(x) (x) -diff -urN perl-5.10.0.orig/ext/Time/HiRes/t/HiRes.t perl-5.10.0/ext/Time/HiRes/t/HiRes.t ---- perl-5.10.0.orig/ext/Time/HiRes/t/HiRes.t 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/ext/Time/HiRes/t/HiRes.t 2008-10-24 17:09:59.000000000 +0000 -@@ -337,7 +337,8 @@ - && defined &Time::HiRes::getitimer - && has_symbol('ITIMER_VIRTUAL') - && $Config{sig_name} =~ m/\bVTALRM\b/ -- && $^O !~ /^(nto)$/) { # nto: QNX 6 has the API but no implementation -+ && $^O !~ /^(nto)$/ # nto: QNX 6 has the API but no implementation -+ && $^O ne 'haiku') { # same for Haiku - for (18..19) { - print "ok $_ # Skip: no virtual interval timers\n"; - } -diff -urN perl-5.10.0.orig/haiku/haikuish.h perl-5.10.0/haiku/haikuish.h ---- perl-5.10.0.orig/haiku/haikuish.h 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/haiku/haikuish.h 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,11 @@ -+#ifndef PERL_HAIKU_HAIKUISH_H -+#define PERL_HAIKU_HAIKUISH_H -+ -+#include "../unixish.h" -+ -+/* We need or else the W* macros aren't defined in perl.h. */ -+ -+#include -+ -+#endif -+ -diff -urN perl-5.10.0.orig/hints/haiku.sh perl-5.10.0/hints/haiku.sh ---- perl-5.10.0.orig/hints/haiku.sh 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/hints/haiku.sh 2008-10-28 02:50:53.000000000 +0000 -@@ -0,0 +1,34 @@ -+# Haiku hints file -+# $Id$ -+ -+prefix="/boot/common" -+ -+libpth='/boot/home/config/lib /boot/common/lib /system/lib' -+usrinc='/boot/develop/headers/posix' -+locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' -+ -+libc='/system/lib/libroot.so' -+libs='-lnetwork' -+ -+# Use Haiku's malloc() by default. -+case "$usemymalloc" in -+'') usemymalloc='n' ;; -+esac -+ -+# Haiku generally supports hard links, but the default file system (BFS) -+# doesn't. So better avoid using hard links. -+d_link='undef' -+dont_use_nlink='define' -+ -+# The array syserrlst[] is useless for the most part. -+# Large negative numbers really kind of suck in arrays. -+d_syserrlst='undef' -+ -+# Haiku uses gcc. -+cc="gcc" -+ld='gcc' -+ -+# The runtime loader library path variable is LIBRARY_PATH. -+case "$ldlibpthname" in -+'') ldlibpthname=LIBRARY_PATH ;; -+esac -diff -urN perl-5.10.0.orig/lib/CPANPLUS/Internals/Constants/Report.pm perl-5.10.0/lib/CPANPLUS/Internals/Constants/Report.pm ---- perl-5.10.0.orig/lib/CPANPLUS/Internals/Constants/Report.pm 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/lib/CPANPLUS/Internals/Constants/Report.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -29,6 +29,7 @@ - Cygwin => 'cygwin', - Darwin => 'darwin', - EBCDIC => 'os390|os400|posix-bc|vmesa', -+ Haiku => 'haiku', - HPUX => 'hpux', - Linux => 'linux', - MSDOS => 'dos|os2|MSWin32|cygwin', -diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm perl-5.10.0/lib/ExtUtils/CBuilder.pm ---- perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/lib/ExtUtils/CBuilder.pm 2008-10-28 02:42:24.000000000 +0000 -@@ -36,6 +36,7 @@ - sunos Unix - cygwin Unix - os2 Unix -+ haiku Unix - - dos Windows - MSWin32 Windows -diff -urN perl-5.10.0.orig/lib/ExtUtils/MM.pm perl-5.10.0/lib/ExtUtils/MM.pm ---- perl-5.10.0.orig/lib/ExtUtils/MM.pm 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/lib/ExtUtils/MM.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -69,6 +69,7 @@ - $Is{VOS} = $^O eq 'vos'; - $Is{QNX} = $^O eq 'qnx'; - $Is{AIX} = $^O eq 'aix'; -+$Is{Haiku} = $^O eq 'haiku'; - - $Is{Unix} = !grep { $_ } values %Is; - -diff -urN perl-5.10.0.orig/lib/ExtUtils/MM_Haiku.pm perl-5.10.0/lib/ExtUtils/MM_Haiku.pm ---- perl-5.10.0.orig/lib/ExtUtils/MM_Haiku.pm 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/lib/ExtUtils/MM_Haiku.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,62 @@ -+package ExtUtils::MM_Haiku; -+ -+use strict; -+ -+=head1 NAME -+ -+ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker -+ -+=head1 SYNOPSIS -+ -+ use ExtUtils::MM_Haiku; # Done internally by ExtUtils::MakeMaker if needed -+ -+=head1 DESCRIPTION -+ -+See ExtUtils::MM_Unix for a documentation of the methods provided -+there. This package overrides the implementation of these methods, not -+the semantics. -+ -+=over 4 -+ -+=cut -+ -+use ExtUtils::MakeMaker::Config; -+use File::Spec; -+require ExtUtils::MM_Any; -+require ExtUtils::MM_Unix; -+ -+use vars qw(@ISA $VERSION); -+@ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -+$VERSION = '6.42'; -+ -+ -+=item os_flavor -+ -+Haiku is Haiku. -+ -+=cut -+ -+sub os_flavor { -+ return('Haiku'); -+} -+ -+=item init_linker -+ -+libperl.a equivalent to be linked to dynamic extensions. -+ -+=cut -+ -+sub init_linker { -+ my($self) = shift; -+ -+ $self->{PERL_ARCHIVE} ||= -+ File::Spec->catdir('$(PERL_INC)',$Config{libperl}); -+ $self->{PERL_ARCHIVE_AFTER} ||= ''; -+ $self->{EXPORT_LIST} ||= ''; -+} -+ -+=back -+ -+1; -+__END__ -+ -diff -urN perl-5.10.0.orig/lib/Module/Build.pm perl-5.10.0/lib/Module/Build.pm ---- perl-5.10.0.orig/lib/Module/Build.pm 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/lib/Module/Build.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -30,6 +30,7 @@ - dynixptx Unix - freebsd Unix - linux Unix -+ haiku Unix - hpux Unix - irix Unix - darwin Unix -diff -urN perl-5.10.0.orig/perl.h perl-5.10.0/perl.h ---- perl-5.10.0.orig/perl.h 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/perl.h 2008-10-25 20:42:31.000000000 +0000 -@@ -1520,15 +1520,15 @@ - # define S_IRWXO (S_IROTH|S_IWOTH|S_IXOTH) - #endif - --/* BeOS 5.0 seems to define S_IREAD and S_IWRITE in -+/* BeOS 5.0 and Haiku R1 seem to define S_IREAD and S_IWRITE in - * which would get included through , but that is 3000 - * lines in the future. --jhi */ - --#if !defined(S_IREAD) && !defined(__BEOS__) -+#if !defined(S_IREAD) && !(defined(__BEOS__) || defined(__HAIKU__)) - # define S_IREAD S_IRUSR - #endif - --#if !defined(S_IWRITE) && !defined(__BEOS__) -+#if !defined(S_IWRITE) && !(defined(__BEOS__) || defined(__HAIKU__)) - # define S_IWRITE S_IWUSR - #endif - -@@ -2551,7 +2551,10 @@ - # define ISHISH "macos classic" - #endif - --#if defined(__BEOS__) -+#if defined(__HAIKU__) -+# include "haiku/haikuish.h" -+# define ISHISH "haiku" -+#elif defined(__BEOS__) - # include "beos/beosish.h" - # define ISHISH "beos" - #endif -@@ -5609,9 +5612,10 @@ - #if O_TEXT != O_BINARY - /* If you have different O_TEXT and O_BINARY and you are a CLRF shop, - * that is, you are somehow DOSish. */ --# if defined(__BEOS__) || defined(__VOS__) || defined(__CYGWIN__) -- /* BeOS has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect; -- * BeOS is always UNIXoid (LF), not DOSish (CRLF). */ -+# if defined(__BEOS__) || defined(__HAIKU__) || defined(__VOS__) || \ -+ defined(__CYGWIN__) -+ /* BeOS/Haiku has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect; -+ * BeOS/Haiku is always UNIXoid (LF), not DOSish (CRLF). */ - /* VOS has O_TEXT != O_BINARY, and they have effect, - * but VOS always uses LF, never CRLF. */ - /* If you have O_TEXT different from your O_BINARY but you still are -diff -urN perl-5.10.0.orig/pod/perlport.pod perl-5.10.0/pod/perlport.pod ---- perl-5.10.0.orig/pod/perlport.pod 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/pod/perlport.pod 2008-10-28 02:37:44.000000000 +0000 -@@ -815,6 +815,7 @@ - dgux dgux AViiON-dgux - DYNIX/ptx dynixptx i386-dynixptx - FreeBSD freebsd freebsd-i386 -+ Haiku haiku BePC-haiku - Linux linux arm-linux - Linux linux i386-linux - Linux linux i586-linux -diff -urN perl-5.10.0.orig/t/io/fs.t perl-5.10.0/t/io/fs.t ---- perl-5.10.0.orig/t/io/fs.t 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/t/io/fs.t 2008-10-24 17:09:59.000000000 +0000 -@@ -275,7 +275,7 @@ - is( $atime, 500000001, 'atime' ); - is( $mtime, 500000000 + $delta, 'mtime' ); - } -- elsif ($^O eq 'beos') { -+ elsif ($^O eq 'beos' || $^O eq 'haiku') { - SKIP: { - skip "atime not updated", 1; - } -diff -urN perl-5.10.1/Configure perl-5.10.1-haiku/Configure ---- perl-5.10.1/Configure 2009-08-18 19:03:53.024117248 +0000 -+++ perl-5.10.1-haiku/Configure 2012-09-07 13:57:19.000000000 +0000 -@@ -5139,18 +5139,6 @@ - eval $checkccflag - ;; - esac -- -- # on x86_64 (at least) we require an extra library (libssp) in the -- # link command line. This library is not named, so I infer that it is -- # an implementation detail that may change. Hence the safest approach -- # is to add the flag to the flags passed to the compiler at link time, -- # as that way the compiler can do the right implementation dependant -- # thing. (NWC) -- case "$gccversion" in -- ?*) set stack-protector -fstack-protector -- eval $checkccflag -- ;; -- esac - ;; - esac - diff --git a/dev-lang/perl/patches/perl-5.10.1.patch b/dev-lang/perl/patches/perl-5.10.1.patch index 8aaa47ae7..052f80bbb 100644 --- a/dev-lang/perl/patches/perl-5.10.1.patch +++ b/dev-lang/perl/patches/perl-5.10.1.patch @@ -1,7 +1,65 @@ -diff -up perl-5.10.1/installperl.orig perl-5.10.1/installperl ---- perl-5.10.1/installperl.orig 2009-08-13 16:40:10.023330816 -0600 -+++ perl-5.10.1/installperl 2010-04-22 19:31:00.720633856 -0600 -@@ -409,6 +409,11 @@ elsif ($Is_Cygwin) { # On Cygwin symlink +diff -ruw perl-5.10.1/ext/Errno/Errno_pm.PL perl-5.10.1-haiku/ext/Errno/Errno_pm.PL +--- perl-5.10.1/ext/Errno/Errno_pm.PL 2009-06-27 16:09:45.059768832 +0000 ++++ perl-5.10.1-haiku/ext/Errno/Errno_pm.PL 2011-03-01 18:01:57.984350720 +0000 +@@ -159,10 +159,14 @@ + # we might miss out on compiler-specific ones + $file{"$ENV{GUSI}include:sys:errno.h"} = 1; + +- } elsif ($^O eq 'beos' || $^O eq 'haiku') { ++ } elsif ($^O eq 'beos') { + # hidden in a special place + $file{'/boot/develop/headers/posix/errno.h'} = 1; + ++ } elsif ($^O eq 'haiku') { ++ # hidden in a special place ++ $file{'/boot/system/develop/headers/posix/errno.h'} = 1; ++ + } elsif ($^O eq 'vos') { + # avoid problem where cpp returns non-POSIX pathnames + $file{'/system/include_library/errno.h'} = 1; +diff -ruw perl-5.10.1/hints/haiku.sh perl-5.10.1-haiku/hints/haiku.sh +--- perl-5.10.1/hints/haiku.sh 2009-02-12 23:58:12.063176704 +0100 ++++ perl-5.10.1-haiku/hints/haiku.sh 1970-01-01 01:00:00.000000000 +0100 +@@ -1,34 +1 @@ +-# Haiku hints file +-# $Id$ +- +-prefix="/boot/common" +- +-libpth='/boot/home/config/lib /boot/common/lib /system/lib' +-usrinc='/boot/develop/headers/posix' +-locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' +- +-libc='/system/lib/libroot.so' +-libs='-lnetwork' +- +-# Use Haiku's malloc() by default. +-case "$usemymalloc" in +-'') usemymalloc='n' ;; +-esac +- +-# Haiku generally supports hard links, but the default file system (BFS) +-# doesn't. So better avoid using hard links. +-d_link='undef' +-dont_use_nlink='define' +- +-# The array syserrlst[] is useless for the most part. +-# Large negative numbers really kind of suck in arrays. +-d_syserrlst='undef' +- +-# Haiku uses gcc. +-cc="gcc" +-ld='gcc' +- +-# The runtime loader library path variable is LIBRARY_PATH. +-case "$ldlibpthname" in +-'') ldlibpthname=LIBRARY_PATH ;; +-esac ++# haiku sets all its specifics via Configure +diff -ruw perl-5.10.1/installperl perl-5.10.1-haiku/installperl +--- perl-5.10.1/installperl 2009-08-13 22:40:10.066846720 +0000 ++++ perl-5.10.1-haiku/installperl 2011-02-28 17:24:45.324272128 +0000 +@@ -409,6 +409,11 @@ mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777); push(@corefiles,'mpeix/mpeixish.h'); } @@ -13,23 +71,10 @@ diff -up perl-5.10.1/installperl.orig perl-5.10.1/installperl # If they have built sperl.o... push(@corefiles,'sperl.o') if -f 'sperl.o'; } -diff -up perl-5.10.1/lib/File/Temp.pm.orig perl-5.10.1/lib/File/Temp.pm ---- perl-5.10.1/lib/File/Temp.pm.orig 2009-06-30 07:13:54.062914560 -0600 -+++ perl-5.10.1/lib/File/Temp.pm 2010-04-22 19:25:11.867172352 -0600 -@@ -1978,7 +1978,8 @@ sub unlink0 { - # on Win9x the link count remains 1 - # On NFS the link count may still be 1 but we cant know that - # we are on NFS -- return ( $fh[3] == 0 or $^O eq 'cygwin' ? 1 : 0); -+ # On haiku, the link count seems to be always 1 (at least for BFS) -+ return ( $fh[3] == 0 or $^O eq 'cygwin' or $^O eq 'haiku' ? 1 : 0); - - } else { - _deferred_unlink($fh, $path, 0); -diff -up perl-5.10.1/lib/File/Temp/t/lock.t.orig perl-5.10.1/lib/File/Temp/t/lock.t ---- perl-5.10.1/lib/File/Temp/t/lock.t.orig 2009-02-12 15:58:13.059506688 -0700 -+++ perl-5.10.1/lib/File/Temp/t/lock.t 2010-04-22 19:25:11.860094464 -0600 -@@ -8,7 +8,8 @@ use Fcntl; +diff -ruw perl-5.10.1/lib/File/Temp/t/lock.t perl-5.10.1-haiku/lib/File/Temp/t/lock.t +--- perl-5.10.1/lib/File/Temp/t/lock.t 2009-02-12 22:58:13.009699328 +0000 ++++ perl-5.10.1-haiku/lib/File/Temp/t/lock.t 2011-02-28 17:24:45.354418688 +0000 +@@ -8,7 +8,8 @@ BEGIN { # see if we have O_EXLOCK eval { &Fcntl::O_EXLOCK; }; @@ -39,10 +84,23 @@ diff -up perl-5.10.1/lib/File/Temp/t/lock.t.orig perl-5.10.1/lib/File/Temp/t/loc plan skip_all => 'Do not seem to have O_EXLOCK'; } else { plan tests => 4; -diff -up perl-5.10.1/t/run/exit.t.orig perl-5.10.1/t/run/exit.t ---- perl-5.10.1/t/run/exit.t.orig 2009-08-04 09:48:30.001310720 -0600 -+++ perl-5.10.1/t/run/exit.t 2010-04-22 19:25:11.870580224 -0600 -@@ -57,18 +57,18 @@ is( ${^CHILD_ERROR_NATIVE}, $native_succ +diff -ruw perl-5.10.1/lib/File/Temp.pm perl-5.10.1-haiku/lib/File/Temp.pm +--- perl-5.10.1/lib/File/Temp.pm 2009-06-30 13:13:54.013369344 +0000 ++++ perl-5.10.1-haiku/lib/File/Temp.pm 2011-02-28 17:24:45.347602944 +0000 +@@ -1978,7 +1978,8 @@ + # on Win9x the link count remains 1 + # On NFS the link count may still be 1 but we cant know that + # we are on NFS +- return ( $fh[3] == 0 or $^O eq 'cygwin' ? 1 : 0); ++ # On haiku, the link count seems to be always 1 (at least for BFS) ++ return ( $fh[3] == 0 or $^O eq 'cygwin' or $^O eq 'haiku' ? 1 : 0); + + } else { + _deferred_unlink($fh, $path, 0); +diff -ruw perl-5.10.1/t/run/exit.t perl-5.10.1-haiku/t/run/exit.t +--- perl-5.10.1/t/run/exit.t 2009-08-04 15:48:30.014155776 +0000 ++++ perl-5.10.1-haiku/t/run/exit.t 2011-02-28 17:24:45.362283008 +0000 +@@ -57,18 +57,18 @@ if (!$vms_exit_mode) { my $posix_ok = eval { require POSIX; }; my $wait_macros_ok = defined &POSIX::WIFEXITED; @@ -66,7 +124,7 @@ diff -up perl-5.10.1/t/run/exit.t.orig perl-5.10.1/t/run/exit.t } SKIP: { -@@ -87,9 +87,9 @@ if (!$vms_exit_mode) { +@@ -87,9 +87,9 @@ SKIP: { skip("No POSIX", 3) unless $posix_ok; skip("No POSIX wait macros", 3) unless $wait_macros_ok; diff --git a/dev-lang/perl/patches/perl-5.18.1.patchset b/dev-lang/perl/patches/perl-5.18.1.patchset new file mode 100644 index 000000000..67640828a --- /dev/null +++ b/dev-lang/perl/patches/perl-5.18.1.patchset @@ -0,0 +1,546 @@ +From 4bef2ada1d8a38b4dff88f0659a3b9e181bf1950 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:52:03 +0200 +Subject: Tell perl that BFS has a link count of 1 + + +diff --git a/cpan/File-Temp/lib/File/Temp.pm b/cpan/File-Temp/lib/File/Temp.pm +index ac57c26..759690c 100644 +--- a/cpan/File-Temp/lib/File/Temp.pm ++++ b/cpan/File-Temp/lib/File/Temp.pm +@@ -2051,7 +2051,8 @@ sub unlink0 { + # On NFS the link count may still be 1 but we can't know that + # we are on NFS. Since we can't be sure, we'll defer it + +- return 1 if $fh[3] == 0 || $^O eq 'cygwin'; ++ # On haiku, the link count seems to be always 1 (at least for BFS) ++ return 1 if $fh[3] == 0 || $^O eq 'cygwin' || $^O eq 'haiku'; + } + # fall-through if we can't unlink now + _deferred_unlink($fh, $path, 0); +-- +1.8.3.4 + + +From e54a8f98abfea2be3eec53b4bbe2cbaaf9f39139 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:52:53 +0200 +Subject: Haiku defines, but does not implement O_EXLOCK + + +diff --git a/cpan/File-Temp/t/lock.t b/cpan/File-Temp/t/lock.t +index ff8c7f9..4364bf6 100644 +--- a/cpan/File-Temp/t/lock.t ++++ b/cpan/File-Temp/t/lock.t +@@ -8,7 +8,8 @@ use Fcntl; + BEGIN { + # see if we have O_EXLOCK + eval { &Fcntl::O_EXLOCK; }; +- if ($@) { ++ if ($@ || $^O eq 'haiku') { ++ # haiku doesn't implement O_EXLOCK yet (but it defines the value) + plan skip_all => 'Do not seem to have O_EXLOCK'; + } else { + plan tests => 4; +-- +1.8.3.4 + + +From 30f81dcecdfb9c49ad8824314348cd23ef43ec0f Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:53:40 +0200 +Subject: haiku sets all its specifics via Configure + + +diff --git a/hints/haiku.sh b/hints/haiku.sh +index fa8ebe5..0f09f53 100644 +--- a/hints/haiku.sh ++++ b/hints/haiku.sh +@@ -1,44 +1 @@ +-# Haiku hints file +-# $Id$ +- +-case "$prefix" in +-'') prefix="/boot/common" ;; +-*) ;; # pass the user supplied value through +-esac +- +-libpth='/boot/home/config/lib /boot/common/lib /system/lib' +-usrinc='/boot/develop/headers/posix' +-locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' +- +-libc='/system/lib/libroot.so' +-libs='-lnetwork' +- +-# Use Haiku's malloc() by default. +-case "$usemymalloc" in +-'') usemymalloc='n' ;; +-esac +- +-# Haiku generally supports hard links, but the default file system (BFS) +-# doesn't. So better avoid using hard links. +-d_link='undef' +-dont_use_nlink='define' +- +-# The array syserrlst[] is useless for the most part. +-# Large negative numbers really kind of suck in arrays. +-d_syserrlst='undef' +- +-# Haiku uses gcc. +-cc="gcc" +-ld='gcc' +- +-# The runtime loader library path variable is LIBRARY_PATH. +-case "$ldlibpthname" in +-'') ldlibpthname=LIBRARY_PATH ;; +-esac +- +-# as of alpha 4.1 (at the latest) some symbols are versioned, +-# confusing the nm lookup +-case "$usenm" in +-'') usenm='undef' ;; +-esac +- ++# haiku sets all its specifics via Configure +-- +1.8.3.4 + + +From 187343906d2ed78aa5e5b4b3a6cfb7ad199c726f Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:54:15 +0200 +Subject: Tell perl that Haiku needs haikuish.h installed as well + + +diff --git a/installperl b/installperl +index e64b1c3..8ae20cc 100755 +--- a/installperl ++++ b/installperl +@@ -379,6 +379,11 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy + + # AIX needs perl.exp installed as well. + push(@corefiles,'perl.exp') if $^O eq 'aix'; ++ if ($^O eq 'haiku') { ++ # Haiku needs haikuish.h installed as well. ++ mkpath("$installarchlib/CORE/haiku", $opts{verbose}, 0777); ++ push(@corefiles,'haiku/haikuish.h'); ++ } + } + foreach my $file (@corefiles) { + # HP-UX (at least) needs to maintain execute permissions +-- +1.8.3.4 + + +From 936c1f0486788b814578ea469f4441d1755dac71 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:55:13 +0200 +Subject: Fix handling of exit codes on Haiku + + +diff --git a/t/run/exit.t b/t/run/exit.t +index 02e57c6..e836410 100644 +--- a/t/run/exit.t ++++ b/t/run/exit.t +@@ -55,18 +55,18 @@ is( ${^CHILD_ERROR_NATIVE}, $native_success, 'Normal exit ${^CHILD_ERROR_NATIVE + if (!$vms_exit_mode) { + my $posix_ok = eval { require POSIX; }; + my $wait_macros_ok = defined &POSIX::WIFEXITED; +- eval { POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}) }; ++ eval { POSIX::WIFEXITED($?) }; + $wait_macros_ok = 0 if $@; + $exit = run('exit 42'); + is( $exit >> 8, 42, 'Non-zero exit' ); + is( $exit, $?, 'Non-zero exit $?' ); +- isnt( !${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' ); ++ isnt( ${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' ); + SKIP: { + skip("No POSIX", 3) unless $posix_ok; + skip("No POSIX wait macros", 3) unless $wait_macros_ok; +- ok(POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED"); +- ok(!POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED"); +- is(POSIX::WEXITSTATUS(${^CHILD_ERROR_NATIVE}), 42, "WEXITSTATUS"); ++ ok(POSIX::WIFEXITED($?), "WIFEXITED"); ++ ok(!POSIX::WIFSIGNALED($?), "WIFSIGNALED"); ++ is(POSIX::WEXITSTATUS($?), 42, "WEXITSTATUS"); + } + + SKIP: { +@@ -85,9 +85,9 @@ if (!$vms_exit_mode) { + SKIP: { + skip("No POSIX", 3) unless $posix_ok; + skip("No POSIX wait macros", 3) unless $wait_macros_ok; +- ok(!POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED"); +- ok(POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED"); +- is(POSIX::WTERMSIG(${^CHILD_ERROR_NATIVE}), 15, "WTERMSIG"); ++ ok(!POSIX::WIFEXITED($?), "WIFEXITED"); ++ ok(POSIX::WIFSIGNALED($?), "WIFSIGNALED"); ++ is(POSIX::WTERMSIG($?), 15, "WTERMSIG"); + } + } + +-- +1.8.3.4 + + +From c8c19c0e4b6493dd5122749ba0f0d7d8b1b89117 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 15:00:44 +0200 +Subject: Fix include path of errno.h + + +diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL +index b707911..7999ae4 100644 +--- a/ext/Errno/Errno_pm.PL ++++ b/ext/Errno/Errno_pm.PL +@@ -143,7 +143,7 @@ sub get_files { + $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place +- $file{'/boot/develop/headers/posix/errno.h'} = 1; ++ $file{'/boot/system/develop/headers/posix/errno.h'} = 1; + + } elsif ($^O eq 'vos') { + # avoid problem where cpp returns non-POSIX pathnames +-- +1.8.3.4 + + +From 46ed1ae1bc678bda0d0fe3efb589847798afab58 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sat, 28 Sep 2013 13:46:42 +0200 +Subject: Adjust ExtUtils::MakeMaker for PM-Haiku. + +* MakeMaker-projects trying to install into 'site-perl' while specifying + PREFIX would end up using a wrong 'site-perl' prefix. +* Split MM_Haiku.pm off MM_BeOS.pm, implementing Haiku-specific overrides + for MakeMaker. + +diff --git a/cpan/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST +index 72feb7d..8eb81f3 100644 +--- a/cpan/ExtUtils-MakeMaker/MANIFEST ++++ b/cpan/ExtUtils-MakeMaker/MANIFEST +@@ -48,6 +48,7 @@ lib/ExtUtils/MM_BeOS.pm + lib/ExtUtils/MM_Cygwin.pm + lib/ExtUtils/MM_Darwin.pm + lib/ExtUtils/MM_DOS.pm ++lib/ExtUtils/MM_Haiku.pm + lib/ExtUtils/MM_MacOS.pm + lib/ExtUtils/MM_NW5.pm + lib/ExtUtils/MM_OS2.pm +diff --git a/cpan/ExtUtils-MakeMaker/NOTES b/cpan/ExtUtils-MakeMaker/NOTES +index cb29aec..bfa628c 100644 +--- a/cpan/ExtUtils-MakeMaker/NOTES ++++ b/cpan/ExtUtils-MakeMaker/NOTES +@@ -80,9 +80,9 @@ The MM_* hierarchy + + MM_Win95 MM_NW5 + \ / +-MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN +- \ | | | / / / +- ------------------------------------------------ ++MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN MM_Haiku ++ \ | | | / / / / ++ -------------------------------------------------------- + | | + MM_Unix | + | | +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +index 26ed594..dfeea45 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +@@ -59,7 +59,8 @@ if( $^O eq 'MSWin32' ) { + $Is{UWIN} = $^O =~ /^uwin(-nt)?$/; + $Is{Cygwin} = $^O eq 'cygwin'; + $Is{NW5} = $Config{osname} eq 'NetWare'; # intentional +-$Is{BeOS} = ($^O =~ /beos/i or $^O eq 'haiku'); ++$Is{BeOS} = $^O =~ /beos/i; ++$Is{Haiku} = $^O eq 'haiku'; + $Is{DOS} = $^O eq 'dos'; + if( $Is{NW5} ) { + $^O = 'NetWare'; +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +new file mode 100644 +index 0000000..81e5f99 +--- /dev/null ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -0,0 +1,70 @@ ++package ExtUtils::MM_Haiku; ++ ++use strict; ++ ++=head1 NAME ++ ++ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker ++ ++=head1 SYNOPSIS ++ ++ use ExtUtils::MM_Haiku; # Done internally by ExtUtils::MakeMaker if needed ++ ++=head1 DESCRIPTION ++ ++See ExtUtils::MM_Unix for a documentation of the methods provided ++there. This package overrides the implementation of these methods, not ++the semantics. ++ ++=over 4 ++ ++=cut ++ ++use ExtUtils::MakeMaker::Config; ++use File::Spec; ++require ExtUtils::MM_Any; ++require ExtUtils::MM_Unix; ++ ++our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); ++our $VERSION = '6.66'; ++ ++ ++=item os_flavor ++ ++Haiku is Haiku. ++ ++=cut ++ ++sub os_flavor { ++ return('Haiku'); ++} ++ ++=head3 init_INSTALL_from_PREFIX ++ ++ $mm->init_INSTALL_from_PREFIX; ++ ++=cut ++ ++sub init_INSTALL_from_PREFIX { ++ my $self = shift; ++ ++ # If a prefix has been given from outside, the default implementation ++ # will set PERLPREFIX, SITEPREFIX and VENDORPREFIX to identical values, ++ # but due to the way how Haiku's package management works, PERLPREFIX ++ # and VENDORPREFIX are not writable at all (as they're being populated ++ # from installed packages via package-fs). SITEPREFIX, however needs to ++ # be set to a path which can be written to (since site packages are ++ # expected to be installed "manually") - so we make sure it points ++ # to a 'non-packaged'-folder: ++ my $prefixGiven = $self->{PREFIX}; ++ $self->SUPER::init_INSTALL_from_PREFIX(); ++ if ($prefixGiven) { ++ $self->{SITEPREFIX} = '$(PREFIX)/non-packaged'; ++ } ++} ++ ++=back ++ ++1; ++__END__ ++ +-- +1.8.3.4 + + +From f9458e30c41213d315721183c9f10c3605812f57 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 8 Oct 2013 22:16:37 +0200 +Subject: Avoid using -rpath for dynamic modules. + + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +index 81e5f99..25ace13 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -65,6 +65,33 @@ sub init_INSTALL_from_PREFIX { + + =back + ++=head3 init_others ++ ++ $MM->init_others(); ++ ++Initializes the macro definitions having to do with compiling and ++linking used by tools_other() and places them in the $MM object. ++ ++If there is no description, its the same as the parameter to ++WriteMakefile() documented in ExtUtils::MakeMaker. ++ ++=cut ++ ++sub init_others { ++ my $self = shift; ++ ++ $self->SUPER::init_others(); ++ ++ # Don't use run-time paths for libraries required by dynamic ++ # modules on Haiku, as that wouldn't work should a library be moved ++ # (for instance because the package has been activated somewhere else). ++ $self->{LD_RUN_PATH} = ""; ++ ++ return; ++} ++ ++=back ++ + 1; + __END__ + +-- +1.8.3.4 + + +From 5d6dde9cb0022bdeee490b383ff1991eacc3b9cc Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 8 Oct 2013 22:17:26 +0200 +Subject: Add script sitecustomize.pl for setting up @INC as we need it. + + +diff --git a/sitecustomize.pl b/sitecustomize.pl +new file mode 100644 +index 0000000..a321e51 +--- /dev/null ++++ b/sitecustomize.pl +@@ -0,0 +1,36 @@ ++#! perl ++ ++use Config; ++ ++# Remove all compiled-in paths referring to Perl's installation dir ++# and replace them with a static set of paths that implement the intended ++# searching order: ++my @ourINC = ( ++ "/boot/home/config/lib/perl5/$Config{version}/$Config{archname}", ++ "/boot/home/config/lib/perl5/$Config{version}", ++ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}", ++ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}", ++ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}/$Config{archname}", ++ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}", ++ "/boot/home/config/lib/perl5/vendor_perl", ++ "/boot/system/lib/perl5/$Config{version}/$Config{archname}", ++ "/boot/system/lib/perl5/$Config{version}", ++ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}", ++ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}", ++ "/boot/system/lib/perl5/vendor_perl/$Config{version}/$Config{archname}", ++ "/boot/system/lib/perl5/vendor_perl/$Config{version}", ++ "/boot/system/lib/perl5/vendor_perl", ++); ++my @newINC; ++my $removedPerlPaths; ++foreach my $inc (@INC) { ++ if ($inc =~ m[^/packages/perl-$Config{version}-\d+/.self/]o) { ++ if (! $removedPerlPaths) { ++ push @newINC, @ourINC; ++ $removedPerlPaths = 1; ++ } ++ next; ++ } ++ push @newINC, $inc; ++} ++@INC = @newINC; +-- +1.8.3.4 + + +From f33151a4535dd22acaae24d4b16da3115b6cef64 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Wed, 9 Oct 2013 20:29:38 +0200 +Subject: Fix initialization check for CPAN. + +* On Haiku, only the site-lib directories will ever be writable, + as the others read-only. This avoids CPAN asking for a way to + circumvent unwritable lib dirs. + +diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm +index b099b04..55bf194 100644 +--- a/cpan/CPAN/lib/CPAN/FirstTime.pm ++++ b/cpan/CPAN/lib/CPAN/FirstTime.pm +@@ -2010,6 +2010,12 @@ sub _print_urllist { + } + + sub _can_write_to_libdirs { ++ if ($^O eq 'haiku') { ++ # on Haiku, the other dirs are never writable, as they are ++ # being populated by packagefs ++ return -w $Config{installsitelib} ++ && -w $Config{installsitearch} ++ } + return -w $Config{installprivlib} + && -w $Config{installarchlib} + && -w $Config{installsitelib} +-- +1.8.3.4 + + +From 6fbbb6e99558e992f373cddd6ae02a3656ad7ce0 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 13 Oct 2013 17:32:50 +0200 +Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES. + +* Adjust MakeMaker to automatically switch to vendor directories if + requested via HAIKU_USE_VENDOR_DIRECTORIES. + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +index 25ace13..0be8c3d 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -29,21 +29,20 @@ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); + our $VERSION = '6.66'; + + +-=item os_flavor +- +-Haiku is Haiku. +- +-=cut +- + sub os_flavor { + return('Haiku'); + } + +-=head3 init_INSTALL_from_PREFIX ++sub init_main { ++ my $self = shift; + +- $mm->init_INSTALL_from_PREFIX; ++ # switch to vendor directories if requested. ++ if ($ENV{'HAIKU_USE_VENDOR_DIRECTORIES'} eq '1') { ++ $self->{INSTALLDIRS} ||= 'vendor'; ++ } + +-=cut ++ $self->SUPER::init_main(); ++} + + sub init_INSTALL_from_PREFIX { + my $self = shift; +@@ -63,20 +62,6 @@ sub init_INSTALL_from_PREFIX { + } + } + +-=back +- +-=head3 init_others +- +- $MM->init_others(); +- +-Initializes the macro definitions having to do with compiling and +-linking used by tools_other() and places them in the $MM object. +- +-If there is no description, its the same as the parameter to +-WriteMakefile() documented in ExtUtils::MakeMaker. +- +-=cut +- + sub init_others { + my $self = shift; + +@@ -90,8 +75,6 @@ sub init_others { + return; + } + +-=back +- + 1; + __END__ + +-- +1.8.3.4 + diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep deleted file mode 100644 index 29159a1ac..000000000 --- a/dev-lang/perl/perl-5.10.1.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Larry Wall's Practical Extraction and Report Language" -HOMEPAGE="http://www.perl.org/" -SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" -BUILD { - cd perl-5.10.1 - ./Configure -Dcf_email=zooey@hirschkaefer.de -Uusenm -de - make -} - -INSTALL { - cd perl-5.10.1 - make install - cd "${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`" - chmod a+x perl psed pstruct perlthanks - cd "${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`" - ln -sf perl5/5.10.1/BePC-haiku/CORE/libperl.so . -} -LICENSE="GNU GPL v1 - Artistic (Perl)" -COPYRIGHT="1993-2009 Larry Wall and others" diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe new file mode 100644 index 000000000..586b5b5af --- /dev/null +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -0,0 +1,128 @@ +SUMMARY="Larry Wall's Practical Extraction and Report Language" +DESCRIPTION=" + Perl was originally developed by Larry Wall in 1987 as a general-purpose + Unix scripting language to make report processing easier. + + Perl borrows features from other programming languages including C, shell + scripting (sh), AWK, and sed. The language provides powerful text + processing facilities without the arbitrary data-length limits of many + contemporary Unix tools, facilitating easy manipulation of text files. + + In addition to CGI, Perl is used for graphics programming, system + administration, network programming, finance, bioinformatics, and other + applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting + languages' because of its flexibility and power, and possibly also + because of its perceived 'ugliness'. + " +HOMEPAGE="http://www.perl.org/" +COPYRIGHT="1993-2009 Larry Wall and others" +LICENSE="GNU GPL v1 + Artistic (Perl)" +SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" +CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="perl-5.10.1.patch" + +PROVIDES=" + perl = $portVersion compat >= 5 + cmd:a2p = $portVersion compat >= 5 + cmd:c2ph = $portVersion compat >= 5 + cmd:config_data = $portVersion compat >= 5 + cmd:corelist = $portVersion compat >= 5 + cmd:cpan = $portVersion compat >= 5 + cmd:cpan2dist = $portVersion compat >= 5 + cmd:cpanp = $portVersion compat >= 5 + cmd:cpanp_run_perl = $portVersion compat >= 5 + cmd:dprofpp = $portVersion compat >= 5 + cmd:enc2xs = $portVersion compat >= 5 + cmd:find2perl = $portVersion compat >= 5 + cmd:h2ph = $portVersion compat >= 5 + cmd:h2xs = $portVersion compat >= 5 + cmd:instmodsh = $portVersion compat >= 5 + cmd:libnetcfg = $portVersion compat >= 5 + cmd:perl = $portVersion compat >= 5 + cmd:perl5.10.1 = $portVersion compat >= 5 + cmd:perlbug = $portVersion compat >= 5 + cmd:perldoc = $portVersion compat >= 5 + cmd:perlivp = $portVersion compat >= 5 + cmd:perlthanks = $portVersion compat >= 5 + cmd:piconv = $portVersion compat >= 5 + cmd:pl2pm = $portVersion compat >= 5 + cmd:pod2html = $portVersion compat >= 5 + cmd:pod2latex = $portVersion compat >= 5 + cmd:pod2man = $portVersion compat >= 5 + cmd:pod2text = $portVersion compat >= 5 + cmd:pod2usage = $portVersion compat >= 5 + cmd:podchecker = $portVersion compat >= 5 + cmd:podselect = $portVersion compat >= 5 + cmd:prove = $portVersion compat >= 5 + cmd:psed = $portVersion compat >= 5 + cmd:pstruct = $portVersion compat >= 5 + cmd:ptar = $portVersion compat >= 5 + cmd:ptardiff = $portVersion compat >= 5 + cmd:s2p = $portVersion compat >= 5 + cmd:shasum = $portVersion compat >= 5 + cmd:splain = $portVersion compat >= 5 + cmd:xsubpp = $portVersion compat >= 5 + lib:libperl = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/perl5/site_perl/5.10.1/BePC-haiku directory + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +BUILD() +{ + ./Configure \ + -Dprefix=$prefix \ + -Dprivlib=$prefix/lib/perl5/core_perl/$portVersion \ + -Dsiteprefix=$prefix/non-packaged \ + -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$portVersion \ + -Dvendorprefix=$prefix \ + -Dvendorlib=$prefix/lib/perl5/vendor_perl/$portVersion \ + -Dcf_email=zooey@hirschkaefer.de \ + -Uusenm -Duseshrplib -Uusemymalloc \ + -Dlibpth="$(finddir B_USER_LIB_DIRECTORY) $(finddir B_COMMON_LIB_DIRECTORY) $(finddir B_SYSTEM_LIB_DIRECTORY)" \ + -Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \ + -Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/develop/headers $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \ + -Dlibc="$(finddir B_SYSTEM_LIB_DIRECTORY)/libroot.so" \ + -Dlibs=-lnetwork -Dcc=gcc -Dld=gcc \ + -Ud_link -Ddont_use_nlink -Ud_syserrlst \ + -Dldlibpthname=LIBRARY_PATH -Dstartperl="#! perl" -de + + # force-remove path from sed + sed -i -e 's/LOC_SED\s*"\/boot\/common\/bin\/sed/LOC_SED "sed/' config.h + + make $jobArgs +} + +INSTALL() +{ + eval $(./miniperl "-I$relativeLibDir" -V:archname) + make install + cd "$binDir" + chmod a+x perl psed pstruct perlthanks + cd "$libDir" + ln -sf perl5/core_perl/5.10.1/$archname/CORE/libperl.so . + + # The "site-perl" stuff is automatically created, when necessary, so we can + # as well remove it. + rm -r $prefix/non-packaged +} diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe new file mode 100644 index 000000000..fbdf7710c --- /dev/null +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -0,0 +1,143 @@ +SUMMARY="Larry Wall's Practical Extraction and Report Language" +DESCRIPTION=" + Perl was originally developed by Larry Wall in 1987 as a general-purpose + Unix scripting language to make report processing easier. + + Perl borrows features from other programming languages including C, shell + scripting (sh), AWK, and sed. The language provides powerful text + processing facilities without the arbitrary data-length limits of many + contemporary Unix tools, facilitating easy manipulation of text files. + + In addition to CGI, Perl is used for graphics programming, system + administration, network programming, finance, bioinformatics, and other + applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting + languages' because of its flexibility and power, and possibly also + because of its perceived 'ugliness'. + " +HOMEPAGE="http://www.perl.org/" +COPYRIGHT="1993-2009 Larry Wall and others" +LICENSE="GNU GPL v1 + Artistic (Perl)" +SRC_URI="http://www.cpan.org/src/perl-5.18.1.tar.gz" +CHECKSUM_MD5="304cb5bd18e48c44edd6053337d3386d" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="perl-5.18.1.patchset" + +PROVIDES=" + # assume that any perl commands are backwards compatible to version 5. + perl = $portVersion compat >= 5 + cmd:a2p = $portVersion compat >= 5 + cmd:c2ph = $portVersion compat >= 5 + cmd:config_data = $portVersion compat >= 5 + cmd:corelist = $portVersion compat >= 5 + cmd:cpan = $portVersion compat >= 5 + cmd:cpan2dist = $portVersion compat >= 5 + cmd:cpanp = $portVersion compat >= 5 + cmd:cpanp_run_perl = $portVersion compat >= 5 + cmd:dprofpp = $portVersion compat >= 5 + cmd:enc2xs = $portVersion compat >= 5 + cmd:find2perl = $portVersion compat >= 5 + cmd:h2ph = $portVersion compat >= 5 + cmd:h2xs = $portVersion compat >= 5 + cmd:instmodsh = $portVersion compat >= 5 + cmd:json_pp = $portVersion compat >= 5 + cmd:libnetcfg = $portVersion compat >= 5 + cmd:perl = $portVersion compat >= 5 + cmd:perl$portVersion = $portVersion compat >= 5 + cmd:perlbug = $portVersion compat >= 5 + cmd:perldoc = $portVersion compat >= 5 + cmd:perlivp = $portVersion compat >= 5 + cmd:perlthanks = $portVersion compat >= 5 + cmd:piconv = $portVersion compat >= 5 + cmd:pl2pm = $portVersion compat >= 5 + cmd:pod2html = $portVersion compat >= 5 + cmd:pod2latex = $portVersion compat >= 5 + cmd:pod2man = $portVersion compat >= 5 + cmd:pod2text = $portVersion compat >= 5 + cmd:pod2usage = $portVersion compat >= 5 + cmd:podchecker = $portVersion compat >= 5 + cmd:podselect = $portVersion compat >= 5 + cmd:prove = $portVersion compat >= 5 + cmd:psed = $portVersion compat >= 5 + cmd:pstruct = $portVersion compat >= 5 + cmd:ptar = $portVersion compat >= 5 + cmd:ptardiff = $portVersion compat >= 5 + cmd:ptargrep = $portVersion compat >= 5 + cmd:s2p = $portVersion compat >= 5 + cmd:shasum = $portVersion compat >= 5 + cmd:splain = $portVersion compat >= 5 + cmd:xsubpp = $portVersion compat >= 5 + cmd:zipdetails = $portVersion compat >= 5 + # vendor_perl refers to the path to packaged perl modules, which includes + # the full perl version, so it isn't backwards compatible to anything else. + vendor_perl = $portVersion + # It is unclear which kind of backwards compatibility libperl.so + # implements, so we assume none. + lib:libperl = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +perlArchName="$(uname -m)-haiku" + +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/perl5/site_perl/$portVersion/sitecustomize.pl keep-old + non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +BUILD() +{ + ./Configure \ + -Dprefix=$prefix \ + -Dprivlib=$prefix/lib/perl5/$portVersion \ + -Dsiteprefix=$prefix/non-packaged \ + -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$portVersion \ + -Dvendorprefix=$prefix \ + -Dvendorlib=$prefix/lib/perl5/vendor_perl/$portVersion \ + -Dcf_email=zooey@hirschkaefer.de \ + -Uusenm -Duseshrplib -Uusemymalloc \ + -Dlibpth="$(finddir B_USER_DEVELOP_DIRECTORY)/lib $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib" \ + -Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \ + -Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/develop/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \ + -Dlibc="'$(finddir B_SYSTEM_LIB_DIRECTORY)/libroot.so'" \ + -Dlibs=-lnetwork -Dcc=gcc -Dld=gcc \ + -Ud_link -Ddont_use_nlink -Ud_syserrlst \ + -Dldlibpthname=LIBRARY_PATH -Dstartperl="#! perl" \ + -Dccdlflags="-Wl,-rpath=$libDir/perl5/$portVersion/$perlArchName/CORE" \ + -Dusesitecustomize \ + -de + + # force-remove path from sed + sed -i -e 's/LOC_SED\s*"\/bin\/sed/LOC_SED "sed/' config.h + + make $jobArgs +} + +INSTALL() +{ + make install + chmod a+x $binDir/{perl,psed,pstruct,perlthanks} + + # copy script into site_perl that takes care of massaging @INC into what we need. + cp sitecustomize.pl $prefix/non-packaged/lib/perl5/site_perl/$portVersion/ +} + +TEST() +{ + make test +} diff --git a/dev-lang/php/php-5.3.4.bep b/dev-lang/php/php-5.3.4.recipe similarity index 95% rename from dev-lang/php/php-5.3.4.bep rename to dev-lang/php/php-5.3.4.recipe index f2331a1d4..794224740 100644 --- a/dev-lang/php/php-5.3.4.bep +++ b/dev-lang/php/php-5.3.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2c069d8f690933e3bf6a8741ed818150" REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/libpcre >= 8.00" -BUILD { +BUILD() +{ cd php-5.3.4 cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 autoreconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd php-5.3.4 make install } diff --git a/dev-lang/php/php-5.3.5.bep b/dev-lang/php/php-5.3.5.recipe similarity index 97% rename from dev-lang/php/php-5.3.5.bep rename to dev-lang/php/php-5.3.5.recipe index e3bdf018a..03db2e432 100644 --- a/dev-lang/php/php-5.3.5.bep +++ b/dev-lang/php/php-5.3.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libpcre >= 8.00 " -BUILD { +BUILD() +{ cd php-5.3.5 libtoolize --force --copy --install aclocal @@ -40,12 +41,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd php-5.3.5 make install INSTALL_ROOT=${DESTDIR} } -TEST { +TEST() +{ cd php-5.3.5 make test } diff --git a/dev-lang/python/fix-haiku.sh b/dev-lang/python/fix-haiku.sh deleted file mode 100644 index c13f7ddea..000000000 --- a/dev-lang/python/fix-haiku.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \; diff --git a/dev-lang/python/patches/python-2.5.4.patch b/dev-lang/python/patches/python-2.5.4.patch deleted file mode 100644 index 9bb9f3ae5..000000000 --- a/dev-lang/python/patches/python-2.5.4.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/_ctypes/libffi/configure.ac ./Python-2.5.4/Modules/_ctypes/libffi/configure.ac ---- ./Python-2.5.4.orig/Modules/_ctypes/libffi/configure.ac 2007-09-05 01:47:16.942407680 +0200 -+++ ./Python-2.5.4/Modules/_ctypes/libffi/configure.ac 2010-06-07 16:42:39.216006656 +0200 -@@ -8,16 +8,16 @@ - AC_CANONICAL_SYSTEM - target_alias=${target_alias-$host_alias} - --m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) -+#m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) - m4_define([_AC_ARG_VAR_PRECIOUS],[]) - AC_PROG_CC --m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -+#m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) - - AC_SUBST(CFLAGS) - - AC_CHECK_HEADERS(sys/mman.h) - AC_CHECK_FUNCS(mmap) --AC_FUNC_MMAP_BLACKLIST -+#AC_FUNC_MMAP_BLACKLIST - - TARGETDIR="unknown" - case "$host" in -@@ -34,6 +34,7 @@ - i*86-*-solaris2.1[[0-9]]*) TARGET=X86_64; TARGETDIR=x86;; - i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;; - i*86-*-beos*) TARGET=X86; TARGETDIR=x86;; -+i*86-*-haiku*) TARGET=X86; TARGETDIR=x86;; - i*86-*-freebsd* | i*86-*-kfreebsd*-gnu) TARGET=X86; TARGETDIR=x86;; - i*86-*-netbsdelf* | i*86-*-knetbsd*-gnu) TARGET=X86; TARGETDIR=x86;; - i*86-*-openbsd*) TARGET=X86; TARGETDIR=x86;; -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/resource.c ./Python-2.5.4/Modules/resource.c ---- ./Python-2.5.4.orig/Modules/resource.c 2006-05-29 23:04:52.942407680 +0200 -+++ ./Python-2.5.4/Modules/resource.c 2010-06-03 18:12:58.990380032 +0200 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,6 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(result); -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/socketmodule.h ./Python-2.5.4/Modules/socketmodule.h ---- ./Python-2.5.4.orig/Modules/socketmodule.h 2006-12-03 12:24:00.942407680 +0100 -+++ ./Python-2.5.4/Modules/socketmodule.h 2010-06-03 18:12:58.991952896 +0200 -@@ -41,6 +41,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/spwdmodule.c ./Python-2.5.4/Modules/spwdmodule.c ---- ./Python-2.5.4.orig/Modules/spwdmodule.c 2006-08-02 08:15:10.942407680 +0200 -+++ ./Python-2.5.4/Modules/spwdmodule.c 2010-06-03 18:12:58.994312192 +0200 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/timemodule.c ./Python-2.5.4/Modules/timemodule.c ---- ./Python-2.5.4.orig/Modules/timemodule.c 2007-12-24 21:00:42.942407680 +0100 -+++ ./Python-2.5.4/Modules/timemodule.c 2010-06-03 18:12:59.021757952 +0200 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Tools/scripts/h2py.py ./Python-2.5.4/Tools/scripts/h2py.py ---- ./Python-2.5.4.orig/Tools/scripts/h2py.py 2004-08-09 19:27:55.942407680 +0200 -+++ ./Python-2.5.4/Tools/scripts/h2py.py 2010-06-06 11:00:49.436731904 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/configure.in ./Python-2.5.4/configure.in ---- ./Python-2.5.4.orig/configure.in 2008-12-13 15:13:52.942407680 +0100 -+++ ./Python-2.5.4/configure.in 2010-06-07 16:53:42.874250240 +0200 -@@ -7,6 +7,7 @@ - AC_PREREQ(2.59) - AC_INIT(python, PYTHON_VERSION, http://www.python.org/python-bugs) - AC_CONFIG_SRCDIR([Include/object.h]) -+AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADER(pyconfig.h) - - dnl This is for stuff that absolutely must end up in pyconfig.h. -@@ -627,6 +628,11 @@ - BeOS*) - LDLIBRARY='libpython$(VERSION).so' - ;; -+ Haiku*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} -+ ;; - CYGWIN*) - LDLIBRARY='libpython$(VERSION).dll.a' - DLLLIBRARY='libpython$(VERSION).dll' -@@ -709,7 +715,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1445,6 +1451,10 @@ - BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY" - LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY" - ;; -+ Haiku*) -+ LDFLAGS="-L." # help ld find libpythonX.Y.so in root directory -+ LDSHARED="gcc -shared" -+ ;; - IRIX/5*) LDSHARED="ld -shared";; - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; - SunOS/5*) -@@ -1585,6 +1595,7 @@ - *) CCSHARED="";; - esac;; - atheos*) CCSHARED="-fPIC";; -+ Haiku*) CCSHARED="-fPIC";; - esac - fi - AC_MSG_RESULT($CCSHARED) -@@ -1710,6 +1721,9 @@ - BeOS*) - AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS - ;; -+Haiku*) -+AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # Haiku -+;; - esac - - AC_MSG_CHECKING(for --with-libs) -@@ -2879,7 +2893,7 @@ - AC_SUBST(LIBM) - case $ac_sys_system in - Darwin) ;; --BeOS) ;; -+BeOS|Haiku) ;; - *) LIBM=-lm - esac - AC_MSG_CHECKING(for --with-libm=STRING) -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/setup.py ./Python-2.5.4/setup.py ---- ./Python-2.5.4.orig/setup.py 2008-10-16 20:58:19.942407680 +0200 -+++ ./Python-2.5.4/setup.py 2010-06-03 18:12:59.056885248 +0200 -@@ -338,7 +338,7 @@ - - # Check for MacOS X, which doesn't need libm.a at all - math_libs = ['m'] -- if platform in ['darwin', 'beos', 'mac']: -+ if platform in ['darwin', 'beos', 'haiku1', 'mac']: - math_libs = [] - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -912,7 +912,7 @@ - exts.append( Extension('resource', ['resource.c']) ) - - # Sun yellow pages. Some systems have the functions in libc. -- if platform not in ['cygwin', 'atheos']: -+ if platform not in ['cygwin', 'atheos', 'haiku1']: - if (self.compiler.find_library_file(lib_dirs, 'nsl')): - libs = ['nsl'] - else: diff --git a/dev-lang/python/patches/python-2.6.4.patch b/dev-lang/python/patches/python-2.6.4.patch deleted file mode 100644 index 2fa785ec5..000000000 --- a/dev-lang/python/patches/python-2.6.4.patch +++ /dev/null @@ -1,544 +0,0 @@ -diff -ruN Python-2.6.4/Lib/plat-haiku1/IN.py Python-2.6.4-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.4/Lib/plat-haiku1/IN.py 1969-12-31 17:00:00.000000000 -0700 -+++ Python-2.6.4-haiku/Lib/plat-haiku1/IN.py 2009-10-27 13:31:08.000000000 -0600 -@@ -0,0 +1,327 @@ -+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h -+ -+# Included from socket.h -+ -+# Included from BeBuild.h -+B_BEOS_VERSION_4 = 0x0400 -+B_BEOS_VERSION_4_5 = 0x0450 -+B_BEOS_VERSION_5 = 0x0500 -+B_BEOS_VERSION = B_BEOS_VERSION_5 -+B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 -+_PR2_COMPATIBLE_ = 1 -+_PR3_COMPATIBLE_ = 1 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+_PR2_COMPATIBLE_ = 0 -+_PR3_COMPATIBLE_ = 0 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+def _UNUSED(x): return x -+ -+ -+# Included from sys/types.h -+ -+# Included from time.h -+ -+# Included from be_setup.h -+def __std(ref): return ref -+ -+__be_os = 2 -+__dest_os = __be_os -+__MSL__ = 0x4011 -+__GLIBC__ = -2 -+__GLIBC_MINOR__ = 1 -+ -+# Included from null.h -+NULL = (0) -+NULL = 0L -+ -+# Included from size_t.h -+ -+# Included from stddef.h -+ -+# Included from wchar_t.h -+CLOCKS_PER_SEC = 1000 -+CLK_TCK = CLOCKS_PER_SEC -+MAX_TIMESTR = 70 -+ -+# Included from sys/time.h -+ -+# Included from ByteOrder.h -+ -+# Included from endian.h -+__LITTLE_ENDIAN = 1234 -+LITTLE_ENDIAN = __LITTLE_ENDIAN -+__BYTE_ORDER = __LITTLE_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__BIG_ENDIAN = 0 -+BIG_ENDIAN = 0 -+__BIG_ENDIAN = 4321 -+BIG_ENDIAN = __BIG_ENDIAN -+__BYTE_ORDER = __BIG_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__LITTLE_ENDIAN = 0 -+LITTLE_ENDIAN = 0 -+__PDP_ENDIAN = 3412 -+PDP_ENDIAN = __PDP_ENDIAN -+ -+# Included from SupportDefs.h -+ -+# Included from Errors.h -+ -+# Included from limits.h -+ -+# Included from float.h -+FLT_ROUNDS = 1 -+FLT_RADIX = 2 -+FLT_MANT_DIG = 24 -+FLT_DIG = 6 -+FLT_MIN_EXP = (-125) -+FLT_MIN_10_EXP = (-37) -+FLT_MAX_EXP = 128 -+FLT_MAX_10_EXP = 38 -+DBL_MANT_DIG = 53 -+DBL_DIG = 15 -+DBL_MIN_EXP = (-1021) -+DBL_MIN_10_EXP = (-308) -+DBL_MAX_EXP = 1024 -+DBL_MAX_10_EXP = 308 -+LDBL_MANT_DIG = DBL_MANT_DIG -+LDBL_DIG = DBL_DIG -+LDBL_MIN_EXP = DBL_MIN_EXP -+LDBL_MIN_10_EXP = DBL_MIN_10_EXP -+LDBL_MAX_EXP = DBL_MAX_EXP -+LDBL_MAX_10_EXP = DBL_MAX_10_EXP -+CHAR_BIT = (8) -+SCHAR_MIN = (-127-1) -+SCHAR_MAX = (127) -+CHAR_MIN = SCHAR_MIN -+CHAR_MAX = SCHAR_MAX -+MB_LEN_MAX = (1) -+SHRT_MIN = (-32767-1) -+SHRT_MAX = (32767) -+LONG_MIN = (-2147483647L-1) -+LONG_MAX = (2147483647L) -+INT_MIN = LONG_MIN -+INT_MAX = LONG_MAX -+ARG_MAX = (32768) -+ATEXIT_MAX = (32) -+CHILD_MAX = (1024) -+IOV_MAX = (256) -+FILESIZEBITS = (64) -+LINK_MAX = (1) -+LOGIN_NAME_MAX = (32) -+MAX_CANON = (255) -+MAX_INPUT = (255) -+NAME_MAX = (256) -+NGROUPS_MAX = (32) -+OPEN_MAX = (128) -+PATH_MAX = (1024) -+PIPE_MAX = (512) -+SSIZE_MAX = (2147483647L) -+TTY_NAME_MAX = (256) -+TZNAME_MAX = (32) -+SYMLINKS_MAX = (16) -+_POSIX_ARG_MAX = (32768) -+_POSIX_CHILD_MAX = (1024) -+_POSIX_LINK_MAX = (1) -+_POSIX_LOGIN_NAME_MAX = (9) -+_POSIX_MAX_CANON = (255) -+_POSIX_MAX_INPUT = (255) -+_POSIX_NAME_MAX = (255) -+_POSIX_NGROUPS_MAX = (0) -+_POSIX_OPEN_MAX = (128) -+_POSIX_PATH_MAX = (1024) -+_POSIX_PIPE_BUF = (512) -+_POSIX_SSIZE_MAX = (2147483647L) -+_POSIX_STREAM_MAX = (8) -+_POSIX_TTY_NAME_MAX = (256) -+_POSIX_TZNAME_MAX = (3) -+B_GENERAL_ERROR_BASE = LONG_MIN -+B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 -+B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 -+B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 -+B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 -+B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 -+B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 -+B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 -+B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 -+B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 -+B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 -+B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 -+B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) -+E2BIG = (B_POSIX_ERROR_BASE + 1) -+ECHILD = (B_POSIX_ERROR_BASE + 2) -+EDEADLK = (B_POSIX_ERROR_BASE + 3) -+EFBIG = (B_POSIX_ERROR_BASE + 4) -+EMLINK = (B_POSIX_ERROR_BASE + 5) -+ENFILE = (B_POSIX_ERROR_BASE + 6) -+ENODEV = (B_POSIX_ERROR_BASE + 7) -+ENOLCK = (B_POSIX_ERROR_BASE + 8) -+ENOSYS = (B_POSIX_ERROR_BASE + 9) -+ENOTTY = (B_POSIX_ERROR_BASE + 10) -+ENXIO = (B_POSIX_ERROR_BASE + 11) -+ESPIPE = (B_POSIX_ERROR_BASE + 12) -+ESRCH = (B_POSIX_ERROR_BASE + 13) -+EFPOS = (B_POSIX_ERROR_BASE + 14) -+ESIGPARM = (B_POSIX_ERROR_BASE + 15) -+EDOM = (B_POSIX_ERROR_BASE + 16) -+ERANGE = (B_POSIX_ERROR_BASE + 17) -+EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) -+EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) -+EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) -+EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) -+EADDRINUSE = (B_POSIX_ERROR_BASE + 22) -+EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) -+ENETDOWN = (B_POSIX_ERROR_BASE + 24) -+ENETUNREACH = (B_POSIX_ERROR_BASE + 25) -+ENETRESET = (B_POSIX_ERROR_BASE + 26) -+ECONNABORTED = (B_POSIX_ERROR_BASE + 27) -+ECONNRESET = (B_POSIX_ERROR_BASE + 28) -+EISCONN = (B_POSIX_ERROR_BASE + 29) -+ENOTCONN = (B_POSIX_ERROR_BASE + 30) -+ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) -+ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) -+EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) -+ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) -+ENOBUFS = (B_POSIX_ERROR_BASE + 35) -+EINPROGRESS = (B_POSIX_ERROR_BASE + 36) -+EALREADY = (B_POSIX_ERROR_BASE + 37) -+EILSEQ = (B_POSIX_ERROR_BASE + 38) -+ENOMSG = (B_POSIX_ERROR_BASE + 39) -+ESTALE = (B_POSIX_ERROR_BASE + 40) -+EOVERFLOW = (B_POSIX_ERROR_BASE + 41) -+EMSGSIZE = (B_POSIX_ERROR_BASE + 42) -+EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) -+ENOTSOCK = (B_POSIX_ERROR_BASE + 44) -+false = 0 -+true = 1 -+NULL = (0) -+FALSE = 0 -+TRUE = 1 -+ -+# Included from TypeConstants.h -+B_HOST_IS_LENDIAN = 1 -+B_HOST_IS_BENDIAN = 0 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+B_HOST_IS_LENDIAN = 0 -+B_HOST_IS_BENDIAN = 1 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_SWAP_DOUBLE(arg): return __swap_double(arg) -+ -+def B_SWAP_FLOAT(arg): return __swap_float(arg) -+ -+def B_SWAP_INT64(arg): return __swap_int64(arg) -+ -+def B_SWAP_INT32(arg): return __swap_int32(arg) -+ -+def B_SWAP_INT16(arg): return __swap_int16(arg) -+ -+def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) -+ -+def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) -+ -+def htons(x): return B_HOST_TO_BENDIAN_INT16(x) -+ -+def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) -+ -+AF_INET = 1 -+INADDR_ANY = 0x00000000 -+INADDR_BROADCAST = 0xffffffff -+INADDR_LOOPBACK = 0x7f000001 -+SOL_SOCKET = 1 -+SO_DEBUG = 1 -+SO_REUSEADDR = 2 -+SO_NONBLOCK = 3 -+SO_REUSEPORT = 4 -+MSG_OOB = 0x1 -+SOCK_DGRAM = 1 -+SOCK_STREAM = 2 -+IPPROTO_UDP = 1 -+IPPROTO_TCP = 2 -+IPPROTO_ICMP = 3 -+B_UDP_MAX_SIZE = (65536 - 1024) -+FD_SETSIZE = 256 -+FDSETSIZE = FD_SETSIZE -+NFDBITS = 32 -+def _FDMSKNO(fd): return ((fd) / NFDBITS) -+ -+def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -ruN Python-2.6.4/Lib/plat-haiku1/regen Python-2.6.4-haiku/Lib/plat-haiku1/regen ---- Python-2.6.4/Lib/plat-haiku1/regen 1969-12-31 17:00:00.000000000 -0700 -+++ Python-2.6.4-haiku/Lib/plat-haiku1/regen 2009-10-27 13:31:08.000000000 -0600 -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+H2PY=../../Tools/scripts/h2py.py -+HEADERS=/boot/develop/headers -+ -+set -v -+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -ruN Python-2.6.4/Modules/resource.c Python-2.6.4-haiku/Modules/resource.c ---- Python-2.6.4/Modules/resource.c 2009-05-08 14:59:57.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/resource.c 2009-10-27 13:31:08.000000000 -0600 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,6 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(result); -diff -ruN Python-2.6.4/Modules/socketmodule.c Python-2.6.4-haiku/Modules/socketmodule.c ---- Python-2.6.4/Modules/socketmodule.c 2009-09-19 01:46:24.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/socketmodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -4640,7 +4640,9 @@ - #ifndef __BEOS__ - /* We have incomplete socket support. */ - PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); -+#ifndef __HAIKU__ - PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#endif - #if defined(SOCK_RDM) - PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); - #endif -diff -ruN Python-2.6.4/Modules/socketmodule.h Python-2.6.4-haiku/Modules/socketmodule.h ---- Python-2.6.4/Modules/socketmodule.h 2008-06-14 02:36:07.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/socketmodule.h 2009-10-27 13:31:08.000000000 -0600 -@@ -47,6 +47,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -ruN Python-2.6.4/Modules/spwdmodule.c Python-2.6.4-haiku/Modules/spwdmodule.c ---- Python-2.6.4/Modules/spwdmodule.c 2008-06-08 22:58:54.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/spwdmodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -ruN Python-2.6.4/Modules/timemodule.c Python-2.6.4-haiku/Modules/timemodule.c ---- Python-2.6.4/Modules/timemodule.c 2008-07-05 13:19:50.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/timemodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -ruN Python-2.6.4/Parser/asdl_c.py Python-2.6.4-haiku/Parser/asdl_c.py ---- Python-2.6.4/Parser/asdl_c.py 2008-11-07 01:56:27.000000000 -0700 -+++ Python-2.6.4-haiku/Parser/asdl_c.py 2009-10-27 13:31:08.000000000 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -ruN Python-2.6.4/Tools/scripts/h2py.py Python-2.6.4-haiku/Tools/scripts/h2py.py ---- Python-2.6.4/Tools/scripts/h2py.py 2004-08-09 11:27:55.000000000 -0600 -+++ Python-2.6.4-haiku/Tools/scripts/h2py.py 2009-10-27 13:31:08.000000000 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -ruN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in ---- Python-2.6.4/configure.in 2009-09-29 07:01:59.000000000 -0600 -+++ Python-2.6.4-haiku/configure.in 2009-10-27 13:31:08.000000000 -0600 -@@ -715,7 +715,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -793,7 +793,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1766,7 +1766,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - - #include -diff -up Python-2.6.5/Modules/spwdmodule.c.orig Python-2.6.5/Modules/spwdmodule.c ---- Python-2.6.5/Modules/spwdmodule.c.orig 2008-06-08 22:58:54.041418752 -0600 -+++ Python-2.6.5/Modules/spwdmodule.c 2010-04-26 15:46:55.977534976 -0600 -@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p) - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -up Python-2.6.5/Modules/timemodule.c.orig Python-2.6.5/Modules/timemodule.c ---- Python-2.6.5/Modules/timemodule.c.orig 2008-07-05 13:19:50.026214400 -0600 -+++ Python-2.6.5/Modules/timemodule.c 2010-04-26 15:46:56.001048576 -0600 -@@ -968,11 +968,11 @@ floatsleep(double secs) - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -up Python-2.6.5/Parser/asdl_c.py.orig Python-2.6.5/Parser/asdl_c.py ---- Python-2.6.5/Parser/asdl_c.py.orig 2009-12-12 17:59:01.002621440 -0700 -+++ Python-2.6.5/Parser/asdl_c.py 2010-04-26 15:46:56.004456448 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -up Python-2.6.5/Python/bltinmodule.c.orig Python-2.6.5/Python/bltinmodule.c ---- Python-2.6.5/Python/bltinmodule.c.orig 2010-04-26 15:47:08.138936320 -0600 -+++ Python-2.6.5/Python/bltinmodule.c 2010-04-26 15:47:23.016777216 -0600 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -up Python-2.6.5/Tools/scripts/h2py.py.orig Python-2.6.5/Tools/scripts/h2py.py ---- Python-2.6.5/Tools/scripts/h2py.py.orig 2004-08-09 11:27:55.006815744 -0600 -+++ Python-2.6.5/Tools/scripts/h2py.py 2010-04-26 15:46:56.047710208 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ except KeyError: - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff --git a/dev-lang/python/patches/python-2.6.6.patch b/dev-lang/python/patches/python-2.6.6.patch deleted file mode 100644 index b2b70cafd..000000000 --- a/dev-lang/python/patches/python-2.6.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -diff -urN Python-2.6.6/Lib/plat-haiku1/IN.py Python-2.6.6-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.6/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.6-haiku/Lib/plat-haiku1/IN.py 2010-08-30 04:52:27.223346688 +0000 -@@ -0,0 +1,327 @@ -+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h -+ -+# Included from socket.h -+ -+# Included from BeBuild.h -+B_BEOS_VERSION_4 = 0x0400 -+B_BEOS_VERSION_4_5 = 0x0450 -+B_BEOS_VERSION_5 = 0x0500 -+B_BEOS_VERSION = B_BEOS_VERSION_5 -+B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 -+_PR2_COMPATIBLE_ = 1 -+_PR3_COMPATIBLE_ = 1 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+_PR2_COMPATIBLE_ = 0 -+_PR3_COMPATIBLE_ = 0 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+def _UNUSED(x): return x -+ -+ -+# Included from sys/types.h -+ -+# Included from time.h -+ -+# Included from be_setup.h -+def __std(ref): return ref -+ -+__be_os = 2 -+__dest_os = __be_os -+__MSL__ = 0x4011 -+__GLIBC__ = -2 -+__GLIBC_MINOR__ = 1 -+ -+# Included from null.h -+NULL = (0) -+NULL = 0L -+ -+# Included from size_t.h -+ -+# Included from stddef.h -+ -+# Included from wchar_t.h -+CLOCKS_PER_SEC = 1000 -+CLK_TCK = CLOCKS_PER_SEC -+MAX_TIMESTR = 70 -+ -+# Included from sys/time.h -+ -+# Included from ByteOrder.h -+ -+# Included from endian.h -+__LITTLE_ENDIAN = 1234 -+LITTLE_ENDIAN = __LITTLE_ENDIAN -+__BYTE_ORDER = __LITTLE_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__BIG_ENDIAN = 0 -+BIG_ENDIAN = 0 -+__BIG_ENDIAN = 4321 -+BIG_ENDIAN = __BIG_ENDIAN -+__BYTE_ORDER = __BIG_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__LITTLE_ENDIAN = 0 -+LITTLE_ENDIAN = 0 -+__PDP_ENDIAN = 3412 -+PDP_ENDIAN = __PDP_ENDIAN -+ -+# Included from SupportDefs.h -+ -+# Included from Errors.h -+ -+# Included from limits.h -+ -+# Included from float.h -+FLT_ROUNDS = 1 -+FLT_RADIX = 2 -+FLT_MANT_DIG = 24 -+FLT_DIG = 6 -+FLT_MIN_EXP = (-125) -+FLT_MIN_10_EXP = (-37) -+FLT_MAX_EXP = 128 -+FLT_MAX_10_EXP = 38 -+DBL_MANT_DIG = 53 -+DBL_DIG = 15 -+DBL_MIN_EXP = (-1021) -+DBL_MIN_10_EXP = (-308) -+DBL_MAX_EXP = 1024 -+DBL_MAX_10_EXP = 308 -+LDBL_MANT_DIG = DBL_MANT_DIG -+LDBL_DIG = DBL_DIG -+LDBL_MIN_EXP = DBL_MIN_EXP -+LDBL_MIN_10_EXP = DBL_MIN_10_EXP -+LDBL_MAX_EXP = DBL_MAX_EXP -+LDBL_MAX_10_EXP = DBL_MAX_10_EXP -+CHAR_BIT = (8) -+SCHAR_MIN = (-127-1) -+SCHAR_MAX = (127) -+CHAR_MIN = SCHAR_MIN -+CHAR_MAX = SCHAR_MAX -+MB_LEN_MAX = (1) -+SHRT_MIN = (-32767-1) -+SHRT_MAX = (32767) -+LONG_MIN = (-2147483647L-1) -+LONG_MAX = (2147483647L) -+INT_MIN = LONG_MIN -+INT_MAX = LONG_MAX -+ARG_MAX = (32768) -+ATEXIT_MAX = (32) -+CHILD_MAX = (1024) -+IOV_MAX = (256) -+FILESIZEBITS = (64) -+LINK_MAX = (1) -+LOGIN_NAME_MAX = (32) -+MAX_CANON = (255) -+MAX_INPUT = (255) -+NAME_MAX = (256) -+NGROUPS_MAX = (32) -+OPEN_MAX = (128) -+PATH_MAX = (1024) -+PIPE_MAX = (512) -+SSIZE_MAX = (2147483647L) -+TTY_NAME_MAX = (256) -+TZNAME_MAX = (32) -+SYMLINKS_MAX = (16) -+_POSIX_ARG_MAX = (32768) -+_POSIX_CHILD_MAX = (1024) -+_POSIX_LINK_MAX = (1) -+_POSIX_LOGIN_NAME_MAX = (9) -+_POSIX_MAX_CANON = (255) -+_POSIX_MAX_INPUT = (255) -+_POSIX_NAME_MAX = (255) -+_POSIX_NGROUPS_MAX = (0) -+_POSIX_OPEN_MAX = (128) -+_POSIX_PATH_MAX = (1024) -+_POSIX_PIPE_BUF = (512) -+_POSIX_SSIZE_MAX = (2147483647L) -+_POSIX_STREAM_MAX = (8) -+_POSIX_TTY_NAME_MAX = (256) -+_POSIX_TZNAME_MAX = (3) -+B_GENERAL_ERROR_BASE = LONG_MIN -+B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 -+B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 -+B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 -+B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 -+B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 -+B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 -+B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 -+B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 -+B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 -+B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 -+B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 -+B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) -+E2BIG = (B_POSIX_ERROR_BASE + 1) -+ECHILD = (B_POSIX_ERROR_BASE + 2) -+EDEADLK = (B_POSIX_ERROR_BASE + 3) -+EFBIG = (B_POSIX_ERROR_BASE + 4) -+EMLINK = (B_POSIX_ERROR_BASE + 5) -+ENFILE = (B_POSIX_ERROR_BASE + 6) -+ENODEV = (B_POSIX_ERROR_BASE + 7) -+ENOLCK = (B_POSIX_ERROR_BASE + 8) -+ENOSYS = (B_POSIX_ERROR_BASE + 9) -+ENOTTY = (B_POSIX_ERROR_BASE + 10) -+ENXIO = (B_POSIX_ERROR_BASE + 11) -+ESPIPE = (B_POSIX_ERROR_BASE + 12) -+ESRCH = (B_POSIX_ERROR_BASE + 13) -+EFPOS = (B_POSIX_ERROR_BASE + 14) -+ESIGPARM = (B_POSIX_ERROR_BASE + 15) -+EDOM = (B_POSIX_ERROR_BASE + 16) -+ERANGE = (B_POSIX_ERROR_BASE + 17) -+EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) -+EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) -+EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) -+EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) -+EADDRINUSE = (B_POSIX_ERROR_BASE + 22) -+EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) -+ENETDOWN = (B_POSIX_ERROR_BASE + 24) -+ENETUNREACH = (B_POSIX_ERROR_BASE + 25) -+ENETRESET = (B_POSIX_ERROR_BASE + 26) -+ECONNABORTED = (B_POSIX_ERROR_BASE + 27) -+ECONNRESET = (B_POSIX_ERROR_BASE + 28) -+EISCONN = (B_POSIX_ERROR_BASE + 29) -+ENOTCONN = (B_POSIX_ERROR_BASE + 30) -+ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) -+ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) -+EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) -+ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) -+ENOBUFS = (B_POSIX_ERROR_BASE + 35) -+EINPROGRESS = (B_POSIX_ERROR_BASE + 36) -+EALREADY = (B_POSIX_ERROR_BASE + 37) -+EILSEQ = (B_POSIX_ERROR_BASE + 38) -+ENOMSG = (B_POSIX_ERROR_BASE + 39) -+ESTALE = (B_POSIX_ERROR_BASE + 40) -+EOVERFLOW = (B_POSIX_ERROR_BASE + 41) -+EMSGSIZE = (B_POSIX_ERROR_BASE + 42) -+EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) -+ENOTSOCK = (B_POSIX_ERROR_BASE + 44) -+false = 0 -+true = 1 -+NULL = (0) -+FALSE = 0 -+TRUE = 1 -+ -+# Included from TypeConstants.h -+B_HOST_IS_LENDIAN = 1 -+B_HOST_IS_BENDIAN = 0 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+B_HOST_IS_LENDIAN = 0 -+B_HOST_IS_BENDIAN = 1 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_SWAP_DOUBLE(arg): return __swap_double(arg) -+ -+def B_SWAP_FLOAT(arg): return __swap_float(arg) -+ -+def B_SWAP_INT64(arg): return __swap_int64(arg) -+ -+def B_SWAP_INT32(arg): return __swap_int32(arg) -+ -+def B_SWAP_INT16(arg): return __swap_int16(arg) -+ -+def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) -+ -+def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) -+ -+def htons(x): return B_HOST_TO_BENDIAN_INT16(x) -+ -+def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) -+ -+AF_INET = 1 -+INADDR_ANY = 0x00000000 -+INADDR_BROADCAST = 0xffffffff -+INADDR_LOOPBACK = 0x7f000001 -+SOL_SOCKET = 1 -+SO_DEBUG = 1 -+SO_REUSEADDR = 2 -+SO_NONBLOCK = 3 -+SO_REUSEPORT = 4 -+MSG_OOB = 0x1 -+SOCK_DGRAM = 1 -+SOCK_STREAM = 2 -+IPPROTO_UDP = 1 -+IPPROTO_TCP = 2 -+IPPROTO_ICMP = 3 -+B_UDP_MAX_SIZE = (65536 - 1024) -+FD_SETSIZE = 256 -+FDSETSIZE = FD_SETSIZE -+NFDBITS = 32 -+def _FDMSKNO(fd): return ((fd) / NFDBITS) -+ -+def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -urN Python-2.6.6/Lib/plat-haiku1/regen Python-2.6.6-haiku/Lib/plat-haiku1/regen ---- Python-2.6.6/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.6-haiku/Lib/plat-haiku1/regen 2010-08-30 04:52:27.237502464 +0000 -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+H2PY=../../Tools/scripts/h2py.py -+HEADERS=/boot/develop/headers -+ -+set -v -+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -urN Python-2.6.6/Modules/resource.c Python-2.6.6-haiku/Modules/resource.c ---- Python-2.6.6/Modules/resource.c 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.6-haiku/Modules/resource.c 2010-08-30 04:52:24.666370048 +0000 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,7 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -- -+#endif - if (PyErr_Occurred()) { - Py_DECREF(result); - return NULL; -diff -urN Python-2.6.6/Modules/socketmodule.c Python-2.6.6-haiku/Modules/socketmodule.c ---- Python-2.6.6/Modules/socketmodule.c 2010-05-23 15:22:08.054525952 +0000 -+++ Python-2.6.6-haiku/Modules/socketmodule.c 2010-08-30 04:53:35.429916160 +0000 -@@ -4661,7 +4661,9 @@ - #ifndef __BEOS__ - /* We have incomplete socket support. */ - PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); -- PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#ifndef __HAIKU__ -+ PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#endif - #if defined(SOCK_RDM) - PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); - #endif -diff -urN Python-2.6.6/Modules/socketmodule.h Python-2.6.6-haiku/Modules/socketmodule.h ---- Python-2.6.6/Modules/socketmodule.h 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.6-haiku/Modules/socketmodule.h 2010-08-30 04:52:24.667942912 +0000 -@@ -47,6 +47,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -urN Python-2.6.6/Modules/spwdmodule.c Python-2.6.6-haiku/Modules/spwdmodule.c ---- Python-2.6.6/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 -+++ Python-2.6.6-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -urN Python-2.6.6/Modules/timemodule.c Python-2.6.6-haiku/Modules/timemodule.c ---- Python-2.6.6/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 -+++ Python-2.6.6-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -urN Python-2.6.6/Parser/asdl_c.py Python-2.6.6-haiku/Parser/asdl_c.py ---- Python-2.6.6/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 -+++ Python-2.6.6-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -urN Python-2.6.6/Python/bltinmodule.c Python-2.6.6-haiku/Python/bltinmodule.c ---- Python-2.6.6/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 -+++ Python-2.6.6-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN Python-2.6.6/Tools/scripts/h2py.py Python-2.6.6-haiku/Tools/scripts/h2py.py ---- Python-2.6.6/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 -+++ Python-2.6.6-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -urN Python-2.6.6/configure.in Python-2.6.6-haiku/configure.in ---- Python-2.6.6/configure.in 2010-05-25 02:27:03.064225280 +0000 -+++ Python-2.6.6-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -823,7 +823,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1829,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - +Date: Sat, 12 Oct 2013 17:37:25 +0200 +Subject: applying patch python-2.6.8.patch + + +diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +index aeb6b74..2edcc48 100644 +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -234,9 +234,13 @@ class build_ext (Command): + + # for extensions under Linux or Solaris with a shared Python library, + # Python's library directory must be appended to library_dirs ++ # For Haiku the situation is similar, though more correctly the ++ # develop/lib path should be used. Due to the naming scheme used for the ++ # python library it works nonetheless. + sysconfig.get_config_var('Py_ENABLE_SHARED') + if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu') +- or sys.platform.startswith('sunos')) ++ or sys.platform.startswith('sunos') ++ or sys.platform.startswith('haiku')) + and sysconfig.get_config_var('Py_ENABLE_SHARED')): + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): + # building third party extensions +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 46d23ec..5354cf1 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -85,7 +85,8 @@ def get_python_inc(plat_specific=0, prefix=None): + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ inc_dir = "include" if sys.platform != "haiku1" else "develop/headers" ++ return os.path.join(prefix, inc_dir, "python" + get_python_version()) + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "mac": +diff --git a/Lib/plat-haiku1/IN.py b/Lib/plat-haiku1/IN.py +new file mode 100644 +index 0000000..362cb41 +--- /dev/null ++++ b/Lib/plat-haiku1/IN.py +@@ -0,0 +1,327 @@ ++# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h ++ ++# Included from socket.h ++ ++# Included from BeBuild.h ++B_BEOS_VERSION_4 = 0x0400 ++B_BEOS_VERSION_4_5 = 0x0450 ++B_BEOS_VERSION_5 = 0x0500 ++B_BEOS_VERSION = B_BEOS_VERSION_5 ++B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 ++_PR2_COMPATIBLE_ = 1 ++_PR3_COMPATIBLE_ = 1 ++_R4_COMPATIBLE_ = 1 ++_R4_5_COMPATIBLE_ = 1 ++_PR2_COMPATIBLE_ = 0 ++_PR3_COMPATIBLE_ = 0 ++_R4_COMPATIBLE_ = 1 ++_R4_5_COMPATIBLE_ = 1 ++def _UNUSED(x): return x ++ ++ ++# Included from sys/types.h ++ ++# Included from time.h ++ ++# Included from be_setup.h ++def __std(ref): return ref ++ ++__be_os = 2 ++__dest_os = __be_os ++__MSL__ = 0x4011 ++__GLIBC__ = -2 ++__GLIBC_MINOR__ = 1 ++ ++# Included from null.h ++NULL = (0) ++NULL = 0L ++ ++# Included from size_t.h ++ ++# Included from stddef.h ++ ++# Included from wchar_t.h ++CLOCKS_PER_SEC = 1000 ++CLK_TCK = CLOCKS_PER_SEC ++MAX_TIMESTR = 70 ++ ++# Included from sys/time.h ++ ++# Included from ByteOrder.h ++ ++# Included from endian.h ++__LITTLE_ENDIAN = 1234 ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++__BYTE_ORDER = __LITTLE_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++__BIG_ENDIAN = 0 ++BIG_ENDIAN = 0 ++__BIG_ENDIAN = 4321 ++BIG_ENDIAN = __BIG_ENDIAN ++__BYTE_ORDER = __BIG_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++__LITTLE_ENDIAN = 0 ++LITTLE_ENDIAN = 0 ++__PDP_ENDIAN = 3412 ++PDP_ENDIAN = __PDP_ENDIAN ++ ++# Included from SupportDefs.h ++ ++# Included from Errors.h ++ ++# Included from limits.h ++ ++# Included from float.h ++FLT_ROUNDS = 1 ++FLT_RADIX = 2 ++FLT_MANT_DIG = 24 ++FLT_DIG = 6 ++FLT_MIN_EXP = (-125) ++FLT_MIN_10_EXP = (-37) ++FLT_MAX_EXP = 128 ++FLT_MAX_10_EXP = 38 ++DBL_MANT_DIG = 53 ++DBL_DIG = 15 ++DBL_MIN_EXP = (-1021) ++DBL_MIN_10_EXP = (-308) ++DBL_MAX_EXP = 1024 ++DBL_MAX_10_EXP = 308 ++LDBL_MANT_DIG = DBL_MANT_DIG ++LDBL_DIG = DBL_DIG ++LDBL_MIN_EXP = DBL_MIN_EXP ++LDBL_MIN_10_EXP = DBL_MIN_10_EXP ++LDBL_MAX_EXP = DBL_MAX_EXP ++LDBL_MAX_10_EXP = DBL_MAX_10_EXP ++CHAR_BIT = (8) ++SCHAR_MIN = (-127-1) ++SCHAR_MAX = (127) ++CHAR_MIN = SCHAR_MIN ++CHAR_MAX = SCHAR_MAX ++MB_LEN_MAX = (1) ++SHRT_MIN = (-32767-1) ++SHRT_MAX = (32767) ++LONG_MIN = (-2147483647L-1) ++LONG_MAX = (2147483647L) ++INT_MIN = LONG_MIN ++INT_MAX = LONG_MAX ++ARG_MAX = (32768) ++ATEXIT_MAX = (32) ++CHILD_MAX = (1024) ++IOV_MAX = (256) ++FILESIZEBITS = (64) ++LINK_MAX = (1) ++LOGIN_NAME_MAX = (32) ++MAX_CANON = (255) ++MAX_INPUT = (255) ++NAME_MAX = (256) ++NGROUPS_MAX = (32) ++OPEN_MAX = (128) ++PATH_MAX = (1024) ++PIPE_MAX = (512) ++SSIZE_MAX = (2147483647L) ++TTY_NAME_MAX = (256) ++TZNAME_MAX = (32) ++SYMLINKS_MAX = (16) ++_POSIX_ARG_MAX = (32768) ++_POSIX_CHILD_MAX = (1024) ++_POSIX_LINK_MAX = (1) ++_POSIX_LOGIN_NAME_MAX = (9) ++_POSIX_MAX_CANON = (255) ++_POSIX_MAX_INPUT = (255) ++_POSIX_NAME_MAX = (255) ++_POSIX_NGROUPS_MAX = (0) ++_POSIX_OPEN_MAX = (128) ++_POSIX_PATH_MAX = (1024) ++_POSIX_PIPE_BUF = (512) ++_POSIX_SSIZE_MAX = (2147483647L) ++_POSIX_STREAM_MAX = (8) ++_POSIX_TTY_NAME_MAX = (256) ++_POSIX_TZNAME_MAX = (3) ++B_GENERAL_ERROR_BASE = LONG_MIN ++B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 ++B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 ++B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 ++B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 ++B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 ++B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 ++B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 ++B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 ++B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 ++B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 ++B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 ++B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) ++E2BIG = (B_POSIX_ERROR_BASE + 1) ++ECHILD = (B_POSIX_ERROR_BASE + 2) ++EDEADLK = (B_POSIX_ERROR_BASE + 3) ++EFBIG = (B_POSIX_ERROR_BASE + 4) ++EMLINK = (B_POSIX_ERROR_BASE + 5) ++ENFILE = (B_POSIX_ERROR_BASE + 6) ++ENODEV = (B_POSIX_ERROR_BASE + 7) ++ENOLCK = (B_POSIX_ERROR_BASE + 8) ++ENOSYS = (B_POSIX_ERROR_BASE + 9) ++ENOTTY = (B_POSIX_ERROR_BASE + 10) ++ENXIO = (B_POSIX_ERROR_BASE + 11) ++ESPIPE = (B_POSIX_ERROR_BASE + 12) ++ESRCH = (B_POSIX_ERROR_BASE + 13) ++EFPOS = (B_POSIX_ERROR_BASE + 14) ++ESIGPARM = (B_POSIX_ERROR_BASE + 15) ++EDOM = (B_POSIX_ERROR_BASE + 16) ++ERANGE = (B_POSIX_ERROR_BASE + 17) ++EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) ++EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) ++EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) ++EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) ++EADDRINUSE = (B_POSIX_ERROR_BASE + 22) ++EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) ++ENETDOWN = (B_POSIX_ERROR_BASE + 24) ++ENETUNREACH = (B_POSIX_ERROR_BASE + 25) ++ENETRESET = (B_POSIX_ERROR_BASE + 26) ++ECONNABORTED = (B_POSIX_ERROR_BASE + 27) ++ECONNRESET = (B_POSIX_ERROR_BASE + 28) ++EISCONN = (B_POSIX_ERROR_BASE + 29) ++ENOTCONN = (B_POSIX_ERROR_BASE + 30) ++ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) ++ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) ++EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) ++ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) ++ENOBUFS = (B_POSIX_ERROR_BASE + 35) ++EINPROGRESS = (B_POSIX_ERROR_BASE + 36) ++EALREADY = (B_POSIX_ERROR_BASE + 37) ++EILSEQ = (B_POSIX_ERROR_BASE + 38) ++ENOMSG = (B_POSIX_ERROR_BASE + 39) ++ESTALE = (B_POSIX_ERROR_BASE + 40) ++EOVERFLOW = (B_POSIX_ERROR_BASE + 41) ++EMSGSIZE = (B_POSIX_ERROR_BASE + 42) ++EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) ++ENOTSOCK = (B_POSIX_ERROR_BASE + 44) ++false = 0 ++true = 1 ++NULL = (0) ++FALSE = 0 ++TRUE = 1 ++ ++# Included from TypeConstants.h ++B_HOST_IS_LENDIAN = 1 ++B_HOST_IS_BENDIAN = 0 ++def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) ++ ++def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) ++ ++def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) ++ ++def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) ++ ++def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) ++ ++def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) ++ ++def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) ++ ++def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) ++ ++def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) ++ ++def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) ++ ++def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) ++ ++def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) ++ ++def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) ++ ++def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) ++ ++def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) ++ ++def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) ++ ++def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) ++ ++def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) ++ ++def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) ++ ++def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) ++ ++B_HOST_IS_LENDIAN = 0 ++B_HOST_IS_BENDIAN = 1 ++def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) ++ ++def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) ++ ++def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) ++ ++def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) ++ ++def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) ++ ++def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) ++ ++def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) ++ ++def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) ++ ++def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) ++ ++def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) ++ ++def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) ++ ++def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) ++ ++def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) ++ ++def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) ++ ++def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) ++ ++def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) ++ ++def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) ++ ++def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) ++ ++def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) ++ ++def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) ++ ++def B_SWAP_DOUBLE(arg): return __swap_double(arg) ++ ++def B_SWAP_FLOAT(arg): return __swap_float(arg) ++ ++def B_SWAP_INT64(arg): return __swap_int64(arg) ++ ++def B_SWAP_INT32(arg): return __swap_int32(arg) ++ ++def B_SWAP_INT16(arg): return __swap_int16(arg) ++ ++def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) ++ ++def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) ++ ++def htons(x): return B_HOST_TO_BENDIAN_INT16(x) ++ ++def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) ++ ++AF_INET = 1 ++INADDR_ANY = 0x00000000 ++INADDR_BROADCAST = 0xffffffff ++INADDR_LOOPBACK = 0x7f000001 ++SOL_SOCKET = 1 ++SO_DEBUG = 1 ++SO_REUSEADDR = 2 ++SO_NONBLOCK = 3 ++SO_REUSEPORT = 4 ++MSG_OOB = 0x1 ++SOCK_DGRAM = 1 ++SOCK_STREAM = 2 ++IPPROTO_UDP = 1 ++IPPROTO_TCP = 2 ++IPPROTO_ICMP = 3 ++B_UDP_MAX_SIZE = (65536 - 1024) ++FD_SETSIZE = 256 ++FDSETSIZE = FD_SETSIZE ++NFDBITS = 32 ++def _FDMSKNO(fd): return ((fd) / NFDBITS) ++ ++def _FDBITNO(fd): return ((fd) % NFDBITS) +diff --git a/Lib/plat-haiku1/regen b/Lib/plat-haiku1/regen +new file mode 100644 +index 0000000..d9da80c +--- /dev/null ++++ b/Lib/plat-haiku1/regen +@@ -0,0 +1,7 @@ ++#! /bin/sh ++ ++H2PY=../../Tools/scripts/h2py.py ++HEADERS=/boot/develop/headers ++ ++set -v ++python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h +diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py +index 7eeef7b..b1938fd 100644 +--- a/Lib/test/test_fileio.py ++++ b/Lib/test/test_fileio.py +@@ -152,6 +152,7 @@ class OtherFileTests(unittest.TestCase): + self.assertEquals(f.writable(), True) + if sys.platform != "darwin" and \ + 'bsd' not in sys.platform and \ ++ 'haiku' not in sys.platform and \ + not sys.platform.startswith('sunos'): + # Somehow /dev/tty appears seekable on some BSDs + self.assertEquals(f.seekable(), False) +diff --git a/Makefile.pre.in b/Makefile.pre.in +index ce4fbdc..aba9464 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -90,7 +90,7 @@ BINDIR= @bindir@ + LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ +-CONFINCLUDEDIR= $(exec_prefix)/include ++CONFINCLUDEDIR= $(INCLUDEDIR) + SCRIPTDIR= $(prefix)/lib + + # Detailed destination directories +diff --git a/Modules/bz2module.c b/Modules/bz2module.c +index cfd8d71..89d9002 100644 +--- a/Modules/bz2module.c ++++ b/Modules/bz2module.c +@@ -9,7 +9,7 @@ Copyright (c) 2002 Python Software Foundation; All Rights Reserved + + #include "Python.h" + #include +-#include ++#include + #include "structmember.h" + + #ifdef WITH_THREAD +diff --git a/Modules/resource.c b/Modules/resource.c +index 9993b93..f8befde 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -86,6 +86,7 @@ resource_getrusage(PyObject *self, PyObject *args) + PyFloat_FromDouble(doubletime(ru.ru_utime))); + PyStructSequence_SET_ITEM(result, 1, + PyFloat_FromDouble(doubletime(ru.ru_stime))); ++#ifndef __HAIKU__ + PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); + PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); + PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); +@@ -100,7 +101,7 @@ resource_getrusage(PyObject *self, PyObject *args) + PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); + PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); + PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); +- ++#endif + if (PyErr_Occurred()) { + Py_DECREF(result); + return NULL; +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +index a28116c..62c5813 100644 +--- a/Modules/socketmodule.c ++++ b/Modules/socketmodule.c +@@ -4661,7 +4661,9 @@ init_socket(void) + #ifndef __BEOS__ + /* We have incomplete socket support. */ + PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); +- PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); ++#ifndef __HAIKU__ ++ PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); ++#endif + #if defined(SOCK_RDM) + PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); + #endif +diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h +index 9b85773..8e35a64 100644 +--- a/Modules/socketmodule.h ++++ b/Modules/socketmodule.h +@@ -47,6 +47,10 @@ typedef int socklen_t; + # undef AF_NETLINK + #endif + ++#if defined(__HAIKU__) ++#undef HAVE_BLUETOOTH_BLUETOOTH_H ++#endif ++ + #ifdef HAVE_BLUETOOTH_BLUETOOTH_H + #include + #include +diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c +index 957de58..69be5bb 100644 +--- a/Modules/spwdmodule.c ++++ b/Modules/spwdmodule.c +@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p) + + SETS(setIndex++, p->sp_namp); + SETS(setIndex++, p->sp_pwdp); ++#ifndef __HAIKU__ + SETI(setIndex++, p->sp_lstchg); ++#endif + SETI(setIndex++, p->sp_min); + SETI(setIndex++, p->sp_max); + SETI(setIndex++, p->sp_warn); +diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c +index 57d9df8..83c9a2e 100644 +--- a/Python/bltinmodule.c ++++ b/Python/bltinmodule.c +@@ -18,7 +18,7 @@ + */ + #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) + const char *Py_FileSystemDefaultEncoding = "mbcs"; +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__HAIKU__) + const char *Py_FileSystemDefaultEncoding = "utf-8"; + #else + const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ +diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py +index 63e7336..65cd21f 100755 +--- a/Tools/scripts/h2py.py ++++ b/Tools/scripts/h2py.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /bin/env python + + # Read #define's and translate to Python code. + # Handle #include statements. +@@ -50,7 +50,7 @@ except KeyError: + searchdirs=os.environ['INCLUDE'].split(';') + except KeyError: + try: +- if sys.platform.find("beos") == 0: ++ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: + searchdirs=os.environ['BEINCLUDES'].split(';') + elif sys.platform.startswith("atheos"): + searchdirs=os.environ['C_INCLUDE_PATH'].split(':') +diff --git a/configure.in b/configure.in +index f3d34f2..aedd433 100644 +--- a/configure.in ++++ b/configure.in +@@ -745,7 +745,7 @@ if test $enable_shared = "yes"; then + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -753,6 +753,9 @@ if test $enable_shared = "yes"; then + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` + ;; ++ Haiku*) ++ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} ++ ;; + esac + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +@@ -823,7 +826,7 @@ AC_PROG_INSTALL + AC_SUBST(LN) + if test -z "$LN" ; then + case $ac_sys_system in +- BeOS*) LN="ln -s";; ++ BeOS*|Haiku*) LN="ln -s";; + CYGWIN*) LN="ln -s";; + atheos*) LN="ln -s";; + *) LN=ln;; +@@ -1829,7 +1832,7 @@ then + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [[ "`$CC -dM -E - +Date: Sun, 13 Oct 2013 17:01:30 +0200 +Subject: Adjust package folders for Python modules. + +* move standard site-packaged into non-packaged hierarchy, as it has to + be writable +* rename directory for packaged python modules to 'vendor-packages' +* add support for automatically switching to 'vendor-packages' directory + when environment variable 'HAIKU_USE_VENDOR_DIRECTORIES' is set + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index 44c7692..ff8c01e 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -97,6 +97,34 @@ INSTALL_SCHEMES = { + 'scripts': '$userbase/bin', + 'data' : '$userbase', + }, ++ 'haiku': { ++ 'purelib': '$base/non-packaged/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/non-packaged/lib/python$py_version_short/site-packages', ++ 'headers': '$base/non-packaged/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$base/non-packaged/bin', ++ 'data' : '$base/non-packaged', ++ }, ++ 'haiku_vendor': { ++ 'purelib': '$base/lib/python$py_version_short/vendor-packages', ++ 'platlib': '$platbase/lib/python$py_version_short/vendor-packages', ++ 'headers': '$base/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, ++ 'haiku_home': { ++ 'purelib': '$base/lib/python', ++ 'platlib': '$base/lib/python', ++ 'headers': '$base/develop/headers/python/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, ++ 'haiku_user': { ++ 'purelib': '$usersite', ++ 'platlib': '$usersite', ++ 'headers': '$userbase/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$userbase/bin', ++ 'data' : '$userbase', ++ }, + } + + # The keys to an installation scheme; if any new types of files are to be +@@ -430,10 +458,16 @@ class install (Command): + raise DistutilsPlatformError( + "User base directory is not specified") + self.install_base = self.install_platbase = self.install_userbase +- self.select_scheme("unix_user") ++ if sys.platform.startswith('haiku'): ++ self.select_scheme("haiku_user") ++ else: ++ self.select_scheme("unix_user") + elif self.home is not None: + self.install_base = self.install_platbase = self.home +- self.select_scheme("unix_home") ++ if sys.platform.startswith('haiku'): ++ self.select_scheme("haiku_home") ++ else: ++ self.select_scheme("unix_home") + else: + if self.prefix is None: + if self.exec_prefix is not None: +@@ -449,7 +483,13 @@ class install (Command): + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix +- self.select_scheme("unix_prefix") ++ if sys.platform.startswith('haiku'): ++ if os.environ.get('HAIKU_USE_VENDOR_DIRECTORIES') == '1': ++ self.select_scheme("haiku_vendor") ++ else: ++ self.select_scheme("haiku") ++ else: ++ self.select_scheme("unix_prefix") + + # finalize_unix () + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 5354cf1..017a94c 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -120,12 +120,20 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": +- libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) +- if standard_lib: +- return libpython ++ if sys.platform.startswith('haiku'): ++ if standard_lib: ++ return os.path.join(prefix, ++ "lib", "python" + get_python_version()) ++ return os.path.join(prefix, "non-packaged", ++ "lib", "python" + get_python_version(), ++ "site-packages") + else: +- return os.path.join(libpython, "site-packages") ++ libpython = os.path.join(prefix, ++ "lib", "python" + get_python_version()) ++ if standard_lib: ++ return libpython ++ else: ++ return os.path.join(libpython, "site-packages") + + elif os.name == "nt": + if standard_lib: +diff --git a/Lib/site.py b/Lib/site.py +index 66c56c2..304f994 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -241,6 +241,11 @@ def addusersitepackages(known_paths): + USER_SITE = os.path.join(USER_BASE, + "Python" + sys.version[0] + sys.version[2], + "site-packages") ++ elif sys.platform.startswith('haiku'): ++ USER_BASE = env_base if env_base else joinuser("~", "non-packaged") ++ USER_SITE = os.path.join(USER_BASE, "lib", ++ "python" + sys.version[:3], ++ "site-packages") + else: + USER_BASE = env_base if env_base else joinuser("~", ".local") + USER_SITE = os.path.join(USER_BASE, "lib", +@@ -264,6 +269,13 @@ def addsitepackages(known_paths): + + if sys.platform in ('os2emx', 'riscos'): + sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) ++ elif sys.platform.startswith('haiku'): ++ sitedirs.append(os.path.join(prefix, "non-packaged", "lib", ++ "python" + sys.version[:3], ++ "site-packages")) ++ sitedirs.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "vendor-packages")) + elif os.sep == '/': + sitedirs.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +-- +1.8.3.4 + + +From 17c8d2590189838ef19b08fb0ce7976d03b1cabc Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 13 Oct 2013 17:06:48 +0200 +Subject: Drop references to common hierarchy. + + +diff --git a/setup.py b/setup.py +index 930a368..41a16a2 100644 +--- a/setup.py ++++ b/setup.py +@@ -429,13 +429,9 @@ class PyBuildExt(build_ext): + inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + + if platform == 'haiku1': +- inc_dirs += ['/boot/common/non-packaged/develop/headers', +- '/boot/common/develop/headers', +- '/boot/system/develop/headers/posix', ++ inc_dirs += ['/boot/system/develop/headers/posix', + '/boot/system/develop/headers'] +- lib_dirs += ['/boot/common/non-packaged/develop/lib', +- '/boot/common/develop/lib', +- '/boot/system/develop/lib'] ++ lib_dirs += ['/boot/system/develop/lib'] + + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.5.4.bep b/dev-lang/python/python-2.5.4.bep deleted file mode 100644 index 90c98e358..000000000 --- a/dev-lang/python/python-2.5.4.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -LICENSE="Python" -COPYRIGHT="1990-2008, Python Software Foundation" -SRC_URI="http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz" -CHECKSUM_MD5="ad47b23778f64edadaaa8b5534986eed" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd Python-2.5.4/Modules/_ctypes/libffi - libtoolize --force --copy --install - aclocal - autoconf - cd ../../.. - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.5.4 - make install -} diff --git a/dev-lang/python/python-2.6.4.bep b/dev-lang/python/python-2.6.4.bep deleted file mode 100644 index b372618e3..000000000 --- a/dev-lang/python/python-2.6.4.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.4/Python-2.6.4.tgz" -CHECKSUM_MD5="17dcac33e4f3adb69a57c2607b6de246" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd Python-2.6.4/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.6.4 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.5.bep b/dev-lang/python/python-2.6.5.bep deleted file mode 100644 index b1b1afb6d..000000000 --- a/dev-lang/python/python-2.6.5.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.5/Python-2.6.5.tgz" -CHECKSUM_MD5="cd04b5b9383b6c1fccdaa991af762cf4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd Python-2.6.5/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.6.5 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.6.bep b/dev-lang/python/python-2.6.6.bep deleted file mode 100644 index 172740f87..000000000 --- a/dev-lang/python/python-2.6.6.bep +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tar.bz2" -CHECKSUM_MD5="cf4e6881bb84a7ce6089e4a307f71f14" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD { - cd Python-2.6.6/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.6.6 - make install -} - -TEST { - cd Python-2.6.6 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.7.bep b/dev-lang/python/python-2.6.7.bep deleted file mode 100644 index f4bca719a..000000000 --- a/dev-lang/python/python-2.6.7.bep +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tar.bz2" -CHECKSUM_MD5="d40ef58ed88438a870bbeb0ac5d4217b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD { - cd Python-2.6.7/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.6.7 - make install -} - -TEST { - cd Python-2.6.7 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2011, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.8.bep b/dev-lang/python/python-2.6.8.bep deleted file mode 100644 index 8fe22dd32..000000000 --- a/dev-lang/python/python-2.6.8.bep +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" -CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD { - cd Python-2.6.8/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.6.8 - make install -} - -TEST { - cd Python-2.6.8 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2012, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe new file mode 100644 index 000000000..3ed5318e0 --- /dev/null +++ b/dev-lang/python/python-2.6.8.recipe @@ -0,0 +1,112 @@ +SUMMARY="An interpreted, interactive, object-oriented programming language" +DESCRIPTION="Python is a programming language that lets you work more quickly and integrate your systems more effectively. You can learn to use Python and see almost immediate gains in productivity and lower maintenance costs. + +Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java and .NET virtual machines. + +Python is free to use, even for commercial products, because of its OSI-approved open source license." +HOMEPAGE="http://www.python.org" +LICENSE="Python" +COPYRIGHT="1990-2012, Python Software Foundation" +SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" +CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="python-2.6.8.patchset" + +PROVIDES=" + python = $portVersion compat >= 2.6 + cmd:2to3 = $portVersion compat >= 2.6 + cmd:idle = $portVersion compat >= 2.6 + cmd:pydoc = $portVersion compat >= 2.6 + cmd:python = $portVersion compat >= 2.6 + cmd:python2.6 = $portVersion compat >= 2.6 + cmd:python2.6_config = $portVersion compat >= 2.6 + cmd:python_config = $portVersion compat >= 2.6 + cmd:smtpd.py = $portVersion compat >= 2.6 + devel:libpython2.6 = 1.0 + lib:libpython2.6 = 1.0 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:nano + lib:libbz2 + lib:libncurses + lib:libssl + lib:libreadline + lib:libsqlite3 + lib:libz + " +BUILD_REQUIRES=" + devel:libbz2 + devel:libncurses + devel:libssl + devel:libreadline + devel:libsqlite3 + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:find + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:nano + " + +SOURCE_DIR="Python-2.6.8" + +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/python2.6/site-packages directory keep-old + " + +PATCH() +{ + echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in + find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \; +} + +BUILD() +{ + cd Modules/_ctypes/libffi + libtoolize --force --copy --install + cd ../../.. + + libtoolize --force --copy --install + aclocal + autoconf + runConfigure ./configure \ + --enable-shared \ + --enable-unicode=ucs4 + + # prevent make from rebuilding stuff that requires python + touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h + + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libpython2.6 + + mkdir -p $prefix/lib/python2.6/vendor-packages + echo 'This directory contains packaged python modules.' \ + >$prefix/lib/python2.6/vendor-packages/README + + mkdir -p $prefix/non-packaged/lib/python2.6 + mv $prefix/lib/python2.6/site-packages $prefix/non-packaged/lib/python2.6/ +} + +TEST() +{ + cd Lib/test + rm test_asynchat.py # this one stalls, so skip it for now + rm test_multiprocessing.py # this one stalls, so skip it for now + + python regrtest.py +} diff --git a/dev-lang/python/python-2.7.1.bep b/dev-lang/python/python-2.7.1.recipe similarity index 96% rename from dev-lang/python/python-2.7.1.bep rename to dev-lang/python/python-2.7.1.recipe index 264f79473..a9294c883 100644 --- a/dev-lang/python/python-2.7.1.bep +++ b/dev-lang/python/python-2.7.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="aa27bc25725137ba155910bd8e5ddc4f" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-2.7.1/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.7.1 make install } -TEST { +TEST() +{ cd Python-2.7.1 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/python/python-3.2.bep b/dev-lang/python/python-3.2.recipe similarity index 97% rename from dev-lang/python/python-3.2.bep rename to dev-lang/python/python-3.2.recipe index fe7bb3ef1..25d290522 100644 --- a/dev-lang/python/python-3.2.bep +++ b/dev-lang/python/python-3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="92e94b5b6652b96349d6362b8337811d" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-3.2/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -21,12 +22,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-3.2 make install } -TEST { +TEST() +{ cd Python-3.2 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.bep b/dev-lang/rebol/rebol-2.101.0.5.75.recipe similarity index 96% rename from dev-lang/rebol/rebol-2.101.0.5.75.bep rename to dev-lang/rebol/rebol-2.101.0.5.75.recipe index 135c0d76a..5c5046485 100644 --- a/dev-lang/rebol/rebol-2.101.0.5.75.bep +++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd r3-master/make wget http://metaeducation.com/media/shared/haiku/r3-make.zip unzip r3-make.zip @@ -15,13 +16,15 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd r3-master/make mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` install -m 0755 r3 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`/rebol } -TEST { +TEST() +{ mkdir -p tests cd tests wget -N https://github.com/rebolsource/rebol-test/archive/master.zip diff --git a/dev-lang/ruby/ruby-1.9.1.bep b/dev-lang/ruby/ruby-1.9.1.recipe similarity index 96% rename from dev-lang/ruby/ruby-1.9.1.bep rename to dev-lang/ruby/ruby-1.9.1.recipe index c8f874a77..34f62b0c2 100644 --- a/dev-lang/ruby/ruby-1.9.1.bep +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="515bfd965814e718c0943abf3dde5494" REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-libs/libedit >= 20100424" -BUILD { +BUILD() +{ cd ruby-1.9.1-p243 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ruby-1.9.1-p243 make install } diff --git a/dev-lang/swi_prolog/licenses/SWI-Prolog b/dev-lang/swi_prolog/licenses/SWI-Prolog new file mode 100644 index 000000000..1359a2de0 --- /dev/null +++ b/dev-lang/swi_prolog/licenses/SWI-Prolog @@ -0,0 +1,5 @@ +The SWI-Prolog Prolog libraries + +Lacking a satisfactory technical solution to handle article 6 of the LGPL, this license cannot be used for the Prolog source code that is part of the SWI-Prolog system (both libraries and kernel code). This situation is comparable to libgcc, the runtime library used with the GNU C-compiler. Therefore, we use the same proven license terms as this library. The libgcc license is the GPL, accompanied with a special exception. Below we rephrased this exception adjusted to our needs: + +As a special exception, if you link this library with other files, compiled with a Free Software compiler, to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. diff --git a/dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch b/dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch new file mode 100644 index 000000000..9fe4959fd --- /dev/null +++ b/dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch @@ -0,0 +1,68 @@ +diff -Naur pl-6.0.2/src/configure.in pl-6.0.2-haiku/src/configure.in +--- pl-6.0.2/src/configure.in 2012-03-04 13:12:01.001835008 +0000 ++++ pl-6.0.2-haiku/src/configure.in 2012-08-20 21:39:21.649330688 +0100 +@@ -689,6 +689,10 @@ + AC_DEFINE(_THREAD_SAFE, 1, + [Required in FreeBSD for compiling thread-safe code]) + ;; ++ *haiku*) ++ pthread_ok=true ++ CFLAGS="$CFLAGS -lroot" ++ ;; + *-win32|*-win64) + pthread_ok=true + AC_CHECK_LIB(pthreadGC2, pthread_create) +diff -Naur pl-6.0.2/src/os/pl-files.c pl-6.0.2-haiku/src/os/pl-files.c +--- pl-6.0.2/src/os/pl-files.c 2012-03-04 13:12:01.011272192 +0000 ++++ pl-6.0.2-haiku/src/os/pl-files.c 2012-08-23 14:45:48.981204992 +0100 +@@ -239,7 +239,7 @@ + return TRUE; + } + +-#ifdef __unix__ /* doesn't work on most not Unix's */ ++#if defined(__unix__) || defined(__HAIKU__) /* doesn't work on most not Unix's */ + { statstruct buf1; + statstruct buf2; + char tmp[MAXPATHLEN]; +diff -Naur pl-6.0.2/src/os/pl-os.c pl-6.0.2-haiku/src/os/pl-os.c +--- pl-6.0.2/src/os/pl-os.c 2012-03-04 13:12:01.011796480 +0000 ++++ pl-6.0.2-haiku/src/os/pl-os.c 2012-08-23 16:02:11.794034176 +0100 +@@ -590,7 +590,7 @@ + } + + retry: +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + { static int MTOK_temp_counter = 0; + const char *sep = id[0] ? "_" : ""; + +@@ -732,7 +732,7 @@ + } + #endif /* O_HPFS */ + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + char * + PrologPath(const char *p, char *buf, size_t len) + { strncpy(buf, p, len); +@@ -2436,7 +2436,7 @@ + return strcpy(buffer, file ? file : buf); + } + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + static char * + okToExec(const char *s) + { statstruct stbuff; +diff -Naur pl-6.0.2/src/pl-term.c pl-6.0.2-haiku/src/pl-term.c +--- pl-6.0.2/src/pl-term.c 2012-03-04 13:12:01.023592960 +0000 ++++ pl-6.0.2-haiku/src/pl-term.c 2012-08-08 20:03:23.111673344 +0100 +@@ -296,7 +296,7 @@ + term_t r = A1; + term_t c = A2; + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + int iorval; + + #ifdef TIOCGSIZE diff --git a/dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch b/dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch new file mode 100644 index 000000000..24003d3d5 --- /dev/null +++ b/dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch @@ -0,0 +1,67 @@ +diff -Naur pl-6.2.0/src/configure.in pl-6.2.0-haiku/src/configure.in +--- pl-6.2.0/src/configure.in 2012-08-21 13:12:53.016777216 +0100 ++++ pl-6.2.0-haiku/src/configure.in 2012-08-23 17:06:25.987758592 +0100 +@@ -728,6 +728,9 @@ + AC_DEFINE(_THREAD_SAFE, 1, + [Required in FreeBSD for compiling thread-safe code]) + ;; ++ *-haiku*) ++ pthread_ok=true ++ ;; + *-win32|*-win64) + pthread_ok=true + AC_CHECK_LIB(pthreadGC2, pthread_create) +diff -Naur pl-6.2.0/src/os/pl-files.c pl-6.2.0-haiku/src/os/pl-files.c +--- pl-6.2.0/src/os/pl-files.c 2012-08-21 13:12:53.026214400 +0100 ++++ pl-6.2.0-haiku/src/os/pl-files.c 2012-08-23 17:07:04.695992320 +0100 +@@ -302,7 +302,7 @@ + return TRUE; + } + +-#ifdef __unix__ /* doesn't work on most not Unix's */ ++#if defined(__unix__) || defined(__HAIKU__) /* doesn't work on most not Unix's */ + { statstruct buf1; + statstruct buf2; + char tmp[MAXPATHLEN]; +diff -Naur pl-6.2.0/src/os/pl-os.c pl-6.2.0-haiku/src/os/pl-os.c +--- pl-6.2.0/src/os/pl-os.c 2012-08-21 13:12:53.027000832 +0100 ++++ pl-6.2.0-haiku/src/os/pl-os.c 2012-08-23 17:09:14.962330624 +0100 +@@ -601,7 +601,7 @@ + } + + retry: +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + { static int MTOK_temp_counter = 0; + const char *sep = id[0] ? "_" : ""; + +@@ -743,7 +743,7 @@ + } + #endif /* O_HPFS */ + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + char * + PrologPath(const char *p, char *buf, size_t len) + { strncpy(buf, p, len); +@@ -2507,7 +2507,7 @@ + return strcpy(buffer, file ? file : buf); + } + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + static char * + okToExec(const char *s) + { statstruct stbuff; +diff -Naur pl-6.2.0/src/pl-term.c pl-6.2.0-haiku/src/pl-term.c +--- pl-6.2.0/src/pl-term.c 2012-08-21 13:12:53.038535168 +0100 ++++ pl-6.2.0-haiku/src/pl-term.c 2012-08-23 17:09:57.306708480 +0100 +@@ -296,7 +296,7 @@ + term_t r = A1; + term_t c = A2; + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + int iorval; + + #ifdef TIOCGSIZE diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep b/dev-lang/swi_prolog/swi_prolog-6.0.2.recipe similarity index 95% rename from dev-lang/swi-prolog/swi-prolog-6.0.2.bep rename to dev-lang/swi_prolog/swi_prolog-6.0.2.recipe index 5e8b7c7e2..4ab667dac 100644 --- a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep +++ b/dev-lang/swi_prolog/swi_prolog-6.0.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp >= 5.0.5 sys-libs/readline >= 6.2" -BUILD { +BUILD() +{ cd pl-6.0.2/src libtoolize -fci autoreconf @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pl-6.0.2/src make install } -TEST { +TEST() +{ cd pl-6.0.2/src make check } diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe similarity index 95% rename from dev-lang/swi-prolog/swi-prolog-6.2.0.bep rename to dev-lang/swi_prolog/swi_prolog-6.2.0.recipe index af37884a6..d88c003b4 100644 --- a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep +++ b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp >= 5.0.5 sys-libs/readline >= 6.2" -BUILD { +BUILD() +{ cd pl-6.2.0/src libtoolize -fci autoreconf @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pl-6.2.0/src make install } -TEST { +TEST() +{ cd pl-6.2.0/src make check } diff --git a/dev-lang/swig/swig-1.3.40.bep b/dev-lang/swig/swig-1.3.40.recipe similarity index 96% rename from dev-lang/swig/swig-1.3.40.bep rename to dev-lang/swig/swig-1.3.40.recipe index 2239e2fdb..072de4125 100644 --- a/dev-lang/swig/swig-1.3.40.bep +++ b/dev-lang/swig/swig-1.3.40.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="2df766c9e03e02811b1ab4bba1c7b9cc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd swig-1.3.40 libtoolize -fci ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd swig-1.3.40 make install } diff --git a/dev-lang/swig/swig-2.0.2.bep b/dev-lang/swig/swig-2.0.2.recipe similarity index 96% rename from dev-lang/swig/swig-2.0.2.bep rename to dev-lang/swig/swig-2.0.2.recipe index df8d4a24e..18dd1aaae 100644 --- a/dev-lang/swig/swig-2.0.2.bep +++ b/dev-lang/swig/swig-2.0.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="eaf619a4169886923e5f828349504a29" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd swig-2.0.2 libtoolize -fci ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd swig-2.0.2 make install } diff --git a/dev-lang/tcl/tcl-8.5.9.bep b/dev-lang/tcl/tcl-8.5.9.recipe similarity index 95% rename from dev-lang/tcl/tcl-8.5.9.bep rename to dev-lang/tcl/tcl-8.5.9.recipe index a95b225d0..9e424aa9b 100644 --- a/dev-lang/tcl/tcl-8.5.9.bep +++ b/dev-lang/tcl/tcl-8.5.9.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8512d8db3233041dd68a81476906012a" -BUILD { +BUILD() +{ cd tcl8.5.9/unix autoconf -f ./configure --prefix=$(finddir B_COMMON_DIRECTORY) \ @@ -13,13 +14,15 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tcl8.5.9/unix make install ln -s tclsh8.5 "$(finddir B_COMMON_BIN_DIRECTORY)/tclsh" } -TEST { +TEST() +{ cd tcl8.5.9/unix make test } diff --git a/dev-lang/v8/v8-r13067.bep b/dev-lang/v8/v8-r13067.recipe similarity index 97% rename from dev-lang/v8/v8-r13067.bep rename to dev-lang/v8/v8-r13067.recipe index 39ac947e2..de190c951 100644 --- a/dev-lang/v8/v8-r13067.bep +++ b/dev-lang/v8/v8-r13067.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="unstable" DEPEND="" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ gyp_patch_path=$(dirname ${PWD})/patches/gyp-r1501.patch cd v8-r13067 cd build @@ -17,12 +18,14 @@ BUILD { make library=shared ia32.debug } -TEST { +TEST() +{ cd v8-r13067 make ia32.debug.check } -INSTALL { +INSTALL() +{ cd v8-r13067 includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY`/v8 mkdir -p ${includedir} diff --git a/dev-lang/yasm/yasm-1.1.0.bep b/dev-lang/yasm/yasm-1.1.0.bep deleted file mode 100644 index d808cf8c5..000000000 --- a/dev-lang/yasm/yasm-1.1.0.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Yasm assembler" -HOMEPAGE="http://www.tortall.net/projects/yasm/" -SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz" -CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd yasm-1.1.0 - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --disable-nls - make -} - -INSTALL { - cd yasm-1.1.0 - make install -} - -LICENSE="Artistic - BSD (2-clause) - BSD (3-clause) - GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="2001-2010 Peter Johnson and other Yasm developers." diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe new file mode 100644 index 000000000..4ae067250 --- /dev/null +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -0,0 +1,54 @@ +SUMMARY="The Yasm modular assembler" +HOMEPAGE="http://www.tortall.net/projects/yasm/" +SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz" +CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb" +LICENSE=" + Artistic + BSD (2-clause) + BSD (3-clause) + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="2001-2010 Peter Johnson and other Yasm developers." +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + yasm = $portVersion compat >= 1 + cmd:yasm = 1.1.0 compat >= 1 + lib:libyasm = 1.1.0 compat >= 1.1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + ./configure $configureDirArgs \ + --disable-nls + make +} + +INSTALL() +{ + make install +} + + +DESCRIPTION="Yasm is a complete rewrite of the NASM assembler under the “new” BSD License (some portions are under other licenses, see COPYING for details). + +Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats. + +Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for assembly of NASM or GAS syntax code into Win32 or Win64 object files." diff --git a/dev-lang/yasm/yasm-1.2.0.bep b/dev-lang/yasm/yasm-1.2.0.bep deleted file mode 100644 index 4e556013f..000000000 --- a/dev-lang/yasm/yasm-1.2.0.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Yasm assembler" -HOMEPAGE="http://www.tortall.net/projects/yasm/" -SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz" -CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd yasm-1.2.0 - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --disable-nls - make -} - -INSTALL { - cd yasm-1.2.0 - make install -} - -LICENSE="Artistic - BSD (2-clause) - BSD (3-clause) - GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe new file mode 100644 index 000000000..70e7758f5 --- /dev/null +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -0,0 +1,59 @@ +SUMMARY="The Yasm modular assembler" +HOMEPAGE="http://www.tortall.net/projects/yasm/" +SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz" +CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6" +LICENSE=" + Artistic + BSD (2-clause) + BSD (3-clause) + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + yasm = $portVersion compat >= 1 + cmd:vsyasm = $portVersion compat >= 1 + cmd:yasm = $portVersion compat >= 1 + cmd:ytasm = $portVersion compat >= 1 + devel:libyasm = $portVersion compat >= 1.2 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + runConfigure ./configure \ + --disable-nls + make $jobArgs + +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libyasm +} + + +DESCRIPTION="Yasm is a complete rewrite of the NASM assembler under the “new” BSD License (some portions are under other licenses, see COPYING for details). + +Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats. + +Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for assembly of NASM or GAS syntax code into Win32 or Win64 object files." diff --git a/dev-libs/apr-util/apr-util-1.3.10.bep b/dev-libs/apr-util/apr-util-1.3.10.bep deleted file mode 100644 index 730f4bd0f..000000000 --- a/dev-libs/apr-util/apr-util-1.3.10.bep +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz" -CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD { - cd apr-util-1.3.10 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.2 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.2/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL { - cd apr-util-1.3.10 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr-util-1.3.11.bep b/dev-libs/apr-util/apr-util-1.3.11.bep deleted file mode 100644 index 0c3e85385..000000000 --- a/dev-libs/apr-util/apr-util-1.3.11.bep +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.11.tar.gz" -CHECKSUM_MD5="bfc16065a784785dd356dc4067fe2504" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD { - cd apr-util-1.3.11 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.2 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.2/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL { - cd apr-util-1.3.11 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr-util-1.3.12.bep b/dev-libs/apr-util/apr-util-1.3.12.bep deleted file mode 100644 index 893bdaeff..000000000 --- a/dev-libs/apr-util/apr-util-1.3.12.bep +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.12.tar.gz" -CHECKSUM_MD5="d1977289889592ef998e3f777f68efe4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD { - cd apr-util-1.3.12 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.5 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.5/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.5 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL { - cd apr-util-1.3.12 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr-util-1.3.9.bep b/dev-libs/apr-util/apr-util-1.3.9.bep deleted file mode 100644 index a01e185fc..000000000 --- a/dev-libs/apr-util/apr-util-1.3.9.bep +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://apache.multihomed.net/apr/apr-util-1.3.9.tar.gz" -CHECKSUM_MD5="cc2ec0ba4f01d88375f1170f762518fa" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD { - cd apr-util-1.3.9 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.2 - echo `AC_CONFIG_MACRO_DIR([m4])` >> configure.in - echo `AM_INIT_AUTOMAKE` >> configure.in - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf --force - APRDIR=`haikuporter -t` - buildconf --with-apr=${APRDIR}/dev-libs/apr/work/apr-1.4.2 - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf --force - autoheader - cd ../.. - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL { - cd apr-util-1.3.9 - make install -} -LICENSE="Apache v2" -COPYRIGHT="2009 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr-util-1.4.1.bep b/dev-libs/apr-util/apr-util-1.4.1.bep deleted file mode 100644 index bd3695d4c..000000000 --- a/dev-libs/apr-util/apr-util-1.4.1.bep +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" -CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr == 1.4.6" -BUILD { - cd apr-util-1.4.1 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.6 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.6/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.6 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL { - cd apr-util-1.4.1 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff b/dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff deleted file mode 100644 index 3c692e083..000000000 --- a/dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -u apr-util-0.9.15-orig/config.layout apr-util-0.9.15/config.layout ---- apr-util-0.9.15-orig/config.layout 2004-11-24 23:45:40.000000000 +0000 -+++ apr-util-0.9.15/config.layout 2008-05-14 15:03:22.000000000 +0000 -@@ -229,3 +229,20 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_MAJOR_VERSION} - -+ -+# Haiku layout -+ -+ prefix: /boot/common -+ exec_prefix: ${prefix} -+ bindir: ${exec_prefix}/bin -+ sbindir: ${exec_prefix}/bin -+ libdir: ${exec_prefix}/lib -+ libexecdir: ${exec_prefix}/bin -+ mandir: ${prefix}/man -+ sysconfdir: ${prefix}/conf -+ datadir: ${prefix} -+ installbuilddir: ${datadir}/build -+ includedir: ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION} -+ localstatedir: ${prefix} -+ libsuffix: -${APRUTIL_MAJOR_VERSION} -+ diff --git a/dev-libs/apr-util/patches/apr-util-0.9.x.diff b/dev-libs/apr-util/patches/apr-util-0.9.x.diff deleted file mode 100644 index 804a56435..000000000 --- a/dev-libs/apr-util/patches/apr-util-0.9.x.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 645316) -+++ configure.in (working copy) -@@ -145,7 +145,7 @@ - dnl ### apr and expat libraries to the build or it'll die a truly horrible - dnl ### death. We now use the apr-config tool to determine the correct - dnl ### library to link against :) --*AIX*|*Darwin*|*BeOS*|CYGWIN*) -+*AIX*|*Darwin*|*BeOS*|*Haiku*|CYGWIN*) - dnl need such stuff as -liconv to be specified when building libaprutil.la - EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)' - ;; diff --git a/dev-libs/apr/apr-1.3.8.bep b/dev-libs/apr/apr-1.3.8.bep deleted file mode 100644 index 4b7ee85d2..000000000 --- a/dev-libs/apr/apr-1.3.8.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.3.8.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd apr-1.3.8 - libtoolize --force --copy --install - buildconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd apr-1.3.8 - make install -} -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.3.9.bep b/dev-libs/apr/apr-1.3.9.bep deleted file mode 100644 index 678bd894c..000000000 --- a/dev-libs/apr/apr-1.3.9.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.3.9.tar.gz" -CHECKSUM_MD5="85bcd8005153b8fa63b1e3f95ea31f07" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd apr-1.3.9 - libtoolize --force --copy --install - buildconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd apr-1.3.9 - make install -} -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.2.bep b/dev-libs/apr/apr-1.4.2.bep deleted file mode 100644 index 470b70c2e..000000000 --- a/dev-libs/apr/apr-1.4.2.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" -CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd apr-1.4.2 - libtoolize -fci - touch libtool.m4 - aclocal -I build - autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd apr-1.4.2 - make install -} - -TEST { - cd apr-1.4.2 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.4.bep b/dev-libs/apr/apr-1.4.4.bep deleted file mode 100644 index d4724c91e..000000000 --- a/dev-libs/apr/apr-1.4.4.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.4.tar.gz" -CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf" -REVISION="3" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd apr-1.4.4 - libtoolize -fci - touch libtool.m4 - aclocal -I build - autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd apr-1.4.4 - make install -} - -TEST { - cd apr-1.4.4 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.5.bep b/dev-libs/apr/apr-1.4.5.bep deleted file mode 100644 index 6a86547d5..000000000 --- a/dev-libs/apr/apr-1.4.5.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.5.tar.gz" -CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1" -REVISION="4" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd apr-1.4.5 - libtoolize -fci - touch libtool.m4 - aclocal -I build - autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd apr-1.4.5 - make install -} - -TEST { - cd apr-1.4.5 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.6.bep b/dev-libs/apr/apr-1.4.6.bep deleted file mode 100644 index 5256885db..000000000 --- a/dev-libs/apr/apr-1.4.6.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" -CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" -REVISION="4" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd apr-1.4.6 - libtoolize -fci - touch libtool.m4 - aclocal -I build - autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd apr-1.4.6 - make install -} - -TEST { - cd apr-1.4.6 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2012 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe new file mode 100644 index 000000000..d8b6ed15f --- /dev/null +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -0,0 +1,111 @@ +SUMMARY="Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" +COPYRIGHT="2012 The Apache Software Foundation." +LICENSE="Apache v2" +CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" +REVISION="7" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="apr-1.4.6.patch" + +PROVIDES=" + apr = $portVersion compat >= 1 + lib:libapr_1 = 0.4.6 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize -fci + touch libtool.m4 + aclocal -I build + autoconf + runConfigure ./configure \ + --with-installbuilddir=$prefix/data/apr + + # TODO: fix this hack (by finding out why top_builddir seems to be unset)! + ln -sfn $sourceDir/libtool /libtool + + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libapr-1 + fixPkgconfig + + # fix apr-1-config + fixDevelopLibDirReferences $binDir/apr-1-config + + # remove superfluous .exp file + rm $libDir/apr.exp + + # devel package + packageEntries devel \ + $binDir \ + $dataDir \ + $developDir +} + +TEST() +{ + make test +} + +# ----- description ---------------------------------------------------------- + +DESCRIPTION=" + The mission of the Apache Portable Runtime (APR) project is to create + and maintain software libraries that provide a predictable and consistent + interface to underlying platform-specific implementations. The primary + goal is to provide an API to which software developers may code and be + assured of predictable if not identical behaviour regardless of the + platform on which their software is built, relieving them of the need to + code special-case conditions to work around or take advantage of + platform-specific deficiencies or features. + + To give a brief overview, the primary core subsystems of APR 1.x include + the following: + + - atomic operations + - dynamic Shared Object loading + - file I/O + - locks (mutexes, condition variables, etc) + - memory management (high performance allocators) + - memory-mapped files + - multicast Sockets + - network I/O + - shared memory + - thread and Process management + - various data structures (tables, hashes, priority queues, etc) + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + apr_devel = portVersion compat >= 1 + cmd:apr_1_config = portVersion compat >= 1 + devel:libapr_1 = 0.4.6 compat >= 0 + " +REQUIRES_devel=" + apr == $portVersion base + " diff --git a/dev-libs/apr/patches/apr-0.9.x-haiku.diff b/dev-libs/apr/patches/apr-0.9.x-haiku.diff deleted file mode 100644 index daf24508f..000000000 --- a/dev-libs/apr/patches/apr-0.9.x-haiku.diff +++ /dev/null @@ -1,185 +0,0 @@ -diff -urN apr-0.9.17-orig/build/apr_hints.m4 apr-0.9.17/build/apr_hints.m4 ---- apr-0.9.17-orig/build/apr_hints.m4 2006-03-16 09:41:51.000000000 +0000 -+++ apr-0.9.17/build/apr_hints.m4 2008-05-13 22:10:51.000000000 +0000 -@@ -390,6 +390,12 @@ - APR_ADDTO(CPPFLAGS, [-DCYGWIN]) - APR_ADDTO(LIBS, [-lcrypt]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -diff -urN apr-0.9.17-orig/configure.in apr-0.9.17/configure.in ---- apr-0.9.17-orig/configure.in 2007-11-03 14:18:38.000000000 +0000 -+++ apr-0.9.17/configure.in 2008-05-13 22:10:51.000000000 +0000 -@@ -219,7 +219,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -434,6 +434,13 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ APR_ADDTO(CPPFLAGS,-I/boot/develop/headers/bsd) -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -656,6 +663,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -671,10 +682,6 @@ - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS_ANON, -- [BeOS areas])]) - case $host in - *linux* ) - # Linux has problems with MM_SHMT_MMANON even though it reports -@@ -722,6 +729,9 @@ - havebeosarea="0" - haveos2shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -735,9 +745,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -@@ -1270,7 +1277,7 @@ - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "lu"' - ;; -- *beos*) -+ *beos*|*haiku*) - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "ld"' - ;; -diff -urN apr-0.9.17-orig/test/testoc.c apr-0.9.17/test/testoc.c ---- apr-0.9.17-orig/test/testoc.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testoc.c 2008-05-13 22:10:51.000000000 +0000 -@@ -78,6 +78,9 @@ - rv = apr_procattr_create(&procattr, p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - -+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV); -+ CuAssertIntEquals(tc, APR_SUCCESS, rv); -+ - rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE, - APR_NO_PIPE); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -diff -urN apr-0.9.17-orig/test/testpipe.c apr-0.9.17/test/testpipe.c ---- apr-0.9.17-orig/test/testpipe.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testpipe.c 2008-05-13 22:10:51.000000000 +0000 -@@ -152,6 +152,9 @@ - rv = apr_procattr_create(&procattr, p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - -+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV); -+ CuAssertIntEquals(tc, APR_SUCCESS, rv); -+ - rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK, - APR_CHILD_BLOCK); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -diff -urN apr-0.9.17-orig/test/testpoll.c apr-0.9.17/test/testpoll.c ---- apr-0.9.17-orig/test/testpoll.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testpoll.c 2008-05-13 22:10:51.000000000 +0000 -@@ -197,6 +197,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -212,6 +214,8 @@ - recv_msg(s, 1, p, tc); - send_msg(s, sa, 0, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 1, tc); -@@ -318,6 +322,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertIntEquals(tc, 1, num); -@@ -348,6 +353,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertIntEquals(tc, 2, num); -@@ -380,6 +386,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertIntEquals(tc, 1, num); -diff -urN apr-0.9.17-orig/test/testproc.c apr-0.9.17/test/testproc.c ---- apr-0.9.17-orig/test/testproc.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testproc.c 2008-05-13 22:10:51.000000000 +0000 -@@ -53,7 +53,7 @@ - rv = apr_procattr_dir_set(attr, "data"); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - -- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM); -+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - - args[0] = "proc_child" EXTENSION; -@@ -129,7 +129,7 @@ - CuAssertIntEquals(tc, APR_SUCCESS, rv); - rv = apr_procattr_dir_set(attr, "data"); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM); -+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - - args[0] = "proc_child"; diff --git a/dev-libs/apr/patches/apr-0.9.x.diff b/dev-libs/apr/patches/apr-0.9.x.diff deleted file mode 100644 index 6bb4257ee..000000000 --- a/dev-libs/apr/patches/apr-0.9.x.diff +++ /dev/null @@ -1,2750 +0,0 @@ -Index: network_io/unix/sockopt.c -=================================================================== ---- network_io/unix/sockopt.c (revision 652904) -+++ network_io/unix/sockopt.c (working copy) -@@ -21,7 +21,7 @@ - static apr_status_t soblock(int sd) - { - /* BeOS uses setsockopt at present for non blocking... */ --#ifndef BEOS -+#if !defined(BEOS) || defined(__HAIKU__) - int fd_flags; - - fd_flags = fcntl(sd, F_GETFL, 0); -@@ -47,7 +47,7 @@ - - static apr_status_t sononblock(int sd) - { --#ifndef BEOS -+#if !defined(BEOS) || defined(__HAIKU__) - int fd_flags; - - fd_flags = fcntl(sd, F_GETFL, 0); -@@ -221,7 +221,7 @@ - * As it can't be turned off we might as well check if they're asking - * for it to be turned on! - */ --#ifdef BEOS -+#if defined(BEOS) && !defined(__HAIKU__) - if (on == 1) - return APR_SUCCESS; - else -Index: network_io/unix/sockaddr.c -=================================================================== ---- network_io/unix/sockaddr.c (revision 652904) -+++ network_io/unix/sockaddr.c (working copy) -@@ -458,7 +458,7 @@ - apr_sockaddr_t *prev_sa; - int curaddr; - #if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \ -- defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) -+ defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) // CHECKME - #ifdef GETHOSTBYNAME_R_HOSTENT_DATA - struct hostent_data hd; - #else -@@ -489,7 +489,7 @@ - } - else { - #if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \ -- defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) -+ defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) // CHECKME - #if defined(GETHOSTBYNAME_R_HOSTENT_DATA) - /* AIX, HP/UX, D/UX et alia */ - gethostbyname_r(hostname, &hs, &hd); -@@ -560,7 +560,7 @@ - - if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) { - if (!hostname || -- family != AF_UNSPEC || -+ family != APR_UNSPEC || - masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) { - return APR_EINVAL; - } -@@ -656,7 +656,7 @@ - return APR_SUCCESS; - #else - #if APR_HAS_THREADS && !defined(GETHOSTBYADDR_IS_THREAD_SAFE) && \ -- defined(HAVE_GETHOSTBYADDR_R) && !defined(BEOS) -+ defined(HAVE_GETHOSTBYADDR_R) && !defined(BEOS) // CHECKME - #ifdef GETHOSTBYNAME_R_HOSTENT_DATA - struct hostent_data hd; - #else -Index: network_io/unix/sockets.c -=================================================================== ---- network_io/unix/sockets.c (revision 652904) -+++ network_io/unix/sockets.c (working copy) -@@ -21,7 +21,7 @@ - #include "apr_portable.h" - #include "apr_arch_inherit.h" - --#if defined(BEOS) && !defined(BEOS_BONE) -+#if defined(BEOS) && !defined(BEOS_BONE) && !defined(__HAIKU__) - #define close closesocket - #endif - -@@ -47,7 +47,7 @@ - apr_sockaddr_vars_set(sock->local_addr, family, 0); - apr_sockaddr_vars_set(sock->remote_addr, family, 0); - sock->netmask = 0; --#if defined(BEOS) && !defined(BEOS_BONE) -+#if defined(BEOS) && !defined(BEOS_BONE) && !defined(__HAIKU__) - /* BeOS pre-BONE has TCP_NODELAY on by default and it can't be - * switched off! - */ -Index: network_io/beos/sendrecv.c -=================================================================== ---- network_io/beos/sendrecv.c (revision 652904) -+++ network_io/beos/sendrecv.c (working copy) -@@ -15,7 +15,7 @@ - */ - - #include "apr_private.h" --#if BEOS_BONE /* BONE uses the unix code - woohoo */ -+#if BEOS_BONE || defined(__HAIKU__) /* BONE uses the unix code - woohoo */ - #include "../unix/sendrecv.c" - #else - #include "apr_arch_networkio.h" -Index: include/arch/unix/apr_arch_file_io.h -=================================================================== ---- include/arch/unix/apr_arch_file_io.h (revision 652904) -+++ include/arch/unix/apr_arch_file_io.h (working copy) -@@ -68,7 +68,9 @@ - #include - #endif - --#if BEOS_BONE -+#if defined(__HAIKU__) -+# include -+#elif BEOS_BONE - # ifndef BONE7 - /* prior to BONE/7 fd_set & select were defined in sys/socket.h */ - # include -Index: include/apr_errno.h -=================================================================== ---- include/apr_errno.h (revision 652904) -+++ include/apr_errno.h (working copy) -@@ -1155,6 +1155,8 @@ - /** operation would block */ - #if !defined(EWOULDBLOCK) || !defined(EAGAIN) - #define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN) -+#elif BEOS -+#define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN) - #elif (EWOULDBLOCK == EAGAIN) - #define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN) - #else -Index: configure.in -=================================================================== ---- configure.in (revision 652904) -+++ configure.in (working copy) -@@ -219,7 +219,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*-haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -403,6 +403,14 @@ - ;; - esac - ;; -+ *haiku*) -+ OSDIR="beos" -+ APR_ADDTO(CPPFLAGS,-DBEOS) -+ enable_threads="system_threads" -+ eolstr="\\n" -+ proc_mutex_is_global=1 -+ file_as_socket="1" -+ ;; - *os390) - OSDIR="os390" - eolstr="\\n" -@@ -1274,7 +1282,7 @@ - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "lu"' - ;; -- *beos*) -+ *beos*|*haiku*) - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "ld"' - ;; -Index: misc/unix/errorcodes.c -=================================================================== ---- misc/unix/errorcodes.c (revision 652904) -+++ misc/unix/errorcodes.c (working copy) -@@ -343,7 +343,7 @@ - * the prototype publically (doh!), so to avoid a build warning - * we add a suitable prototype here. - */ --#if defined(BEOS) -+#if defined(BEOS) && !defined(__HAIKU__) - const char *strerror_r(apr_status_t, char *, apr_size_t); - #endif - -Index: threadproc/beos/proc.c -=================================================================== ---- threadproc/beos/proc.c (revision 652904) -+++ threadproc/beos/proc.c (working copy) -@@ -365,7 +365,12 @@ - } - - APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, -- void *limit) -+#ifdef APR_HAVE_STRUCT_RLIMIT -+ struct rlimit -+#else -+ void -+#endif -+ *limit) - { - return APR_ENOTIMPL; - } -Index: build/config.guess -=================================================================== ---- build/config.guess (revision 652904) -+++ build/config.guess (working copy) -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2004 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2002-03-20' -+timestamp='2008-01-08' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,17 +18,14 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --##################################################################### --# This file contains changes for Apache, clearly marked below. --# These changes are hereby donated to the public domain. --##################################################################### - - # Originally written by Per Bothner . - # Please send patches to . Submit a context -@@ -58,8 +56,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -71,11 +69,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -93,30 +91,42 @@ - exit 1 - fi - -+trap 'exit 1' 1 2 15 - --dummy=dummy-$$ --trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -+# compiler to aid in system detection is discouraged as it requires -+# temporary files to be created and, as you can see below, it is a -+# headache to deal with in a portable fashion. - --# CC_FOR_BUILD -- compiler used by this script. - # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still - # use `HOST_CC' if defined, but it is deprecated. - --set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in -- ,,) echo "int dummy(){}" > $dummy.c ; -+# Portable tmp directory creation inspired by the Autoconf team. -+ -+set_cc_for_build=' -+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -+: ${TMPDIR=/tmp} ; -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || -+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -+dummy=$tmp/dummy ; -+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -+case $CC_FOR_BUILD,$HOST_CC,$CC in -+ ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do -- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; -- if test $? = 0 ; then -+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; -- rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -147,9 +157,11 @@ - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in -+ armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -172,159 +184,128 @@ - ;; - esac - # The OS release -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ # Debian GNU/NetBSD machines have a different userland, and -+ # thus, need a distinct triplet. However, they do not need -+ # kernel version information, so it can be replaced with a -+ # suitable tag, in the style of linux-gnu. -+ case "${UNAME_VERSION}" in -+ Debian*) -+ release='-gnu' -+ ;; -+ *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ ;; -+ esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac -+ # According to Compaq, /usr/sbin/psrinfo has been available on -+ # OSF/1 and Tru64 systems produced since 1995. I hope that -+ # covers most systems running today. This code pipes the CPU -+ # types through head -n 1, so we only detect the type of CPU 0. -+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` -+ case "$ALPHA_CPU_TYPE" in -+ "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; -+ "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; -+ "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; -+ "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; -+ "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; -+ "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; -+ "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; -+ "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; -+ "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; -+ "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; -+ esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- cat <$dummy.s -- .data --\$Lformat: -- .byte 37,100,45,37,120,10,0 # "%d-%x\n" -- -- .text -- .globl main -- .align 4 -- .ent main --main: -- .frame \$30,16,\$26,0 -- ldgp \$29,0(\$27) -- .prologue 1 -- .long 0x47e03d80 # implver \$0 -- lda \$2,-1 -- .long 0x47e20c21 # amask \$2,\$1 -- lda \$16,\$Lformat -- mov \$0,\$17 -- not \$1,\$18 -- jsr \$26,printf -- ldgp \$29,0(\$26) -- mov 0,\$16 -- jsr \$26,exit -- .end main --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null -- if test "$?" = 0 ; then -- case `./$dummy` in -- 0-0) -- UNAME_MACHINE="alpha" -- ;; -- 1-0) -- UNAME_MACHINE="alphaev5" -- ;; -- 1-1) -- UNAME_MACHINE="alphaev56" -- ;; -- 1-101) -- UNAME_MACHINE="alphapca56" -- ;; -- 2-303) -- UNAME_MACHINE="alphaev6" -- ;; -- 2-307) -- UNAME_MACHINE="alphaev67" -- ;; -- 2-1307) -- UNAME_MACHINE="alphaev68" -- ;; -- esac -- fi -- rm -f $dummy.s $dummy -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; --######################### --# Apache changes --# --# *:OS/390:*:*) --# echo i370-ibm-openedition --# exit 0 ;; -- *:OS390:*:* | *:OS/390:*:*) -- echo s390-ibm-os390 -- exit 0 ;; -- *:OS400:*:* | *:OS/400:*:*) -- echo as400-ibm-os400 -- exit 0 ;; -- *:OS/2:*:*) -- echo "i386-pc-os2_emx" -- exit 0;; --# --# end Apache changes --######################### -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -332,25 +313,32 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -+ case `/usr/bin/uname -p` in -+ sparc) echo sparc-icl-nx7; exit ;; -+ esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -359,10 +347,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -374,10 +362,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -388,37 +376,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -442,27 +433,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy \ -- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; -+ Motorola:*:4.3:PL8-*) -+ echo powerpc-harris-powermax -+ exit ;; -+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) -+ echo powerpc-harris-powermax -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -478,29 +475,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -508,7 +505,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -523,16 +520,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -545,28 +545,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -622,17 +622,37 @@ - exit (0); - } - EOF -- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` -- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi -- rm -f $dummy.c $dummy -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] -+ then -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null -+ then -+ HP_ARCH="hppa2.0w" -+ else -+ HP_ARCH="hppa64" -+ fi -+ fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -660,134 +680,192 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY*T3D:*:*:*) -- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; -+ *:UNICOS/mp:*:*) -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:3*) -- echo i386-pc-interix3 -- exit 0 ;; -+ exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; -+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -+ echo i${UNAME_MACHINE}-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? -- echo i386-pc-interix -- exit 0 ;; -+ echo i586-pc-interix -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -804,16 +882,45 @@ - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- rm -f $dummy.c -- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -+ mips64:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips64 -+ #undef mips64el -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -827,7 +934,7 @@ - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -835,22 +942,31 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -+ exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -868,15 +984,15 @@ - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -+ exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -+ exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -+ exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build -@@ -893,24 +1009,33 @@ - LIBC=gnulibc1 - # endif - #else -- #ifdef __INTEL_COMPILER -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- rm -f $dummy.c -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -918,7 +1043,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; -+ i*86:OS/2:*:*) -+ # If we were able to find `uname', then EMX Unix compatibility -+ # is probably installed. -+ echo ${UNAME_MACHINE}-pc-os2-emx -+ exit ;; -+ i*86:XTS-300:*:STOP) -+ echo ${UNAME_MACHINE}-unknown-stop -+ exit ;; -+ i*86:atheos:*:*) -+ echo ${UNAME_MACHINE}-unknown-atheos -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ echo i386-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ i*86:*DOS:*:*) -+ echo ${UNAME_MACHINE}-pc-msdosdjgpp -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -926,99 +1071,100 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` -- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ -+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -- i*86:*DOS:*:*) -- echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) -+ exit ;; -+ mc68k:UNIX:SYSTEM5:3.51m) -+ echo m68k-convergent-sysv -+ exit ;; -+ M680?0:D-NIX:5.3:*) -+ echo m68k-diab-dnix -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -- echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1026,61 +1172,87 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-6:SUPER-UX:*:*) -+ echo sx6-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- echo `uname -p`-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac -+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1088,22 +1260,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1114,39 +1289,47 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -- i*86:OS/2:*:*) -- # If we were able to find `uname', then EMX Unix compatibility -- # is probably installed. -- echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -- i*86:XTS-300:*:STOP) -- echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -- i*86:atheos:*:*) -- echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1178,7 +1361,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1267,12 +1450,12 @@ - } - EOF - --$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 --rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1281,22 +1464,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1307,7 +1490,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+and -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -Index: build/config.sub -=================================================================== ---- build/config.sub (revision 652904) -+++ build/config.sub (working copy) -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2004 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2002-03-07' -+timestamp='2008-01-16' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,18 +22,14 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --##################################################################### --# This file contains changes for Apache, clearly marked below. --# These changes are hereby donated to the public domain. --##################################################################### - - # Please send patches to . Submit a context - # diff and a properly formatted ChangeLog entry. -@@ -75,8 +72,8 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -88,11 +85,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +101,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -123,28 +120,12 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; --######################## --# changes for Apache --# -- tpf | os390 | vmcms) -- os=-$maybe_os -- basic_machine=s390; -- ;; -- os400) -- os=-$maybe_os -- basic_machine=as400; -- ;; -- mvs) -- os=-mvs -- basic_machine=i370; -- ;; --# --# end Apache changes --######################## - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -167,7 +148,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -@@ -192,6 +173,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -208,6 +193,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -251,31 +240,52 @@ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ -- | d10v | d30v | dsp16xx \ -- | fr30 \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | m32r | m68000 | m68k | m88k | mcore \ -- | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ -- | mips64vr4100 | mips64vr4100el | mips64vr4300 \ -- | mips64vr4300el | mips64vr5000 | mips64vr5000el \ -- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ -- | mipsisa32 | mipsisa64 \ -+ | ip2k | iq2000 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ -+ | mips64orion | mips64orionel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | mt \ -+ | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -- | strongarm \ -- | tahoe | thumb | tic80 | tron \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -@@ -286,6 +296,9 @@ - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -304,41 +317,66 @@ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -- | arm-* | armbe-* | armle-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c54x-* \ -- | clipper-* | cydra-* \ -- | d10v-* | d30v-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | clipper-* | craynv-* | cydra-* \ -+ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | m32r-* \ -+ | ip2k-* | iq2000-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ -- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ -- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -+ | mips16-* \ -+ | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ -+ | mips64orion-* | mips64orionel-* \ -+ | mips64vr4100-* | mips64vr4100el-* \ -+ | mips64vr4300-* | mips64vr4300el-* \ -+ | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ -+ | mipsisa32-* | mipsisa32el-* \ -+ | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64sb1-* | mipsisa64sb1el-* \ -+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ -+ | msp430-* \ -+ | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -+ | tahoe-* | thumb-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown -+ ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -@@ -355,6 +393,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -406,6 +447,14 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - c90) - basic_machine=c90-cray - os=-unicos -@@ -434,12 +483,27 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -462,6 +526,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -612,6 +680,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -627,6 +703,10 @@ - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -640,10 +720,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -656,6 +732,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -731,10 +810,13 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -751,55 +833,75 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; -- pc532 | pc532-*) -+ pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -- pentiumpro | p6 | 6x86 | athlon) -+ pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -+ pentium4) -+ basic_machine=i786-pc -+ ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown -- ;; -+ ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -- ;; -+ ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown -- ;; -+ ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown -- ;; -+ ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -@@ -810,6 +912,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -830,15 +936,20 @@ - basic_machine=a29k-amd - os=-udi - ;; --######################## --# changes for Apache --# -- as400*) -- basic_machine=as400-ibm -+ sb1) -+ basic_machine=mipsisa64sb1-unknown - ;; --# --# end Apache changes --######################## -+ sb1el) -+ basic_machine=mipsisa64sb1el-unknown -+ ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -846,6 +957,12 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -904,7 +1021,7 @@ - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; -- sv1) -+ sv1) - basic_machine=sv1-cray - os=-unicos - ;; -@@ -912,10 +1029,6 @@ - basic_machine=i386-sequent - os=-dynix - ;; -- t3d) -- basic_machine=alpha-cray -- os=-unicos -- ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos -@@ -928,6 +1041,18 @@ - basic_machine=tic54x-unknown - os=-coff - ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff -+ ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -941,6 +1066,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -962,8 +1091,8 @@ - os=-vms - ;; - vpp*|vx|vx-*) -- basic_machine=f301-fujitsu -- ;; -+ basic_machine=f301-fujitsu -+ ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks -@@ -984,11 +1113,11 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- windows32) -- basic_machine=i386-pc -- os=-windows32-msvcrt -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 - ;; -- xps | xps100) -+ xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) -@@ -1018,6 +1147,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1034,16 +1166,13 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh3eb | sh4eb) -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; -- cydra) -+ cydra) - basic_machine=cydra-cydrome - ;; - orion) -@@ -1058,10 +1187,6 @@ - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; -- c4x*) -- basic_machine=c4x-none -- os=-coff -- ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; -@@ -1106,14 +1231,6 @@ - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; --######################## --# changes for Apache --# -- -os2_emx | -tpf* | -os390* | -vmcms* | -os400* ) -- ;; --# --# end Apache changes --######################## - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. -@@ -1125,18 +1242,23 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ -- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -dragonfly*) -+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1148,16 +1270,21 @@ - ;; - esac - ;; -+ -nto-qnx*) -+ ;; - -nto*) -- os=-nto-qnx -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1170,6 +1297,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1191,6 +1321,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1201,7 +1334,7 @@ - os=-rtmk-nova - ;; - -ns2 ) -- os=-nextstep2 -+ os=-nextstep2 - ;; - -nsk*) - os=-nsk -@@ -1213,6 +1346,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1240,9 +1376,18 @@ - -xenix) - os=-xenix - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -- os=-mint -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint - ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; - -none) - ;; - *) -@@ -1265,6 +1410,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1274,11 +1425,14 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; -- pdp11-*) -+ pdp11-*) - os=-none - ;; - *-dec | vax-*) -@@ -1299,6 +1453,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1317,33 +1474,15 @@ - *-be) - os=-beos - ;; --######################## --# changes for Apache --# --# *-ibm) --# os=-aix --# ;; --# -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) -- case $basic_machine in -- s390*) -- os=-os390; -- ;; -- i370*) -- os=-mvs; -- ;; -- as400*) -- os=-os400; -- ;; -- *) -- os=-aix -- ;; -- esac -- ;; --# --# end Apache changes --######################## -- -+ os=-aix -+ ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1395,19 +1534,19 @@ - *-next) - os=-nextstep3 - ;; -- *-gould) -+ *-gould) - os=-sysv - ;; -- *-highlevel) -+ *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; -- *-sgi) -+ *-sgi) - os=-irix - ;; -- *-siemens) -+ *-siemens) - os=-sysv4 - ;; - *-masscomp) -@@ -1476,10 +1615,16 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -- -vxsim* | -vxworks*) -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) -@@ -1503,7 +1648,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) -Index: build/apr_hints.m4 -=================================================================== ---- build/apr_hints.m4 (revision 652904) -+++ build/apr_hints.m4 (working copy) -@@ -358,6 +358,11 @@ - esac - APR_ADDTO(CPPFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR]) - ;; -+ *-haiku*) -+ APR_ADDTO(CPPFLAGS, [-DBEOS]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ ;; - 4850-*.*) - APR_ADDTO(CPPFLAGS, [-DSVR4 -DMPRAS]) - APR_ADDTO(LIBS, [-lc -L/usr/ucblib -lucb]) -Index: build/apr_network.m4 -=================================================================== ---- build/apr_network.m4 (revision 652904) -+++ build/apr_network.m4 (working copy) -@@ -277,7 +277,7 @@ - } - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave port 0 to get ephemeral */ -@@ -307,7 +307,7 @@ - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; - sa.sin_port = listen_port; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave sin_addr all zeros to use loopback */ -@@ -386,7 +386,7 @@ - } - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave port 0 to get ephemeral */ -@@ -421,7 +421,7 @@ - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; - sa.sin_port = listen_port; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave sin_addr all zeros to use loopback */ -Index: file_io/unix/readwrite.c -=================================================================== ---- file_io/unix/readwrite.c (revision 652904) -+++ file_io/unix/readwrite.c (working copy) -@@ -21,7 +21,7 @@ - - /* The only case where we don't use wait_for_io_or_timeout is on - * pre-BONE BeOS, so this check should be sufficient and simpler */ --#if !BEOS_R5 -+#if !BEOS_R5 || defined(__HAIKU__) - #define USE_WAIT_FOR_IO - #endif - -Index: support/unix/waitio.c -=================================================================== ---- support/unix/waitio.c (revision 652904) -+++ support/unix/waitio.c (working copy) -@@ -22,7 +22,7 @@ - - /* The only case where we don't use wait_for_io_or_timeout is on - * pre-BONE BeOS, so this check should be sufficient and simpler */ --#if !BEOS_R5 -+#if !BEOS_R5 || defined(__HAIKU__) - #define USE_WAIT_FOR_IO - #endif - diff --git a/dev-libs/apr/patches/apr-1.0.1.diff b/dev-libs/apr/patches/apr-1.0.1.diff deleted file mode 100644 index ba6330540..000000000 --- a/dev-libs/apr/patches/apr-1.0.1.diff +++ /dev/null @@ -1,2869 +0,0 @@ -configure: -CFLAGS="-I/boot/home/develop/flock_server/src/headers -I/boot/home/config/include" CPPFLAGS="-I/boot/home/develop/flock_server/src/headers -I/boot/home/config/include" LDFLAGS="-L/boot/home/config/lib -lflock -liconv -no-undefined" ./configure --prefix=/boot/home/config --with-libtool - -diff -urN apr-1.0.1.orig/build/apr_hints.m4 apr-1.0.1/build/apr_hints.m4 ---- apr-1.0.1.orig/build/apr_hints.m4 2004-11-17 02:07:02.000000000 +0100 -+++ apr-1.0.1/build/apr_hints.m4 2004-12-17 15:19:10.000000000 +0100 -@@ -351,7 +351,6 @@ - *beos*) - APR_ADDTO(CPPFLAGS, [-DBEOS]) - PLATOSVERS=`uname -r` -- APR_SETIFNULL(apr_process_lock_is_global, [yes]) - case $PLATOSVERS in - 5.0.4) - APR_ADDTO(LDFLAGS, [-L/boot/beos/system/lib]) -@@ -362,6 +361,9 @@ - APR_ADDTO(LDFLAGS, [-L/boot/beos/system/lib]) - APR_ADDTO(LIBS, [-lbind -lsocket]) - ;; -+ *) -+ APR_ADDTO(LDFLAGS,-lnet) -+ ;; - esac - APR_ADDTO(CPPFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR]) - ;; -diff -urN apr-1.0.1.orig/configure.in apr-1.0.1/configure.in ---- apr-1.0.1.orig/configure.in 2004-11-17 02:07:02.000000000 +0100 -+++ apr-1.0.1/configure.in 2004-12-17 15:19:10.000000000 +0100 -@@ -221,7 +221,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390 | *beos) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -232,6 +232,10 @@ - [APR_ADDTO(CFLAGS,-g) - if test "$GCC" = "yes"; then - APR_ADDTO(CFLAGS,-Wall) -+ if test "$host" = "i586-pc-beos"; then -+ APR_REMOVEFROM(CFLAGS, -O2) -+ APR_ADDTO(CFLAGS, -O0) -+ fi - elif test "$AIX_XLC" = "yes"; then - APR_ADDTO(CFLAGS,-qfullpath) - fi -@@ -384,10 +388,9 @@ - APR_CHECK_DEFINE(BONE_VERSION, sys/socket.h) - eolstr="\\n" - osver=`uname -r` -- proc_mutex_is_global=1 - OBJECTS_PLATFORM='$(OBJECTS_beos)' - case $osver in -- 5.0.4) -+ 5.0.4 | 5.1) - file_as_socket="1" - ;; - *) -@@ -715,6 +718,7 @@ - haveshmgetanon="0" - havemmapzero="0" - havemmapanon="0" -+havebeosarea="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, -@@ -732,7 +736,7 @@ - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])]) - APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -+ [havebeosarea="1" - APR_DECIDE(USE_SHMEM_BEOS_ANON, - [BeOS areas])]) - case $host in -@@ -779,7 +783,6 @@ - havemmaptmp="0" - havemmapshm="0" - haveshmget="0" --havebeosarea="0" - haveos2shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, -@@ -796,7 +799,7 @@ - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) - APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -+ [havebeosarea="1" - APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" -@@ -1315,9 +1318,10 @@ - size_t_fmt='#define APR_SIZE_T_FMT "ld"' - ;; - *beos*) -- ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' -- size_t_fmt='#define APR_SIZE_T_FMT "ld"' -- ;; -+ pid_t_fmt='#define APR_PID_T_FMT "ld"' -+ ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' -+ size_t_fmt='#define APR_SIZE_T_FMT "ld"' -+ ;; - *apple-darwin*) - ssize_t_fmt='#define APR_SSIZE_T_FMT "d"' - size_t_fmt='#define APR_SIZE_T_FMT "lu"' -@@ -1399,6 +1403,10 @@ - # Original HP-UX: - AC_CHECK_LIB(dld, shl_load, [dsotype=shl; APR_ADDTO(LIBS,-ldld)]) - fi -+ if test "$dsotype" = "any"; then -+ # BeOS: -+ AC_CHECK_LIB(root, load_image, [dsotype=other]) -+ fi - # Normal POSIX: - if test "$dsotype" = "any"; then - AC_CHECK_FUNC(dlopen, [dsotype=dlfcn]) -@@ -1414,10 +1422,6 @@ - [dsotype=any - echo "Weird: dlopen() was found but dlsym() was not found!"])]) - fi -- if test "$dsotype" = "any"; then -- # BeOS: -- AC_CHECK_LIB(root, load_image, [dsotype=other]) -- fi - # Everything else: - if test "$dsotype" = "any"; then - case $host in -@@ -1597,6 +1601,17 @@ - fi - fi - -+# BeOS has no built-in flock(), but there is a third-party flock_server package -+# that adds basic (if not compliant) support. It defines flock() in flock.h. -+case $host in -+ *beos) -+ unset ac_cv_define_LOCK_EX -+ APR_CHECK_DEFINE(LOCK_EX, flock.h) -+ APR_IFALLYES(func:flock define:LOCK_EX, [ -+ APR_ADDTO(CFLAGS, -Dclose=flock_close -Ddup2=flock_dup2)]) -+ ;; -+esac -+ - # See which lock mechanisms we can support on this system. - APR_IFALLYES(header:semaphore.h func:sem_open func:sem_close dnl - func:sem_unlink func:sem_post func:sem_wait, -@@ -1610,7 +1625,16 @@ - func:pthread_mutexattr_setpshared dnl - file:/dev/zero, - hasprocpthreadser="1", hasprocpthreadser="0") --APR_IFALLYES(header:OS.h func:create_sem, hasbeossem="1", hasbeossem="0") -+APR_IFALLYES(header:OS.h func:create_sem, hasbeossemser="1", hasbeossemser="0") -+ -+# BeOS defines F_SETLK, but that doesn't mean, that it really works. -+case $host in -+ *beos*) -+ hasfcntlser="0" -+ ;; -+ *) -+ ;; -+esac - - # See which lock mechanism we'll select by default on this system. - # The last APR_DECIDE to execute sets the default. -@@ -1642,6 +1666,7 @@ - posixser="0" - procpthreadser="0" - fcntlser="0" -+beossemser="0" - case $ac_decision in - USE_FLOCK_SERIALIZE ) - flockser="1" -@@ -1659,7 +1684,7 @@ - procpthreadser="1" - ;; - USE_BEOSSEM ) -- beossem="1" -+ beossemser="1" - ;; - esac - -@@ -1668,12 +1693,14 @@ - AC_SUBST(hasposixser) - AC_SUBST(hasfcntlser) - AC_SUBST(hasprocpthreadser) -+AC_SUBST(hasbeossemser) - AC_SUBST(flockser) - AC_SUBST(sysvser) - AC_SUBST(posixser) - AC_SUBST(fcntlser) - AC_SUBST(procpthreadser) - AC_SUBST(pthreadser) -+AC_SUBST(beossemser) - - AC_MSG_CHECKING(if all interprocess locks affect threads) - if test "x$apr_process_lock_is_global" = "xyes"; then -@@ -1983,6 +2010,9 @@ - if test -d $srcdir/test; then - MAKEFILES="$MAKEFILES test/Makefile test/internal/Makefile" - fi -+if test -d $srcdir/threadproc/beos; then -+ MAKEFILES="$MAKEFILES threadproc/beos/Makefile" -+fi - - # - # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles -diff -urN apr-1.0.1.orig/dso/beos/dso.c apr-1.0.1/dso/beos/dso.c ---- apr-1.0.1.orig/dso/beos/dso.c 2004-03-09 15:40:41.000000000 +0100 -+++ apr-1.0.1/dso/beos/dso.c 2004-12-17 15:19:10.000000000 +0100 -@@ -22,7 +22,7 @@ - { - apr_dso_handle_t *dso = thedso; - -- if (dso->handle > 0 && unload_add_on(dso->handle) < B_NO_ERROR) -+ if (dso->handle >= 0 && unload_add_on(dso->handle) < B_NO_ERROR) - return APR_EINIT; - dso->handle = -1; - -@@ -32,19 +32,16 @@ - APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, - const char *path, apr_pool_t *pool) - { -- image_id newid = -1; -+ apr_dso_handle_t *handle = apr_pcalloc(pool, sizeof(apr_dso_handle_t)); -+ *res_handle = handle; - -- *res_handle = apr_pcalloc(pool, sizeof(*res_handle)); -- -- if((newid = load_add_on(path)) < B_NO_ERROR) { -- (*res_handle)->errormsg = strerror(newid); -+ handle->handle = load_add_on(path); -+ if (handle->handle < B_NO_ERROR) - return APR_EDSOOPEN; -- } -- -- (*res_handle)->pool = pool; -- (*res_handle)->handle = newid; - -- apr_pool_cleanup_register(pool, *res_handle, dso_cleanup, apr_pool_cleanup_null); -+ handle->pool = pool; -+ -+ apr_pool_cleanup_register(pool, handle, dso_cleanup, apr_pool_cleanup_null); - - return APR_SUCCESS; - } -@@ -62,10 +59,9 @@ - if (symname == NULL) - return APR_ESYMNOTFOUND; - -- err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, -- ressym); -+ err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, ressym); - -- if(err != B_OK) -+ if (err != B_OK) - return APR_ESYMNOTFOUND; - - return APR_SUCCESS; -diff -urN apr-1.0.1.orig/file_io/unix/flock.c apr-1.0.1/file_io/unix/flock.c ---- apr-1.0.1.orig/file_io/unix/flock.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/file_io/unix/flock.c 2004-12-17 15:19:10.000000000 +0100 -@@ -22,11 +22,15 @@ - #include - #endif - -+#if defined(BEOS) && APR_HAS_FLOCK_SERIALIZE -+#include -+#endif -+ - APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type) - { - int rc; - --#if defined(HAVE_FCNTL_H) -+#if APR_HAS_FCNTL_SERIALIZE - { - struct flock l = { 0 }; - int fc; -@@ -56,7 +60,7 @@ - return errno; - } - } --#elif defined(HAVE_SYS_FILE_H) -+#elif APR_HAS_FLOCK_SERIALIZE - { - int ltype; - -@@ -85,7 +89,7 @@ - { - int rc; - --#if defined(HAVE_FCNTL_H) -+#if APR_HAS_FCNTL_SERIALIZE - { - struct flock l = { 0 }; - -@@ -102,7 +106,7 @@ - if (rc == -1) - return errno; - } --#elif defined(HAVE_SYS_FILE_H) -+#elif APR_HAS_FLOCK_SERIALIZE - { - /* keep trying if flock() gets interrupted (by a signal) */ - while ((rc = flock(thefile->filedes, LOCK_UN)) < 0 && errno == EINTR) -diff -urN apr-1.0.1.orig/file_io/unix/pipe.c apr-1.0.1/file_io/unix/pipe.c ---- apr-1.0.1.orig/file_io/unix/pipe.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/file_io/unix/pipe.c 2004-12-17 15:19:11.000000000 +0100 -@@ -42,7 +42,7 @@ - fd_flags &= ~O_NONBLOCK; - # elif defined(O_NDELAY) - fd_flags &= ~O_NDELAY; --# elif defined(FNDELAY) -+# elif defined(O_FNDELAY) - fd_flags &= ~O_FNDELAY; - # else - /* XXXX: this breaks things, but an alternative isn't obvious...*/ -@@ -77,7 +77,7 @@ - fd_flags |= O_NONBLOCK; - # elif defined(O_NDELAY) - fd_flags |= O_NDELAY; --# elif defined(FNDELAY) -+# elif defined(O_FNDELAY) - fd_flags |= O_FNDELAY; - # else - /* XXXX: this breaks things, but an alternative isn't obvious...*/ -diff -urN apr-1.0.1.orig/include/apr.h.in apr-1.0.1/include/apr.h.in ---- apr-1.0.1.orig/include/apr.h.in 2004-06-05 13:52:43.000000000 +0200 -+++ apr-1.0.1/include/apr.h.in 2004-12-17 15:19:10.000000000 +0100 -@@ -172,12 +172,14 @@ - #define APR_USE_FCNTL_SERIALIZE @fcntlser@ - #define APR_USE_PROC_PTHREAD_SERIALIZE @procpthreadser@ - #define APR_USE_PTHREAD_SERIALIZE @pthreadser@ -+#define APR_USE_BEOS_SEM_SERIALIZE @beossemser@ - - #define APR_HAS_FLOCK_SERIALIZE @hasflockser@ - #define APR_HAS_SYSVSEM_SERIALIZE @hassysvser@ - #define APR_HAS_POSIXSEM_SERIALIZE @hasposixser@ - #define APR_HAS_FCNTL_SERIALIZE @hasfcntlser@ - #define APR_HAS_PROC_PTHREAD_SERIALIZE @hasprocpthreadser@ -+#define APR_HAS_BEOS_SEM_SERIALIZE @hasbeossemser@ - - #define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@ - -diff -urN apr-1.0.1.orig/include/apr_portable.h apr-1.0.1/include/apr_portable.h ---- apr-1.0.1.orig/include/apr_portable.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/apr_portable.h 2004-12-17 15:19:10.000000000 +0100 -@@ -87,9 +87,24 @@ - #include - #include - -+/** Basic OS process mutex structure. */ - struct apr_os_proc_mutex_t { -- sem_id sem; -- int32 ben; -+#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE -+ /** Value used for SYS V Semaphore, FCNTL and FLOCK serialization */ -+ int crossproc; -+#endif -+#if APR_HAS_PROC_PTHREAD_SERIALIZE -+ /** Value used for PTHREAD serialization */ -+ pthread_mutex_t *pthread_interproc; -+#endif -+#if APR_HAS_THREADS -+ /* If no threads, no need for thread locks */ -+#if APR_USE_PTHREAD_SERIALIZE -+ /** This value is currently unused within APR and Apache */ -+ pthread_mutex_t *intraproc; -+#endif -+ sem_id beos_sem; -+#endif - }; - - typedef int apr_os_file_t; -@@ -98,7 +113,7 @@ - typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; - typedef thread_id apr_os_thread_t; - typedef thread_id apr_os_proc_t; --typedef int apr_os_threadkey_t; -+typedef int32 apr_os_threadkey_t; - typedef struct timeval apr_os_imp_time_t; - typedef struct tm apr_os_exp_time_t; - typedef image_id apr_os_dso_handle_t; ---- apr-1.0.1.orig/include/arch/beos/apr_arch_proc_mutex.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_proc_mutex.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,35 +0,0 @@ --/* Copyright 2000-2004 The Apache Software Foundation -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --#ifndef PROC_MUTEX_H --#define PROC_MUTEX_H -- --#include "apr_pools.h" --#include "apr_proc_mutex.h" --#include "apr_file_io.h" --#include "apr_general.h" --#include "apr_lib.h" --#include "apr_portable.h" -- --struct apr_proc_mutex_t { -- apr_pool_t *pool; -- -- /* Our lock :) */ -- sem_id Lock; -- int32 LockCount; --}; -- --#endif /* PROC_MUTEX_H */ -- -diff -urN apr-1.0.1.orig/include/arch/beos/apr_arch_shm.h apr-1.0.1/include/arch/beos/apr_arch_shm.h ---- apr-1.0.1.orig/include/arch/beos/apr_arch_shm.h 1970-01-01 01:00:00.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_shm.h 2004-12-17 15:19:11.000000000 +0100 -@@ -0,0 +1,35 @@ -+/* Copyright 2000-2004 The Apache Software Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef SHM_H -+#define SHM_H -+ -+#include -+#include "apr_pools.h" -+#include "apr_general.h" -+#include "apr_lib.h" -+#include "apr_portable.h" -+ -+typedef struct beos_area_handle beos_area_handle; -+ -+struct apr_shm_t { -+ apr_pool_t *pool; -+ beos_area_handle *handle; -+}; -+ -+apr_status_t apr_beos_setup_shmem(); -+apr_status_t apr_beos_shmem_child_init(); -+ -+#endif /* SHM_H */ -diff -urN apr-1.0.1.orig/include/arch/beos/apr_arch_thread_mutex.h apr-1.0.1/include/arch/beos/apr_arch_thread_mutex.h ---- apr-1.0.1.orig/include/arch/beos/apr_arch_thread_mutex.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_thread_mutex.h 2004-12-17 15:19:11.000000000 +0100 -@@ -37,5 +37,8 @@ - int owner_ref; - }; - -+apr_status_t apr_beos_thread_mutex_init(apr_thread_mutex_t *mutex, -+ unsigned int flags, apr_pool_t *pool); -+ - #endif /* THREAD_MUTEX_H */ - -diff -urN apr-1.0.1.orig/include/arch/beos/apr_arch_threadproc.h apr-1.0.1/include/arch/beos/apr_arch_threadproc.h ---- apr-1.0.1.orig/include/arch/beos/apr_arch_threadproc.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_threadproc.h 2004-12-17 15:19:11.000000000 +0100 -@@ -44,6 +44,7 @@ - void *data; - apr_thread_start_t func; - apr_status_t exitval; -+ vint32 join_count; - }; - - struct apr_threadattr_t { -@@ -55,21 +56,8 @@ - - struct apr_threadkey_t { - apr_pool_t *pool; -- int32 key; --}; -- --struct beos_private_data { -- const void ** data; -- int count; -- volatile thread_id td; --}; -- --struct beos_key { -- int assigned; -- int count; -- sem_id lock; -- int32 ben_lock; -- void (* destructor) (void *); -+ int32 key; -+ void (*destructor)(void *); - }; - - struct apr_procattr_t { -@@ -87,7 +75,6 @@ - - struct apr_thread_once_t { - sem_id sem; -- int hit; - }; - - #endif /* ! THREAD_PROC_H */ -diff -urN apr-1.0.1.orig/include/arch/unix/apr_arch_proc_mutex.h apr-1.0.1/include/arch/unix/apr_arch_proc_mutex.h ---- apr-1.0.1.orig/include/arch/unix/apr_arch_proc_mutex.h 2004-06-14 10:53:31.000000000 +0200 -+++ apr-1.0.1/include/arch/unix/apr_arch_proc_mutex.h 2004-12-17 15:19:10.000000000 +0100 -@@ -104,6 +104,9 @@ - #if APR_HAS_PROC_PTHREAD_SERIALIZE - pthread_mutex_t *pthread_interproc; - #endif -+#if APR_HAS_BEOS_SEM_SERIALIZE -+ sem_id beos_sem; -+#endif - }; - - void apr_proc_mutex_unix_setup_lock(void); -diff -urN apr-1.0.1.orig/locks/beos/locks_common.c apr-1.0.1/locks/beos/locks_common.c ---- apr-1.0.1.orig/locks/beos/locks_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ apr-1.0.1/locks/beos/locks_common.c 2004-12-17 15:19:11.000000000 +0100 -@@ -0,0 +1,5 @@ -+/* Include "apr_arch_thread_mutex.h" first, so that "apr_arch_global_mutex.h" -+ * won't include the wrong one (the UNIX version). -+ */ -+#include "apr_arch_thread_mutex.h" -+#include "../unix/global_mutex.c" -diff -urN apr-1.0.1.orig/locks/beos/proc_mutex.c apr-1.0.1/locks/beos/proc_mutex.c ---- apr-1.0.1.orig/locks/beos/proc_mutex.c 2004-03-09 15:39:45.000000000 +0100 -+++ apr-1.0.1/locks/beos/proc_mutex.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,157 +13,68 @@ - * limitations under the License. - */ - --/*Read/Write locking implementation based on the MultiLock code from -- * Stephen Beaulieu -- */ -- - #include "apr_arch_proc_mutex.h" - #include "apr_strings.h" - #include "apr_portable.h" -+#if APR_HAS_FLOCK_SERIALIZE -+#include -+#endif - --static apr_status_t _proc_mutex_cleanup(void * data) --{ -- apr_proc_mutex_t *lock = (apr_proc_mutex_t*)data; -- if (lock->LockCount != 0) { -- /* we're still locked... */ -- while (atomic_add(&lock->LockCount , -1) > 1){ -- /* OK we had more than one person waiting on the lock so -- * the sem is also locked. Release it until we have no more -- * locks left. -- */ -- release_sem (lock->Lock); -- } -- } -- delete_sem(lock->Lock); -- return APR_SUCCESS; --} -- --APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex, -- const char *fname, -- apr_lockmech_e mech, -- apr_pool_t *pool) --{ -- apr_proc_mutex_t *new; -- apr_status_t stat = APR_SUCCESS; -- -- if (mech != APR_LOCK_DEFAULT) { -- return APR_ENOTIMPL; -- } -- -- new = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); -- if (new == NULL){ -- return APR_ENOMEM; -- } -- -- if ((stat = create_sem(0, "APR_Lock")) < B_NO_ERROR) { -- _proc_mutex_cleanup(new); -- return stat; -- } -- new->LockCount = 0; -- new->Lock = stat; -- new->pool = pool; -- -- apr_pool_cleanup_register(new->pool, (void *)new, _proc_mutex_cleanup, -- apr_pool_cleanup_null); -- -- (*mutex) = new; -- return APR_SUCCESS; --} -+#include - --APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex, -- const char *fname, -- apr_pool_t *pool) -+static apr_status_t proc_mutex_beos_sem_cleanup(void *mutex_) - { -- return APR_SUCCESS; --} -+ apr_proc_mutex_t *mutex = mutex_; - --APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex) --{ -- int32 stat; -- -- if (atomic_add(&mutex->LockCount, 1) > 0) { -- if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) { -- atomic_add(&mutex->LockCount, -1); -- return stat; -- } -- } -- return APR_SUCCESS; --} -- --APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex) --{ -- return APR_ENOTIMPL; --} -+ return delete_sem(mutex->beos_sem); -+} - --APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex) -+static apr_status_t proc_mutex_beos_sem_create(apr_proc_mutex_t *new_mutex, -+ const char *fname) - { -- int32 stat; -- -- if (atomic_add(&mutex->LockCount, -1) > 1) { -- if ((stat = release_sem(mutex->Lock)) < B_NO_ERROR) { -- atomic_add(&mutex->LockCount, 1); -- return stat; -- } -- } -- return APR_SUCCESS; --} -+ new_mutex->beos_sem = create_sem(1, "APR_ProcMutex"); -+ if (new_mutex->beos_sem < B_NO_ERROR) -+ return new_mutex->beos_sem; - --APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex) --{ -- apr_status_t stat; -- if ((stat = _proc_mutex_cleanup(mutex)) == APR_SUCCESS) { -- apr_pool_cleanup_kill(mutex->pool, mutex, _proc_mutex_cleanup); -- return APR_SUCCESS; -- } -- return stat; --} -+ apr_pool_cleanup_register(new_mutex->pool, (void *)new_mutex, -+ apr_proc_mutex_cleanup, -+ apr_pool_cleanup_null); - --APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex) --{ -- return _proc_mutex_cleanup(mutex); -+ return APR_SUCCESS; - } - -- --APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex) -+static apr_status_t proc_mutex_beos_sem_acquire(apr_proc_mutex_t *mutex) - { -- return NULL; -+ return acquire_sem(mutex->beos_sem); - } - --APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) -+static apr_status_t proc_mutex_beos_sem_tryacquire(apr_proc_mutex_t *mutex) - { -- return "beossem"; -+ return acquire_sem_etc(mutex->beos_sem, 0, B_RELATIVE_TIMEOUT, 0); - } - --APR_DECLARE(const char *) apr_proc_mutex_defname(void) -+static apr_status_t proc_mutex_beos_sem_release(apr_proc_mutex_t *mutex) - { -- return "beossem"; -+ return release_sem(mutex->beos_sem); - } - --APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex) -- --/* Implement OS-specific accessors defined in apr_portable.h */ -- --APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, -- apr_proc_mutex_t *pmutex) -+static apr_status_t proc_mutex_beos_sem_child_init(apr_proc_mutex_t **mutex, -+ apr_pool_t *cont, -+ const char *fname) - { -- ospmutex->sem = pmutex->Lock; -- ospmutex->ben = pmutex->LockCount; - return APR_SUCCESS; - } - --APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, -- apr_os_proc_mutex_t *ospmutex, -- apr_pool_t *pool) --{ -- if (pool == NULL) { -- return APR_ENOPOOL; -- } -- if ((*pmutex) == NULL) { -- (*pmutex) = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); -- (*pmutex)->pool = pool; -- } -- (*pmutex)->Lock = ospmutex->sem; -- (*pmutex)->LockCount = ospmutex->ben; -- return APR_SUCCESS; --} -+static const apr_proc_mutex_unix_lock_methods_t mutex_beos_sem_methods = -+{ -+ APR_PROCESS_LOCK_MECH_IS_GLOBAL, -+ proc_mutex_beos_sem_create, -+ proc_mutex_beos_sem_acquire, -+ proc_mutex_beos_sem_tryacquire, -+ proc_mutex_beos_sem_release, -+ proc_mutex_beos_sem_cleanup, -+ proc_mutex_beos_sem_child_init, -+ "beossem" -+}; - -+#include "../unix/proc_mutex.c" -diff -urN apr-1.0.1.orig/locks/beos/thread_cond.c apr-1.0.1/locks/beos/thread_cond.c ---- apr-1.0.1.orig/locks/beos/thread_cond.c 2004-02-26 18:03:26.000000000 +0100 -+++ apr-1.0.1/locks/beos/thread_cond.c 2004-12-17 15:19:11.000000000 +0100 -@@ -20,7 +20,6 @@ - - static apr_status_t thread_cond_cleanup(void *data) - { -- struct waiter *w; - apr_thread_cond_t *cond = (apr_thread_cond_t *)data; - - acquire_sem(cond->lock); -diff -urN apr-1.0.1.orig/locks/beos/thread_mutex.c apr-1.0.1/locks/beos/thread_mutex.c ---- apr-1.0.1.orig/locks/beos/thread_mutex.c 2004-02-26 18:03:26.000000000 +0100 -+++ apr-1.0.1/locks/beos/thread_mutex.c 2004-12-17 15:19:11.000000000 +0100 -@@ -26,18 +26,37 @@ - apr_thread_mutex_t *lock = (apr_thread_mutex_t*)data; - if (lock->LockCount != 0) { - /* we're still locked... */ -- while (atomic_add(&lock->LockCount , -1) > 1){ -- /* OK we had more than one person waiting on the lock so -- * the sem is also locked. Release it until we have no more -- * locks left. -- */ -+ while (atomic_add(&lock->LockCount , -1) > 1){ -+ /* OK we had more than one person waiting on the lock so -+ * the sem is also locked. Release it until we have no more -+ * locks left. -+ */ - release_sem (lock->Lock); -- } -+ } - } - delete_sem(lock->Lock); - return APR_SUCCESS; - } - -+/* pool may be NULL. */ -+apr_status_t apr_beos_thread_mutex_init(apr_thread_mutex_t *mutex, -+ unsigned int flags, apr_pool_t *pool) -+{ -+ mutex->Lock = create_sem(0, "APR_Lock"); -+ if (mutex->Lock < 0) -+ return mutex->Lock; -+ -+ mutex->LockCount = 0; -+ mutex->pool = pool; -+ -+ /* Optimal default is APR_THREAD_MUTEX_UNNESTED, -+ * no additional checks required for either flag. -+ */ -+ mutex->nested = flags & APR_THREAD_MUTEX_NESTED; -+ -+ return APR_SUCCESS; -+} -+ - APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex, - unsigned int flags, - apr_pool_t *pool) -@@ -49,19 +68,10 @@ - if (new_m == NULL){ - return APR_ENOMEM; - } -- -- if ((stat = create_sem(0, "APR_Lock")) < B_NO_ERROR) { -- _thread_mutex_cleanup(new_m); -- return stat; -- } -- new_m->LockCount = 0; -- new_m->Lock = stat; -- new_m->pool = pool; - -- /* Optimal default is APR_THREAD_MUTEX_UNNESTED, -- * no additional checks required for either flag. -- */ -- new_m->nested = flags & APR_THREAD_MUTEX_NESTED; -+ stat = apr_beos_thread_mutex_init(new_m, flags, pool); -+ if (stat != APR_SUCCESS) -+ return stat; - - apr_pool_cleanup_register(new_m->pool, (void *)new_m, _thread_mutex_cleanup, - apr_pool_cleanup_null); -@@ -90,13 +100,13 @@ - return APR_SUCCESS; - } - -- if (atomic_add(&mutex->LockCount, 1) > 0) { -- if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) { -+ if (atomic_add(&mutex->LockCount, 1) > 0) { -+ if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) { - /* Oh dear, acquire_sem failed!! */ -- atomic_add(&mutex->LockCount, -1); -- return stat; -- } -- } -+ atomic_add(&mutex->LockCount, -1); -+ return stat; -+ } -+ } - - mutex->owner = me; - mutex->owner_ref = 1; -@@ -119,7 +129,7 @@ - return APR_SUCCESS; - } - -- if (atomic_add(&mutex->LockCount, -1) > 1) { -+ if (atomic_add(&mutex->LockCount, -1) > 1) { - if ((stat = release_sem(mutex->Lock)) < B_NO_ERROR) { - atomic_add(&mutex->LockCount, 1); - return stat; -diff -urN apr-1.0.1.orig/locks/unix/proc_mutex.c apr-1.0.1/locks/unix/proc_mutex.c ---- apr-1.0.1.orig/locks/unix/proc_mutex.c 2004-06-15 10:21:22.000000000 +0200 -+++ apr-1.0.1/locks/unix/proc_mutex.c 2004-12-17 15:19:11.000000000 +0100 -@@ -717,6 +717,8 @@ - new_mutex->inter_meth = &mutex_proc_pthread_methods; - #elif APR_USE_POSIXSEM_SERIALIZE - new_mutex->inter_meth = &mutex_posixsem_methods; -+#elif APR_USE_BEOS_SEM_SERIALIZE -+ new_mutex->inter_meth = &mutex_beos_sem_methods; - #else - return APR_ENOTIMPL; - #endif -@@ -837,6 +839,9 @@ - #if APR_HAS_PROC_PTHREAD_SERIALIZE - ospmutex->pthread_interproc = pmutex->pthread_interproc; - #endif -+#if APR_HAS_BEOS_SEM_SERIALIZE -+ ospmutex->beos_sem = pmutex->beos_sem; -+#endif - return APR_SUCCESS; - } - -@@ -858,6 +863,9 @@ - #if APR_HAS_PROC_PTHREAD_SERIALIZE - (*pmutex)->pthread_interproc = ospmutex->pthread_interproc; - #endif -+#if APR_HAS_BEOS_SEM_SERIALIZE -+ (*pmutex)->beos_sem = ospmutex->beos_sem; -+#endif - return APR_SUCCESS; - } - -diff -urN apr-1.0.1.orig/misc/unix/start.c apr-1.0.1/misc/unix/start.c ---- apr-1.0.1.orig/misc/unix/start.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/misc/unix/start.c 2004-12-17 15:19:11.000000000 +0100 -@@ -22,6 +22,10 @@ - #include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ - #include "apr_arch_internal_time.h" - -+#ifdef BEOS -+#include "apr_arch_shm.h" /* for apr_beos_setup_shmem() */ -+#endif -+ - - APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, - const char * const * *argv, -@@ -51,6 +55,10 @@ - apr_unix_setup_time(); - #endif - -+#ifdef BEOS -+ apr_beos_setup_shmem(); -+#endif -+ - if ((status = apr_pool_initialize()) != APR_SUCCESS) - return status; - ---- apr-1.0.1.orig/network_io/beos/sendrecv.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/network_io/beos/sendrecv.c 2004-12-17 15:25:26.000000000 +0100 -@@ -17,9 +17,14 @@ - #if BEOS_BONE /* BONE uses the unix code - woohoo */ - #include "../unix/sendrecv.c" - #else -+#include -+ - #include "apr_arch_networkio.h" - #include "apr_time.h" - -+#define SEND_WAIT APR_USEC_PER_SEC / 100 -+#define RECEIVE_WAIT APR_USEC_PER_SEC / 100 -+ - static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read) - { - struct timeval tv, *tvptr; -@@ -37,6 +42,8 @@ - tv.tv_usec = sock->timeout % APR_USEC_PER_SEC; - tvptr = &tv; - } -+ /* This probably only works for read_for. At least according to the -+ * documentation only the read set argument is actually supported. */ - srv = select(sock->socketdes + 1, - for_read ? &fdset : NULL, - for_read ? NULL : &fdset, -@@ -54,38 +61,46 @@ - return APR_SUCCESS; - } - --#define SEND_WAIT APR_USEC_PER_SEC / 10 -+apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s, -+ int for_read) -+{ -+ /* BeOS net_server select() supports sockets only */ -+ if (!f) -+ return APR_ENOTIMPL; -+ -+ return wait_for_io_or_timeout(s, for_read); -+} - - APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf, - apr_size_t *len) - { - apr_ssize_t rv; -- -+ - do { - rv = send(sock->socketdes, buf, (*len), 0); - } while (rv == -1 && errno == EINTR); - - if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -- apr_int32_t snooze_val = SEND_WAIT; -- apr_int32_t zzz = 0; -- -- do { -- rv = send(sock->socketdes, buf, (*len), 0); -- if (rv == -1 && errno == EWOULDBLOCK){ -- apr_sleep (snooze_val); -- zzz += snooze_val; -- snooze_val += SEND_WAIT; -- /* have we passed our timeout value */ -- if (zzz > (sock->timeout * APR_USEC_PER_SEC)) -- break; -- } -- } while (rv == -1 && (errno == EINTR || errno == EWOULDBLOCK)); -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ -+ do { -+ rv = send(sock->socketdes, buf, (*len), 0); -+ } while (rv == -1 && errno == EINTR); -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - *len = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } -- (*len) = rv; -+ *len = rv; - - return APR_SUCCESS; - } -@@ -100,22 +115,30 @@ - } while (rv == -1 && errno == EINTR); - - if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -- apr_status_t arv = wait_for_io_or_timeout(sock, 1); -- if (arv != APR_SUCCESS) { -- *len = 0; -- return arv; -- } -- else { -+ /* bonefish: I don't know why, but in some cases select() seems to -+ * return success, even if there's nothing to read yet. Maybe if the -+ * connection is not yet established? The tests exposed this problem. -+ * Long story short, we have to poll here, too. */ -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ - do { - rv = recv(sock->socketdes, buf, (*len), 0); - } while (rv == -1 && errno == EINTR); -- } -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - (*len) = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } -- (*len) = rv; -+ *len = rv; - if (rv == 0) - return APR_EOF; - return APR_SUCCESS; -@@ -144,23 +167,28 @@ - where->salen); - } while (rv == -1 && errno == EINTR); - -- if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) -- && sock->timeout != 0) { -- apr_status_t arv = wait_for_io_or_timeout(sock, 0); -- if (arv != APR_SUCCESS) { -- *len = 0; -- return arv; -- } else { -+ -+ if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ - do { - rv = sendto(sock->socketdes, buf, (*len), flags, - (const struct sockaddr*)&where->sa, - where->salen); - } while (rv == -1 && errno == EINTR); -- } -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - *len = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } - *len = rv; - return APR_SUCCESS; -@@ -173,38 +201,38 @@ - { - apr_ssize_t rv; - -- if (from == NULL){ -- return APR_ENOMEM; -- /* Not sure if this is correct. Maybe we should just allocate -- the memory?? -- */ -- } -- - do { - rv = recvfrom(sock->socketdes, buf, (*len), flags, - (struct sockaddr*)&from->sa, &from->salen); - } while (rv == -1 && errno == EINTR); - -- if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) && -- sock->timeout != 0) { -- apr_status_t arv = wait_for_io_or_timeout(sock, 1); -- if (arv != APR_SUCCESS) { -- *len = 0; -- return arv; -- } else { -+ if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -+ /* bonefish: I don't know why, but in some cases select() seems to -+ * return success, even if there's nothing to read yet. Maybe if the -+ * connection is not yet established? The tests exposed this problem. -+ * Long story short, we have to poll here, too. */ -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ - do { - rv = recvfrom(sock->socketdes, buf, (*len), flags, - (struct sockaddr*)&from->sa, &from->salen); -- } while (rv == -1 && errno == EINTR); -- } -+ } while (rv == -1 && errno == EINTR); -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - (*len) = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } -- -- (*len) = rv; -- if (rv == 0) -+ *len = rv; -+ if (rv == 0 && sock->type == SOCK_STREAM) - return APR_EOF; - - return APR_SUCCESS; -diff -urN apr-1.0.1.orig/network_io/unix/sockaddr.c apr-1.0.1/network_io/unix/sockaddr.c ---- apr-1.0.1.orig/network_io/unix/sockaddr.c 2004-07-13 11:15:50.000000000 +0200 -+++ apr-1.0.1/network_io/unix/sockaddr.c 2004-12-17 15:19:11.000000000 +0100 -@@ -543,7 +543,7 @@ - - if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) { - if (!hostname || -- family != AF_UNSPEC || -+ family != APR_UNSPEC || - masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) { - return APR_EINVAL; - } -diff -urN apr-1.0.1.orig/network_io/unix/sockets.c apr-1.0.1/network_io/unix/sockets.c ---- apr-1.0.1.orig/network_io/unix/sockets.c 2004-03-10 21:58:34.000000000 +0100 -+++ apr-1.0.1/network_io/unix/sockets.c 2004-12-17 15:19:11.000000000 +0100 -@@ -20,9 +20,10 @@ - #include "apr_portable.h" - #include "apr_arch_inherit.h" - --#if defined(BEOS) && !defined(BEOS_BONE) -+#ifdef BEOS_R5 -+#undef close - #define close closesocket --#endif -+#endif /* BEOS_R5 */ - - static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */ - -@@ -92,7 +93,28 @@ - - alloc_socket(new, cont); - -+#ifndef BEOS_R5 - (*new)->socketdes = socket(family, type, protocol); -+#else -+ /* For any reason BeOS R5 has an unconventional protocol numbering, -+ * so we need to translate here. */ -+ switch (protocol) { -+ case 0: -+ (*new)->socketdes = socket(family, type, 0); -+ break; -+ case APR_PROTO_TCP: -+ (*new)->socketdes = socket(family, type, IPPROTO_TCP); -+ break; -+ case APR_PROTO_UDP: -+ (*new)->socketdes = socket(family, type, IPPROTO_UDP); -+ break; -+ case APR_PROTO_SCTP: -+ default: -+ errno = EPROTONOSUPPORT; -+ (*new)->socketdes = -1; -+ break; -+ } -+#endif /* BEOS_R5 */ - - #if APR_HAVE_IPV6 - if ((*new)->socketdes < 0 && ofamily == APR_UNSPEC) { -diff -urN apr-1.0.1.orig/network_io/unix/sockopt.c apr-1.0.1/network_io/unix/sockopt.c ---- apr-1.0.1.orig/network_io/unix/sockopt.c 2004-04-03 19:15:52.000000000 +0200 -+++ apr-1.0.1/network_io/unix/sockopt.c 2004-12-17 15:19:11.000000000 +0100 -@@ -323,6 +323,7 @@ - - apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark) - { -+#ifndef BEOS_R5 - int oobmark; - - if (ioctl(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0) -@@ -331,6 +332,9 @@ - *atmark = (oobmark != 0); - - return APR_SUCCESS; -+#else -+ return APR_ENOTIMPL; -+#endif - } - - -diff -urN apr-1.0.1.orig/shmem/beos/shm.c apr-1.0.1/shmem/beos/shm.c ---- apr-1.0.1.orig/shmem/beos/shm.c 2004-06-29 18:38:16.000000000 +0200 -+++ apr-1.0.1/shmem/beos/shm.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,25 +13,147 @@ - * limitations under the License. - */ - --#include "apr_general.h" --#include "apr_shm.h" -+#include "apr_arch_shm.h" -+#include "apr_arch_thread_mutex.h" - #include "apr_errno.h" - #include "apr_lib.h" -+#include "apr_general.h" -+#include "apr_portable.h" -+#include "apr_ring.h" -+#include "apr_shm.h" - #include "apr_strings.h" -+ -+#include - #include - #include --#include --#include "apr_portable.h" -+#include -+ -+#include -+ -+static struct apr_thread_mutex_t area_handles_lock; - --struct apr_shm_t { -- apr_pool_t *pool; -- void *memblock; -- void *ptr; -- apr_size_t reqsize; -- apr_size_t avail; -- area_id aid; -+APR_RING_HEAD(area_handle_list, beos_area_handle); -+static struct area_handle_list area_handles; -+ -+struct beos_area_handle { -+ APR_RING_ENTRY(beos_area_handle) link; -+ area_id id; /* area id */ -+ char *name; /* area name */ -+ void *address; /* base address */ -+ apr_size_t size; /* requested size */ -+ char *filename; /* name of the file, associated with the area */ -+ int fd; /* FD of the file, associated with the area */ -+ int use_count; /* how often attached in this process */ - }; - -+typedef struct shmem_file_info { -+ apr_size_t size; /* requested size of the shmem */ -+ char name[B_OS_NAME_LENGTH]; /* area name */ -+} shmem_file_info; -+ -+#define LOCK_AREA_HANDLES() apr_thread_mutex_lock(&area_handles_lock) -+#define UNLOCK_AREA_HANDLES() apr_thread_mutex_unlock(\ -+ &area_handles_lock) -+#define INIT_AREA_HANDLE_LINK(handle) APR_RING_ELEM_INIT(handle, link) -+#define FIRST_AREA_HANDLE() APR_RING_FIRST(&area_handles) -+#define NEXT_AREA_HANDLE(handle) APR_RING_NEXT(handle, link) -+#define AREA_HANDLES_END() APR_RING_SENTINEL(&area_handles, \ -+ beos_area_handle, link) -+#define ADD_AREA_HANDLE(handle) APR_RING_INSERT_TAIL(&area_handles, \ -+ handle, \ -+ beos_area_handle, \ -+ link) -+#define REMOVE_AREA_HANDLE(handle) APR_RING_REMOVE(handle, link) -+ -+/* Initializes the area handle list and the semaphore that protects it. Invoked -+ by apr_initialize(). */ -+apr_status_t apr_beos_setup_shmem() -+{ -+ APR_RING_INIT(&area_handles, beos_area_handle, link); -+ return apr_beos_thread_mutex_init(&area_handles_lock, 0, NULL); -+} -+ -+/* Called directly after fork() in the child process. Sets up the semaphore -+ that protects the area handle list in a child process and repairs the shared -+ memory areas. The problem is that BeOS fork() clones all areas copy on write, -+ which requires us to re-clone the parent's areas. */ -+apr_status_t apr_beos_shmem_child_init() -+{ -+ apr_status_t error; -+ beos_area_handle *handle; -+ -+ /* re-init the lock */ -+ error = apr_beos_thread_mutex_init(&area_handles_lock, 0, NULL); -+ if (error != B_OK) -+ return error; -+ -+ /* now iterate through the area handle list and clone all areas */ -+ for (handle = FIRST_AREA_HANDLE(); -+ handle != AREA_HANDLES_END(); -+ handle = NEXT_AREA_HANDLE(handle)) { -+ /* delete the clone area and clone the original one */ -+ delete_area(area_for(handle->address)); -+ handle->id = clone_area(handle->name, &(handle->address), -+ B_EXACT_ADDRESS, B_READ_AREA | B_WRITE_AREA, -+ handle->id); -+ if (handle->id < 0) -+ return handle->id; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+/* Creates a new area handle from a given valid area_info. */ -+static beos_area_handle *create_area_handle(area_id id, const char *name, -+ void *address, apr_size_t size, -+ const char *filename, int fd, -+ int useCount) -+{ -+ beos_area_handle *handle -+ = (beos_area_handle*)malloc(sizeof(beos_area_handle)); -+ if (!handle) -+ return NULL; -+ -+ INIT_AREA_HANDLE_LINK(handle); -+ handle->id = id; -+ handle->name = strdup(name); -+ handle->address = address; -+ handle->size = size; -+ handle->filename = (filename ? strdup(filename) : NULL); -+ handle->fd = fd; -+ handle->use_count = useCount; -+ -+ if (!handle->name || (filename && !handle->filename)) { -+ free(handle->name); -+ free(handle->filename); -+ free(handle); -+ return NULL; -+ } -+ -+ return handle; -+} -+ -+static apr_status_t shm_cleanup(void *_m) -+{ -+ apr_shm_t *m = (apr_shm_t*)_m; -+ -+ LOCK_AREA_HANDLES(); -+ -+ if (m->handle && --m->handle->use_count == 0) { -+ REMOVE_AREA_HANDLE(m->handle); -+ delete_area(m->handle->id); -+ if (m->handle->fd >= 0) -+ close(m->handle->fd); -+ free(m->handle->name); -+ free(m->handle); -+ } -+ m->handle = NULL; -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ return APR_SUCCESS; -+} -+ - APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, - apr_size_t reqsize, - const char *filename, -@@ -40,53 +162,102 @@ - apr_size_t pagesize; - area_id newid; - char *addr; -- char shname[B_OS_NAME_LENGTH]; -+ shmem_file_info fileInfo; -+ char *shname = fileInfo.name; -+ int fd = -1; -+ int num = 0; -+ status_t error = B_OK; -+ beos_area_handle *handle = NULL; - - (*m) = (apr_shm_t *)apr_pcalloc(p, sizeof(apr_shm_t)); - /* we MUST allocate in pages, so calculate how big an area we need... */ - pagesize = ((reqsize + B_PAGE_SIZE - 1) / B_PAGE_SIZE) * B_PAGE_SIZE; -- -- if (!filename) { -- int num = 0; -- snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld", find_thread(NULL)); -- while (find_area(shname) >= 0) -- snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld_%d", -- find_thread(NULL), num++); -- } -- newid = create_area(filename ? filename : shname, -- (void*)&addr, B_ANY_ADDRESS, -- pagesize, B_LAZY_LOCK, B_READ_AREA|B_WRITE_AREA); - -- if (newid < 0) -- return errno; -+ -+ /* create a unique name for the area */ -+ snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld", find_thread(NULL)); -+ while (find_area(shname) >= 0) -+ snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld_%d", -+ find_thread(NULL), num++); -+ -+ LOCK_AREA_HANDLES(); -+ -+ /* if a file name was given, create the file */ -+ if (filename) { -+ fd = open(filename, O_RDWR |O_CREAT | O_TRUNC | O_EXCL, -+ S_IRUSR | S_IWUSR, S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); -+ if (fd < 0) -+ return errno; -+ } -+ -+ /* write the shmem info to the file */ -+ if (fd >= 0) { -+ int len = (shname + strlen(shname)) - (char*)&fileInfo; -+ fileInfo.size = reqsize; -+ if (write(fd, &fileInfo, len) < 0) -+ error = errno; -+ } -+ -+ /* allocate the area */ -+ if (error == B_OK) { -+ newid = create_area(shname, (void*)&addr, B_ANY_ADDRESS, -+ pagesize, B_LAZY_LOCK, B_READ_AREA | B_WRITE_AREA); -+ if (newid < 0) -+ error = newid; -+ } -+ -+ /* allocate an area handle */ -+ if (error == B_OK) { -+ handle = create_area_handle(newid, shname, addr, reqsize, filename, fd, -+ 1); -+ /* add it to the list */ -+ if (handle) -+ ADD_AREA_HANDLE(handle); -+ else -+ error = APR_ENOMEM; -+ } -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ /* cleanup on error */ -+ if (error != B_OK) { -+ if (newid >= 0) -+ delete_area(newid); -+ if (filename) -+ unlink(filename); -+ close(fd); -+ return error; -+ } - - (*m)->pool = p; -- (*m)->aid = newid; -- (*m)->memblock = addr; -- (*m)->ptr = (void*)addr; -- (*m)->avail = pagesize; /* record how big an area we actually created... */ -- (*m)->reqsize = reqsize; -+ (*m)->handle = handle; -+ -+ apr_pool_cleanup_register(p, *m, shm_cleanup, apr_pool_cleanup_null); - - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m) - { -- delete_area(m->aid); -- m->avail = 0; -- m->memblock = NULL; -- return APR_SUCCESS; -+ LOCK_AREA_HANDLES(); -+ -+ if (m->handle && m->handle->filename) { -+ unlink(m->handle->filename); -+ free(m->handle->filename); -+ m->handle->filename = NULL; -+ } -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ return apr_pool_cleanup_run(m->pool, m, shm_cleanup); - } - - APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename, - apr_pool_t *pool) - { -- area_id deleteme = find_area(filename); -- -- if (deleteme == B_NAME_NOT_FOUND) -- return APR_EINVAL; -+ if (unlink(filename) < 0) -+ return errno; - -- delete_area(deleteme); - return APR_SUCCESS; - } - -@@ -94,58 +265,132 @@ - const char *filename, - apr_pool_t *pool) - { -- area_info ai; -- thread_info ti; -- apr_shm_t *new_m; -- area_id deleteme = find_area(filename); -- -- if (deleteme == B_NAME_NOT_FOUND) -+ int fd = -1; -+ shmem_file_info fileInfo; -+ char *areaName = fileInfo.name; -+ int fileInfoLen; -+ int nameLen = 0; -+ beos_area_handle *handle = NULL; -+ area_id id = -1; -+ status_t error = B_OK; -+ -+ /* open the file */ -+ fd = open(filename, O_RDONLY); -+ if (fd < 0) - return APR_EINVAL; - -- new_m = (apr_shm_t*)apr_palloc(pool, sizeof(apr_shm_t*)); -- if (new_m == NULL) -- return APR_ENOMEM; -- new_m->pool = pool; -- -- get_area_info(deleteme, &ai); -- get_thread_info(find_thread(NULL), &ti); -- -- if (ti.team != ai.team) { -- area_id narea; -- -- narea = clone_area(ai.name, &(ai.address), B_CLONE_ADDRESS, -- B_READ_AREA|B_WRITE_AREA, ai.area); -- -- if (narea < B_OK) -- return narea; -- -- get_area_info(narea, &ai); -- new_m->aid = narea; -- new_m->memblock = ai.address; -- new_m->ptr = (void*)ai.address; -- new_m->avail = ai.size; -- new_m->reqsize = ai.size; -+ /* read the file info */ -+ fileInfoLen = read(fd, &fileInfo, sizeof(shmem_file_info) - 1); -+ if (fileInfoLen > 0) { -+ nameLen = (char*)&fileInfo + fileInfoLen - areaName; -+ if (nameLen > 0) { -+ areaName[nameLen] = '\0'; -+ nameLen = strlen(areaName); -+ } -+ } -+ if (nameLen <= 0) -+ error = APR_EINVAL; -+ -+ LOCK_AREA_HANDLES(); -+ -+ /* check, if we already know the area */ -+ if (error == B_OK) { -+ beos_area_handle *itHandle; -+ for (itHandle = FIRST_AREA_HANDLE(); -+ itHandle != AREA_HANDLES_END(); -+ itHandle = NEXT_AREA_HANDLE(itHandle)) { -+ if (strcmp(itHandle->name, areaName) == 0) { -+ /* OK, found */ -+ handle = itHandle; -+ close(fd); -+ fd = -1; -+ break; -+ } -+ } -+ } -+ -+ /* if we don't know the area yet, get it */ -+ if (error == B_OK && !handle) { -+ id = find_area(areaName); -+ if (id < 0) -+ error = APR_EINVAL; -+ } -+ -+ /* if we have no error till now, then there definitely exists an area */ -+ if (error == B_OK) { -+ /* allocate memory for the new shared memory handle */ -+ *m = (apr_shm_t*)apr_palloc(pool, sizeof(apr_shm_t*)); -+ if (!*m) -+ error = APR_ENOMEM; - } - -- (*m) = new_m; -+ /* if we don't know the area yet, we clone it */ -+ if (error == B_OK && !handle) { -+ area_info areaInfo; -+ error = get_area_info(id, &areaInfo); -+ if (error == B_OK && areaInfo.size < fileInfo.size) { -+ /* something's fishy: the actual area size is less than the -+ * shmem region it is supposed to contain */ -+ error = APR_EINVAL; -+ } -+ if (error == B_OK) { -+ void *address; -+ id = clone_area(areaInfo.name, &address, B_ANY_ADDRESS, -+ B_READ_AREA | B_WRITE_AREA, areaInfo.area); -+ if (id >= 0) { -+ /* create the area */ -+ handle = create_area_handle(id, areaName, address, -+ fileInfo.size, filename, fd, 0); -+ /* The size we supply here is actually not the real size -+ * of the shared memory region, but is rounded up to a -+ * page size multiple. We could store the real size in -+ * the file. */ - -- return APR_SUCCESS; -+ /* add it to the list */ -+ if (handle) { -+ ADD_AREA_HANDLE(handle); -+ } -+ else { -+ delete_area(id); -+ error = APR_ENOMEM; -+ } -+ } -+ else -+ error = id; -+ } -+ } -+ -+ /* now we should have a handle -- nothing can go wrong anymore */ -+ if (error == B_OK) { -+ (*m)->pool = pool; -+ (*m)->handle = handle; -+ (*m)->handle->use_count++; -+ apr_pool_cleanup_register(pool, *m, shm_cleanup, apr_pool_cleanup_null); -+ } -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ /* cleanup on error */ -+ if (error != B_OK) { -+ close(fd); -+ } -+ -+ return error; - } - - APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m) - { -- delete_area(m->aid); -- return APR_SUCCESS; -+ return apr_pool_cleanup_run(m->pool, m, shm_cleanup); - } - - APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m) - { -- return m->memblock; -+ return (m->handle ? m->handle->address : NULL); - } - - APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m) - { -- return m->reqsize; -+ return (m->handle ? m->handle->size : 0); - } - - APR_POOL_IMPLEMENT_ACCESSOR(shm) -diff -urN apr-1.0.1.orig/test/Makefile.in apr-1.0.1/test/Makefile.in ---- apr-1.0.1.orig/test/Makefile.in 2004-11-17 02:07:02.000000000 +0100 -+++ apr-1.0.1/test/Makefile.in 2004-12-17 15:19:11.000000000 +0100 -@@ -72,7 +72,7 @@ - $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -c $(srcdir)/mod_test.c && touch $@ - - mod_test.la: mod_test.slo $(LOCAL_LIBS) -- $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ -+ $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(LOCAL_LIBS) $(ALL_LIBS) - - libmod_test.la: mod_test.slo $(LOCAL_LIBS) - $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(LOCAL_LIBS) $(ALL_LIBS) -diff -urN apr-1.0.1.orig/test/testdso.c apr-1.0.1/test/testdso.c ---- apr-1.0.1.orig/test/testdso.c 2004-05-14 16:43:22.000000000 +0200 -+++ apr-1.0.1/test/testdso.c 2004-12-17 15:19:11.000000000 +0100 -@@ -77,9 +77,11 @@ - ABTS_ASSERT(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status); - ABTS_PTR_NOTNULL(tc, func1); - -- function = (void (*)(char *))func1; -- (*function)(teststr); -- ABTS_STR_EQUAL(tc, "Hello - I'm a DSO!\n", teststr); -+ if (status == APR_SUCCESS) { -+ function = (void (*)(char *))func1; -+ (*function)(teststr); -+ ABTS_STR_EQUAL(tc, "Hello - I'm a DSO!\n", teststr); -+ } - - apr_dso_unload(h); - } -@@ -100,9 +102,11 @@ - ABTS_ASSERT(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status); - ABTS_PTR_NOTNULL(tc, func1); - -- function = (int (*)(int))func1; -- status = (*function)(5); -- ABTS_INT_EQUAL(tc, 5, status); -+ if (status == APR_SUCCESS) { -+ function = (int (*)(int))func1; -+ status = (*function)(5); -+ ABTS_INT_EQUAL(tc, 5, status); -+ } - - apr_dso_unload(h); - } -diff -urN apr-1.0.1.orig/test/testpipe.c apr-1.0.1/test/testpipe.c ---- apr-1.0.1.orig/test/testpipe.c 2004-05-14 16:43:22.000000000 +0200 -+++ apr-1.0.1/test/testpipe.c 2004-12-17 15:19:11.000000000 +0100 -@@ -23,6 +23,11 @@ - #include "apr_thread_proc.h" - #include "apr_strings.h" - -+/* BeOS doesn't offer non-blocking pipes */ -+#if defined(BEOS) -+# define BLOCKING_PIPE_ONLY -+#endif -+ - static apr_file_t *readp = NULL; - static apr_file_t *writep = NULL; - -@@ -60,6 +65,10 @@ - ABTS_PTR_NOTNULL(tc, readp); - ABTS_PTR_NOTNULL(tc, writep); - -+#ifdef BLOCKING_PIPE_ONLY -+ (void)timeout; -+ ABTS_NOT_IMPL(tc, "no non-blocking pipe support"); -+#else - rv = apr_file_pipe_timeout_get(readp, &timeout); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, -1, timeout); -@@ -70,6 +79,7 @@ - rv = apr_file_pipe_timeout_get(readp, &timeout); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, apr_time_from_sec(1), timeout); -+#endif - } - - static void read_write(abts_case *tc, void *data) -@@ -86,12 +96,16 @@ - ABTS_PTR_NOTNULL(tc, readp); - ABTS_PTR_NOTNULL(tc, writep); - -+#ifdef BLOCKING_PIPE_ONLY -+ ABTS_NOT_IMPL(tc, "no non-blocking pipe support"); -+#else - rv = apr_file_pipe_timeout_set(readp, apr_time_from_sec(1)); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - - rv = apr_file_read(readp, buf, &nbytes); - ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); - ABTS_INT_EQUAL(tc, 0, nbytes); -+#endif - } - - static void read_write_notimeout(abts_case *tc, void *data) -@@ -122,6 +136,9 @@ - - static void test_pipe_writefull(abts_case *tc, void *data) - { -+#ifdef BLOCKING_PIPE_ONLY -+ ABTS_NOT_IMPL(tc, "no non-blocking pipe support"); -+#else - int iterations = 1000; - int i; - int bytes_per_iteration = 8000; -@@ -177,6 +194,7 @@ - apr_proc_wait(&proc, NULL, &why, APR_WAIT) == APR_CHILD_DONE); - - ABTS_ASSERT(tc, "child terminated normally", why == APR_PROC_EXIT); -+#endif - } - - abts_suite *testpipe(abts_suite *suite) -diff -urN apr-1.0.1.orig/test/testpoll.c apr-1.0.1/test/testpoll.c ---- apr-1.0.1.orig/test/testpoll.c 2004-07-06 05:38:06.000000000 +0200 -+++ apr-1.0.1/test/testpoll.c 2004-12-17 15:19:11.000000000 +0100 -@@ -21,6 +21,11 @@ - #include "apr_network_io.h" - #include "apr_poll.h" - -+/* non-BONE BeOS select() only supports the read set */ -+#if defined(BEOS) && !defined(HAVE_BONE_VERSION) -+# define NO_POLLOUT_SUPPORT 1 -+#endif -+ - #define SMALL_NUM_SOCKETS 3 - /* We can't use 64 here, because some platforms *ahem* Solaris *ahem* have - * a default limit of 64 open file descriptors per process. If we use -@@ -425,6 +430,9 @@ - - static void pollset_remove(abts_case *tc, void *data) - { -+#ifdef NO_POLLOUT_SUPPORT -+ ABTS_NOT_IMPL(tc, "no APR_POLLOUT support"); -+#else - apr_status_t rv; - apr_pollset_t *pollset; - const apr_pollfd_t *hot_files; -@@ -497,6 +505,7 @@ - (hot_files[1].client_data == (void *)4)) || - ((hot_files[0].client_data == (void *)4) && - (hot_files[1].client_data == (void *)1))); -+#endif - } - - abts_suite *testpoll(abts_suite *suite) -@@ -527,9 +536,7 @@ - abts_run_test(suite, clear_middle_pollset, NULL); - abts_run_test(suite, send_last_pollset, NULL); - abts_run_test(suite, clear_last_pollset, NULL); -- - abts_run_test(suite, pollset_remove, NULL); -- - abts_run_test(suite, close_all_sockets, NULL); - - return suite; -diff -urN apr-1.0.1.orig/test/testsockopt.c apr-1.0.1/test/testsockopt.c ---- apr-1.0.1.orig/test/testsockopt.c 2004-08-01 00:36:03.000000000 +0200 -+++ apr-1.0.1/test/testsockopt.c 2004-12-17 15:19:11.000000000 +0100 -@@ -19,6 +19,11 @@ - #include "apr_lib.h" - #include "testutil.h" - -+/* non-BONE BeOS versions don't know SO_KEEPALIVE */ -+#if defined(BEOS) && !defined(HAVE_BONE_VERSION) -+# define NO_SO_KEEPALIVE 1 -+#endif -+ - static apr_socket_t *sock = NULL; - - static void create_socket(abts_case *tc, void *data) -@@ -32,6 +37,9 @@ - - static void set_keepalive(abts_case *tc, void *data) - { -+#ifdef NO_SO_KEEPALIVE -+ ABTS_NOT_IMPL(tc, "no SO_KEEPALIVE socket option"); -+#else - apr_status_t rv; - apr_int32_t ck; - -@@ -41,6 +49,7 @@ - rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, ck); -+#endif - } - - static void set_debug(abts_case *tc, void *data) -@@ -62,6 +71,9 @@ - - static void remove_keepalive(abts_case *tc, void *data) - { -+#ifdef NO_SO_KEEPALIVE -+ ABTS_NOT_IMPL(tc, "no SO_KEEPALIVE socket option"); -+#else - apr_status_t rv; - apr_int32_t ck; - -@@ -75,6 +87,7 @@ - rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 0, ck); -+#endif - } - - static void corkable(abts_case *tc, void *data) -diff -urN apr-1.0.1.orig/threadproc/beos/Makefile.in apr-1.0.1/threadproc/beos/Makefile.in ---- apr-1.0.1.orig/threadproc/beos/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ apr-1.0.1/threadproc/beos/Makefile.in 2004-12-17 15:18:45.000000000 +0100 -@@ -0,0 +1,21 @@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+TARGETS = \ -+ apr_proc_stub -+ -+# bring in rules.mk for standard functionality -+@INCLUDE_RULES@ -+ -+INCDIR=../../include -+OSDIR=$(INCDIR)/arch/@OSDIR@ -+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(OSDIR) -I$(DEFOSDIR) -+ -+CLEAN_TARGETS = apr_proc_stub /boot/home/config/bin/apr_proc_stub -+ -+apr_proc_stub: -+ $(CC) apr_proc_stub.c \ -+ && cp apr_proc_stub /boot/home/config/bin -+ -+# DO NOT REMOVE -diff -urN apr-1.0.1.orig/threadproc/beos/apr_proc_stub.c apr-1.0.1/threadproc/beos/apr_proc_stub.c ---- apr-1.0.1.orig/threadproc/beos/apr_proc_stub.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/threadproc/beos/apr_proc_stub.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,15 +13,17 @@ - * limitations under the License. - */ - -+#include - #include - #include - #include - #include - - struct pipefd { -- int in; -- int out; -- int err; -+ int in; -+ int out; -+ int err; -+ port_id port; - }; - - int main(int argc, char *argv[]) { -@@ -32,44 +34,65 @@ - * argv[2] = progname to execute - * rest of arguments to be passed to program - */ -- char *progname = argv[2]; -- char *directory = argv[1]; -- struct pipefd *pfd; -- thread_id sender; -- void *buffer; -- char ** newargs; -- int i = 0; -- -- newargs = (char**)malloc(sizeof(char*) * (argc - 1)); -- -- buffer = (void*)malloc(sizeof(struct pipefd)); -- /* this will block until we get the data */ -- receive_data(&sender, buffer, sizeof(struct pipefd)); -- pfd = (struct pipefd*)buffer; -- -- if (pfd->in > STDERR_FILENO) { -- if (dup2(pfd->in, STDIN_FILENO) != STDIN_FILENO) return (-1); -- close (pfd->in); -- } -- if (pfd->out > STDERR_FILENO) { -- if (dup2(pfd->out, STDOUT_FILENO) != STDOUT_FILENO) return (-1); -- close (pfd->out); -- } -- if (pfd->err > STDERR_FILENO) { -- if (dup2(pfd->err, STDERR_FILENO) != STDERR_FILENO) return (-1); -- close (pfd->err); -- } -- -- for (i=3;i<=argc;i++){ -- newargs[i-3] = argv[i]; -- } -- -- /* tell the caller we're OK to start */ -- send_data(sender,1,NULL,0); -- -- if (directory != NULL) -- chdir(directory); -- execve (progname, newargs, environ); -+ char *progname = argv[2]; -+ char *directory = argv[1]; -+ struct pipefd pfd; -+ thread_id sender; -+ char **newargs = argv + 3; -+ int i = 0; -+ status_t error = B_OK; -+ -+ /* this will block until we get the data */ -+ receive_data(&sender, &pfd, sizeof(struct pipefd)); -+ -+ if (argc < 3) -+ error = B_BAD_VALUE; -+ -+ newargs = (char**)malloc(sizeof(char*) * (argc - 1)); -+ for (i=3;i<=argc;i++) { -+ newargs[i-3] = argv[i]; -+ } -+ -+ if (error == B_OK && pfd.in > STDERR_FILENO) { -+ if (dup2(pfd.in, STDIN_FILENO) != STDIN_FILENO) -+ error = errno; -+ close(pfd.in); -+ } -+ if (error == B_OK && pfd.out > STDERR_FILENO) { -+ if (dup2(pfd.out, STDOUT_FILENO) != STDOUT_FILENO) -+ error = errno; -+ close(pfd.out); -+ } -+ if (error == B_OK && pfd.err > STDERR_FILENO) { -+ if (dup2(pfd.err, STDERR_FILENO) != STDERR_FILENO) -+ error = errno; -+ close(pfd.err); -+ } -+ -+ if (error == B_OK && chdir(directory) < 0) -+ error = errno; -+ -+ if (error == B_OK) { -+ /* get our parent's team ID (the port owner) and our team ID */ -+ port_info portInfo; -+ thread_info threadInfo; -+ get_port_info(pfd.port, &portInfo); -+ get_thread_info(find_thread(NULL), &threadInfo); -+ -+ /* transfer the port ownership to us, so the the port will -+ * automatically be deleted, if execv() succeeds */ -+ set_port_owner(pfd.port, threadInfo.team); -+ -+ if (execv(progname, newargs) < 0) -+ error = errno; -+ -+ /* execv() failed; transfer the port ownership back to our parent, -+ * so that we can send the error code to it */ -+ set_port_owner(pfd.port, portInfo.team); -+ } - -- return (-1); -+ /* something went wrong; send our parent the error code */ -+ write_port(pfd.port, 0, &error, sizeof(error)); -+ -+ return (-1); - } -diff -urN apr-1.0.1.orig/threadproc/beos/proc.c apr-1.0.1/threadproc/beos/proc.c ---- apr-1.0.1.orig/threadproc/beos/proc.c 2004-06-29 18:35:57.000000000 +0200 -+++ apr-1.0.1/threadproc/beos/proc.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,13 +13,22 @@ - * limitations under the License. - */ - -+#include "apr_arch_shm.h" - #include "apr_arch_threadproc.h" -+#include "apr_random.h" -+#include "apr_signal.h" - #include "apr_strings.h" - -+#include -+#include -+ -+#include -+ - struct send_pipe { -- int in; -- int out; -- int err; -+ int in; -+ int out; -+ int err; -+ port_id port; - }; - - APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *pool) -@@ -113,18 +122,11 @@ - APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, - const char *dir) - { -- char * cwd; -- if (dir[0] != '/') { -- cwd = (char*)malloc(sizeof(char) * PATH_MAX); -- getcwd(cwd, PATH_MAX); -- attr->currdir = (char *)apr_pstrcat(attr->pool, cwd, "/", dir, NULL); -- free(cwd); -- } else { -- attr->currdir = (char *)apr_pstrdup(attr->pool, dir); -- } -+ attr->currdir = apr_pstrdup(attr->pool, dir); - if (attr->currdir) { - return APR_SUCCESS; - } -+ - return APR_ENOMEM; - } - -@@ -144,53 +146,53 @@ - APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool) - { - int pid; -+ port_id port; -+ status_t error = B_OK; -+ status_t childInitError = B_OK; -+ int32 code; -+ -+ /* we create a port through which the child will send us whether its -+ * initialization was successful */ -+ port = create_port(1, "apr_fork"); -+ if (port < 0) -+ return port; - - if ((pid = fork()) < 0) { -+ delete_port(port); - return errno; - } - else if (pid == 0) { -- /* This is really ugly... -- * The semantics of BeOS's fork() are that areas (used for shared -- * memory) get COW'd :-( The only way we can make shared memory -- * work across fork() is therefore to find any areas that have -- * been created and then clone them into our address space. -- * Thankfully only COW'd areas have the lock variable set at -- * anything but 0, so we can use that to find the areas we need to -- * copy. Of course what makes it even worse is that the loop through -- * the area's will go into an infinite loop, eating memory and then -- * eventually segfault unless we know when we reach then end of the -- * "original" areas and stop. Why? Well, we delete the area and then -- * add another to the end of the list... -- */ -- area_info ai; -- int32 cookie = 0; -- area_id highest = 0; -- -- while (get_next_area_info(0, &cookie, &ai) == B_OK) -- if (ai.area > highest) -- highest = ai.area; -- cookie = 0; -- while (get_next_area_info(0, &cookie, &ai) == B_OK) { -- if (ai.area > highest) -- break; -- if (ai.lock > 0) { -- area_id original = find_area(ai.name); -- delete_area(ai.area); -- clone_area(ai.name, &ai.address, B_CLONE_ADDRESS, -- ai.protection, original); -- } -- } -- - proc->pid = pid; -- proc->in = NULL; -+ proc->in = NULL; - proc->out = NULL; - proc->err = NULL; -+ -+ error = apr_beos_shmem_child_init(); -+ write_port(port, 0, &error, sizeof(error)); -+ if (error != B_OK) -+ exit(1); -+ -+ apr_random_after_fork(proc); -+ - return APR_INCHILD; - } - proc->pid = pid; - proc->in = NULL; - proc->out = NULL; - proc->err = NULL; -+ -+ /* get the child initialization status */ -+ do { -+ error = read_port(port, &code, &childInitError, sizeof(childInitError)); -+ } while (error == EINTR); -+ -+ delete_port(port); -+ -+ if (error >= B_OK) -+ error = childInitError; -+ if (error != B_OK) -+ return error; -+ - return APR_INPARENT; - } - -@@ -215,62 +217,234 @@ - return APR_SUCCESS; - } - -+static status_t find_program(const char **resolvedProgramName, -+ const char *programName, apr_procattr_t *attr, -+ const char *const *env, apr_pool_t *pool) -+{ -+ const char *pathVarName = "PATH="; -+ int pathVarNameLen = strlen(pathVarName); -+ const char *paths = NULL; -+ int programNameLen = strlen(programName); -+ int i; -+ -+ /* If the program name is absolute, then there's nothing to do. -+ * If the program name consists of more than one path element, then we -+ * consider it a relative path and don't search in PATH either. */ -+ if (*programName == '/' || strchr(programName, '/')) { -+ *resolvedProgramName = programName; -+ return B_OK; -+ } -+ -+ /* get the PATH environment variable */ -+ for (i = 0; env[i]; i++) { -+ const char *var = env[i]; -+ if (strncmp(var, pathVarName, pathVarNameLen) == 0) { -+ paths = var + pathVarNameLen; -+ break; -+ } -+ } -+ if (!paths) -+ return APR_ENOENT; -+ -+ /* iterate through the paths */ -+ do { -+ const char *pathEnd = strchr(paths, ':'); -+ int pathLen = (pathEnd ? pathEnd - paths : strlen(paths)); -+ -+ /* We skip empty paths and those that would become too long. -+ * The latter is not really correct, but practically irrelevant. */ -+ if (pathLen > 0 -+ && pathLen + 1 + programNameLen < B_PATH_NAME_LENGTH) { -+ /* get the path */ -+ char path[B_PATH_NAME_LENGTH]; -+ struct stat st; -+ memcpy(path, paths, pathLen); -+ path[pathLen] = '\0'; -+ -+ /* get the program path */ -+ strcat(path, "/"); -+ strcat(path, programName); -+ -+ /* stat() the path to be sure, there is a file */ -+ if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { -+ /* If the path is relative, we make it absolute by -+ * prepending the current working directory, so there -+ * won't be problems when changing the cwd later */ -+ if (*path == '/') { -+ *resolvedProgramName = apr_pstrdup(pool, path); -+ } -+ else { -+ char cwd[B_PATH_NAME_LENGTH]; -+ getcwd(cwd, sizeof(cwd)); -+ *resolvedProgramName = apr_pstrcat(pool, cwd, "/", -+ path, NULL); -+ } -+ return B_OK; -+ } -+ } -+ -+ paths = (pathEnd ? pathEnd + 1 : NULL); -+ } while (paths); -+ -+ /* not found in PATH */ -+ return APR_ENOENT; -+} -+ -+typedef struct char_buffer { -+ char *buffer; -+ int size; -+} char_buffer; -+ -+static void append_char(char_buffer *buffer, char c) -+{ -+ if (buffer->buffer) { -+ *(buffer->buffer) = c; -+ buffer->buffer++; -+ } -+ buffer->size++; -+} -+ -+static void prepare_shell_args(const char *progname, const char * const *args, -+ int argc, char_buffer *buffer) -+{ -+ int i; -+ -+ for (i = 0; i < argc; i++) { -+ const char *arg = args[i]; -+ -+ /* replace the first argument with the program name and separate the -+ * other arguments with a space */ -+ if (i == 0) -+ arg = progname; -+ else -+ append_char(buffer, ' '); -+ -+ if (*arg == '\0') { -+ /* empty arg */ -+ append_char(buffer, '"'); -+ append_char(buffer, '"'); -+ } -+ else { -+ while (*arg) { -+ /* escape special characters */ -+ if (strchr(" ()?*&\"'[]^\\~|;!<>*$", *arg)) -+ append_char(buffer, '\\'); -+ append_char(buffer, *arg); -+ arg++; -+ } -+ } -+ } -+} -+ - APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, const char *progname, - const char * const *args, - const char * const *env, - apr_procattr_t *attr, - apr_pool_t *pool) - { -- int i=0,nargs=0; -- char **newargs = NULL; -- thread_id newproc, sender; -- struct send_pipe *sp; -- char * dir = NULL; -- -- sp = (struct send_pipe *)apr_palloc(pool, sizeof(struct send_pipe)); -+ int i = 0, nargs = 0; -+ const char **newargs = NULL; -+ thread_id newproc; -+ struct send_pipe sp; -+ const char *shellArgs[4] = { SHELL_PATH, "-c", NULL, NULL }; -+ status_t error; -+ status_t childError; - - new->in = attr->parent_in; - new->err = attr->parent_err; - new->out = attr->parent_out; -- sp->in = attr->child_in ? attr->child_in->filedes : -1; -- sp->out = attr->child_out ? attr->child_out->filedes : -1; -- sp->err = attr->child_err ? attr->child_err->filedes : -1; -+ sp.in = attr->child_in ? attr->child_in->filedes : -1; -+ sp.out = attr->child_out ? attr->child_out->filedes : -1; -+ sp.err = attr->child_err ? attr->child_err->filedes : -1; -+ -+ /* Get the correct environment to use. */ -+ switch (attr->cmdtype) { -+ case APR_SHELLCMD: -+ case APR_PROGRAM: -+ break; -+ case APR_PROGRAM_ENV: -+ case APR_PROGRAM_PATH: -+ case APR_SHELLCMD_ENV: -+ env = (const char *const*)environ; -+ break; -+ } -+ if (!env) -+ env = (const char *const*)environ; -+ -+ /* In case of APR_PROGRAM_PATH we need to find the program ourselves. In -+ * the other cases, the program name shall either be considered a path or -+ * the shell searches for the program. */ -+ if (attr->cmdtype == APR_PROGRAM_PATH) { -+ error = find_program(&progname, progname, attr, env, pool); -+ if (error != B_OK) -+ return error; -+ } -+ -+ /* if the program shall be started via shell, we need to prepare the -+ * arguments */ -+ if (attr->cmdtype == APR_SHELLCMD || attr->cmdtype == APR_SHELLCMD_ENV) { -+ char_buffer charBuffer = { NULL, 0 }; -+ int argc = 0; -+ -+ /* count the arguments */ -+ while (args && args[argc]) { -+ argc++; -+ } -+ if (argc == 0) -+ return APR_EINVAL; -+ -+ /* first we get the length */ -+ prepare_shell_args(progname, args, argc, &charBuffer); - -+ /* allocate the memory and get the args for real */ -+ charBuffer.buffer = (char*)apr_palloc(pool, charBuffer.size + 1); -+ charBuffer.size = 0; -+ shellArgs[2] = charBuffer.buffer; -+ prepare_shell_args(progname, args, argc, &charBuffer); -+ *(charBuffer.buffer) = '\0'; -+ -+ /* replace the program name and the arguments */ -+ progname = shellArgs[0]; -+ args = shellArgs; -+ } -+ -+ /* count the arguments */ - i = 0; - while (args && args[i]) { - i++; - } - -- newargs = (char**)malloc(sizeof(char *) * (i + 4)); -- newargs[0] = strdup("/boot/home/config/bin/apr_proc_stub"); -+ newargs = (const char**)malloc(sizeof(const char *) * (i + 4)); -+ newargs[0] = "/boot/home/config/bin/apr_proc_stub"; - if (attr->currdir == NULL) { -- /* we require the directory , so use a temp. variable */ -- dir = malloc(sizeof(char) * PATH_MAX); -- getcwd(dir, PATH_MAX); -- newargs[1] = strdup(dir); -- free(dir); -- } else { -- newargs[1] = strdup(attr->currdir); -+ newargs[1] = "."; - } -- newargs[2] = strdup(progname); -+ else { -+ newargs[1] = attr->currdir; -+ } -+ newargs[2] = progname; - i=0;nargs = 3; - - while (args && args[i]) { -- newargs[nargs] = strdup(args[i]); -+ newargs[nargs] = args[i]; - i++;nargs++; - } - newargs[nargs] = NULL; - -- /* ### we should be looking at attr->cmdtype in here... */ -- -- newproc = load_image(nargs, (const char**)newargs, (const char**)env); -+ /* create a temporary port, the stub will use to report an error back to -+ * us */ -+ sp.port = create_port(1, "apr_proc_create"); -+ if (sp.port < 0) -+ return sp.port; -+ -+ /* load the stub */ -+ newproc = load_image(nargs, newargs, (const char**)env); - - /* load_image copies the data so now we can free it... */ -- while (--nargs >= 0) -- free (newargs[nargs]); - free(newargs); - - if (newproc < B_NO_ERROR) { -+ delete_port(sp.port); - return errno; - } - -@@ -286,15 +460,25 @@ - apr_file_close(attr->child_err); - } - -- send_data(newproc, 0, (void*)sp, sizeof(struct send_pipe)); -+ send_data(newproc, 0, &sp, sizeof(struct send_pipe)); - new->pid = newproc; - - /* before we go charging on we need the new process to get to a -- * certain point. When it gets there it'll let us know and we -- * can carry on. */ -- receive_data(&sender, (void*)NULL,0); -- -- return APR_SUCCESS; -+ * certain point. The stub will either send us an error code back through -+ * the port or simply delete the port, when everything went fine. */ -+ do { -+ int32 code; -+ error = read_port(sp.port, &code, &childError, sizeof(childError)); -+ } while (error == EINTR); -+ -+ if (error == B_BAD_PORT_ID) -+ return APR_SUCCESS; -+ -+ delete_port(sp.port); -+ -+ if (error >= B_OK) -+ return childError; -+ return error; - } - - APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc, -@@ -360,10 +544,10 @@ - apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool); - - if (child_in != NULL) -- apr_file_dup(&attr->child_in, child_in, attr->pool); -+ apr_file_dup2(attr->child_in, child_in, attr->pool); - - if (parent_in != NULL) -- apr_file_dup(&attr->parent_in, parent_in, attr->pool); -+ apr_file_dup2(attr->parent_in, parent_in, attr->pool); - - return APR_SUCCESS; - } -@@ -375,10 +559,10 @@ - apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool); - - if (child_out != NULL) -- apr_file_dup(&attr->child_out, child_out, attr->pool); -+ apr_file_dup2(attr->child_out, child_out, attr->pool); - - if (parent_out != NULL) -- apr_file_dup(&attr->parent_out, parent_out, attr->pool); -+ apr_file_dup2(attr->parent_out, parent_out, attr->pool); - - return APR_SUCCESS; - } -@@ -390,10 +574,10 @@ - apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool); - - if (child_err != NULL) -- apr_file_dup(&attr->child_err, child_err, attr->pool); -+ apr_file_dup2(attr->child_err, child_err, attr->pool); - - if (parent_err != NULL) -- apr_file_dup(&attr->parent_err, parent_err, attr->pool); -+ apr_file_dup2(attr->parent_err, parent_err, attr->pool); - - return APR_SUCCESS; - } -diff -urN apr-1.0.1.orig/threadproc/beos/thread.c apr-1.0.1/threadproc/beos/thread.c ---- apr-1.0.1.orig/threadproc/beos/thread.c 2004-06-10 12:57:25.000000000 +0200 -+++ apr-1.0.1/threadproc/beos/thread.c 2004-12-17 15:19:11.000000000 +0100 -@@ -26,27 +26,27 @@ - } - - (*new)->pool = pool; -- (*new)->attr = (int32)B_NORMAL_PRIORITY; -+ (*new)->attr = (int32)B_NORMAL_PRIORITY; - - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, apr_int32_t on) - { -- if (on == 1){ -- attr->detached = 1; -- } else { -- attr->detached = 0; -- } -+ if (on == 1){ -+ attr->detached = 1; -+ } else { -+ attr->detached = 0; -+ } - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr) - { -- if (attr->detached == 1){ -- return APR_DETACH; -- } -- return APR_NOTDETACH; -+ if (attr->detached == 1){ -+ return APR_DETACH; -+ } -+ return APR_NOTDETACH; - } - - APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr, -@@ -61,10 +61,11 @@ - return APR_ENOTIMPL; - } - --static void *dummy_worker(void *opaque) -+static int32 dummy_worker(void *opaque) - { - apr_thread_t *thd = (apr_thread_t*)opaque; -- return thd->func(thd, thd->data); -+ thd->func(thd, thd->data); -+ return 0; - } - - APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr, -@@ -82,23 +83,21 @@ - (*new)->pool = pool; - (*new)->data = data; - (*new)->func = func; -- (*new)->exitval = -1; -+ (*new)->exitval = 0; -+ (*new)->join_count = 0; - - /* First we create the new thread...*/ -- if (attr) -- temp = attr->attr; -- else -- temp = B_NORMAL_PRIORITY; -+ if (attr) -+ temp = attr->attr; -+ else -+ temp = B_NORMAL_PRIORITY; - - stat = apr_pool_create(&(*new)->pool, pool); - if (stat != APR_SUCCESS) { - return stat; - } - -- (*new)->td = spawn_thread((thread_func)dummy_worker, -- "apr thread", -- temp, -- (*new)); -+ (*new)->td = spawn_thread(dummy_worker, "apr thread", temp, (*new)); - - /* Now we try to run it...*/ - if (resume_thread((*new)->td) == B_NO_ERROR) { -@@ -128,7 +127,8 @@ - return APR_SUCCESS; - } - --APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *thd) -+APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, -+ apr_thread_t *thd) - { - status_t rv = 0, ret; - ret = wait_for_thread(thd->td, &rv); -@@ -137,10 +137,10 @@ - return APR_SUCCESS; - } - else { -- /* if we've missed the thread's death, did we set an exit value prior -- * to it's demise? If we did return that. -+ /* We've missed the thread's death, if noone joined it before us, we -+ * will succeed. - */ -- if (thd->exitval != -1) { -+ if (atomic_add(&thd->join_count, 1) == 0) { - *retval = thd->exitval; - return APR_SUCCESS; - } else -@@ -150,12 +150,27 @@ - - APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd) - { -- if (suspend_thread(thd->td) == B_NO_ERROR){ -+ /* -+ if (suspend_thread(thd->td) == B_NO_ERROR){ - return APR_SUCCESS; - } - else { - return errno; - } -+ -+ * bonefish: -+ * The code above is definitely not correct. The OpenGroup specification -+ * of pthread_detach() says: -+ * -+ * "The pthread_detach() function shall indicate to the implementation that -+ * storage for the thread thread can be reclaimed when that thread -+ * terminates. If thread has not terminated, pthread_detach() shall not -+ * cause it to terminate. The effect of multiple pthread_detach() calls -+ * on the same target thread is unspecified." -+ * -+ * I don't really see, what we should do here. -+ */ -+ return APR_SUCCESS; - } - - void apr_thread_yield() -@@ -198,10 +213,8 @@ - { - apr_thread_once_t *control = (apr_thread_once_t *)vcontrol; - -- if (control->sem) { -- release_sem(control->sem); -+ if (control->sem >= 0) - delete_sem(control->sem); -- } - - return APR_SUCCESS; - } -@@ -211,7 +224,6 @@ - { - int rc; - *control = (apr_thread_once_t *)apr_pcalloc(p, sizeof(apr_thread_once_t)); -- (*control)->hit = 0; /* we haven't done it yet... */ - rc = ((*control)->sem = create_sem(1, "thread_once")); - if (rc < 0) - return rc; -@@ -225,10 +237,11 @@ - APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control, - void (*func)(void)) - { -- if (!control->hit) { -+ if (control->sem >= 0) { - if (acquire_sem(control->sem) == B_OK) { -- control->hit = 1; - func(); -+ delete_sem(control->sem); -+ control->sem = -1; - } - } - return APR_SUCCESS; -diff -urN apr-1.0.1.orig/threadproc/beos/threadpriv.c apr-1.0.1/threadproc/beos/threadpriv.c ---- apr-1.0.1.orig/threadproc/beos/threadpriv.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/threadproc/beos/threadpriv.c 2004-12-17 15:19:11.000000000 +0100 -@@ -14,135 +14,51 @@ - */ - - #include "apr_arch_threadproc.h" -+#include - --static struct beos_key key_table[BEOS_MAX_DATAKEYS]; --static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS]; --static sem_id lock; -+static void threadkey_cleanup(void *_key) -+{ -+ apr_threadkey_t *key = (apr_threadkey_t *)_key; -+ void* data = tls_get(key->key); -+ -+ if (data && key->destructor) { -+ (*key->destructor)(data); -+ } -+} - - APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, - void (*dest)(void *), apr_pool_t *pool) - { -- (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t)); -+ (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t)); -+ - if ((*key) == NULL) { - return APR_ENOMEM; - } - -+ (*key)->key = tls_allocate(); - (*key)->pool = pool; -- -- acquire_sem(lock); -- for ((*key)->key=0; (*key)->key < BEOS_MAX_DATAKEYS; (*key)->key++){ -- if (key_table[(*key)->key].assigned == 0){ -- key_table[(*key)->key].assigned = 1; -- key_table[(*key)->key].destructor = dest; -- release_sem(lock); -- return APR_SUCCESS; -- } -- -- } -- release_sem(lock); -- return APR_ENOMEM; -+ (*key)->destructor = dest; -+ -+ on_exit_thread(&threadkey_cleanup, *key); -+ -+ return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key) - { -- thread_id tid; -- int i, index=0; -- tid = find_thread(NULL); -- for (i=0;idata){ -- /* it's been used */ -- if (beos_data[i]->td == tid){ -- index = i; -- } -- } -- } -- if (index == 0){ -- /* no storage for thread so we can't get anything... */ -- return APR_ENOMEM; -- } -- -- if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ -- acquire_sem(key_table[key->key].lock); -- if (key_table[key->key].count){ -- (*new) = (void*)beos_data[index]->data[key->key]; -- } else { -- (*new) = NULL; -- } -- release_sem(key_table[key->key].lock); -- } else { -- (*new) = NULL; -- } -- return APR_SUCCESS; -+ (*new) = tls_get(key->key); -+ return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t *key) - { -- thread_id tid; -- int i,index = 0, ret = 0; -- -- tid = find_thread(NULL); -- for (i=0; i < BEOS_MAX_DATAKEYS; i++){ -- if (beos_data[i]->data){ -- if (beos_data[i]->td == tid){index = i;} -- } -- } -- if (index==0){ -- /* not yet been allocated */ -- for (i=0; i< BEOS_MAX_DATAKEYS; i++){ -- if (! beos_data[i]->data){ -- /* we'll take this one... */ -- index = i; -- beos_data[i]->data = (const void **)malloc(sizeof(void *) * BEOS_MAX_DATAKEYS); -- memset((void *)beos_data[i]->data, 0, sizeof(void *) * BEOS_MAX_DATAKEYS); -- beos_data[i]->count = (int)malloc(sizeof(int)); -- beos_data[i]->td = (thread_id)malloc(sizeof(thread_id)); -- beos_data[i]->td = tid; -- } -- } -- } -- if (index == 0){ -- /* we're out of luck.. */ -- return APR_ENOMEM; -- } -- if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ -- acquire_sem(key_table[key->key].lock); -- if (key_table[key->key].count){ -- if (beos_data[index]->data[key->key] == NULL){ -- if (priv != NULL){ -- beos_data[index]->count++; -- key_table[key->key].count++; -- } -- } else { -- if (priv == NULL){ -- beos_data[index]->count--; -- key_table[key->key].count--; -- } -- } -- beos_data[index]->data[key->key] = priv; -- ret = 1; -- } else { -- ret = 0; -- } -- release_sem(key_table[key->key].lock); -- } -- if (ret) -- return APR_SUCCESS; -- return APR_ENOMEM; -+ tls_set(key->key, priv); -+ return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key) - { -- if (key->key < BEOS_MAX_DATAKEYS){ -- acquire_sem(key_table[key->key].lock); -- if (key_table[key->key].count == 1){ -- key_table[key->key].destructor = NULL; -- key_table[key->key].count = 0; -- } -- release_sem(key_table[key->key].lock); -- } else { -- return APR_ENOMEM; -- } -- return APR_SUCCESS; -+ return APR_ENOTIMPL; - } - - APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key, -diff -urN apr-1.0.1.orig/user/unix/userinfo.c apr-1.0.1/user/unix/userinfo.c ---- apr-1.0.1.orig/user/unix/userinfo.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/user/unix/userinfo.c 2004-12-17 15:19:11.000000000 +0100 -@@ -31,6 +31,28 @@ - - #define PWBUF_SIZE 512 - -+/* on BeOS R5 (also for BONE systems?) getpwnam() is broken */ -+#ifdef BEOS -+static struct passwd *beos_getpwnam(const char *name) -+{ -+ struct passwd *p; -+ while ((p = getpwent()) != NULL) { -+ if (strcmp(p->pw_name, name) == 0) -+ break; -+ } -+ endpwent(); -+ -+ if (!p) { -+ errno = ENOENT; -+ /* probably not the correct error code, but that doesn't really -+ * matter anyway */ -+ } -+ return p; -+} -+#define getpwnam beos_getpwnam -+#endif -+ -+ - static apr_status_t getpwnam_safe(const char *username, - struct passwd *pw, - char pwbuf[PWBUF_SIZE]) diff --git a/dev-libs/apr/patches/apr-1.2.x.diff b/dev-libs/apr/patches/apr-1.2.x.diff deleted file mode 100644 index faa0ab6ea..000000000 --- a/dev-libs/apr/patches/apr-1.2.x.diff +++ /dev/null @@ -1,23 +0,0 @@ -Index: Makefile.in -=================================================================== ---- Makefile.in (revision 619048) -+++ Makefile.in (working copy) -@@ -18,7 +18,7 @@ - INCDIR=./include - OSDIR=$(top_srcdir)/include/arch/@OSDIR@ - DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ --INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include -+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include - - # - # Macros for target determination -Index: build/gen-build.py -=================================================================== ---- build/gen-build.py (revision 619048) -+++ build/gen-build.py (working copy) -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # diff --git a/dev-libs/apr/patches/apr-1.3.3.patch b/dev-libs/apr/patches/apr-1.3.3.patch deleted file mode 100644 index 9eb5f2c0e..000000000 --- a/dev-libs/apr/patches/apr-1.3.3.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -urN apr-1.3.3/build/apr_hints.m4 apr-1.3.3-haiku/build/apr_hints.m4 ---- apr-1.3.3/build/apr_hints.m4 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/build/apr_hints.m4 2009-04-28 02:01:57.000000000 +0000 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then - - apr_preload_done="yes" -@@ -453,6 +453,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -463,7 +469,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.3.3/build/apr_network.m4 apr-1.3.3-haiku/build/apr_network.m4 ---- apr-1.3.3/build/apr_network.m4 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/build/apr_network.m4 2009-04-27 06:00:26.000000000 +0000 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.3.3/build/apr_threads.m4 apr-1.3.3-haiku/build/apr_threads.m4 ---- apr-1.3.3/build/apr_threads.m4 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/build/apr_threads.m4 2009-04-27 05:51:44.000000000 +0000 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.3.3/configure.in apr-1.3.3-haiku/configure.in ---- apr-1.3.3/configure.in 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/configure.in 2009-04-28 02:02:02.000000000 +0000 -@@ -244,7 +244,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -479,6 +479,12 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -833,6 +840,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -904,6 +915,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -917,9 +931,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -diff -urN apr-1.3.3/test/testpoll.c apr-1.3.3-haiku/test/testpoll.c ---- apr-1.3.3/test/testpoll.c 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/test/testpoll.c 2009-04-28 02:02:28.000000000 +0000 -@@ -193,6 +193,8 @@ - recv_msg(s, 2, p, tc); - send_msg(s, sa, 1, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -207,6 +209,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -381,6 +385,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); -@@ -411,6 +416,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 2, num); -@@ -443,6 +449,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); diff --git a/dev-libs/apr/patches/apr-1.3.8.patch b/dev-libs/apr/patches/apr-1.3.8.patch deleted file mode 100644 index 0b1f41ac2..000000000 --- a/dev-libs/apr/patches/apr-1.3.8.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -urN apr-1.3.8/build/apr_hints.m4 apr-1.3.8-haiku/build/apr_hints.m4 ---- apr-1.3.8/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700 -+++ apr-1.3.8-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then - - apr_preload_done="yes" -@@ -454,6 +454,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -464,7 +470,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.3.8/build/apr_network.m4 apr-1.3.8-haiku/build/apr_network.m4 ---- apr-1.3.8/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700 -+++ apr-1.3.8-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.3.8/build/apr_threads.m4 apr-1.3.8-haiku/build/apr_threads.m4 ---- apr-1.3.8/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700 -+++ apr-1.3.8-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.3.8/build/gen-build.py apr-1.3.8-haiku/build/gen-build.py ---- apr-1.3.8/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800 -+++ apr-1.3.8-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # -diff -urN apr-1.3.8/configure.in apr-1.3.8-haiku/configure.in ---- apr-1.3.8/configure.in 2009-07-17 16:14:25.000000000 -0700 -+++ apr-1.3.8-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700 -@@ -135,7 +135,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) -@@ -248,7 +248,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -486,6 +486,12 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -962,6 +968,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -1033,6 +1043,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -1046,9 +1059,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -diff -urN apr-1.3.8/test/testpoll.c apr-1.3.8-haiku/test/testpoll.c ---- apr-1.3.8/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700 -+++ apr-1.3.8-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700 -@@ -193,6 +193,8 @@ - recv_msg(s, 2, p, tc); - send_msg(s, sa, 1, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -207,6 +209,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -381,6 +385,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); -@@ -411,6 +416,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 2, num); -@@ -443,6 +449,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); diff --git a/dev-libs/apr/patches/apr-1.3.9.patch b/dev-libs/apr/patches/apr-1.3.9.patch deleted file mode 100644 index 41d545de0..000000000 --- a/dev-libs/apr/patches/apr-1.3.9.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -urN apr-1.3.9/build/apr_hints.m4 apr-1.3.9-haiku/build/apr_hints.m4 ---- apr-1.3.9/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700 -+++ apr-1.3.9-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then - - apr_preload_done="yes" -@@ -454,6 +454,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -464,7 +470,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.3.9/build/apr_network.m4 apr-1.3.9-haiku/build/apr_network.m4 ---- apr-1.3.9/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700 -+++ apr-1.3.9-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.3.9/build/apr_threads.m4 apr-1.3.9-haiku/build/apr_threads.m4 ---- apr-1.3.9/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700 -+++ apr-1.3.9-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.3.9/build/gen-build.py apr-1.3.9-haiku/build/gen-build.py ---- apr-1.3.9/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800 -+++ apr-1.3.9-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # -diff -urN apr-1.3.9/configure.in apr-1.3.9-haiku/configure.in ---- apr-1.3.9/configure.in 2009-07-17 16:14:25.000000000 -0700 -+++ apr-1.3.9-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700 -@@ -135,7 +135,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) -@@ -248,7 +248,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -486,6 +486,12 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -962,6 +968,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -1033,6 +1043,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -1046,9 +1059,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -diff -urN apr-1.3.9/test/testpoll.c apr-1.3.9-haiku/test/testpoll.c ---- apr-1.3.9/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700 -+++ apr-1.3.9-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700 -@@ -193,6 +193,8 @@ - recv_msg(s, 2, p, tc); - send_msg(s, sa, 1, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -207,6 +209,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -381,6 +385,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); -@@ -411,6 +416,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 2, num); -@@ -443,6 +449,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); diff --git a/dev-libs/apr/patches/apr-1.4.2.patch b/dev-libs/apr/patches/apr-1.4.2.patch deleted file mode 100644 index 3a6fcb6ce..000000000 --- a/dev-libs/apr/patches/apr-1.4.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN apr-1.4.2/config.layout apr-1.4.2-haiku/config.layout ---- apr-1.4.2/config.layout 2004-11-24 22:51:51.065798144 +0000 -+++ apr-1.4.2-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer -diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in ---- apr-1.4.2/configure.in 2009-11-16 07:45:28.064225280 +0000 -+++ apr-1.4.2-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000 -@@ -143,7 +143,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe new file mode 100644 index 000000000..d54f98417 --- /dev/null +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -0,0 +1,100 @@ +SUMMARY="Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz" +LICENSE="Apache v2" +COPYRIGHT="2010 The Apache Software Foundation." +CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + apr_util = $portVersion compat >= 1 + lib:libaprutil = $portVersion compat >= 1 + lib:libaprutil_1 = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + apr >= 1.3.9 + expat >= 2.0 + " +BUILD_REQUIRES=" + $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName + aprInstallDir=$aprUtilPackageLinksDir/apr + expatInstallDir=$aprUtilPackageLinksDir/expat + + rm -rf aclocal.m4 + mkdir -p m4 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + cd xml/expat + mkdir -p m4 + echo 'AM_INIT_AUTOMAKE' >> configure.in + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + + # TODO: fix this hack! + cp /boot/common/bin/libtool . + ln -sfn $sourceDir/libtool /libtool + + ./configure $configureDirArgs \ + --with-apr=$aprInstallDir \ + --with-expat=$expatInstallDir + make +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libaprutil-1 + fixPkgconfig +} + +DESCRIPTION=" + The mission of the Apache Portable Runtime (APR) project is to create + and maintain software libraries that provide a predictable and consistent + interface to underlying platform-specific implementations. The primary + goal is to provide an API to which software developers may code and be + assured of predictable if not identical behaviour regardless of the + platform on which their software is built, relieving them of the need to + code special-case conditions to work around or take advantage of + platform-specific deficiencies or features. + + To give a brief overview, the primary core subsystems of APR 1.x include + the following: + + - atomic operations + - dynamic Shared Object loading + - file I/O + - locks (mutexes, condition variables, etc) + - memory management (high performance allocators) + - memory-mapped files + - multicast Sockets + - network I/O + - shared memory + - thread and Process management + - various data structures (tables, hashes, priority queues, etc) + " diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe new file mode 100644 index 000000000..0696004a9 --- /dev/null +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -0,0 +1,130 @@ +SUMMARY="Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" +LICENSE="Apache v2" +COPYRIGHT="2011 The Apache Software Foundation." +CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="apr_util-1.4.1.patch" + +PROVIDES=" + apr_util = $portVersion compat >= 1 + lib:libaprutil_1 = 0.4.1 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libapr_1 + lib:libexpat + lib:libiconv + " +BUILD_REQUIRES=" + devel:libapr_1 >= 0.4.6 + devel:libexpat >= 1.5.2 + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="apr-util-$portVersion" + +PATCH() +{ + echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in +} + +BUILD() +{ + aprInstallDir=$portPackageLinksDir/lib~libapr_1 + expatInstallDir=$portPackageLinksDir/lib~libexpat + + rm -rf aclocal.m4 + mkdir -p m4 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + + cd xml/expat + mkdir -p m4 + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + + # TODO: fix this hack! + cp /boot/system/bin/libtool . + ln -sfn $sourceDir/libtool /libtool + + runConfigure ./configure \ + --with-apr=$aprInstallDir \ + --with-expat=$expatInstallDir + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libaprutil-1 + fixPkgconfig + + # fix apu-1-config + fixDevelopLibDirReferences $binDir/apu-1-config + + # remove superfluous .exp file + rm $libDir/aprutil.exp + + # devel package + packageEntries devel \ + $binDir \ + $developDir +} + +DESCRIPTION=" + The mission of the Apache Portable Runtime (APR) project is to create + and maintain software libraries that provide a predictable and consistent + interface to underlying platform-specific implementations. The primary + goal is to provide an API to which software developers may code and be + assured of predictable if not identical behaviour regardless of the + platform on which their software is built, relieving them of the need to + code special-case conditions to work around or take advantage of + platform-specific deficiencies or features. + + To give a brief overview, the primary core subsystems of APR 1.x include + the following: + + - atomic operations + - dynamic Shared Object loading + - file I/O + - locks (mutexes, condition variables, etc) + - memory management (high performance allocators) + - memory-mapped files + - multicast Sockets + - network I/O + - shared memory + - thread and Process management + - various data structures (tables, hashes, priority queues, etc) + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + apr_util_devel = portVersion compat >= 1 + cmd:apu_1_config = $portVersion compat >= 1 + devel:libaprutil_1 = 0.4.1 compat >= 0 + " +REQUIRES_devel=" + apr_util == $portVersion base + " diff --git a/dev-libs/apr_util/patches/apr_util-1.4.1.patch b/dev-libs/apr_util/patches/apr_util-1.4.1.patch new file mode 100644 index 000000000..64006262e --- /dev/null +++ b/dev-libs/apr_util/patches/apr_util-1.4.1.patch @@ -0,0 +1,45 @@ +diff -ur orig/apr-util-1.4.1/build/apu-conf.m4 apr_util-1.4.1/build/apu-conf.m4 +--- orig/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.026738688 +0200 ++++ apr_util-1.4.1/build/apu-conf.m4 2013-04-30 21:28:37.100401152 +0200 +@@ -145,10 +145,10 @@ + else + # Add given path to standard search paths if appropriate: + if test "$withval" != "/usr"; then +- APR_ADDTO(LDFLAGS, [-L$withval/lib]) +- APR_ADDTO(CPPFLAGS, [-I$withval/include]) +- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) +- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) ++ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib]) ++ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib]) + fi + # ...and refuse to fall back on the builtin expat. + apu_try_builtin_expat=0 +diff -ur orig/apr-util-1.4.1/config.layout apr_util-1.4.1/config.layout +--- orig/apr-util-1.4.1/config.layout 2005-02-09 13:18:43.064749568 +0100 ++++ apr_util-1.4.1/config.layout 2013-04-30 21:27:27.079953920 +0200 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer diff --git a/dev-libs/atk/atk-1.29.2.bep b/dev-libs/atk/atk-1.29.2.recipe similarity index 95% rename from dev-libs/atk/atk-1.29.2.bep rename to dev-libs/atk/atk-1.29.2.recipe index 5fbeadeb8..78bf73576 100644 --- a/dev-libs/atk/atk-1.29.2.bep +++ b/dev-libs/atk/atk-1.29.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="sys-devel/gettext >= 0.17 dev-libs/glib >= 2.24.0" -BUILD { +BUILD() +{ cd atk-1.29.2 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd atk-1.29.2 make isntall } diff --git a/dev-libs/atk/atk-1.30.0.bep b/dev-libs/atk/atk-1.30.0.recipe similarity index 96% rename from dev-libs/atk/atk-1.30.0.bep rename to dev-libs/atk/atk-1.30.0.recipe index bdaa27b25..3df557196 100644 --- a/dev-libs/atk/atk-1.30.0.bep +++ b/dev-libs/atk/atk-1.30.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="broken" DEPEND="sys-devel/gettext >= 0.17 dev-libs/glib >= 2.24.0 dev-util/gtk-doc >= 1.15" -BUILD { +BUILD() +{ cd atk-1.30.0 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd atk-1.30.0 make isntall } diff --git a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep b/dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe similarity index 96% rename from dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep rename to dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe index 7f20ba736..9e2ca9c29 100644 --- a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep +++ b/dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="319d0b18cc4eb735c8038ece9df055e4" -BUILD { +BUILD() +{ cd gc-7.2alpha6 libtoolize --force --copy --install autoconf -f @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gc-7.2alpha6 make install } -TEST { +TEST() +{ cd gc-7.2alpha6 make check } diff --git a/dev-libs/boehm-gc/boehm-gc-7.2d.bep b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe similarity index 96% rename from dev-libs/boehm-gc/boehm-gc-7.2d.bep rename to dev-libs/boehm_gc/boehm_gc-7.2d.recipe index b8f67af6f..194c705cb 100644 --- a/dev-libs/boehm-gc/boehm-gc-7.2d.bep +++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2" -BUILD { +BUILD() +{ cd gc-7.2 libtoolize --force --copy --install autoconf -f @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gc-7.2 make install } -TEST { +TEST() +{ cd gc-7.2 make check } diff --git a/dev-libs/boehm_gc/licenses/BOEHM b/dev-libs/boehm_gc/licenses/BOEHM new file mode 100644 index 000000000..1a17075d4 --- /dev/null +++ b/dev-libs/boehm_gc/licenses/BOEHM @@ -0,0 +1,29 @@ +Copyright (c) 1988, 1989 Hans-J. Boehm, Alan J. Demers +Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. +Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. +Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. + +The file linux_threads.c is also +Copyright (c) 1998 by Fergus Henderson. All rights reserved. + +The files Makefile.am, and configure.in are +Copyright (c) 2001 by Red Hat Inc. All rights reserved. + +Several files supporting GNU-style builds are copyrighted by the Free +Software Foundation, and carry a different license from that given +below. + +THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED +OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + +Permission is hereby granted to use or copy this program +for any purpose, provided the above notices are retained on all copies. +Permission to modify the code and to distribute modified code is granted, +provided the above notices are retained, and a notice that the code was +modified is included with the above copyright notice. + +A few of the files needed to use the GNU-style build procedure come with +slightly different licenses, though they are all similar in spirit. A few +are GPL'ed, but with an exception that should cover all uses in the +collector. (If you are concerned about such things, I recommend you look +at the notice in config.guess or ltmain.sh.) diff --git a/dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch b/dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch new file mode 100644 index 000000000..e5f093551 --- /dev/null +++ b/dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch @@ -0,0 +1,247 @@ +diff -ru gc-7.2alpha6-orig/configure.ac gc-7.2alpha6/configure.ac +--- gc-7.2alpha6-orig/configure.ac 2011-06-14 12:34:55.000000000 +0000 ++++ gc-7.2alpha6/configure.ac 2012-03-16 00:46:16.500695040 +0000 +@@ -83,6 +83,7 @@ + AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.]) + AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.]) + AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.]) ++AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.]) + AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.]) + AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.]) + AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.]) +@@ -127,6 +128,10 @@ + AC_DEFINE(GC_AIX_THREADS) + AC_DEFINE(_REENTRANT) + ;; ++ *-*-haiku*) ++ AC_DEFINE(GC_HAIKU_THREADS) ++ AC_DEFINE(_REENTRANT) ++ ;; + *-*-hpux11*) + AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.") + AC_DEFINE(GC_HPUX_THREADS) +diff -ru gc-7.2alpha6-orig/dyn_load.c gc-7.2alpha6/dyn_load.c +--- gc-7.2alpha6-orig/dyn_load.c 2011-05-31 15:27:11.000000000 +0000 ++++ gc-7.2alpha6/dyn_load.c 2012-03-23 22:11:06.758906880 +0000 +@@ -63,7 +63,7 @@ + !(defined(FREEBSD) && defined(__ELF__)) && \ + !(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \ + !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \ +- !defined(DARWIN) && !defined(CYGWIN32) ++ !defined(DARWIN) && !defined(CYGWIN32) && !defined(HAIKU) + --> We only know how to find data segments of dynamic libraries for the + --> above. Additional SVR4 variants might not be too + --> hard to add. +@@ -1419,6 +1419,22 @@ + + #endif /* DARWIN */ + ++#ifdef HAIKU ++#include ++ ++GC_INNER void GC_register_dynamic_libraries() ++{ ++ image_info info; ++ int32 cookie = 0; ++ while (get_next_image_info(0, &cookie, &info) == B_OK) ++ { ++ void *data = info.data; ++ GC_add_roots_inner(data, data + info.data_size, TRUE); ++ } ++} ++ ++#endif /* HAIKU */ ++ + #elif defined(PCR) + + # include "il/PCR_IL.h" +diff -ru gc-7.2alpha6-orig/include/gc_config_macros.h gc-7.2alpha6/include/gc_config_macros.h +--- gc-7.2alpha6-orig/include/gc_config_macros.h 2011-04-24 13:09:21.000000000 +0000 ++++ gc-7.2alpha6/include/gc_config_macros.h 2012-03-16 00:44:30.556793856 +0000 +@@ -65,7 +65,7 @@ + || defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \ + || defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \ + || defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \ +- || defined(GC_WIN32_THREADS) ++ || defined(GC_WIN32_THREADS) || defined(GC_HAIKU_THREADS) + # ifndef GC_THREADS + # define GC_THREADS + # endif +diff -ru gc-7.2alpha6-orig/include/private/config.h.in gc-7.2alpha6/include/private/config.h.in +--- gc-7.2alpha6-orig/include/private/config.h.in 2010-09-11 11:27:06.000000000 +0000 ++++ gc-7.2alpha6/include/private/config.h.in 2012-03-16 00:49:30.038273024 +0000 +@@ -45,6 +45,9 @@ + /* Define to support GNU pthreads. */ + #undef GC_GNU_THREADS + ++/* Define to support Haiku pthreads. */ ++#undef GC_HAIKU_THREADS ++ + /* Define if backtrace information is supported. */ + #undef GC_HAVE_BUILTIN_BACKTRACE + +Only in gc-7.2alpha6/include/private: config.h.in~ +diff -ru gc-7.2alpha6-orig/include/private/gcconfig.h gc-7.2alpha6/include/private/gcconfig.h +--- gc-7.2alpha6-orig/include/private/gcconfig.h 2011-05-31 15:27:12.000000000 +0000 ++++ gc-7.2alpha6/include/private/gcconfig.h 2012-03-23 22:28:55.210501632 +0000 +@@ -234,6 +234,11 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define HAIKU ++# define mach_type_known ++# endif + # if defined(OPENBSD) && defined(__amd64__) + # define X86_64 + # define mach_type_known +@@ -1110,6 +1115,15 @@ + extern int etext[]; + # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) + # endif ++# ifdef HAIKU ++# define OS_TYPE "HAIKU" ++# include ++# define GETPAGESIZE() B_PAGE_SIZE ++ extern int etext[]; ++# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) ++# define DYNAMIC_LOADING ++# define MPROTECT_VDB ++# endif + # ifdef SOLARIS + # define OS_TYPE "SOLARIS" + extern int _etext[], _end[]; +@@ -2345,7 +2359,7 @@ + #if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \ + || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \ + || defined(DGUX) || defined(BSD) || defined(HURD) \ +- || defined(AIX) || defined(DARWIN) || defined(OSF1) ++ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU) + # define UNIX_LIKE /* Basic Unix-like system calls work. */ + #endif + +@@ -2423,7 +2437,8 @@ + + #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \ + || defined(OPENBSD) || defined(ARM32) \ +- || defined(MIPS) || defined(AVR32))) \ ++ || defined(MIPS) || defined(AVR32) \ ++ || defined(HAIKU))) \ + || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \ + || (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT) + # define NO_GETCONTEXT +@@ -2721,6 +2736,9 @@ + # elif defined(SN_TARGET_PS3) + void *ps3_get_mem(size_t size); + # define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes) ++# elif defined(HAIKU) ++ ptr_t GC_haiku_get_mem(GC_word bytes); ++# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes) + # else + ptr_t GC_unix_get_mem(GC_word bytes); + # define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes) +diff -ru gc-7.2alpha6-orig/include/private/thread_local_alloc.h gc-7.2alpha6/include/private/thread_local_alloc.h +--- gc-7.2alpha6-orig/include/private/thread_local_alloc.h 2011-05-13 14:40:31.000000000 +0000 ++++ gc-7.2alpha6/include/private/thread_local_alloc.h 2012-03-16 00:55:25.252706816 +0000 +@@ -47,7 +47,7 @@ + # define USE_COMPILER_TLS + # elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \ + || defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \ +- || defined(GC_NETBSD_THREADS) ++ || defined(GC_NETBSD_THREADS) || defined(GC_HAIKU_THREADS) + # define USE_PTHREAD_SPECIFIC + # elif defined(GC_HPUX_THREADS) + # ifdef __GNUC__ +diff -ru gc-7.2alpha6-orig/os_dep.c gc-7.2alpha6/os_dep.c +--- gc-7.2alpha6-orig/os_dep.c 2011-05-31 15:27:11.000000000 +0000 ++++ gc-7.2alpha6/os_dep.c 2012-03-23 22:32:31.656932864 +0000 +@@ -790,7 +790,7 @@ + } + #endif /* !MSWIN32 */ + +-#ifdef BEOS ++#if defined(BEOS) || defined(HAIKU) + # include + + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -801,7 +801,7 @@ + return GC_SUCCESS; + } + # define HAVE_GET_STACK_BASE +-#endif /* BEOS */ ++#endif /* BEOS || HAIKU */ + + #ifdef OS2 + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -1127,7 +1127,7 @@ + # define GET_MAIN_STACKBASE_SPECIAL + #elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \ + && !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \ +- && !defined(GC_OPENBSD_THREADS) \ ++ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \ + && (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC)) + + # if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN) +@@ -1977,7 +1977,7 @@ + # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \ + && !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \ + && !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \ +- && !defined(__CC_ARM) ++ && !defined(__CC_ARM) && !defined(HAIKU) + + # define SBRK_ARG_T ptrdiff_t + +@@ -2302,6 +2302,19 @@ + } + #endif + ++#ifdef HAIKU ++#include ++ ++ptr_t GC_haiku_get_mem(word bytes) ++{ ++ void* mem; ++ if (posix_memalign(&mem, GC_page_size, bytes) == 0) ++ return mem; ++ else ++ return NULL; ++} ++#endif ++ + #ifdef USE_MUNMAP + + /* For now, this only works on Win32/WinCE and some Unix-like */ +@@ -2903,7 +2916,9 @@ + # elif !defined(MSWIN32) && !defined(MSWINCE) + # include + # include +-# include ++# if !defined(HAIKU) ++# include ++# endif + + # define PROTECT(addr, len) \ + if (mprotect((caddr_t)(addr), (size_t)(len), \ +@@ -3062,6 +3077,8 @@ + /* Empirically c.trapno == 14, on IA32, but is that useful? */ + /* Should probably consider alignment issues on other */ + /* architectures. */ ++# elif defined(HAIKU) ++# define CODE_OK TRUE + # elif defined(HPUX) + # define CODE_OK (si -> si_code == SEGV_ACCERR \ + || si -> si_code == BUS_ADRERR \ +diff -ru gc-7.2alpha6-orig/pthread_support.c gc-7.2alpha6/pthread_support.c +--- gc-7.2alpha6-orig/pthread_support.c 2011-05-31 15:27:11.000000000 +0000 ++++ gc-7.2alpha6/pthread_support.c 2012-03-16 00:39:06.171442176 +0000 +@@ -938,7 +938,8 @@ + GC_nprocs = pthread_num_processors_np(); + # elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \ + || defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \ +- || defined(PLATFORM_ANDROID) || defined(NACL) ++ || defined(PLATFORM_ANDROID) || defined(NACL) \ ++ || defined(GC_HAIKU_THREADS) + GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN); + if (GC_nprocs <= 0) GC_nprocs = 1; + # elif defined(GC_IRIX_THREADS) diff --git a/dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch b/dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch new file mode 100644 index 000000000..4d2b35488 --- /dev/null +++ b/dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch @@ -0,0 +1,248 @@ +diff -urN gc-7.2/configure.ac gc-7.2-haiku/configure.ac +--- gc-7.2/configure.ac 2012-08-09 13:25:13.047185920 -0700 ++++ gc-7.2-haiku/configure.ac 2013-03-27 00:43:42.665321472 -0700 +@@ -89,6 +89,7 @@ + AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.]) + AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.]) + AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.]) ++AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.]) + AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.]) + AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.]) + AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.]) +@@ -140,6 +141,10 @@ + AC_DEFINE(GC_AIX_THREADS) + AC_DEFINE(_REENTRANT) + ;; ++ *-*-haiku*) ++ AC_DEFINE(GC_HAIKU_THREADS) ++ AC_DEFINE(_REENTRANT) ++ ;; + *-*-hpux11*) + AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.") + AC_DEFINE(GC_HPUX_THREADS) +diff -urN gc-7.2/dyn_load.c gc-7.2-haiku/dyn_load.c +--- gc-7.2/dyn_load.c 2012-08-09 13:25:13.034603008 -0700 ++++ gc-7.2-haiku/dyn_load.c 2013-03-27 00:43:42.670564352 -0700 +@@ -63,7 +63,7 @@ + !(defined(FREEBSD) && defined(__ELF__)) && \ + !(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \ + !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \ +- !defined(DARWIN) && !defined(CYGWIN32) ++ !defined(DARWIN) && !defined(CYGWIN32) && !defined(HAIKU) + --> We only know how to find data segments of dynamic libraries for the + --> above. Additional SVR4 variants might not be too + --> hard to add. +@@ -1426,6 +1426,22 @@ + + #endif /* DARWIN */ + ++#ifdef HAIKU ++#include ++ ++GC_INNER void GC_register_dynamic_libraries() ++{ ++ image_info info; ++ int32 cookie = 0; ++ while (get_next_image_info(0, &cookie, &info) == B_OK) ++ { ++ void *data = info.data; ++ GC_add_roots_inner(data, data + info.data_size, TRUE); ++ } ++} ++ ++#endif /* HAIKU */ ++ + #elif defined(PCR) + + # include "il/PCR_IL.h" +diff -urN gc-7.2/include/gc_config_macros.h gc-7.2-haiku/include/gc_config_macros.h +--- gc-7.2/include/gc_config_macros.h 2012-08-09 13:25:13.028835840 -0700 ++++ gc-7.2-haiku/include/gc_config_macros.h 2013-03-27 00:51:21.900726784 -0700 +@@ -68,7 +68,8 @@ + || defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \ + || defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \ + || defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \ +- || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) ++ || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) \ ++ || defined(GC_HAIKU_THREADS) + # ifndef GC_THREADS + # define GC_THREADS + # endif +diff -urN gc-7.2/include/private/config.h.in gc-7.2-haiku/include/private/config.h.in +--- gc-7.2/include/private/config.h.in 2012-08-09 13:25:13.029884416 -0700 ++++ gc-7.2-haiku/include/private/config.h.in 2013-03-27 00:44:56.633602048 -0700 +@@ -48,6 +48,9 @@ + /* Define to support GNU pthreads. */ + #undef GC_GNU_THREADS + ++/* Define to support Haiku pthreads. */ ++#undef GC_HAIKU_THREADS ++ + /* Define if backtrace information is supported. */ + #undef GC_HAVE_BUILTIN_BACKTRACE + +diff -urN gc-7.2/include/private/gcconfig.h gc-7.2-haiku/include/private/gcconfig.h +--- gc-7.2/include/private/gcconfig.h 2012-08-09 13:25:13.030408704 -0700 ++++ gc-7.2-haiku/include/private/gcconfig.h 2013-03-27 00:45:52.350748672 -0700 +@@ -234,6 +234,11 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define HAIKU ++# define mach_type_known ++# endif + # if defined(OPENBSD) && defined(__amd64__) + # define X86_64 + # define mach_type_known +@@ -1115,6 +1120,15 @@ + extern int etext[]; + # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) + # endif ++# ifdef HAIKU ++# define OS_TYPE "HAIKU" ++# include ++# define GETPAGESIZE() B_PAGE_SIZE ++ extern int etext[]; ++# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) ++# define DYNAMIC_LOADING ++# define MPROTECT_VDB ++# endif + # ifdef SOLARIS + # define OS_TYPE "SOLARIS" + extern int _etext[], _end[]; +@@ -2404,7 +2418,7 @@ + #if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \ + || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \ + || defined(DGUX) || defined(BSD) || defined(HURD) \ +- || defined(AIX) || defined(DARWIN) || defined(OSF1) ++ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU) + # define UNIX_LIKE /* Basic Unix-like system calls work. */ + #endif + +@@ -2482,7 +2496,8 @@ + + #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \ + || defined(OPENBSD) || defined(ARM32) \ +- || defined(MIPS) || defined(AVR32))) \ ++ || defined(MIPS) || defined(AVR32) \ ++ || defined(HAIKU))) \ + || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \ + || (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT) + # define NO_GETCONTEXT +@@ -2789,6 +2804,9 @@ + # elif defined(SN_TARGET_PS3) + void *ps3_get_mem(size_t size); + # define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes) ++# elif defined(HAIKU) ++ ptr_t GC_haiku_get_mem(GC_word bytes); ++# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes) + # else + ptr_t GC_unix_get_mem(GC_word bytes); + # define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes) +diff -urN gc-7.2/include/private/thread_local_alloc.h gc-7.2-haiku/include/private/thread_local_alloc.h +--- gc-7.2/include/private/thread_local_alloc.h 2012-08-09 13:25:13.029884416 -0700 ++++ gc-7.2-haiku/include/private/thread_local_alloc.h 2013-03-27 00:49:11.605290496 -0700 +@@ -47,7 +47,8 @@ + # define USE_COMPILER_TLS + # elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \ + || defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \ +- || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS) ++ || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS) \ ++ || || defined(GC_HAIKU_THREADS) + # define USE_PTHREAD_SPECIFIC + # elif defined(GC_HPUX_THREADS) + # ifdef __GNUC__ +diff -urN gc-7.2/os_dep.c gc-7.2-haiku/os_dep.c +--- gc-7.2/os_dep.c 2012-08-09 13:25:13.034340864 -0700 ++++ gc-7.2-haiku/os_dep.c 2013-03-27 00:46:12.884998144 -0700 +@@ -790,7 +790,7 @@ + } + #endif /* !MSWIN32 */ + +-#ifdef BEOS ++#if defined(BEOS) || defined(HAIKU) + # include + + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -801,7 +801,7 @@ + return GC_SUCCESS; + } + # define HAVE_GET_STACK_BASE +-#endif /* BEOS */ ++#endif /* BEOS || HAIKU */ + + #ifdef OS2 + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -1138,7 +1138,7 @@ + # define GET_MAIN_STACKBASE_SPECIAL + #elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \ + && !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \ +- && !defined(GC_OPENBSD_THREADS) \ ++ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \ + && (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC)) + + # if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN) +@@ -2001,7 +2001,7 @@ + # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \ + && !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \ + && !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \ +- && !defined(__CC_ARM) ++ && !defined(__CC_ARM) && !defined(HAIKU) + + # define SBRK_ARG_T ptrdiff_t + +@@ -2326,6 +2326,19 @@ + } + #endif + ++#ifdef HAIKU ++#include ++ ++ptr_t GC_haiku_get_mem(word bytes) ++{ ++ void* mem; ++ if (posix_memalign(&mem, GC_page_size, bytes) == 0) ++ return mem; ++ else ++ return NULL; ++} ++#endif ++ + #ifdef USE_MUNMAP + + /* For now, this only works on Win32/WinCE and some Unix-like */ +@@ -2927,7 +2940,9 @@ + # elif !defined(MSWIN32) && !defined(MSWINCE) + # include + # include +-# include ++# if !defined(HAIKU) ++# include ++# endif + + # define PROTECT(addr, len) \ + if (mprotect((caddr_t)(addr), (size_t)(len), \ +@@ -3086,6 +3101,8 @@ + /* Empirically c.trapno == 14, on IA32, but is that useful? */ + /* Should probably consider alignment issues on other */ + /* architectures. */ ++# elif defined(HAIKU) ++# define CODE_OK TRUE + # elif defined(HPUX) + # define CODE_OK (si -> si_code == SEGV_ACCERR \ + || si -> si_code == BUS_ADRERR \ +diff -urN gc-7.2/pthread_support.c gc-7.2-haiku/pthread_support.c +--- gc-7.2/pthread_support.c 2012-08-09 13:25:13.048234496 -0700 ++++ gc-7.2-haiku/pthread_support.c 2013-03-27 00:46:12.896794624 -0700 +@@ -999,7 +999,8 @@ + GC_nprocs = pthread_num_processors_np(); + # elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \ + || defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \ +- || defined(PLATFORM_ANDROID) || defined(NACL) ++ || defined(PLATFORM_ANDROID) || defined(NACL) \ ++ || defined(GC_HAIKU_THREADS) + GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN); + if (GC_nprocs <= 0) GC_nprocs = 1; + # elif defined(GC_IRIX_THREADS) diff --git a/dev-libs/boost/boost-1.42.0.bep b/dev-libs/boost/boost-1.42.0.recipe similarity index 96% rename from dev-libs/boost/boost-1.42.0.bep rename to dev-libs/boost/boost-1.42.0.recipe index 9884d876b..f7789a6c3 100644 --- a/dev-libs/boost/boost-1.42.0.bep +++ b/dev-libs/boost/boost-1.42.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd boost_1_42_0 ./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY` ./bjam --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -18,7 +19,8 @@ BUILD { runtime-link=shared } -INSTALL { +INSTALL() +{ cd boost_1_42_0 ./bjam install } diff --git a/dev-libs/boost/boost-1.50.0.bep b/dev-libs/boost/boost-1.50.0.recipe similarity index 98% rename from dev-libs/boost/boost-1.50.0.bep rename to dev-libs/boost/boost-1.50.0.recipe index d0eef3144..590e1969e 100644 --- a/dev-libs/boost/boost-1.50.0.bep +++ b/dev-libs/boost/boost-1.50.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="boehm-gc" -BUILD { +BUILD() +{ cd boost_1_50_0 ./bootstrap.sh \ --without-icu \ @@ -34,7 +35,8 @@ BUILD { runtime-link=shared } -INSTALL { +INSTALL() +{ cd boost_1_50_0 ./bjam install \ -d2 \ diff --git a/dev-libs/boost/boost-1.53.0.bep b/dev-libs/boost/boost-1.53.0.recipe similarity index 98% rename from dev-libs/boost/boost-1.53.0.bep rename to dev-libs/boost/boost-1.53.0.recipe index 65dfda630..4b4a6adbe 100644 --- a/dev-libs/boost/boost-1.53.0.bep +++ b/dev-libs/boost/boost-1.53.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="boehm-gc" -BUILD { +BUILD() +{ cd boost_1_53_0 ./bootstrap.sh \ --without-icu \ @@ -34,7 +35,8 @@ BUILD { runtime-link=shared } -INSTALL { +INSTALL() +{ cd boost_1_53_0 ./bjam install \ -d2 \ diff --git a/dev-libs/chmlib/chmlib-0.40.bep b/dev-libs/chmlib/chmlib-0.40.recipe similarity index 96% rename from dev-libs/chmlib/chmlib-0.40.bep rename to dev-libs/chmlib/chmlib-0.40.recipe index b072d2c84..9182b515e 100644 --- a/dev-libs/chmlib/chmlib-0.40.bep +++ b/dev-libs/chmlib/chmlib-0.40.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd chmlib-0.40 rm aclocal.m4 rm acinclude.m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd chmlib-0.40 make install } diff --git a/dev-libs/cyassl/cyassl-1.6.5.bep b/dev-libs/cyassl/cyassl-1.6.5.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-1.6.5.bep rename to dev-libs/cyassl/cyassl-1.6.5.recipe index 67654514a..45c76da1a 100644 --- a/dev-libs/cyassl/cyassl-1.6.5.bep +++ b/dev-libs/cyassl/cyassl-1.6.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="98c2c6350acf1d089756a1de9ccb9903" -BUILD { +BUILD() +{ cd cyassl-1.6.5 libtoolize --force --copy --install rm acinclude.m4 @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-1.6.5 make install } -TEST { +TEST() +{ cd cyassl-1.6.5 make check cd testsuite diff --git a/dev-libs/cyassl/cyassl-1.8.0.bep b/dev-libs/cyassl/cyassl-1.8.0.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-1.8.0.bep rename to dev-libs/cyassl/cyassl-1.8.0.recipe index ac5c9a2bd..c5f42dabb 100644 --- a/dev-libs/cyassl/cyassl-1.8.0.bep +++ b/dev-libs/cyassl/cyassl-1.8.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="app-text/dos2unix >= 1.0" CHECKSUM_MD5="d2ce70ffe04b6603eeb630258e236a58" -BUILD { +BUILD() +{ cd cyassl-1.8.0 dos2unix * dos2unix include/* @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-1.8.0 make install } -TEST { +TEST() +{ cd cyassl-1.8.0 make check cd testsuite diff --git a/dev-libs/cyassl/cyassl-2.0.2.bep b/dev-libs/cyassl/cyassl-2.0.2.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-2.0.2.bep rename to dev-libs/cyassl/cyassl-2.0.2.recipe index 9a45cb316..ee333d453 100644 --- a/dev-libs/cyassl/cyassl-2.0.2.bep +++ b/dev-libs/cyassl/cyassl-2.0.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="app-text/dos2unix >= 1.0" CHECKSUM_MD5="2f51752207132c161155508eeb517e38" -BUILD { +BUILD() +{ cd cyassl-2.0.2 dos2unix * dos2unix include/* @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-2.0.2 make install } -TEST { +TEST() +{ cd cyassl-2.0.2 make check cd testsuite diff --git a/dev-libs/cyassl/cyassl-2.5.0.bep b/dev-libs/cyassl/cyassl-2.5.0.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-2.5.0.bep rename to dev-libs/cyassl/cyassl-2.5.0.recipe index cb0404bf6..890172492 100644 --- a/dev-libs/cyassl/cyassl-2.5.0.bep +++ b/dev-libs/cyassl/cyassl-2.5.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="app-text/dos2unix >= 1.0" CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd" -BUILD { +BUILD() +{ cd cyassl-2.5.0 dos2unix * dos2unix include/* @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-2.5.0 make install } -TEST { +TEST() +{ cd cyassl-2.5.0 make check cd testsuite diff --git a/dev-libs/expat/expat-2.0.1.bep b/dev-libs/expat/expat-2.0.1.bep deleted file mode 100644 index 47cf1b110..000000000 --- a/dev-libs/expat/expat-2.0.1.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="XML parsing libraries" -HOMEPAGE="http://expat.sourceforge.net/" -SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" -BUILD { - cd expat-2.0.1 - rm -f conftools/libtool.m4 - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am - libtoolize --force --copy --install - aclocal -I conftools -I m4 - autoconf - configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd expat-2.0.1 - make install DESTDIR="${DESTDIR}" -} -LICENSE="MIT" -COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper - 2001-2006 Expat maintainers." diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe new file mode 100644 index 000000000..551d50b5b --- /dev/null +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -0,0 +1,81 @@ +SUMMARY="XML parser toolkit" +DESCRIPTION="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)." +HOMEPAGE="http://expat.sourceforge.net/" +COPYRIGHT=" + 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper + 2001-2006 Expat maintainers. + " +LICENSE="MIT" +SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" +CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" +REVISION="7" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + expat$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libexpat$secondaryArchSuffix = 1.5.2 compat >= 1 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:xmlwf = $portVersion compat >= 2.0 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +PATCH() +{ + echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in + echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am +} + +BUILD() +{ + rm -f conftools/libtool.m4 + libtoolize --force --copy --install + aclocal -I conftools -I m4 + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + + # prepare develop/lib + prepareInstalledDevelLibs libexpat + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + expat${secondaryArchSuffix}_devel = $portVersion + devel:libexpat${secondaryArchSuffix} = 1.5.2 compat >= 1 + " +REQUIRES_devel=" + expat${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.bep deleted file mode 100644 index 2b145c184..000000000 --- a/dev-libs/fribidi/fribidi-0.19.2.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm" -HOMEPAGE="http://fribidi.org/" -SRC_URI="http://fribidi.org/download/fribidi-0.19.2.tar.gz" -CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd fribidi-0.19.2 - rm -rf aclocal.m4 - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS - make -} - -INSTALL { - cd fribidi-0.19.2 - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2004 Sharif FarsiWeb, Inc - 2001,2002 Behdad Esfahbod - 1999,2000 Dov Grobgeld" diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe new file mode 100644 index 000000000..4c5324286 --- /dev/null +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -0,0 +1,79 @@ +SUMMARY="A free implementation of the unicode bidirectional algorithm" +DESCRIPTION="This is GNU FriBidi. The Free Implementation of the Unicode Bidirectional Algorithm. One of the missing links stopping the penetration of free software in Middle East is the lack of support for the Arabic and Hebrew alphabets. In order to have proper Arabic and Hebrew support, the BiDi algorithm should have been implemented. It is our hope that this library will stimulate more free software in the Middle Eastern countries." +HOMEPAGE="http://fribidi.org/" +SRC_URI="http://fribidi.org/download/fribidi-0.19.5.tar.bz2" +CHECKSUM_MD5="925bafb97afee8a2fc2d0470c072a155" +REVISION="1" + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2004 Sharif FarsiWeb, Inc + 2001,2002 Behdad Esfahbod + 1999,2000 Dov Grobgeld" + +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + fribidi = $portVersion + cmd:fribidi = 0.19.5 compat >= 0.19 + lib:libfribidi = 0.3.4 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " +PATCH() +{ + sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac + sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac + sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac + +} +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libfribidi + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + make test +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + fribidi_devel = $portVersion + cmd:fribidi$secondaryArchSuffix = $portVersion compat >= 0.19 + devel:libfribidi = 0.3.4 compat >= 0 + " +REQUIRES_devel=" + fribidi == $portVersion base + " diff --git a/dev-libs/glib/glib-2.22.2.bep b/dev-libs/glib/glib-2.22.2.recipe similarity index 96% rename from dev-libs/glib/glib-2.22.2.bep rename to dev-libs/glib/glib-2.22.2.recipe index 2f27e322c..b33e97fc1 100644 --- a/dev-libs/glib/glib-2.22.2.bep +++ b/dev-libs/glib/glib-2.22.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="00eb873975e2ef9361b8177131c7c943" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd glib-2.22.2 rm -rf aclocal.m4 mkdir -p m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.22.2 make install } diff --git a/dev-libs/glib/glib-2.24.1.bep b/dev-libs/glib/glib-2.24.1.recipe similarity index 96% rename from dev-libs/glib/glib-2.24.1.bep rename to dev-libs/glib/glib-2.24.1.recipe index 91942f10f..0e74b1972 100644 --- a/dev-libs/glib/glib-2.24.1.bep +++ b/dev-libs/glib/glib-2.24.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e61f2e9636f9d57067c4e3a690b9911a" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd glib-2.24.1 rm -rf aclocal.m4 mkdir -p m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.24.1 make install } diff --git a/dev-libs/glib/glib-2.24.2.bep b/dev-libs/glib/glib-2.24.2.recipe similarity index 98% rename from dev-libs/glib/glib-2.24.2.bep rename to dev-libs/glib/glib-2.24.2.recipe index 4be365b05..a19d4cd8e 100644 --- a/dev-libs/glib/glib-2.24.2.bep +++ b/dev-libs/glib/glib-2.24.2.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/pkgconfig >= 0.23 sys-devel/gettext >= 0.17 dev-libs/libpcre >= 8.00" -BUILD { +BUILD() +{ cd glib-2.24.2 rm -rf aclocal.m4 mkdir -p m4 @@ -27,7 +28,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.24.2 make install } diff --git a/dev-libs/glib/glib-2.26.1.bep b/dev-libs/glib/glib-2.26.1.recipe similarity index 97% rename from dev-libs/glib/glib-2.26.1.bep rename to dev-libs/glib/glib-2.26.1.recipe index a01e3eeec..4d44567d8 100644 --- a/dev-libs/glib/glib-2.26.1.bep +++ b/dev-libs/glib/glib-2.26.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/pkgconfig >= 0.23 sys-devel/gettext >= 0.17" -BUILD { +BUILD() +{ cd glib-2.26.1 rm -rf aclocal.m4 mkdir -p m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.26.1 make install } diff --git a/dev-libs/gmp/gmp-4.3.1.bep b/dev-libs/gmp/gmp-4.3.1.recipe similarity index 94% rename from dev-libs/gmp/gmp-4.3.1.bep rename to dev-libs/gmp/gmp-4.3.1.recipe index a79acb26d..811275dc9 100644 --- a/dev-libs/gmp/gmp-4.3.1.bep +++ b/dev-libs/gmp/gmp-4.3.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="26cec15a90885042dd4a15c4003b08ae" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-4.3.1 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-4.3.1 make install } -TEST { +TEST() +{ cd gmp-4.3.1 make check } diff --git a/dev-libs/gmp/gmp-4.3.2.bep b/dev-libs/gmp/gmp-4.3.2.recipe similarity index 94% rename from dev-libs/gmp/gmp-4.3.2.bep rename to dev-libs/gmp/gmp-4.3.2.recipe index 25053b62d..f0190945d 100644 --- a/dev-libs/gmp/gmp-4.3.2.bep +++ b/dev-libs/gmp/gmp-4.3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="dd60683d7057917e34630b4a787932e8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-4.3.2 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-4.3.2 make install } -TEST { +TEST() +{ cd gmp-4.3.2 make check } diff --git a/dev-libs/gmp/gmp-5.0.1.bep b/dev-libs/gmp/gmp-5.0.1.recipe similarity index 94% rename from dev-libs/gmp/gmp-5.0.1.bep rename to dev-libs/gmp/gmp-5.0.1.recipe index 7610ec638..5b7af9fa7 100644 --- a/dev-libs/gmp/gmp-5.0.1.bep +++ b/dev-libs/gmp/gmp-5.0.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6bac6df75c192a13419dfd71d19240a7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-5.0.1 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-5.0.1 make install } -TEST { +TEST() +{ cd gmp-5.0.1 make check } diff --git a/dev-libs/gmp/gmp-5.0.5.bep b/dev-libs/gmp/gmp-5.0.5.recipe similarity index 94% rename from dev-libs/gmp/gmp-5.0.5.bep rename to dev-libs/gmp/gmp-5.0.5.recipe index 38f2da522..b9daccb9c 100644 --- a/dev-libs/gmp/gmp-5.0.5.bep +++ b/dev-libs/gmp/gmp-5.0.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8aef50959acec2a1ad41d144ffe0f3b5" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-5.0.5 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-5.0.5 make install } -TEST { +TEST() +{ cd gmp-5.0.5 make check } diff --git a/dev-libs/gmp/gmp-5.1.1.bep b/dev-libs/gmp/gmp-5.1.1.bep deleted file mode 100644 index a50602270..000000000 --- a/dev-libs/gmp/gmp-5.1.1.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" -HOMEPAGE="http://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz" -CHECKSUM_MD5="485b1296e6287fa381e6015b19767989" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd gmp-5.1.1 - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd gmp-5.1.1 - make install -} - -TEST { - cd gmp-5.1.1 - make check -} - -LICENSE="GNU GPL v3 - GNU LGPL v3" -COPYRIGHT="1991-2013 Free Software Foundation, Inc." diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe new file mode 100644 index 000000000..8edc663a3 --- /dev/null +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -0,0 +1,63 @@ +SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" +DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" +HOMEPAGE="http://gmplib.org/" +SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz" +CHECKSUM_MD5="485b1296e6287fa381e6015b19767989" +LICENSE="GNU GPL v3 + GNU LGPL v3" +COPYRIGHT="1991-2013 Free Software Foundation, Inc." +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" +PROVIDES="cmp:gmp = $portVersion compat >= 5.1 + lib:libgmp + lib:libgmp = 10 + lib:libgmp = 10.1.1" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:libtool + cmd:autoconf + cmd:automake + cmd:make + " + +SOURE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare devel/lib + prepareInstalledDevelLibs libgmp + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} + +# ----- devel package + +PROVIDES_devel=" + libgmp = $portVersion + devel:libgmp = 10.1.1 compat >= 0 + " +REQUIRES_devel=" + libgmp == $portVersion base + " + diff --git a/dev-libs/gnulib/gnulib-9999.bep b/dev-libs/gnulib/gnulib-9999.recipe similarity index 93% rename from dev-libs/gnulib/gnulib-9999.bep rename to dev-libs/gnulib/gnulib-9999.recipe index d3236b7ee..35cbc5db5 100644 --- a/dev-libs/gnulib/gnulib-9999.bep +++ b/dev-libs/gnulib/gnulib-9999.recipe @@ -5,15 +5,18 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ echo "gnulib isn't meant to be built." } -INSTALL { +INSTALL() +{ echo "gnulib isn't meant to be installed." } -TEST { +TEST() +{ make check } diff --git a/dev-libs/icu/icu-4.4.1.bep b/dev-libs/icu/icu-4.4.1.bep deleted file mode 100644 index 3a3bdc891..000000000 --- a/dev-libs/icu/icu-4.4.1.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="icu" -HOMEPAGE="http://www.icu-project.org" -SRC_URI="http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz" -CHECKSUM_MD5="b6bc0a1153540b2088f8b03e0ba625d3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd icu/source - CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd icu/source - make install -} - -LICENSE="ICU" -COPYRIGHT="1997-2010 IBM Corporation and others." diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe new file mode 100644 index 000000000..e70217151 --- /dev/null +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -0,0 +1,127 @@ +SUMMARY="International Components for Unicode (ICU)" +HOMEPAGE="http://www.icu-project.org" +LICENSE="ICU" +COPYRIGHT="1997-2011 IBM Corporation and others." +SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz" +CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="icu-4.8.1.1.patch" + +PROVIDES=" + icu$secondaryArchSuffix = $portVersion compat >= 4.8 + lib:libicudata$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicui18n$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicuio$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicule$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libiculx$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicutest$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicutu$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicuuc$secondaryArchSuffix = 48.1.1 compat >= 48 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +SOURCE_DIR="icu" + +BUILD() +{ + cd source + runConfigure ./configure \ + --disable-renaming --disable-samples --disable-extras + make $jobArgs +} + +INSTALL() +{ + cd source + make install + + prepareInstalledDevelLibs \ + libicudata \ + libicui18n \ + libicuio \ + libicule \ + libiculx \ + libicutu \ + libicuuc + fixPkgconfig + + # Rename the data/icu directory when built for the secondary architecture, + # so that it doesn't clash with the primary package's. + if [ -n "$secondaryArchSuffix" ]; then + mv $dataDir/icu $dataDir/icu$secondaryArchSuffix + # TODO: The icu-config, the Makefile.inc, and possibly other files need + # to be adjusted as well. They are probably also not quite correct for + # the primary architecture (lib vs. develop/lib). + fi + + # devel package + packageEntries devel \ + $developDir \ + $dataDir \ + $libDir/icu \ + $binDir/icu-config + + # main package cleanup + rm -r $binDir +} + +TEST() +{ + cd source + make check +} + +DESCRIPTION="ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software. + +ICU is released under a nonrestrictive open source license that is suitable for use with both commercial software and with other open source or free software. + +Here are a few highlights of the services provided by ICU: + + * Code Page Conversion: Convert text data to or from Unicode and nearly any other character set or encoding. ICU's conversion tables are based on charset data collected by IBM over the course of many decades, and is the most complete available anywhere. + + * Collation: Compare strings according to the conventions and standards of a particular language, region or country. ICU's collation is based on the Unicode Collation Algorithm plus locale-specific comparison rules from the Common Locale Data Repository, a comprehensive source for this type of data. + + * Formatting: Format numbers, dates, times and currency amounts according the conventions of a chosen locale. This includes translating month and day names into the selected language, choosing appropriate abbreviations, ordering fields correctly, etc. This data also comes from the Common Locale Data Repository. + + * Time Calculations: Multiple types of calendars are provided beyond the traditional Gregorian calendar. A thorough set of timezone calculation APIs are provided. + + * Unicode Support: ICU closely tracks the Unicode standard, providing easy access to all of the many Unicode character properties, Unicode Normalization, Case Folding and other fundamental operations as specified by the Unicode Standard. + + * Regular Expression: ICU's regular expressions fully support Unicode while providing very competitive performance. + + * Bidi: support for handling text containing a mixture of left to right (English) and right to left (Arabic or Hebrew) data. + + * Text Boundaries: Locate the positions of words, sentences, paragraphs within a range of text, or identify locations that would be suitable for line wrapping when displaying the text." + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The ICU development files" +PROVIDES_devel=" + icu${secondaryArchSuffix}_devel = $portVersion + cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 4.8 + devel:libicudata${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicui18n${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicuio${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicule${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libiculx${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicutest${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicutu${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicuuc${secondaryArchSuffix} = 48.1.1 compat >= 48 + " +REQUIRES_devel=" + icu${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/icu/icu-4.8.1.bep b/dev-libs/icu/icu-4.8.1.bep deleted file mode 100644 index 423c57d5d..000000000 --- a/dev-libs/icu/icu-4.8.1.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="icu" -HOMEPAGE="http://www.icu-project.org" -SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1/icu4c-4_8_1-src.tgz" -CHECKSUM_MD5="af36f635271a239d76d038d6cf8da8df" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd icu/source - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-renaming --disable-samples --disable-extras - make -} - -INSTALL { - cd icu/source - make install -} - -LICENSE="ICU" -COPYRIGHT="1997-2011 IBM Corporation and others." diff --git a/dev-libs/icu/patches/icu-4.4.1.patch b/dev-libs/icu/patches/icu-4.4.1.patch deleted file mode 100644 index 93f8911f4..000000000 --- a/dev-libs/icu/patches/icu-4.4.1.patch +++ /dev/null @@ -1,510 +0,0 @@ -diff -ruwN icu/source/aclocal.m4 icu-haiku/source/aclocal.m4 ---- icu/source/aclocal.m4 2010-04-28 17:28:54.011796480 +0200 -+++ icu-haiku/source/aclocal.m4 2010-07-26 14:35:01.820248576 +0200 -@@ -59,7 +59,8 @@ - *-*-os400*) icu_cv_host_frag=mh-os400 ;; - *-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;; - *-apple-darwin*) icu_cv_host_frag=mh-darwin ;; --*-*-beos|*-*-haiku) icu_cv_host_frag=mh-beos ;; -+*-*-beos) icu_cv_host_frag=mh-beos ;; -+*-*-haiku) icu_cv_host_frag=mh-haiku ;; - *-*-irix*) icu_cv_host_frag=mh-irix ;; - *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; - *-*-nto*) icu_cv_host_frag=mh-qnx ;; -diff -ruwN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp ---- icu/source/common/normalizer2.cpp 2010-04-28 17:27:38.044040192 +0200 -+++ icu-haiku/source/common/normalizer2.cpp 2010-07-26 19:29:38.945553408 +0200 -@@ -221,7 +221,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.decompose(src, limit, &buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - ReorderingBuffer &buffer, UErrorCode &errorCode) const { -@@ -231,7 +231,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { - return impl.decompose(src, limit, NULL, errorCode); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { - return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; - } -@@ -251,7 +251,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - ReorderingBuffer &buffer, UErrorCode &errorCode) const { -@@ -293,7 +293,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const { - return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { - return impl.getCompQuickCheck(impl.getNorm16(c)); - } -@@ -320,7 +320,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.makeFCD(src, limit, &buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - ReorderingBuffer &buffer, UErrorCode &errorCode) const { -@@ -330,7 +330,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { - return impl.makeFCD(src, limit, NULL, errorCode); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); } - virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); } - virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); } -diff -ruwN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku ---- icu/source/config/mh-haiku 1970-01-01 01:00:00.000000000 +0100 -+++ icu-haiku/source/config/mh-haiku 2010-07-26 21:54:15.739246080 +0200 -@@ -0,0 +1,82 @@ -+## -*-makefile-*- -+## haiku-specific setup -+## Copyright (c) 2009, International Business Machines Corporation and -+## others. All Rights Reserved. -+## -+ -+## Commands to generate dependency files -+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) -+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -+ -+## Flags for position independent code -+SHAREDLIBCFLAGS = -fPIC -+SHAREDLIBCXXFLAGS = -fPIC -+SHAREDLIBCPPFLAGS = -DPIC -+ -+## Additional flags when building libraries and with threads -+LIBCPPFLAGS = -+THREADSCPPFLAGS = -+ -+## These are the library specific LDFLAGS -+LDFLAGSICUDT=-nodefaultlibs -nostdlib -+ -+## Compiler switch to embed a runtime search path -+LD_RPATH= -+LD_RPATH_PRE = -Wl,-rpath, -+ -+## Compiler switch to embed a library name -+LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) -+ -+## Shared library options -+LD_SOOPTIONS= -Wl,-Bsymbolic -+ -+## Shared object suffix -+SO = so -+## Non-shared intermediate object suffix -+STATIC_O = ao -+ -+## Compilation rules -+%.$(STATIC_O): $(srcdir)/%.c -+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -+%.o: $(srcdir)/%.c -+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< -+ -+%.$(STATIC_O): $(srcdir)/%.cpp -+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< -+%.o: $(srcdir)/%.cpp -+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< -+ -+ -+## Dependency rules -+%.d: $(srcdir)/%.c -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+%.d: $(srcdir)/%.cpp -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+## Versioned libraries rules -+ -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${ - #include - #include -+#if (__GNUC__ != 2) - #include -+#endif - - // *************************************************************************** - // class DigitList -@@ -399,11 +401,15 @@ - nonConstThis->fDouble /= -1; - } - } else if (isInfinite()) { -+#if (__GNUC__ != 2) - if (std::numeric_limits::has_infinity) { - nonConstThis->fDouble = std::numeric_limits::infinity(); - } else { - nonConstThis->fDouble = std::numeric_limits::max(); - } -+#else -+ nonConstThis->fDouble = DBL_MAX; -+#endif - if (!isPositive()) { - nonConstThis->fDouble = -fDouble; - } -diff -ruwN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h ---- icu/source/i18n/reldtfmt.h 2010-04-28 17:27:10.049283072 +0200 -+++ icu-haiku/source/i18n/reldtfmt.h 2010-07-26 19:08:52.212074496 +0200 -@@ -78,7 +78,9 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ != 2) - using DateFormat::format; -+#endif - - /** - * Format a date or time, which is the standard millis since 24:00 GMT, Jan -diff -ruwN icu/source/i18n/smpdtfmt.cpp icu-haiku/source/i18n/smpdtfmt.cpp ---- icu/source/i18n/smpdtfmt.cpp 2010-04-28 17:27:08.050855936 +0200 -+++ icu-haiku/source/i18n/smpdtfmt.cpp 2010-07-26 14:35:01.834142208 +0200 -@@ -1054,7 +1054,7 @@ - int32_t - SimpleDateFormat::parseGMTDefault(const UnicodeString &text, ParsePosition &pos) const { - int32_t start = pos.getIndex(); -- NumberFormat *currentNumberFormat = getNumberFormat(UDAT_TIMEZONE_RFC_FIELD); -+ NumberFormat *currentNumberFormat = getNumberFormatByIndex(UDAT_TIMEZONE_RFC_FIELD); - - if (start + kUtLen + 1 >= text.length()) { - pos.setErrorIndex(start); -@@ -1465,7 +1465,7 @@ - return; - } - -- currentNumberFormat = getNumberFormat(patternCharIndex); -+ currentNumberFormat = getNumberFormatByIndex(patternCharIndex); - switch (patternCharIndex) { - - // for any "G" symbol, write out the appropriate era string -@@ -1730,7 +1730,7 @@ - //---------------------------------------------------------------------- - - NumberFormat * --SimpleDateFormat::getNumberFormat(UDateFormatField index) const { -+SimpleDateFormat::getNumberFormatByIndex(UDateFormatField index) const { - if (fNumberFormatters != NULL) { - return fNumberFormatters[index]; - } else { -@@ -2365,7 +2365,7 @@ - } - - patternCharIndex = (UDateFormatField)(patternCharPtr - DateFormatSymbols::getPatternUChars()); -- currentNumberFormat = getNumberFormat(patternCharIndex); -+ currentNumberFormat = getNumberFormatByIndex(patternCharIndex); - UCalendarDateFields field = fgPatternIndexToCalendarField[patternCharIndex]; - - // If there are any spaces here, skip over them. If we hit the end -diff -ruwN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h ---- icu/source/i18n/unicode/choicfmt.h 2010-04-28 17:27:04.037486592 +0200 -+++ icu-haiku/source/i18n/unicode/choicfmt.h 2010-07-26 18:59:35.882114560 +0200 -@@ -441,7 +441,9 @@ - virtual const UnicodeString* getFormats(int32_t& count) const; - - -+#if (__GNUC__ != 2) - using NumberFormat::format; -+#endif - - /** - * Format a double or long number using this object's choices. -diff -ruwN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h ---- icu/source/i18n/unicode/datefmt.h 2010-04-28 17:27:04.036962304 +0200 -+++ icu-haiku/source/i18n/unicode/datefmt.h 2010-07-26 18:57:27.439615488 +0200 -@@ -212,7 +212,9 @@ - virtual UBool operator==(const Format&) const; - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles Formattable -diff -ruwN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h ---- icu/source/i18n/unicode/decimfmt.h 2010-04-28 17:27:04.032505856 +0200 -+++ icu-haiku/source/i18n/unicode/decimfmt.h 2010-07-26 21:37:12.587202560 +0200 -@@ -824,7 +824,16 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ != 2) - using NumberFormat::format; -+#else -+ virtual UnicodeString& format(const Formattable& obj, -+ UnicodeString& appendTo, -+ FieldPositionIterator* posIter, -+ UErrorCode& status) const { -+ return NumberFormat::format(obj, appendTo, posIter, status); -+ } -+#endif - - /** - * Format a double or long number using base-10 representation. -diff -ruwN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h ---- icu/source/i18n/unicode/dtitvfmt.h 2010-04-28 17:27:04.036700160 +0200 -+++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2010-07-26 19:12:22.191627264 +0200 -@@ -363,7 +363,9 @@ - UBool operator!=(const Format& other) const; - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles Formattable -diff -ruwN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h ---- icu/source/i18n/unicode/msgfmt.h 2010-04-28 17:27:04.033554432 +0200 -+++ icu-haiku/source/i18n/unicode/msgfmt.h 2010-07-26 18:57:58.825753600 +0200 -@@ -584,7 +584,9 @@ - virtual const Format** getFormats(int32_t& count) const; - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Formats the given array of arguments into a user-readable string. -diff -ruwN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h ---- icu/source/i18n/unicode/numfmt.h 2010-04-28 17:27:04.037224448 +0200 -+++ icu-haiku/source/i18n/unicode/numfmt.h 2010-07-26 18:54:07.820510720 +0200 -@@ -234,8 +234,9 @@ - */ - virtual UBool operator==(const Format& other) const; - -- -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles -diff -ruwN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h ---- icu/source/i18n/unicode/plurfmt.h 2010-04-28 17:27:04.031981568 +0200 -+++ icu-haiku/source/i18n/unicode/plurfmt.h 2010-07-26 19:00:08.335282176 +0200 -@@ -308,7 +308,9 @@ - void applyPattern(const UnicodeString& pattern, UErrorCode& status); - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Formats a plural message for a given number. -diff -ruwN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h ---- icu/source/i18n/unicode/rbnf.h 2010-04-28 17:27:04.039845888 +0200 -+++ icu-haiku/source/i18n/unicode/rbnf.h 2010-07-26 19:01:11.091226112 +0200 -@@ -722,7 +722,9 @@ - const Locale& locale = Locale::getDefault()); - - -+#if (__GNUC__ != 2) - using NumberFormat::format; -+#endif - - /** - * Formats the specified 32-bit number using the default ruleset. -diff -ruwN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h ---- icu/source/i18n/unicode/selfmt.h 2010-04-28 17:27:04.039583744 +0200 -+++ icu-haiku/source/i18n/unicode/selfmt.h 2010-07-26 19:00:39.130547712 +0200 -@@ -220,7 +220,9 @@ - void applyPattern(const UnicodeString& pattern, UErrorCode& status); - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Selects the phrase for the given keyword -diff -ruwN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h ---- icu/source/i18n/unicode/smpdtfmt.h 2010-04-28 17:27:04.034603008 +0200 -+++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2010-07-26 18:58:52.592969728 +0200 -@@ -368,7 +368,9 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ != 2) - using DateFormat::format; -+#endif - - /** - * Format a date or time, which is the standard millis since 24:00 GMT, Jan -@@ -1021,8 +1023,7 @@ - /** - * Get the numbering system to be used for a particular field. - */ -- using DateFormat::getNumberFormat; // Do not hide visibility of base class function -- NumberFormat * getNumberFormat(UDateFormatField index) const; -+ NumberFormat * getNumberFormatByIndex(UDateFormatField index) const; - - /** - * Parse the given override string and set up structures for number formats -diff -ruwN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h ---- icu/source/i18n/unicode/tmutfmt.h 2010-04-28 17:27:04.037486592 +0200 -+++ icu-haiku/source/i18n/unicode/tmutfmt.h 2010-07-26 21:37:12.592969728 +0200 -@@ -164,7 +164,16 @@ - void setNumberFormat(const NumberFormat& format, UErrorCode& status); - - -+#if (__GNUC__ != 2) - using MeasureFormat::format; -+#else -+ virtual UnicodeString& format(const Formattable& obj, -+ UnicodeString& appendTo, -+ FieldPositionIterator* posIter, -+ UErrorCode& status) const { -+ return Format::format(obj, appendTo, posIter, status); -+ } -+#endif - - /** - * Format a TimeUnitAmount. -diff -ruwN icu/source/i18n/uspoof_conf.cpp icu-haiku/source/i18n/uspoof_conf.cpp ---- icu/source/i18n/uspoof_conf.cpp 2010-04-28 17:27:08.050069504 +0200 -+++ icu-haiku/source/i18n/uspoof_conf.cpp 2010-07-26 19:15:22.253231104 +0200 -@@ -106,8 +106,10 @@ - // Conforms to the type signature for a USortComparator in uvector.h - - static int8_t U_CALLCONV SPUStringCompare(UHashTok left, UHashTok right) { -- const SPUString *sL = static_cast(left.pointer); -- const SPUString *sR = static_cast(right.pointer); -+ const SPUString *sL = const_cast( -+ static_cast(left.pointer)); -+ const SPUString *sR = const_cast( -+ static_cast(right.pointer)); - int32_t lenL = sL->fStr->length(); - int32_t lenR = sR->fStr->length(); - if (lenL < lenR) { -diff -ruwN icu/source/io/unicode/ustream.h icu-haiku/source/io/unicode/ustream.h ---- icu/source/io/unicode/ustream.h 2010-04-28 17:27:52.013369344 +0200 -+++ icu-haiku/source/io/unicode/ustream.h 2010-07-26 14:35:01.843055104 +0200 -@@ -27,8 +27,13 @@ - */ - - #if U_IOSTREAM_SOURCE >= 199711 -+ -+#if (__GNUC__ == 2) -+#include -+#else - #include - #include -+#endif - - U_NAMESPACE_BEGIN - -diff -ruwN icu/source/tools/gennorm2/n2builder.cpp icu-haiku/source/tools/gennorm2/n2builder.cpp ---- icu/source/tools/gennorm2/n2builder.cpp 2010-04-28 17:27:42.052953088 +0200 -+++ icu-haiku/source/tools/gennorm2/n2builder.cpp 2010-07-26 19:18:33.715390976 +0200 -@@ -674,7 +674,11 @@ - } - int32_t length=p->compositions->size(); - for(int32_t i=0; icompositions)[i]; -+#else - CompositionPair &pair=p->compositions->at(i); -+#endif - // 22 bits for the composite character and whether it combines forward. - UChar32 compositeAndFwd=pair.composite<<1; - if(getNormRef(pair.composite).compositions!=NULL) { -diff -ruwN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp ---- icu/source/tools/pkgdata/pkgdata.cpp 2010-04-28 17:27:46.008912896 +0200 -+++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2010-07-26 18:30:06.726401024 +0200 -@@ -472,7 +472,7 @@ - } - - static int runCommand(const char* command, UBool specialHandling) { -- char cmd[SMALL_BUFFER_MAX_SIZE]; -+ char cmd[64000]; - - if (!specialHandling) { - #ifdef USING_CYGWIN diff --git a/dev-libs/icu/patches/icu-4.8.1.1.patch b/dev-libs/icu/patches/icu-4.8.1.1.patch new file mode 100644 index 000000000..0db0c4abe --- /dev/null +++ b/dev-libs/icu/patches/icu-4.8.1.1.patch @@ -0,0 +1,591 @@ +diff -ruN icu/source/common/messagepattern.cpp icu-haiku/source/common/messagepattern.cpp +--- icu/source/common/messagepattern.cpp 2011-07-19 23:16:28.046137344 +0200 ++++ icu-haiku/source/common/messagepattern.cpp 2011-08-19 15:48:48.211025920 +0200 +@@ -88,8 +88,12 @@ + int32_t length, + UErrorCode &errorCode); + UBool ensureCapacityForOneMore(int32_t oldLength, UErrorCode &errorCode); +- UBool memEquals(const MessagePatternList &other, int32_t length) const { +- return 0==uprv_memcmp(a.getAlias(), other.a.getAlias(), length*sizeof(T)); ++ UBool equals(const MessagePatternList &other, int32_t length) const { ++ for (int32_t i=0; i a; +@@ -309,7 +313,7 @@ + msg==other.msg && + // parts.equals(o.parts) + partsLength==other.partsLength && +- (partsLength==0 || partsList->memEquals(*other.partsList, partsLength)); ++ (partsLength==0 || partsList->equals(*other.partsList, partsLength)); + // No need to compare numericValues if msg and parts are the same. + } + +diff -ruN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp +--- icu/source/common/normalizer2.cpp 2011-07-19 23:16:24.008912896 +0200 ++++ icu-haiku/source/common/normalizer2.cpp 2011-08-19 15:46:55.276824064 +0200 +@@ -239,7 +239,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.decompose(src, limit, &buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -250,7 +250,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { + return impl.decompose(src, limit, NULL, errorCode); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { + return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; + } +@@ -270,7 +270,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -313,7 +313,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const { + return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { + return impl.getCompQuickCheck(impl.getNorm16(c)); + } +@@ -340,7 +340,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.makeFCD(src, limit, &buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -351,7 +351,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { + return impl.makeFCD(src, limit, NULL, errorCode); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); } + virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); } + virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); } +diff -ruN icu/source/common/unicode/bytestrie.h icu-haiku/source/common/unicode/bytestrie.h +--- icu/source/common/unicode/bytestrie.h 2011-07-19 23:16:16.052953088 +0200 ++++ icu-haiku/source/common/unicode/bytestrie.h 2011-08-19 15:46:55.331874304 +0200 +@@ -338,6 +338,9 @@ + // but the code looks more confusing that way.) + UVector32 *stack_; + }; ++#if (__GNUC__ == 2) ++ friend class Iterator; ++#endif + + private: + friend class BytesTrieBuilder; +diff -ruN icu/source/common/unicode/bytestriebuilder.h icu-haiku/source/common/unicode/bytestriebuilder.h +--- icu/source/common/unicode/bytestriebuilder.h 2011-07-19 23:16:16.053477376 +0200 ++++ icu-haiku/source/common/unicode/bytestriebuilder.h 2011-08-19 15:46:55.333185024 +0200 +@@ -141,6 +141,9 @@ + private: + const char *s; + }; ++#if (__GNUC__ == 2) ++ friend class BTLinearMatchNode; ++#endif + + virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length, + Node *nextNode) const; +diff -ruN icu/source/common/unicode/platform.h.in icu-haiku/source/common/unicode/platform.h.in +--- icu/source/common/unicode/platform.h.in 2011-07-19 23:16:18.055574528 +0200 ++++ icu-haiku/source/common/unicode/platform.h.in 2011-08-19 15:46:55.346554368 +0200 +@@ -299,7 +299,7 @@ + + #ifdef U_STATIC_IMPLEMENTATION + #define U_EXPORT +-#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ ++#elif (@U_USE_GCC_VISIBILITY_ATTRIBUTE@) && (__GNUC__ > 2) + #define U_EXPORT __attribute__((visibility("default"))) + #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ + || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) +diff -ruN icu/source/common/unicode/stringtriebuilder.h icu-haiku/source/common/unicode/stringtriebuilder.h +--- icu/source/common/unicode/stringtriebuilder.h 2011-07-19 23:16:18.056623104 +0200 ++++ icu-haiku/source/common/unicode/stringtriebuilder.h 2011-08-19 15:46:55.336068608 +0200 +@@ -245,6 +245,9 @@ + protected: + int32_t value; + }; ++#if (__GNUC__ == 2) ++ friend class FinalValueNode; ++#endif + + /** @internal */ + class ValueNode : public Node { +@@ -272,6 +275,9 @@ + protected: + Node *next; + }; ++#if (__GNUC__ == 2) ++ friend class IntermediateValueNode; ++#endif + + /** @internal */ + class LinearMatchNode : public ValueNode { +@@ -323,6 +329,9 @@ + int32_t values[kMaxBranchLinearSubNodeLength]; + UChar units[kMaxBranchLinearSubNodeLength]; + }; ++#if (__GNUC__ == 2) ++ friend class ListBranchNode; ++#endif + + /** @internal */ + class SplitBranchNode : public BranchNode { +@@ -339,6 +348,9 @@ + Node *lessThan; + Node *greaterOrEqual; + }; ++#if (__GNUC__ == 2) ++ friend class SplitBranchNode; ++#endif + + // Branch head node, for writing the actual node lead unit. + /** @internal */ +@@ -354,6 +366,9 @@ + int32_t length; + Node *next; // A branch sub-node. + }; ++#if (__GNUC__ == 2) ++ friend class BranchHeadNode; ++#endif + + /** @internal */ + virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, +diff -ruN icu/source/common/unicode/ucharstrie.h icu-haiku/source/common/unicode/ucharstrie.h +--- icu/source/common/unicode/ucharstrie.h 2011-07-19 23:16:18.058720256 +0200 ++++ icu-haiku/source/common/unicode/ucharstrie.h 2011-08-19 15:46:55.338165760 +0200 +@@ -368,6 +368,9 @@ + // but the code looks more confusing that way.) + UVector32 *stack_; + }; ++#if (__GNUC__ == 2) ++ friend class Iterator; ++#endif + + private: + friend class UCharsTrieBuilder; +diff -ruN icu/source/common/unicode/ucharstriebuilder.h icu-haiku/source/common/unicode/ucharstriebuilder.h +--- icu/source/common/unicode/ucharstriebuilder.h 2011-07-19 23:16:18.059244544 +0200 ++++ icu-haiku/source/common/unicode/ucharstriebuilder.h 2011-08-19 15:46:55.339738624 +0200 +@@ -145,6 +145,9 @@ + private: + const UChar *s; + }; ++#if (__GNUC__ == 2) ++ friend class UCTLinearMatchNode; ++#endif + + virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, + Node *nextNode) const; +diff -ruN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku +--- icu/source/config/mh-haiku 2011-07-19 23:16:46.026214400 +0200 ++++ icu-haiku/source/config/mh-haiku 2011-08-19 15:46:55.328990720 +0200 +@@ -17,6 +17,9 @@ + LIBCPPFLAGS = + THREADSCPPFLAGS = + ++# ++CPPFLAGS += -D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1 ++ + ## Compiler switch to embed a runtime search path + LD_RPATH= + LD_RPATH_PRE = -Wl,-rpath, +@@ -31,35 +34,35 @@ + + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c +- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< ++ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< + %.o: $(srcdir)/%.c +- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< ++ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< + + %.$(STATIC_O): $(srcdir)/%.cpp +- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< ++ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< + %.o: $(srcdir)/%.cpp +- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< ++ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< + + + ## Dependency rules + %.d: $(srcdir)/%.c +- @echo "generating dependency information for $<" +- @$(SHELL) -ec '$(GEN_DEPS.c) $< \ +- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ +- [ -s $@ ] || rm -f $@' ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' + + %.d: $(srcdir)/%.cpp +- @echo "generating dependency information for $<" +- @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ +- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ +- [ -s $@ ] || rm -f $@' ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' + + ## Versioned libraries rules + + %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) +- $(RM) $@ && ln -s ${(preferenceSorting.elementAt(psIndex)); ++ UnicodeString item = *static_cast(preferenceSorting.elementAt(psIndex)); + // TODO: Since preferenceSorting was originally populated from the contents of a UnicodeSet, + // is it even possible for duplicates to show up in this check? + if (labelSet.contains(item)) { +@@ -240,7 +240,7 @@ + int32_t count = 0; + int32_t old = -1; + for (int32_t srcIndex=0; srcIndexsize(); srcIndex++) { +- const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); ++ const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); + ++count; + const int32_t bump = count * maxLabelCount_ / size; + if (bump == old) { +@@ -528,7 +528,7 @@ + const UnicodeString &AlphabeticIndex::getOverflowComparisonString(const UnicodeString &lowerLimit, UErrorCode &/*status*/) { + for (int32_t i=0; isize(); i++) { + const UnicodeString *s = +- static_cast(firstScriptCharacters_->elementAt(i)); ++ const_cast(static_cast(firstScriptCharacters_->elementAt(i))); + if (collator_->compare(*s, lowerLimit) > 0) { + return *s; + } +@@ -735,8 +735,10 @@ + sortCollateComparator(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const UnicodeString *leftString = static_cast(leftTok->pointer); +- const UnicodeString *rightString = static_cast(rightTok->pointer); ++ const UnicodeString *leftString ++ = const_cast(static_cast(leftTok->pointer)); ++ const UnicodeString *rightString ++ = const_cast(static_cast(rightTok->pointer)); + const Collator *col = static_cast(context); + + if (leftString == rightString) { +@@ -760,8 +762,10 @@ + recordCompareFn(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const AlphabeticIndex::Record *leftRec = static_cast(leftTok->pointer); +- const AlphabeticIndex::Record *rightRec = static_cast(rightTok->pointer); ++ const AlphabeticIndex::Record *leftRec ++ = const_cast(static_cast(leftTok->pointer)); ++ const AlphabeticIndex::Record *rightRec ++ = const_cast(static_cast(rightTok->pointer)); + const Collator *col = static_cast(context); + + Collator::EComparisonResult r = col->compare(leftRec->sortingName_, rightRec->sortingName_); +@@ -1087,8 +1091,8 @@ + PreferenceComparator(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const UnicodeString *s1 = static_cast(leftTok->pointer); +- const UnicodeString *s2 = static_cast(rightTok->pointer); ++ const UnicodeString *s1 = const_cast(static_cast(leftTok->pointer)); ++ const UnicodeString *s2 = const_cast(static_cast(rightTok->pointer)); + UErrorCode &status = *(UErrorCode *)(context); // Cast off both static and const. + if (s1 == s2) { + return 0; +diff -ruN icu/source/i18n/currfmt.h icu-haiku/source/i18n/currfmt.h +--- icu/source/i18n/currfmt.h 2011-07-19 23:16:00.058720256 +0200 ++++ icu-haiku/source/i18n/currfmt.h 2011-08-19 15:46:55.293339136 +0200 +@@ -63,7 +63,9 @@ + virtual Format* clone() const; + + ++#if (__GNUC__ > 2) + using MeasureFormat::format; ++#endif + + /** + * Override Format API. +diff -ruN icu/source/i18n/digitlst.cpp icu-haiku/source/i18n/digitlst.cpp +--- icu/source/i18n/digitlst.cpp 2011-07-19 23:16:00.050593792 +0200 ++++ icu-haiku/source/i18n/digitlst.cpp 2011-08-19 15:46:55.295698432 +0200 +@@ -37,7 +37,9 @@ + #include + #include + #include ++#if (__GNUC__ > 2) + #include ++#endif + + // *************************************************************************** + // class DigitList +@@ -423,11 +425,15 @@ + nonConstThis->fDouble /= -1; + } + } else if (isInfinite()) { ++#if (__GNUC__ > 2) + if (std::numeric_limits::has_infinity) { + nonConstThis->fDouble = std::numeric_limits::infinity(); + } else { + nonConstThis->fDouble = std::numeric_limits::max(); + } ++#else ++ nonConstThis->fDouble = DBL_MAX; ++#endif + if (!isPositive()) { + nonConstThis->fDouble = -fDouble; + } +diff -ruN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h +--- icu/source/i18n/reldtfmt.h 2011-07-19 23:16:06.034078720 +0200 ++++ icu-haiku/source/i18n/reldtfmt.h 2011-08-19 15:46:55.297533440 +0200 +@@ -79,7 +79,9 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using DateFormat::format; ++#endif + + /** + * Format a date or time, which is the standard millis since 24:00 GMT, Jan +diff -ruN icu/source/i18n/unicode/alphaindex.h icu-haiku/source/i18n/unicode/alphaindex.h +--- icu/source/i18n/unicode/alphaindex.h 2011-07-19 23:15:52.042467328 +0200 ++++ icu-haiku/source/i18n/unicode/alphaindex.h 2011-08-19 15:46:55.344719360 +0200 +@@ -588,6 +588,9 @@ + Record(AlphabeticIndex *alphaIndex, const UnicodeString &name, const void *data); + ~Record(); + }; ++#if (__GNUC__ == 2) ++ friend struct Record; ++#endif + + /** + * Holds all user records before they are distributed into buckets. +diff -ruN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h +--- icu/source/i18n/unicode/choicfmt.h 2011-07-19 23:15:52.038797312 +0200 ++++ icu-haiku/source/i18n/unicode/choicfmt.h 2011-08-19 15:46:55.300154880 +0200 +@@ -352,7 +352,9 @@ + virtual const UnicodeString* getFormats(int32_t& count) const; + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#endif + + /** + * Formats a double number using this object's choices. +diff -ruN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h +--- icu/source/i18n/unicode/datefmt.h 2011-07-19 23:15:52.035389440 +0200 ++++ icu-haiku/source/i18n/unicode/datefmt.h 2011-08-19 15:46:55.302514176 +0200 +@@ -212,7 +212,9 @@ + virtual UBool operator==(const Format&) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles Formattable +diff -ruN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h +--- icu/source/i18n/unicode/decimfmt.h 2011-07-19 23:15:54.040370176 +0200 ++++ icu-haiku/source/i18n/unicode/decimfmt.h 2011-08-19 15:46:55.305397760 +0200 +@@ -834,7 +834,16 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#else ++ virtual UnicodeString& format(const Formattable& obj, ++ UnicodeString& appendTo, ++ FieldPositionIterator* posIter, ++ UErrorCode& status) const { ++ return NumberFormat::format(obj, appendTo, posIter, status); ++ } ++#endif + + /** + * Format a double or long number using base-10 representation. +diff -ruN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h +--- icu/source/i18n/unicode/dtitvfmt.h 2011-07-19 23:15:54.042467328 +0200 ++++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2011-08-19 15:46:55.307757056 +0200 +@@ -363,7 +363,9 @@ + UBool operator!=(const Format& other) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles Formattable +diff -ruN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h +--- icu/source/i18n/unicode/msgfmt.h 2011-07-19 23:15:54.041156608 +0200 ++++ icu-haiku/source/i18n/unicode/msgfmt.h 2011-08-19 15:46:55.310116352 +0200 +@@ -615,7 +615,9 @@ + virtual const Format** getFormats(int32_t& count) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Formats the given array of arguments into a user-readable string. +diff -ruN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h +--- icu/source/i18n/unicode/numfmt.h 2011-07-19 23:15:54.039059456 +0200 ++++ icu-haiku/source/i18n/unicode/numfmt.h 2011-08-19 15:46:55.312213504 +0200 +@@ -212,8 +212,9 @@ + */ + virtual UBool operator==(const Format& other) const; + +- ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles +diff -ruN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h +--- icu/source/i18n/unicode/plurfmt.h 2011-07-19 23:15:52.044040192 +0200 ++++ icu-haiku/source/i18n/unicode/plurfmt.h 2011-08-19 15:46:55.314310656 +0200 +@@ -281,7 +281,9 @@ + void applyPattern(const UnicodeString& pattern, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Formats a plural message for a given number. +diff -ruN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h +--- icu/source/i18n/unicode/rbnf.h 2011-07-19 23:15:54.034340864 +0200 ++++ icu-haiku/source/i18n/unicode/rbnf.h 2011-08-19 15:46:55.316932096 +0200 +@@ -722,7 +722,9 @@ + const Locale& locale = Locale::getDefault()); + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#endif + + /** + * Formats the specified 32-bit number using the default ruleset. +diff -ruN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h +--- icu/source/i18n/unicode/selfmt.h 2011-07-19 23:15:52.042991616 +0200 ++++ icu-haiku/source/i18n/unicode/selfmt.h 2011-08-19 15:46:55.318767104 +0200 +@@ -219,7 +219,9 @@ + void applyPattern(const UnicodeString& pattern, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Selects the phrase for the given keyword +diff -ruN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h +--- icu/source/i18n/unicode/smpdtfmt.h 2011-07-19 23:15:52.035127296 +0200 ++++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2011-08-19 15:46:55.321126400 +0200 +@@ -369,7 +369,9 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using DateFormat::format; ++#endif + + /** + * Format a date or time, which is the standard millis since 24:00 GMT, Jan +diff -ruN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h +--- icu/source/i18n/unicode/tmutfmt.h 2011-07-19 23:15:54.039583744 +0200 ++++ icu-haiku/source/i18n/unicode/tmutfmt.h 2011-08-19 15:46:55.322961408 +0200 +@@ -162,7 +162,16 @@ + void setNumberFormat(const NumberFormat& format, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using MeasureFormat::format; ++#else ++ virtual UnicodeString& format(const Formattable& obj, ++ UnicodeString& appendTo, ++ FieldPositionIterator* posIter, ++ UErrorCode& status) const { ++ return MeasureFormat::format(obj, appendTo, posIter, status); ++ } ++#endif + + /** + * Format a TimeUnitAmount. +diff -ruN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp +--- icu/source/tools/pkgdata/pkgdata.cpp 2011-07-19 23:16:36.003670016 +0200 ++++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2011-08-19 15:46:55.326107136 +0200 +@@ -476,7 +476,7 @@ + + static int runCommand(const char* command, UBool specialHandling) { + char *cmd = NULL; +- char cmdBuffer[SMALL_BUFFER_MAX_SIZE]; ++ char cmdBuffer[64000]; + int32_t len = strlen(command); + + if (len == 0) { diff --git a/dev-libs/jansson/jansson-2.4.bep b/dev-libs/jansson/jansson-2.4.recipe similarity index 94% rename from dev-libs/jansson/jansson-2.4.bep rename to dev-libs/jansson/jansson-2.4.recipe index ad46db01e..c7f74eea7 100644 --- a/dev-libs/jansson/jansson-2.4.bep +++ b/dev-libs/jansson/jansson-2.4.recipe @@ -5,18 +5,21 @@ CHECKSUM_MD5="c4629b89bf0432f3158c461e88fe0113" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jansson-2.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd jansson-2.4 make install } -TEST { +TEST() +{ cd jansson-2.4/test run-suites } diff --git a/dev-libs/json-c/json-c-0.9.bep b/dev-libs/json_c/json_c-0.9.recipe similarity index 95% rename from dev-libs/json-c/json-c-0.9.bep rename to dev-libs/json_c/json_c-0.9.recipe index 2672551fb..bc916a517 100644 --- a/dev-libs/json-c/json-c-0.9.bep +++ b/dev-libs/json_c/json_c-0.9.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3a13d264528dcbaf3931b0cede24abae" -BUILD { +BUILD() +{ cd json-c-0.9 libtoolize --force --install --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd json-c-0.9 make install DESTDIR=${DESTDIR} } diff --git a/dev-libs/json-c/patches/json-c-0.9.patch b/dev-libs/json_c/patches/json-c-0.9.patch similarity index 100% rename from dev-libs/json-c/patches/json-c-0.9.patch rename to dev-libs/json_c/patches/json-c-0.9.patch diff --git a/dev-libs/libattica/libattica-0.4.1.bep b/dev-libs/libattica/libattica-0.4.1.recipe similarity index 94% rename from dev-libs/libattica/libattica-0.4.1.bep rename to dev-libs/libattica/libattica-0.4.1.recipe index 7652478be..881958ff4 100644 --- a/dev-libs/libattica/libattica-0.4.1.bep +++ b/dev-libs/libattica/libattica-0.4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b90983ec5d79e5ddcbc9146fa23cab72" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd attica-0.4.1 cmake CMakeLists.txt make } -INSTALL { +INSTALL() +{ cd attica-0.4.1 make install } diff --git a/dev-libs/libcdio/libcdio-0.82.bep b/dev-libs/libcdio/libcdio-0.82.recipe similarity index 96% rename from dev-libs/libcdio/libcdio-0.82.bep rename to dev-libs/libcdio/libcdio-0.82.recipe index 1fb34ef75..cef7033b6 100644 --- a/dev-libs/libcdio/libcdio-0.82.bep +++ b/dev-libs/libcdio/libcdio-0.82.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libiconv >= 1.12" CHECKSUM_MD5="1c29b18e01ab2b966162bc727bf3c360" -BUILD { +BUILD() +{ cd libcdio-0.82 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcdio-0.82 make install } diff --git a/dev-libs/libcdio/libcdio-0.83.bep b/dev-libs/libcdio/libcdio-0.83.recipe similarity index 96% rename from dev-libs/libcdio/libcdio-0.83.bep rename to dev-libs/libcdio/libcdio-0.83.recipe index 9c49fbacf..8de9b8fe9 100644 --- a/dev-libs/libcdio/libcdio-0.83.bep +++ b/dev-libs/libcdio/libcdio-0.83.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libiconv >= 1.12" CHECKSUM_MD5="b9e0f1bccb142e697cd834fe56b6e6fb" -BUILD { +BUILD() +{ cd libcdio-0.83 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcdio-0.83 make install } diff --git a/dev-libs/libcdio/libcdio-0.90.bep b/dev-libs/libcdio/libcdio-0.90.recipe similarity index 96% rename from dev-libs/libcdio/libcdio-0.90.bep rename to dev-libs/libcdio/libcdio-0.90.recipe index ccb9b0931..21184f10c 100644 --- a/dev-libs/libcdio/libcdio-0.90.bep +++ b/dev-libs/libcdio/libcdio-0.90.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/libiconv >= 1.12 dev-util/pkgconfig" CHECKSUM_MD5="1b245b023fb03a58d030fd2800db3247" -BUILD { +BUILD() +{ cd libcdio-0.90 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcdio-0.90 make install } diff --git a/dev-libs/libcss/libcss-0.1.2.bep b/dev-libs/libcss/libcss-0.1.2.recipe similarity index 95% rename from dev-libs/libcss/libcss-0.1.2.bep rename to dev-libs/libcss/libcss-0.1.2.recipe index 8a6a7596a..110740f12 100644 --- a/dev-libs/libcss/libcss-0.1.2.bep +++ b/dev-libs/libcss/libcss-0.1.2.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libparserutils >= 0.1.1" -BUILD { +BUILD() +{ cd libcss-0.1.2 make } -INSTALL { +INSTALL() +{ cd libcss-0.1.2 make install } diff --git a/dev-libs/libcss/libcss-0.2.0-HEAD.bep b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe similarity index 100% rename from dev-libs/libcss/libcss-0.2.0-HEAD.bep rename to dev-libs/libcss/libcss-0.2.0_HEAD.recipe diff --git a/dev-libs/libdwarf/libdwarf-20120410.bep b/dev-libs/libdwarf/libdwarf-20120410.recipe similarity index 97% rename from dev-libs/libdwarf/libdwarf-20120410.bep rename to dev-libs/libdwarf/libdwarf-20120410.recipe index 6ef959510..01c895b41 100644 --- a/dev-libs/libdwarf/libdwarf-20120410.bep +++ b/dev-libs/libdwarf/libdwarf-20120410.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libelf >= 0.8.13" -BUILD { +BUILD() +{ cd dwarf-20120410/libdwarf ./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY) make @@ -14,7 +15,8 @@ BUILD { LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make } -INSTALL { +INSTALL() +{ cd dwarf-20120410/libdwarf make install cd ../dwarfdump diff --git a/dev-libs/libebml/libebml-1.0.0.bep b/dev-libs/libebml/libebml-1.0.0.recipe similarity index 95% rename from dev-libs/libebml/libebml-1.0.0.bep rename to dev-libs/libebml/libebml-1.0.0.recipe index b20b98fd2..4c79fea0c 100644 --- a/dev-libs/libebml/libebml-1.0.0.bep +++ b/dev-libs/libebml/libebml-1.0.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03" -BUILD { +BUILD() +{ cd libebml-1.0.0/make/linux make } -INSTALL { +INSTALL() +{ cd libebml-1.0.0/make/linux if [ -n ${DESTDIR} ];then make install DESTDIR="${DESTDIR}" diff --git a/dev-libs/libedit/libedit-20090923.bep b/dev-libs/libedit/libedit-20090923.bep deleted file mode 100644 index ccc9f99fd..000000000 --- a/dev-libs/libedit/libedit-20090923.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="libedit - A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://www.thrysoee.dk/editline/libedit-20090923-3.0.tar.gz" -CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libedit-20090923-3.0 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libedit-20090923-3.0 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." diff --git a/dev-libs/libedit/libedit-20100424.bep b/dev-libs/libedit/libedit-20100424.bep deleted file mode 100644 index f48954ddd..000000000 --- a/dev-libs/libedit/libedit-20100424.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://ports-space.haiku-files.org/dev-libs/source/libedit-20100424-3.0.tar.gz" -CHECKSUM_MD5="eb4482139525beff12c8ef59f1a84aae" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." -BUILD { - cd libedit-20100424-3.0 - autoreconf --force --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-shared \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libedit-20100424-3.0 - make install -} diff --git a/dev-libs/libedit/libedit-20110802-3.0.bep b/dev-libs/libedit/libedit-20110802-3.0.bep deleted file mode 100644 index 441ef480a..000000000 --- a/dev-libs/libedit/libedit-20110802-3.0.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://www.thrysoee.dk/editline/libedit-20110802-3.0.tar.gz" -CHECKSUM_MD5="0ea42e2c794da8ed32f6307b427f6590" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2011 The NetBSD Foundation, Inc." -BUILD { - cd libedit-20110802-3.0 - autoreconf --force --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-shared \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libedit-20110802-3.0 - make install -} diff --git a/dev-libs/libedit/libedit-20120601-3.0.bep b/dev-libs/libedit/libedit-20120601-3.0.bep deleted file mode 100644 index 27c02f8ce..000000000 --- a/dev-libs/libedit/libedit-20120601-3.0.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" -CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." -BUILD { - cd libedit-20120601-3.0 - autoreconf --force --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-shared \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libedit-20120601-3.0 - make install -} diff --git a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe new file mode 100644 index 000000000..a7ebed3d6 --- /dev/null +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -0,0 +1,66 @@ +SUMMARY="A BSD licensed replacement for the GNU readline library" +DESCRIPTION="This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline." +LICENSE="BSD (3-clause)" +COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." +HOMEPAGE="http://www.thrysoee.dk/editline/" +SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" +CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="libedit-2012_06_01_3.0.patch" + +PROVIDES=" + libedit = $portVersion + lib:libedit = 0.0.41 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libncurses + " +BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoreconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:sed + " + +SOURCE_DIR="libedit-20120601-3.0" + +BUILD() +{ + autoreconf --force --install + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libedit + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 +} + + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libedit_devel = $portVersion + devel:libedit = 0.0.41 compat >= 0 + " +REQUIRES_devel=" + libedit == $portVersion base + " diff --git a/dev-libs/libedit/patches/libedit-20090923.patch b/dev-libs/libedit/patches/libedit-20090923.patch deleted file mode 100644 index c706156d4..000000000 --- a/dev-libs/libedit/patches/libedit-20090923.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur libedit-20090923-3.0/examples/fileman.c libedit-20090923-3.0-haiku/examples/fileman.c ---- libedit-20090923-3.0/examples/fileman.c 2008-07-12 02:41:43.000000000 -0600 -+++ libedit-20090923-3.0-haiku/examples/fileman.c 2009-10-29 15:35:57.000000000 -0600 -@@ -11,7 +11,11 @@ - #include - #include - #include -+#if defined(__HAIKU__) -+#include -+#else - #include -+#endif - #include - #include - #include -diff -ur libedit-20090923-3.0/src/editline/readline.h libedit-20090923-3.0-haiku/src/editline/readline.h ---- libedit-20090923-3.0/src/editline/readline.h 2009-09-23 15:04:26.000000000 -0600 -+++ libedit-20090923-3.0-haiku/src/editline/readline.h 2009-10-29 15:35:17.000000000 -0600 -@@ -75,7 +75,7 @@ - - #ifndef CTRL - #include --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) - #include - #endif - #ifndef CTRL -diff -ur libedit-20090923-3.0/src/el.c libedit-20090923-3.0-haiku/src/el.c ---- libedit-20090923-3.0/src/el.c 2009-09-23 15:04:26.000000000 -0600 -+++ libedit-20090923-3.0-haiku/src/el.c 2009-10-29 15:30:46.000000000 -0600 -@@ -41,10 +41,6 @@ - #endif - #endif /* not lint && not SCCSID */ - --#ifndef MAXPATHLEN --#define MAXPATHLEN 4096 --#endif -- - /* - * el.c: EditLine interface functions - */ -@@ -56,6 +52,10 @@ - #include - #include "el.h" - -+#ifndef MAXPATHLEN -+#define MAXPATHLEN 4096 -+#endif -+ - /* el_init(): - * Initialize editline and set default parameters. - */ -diff -ur libedit-20090923-3.0/src/vis.c libedit-20090923-3.0-haiku/src/vis.c ---- libedit-20090923-3.0/src/vis.c 2009-09-23 15:04:26.000000000 -0600 -+++ libedit-20090923-3.0-haiku/src/vis.c 2009-10-29 15:34:45.000000000 -0600 -@@ -65,6 +65,10 @@ - #include - #include - -+#if defined(__HAIKU__) -+#include -+#endif -+ - #ifdef __weak_alias - __weak_alias(strsvis,_strsvis) - __weak_alias(strsvisx,_strsvisx) diff --git a/dev-libs/libedit/patches/libedit-20100424.patch b/dev-libs/libedit/patches/libedit-20100424.patch deleted file mode 100644 index 9ed2ec6b6..000000000 --- a/dev-libs/libedit/patches/libedit-20100424.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up libedit-20100424-3.0/configure.ac.orig libedit-20100424-3.0/configure.ac ---- libedit-20100424-3.0/configure.ac.orig 2010-04-29 17:13:51.201588736 -0600 -+++ libedit-20100424-3.0/configure.ac 2010-04-29 17:13:56.768344064 -0600 -@@ -46,7 +46,7 @@ AC_FUNC_ALLOCA - AC_HEADER_DIRENT - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h]) -+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h]) - - AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[]) - -diff -up libedit-20100424-3.0/examples/fileman.c.orig libedit-20100424-3.0/examples/fileman.c ---- libedit-20100424-3.0/examples/fileman.c.orig 2010-04-29 17:11:46.768868352 -0600 -+++ libedit-20100424-3.0/examples/fileman.c 2010-04-29 17:11:53.987496448 -0600 -@@ -11,7 +11,11 @@ - #include - #include - #include -+#ifdef HAVE_SYS_ERRNO_H - #include -+#elif HAVE_ERRNO_H -+#include -+#endif - #include - #include - #include -diff -up libedit-20100424-3.0/src/el.c.orig libedit-20100424-3.0/src/el.c ---- libedit-20100424-3.0/src/el.c.orig 2010-04-29 17:13:07.215482368 -0600 -+++ libedit-20100424-3.0/src/el.c 2010-04-29 17:13:27.866385920 -0600 -@@ -55,7 +55,9 @@ __RCSID("$NetBSD: el.c,v 1.59 2010/04/15 - #include - #include - #include -+#ifdef HAVE_LANGINFO_H - #include -+#endif - #include "el.h" - - /* el_init(): -diff -up libedit-20100424-3.0/src/vis.c.orig libedit-20100424-3.0/src/vis.c ---- libedit-20100424-3.0/src/vis.c.orig 2010-04-29 17:12:31.912261120 -0600 -+++ libedit-20100424-3.0/src/vis.c 2010-04-29 17:12:56.681574400 -0600 -@@ -67,6 +67,10 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2 - #include - #include - -+#ifdef HAVE_STDINT_H -+#include -+#endif -+ - #ifdef __weak_alias - __weak_alias(strsvis,_strsvis) - __weak_alias(strsvisx,_strsvisx) -diff -up libedit-20100424-3.0/src/editline/readline.h.orig libedit-20100424-3.0/src/editline/readline.h ---- libedit-20100424-3.0/src/editline/readline.h.orig 2010-04-29 17:12:05.235143168 -0600 -+++ libedit-20100424-3.0/src/editline/readline.h 2010-04-29 17:12:16.735313920 -0600 -@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; - - #ifndef CTRL - #include --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) - #include - #endif - #ifndef CTRL diff --git a/dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch b/dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch new file mode 100644 index 000000000..ffecf61f4 --- /dev/null +++ b/dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch @@ -0,0 +1,53 @@ +diff -urN libedit-20120601-3.0/configure.ac libedit-20120601-3.0-haiku/configure.ac +--- libedit-20120601-3.0/configure.ac 2012-06-01 12:04:56.000000000 -0700 ++++ libedit-20120601-3.0-haiku/configure.ac 2012-06-16 15:01:10.749207552 -0700 +@@ -65,7 +65,7 @@ + AC_HEADER_DIRENT + AC_HEADER_STDC + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h]) ++AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h]) + + AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[]) + +diff -urN libedit-20120601-3.0/examples/fileman.c libedit-20120601-3.0-haiku/examples/fileman.c +--- libedit-20120601-3.0/examples/fileman.c 2010-04-22 12:13:17.000000000 -0700 ++++ libedit-20120601-3.0-haiku/examples/fileman.c 2012-06-16 15:01:10.911212544 -0700 +@@ -11,7 +11,11 @@ + #include + #include + #include ++#ifdef HAVE_SYS_ERRNO_H + #include ++#elif HAVE_ERRNO_H ++#include ++#endif + #include + #include + #include +diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haiku/src/editline/readline.h +--- libedit-20120601-3.0/src/editline/readline.h 2012-05-22 10:43:49.000000000 -0700 ++++ libedit-20120601-3.0-haiku/src/editline/readline.h 2012-06-16 15:01:10.947388416 -0700 +@@ -75,7 +75,7 @@ + + #ifndef CTRL + #include +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) + #include + #endif + #ifndef CTRL +diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c +--- libedit-20120601-3.0/src/vis.c 2011-07-08 23:39:42.000000000 -0700 ++++ libedit-20120601-3.0-haiku/src/vis.c 2012-06-16 15:01:11.063176704 -0700 +@@ -68,6 +68,10 @@ + #include + #include + ++#ifdef HAVE_STDINT_H ++#include ++#endif ++ + #ifdef __weak_alias + __weak_alias(strvisx,_strvisx) + #endif diff --git a/dev-libs/libelf/libelf-0.8.13.bep b/dev-libs/libelf/libelf-0.8.13.recipe similarity index 96% rename from dev-libs/libelf/libelf-0.8.13.bep rename to dev-libs/libelf/libelf-0.8.13.recipe index d1a0c7ebb..ce1ff7e9d 100644 --- a/dev-libs/libelf/libelf-0.8.13.bep +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libelf-0.8.13 libtoolize -fci autoreconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libelf-0.8.13 make install instroot=$DESTDIR make install-compat instroot=$DESTDIR diff --git a/dev-libs/libevent/libevent-1.4.11.bep b/dev-libs/libevent/libevent-1.4.11.bep deleted file mode 100644 index 6747e2dc5..000000000 --- a/dev-libs/libevent/libevent-1.4.11.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-1.4.11-stable.tar.gz" -CHECKSUM_MD5="3d2dfe659a84441dd27e4587b5ffe0fe" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - cd libevent-1.4.11-stable - autoreconf -vfi - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libevent-1.4.11-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/libevent-1.4.13.bep b/dev-libs/libevent/libevent-1.4.13.bep deleted file mode 100644 index a7975f433..000000000 --- a/dev-libs/libevent/libevent-1.4.13.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-1.4.13-stable.tar.gz" -CHECKSUM_MD5="0b3ea18c634072d12b3c1ee734263664" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - cd libevent-1.4.13-stable - autoreconf -vfi - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libevent-1.4.13-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.bep deleted file mode 100644 index aff7ae9a7..000000000 --- a/dev-libs/libevent/libevent-1.4.14b.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz" -CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - cd libevent-1.4.14b-stable - autoreconf -vfi - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS - make -} - -INSTALL { - cd libevent-1.4.14b-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe new file mode 100644 index 000000000..3681bbc1a --- /dev/null +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -0,0 +1,103 @@ +SUMMARY="Libevent - an event notification library" +DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts. +libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop." +HOMEPAGE="http://www.libevent.org/" +SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz" +CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" + +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + cmd:event_rpcgen.py + lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " +SOURCE_DIR="$portVersionedName-stable" + +PATCHES="libevent-1.4.14b.patch" + +BUILD() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in + sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am + + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + +# TODO: replace /packages/libevent-1.4.14b-1/.self/ with an alias + mv /packages/libevent-1.4.14b-1/.self/lib/libevent.a \ + /packages/libevent-1.4.14b-1/.self/lib/libevent.la \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_core.a \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_core.la \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_extra.a \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_extra.la \ + $developDir + + prepareInstalledDevelLibs \ + libevent-1.4 \ + libevent_core-1.4 \ + libevent_extra-1.4 + + fixPkgconfig + + # devel package + + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cmd:event_rpcgen.py + lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 + " + +REQUIRES_devel=" + libevent$secondaryArchSuffix == $portVersion base + " diff --git a/dev-libs/libevent/libevent-2.0.10.bep b/dev-libs/libevent/libevent-2.0.10.bep deleted file mode 100644 index 87dc63adc..000000000 --- a/dev-libs/libevent/libevent-2.0.10.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-2.0.10-stable.tar.gz" -CHECKSUM_MD5="a37401d26cbbf28185211d582741a3d4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - cd libevent-2.0.10-stable - autoreconf -vfi - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS - make -} - -INSTALL { - cd libevent-2.0.10-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe new file mode 100644 index 000000000..adde785c0 --- /dev/null +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -0,0 +1,118 @@ +SUMMARY="Libevent - an event notification library" +DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts. +libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop." +HOMEPAGE="http://www.libevent.org/" +SRC_URI="https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz" +CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" + +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + cmd:event_rpcgen.py + lib:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5 + lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_openssl_2.0$secondaryArchSuffix= 5.1.9 compat >= 5 + lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_openssl$secondaryArchSuffix= 5.1.9 compat >= 5 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libnetwork$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libnetwork >= $haikuVersion + " +BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libz + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " +SOURCE_DIR="$portVersionedName-stable" + +PATCHES="libevent-2.0.21.patch" + +BUILD() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in + sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am + + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libevent \ + libevent_core \ + libevent_extra \ + libevent_pthreads \ + libevent_openssl + + mv .libs/libevent_core.* \ + .libs/libevent_extra.* \ + .libs/libevent_pthreads.* \ + .libs/libevent_openssl.* \ + $developLibDir + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cmd:event_rpcgen.py + lib:libevent$secondaryArchSuffix = $portVersion + lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5 + devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 + " + +REQUIRES_devel=" + libevent$secondaryArchSuffix == $portVersion base + devel:libssl + devel:libcrypto + " diff --git a/dev-libs/libevent/patches/libevent-1.4.11.patch b/dev-libs/libevent/patches/libevent-1.4.11.patch deleted file mode 100644 index 666e9f109..000000000 --- a/dev-libs/libevent/patches/libevent-1.4.11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libevent-1.4.11-stable/configure.in libevent-1.4.11-stable-haiku/configure.in ---- libevent-1.4.11-stable/configure.in 2009-05-24 13:37:49.000000000 +0000 -+++ libevent-1.4.11-stable-haiku/configure.in 2009-05-28 16:55:17.000000000 +0000 -@@ -33,7 +33,7 @@ - AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for libraries. --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - AC_CHECK_LIB(resolv, inet_aton) - AC_CHECK_LIB(rt, clock_gettime) - AC_CHECK_LIB(nsl, inet_ntoa) diff --git a/dev-libs/libevent/patches/libevent-1.4.13.patch b/dev-libs/libevent/patches/libevent-1.4.13.patch deleted file mode 100644 index 3f01c4701..000000000 --- a/dev-libs/libevent/patches/libevent-1.4.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libevent-1.4.13-stable/configure.in libevent-1.4.13-stable-haiku/configure.in ---- libevent-1.4.13-stable/configure.in 2009-05-24 13:37:49.000000000 +0000 -+++ libevent-1.4.13-stable-haiku/configure.in 2009-05-28 16:55:17.000000000 +0000 -@@ -33,7 +33,7 @@ - AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for libraries. --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - AC_CHECK_LIB(resolv, inet_aton) - AC_CHECK_LIB(rt, clock_gettime) - AC_CHECK_LIB(nsl, inet_ntoa) diff --git a/dev-libs/libevent/patches/libevent-2.0.10.patch b/dev-libs/libevent/patches/libevent-2.0.10.patch deleted file mode 100644 index bd94c5901..000000000 --- a/dev-libs/libevent/patches/libevent-2.0.10.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur libevent-2.0.10-stable/configure.in libevent-2.0.10-stable-haiku/configure.in ---- libevent-2.0.10-stable/configure.in 2010-12-16 18:38:34.018350080 +0100 -+++ libevent-2.0.10-stable-haiku/configure.in 2011-02-21 23:55:55.070254592 +0100 -@@ -54,8 +54,8 @@ - AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for libraries. --AC_SEARCH_LIBS([inet_ntoa], [nsl]) --AC_SEARCH_LIBS([socket], [socket]) -+AC_SEARCH_LIBS([inet_ntoa], [nsl network]) -+AC_SEARCH_LIBS([socket], [socket network]) - AC_SEARCH_LIBS([inet_aton], [resolv]) - AC_SEARCH_LIBS([clock_gettime], [rt]) - AC_SEARCH_LIBS([sendfile], [sendfile]) -diff -Naur libevent-2.0.10-stable/util-internal.h libevent-2.0.10-stable-haiku/util-internal.h ---- libevent-2.0.10-stable/util-internal.h 2010-12-14 20:07:56.021233664 +0100 -+++ libevent-2.0.10-stable-haiku/util-internal.h 2011-02-22 00:00:14.000000000 +0100 -@@ -173,7 +173,7 @@ - - /* Evaluates to the same boolean value as 'p', and hints to the compiler that - * we expect this value to be false. */ --#ifdef __GNUC__ -+#if __GNUC__ >= 3 - #define EVUTIL_UNLIKELY(p) __builtin_expect(!!(p),0) - #else - #define EVUTIL_UNLIKELY(p) (p) \ No newline at end of file diff --git a/dev-libs/libevent/patches/libevent-2.0.21.patch b/dev-libs/libevent/patches/libevent-2.0.21.patch new file mode 100644 index 000000000..92ece1c59 --- /dev/null +++ b/dev-libs/libevent/patches/libevent-2.0.21.patch @@ -0,0 +1,13 @@ +--- configure.in 2012-11-17 22:34:13.040894464 -0800 ++++ haiku/configure.in 2013-08-28 15:07:32.000000000 -0700 +@@ -104,8 +104,8 @@ + AM_CONDITIONAL([BUILD_REGRESS], [test "$enable_libevent_regress" = "yes"]) + + dnl Checks for libraries. +-AC_SEARCH_LIBS([inet_ntoa], [nsl]) +-AC_SEARCH_LIBS([socket], [socket]) ++AC_SEARCH_LIBS([inet_ntoa], [nsl network]) ++AC_SEARCH_LIBS([socket], [socket network]) + AC_SEARCH_LIBS([inet_aton], [resolv]) + AC_SEARCH_LIBS([clock_gettime], [rt]) + AC_SEARCH_LIBS([sendfile], [sendfile]) diff --git a/dev-libs/libffi/libffi-3.0.11.bep b/dev-libs/libffi/libffi-3.0.11.recipe similarity index 96% rename from dev-libs/libffi/libffi-3.0.11.bep rename to dev-libs/libffi/libffi-3.0.11.recipe index 2b187d569..ad0a8b41c 100644 --- a/dev-libs/libffi/libffi-3.0.11.bep +++ b/dev-libs/libffi/libffi-3.0.11.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="f69b9693227d976835b4857b1ba7d0e3" DEPEND="" -BUILD { +BUILD() +{ cd libffi-3.0.11 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libffi-3.0.11 make install } diff --git a/dev-libs/libffi/libffi-3.0.9.bep b/dev-libs/libffi/libffi-3.0.9.recipe similarity index 96% rename from dev-libs/libffi/libffi-3.0.9.bep rename to dev-libs/libffi/libffi-3.0.9.recipe index 1dfcf228a..784fae19e 100644 --- a/dev-libs/libffi/libffi-3.0.9.bep +++ b/dev-libs/libffi/libffi-3.0.9.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="1f300a7a7f975d4046f51c3022fa5ff1" DEPEND="" -BUILD { +BUILD() +{ cd libffi-3.0.9 cp /boot/common/share/libtool/config/config.* . libtoolize --force --copy @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libffi-3.0.9 make install } diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep b/dev-libs/libgcrypt/libgcrypt-1.4.5.recipe similarity index 95% rename from dev-libs/libgcrypt/libgcrypt-1.4.5.bep rename to dev-libs/libgcrypt/libgcrypt-1.4.5.recipe index 549933e7a..cb42a44dd 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep +++ b/dev-libs/libgcrypt/libgcrypt-1.4.5.recipe @@ -4,7 +4,8 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.5.tar.gz" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-libs/libgpg-error" -BUILD { +BUILD() +{ cd libgcrypt-1.4.5 libtoolize --force --copy --install autogen.sh @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgcrypt-1.4.5 make install } diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep b/dev-libs/libgcrypt/libgcrypt-1.5.0.recipe similarity index 96% rename from dev-libs/libgcrypt/libgcrypt-1.5.0.bep rename to dev-libs/libgcrypt/libgcrypt-1.5.0.recipe index f22ea0cbf..a9b064944 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep +++ b/dev-libs/libgcrypt/libgcrypt-1.5.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libgpg-error > 1.8" CHECKSUM_MD5="693f9c64d50c908bc4d6e01da3ff76d8" -BUILD { +BUILD() +{ cd libgcrypt-1.5.0 libtoolize --force --copy --install autogen.sh @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgcrypt-1.5.0 make install } diff --git a/dev-libs/libgpg-error/libgpg-error-1.10.bep b/dev-libs/libgpg_error/libgpg_error-1.10.recipe similarity index 96% rename from dev-libs/libgpg-error/libgpg-error-1.10.bep rename to dev-libs/libgpg_error/libgpg_error-1.10.recipe index 4b7149696..9f673b8c1 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.10.bep +++ b/dev-libs/libgpg_error/libgpg_error-1.10.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="gettext = 0.18.1.1-dev" CHECKSUM_MD5="736a03daa9dc5873047d4eb4a9c22a16" -BUILD { +BUILD() +{ cd libgpg-error-1.10 cd po touch t-cs.gmo t-de.gmo t-fr.gmo t-it.gmo t-nl.gmo \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgpg-error-1.10 make install } diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.bep b/dev-libs/libgpg_error/libgpg_error-1.7.recipe similarity index 95% rename from dev-libs/libgpg-error/libgpg-error-1.7.bep rename to dev-libs/libgpg_error/libgpg_error-1.7.recipe index d51596db0..22757c159 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.7.bep +++ b/dev-libs/libgpg_error/libgpg_error-1.7.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="" CHECKSUM_MD5="62c0d09d1e76c5b6da8fff92314c4665" -BUILD { +BUILD() +{ cd libgpg-error-1.7 autoreconf -vfi -Im4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libgpg-error-1.7 make install } diff --git a/dev-libs/libgpg_error/patches/libgpg_error-1.10.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.10.patch new file mode 100644 index 000000000..09e99ba4a --- /dev/null +++ b/dev-libs/libgpg_error/patches/libgpg_error-1.10.patch @@ -0,0 +1,11 @@ +--- libgpg-error-1.10/src/mkerrcodes2.awk 2008-08-26 12:45:58.010747904 +0000 ++++ libgpg-error-1.10-haiku/src/mkerrcodes2.awk 2012-04-09 16:59:18.363855872 +0000 +@@ -81,7 +81,7 @@ + /^#/ { next; } + + header { +- if ($1 ~ /^[0123456789]+$/) ++ if ($1 ~ /^-?[0123456789]+$/) + { + print "static const int err_code_from_index[] = {"; + header = 0; diff --git a/dev-libs/libgpg-error/patches/libgpg-error-1.7.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.7.patch similarity index 100% rename from dev-libs/libgpg-error/patches/libgpg-error-1.7.patch rename to dev-libs/libgpg_error/patches/libgpg_error-1.7.patch diff --git a/dev-libs/libiconv/libiconv-1.12.bep b/dev-libs/libiconv/libiconv-1.12.bep deleted file mode 100644 index 7b40e7808..000000000 --- a/dev-libs/libiconv/libiconv-1.12.bep +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION="libiconv" -HOMEPAGE="http://www.gnu.org/software/libiconv/" -SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz" -CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libiconv-1.12 - rm -rf aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci - aclocal --install -I m4 -I srcm4 - autoconf - autoheader - cd libcharset - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci - aclocal --install -I m4 - autoconf - autoheader - cd .. - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --docdir=$COMMON_DOCS/doc/iconv \ - --mandir=$COMMON_DOCS/man \ - --enable-relocatable \ - --enable-shared \ - --enable-static \ - --disable-nls - make -} - -INSTALL { - cd libiconv-1.12 - ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir` - mkdir -p ${ACLOCALDIR} - cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 - make install -} - -TEST{ - cd libiconv-1.12 - make check -} diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.bep deleted file mode 100644 index 2cecdd09e..000000000 --- a/dev-libs/libiconv/libiconv-1.13.1.bep +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION="libiconv" -HOMEPAGE="http://www.gnu.org/software/libiconv/" -SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" -CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libiconv-1.13.1 - rm -rf aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci - aclocal --install -I m4 -I srcm4 - autoconf - autoheader - cd libcharset - - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci - aclocal --install -I m4 - autoconf - autoheader - cd .. - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --docdir=$COMMON_DOCS/doc/iconv \ - --mandir=$COMMON_DOCS/man \ - --enable-relocatable \ - --enable-shared \ - --enable-static \ - --disable-nls - make -} - -INSTALL { - cd libiconv-1.13.1 - ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir` - mkdir -p ${ACLOCALDIR} - cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 - make install -} - -TEST{ - cd libiconv-1.13.1 - make check -} diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe new file mode 100644 index 000000000..1a1caf534 --- /dev/null +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -0,0 +1,207 @@ +SUMMARY="GNU iconv implementation" +HOMEPAGE=" + http://www.gnu.org/software/libiconv + http://www.gnu.org/software/iconv + " +LICENSE=" + GNU LGPL v2 + GNU GPL v3 + " +COPYRIGHT="2000-2009 Free Software Foundation, Inc." +SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" +CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libiconv$secondaryArchSuffix = $portVersion compat >= 1.13 + lib:libiconv$secondaryArchSuffix = 2.5.0 compat >= 2 + lib:libcharset$secondaryArchSuffix = 1.0.0 compat >= 1 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:iconv = 2.5.0 compat >= 2 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} + cmd:libtoolize + cmd:make + " + +BUILD() +{ + rm -rf aclocal.m4 + echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" + libtoolize -fci + aclocal --install -I m4 -I srcm4 + autoconf + autoheader + cd libcharset + echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" + libtoolize -fci + aclocal --install -I m4 + autoconf + autoheader + cd .. + runConfigure ./configure \ + --enable-relocatable \ + --enable-shared \ + --enable-static \ + --disable-nls + make $jobArgs +} + +INSTALL() +{ + ACLOCALDIR=$prefix/data/aclocal + mkdir -p ${ACLOCALDIR} + cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 + make install + + rm $libDir/charset.alias + + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + + prepareInstalledDevelLibs libiconv libcharset + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 \ + $dataDir \ + $docDir/*.3.html +} + +TEST() +{ + make check +} + +DESCRIPTION=" + For historical reasons, international text is often encoded using a + language or country dependent character encoding. With the advent of the + internet and the frequent exchange of text across countries - even the + viewing of a web page from a foreign country is a \"text exchange\" in this + context -, conversions between these encodings have become important. + They have also become a problem, because many characters which are present + in one encoding are absent in many other encodings. To solve this mess, + the Unicode encoding has been created. It is a super-encoding of all + others and is therefore the default encoding for new text formats like XML. + + Still, many computers still operate in locale with a traditional (limited) + character encoding. Some programs, like mailers and web browsers, must be + able to convert between a given text encoding and the user's encoding. + Other programs internally store strings in Unicode, to facilitate internal + processing, and need to convert between internal string representation + (Unicode) and external string representation (a traditional encoding) when + they are doing I/O. GNU libiconv is a conversion library for both kinds + of applications. + + This library provides an iconv() implementation, for use on systems which + don't have one, or whose implementation cannot convert from/to Unicode. + + It provides support for the encodings: + + European languages + ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-R, KOI8-U, + KOI8-RU, CP{1250,1251,1252,1253,1254,1257}, CP{850,866,1131}, + Mac{Roman,CentralEurope,Iceland,Croatian,Romania}, + Mac{Cyrillic,Ukraine,Greek,Turkish}, Macintosh + Semitic languages + ISO-8859-{6,8}, CP{1255,1256}, CP862, Mac{Hebrew,Arabic} + Japanese + EUC-JP, SHIFT_JIS, CP932, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1 + Chinese + EUC-CN, HZ, GBK, CP936, GB18030, EUC-TW, BIG5, CP950, BIG5-HKSCS, + BIG5-HKSCS:2004, BIG5-HKSCS:2001, BIG5-HKSCS:1999, ISO-2022-CN, + ISO-2022-CN-EXT + Korean + EUC-KR, CP949, ISO-2022-KR, JOHAB + Armenian + ARMSCII-8 + Georgian + Georgian-Academy, Georgian-PS + Tajik + KOI8-T + Kazakh + PT154, RK1048 + Thai + ISO-8859-11, TIS-620, CP874, MacThai + Laotian + MuleLao-1, CP1133 + Vietnamese + VISCII, TCVN, CP1258 + Platform specifics + HP-ROMAN8, NEXTSTEP + Full Unicode + UTF-8 + UCS-2, UCS-2BE, UCS-2LE + UCS-4, UCS-4BE, UCS-4LE + UTF-16, UTF-16BE, UTF-16LE + UTF-32, UTF-32BE, UTF-32LE + UTF-7 + C99, JAVA + Full Unicode, in terms of uint16_t or uint32_t (with machine dependent + endianness and alignment) + UCS-2-INTERNAL, UCS-4-INTERNAL + Locale dependent, in terms of 'char' or 'wchar_t' (with machine dependent + endianness and alignment, and with OS and locale dependent semantics) + char, wchar_t + The empty encoding name \"\" is equivalent to \"char\": it denotes the + locale dependent character encoding. + + When configured with the option --enable-extra-encodings, it also provides + support for a few extra encodings: + + European languages + CP{437,737,775,852,853,855,857,858,860,861,863,865,869,1125} + Semitic languages + CP864 + Japanese + EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3 + Chinese + BIG5-2003 (experimental) + Turkmen + TDS565 + Platform specifics + ATARIST, RISCOS-LATIN1 + + It can convert from any of these encodings to any other, through Unicode + conversion. + + It has also some limited support for transliteration, i.e. when a character + cannot be represented in the target character set, it can be approximated + through one or several similarly looking characters. Transliteration is + activated when \"//TRANSLIT\" is appended to the target encoding name. + + libiconv is for you if your application needs to support multiple character + encodings, but that support lacks from your system. + " + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libiconv development files" +PROVIDES_devel=" + libiconv${secondaryArchSuffix}_devel = $portVersion compat >= 1.13 + devel:libiconv${secondaryArchSuffix} = 2.5.0 compat >= 2 + devel:libcharset${secondaryArchSuffix} = 1.0.0 compat >= 1 + " +REQUIRES_devel=" + libiconv${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/libiconv/libiconv.OptionalPackageDescription b/dev-libs/libiconv/libiconv.OptionalPackageDescription deleted file mode 100644 index aa34e4d12..000000000 --- a/dev-libs/libiconv/libiconv.OptionalPackageDescription +++ /dev/null @@ -1,17 +0,0 @@ -Package: libiconv -Version: 1.13.1 -Copyright: 1998-2009 Free Software Foundation, Inc. -License: GNU LGPL v2 -URL: http://www.gnu.org/software/libiconv - -Package: libcharset -Version: 1.13.1 -Copyright: 1998-2009 Free Software Foundation, Inc. -License: GNU LGPL v2 -URL: http://www.gnu.org/software/libiconv - -Package: iconv -Version: 1.13.1 -Copyright: 1998-2009 Free Software Foundation, Inc. -License: GNU GPL v3 -URL: http://www.gnu.org/software/iconv diff --git a/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff b/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff deleted file mode 100644 index e2cc9cd3f..000000000 --- a/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff +++ /dev/null @@ -1,813 +0,0 @@ -diff -ur libiconv-1.12/build-aux/config.guess libiconv-1.12-haiku/build-aux/config.guess ---- libiconv-1.12/build-aux/config.guess 2007-09-30 01:30:02.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/config.guess 2008-05-25 16:59:19.000000000 +0000 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2007-07-22' -+timestamp='2008-01-08' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -56,8 +56,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -532,7 +532,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -799,6 +799,9 @@ - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -@@ -833,7 +836,14 @@ - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -954,8 +964,8 @@ - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -- xtensa:Linux:*:*) -- echo xtensa-unknown-linux-gnu -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -1206,6 +1216,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -diff -ur libiconv-1.12/build-aux/config.libpath libiconv-1.12-haiku/build-aux/config.libpath ---- libiconv-1.12/build-aux/config.libpath 2007-10-23 23:31:23.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/config.libpath 2008-05-26 04:06:01.000000000 +0000 -@@ -50,7 +50,7 @@ - shlibpath_var=LIBPATH - fi - ;; -- beos*) -+ beos* | haiku*) - shlibpath_var=LIBRARY_PATH - ;; - bsdi[45]*) -diff -ur libiconv-1.12/build-aux/config.rpath libiconv-1.12-haiku/build-aux/config.rpath ---- libiconv-1.12/build-aux/config.rpath 2007-11-11 16:41:16.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/config.rpath 2008-05-26 02:47:52.000000000 +0000 -@@ -175,7 +175,7 @@ - # them. - ld_shlibs=no - ;; -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else -@@ -511,7 +511,7 @@ - amigaos*) - library_names_spec='$libname.a' - ;; -- beos*) -+ beos* | haiku*) - library_names_spec='$libname$shrext' - ;; - bsdi[45]*) -diff -ur libiconv-1.12/build-aux/ltmain.sh libiconv-1.12-haiku/build-aux/ltmain.sh ---- libiconv-1.12/build-aux/ltmain.sh 2007-10-27 00:28:24.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/ltmain.sh 2008-05-26 02:58:38.000000000 +0000 -@@ -1593,7 +1593,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -3505,7 +3505,7 @@ - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -diff -ur libiconv-1.12/configure libiconv-1.12-haiku/configure ---- libiconv-1.12/configure 2007-11-11 16:46:26.000000000 +0000 -+++ libiconv-1.12-haiku/configure 2008-05-26 03:04:26.000000000 +0000 -@@ -5876,7 +5876,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -8697,7 +8697,7 @@ - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -9217,7 +9217,7 @@ - ld_shlibs=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -10272,7 +10272,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -10825,7 +10825,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -12686,7 +12686,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -13624,7 +13624,7 @@ - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -14243,7 +14243,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -15343,7 +15343,7 @@ - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -15863,7 +15863,7 @@ - ld_shlibs_F77=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -16847,7 +16847,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -17931,7 +17931,7 @@ - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -18451,7 +18451,7 @@ - ld_shlibs_GCJ=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -19455,7 +19455,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -diff -ur libiconv-1.12/libcharset/build-aux/config.guess libiconv-1.12-haiku/libcharset/build-aux/config.guess ---- libiconv-1.12/libcharset/build-aux/config.guess 2005-12-29 12:12:25.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/build-aux/config.guess 2008-05-25 16:59:19.000000000 +0000 -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2005-12-23' -+timestamp='2008-01-08' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -55,8 +56,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -106,7 +107,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -160,6 +161,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -206,8 +208,11 @@ - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -@@ -325,7 +330,7 @@ - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -- i86pc:SunOS:5.*:*) -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) -@@ -527,7 +532,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -767,6 +772,8 @@ - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac -@@ -774,7 +781,7 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -- i*:MINGW*:*) -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) -@@ -784,9 +791,18 @@ - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[345]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -@@ -820,6 +836,16 @@ - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -@@ -856,7 +882,11 @@ - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) -@@ -875,7 +905,11 @@ - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -@@ -930,6 +964,9 @@ - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -972,7 +1009,7 @@ - LIBC=gnulibc1 - # endif - #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout -@@ -982,7 +1019,11 @@ - LIBC=dietlibc - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit -@@ -1175,6 +1216,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1184,6 +1231,15 @@ - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; -diff -ur libiconv-1.12/libcharset/build-aux/config.libpath libiconv-1.12-haiku/libcharset/build-aux/config.libpath ---- libiconv-1.12/libcharset/build-aux/config.libpath 2005-12-29 12:12:25.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/build-aux/config.libpath 2008-05-26 03:14:14.000000000 +0000 -@@ -51,7 +51,7 @@ - shlibpath_var=LIBPATH - fi - ;; -- beos*) -+ beos* | haiku*) - shlibpath_var=LIBRARY_PATH - ;; - bsdi4*) -diff -ur libiconv-1.12/libcharset/build-aux/ltmain.sh libiconv-1.12-haiku/libcharset/build-aux/ltmain.sh ---- libiconv-1.12/libcharset/build-aux/ltmain.sh 2007-10-27 00:28:36.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/build-aux/ltmain.sh 2008-05-26 03:18:48.000000000 +0000 -@@ -1593,7 +1593,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -3505,7 +3505,7 @@ - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -diff -ur libiconv-1.12/libcharset/configure libiconv-1.12-haiku/libcharset/configure ---- libiconv-1.12/libcharset/configure 2007-11-11 16:48:07.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/configure 2008-05-26 03:22:22.000000000 +0000 -@@ -4272,7 +4272,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -6985,7 +6985,7 @@ - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -7505,7 +7505,7 @@ - ld_shlibs=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -8560,7 +8560,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -9113,7 +9113,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -10974,7 +10974,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -11912,7 +11912,7 @@ - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -12531,7 +12531,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -13631,7 +13631,7 @@ - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -14151,7 +14151,7 @@ - ld_shlibs_F77=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -15135,7 +15135,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -16219,7 +16219,7 @@ - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -16739,7 +16739,7 @@ - ld_shlibs_GCJ=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -17743,7 +17743,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -diff -ur libiconv-1.12/libcharset/lib/config.charset libiconv-1.12-haiku/libcharset/lib/config.charset ---- libiconv-1.12/libcharset/lib/config.charset 2006-06-19 10:40:15.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/lib/config.charset 2008-05-26 03:24:24.000000000 +0000 -@@ -469,7 +469,7 @@ - # space nevertheless. - echo "* UTF-8" - ;; -- beos*) -+ beos* | haiku*) - # BeOS has a single locale, and it has UTF-8 encoding. - echo "* UTF-8" - ;; -diff -ur libiconv-1.12/libcharset/m4/libtool.m4 libiconv-1.12-haiku/libcharset/m4/libtool.m4 ---- libiconv-1.12/libcharset/m4/libtool.m4 2007-10-27 00:46:10.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/m4/libtool.m4 2008-05-26 03:29:49.000000000 +0000 -@@ -937,7 +937,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -1342,7 +1342,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -2316,7 +2316,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2542,7 +2542,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3033,7 +3033,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -4955,7 +4955,7 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -5238,7 +5238,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -5631,7 +5631,7 @@ - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc -diff -ur libiconv-1.12/m4/libtool.m4 libiconv-1.12-haiku/m4/libtool.m4 ---- libiconv-1.12/m4/libtool.m4 2007-10-27 00:46:10.000000000 +0000 -+++ libiconv-1.12-haiku/m4/libtool.m4 2008-05-26 03:33:20.000000000 +0000 -@@ -937,7 +937,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -1342,7 +1342,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -2316,7 +2316,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2542,7 +2542,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3033,7 +3033,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -4955,7 +4955,7 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -5238,7 +5238,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -5631,7 +5631,7 @@ - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc diff --git a/dev-libs/liboil/liboil-0.3.17.bep b/dev-libs/liboil/liboil-0.3.17.recipe similarity index 96% rename from dev-libs/liboil/liboil-0.3.17.bep rename to dev-libs/liboil/liboil-0.3.17.recipe index a54643c8d..1ac563a5b 100644 --- a/dev-libs/liboil/liboil-0.3.17.bep +++ b/dev-libs/liboil/liboil-0.3.17.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="47dc734f82faeb2964d97771cfd2e701" -BUILD { +BUILD() +{ cd liboil-0.3.17 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd liboil-0.3.17 make install } diff --git a/dev-libs/libparserutils/libparserutils-0.1.1.bep b/dev-libs/libparserutils/libparserutils-0.1.1.recipe similarity index 95% rename from dev-libs/libparserutils/libparserutils-0.1.1.bep rename to dev-libs/libparserutils/libparserutils-0.1.1.recipe index 28738cbe1..79b17c7e9 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.1.bep +++ b/dev-libs/libparserutils/libparserutils-0.1.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.1.1- REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libparserutils-0.1.1 make } -INSTALL { +INSTALL() +{ cd libparserutils-0.1.1 make install } diff --git a/dev-libs/libparserutils/libparserutils-0.1.2-HEAD.bep b/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe similarity index 100% rename from dev-libs/libparserutils/libparserutils-0.1.2-HEAD.bep rename to dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe diff --git a/dev-libs/libpcre/libpcre-8.00.bep b/dev-libs/libpcre/libpcre-8.00.bep deleted file mode 100644 index 802fb405a..000000000 --- a/dev-libs/libpcre/libpcre-8.00.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.00.tar.gz" -CHECKSUM_MD5="c95500eeda12c8c7edc6b0926d60952c" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd pcre-8.00 - libtoolize --force --copy - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-utf8 --enable-unicode-properties --with-pic - make - make check -} - -INSTALL { - cd pcre-8.00 - make install -} -LICENSE="PCRE" -COPYRIGHT="1997-2010 University of Cambridge - 2007-2010, Google Inc. All rights reserved." diff --git a/dev-libs/libpcre/libpcre-8.02.bep b/dev-libs/libpcre/libpcre-8.02.bep deleted file mode 100644 index c5e5b701c..000000000 --- a/dev-libs/libpcre/libpcre-8.02.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.02.tar.bz2" -CHECKSUM_MD5="27948c1b5f5c1eabc23cba1ebe4c316f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd pcre-8.02 - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - libtoolize --force --copy - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-utf8 --enable-unicode-properties --with-pic --libdir=${LIBDIR} - make - make check -} - -INSTALL { - cd pcre-8.02 - make install -} -LICENSE="PCRE" -COPYRIGHT="1997-2010 University of Cambridge - 2007-2010, Google Inc. All rights reserved." diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.bep deleted file mode 100644 index 1d1b9188d..000000000 --- a/dev-libs/libpcre/libpcre-8.12.bep +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.12.tar.bz2" -CHECKSUM_MD5="f14a9fef3c92f3fc6c5ac92d7a2c7eb3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd pcre-8.12 - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - libtoolize --force --copy - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-utf8 \ - --enable-unicode-properties \ - --with-pic \ - --libdir=${LIBDIR} \ - --mandir=$COMMON_DOCS/man \ - --docdir=$COMMON_DOCS/doc/pcre - make -} - -INSTALL { - cd pcre-8.12 - make install -} - -TEST { - cd pcre-8.12 - make check -} - -LICENSE="PCRE" -COPYRIGHT="1997-2010 University of Cambridge - 2007-2010, Google Inc. All rights reserved." diff --git a/dev-libs/libpcre/libpcre-8.21.bep b/dev-libs/libpcre/libpcre-8.21.bep deleted file mode 100644 index 429772017..000000000 --- a/dev-libs/libpcre/libpcre-8.21.bep +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.pcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" -CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd pcre-8.21 - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-utf8 \ - --enable-unicode-properties \ - --with-pic \ - --libdir=${LIBDIR} \ - --mandir=$COMMON_DOCS/man \ - --docdir=$COMMON_DOCS/doc/pcre - make -} - -INSTALL { - cd pcre-8.21 - make install -} - -TEST { - cd pcre-8.21 - make check -} - -LICENSE="PCRE" -COPYRIGHT="1997-2011 University of Cambridge - 2007-2011, Google Inc. All rights reserved." diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe new file mode 100644 index 000000000..2a0093640 --- /dev/null +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -0,0 +1,95 @@ +SUMMARY="Perl5 Compatible Regular Expressions" +DESCRIPTION=" + The PCRE library is a set of functions that implement regular expression + pattern matching using the same syntax and semantics as Perl 5. PCRE has + its own native API, as well as a set of wrapper functions that correspond + to the POSIX regular expression API. The PCRE library is free, even for + building proprietary software. + This package contains the native API. + " +HOMEPAGE="http://www.pcre.org/" +LICENSE="PCRE" +COPYRIGHT=" + 1997-2011 University of Cambridge + 2007-2011, Google Inc. All rights reserved. + " +SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" +CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + libpcre = $portVersion + cmd:pcregrep = $portVersion compat >= 8 + cmd:pcretest = $portVersion compat >= 8 + lib:libpcre = 0.0.1 compat >= 0 + lib:libpcrecpp = 0.0.1 compat >= 0 + lib:libpcreposix = 0.0.1 compat >= 0 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:make + cmd:ld + cmd:libtoolize + " + +SOURCE_DIR="pcre-$portVersion" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure \ + --enable-utf8 \ + --enable-unicode-properties \ + --with-pic + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix + fixPkgconfig + + # fix pcre-config + fixDevelopLibDirReferences $binDir/pcre-config + + # devel package + packageEntries devel \ + $binDir/pcre-config \ + $developDir \ + $manDir/man3 +} + +TEST() +{ + make check +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libpcre_devel = $portVersion + cmd:pcre_config = $portVersion compat >= 8 + devel:libpcre = 0.0.1 compat >= 0 + devel:libpcrecpp = 0.0.1 compat >= 0 + devel:libpcreposix = 0.0.1 compat >= 0 + " +REQUIRES_devel=" + libpcre == $portVersion base + " diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe similarity index 95% rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe index 7c8343203..7d65949e3 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep +++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpthread-stubs-0.3 make install } diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe similarity index 95% rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe index 7c8343203..7d65949e3 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep +++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpthread-stubs-0.3 make install } diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.bep b/dev-libs/libsigc++/libsigc++-1.2.7.recipe similarity index 97% rename from dev-libs/libsigc++/libsigc++-1.2.7.bep rename to dev-libs/libsigc++/libsigc++-1.2.7.recipe index 1decbb7ed..246950f41 100644 --- a/dev-libs/libsigc++/libsigc++-1.2.7.bep +++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe @@ -5,7 +5,8 @@ REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-cpp/mm-common >= 0.9.2" CHECKSUM_MD5="b939751dff0db9652c5dbfc9de685efa" -BUILD { +BUILD() +{ cd libsigc++-1.2.7 libtoolize --force --copy --install aclocal -I scripts @@ -18,7 +19,8 @@ BUILD { # those errors and we really don't need either one } -INSTALL { +INSTALL() +{ cd libsigc++-1.2.7 make -i install } diff --git a/dev-libs/libsigc++/libsigc++-2.2.7.bep b/dev-libs/libsigc++/libsigc++-2.2.7.recipe similarity index 96% rename from dev-libs/libsigc++/libsigc++-2.2.7.bep rename to dev-libs/libsigc++/libsigc++-2.2.7.recipe index 9a4accac8..8ab2d197f 100644 --- a/dev-libs/libsigc++/libsigc++-2.2.7.bep +++ b/dev-libs/libsigc++/libsigc++-2.2.7.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-cpp/mm-common >= 0.9.2" CHECKSUM_MD5="48afe53ba0e3958f6ac5f072afed1c53" -BUILD { +BUILD() +{ cd libsigc++-2.2.7 libtoolize --force --copy aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsigc++-2.2.7 make install } diff --git a/dev-libs/libsigsegv/libsigsegv-2.8.bep b/dev-libs/libsigsegv/libsigsegv-2.8.recipe similarity index 95% rename from dev-libs/libsigsegv/libsigsegv-2.8.bep rename to dev-libs/libsigsegv/libsigsegv-2.8.recipe index 989c8e42c..43ca12414 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.8.bep +++ b/dev-libs/libsigsegv/libsigsegv-2.8.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="ebe554e26870d8bc200ef3e3539ffd7c" -BUILD { +BUILD() +{ cd libsigsegv-2.8 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsigsegv-2.8 make install } diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe new file mode 100644 index 000000000..522d04a76 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe @@ -0,0 +1,56 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#85dcb683b0c705c1789a3f688bd0d02368107824" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion" +REQUIRES="haiku >= $haikuVersion + lib:libexpat >= 1.5 + lib:libz + " +BUILD_REQUIRES="$REQUIRES" +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin +} diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe new file mode 100644 index 000000000..9f14ce4ff --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe @@ -0,0 +1,56 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#162ae79ad078caa7bb9c3ca44a76380093463ca9" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion" +REQUIRES="haiku >= $haikuVersion + lib:libexpat >= 1.5 + lib:libz + " +BUILD_REQUIRES="$REQUIRES" +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin +} diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe new file mode 100644 index 000000000..3d86900af --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe @@ -0,0 +1,77 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#a53a69500a56fa1056c6f3a4b17cc91a50c51395" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion + " +REQUIRES="haiku >= $haikuVersion + lib:libexpat + lib:libz + " +BUILD_REQUIRES=" + devel:libexpat + devel:libz + " +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libsolv development files" +PROVIDES_devel=" + libsolv_devel = $portVersion + devel:libsolv = $portVersion + devel:libsolvext = $portVersion + " +REQUIRES_devel=" + libsolv == $portVersion base + " diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe new file mode 100644 index 000000000..846d14650 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -0,0 +1,81 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libsolv$secondaryArchSuffix = $portVersion + lib:libsolv$secondaryArchSuffix = $portVersion + lib:libsolvext$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \ + src/CMakeLists.txt ext/CMakeLists.txt +} + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + libsolv${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe new file mode 100644 index 000000000..46e61e7ea --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -0,0 +1,81 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#01ed09a3e1f4637f72d4239fe3724fcafa39be94" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libsolv$secondaryArchSuffix = $portVersion + lib:libsolv$secondaryArchSuffix = $portVersion + lib:libsolvext$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \ + src/CMakeLists.txt ext/CMakeLists.txt +} + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + libsolv${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.bep b/dev-libs/libunistring/libunistring-0.9.1.1.recipe similarity index 96% rename from dev-libs/libunistring/libunistring-0.9.1.1.bep rename to dev-libs/libunistring/libunistring-0.9.1.1.recipe index 0138a2f4e..c131742e8 100644 --- a/dev-libs/libunistring/libunistring-0.9.1.1.bep +++ b/dev-libs/libunistring/libunistring-0.9.1.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/git >= 1.6.5.3 dev-util/gperf >= 3.0.4" -BUILD { +BUILD() +{ cd libunistring-0.9.1.1 libtoolize --copy --force --install ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libunistring-0.9.1.1 make install } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe similarity index 94% rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe index 8d71ca25f..f754274f1 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep +++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.1.1-sr REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libwapcaplet-0.1.1 make } -INSTALL { +INSTALL() +{ cd libwapcaplet-0.1.1 make install } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe new file mode 100644 index 000000000..42356bef8 --- /dev/null +++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe @@ -0,0 +1,22 @@ +DESCRIPTION="LibWapcaplet is a string internment library" +HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" +SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0" + +BUILD() +{ + cd libwapcaplet-0.1.1-HEAD + make PREFIX=/boot/common +} + +INSTALL() +{ + cd libwapcaplet-0.1.1-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe similarity index 100% rename from dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep rename to dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep b/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe similarity index 95% rename from dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep rename to dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe index 6e1d2a3c1..09547ecfd 100644 --- a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep +++ b/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7c64a28b08c8fdf6c8a95b0d5f1497b0" -BUILD { +BUILD() +{ cd libxdg-basedir-1.1.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libxdg-basedir-1.1.1 make install } diff --git a/dev-libs/libxdg-basedir/patches/libxdg-basedir-1.1.1.patch b/dev-libs/libxdg_basedir/patches/libxdg_basedir-1.1.1.patch similarity index 100% rename from dev-libs/libxdg-basedir/patches/libxdg-basedir-1.1.1.patch rename to dev-libs/libxdg_basedir/patches/libxdg_basedir-1.1.1.patch diff --git a/dev-libs/libxml2/libxml2-2.7.0-haiku.diff b/dev-libs/libxml2/libxml2-2.7.0-haiku.diff deleted file mode 100644 index 6bbb44a31..000000000 --- a/dev-libs/libxml2/libxml2-2.7.0-haiku.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN libxml2-2.7.0/configure.in libxml2-2.7.0-haiku/configure.in ---- libxml2-2.7.0/configure.in 2008-08-30 07:38:39.000000000 -0700 -+++ libxml2-2.7.0-haiku/configure.in 2008-08-30 14:20:06.000000000 -0700 -@@ -1255,6 +1255,9 @@ - ;; - *beos*) M_LIBS="" - ;; -+ *haiku*) M_LIBS="" -+ ;; -+ - *) M_LIBS="-lm" - ;; - esac diff --git a/dev-libs/libxml2/libxml2-2.7.2-haiku.diff b/dev-libs/libxml2/libxml2-2.7.2-haiku.diff deleted file mode 100644 index ec5425521..000000000 --- a/dev-libs/libxml2/libxml2-2.7.2-haiku.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libxml2-2.7.2/configure.in libxml2-2.7.2-haiku/configure.in ---- libxml2-2.7.2/configure.in 2008-10-03 07:09:55.000000000 +0000 -+++ libxml2-2.7.2-haiku/configure.in 2008-10-22 19:07:34.000000000 +0000 -@@ -1257,6 +1257,8 @@ - ;; - *beos*) M_LIBS="" - ;; -+ *haiku*) M_LIBS="" -+ ;; - *) M_LIBS="-lm" - ;; - esac diff --git a/dev-libs/libxml2/libxml2-2.7.3.bep b/dev-libs/libxml2/libxml2-2.7.3.bep deleted file mode 100644 index 5a7a0d4df..000000000 --- a/dev-libs/libxml2/libxml2-2.7.3.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.3.tar.gz" -CHECKSUM_MD5="8f4fda3969237c2a33bdb1583b5d06b2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libxml2-2.7.3 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS=-lnetwork - make -} - -INSTALL { - cd libxml2-2.7.3 - make install -} -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.7.6.bep b/dev-libs/libxml2/libxml2-2.7.6.bep deleted file mode 100644 index aeb674eb8..000000000 --- a/dev-libs/libxml2/libxml2-2.7.6.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz" -CHECKSUM_MD5="7740a8ec23878a2f50120e1faa2730f2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libxml2-2.7.6 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" - make -} - -INSTALL { - cd libxml2-2.7.6 - make install -} -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.7.7.bep b/dev-libs/libxml2/libxml2-2.7.7.bep deleted file mode 100644 index f5205acd0..000000000 --- a/dev-libs/libxml2/libxml2-2.7.7.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.7.tar.gz" -CHECKSUM_MD5="9abc9959823ca9ff904f1fbcf21df066" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libxml2-2.7.7 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" - make -} - -INSTALL { - cd libxml2-2.7.7 - make install -} - -TEST { - cd libxml2-2.7.7 - make tests -} - -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.7.8.bep b/dev-libs/libxml2/libxml2-2.7.8.bep deleted file mode 100644 index f6de68bbd..000000000 --- a/dev-libs/libxml2/libxml2-2.7.8.bep +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" -CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libxml2-2.7.8 - libtoolize --force --copy --install - aclocal - autoconf - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc \ - --mandir=$COMMON_DOCS/man - LDFLAGS="-lnetwork" - make -} - -INSTALL { - cd libxml2-2.7.8 - make install -} - -TEST { - cd libxml2-2.7.8 - make tests -} - -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.8.0.bep b/dev-libs/libxml2/libxml2-2.8.0.bep deleted file mode 100644 index 49230b94f..000000000 --- a/dev-libs/libxml2/libxml2-2.8.0.bep +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" -CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libxml2-2.8.0 - libtoolize --force --copy --install - aclocal - autoconf - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc \ - --mandir=$COMMON_DOCS/man - LDFLAGS="-lnetwork" - make -} - -INSTALL { - cd libxml2-2.8.0 - make install -} - -TEST { - cd libxml2-2.8.0 - make tests -} - -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe new file mode 100644 index 000000000..32c97981f --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -0,0 +1,223 @@ +SUMMARY="The XML C parser and toolkit of Gnome" +HOMEPAGE="http://www.xmlsoft.org/" +LICENSE="MIT" +COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." +SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" +CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libxml2-2.8.0.patchset" + +# build the python module only for the primary architecture +pythonModuleEnabled=false +if [ -z "$secondaryArchSuffix" ]; then + pythonModuleEnabled=true +fi + +PROVIDES=" + libxml2$secondaryArchSuffix = $portVersion compat >= 2 + lib:libxml2$secondaryArchSuffix = $portVersion compat >= 2 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:xmlcatalog = $portVersion compat >= 2 + cmd:xmllint = $portVersion compat >= 2 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix + " +if $pythonModuleEnabled; then + BUILD_REQUIRES="$BUILD_REQUIRES + python + " + # Note: We don't use "cmd:python" here to avoid issues with the + # python search path. +fi + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + lib:libicudata$secondaryArchSuffix + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:sed + " + +PATCH() +{ + # replace hard-coded references to the development documentation dir + sed -i "s,^DEVHELP_DIR=\(.*\),DEVHELP_DIR=${developDocDir}," \ + doc/devhelp/Makefile.am + sed -i "s,%{_datadir}/gtk-doc/html/libxml2,${developDocDir},g" \ + libxml.spec.in +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + + withPython= + if $pythonModuleEnabled; then + # We symlink python's directories into our packaging directory and tell + # configure that it can find python there. This way the correct + # installation directory for the python module is determined. + pythonDir="$portPackageLinksDir/python" + ln -s $pythonDir/bin $pythonDir/develop $pythonDir/lib $prefix + withPython="--with-python=$prefix" + fi + + runConfigure ./configure LDFLAGS="-lnetwork" \ + --with-html-dir=$docDir/html \ + --with-html-subdir="" \ + $withPython + make $jobArgs +} + +INSTALL() +{ + if $pythonModuleEnabled; then + # Unfortunately we can't just remove the in symlinks we created in + # BUILD() and install normally, since then make detects that the + # Python.h is missing and tries to rebuild the module. So we leave + # things as is and use DESTDIR to install the everything in a subdir. + # Then we remove the symlinks and move everything where it belongs. + make DESTDIR=$prefix install + rm -f $prefix/bin $prefix/develop $prefix/lib + mv $prefix/$prefix/* $prefix + rm -r $prefix/packages + else + make install + fi + + # prepare develop/lib + prepareInstalledDevelLibs libxml2 + fixPkgconfig + mv $libDir/xml2Conf.sh $developLibDir/ + fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config + + # python package + if $pythonModuleEnabled; then + packageEntries python \ + $libDir/python* \ + ${docDir}_python* + fi + + # devel package + packageEntries devel \ + $binDir/xml2-config \ + $dataDir \ + $developDir \ + $docDir \ + $manDir/man1/xml2-config.1 \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + else + # left-over since all contents has been moved to other packages + rmdir $(dirname $docDir) + fi +} + +TEST() +{ + make tests +} + +# ----- devel package --------------------------------------------------------- + +PROVIDES_devel=" + libxml2${secondaryArchSuffix}_devel = $portVersion + cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2 + devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2 + " +REQUIRES_devel=" + libxml2$secondaryArchSuffix == $portVersion base + " + +# ----- python package ------------------------------------------------------- + +if $pythonModuleEnabled; then + SUMMARY_python="The python module for libxml2" + PROVIDES_python=" + libxml2_python = $portVersion + " + REQUIRES_python=" + libxml2 == $portVersion base + cmd:python + " +fi + +# ----- DESCRIPTION ----------------------------------------------------------- + +DESCRIPTION=" + Libxml2 is the XML C parser and toolkit developed for the Gnome project + (but usable outside of the Gnome platform), it is free software available + under the MIT License. XML itself is a metalanguage to design markup + languages, i.e. text language where semantic and structure are added to + the content using extra "markup" information enclosed between angle + brackets. HTML is the most well-known markup language. Though the library + is written in C a variety of language bindings make it available in other + environments. + + Libxml2 implements a number of existing standards related to markup + languages: + + - the XML standard: http://www.w3.org/TR/REC-xml + - Namespaces in XML: http://www.w3.org/TR/REC-xml-names/ + - XML Base: http://www.w3.org/TR/xmlbase/ + - RFC 2396 : Uniform Resource Identifiers + - XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath + - HTML4 parser: http://www.w3.org/TR/html401/ + - XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr + - XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/ + - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] + Unicode encodings, and more if using iconv support part of SGML Open + Technical Resolution TR9401:1997 + - XML Catalogs Working Draft 06 August 2001: + http://www.oasis-open.org/committees/entity/spec-2001-08-06.html + - Canonical XML Version 1.0: + http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization + CR draft http://www.w3.org/TR/xml-exc-c14n + - Relax NG, ISO/IEC 19757-2:2003, + http://www.oasis-open.org/committees/relax-ng/spec-20011203.html + - W3C XML Schemas Part 2: Datatypes REC 02 May 2001 + - W3C xml:id Working Draft 7 April 2004 + + In most cases libxml2 tries to implement the specifications in a + relatively strictly compliant way. As of release 2.4.16, libxml2 passed + all 1800+ tests from the OASIS XML Tests Suite. + + To some extent libxml2 provides support for the following additional + specifications but doesn't claim to implement them completely: + + - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ + the document model, but it doesn't implement the API itself, gdome2 + does this on top of libxml2 + - RFC 959 : libxml2 implements a basic FTP client code + - RFC 1945 : HTTP/1.0, again a basic HTTP client code + - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible + with early expat versions + + A partial implementation of XML Schemas Part 1: Structure is being worked + on but it would be far too early to make any conformance statement about + it at the moment. + " diff --git a/dev-libs/libxml2/libxml2-2.9.0.bep b/dev-libs/libxml2/libxml2-2.9.0.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.9.0.bep rename to dev-libs/libxml2/libxml2-2.9.0.recipe index 70bf22569..bd26c3d12 100644 --- a/dev-libs/libxml2/libxml2-2.9.0.bep +++ b/dev-libs/libxml2/libxml2-2.9.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5b9bebf4f5d2200ae2c4efe8fa6103f7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxml2-2.9.0 libtoolize --force --copy --install aclocal @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxml2-2.9.0 make install } -TEST { +TEST() +{ cd libxml2-2.9.0 make tests } diff --git a/dev-libs/libxml2/patches/libxml2-2.7.3.patch b/dev-libs/libxml2/patches/libxml2-2.7.3.patch deleted file mode 100644 index e8f931a1c..000000000 --- a/dev-libs/libxml2/patches/libxml2-2.7.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libxml2-2.7.3/configure.in libxml2-2.7.3-haiku/configure.in ---- libxml2-2.7.3/configure.in 2009-01-19 06:27:55.000000000 +0000 -+++ libxml2-2.7.3-haiku/configure.in 2009-01-19 06:24:30.000000000 +0000 -@@ -473,7 +473,7 @@ - - dnl Checks for inet libraries: - AC_SEARCH_LIBS(gethostent, [nsl]) --AC_SEARCH_LIBS(setsockopt, [socket net]) -+AC_SEARCH_LIBS(setsockopt, [socket net network]) - AC_SEARCH_LIBS(connect, [inet]) - - dnl Determine what socket length (socklen_t) data type is -@@ -1259,7 +1259,7 @@ - case "$host" in - *mingw*) M_LIBS="" - ;; -- *beos*) M_LIBS="" -+ *beos*|*haiku*) M_LIBS="" - ;; - *) M_LIBS="-lm" - ;; diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patchset b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset new file mode 100644 index 000000000..d01d3ef3b --- /dev/null +++ b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset @@ -0,0 +1,125 @@ +From 847ae3527f9a7c10bbb81a299c0779bdedaa078b Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 03:04:24 +0200 +Subject: applying patch libxml2-2.8.0.patch + + +diff --git a/Makefile.am b/Makefile.am +index f82cefa..c4464a6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1208,8 +1208,8 @@ pkgconfig_DATA = libxml-2.0.pc + # + # Install the tests program sources as examples + # +-BASE_DIR=$(datadir)/doc +-DOC_MODULE=libxml2-$(VERSION) ++BASE_DIR=$(docdir) ++DOC_MODULE= + EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples + + install-data-local: +diff --git a/configure.in b/configure.in +index 0fb4983..a5f86ca 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.59) + AC_INIT(entities.c) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST + +diff --git a/xml2-config.in b/xml2-config.in +index 2989325..162d348 100644 +--- a/xml2-config.in ++++ b/xml2-config.in +@@ -40,8 +40,8 @@ while test $# -gt 0; do + case "$1" in + --prefix=*) + prefix=$optarg +- includedir=$prefix/include +- libdir=$prefix/lib ++ includedir=$prefix/develop/headers ++ libdir=$prefix/develop/lib + ;; + + --prefix) +@@ -50,7 +50,7 @@ while test $# -gt 0; do + + --exec-prefix=*) + exec_prefix=$optarg +- libdir=$exec_prefix/lib ++ libdir=$exec_prefix/develop/lib + ;; + + --exec-prefix) +-- +1.7.10.2 + + +From 6a3fd0a71df7e9f9207cc44dab2abd77822939fa Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 20:15:20 +0200 +Subject: configure.in: hack to find python directories on Haiku + +configure should really just ask python-config instead of searching +the stuff itself. + +diff --git a/configure.in b/configure.in +index a5f86ca..ade0cf8 100644 +--- a/configure.in ++++ b/configure.in +@@ -766,11 +766,11 @@ if test "$with_python" != "no" ; then + fi + if test "$PYTHON_VERSION" != "" + then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ ++ if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h -a \ + -d $with_python/lib/python$PYTHON_VERSION/site-packages + then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages ++ PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION ++ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages + else + if test -r $prefix/include/python$PYTHON_VERSION/Python.h + then +-- +1.7.10.2 + + +From 76ec01677cdf7b754497320bca5587c423d0bf65 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 23:00:24 +0200 +Subject: python[/tests]/Makefile.am: $(datadir)/doc -> $(docdir) + + +diff --git a/python/Makefile.am b/python/Makefile.am +index 68d2236..3bad10f 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -9,7 +9,7 @@ INCLUDES = \ + -I$(top_builddir)/include \ + -I$(top_builddir)/$(subdir) + +-docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) ++docsdir = $(docdir)_python-$(LIBXML_VERSION) + # libxml2class.txt is generated + dist_docs_DATA = TODO + +diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am +index 52c89fc..7549db9 100644 +--- a/python/tests/Makefile.am ++++ b/python/tests/Makefile.am +@@ -1,4 +1,4 @@ +-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples ++exampledir = $(docdir)_python-$(LIBXML_VERSION)/examples + dist_example_DATA = $(PYTESTS) $(XMLS) + + PYTESTS= \ +-- +1.7.10.2 + diff --git a/dev-libs/libxml2/libxml2-trunk.diff b/dev-libs/libxml2/patches/libxml2-trunk.diff similarity index 100% rename from dev-libs/libxml2/libxml2-trunk.diff rename to dev-libs/libxml2/patches/libxml2-trunk.diff diff --git a/dev-libs/libxslt/libxslt-1.1.26.bep b/dev-libs/libxslt/libxslt-1.1.26.recipe similarity index 97% rename from dev-libs/libxslt/libxslt-1.1.26.bep rename to dev-libs/libxslt/libxslt-1.1.26.recipe index 2702fe367..9eb59b7bf 100644 --- a/dev-libs/libxslt/libxslt-1.1.26.bep +++ b/dev-libs/libxslt/libxslt-1.1.26.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e61d0364a30146aaa3001296f853b2b9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxslt-1.1.26 libtoolize --force --copy --install aclocal @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxslt-1.1.26 make install } diff --git a/dev-libs/libxslt/libxslt-1.1.28.bep b/dev-libs/libxslt/libxslt-1.1.28.bep deleted file mode 100644 index 759cc47f0..000000000 --- a/dev-libs/libxslt/libxslt-1.1.28.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="XSLT C library developed for the GNOME project" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" -CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libxslt-1.1.28 - libtoolize --force --copy --install - aclocal - autoconf - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/' Makefile* - automake - - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd libxslt-1.1.28 - make install -} - -LICENSE="MIT" -COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe new file mode 100644 index 000000000..3af348ce2 --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -0,0 +1,81 @@ +SUMMARY="XSLT C library developed for the GNOME project" +HOMEPAGE="http://www.xmlsoft.org/" +LICENSE="MIT" +COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." +SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" +CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libxslt$secondaryArchSuffix = $portVersion + lib:libxslt$secondaryArchSuffix = $portVersion + lib:libexslt$secondaryArchSuffix = $portVersion + cmd:xslt_config$secondaryArchSuffix = $portVersion + cmd:xsltproc$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:automake + cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:sed + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libxslt + prepareInstalledDevelLibs libexslt + fixPkgconfig + + # devel package + packageEntries devel $developDir +} + +DESCRIPTION=" + Libxslt is the XSLT C library developed for the GNOME project. XSLT itself + is a an XML language to define transformation for XML. Libxslt is based on + libxml2 the XML C library developed for the GNOME project. It also + implements most of the EXSLT set of processor-portable extensions functions + and some of Saxon's evaluate and expressions extensions. + + People can either embed the library in their application or use xsltproc + the command line processing tool. This library is free software and can be + reused in commercial applications. + " + +PROVIDES_devel=" + libxslt${secondaryArchSuffix}_devel = $portVersion + devel:libxslt${secondaryArchSuffix} = $portVersion compat >= 1 + devel:libexslt${secondaryArchSuffix} = $portVersion compat >= 1 + " +REQUIRES_devel=" + libxslt${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/libzip/libzip-0.10.1.bep b/dev-libs/libzip/libzip-0.10.1.recipe similarity index 96% rename from dev-libs/libzip/libzip-0.10.1.bep rename to dev-libs/libzip/libzip-0.10.1.recipe index f7500da45..11d333880 100644 --- a/dev-libs/libzip/libzip-0.10.1.bep +++ b/dev-libs/libzip/libzip-0.10.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libzip-0.10.1 sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libzip-0.10.1 make install } diff --git a/dev-libs/libzip/libzip-0.10.bep b/dev-libs/libzip/libzip-0.10.recipe similarity index 96% rename from dev-libs/libzip/libzip-0.10.bep rename to dev-libs/libzip/libzip-0.10.recipe index aa1f380ae..39214e8ec 100644 --- a/dev-libs/libzip/libzip-0.10.bep +++ b/dev-libs/libzip/libzip-0.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="663d79a9d299a61026d1860d52cdf6fc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libzip-0.10 sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libzip-0.10 make install } diff --git a/dev-libs/lzo/lzo-2.06.bep b/dev-libs/lzo/lzo-2.06.recipe similarity index 94% rename from dev-libs/lzo/lzo-2.06.bep rename to dev-libs/lzo/lzo-2.06.recipe index 487c7facc..0828119ae 100644 --- a/dev-libs/lzo/lzo-2.06.bep +++ b/dev-libs/lzo/lzo-2.06.recipe @@ -5,18 +5,21 @@ CHECKSUM_MD5="95380bd4081f85ef08c5209f4107e9f8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lzo-2.06 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd lzo-2.06 make install } -TEST { +TEST() +{ cd lzo-2.06 make check } diff --git a/dev-libs/mpc/mpc-1.0.1.bep b/dev-libs/mpc/mpc-1.0.1.recipe similarity index 95% rename from dev-libs/mpc/mpc-1.0.1.bep rename to dev-libs/mpc/mpc-1.0.1.recipe index b4dd82b82..f53eedff9 100644 --- a/dev-libs/mpc/mpc-1.0.1.bep +++ b/dev-libs/mpc/mpc-1.0.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp = 5.0.5" CHECKSUM_SHA1="8c7e19ad0dd9b3b5cc652273403423d6cf0c5edf" -BUILD { +BUILD() +{ cd mpc-1.0.1 # libtoolize --force --copy --install # aclocal -I m4 @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpc-1.0.1 make install } -TEST { +TEST() +{ cd mpc-1.0.1 make check } diff --git a/dev-libs/mpfr/mpfr-3.0.0-7047.bep b/dev-libs/mpfr/mpfr-3.0.0-7047.bep deleted file mode 100644 index e134e23d0..000000000 --- a/dev-libs/mpfr/mpfr-3.0.0-7047.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" -HOMEPAGE="www.mpfr.org" -SRC_URI="svn://scm.gforge.inria.fr/svn/mpfr/branches/3.0#7047" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-libs/gmp = ?.?.?" -#CHECKSUM_MD5="" -BUILD { - cd mpfr-3.0.0-7047 - libtoolize --force --copy --install - aclocal -I m4 - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd mpfr-3.0.0-7047 - make install - make check -} - -LICENSE="GNU LGPL v3" -#COPYRIGHT="" diff --git a/dev-libs/mpfr/mpfr-3.1.1.bep b/dev-libs/mpfr/mpfr-3.1.1.recipe similarity index 95% rename from dev-libs/mpfr/mpfr-3.1.1.bep rename to dev-libs/mpfr/mpfr-3.1.1.recipe index 791db9071..8f4a04c4b 100644 --- a/dev-libs/mpfr/mpfr-3.1.1.bep +++ b/dev-libs/mpfr/mpfr-3.1.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp = 5.0.5" CHECKSUM_MD5="91d51c41fcf2799e4ee7a7126fc95c17" -BUILD { +BUILD() +{ cd mpfr-3.1.1 # libtoolize --force --copy --install # aclocal -I m4 @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpfr-3.1.1 make install } -TEST { +TEST() +{ cd mpfr-3.1.1 make check } diff --git a/dev-libs/oniguruma/oniguruma-5.9.2.bep b/dev-libs/oniguruma/oniguruma-5.9.2.recipe similarity index 94% rename from dev-libs/oniguruma/oniguruma-5.9.2.bep rename to dev-libs/oniguruma/oniguruma-5.9.2.recipe index d55211dcc..fc87ef1bd 100644 --- a/dev-libs/oniguruma/oniguruma-5.9.2.bep +++ b/dev-libs/oniguruma/oniguruma-5.9.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="0f4ad1b100a5f9a91623e04111707b84" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd onig-5.9.2 libtoolize --force --copy --install touch NEWS ChangeLog @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd onig-5.9.2 make install } -TEST { +TEST() +{ cd onig-5.9.2 make check } diff --git a/dev-libs/openssl/openssl-0.9.8l.bep b/dev-libs/openssl/openssl-0.9.8l.bep deleted file mode 100644 index 1e9cdad01..000000000 --- a/dev-libs/openssl/openssl-0.9.8l.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-0.9.8l.tar.gz" -CHECKSUM_MD5="05a0ece1372392a2cf310ebb96333025" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd openssl-0.9.8l - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL { - cd openssl-0.9.8l - make install -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-0.9.8m.bep b/dev-libs/openssl/openssl-0.9.8m.bep deleted file mode 100644 index 1048d6344..000000000 --- a/dev-libs/openssl/openssl-0.9.8m.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-0.9.8m.tar.gz" -CHECKSUM_MD5="898bf125370926d5f692a2201124f8ec" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-0.9.8m - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL { - cd openssl-0.9.8m - make install -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0.bep b/dev-libs/openssl/openssl-1.0.0.bep deleted file mode 100644 index 79c4511c3..000000000 --- a/dev-libs/openssl/openssl-1.0.0.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0.tar.gz" -CHECKSUM_MD5="89eaa86e25b2845f920ec00ae4c864ed" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0 - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL { - cd openssl-1.0.0 - make install INSTALL_PREFIX="${DESTDIR}" -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0a.bep b/dev-libs/openssl/openssl-1.0.0a.bep deleted file mode 100644 index a0cd88932..000000000 --- a/dev-libs/openssl/openssl-1.0.0a.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0a.tar.gz" -CHECKSUM_MD5="e3873edfffc783624cfbdb65e2249cbd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0a - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL { - cd openssl-1.0.0a - make install INSTALL_PREFIX="${DESTDIR}" -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0c.bep b/dev-libs/openssl/openssl-1.0.0c.bep deleted file mode 100644 index 81b78579e..000000000 --- a/dev-libs/openssl/openssl-1.0.0c.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0c.tar.gz" -CHECKSUM_MD5="ff8fb85610aef328315a9decbb2712e4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0c - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL { - cd openssl-1.0.0c - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0c - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0c.hpb b/dev-libs/openssl/openssl-1.0.0c.hpb deleted file mode 100644 index 62f55d87c..000000000 --- a/dev-libs/openssl/openssl-1.0.0c.hpb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0c.tar.gz" -CHECKSUM_MD5="ff8fb85610aef328315a9decbb2712e4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0c - config --prefix=/boot/common zlib shared - make -} - -INSTALL { - cd openssl-1.0.0c - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0c - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0d.bep b/dev-libs/openssl/openssl-1.0.0d.bep deleted file mode 100644 index 7684bdccb..000000000 --- a/dev-libs/openssl/openssl-1.0.0d.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" -CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0d - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl - make -} - -INSTALL { - cd openssl-1.0.0d - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0d - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2011 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe new file mode 100644 index 000000000..5bc4a71bd --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -0,0 +1,80 @@ +SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" +DESCRIPTION=" + The OpenSSL Project is a collaborative effort to develop a robust, + commercial-grade, full-featured, and Open Source toolkit implementing the + Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) + protocols as well as a full-strength general purpose cryptography library. + The project is managed by a worldwide community of volunteers that use the + Internet to communicate, plan, and develop the OpenSSL toolkit and its + related documentation. + + OpenSSL is based on the excellent SSLeay library developed by Eric A. Young + and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style + licence, which basically means that you are free to get and use it for + commercial and non-commercial purposes subject to some simple license + conditions. + " +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" +CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" +LICENSE="OpenSSL" +COPYRIGHT=" + 1995-1998 Eric Young + 1998-2011 The OpenSSL Project. + " +REVISION="5" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="openssl-1.0.0d.patch" + +PROVIDES=" + openssl = $portVersion compat >= 1.0.0 + cmd:c_rehash = $portVersion compat >= 1 + cmd:openssl = $portVersion compat >= 1 + lib:libcrypto = $portVersion compat >= 1.0.0 + lib:libssl = $portVersion compat >= 1.0.0 + " +REQUIRES=" + haiku >= $haikuVersion + zlib >= 1.2.3 + " +BUILD_REQUIRES=" + zlib_devel >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl >= 5 + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + # Fix hardcoded directory for manpages + sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* + + ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl + make +} + +INSTALL() +{ + make install + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir + + # prepare develop/lib + prepareInstalledDevelLibs libcrypto libssl + fixPkgconfig +} + +TEST() +{ + make test +} diff --git a/dev-libs/openssl/openssl-1.0.0e.bep b/dev-libs/openssl/openssl-1.0.0e.bep deleted file mode 100644 index d84ffb104..000000000 --- a/dev-libs/openssl/openssl-1.0.0e.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0e.tar.gz" -CHECKSUM_MD5="7040b89c4c58c7a1016c0dfa6e821c86" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0e - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl - make -} - -INSTALL { - cd openssl-1.0.0e - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0e - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2011 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0g.bep b/dev-libs/openssl/openssl-1.0.0g.bep deleted file mode 100644 index 5797ec087..000000000 --- a/dev-libs/openssl/openssl-1.0.0g.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0g.tar.gz" -CHECKSUM_MD5="07ecbe4324f140d157478637d6beccf1" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0g - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl - make -} - -INSTALL { - cd openssl-1.0.0g - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0g - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2012 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0j.bep b/dev-libs/openssl/openssl-1.0.0j.bep deleted file mode 100644 index a86acc668..000000000 --- a/dev-libs/openssl/openssl-1.0.0j.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" -CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0j - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl - make -} - -INSTALL { - cd openssl-1.0.0j - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0j - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2012 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe new file mode 100644 index 000000000..90b2d83e7 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -0,0 +1,125 @@ +SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" +DESCRIPTION=" + The OpenSSL Project is a collaborative effort to develop a robust, + commercial-grade, full-featured, and Open Source toolkit implementing the + Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) + protocols as well as a full-strength general purpose cryptography library. + The project is managed by a worldwide community of volunteers that use the + Internet to communicate, plan, and develop the OpenSSL toolkit and its + related documentation. + + OpenSSL is based on the excellent SSLeay library developed by Eric A. Young + and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style + licence, which basically means that you are free to get and use it for + commercial and non-commercial purposes subject to some simple license + conditions. + " +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" +CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" +LICENSE="OpenSSL" +COPYRIGHT=" + 1995-1998 Eric Young + 1998-2012 The OpenSSL Project. + " +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="openssl-1.0.0j.patch" + +PROVIDES=" + openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:c_rehash = $portVersion compat >= 1 + cmd:openssl = $portVersion compat >= 1 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1.2.3 + " +if [ -n "$secondaryArchSuffix" ]; then + REQUIRES="$REQUIRES + openssl == $portVersion base + " +fi + +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} + cmd:make + cmd:perl >= 5 + cmd:sed + " + +PATCH() +{ + # fix hard-coded perl path + sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget +} + +BUILD() +{ + # Fix hardcoded directory for manpages + sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* + + PERL="/bin/env perl" \ + ./config --prefix=$prefix --libdir=$relativeLibDir \ + --openssldir=$dataRootDir/ssl \ + zlib shared + make + # multi-job builds don't work correctly +} + +INSTALL() +{ + make install + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir + + # prepare develop/lib + prepareInstalledDevelLibs libcrypto libssl + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package, + # since we make it depend on the primary package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $dataRootDir/ssl + rm -rf $documentationDir + fi +} + +TEST() +{ + cd openssl-1.0.0j + make test +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + openssl${secondaryArchSuffix}_devel = $portVersion + devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0 + devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0 + " +REQUIRES_devel=" + openssl${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/openssl/patches/openssl-0.9.8l.patch b/dev-libs/openssl/patches/openssl-0.9.8l.patch deleted file mode 100644 index 338226ec8..000000000 --- a/dev-libs/openssl/patches/openssl-0.9.8l.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-0.9.8l/Configure openssl-0.9.8l-haiku/Configure ---- openssl-0.9.8l/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-0.9.8l-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-0.9.8l/Makefile.shared openssl-0.9.8l-haiku/Makefile.shared ---- openssl-0.9.8l/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-0.9.8l-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-0.9.8l/config openssl-0.9.8l-haiku/config ---- openssl-0.9.8l/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-0.9.8l-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-0.9.8m.patch b/dev-libs/openssl/patches/openssl-0.9.8m.patch deleted file mode 100644 index 7b74cc2fe..000000000 --- a/dev-libs/openssl/patches/openssl-0.9.8m.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-0.9.8m/Configure openssl-0.9.8m-haiku/Configure ---- openssl-0.9.8m/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-0.9.8m-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-0.9.8m/Makefile.shared openssl-0.9.8m-haiku/Makefile.shared ---- openssl-0.9.8m/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-0.9.8m-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-0.9.8m/config openssl-0.9.8m-haiku/config ---- openssl-0.9.8m/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-0.9.8m-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0.patch b/dev-libs/openssl/patches/openssl-1.0.0.patch deleted file mode 100644 index 00ec33277..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0/Configure openssl-1.0.0-haiku/Configure ---- openssl-1.0.0/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-1.0.0-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0/Makefile.shared openssl-1.0.0-haiku/Makefile.shared ---- openssl-1.0.0/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-1.0.0-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0/config openssl-1.0.0-haiku/config ---- openssl-1.0.0/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-1.0.0-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0a.patch b/dev-libs/openssl/patches/openssl-1.0.0a.patch deleted file mode 100644 index 92f1dbddb..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0a.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0a/Configure openssl-1.0.0a-haiku/Configure ---- openssl-1.0.0a/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-1.0.0a-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0a/Makefile.shared openssl-1.0.0a-haiku/Makefile.shared ---- openssl-1.0.0a/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-1.0.0a-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0a/config openssl-1.0.0a-haiku/config ---- openssl-1.0.0a/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-1.0.0a-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0c.patch b/dev-libs/openssl/patches/openssl-1.0.0c.patch deleted file mode 100644 index a7bd91cba..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0c.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0c/Configure openssl-1.0.0c-haiku/Configure ---- openssl-1.0.0c/Configure 2010-11-30 22:19:26.013631488 +0000 -+++ openssl-1.0.0c-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 -@@ -582,6 +582,9 @@ - "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0c/Makefile.shared openssl-1.0.0c-haiku/Makefile.shared ---- openssl-1.0.0c/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 -+++ openssl-1.0.0c-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 -@@ -594,10 +594,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0c/config openssl-1.0.0c-haiku/config ---- openssl-1.0.0c/config 2010-03-09 17:08:39.013369344 +0000 -+++ openssl-1.0.0c-haiku/config 2010-12-10 09:33:29.000000000 +0000 -@@ -134,6 +134,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -799,6 +803,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/popt/popt-1.16.bep b/dev-libs/popt/popt-1.16.recipe similarity index 95% rename from dev-libs/popt/popt-1.16.bep rename to dev-libs/popt/popt-1.16.recipe index 1ff0dc764..c7b6f8b3f 100644 --- a/dev-libs/popt/popt-1.16.bep +++ b/dev-libs/popt/popt-1.16.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3743beefa3dd6247a73f8f7a32c14c33" -BUILD { +BUILD() +{ cd popt-1.16 libtoolize --force --copy --install echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd popt-1.16 make install } diff --git a/dev-libs/protobuf/protobuf-2.4.1.bep b/dev-libs/protobuf/protobuf-2.4.1.recipe similarity index 94% rename from dev-libs/protobuf/protobuf-2.4.1.bep rename to dev-libs/protobuf/protobuf-2.4.1.recipe index c71c5f1cf..ef23ac899 100644 --- a/dev-libs/protobuf/protobuf-2.4.1.bep +++ b/dev-libs/protobuf/protobuf-2.4.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd protobuf-2.4.1 libtoolize --force --copy --install ./autogen.sh @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd protobuf-2.4.1 make install } -TEST { +TEST() +{ cd protobuf-2.4.1 make check } diff --git a/dev-libs/raptor2/raptor2-2.0.8.bep b/dev-libs/raptor2/raptor2-2.0.8.recipe similarity index 95% rename from dev-libs/raptor2/raptor2-2.0.8.bep rename to dev-libs/raptor2/raptor2-2.0.8.recipe index 72941880d..201b1cf35 100644 --- a/dev-libs/raptor2/raptor2-2.0.8.bep +++ b/dev-libs/raptor2/raptor2-2.0.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="ac60858b875aab8fa7917f21a1237aa9" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-util/gtk-doc>=1.3" -BUILD { +BUILD() +{ cd raptor2-2.0.8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd raptor2-2.0.8 make install } -TEST { +TEST() +{ cd raptor2-2.0.8 make check } diff --git a/dev-libs/rasqal/rasqal-0.9.29.bep b/dev-libs/rasqal/rasqal-0.9.29.recipe similarity index 95% rename from dev-libs/rasqal/rasqal-0.9.29.bep rename to dev-libs/rasqal/rasqal-0.9.29.recipe index f8d4a3d38..c8fc0413e 100644 --- a/dev-libs/rasqal/rasqal-0.9.29.bep +++ b/dev-libs/rasqal/rasqal-0.9.29.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="49e4b75a0c67465edf55dd20606715fa" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-libs/raptor2>=2.0.8" -BUILD { +BUILD() +{ cd rasqal-0.9.29 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd rasqal-0.9.29 make install } -TEST { +TEST() +{ cd rasqal-0.9.29 make check } diff --git a/dev-libs/redland/redland-1.0.15.bep b/dev-libs/redland/redland-1.0.15.recipe similarity index 95% rename from dev-libs/redland/redland-1.0.15.bep rename to dev-libs/redland/redland-1.0.15.recipe index 8aa04a56b..386fff5c7 100644 --- a/dev-libs/redland/redland-1.0.15.bep +++ b/dev-libs/redland/redland-1.0.15.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b0deb87f3c7d3237a3d587c1e0f2f266" REVISION="1" STATUS_HAIKU="untested" DEPEND="rasqal>=0.9.29" -BUILD { +BUILD() +{ cd redland-1.0.15 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd redland-1.0.15 make install } -TEST { +TEST() +{ cd redland-1.0.15 make check } diff --git a/dev-libs/serd/serd-0.18.0.bep b/dev-libs/serd/serd-0.18.0.recipe similarity index 96% rename from dev-libs/serd/serd-0.18.0.bep rename to dev-libs/serd/serd-0.18.0.recipe index 7ae46de27..d48670c8d 100644 --- a/dev-libs/serd/serd-0.18.0.bep +++ b/dev-libs/serd/serd-0.18.0.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="96dbade2c81d6df8100a9ef605ce35f8" -BUILD { +BUILD() +{ cd serd-0.18.0 sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" waf sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" wscript @@ -15,7 +16,8 @@ BUILD { ./waf } -INSTALL { +INSTALL() +{ cd serd-0.18.0 ./waf install } diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.bep b/dev-libs/tinyxml/tinyxml-2.6.2.recipe similarity index 91% rename from dev-libs/tinyxml/tinyxml-2.6.2.bep rename to dev-libs/tinyxml/tinyxml-2.6.2.recipe index 76ea6f7f2..0bcaeec8b 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2.bep +++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe @@ -1,27 +1,29 @@ -DESCRIPTION="TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" -SRC_URI="http://en.sourceforge.jp/frs/g_redir.php?m=jaist&f=%2Ftinyxml%2Ftinyxml%2F2.6.2%2Ftinyxml_2_6_2.tar.gz" -CHECKSUM_MD5="c1b864c96804a10526540c664ade67f0" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" - -BUILD { +DESCRIPTION="TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs" +HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" +SRC_URI="http://en.sourceforge.jp/frs/g_redir.php?m=jaist&f=%2Ftinyxml%2Ftinyxml%2F2.6.2%2Ftinyxml_2_6_2.tar.gz" +CHECKSUM_MD5="c1b864c96804a10526540c664ade67f0" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" + +BUILD() +{ cd tinyxml rm xmltest.cpp wget http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt cmake ./ make -} - -INSTALL { +} + +INSTALL() +{ cd tinyxml make install mkdir -p ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml cp ./*.cpp ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml mkdir -p ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml cp ./docs/* ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml -} - -LICENSE="Zlib" -COPYRIGHT="2001-2010 Lee Thomason" +} + +LICENSE="Zlib" +COPYRIGHT="2001-2010 Lee Thomason" diff --git a/dev-libs/uriparser/uriparser-0.7.5.bep b/dev-libs/uriparser/uriparser-0.7.5.recipe similarity index 96% rename from dev-libs/uriparser/uriparser-0.7.5.bep rename to dev-libs/uriparser/uriparser-0.7.5.recipe index c808642ab..a65afc5c7 100644 --- a/dev-libs/uriparser/uriparser-0.7.5.bep +++ b/dev-libs/uriparser/uriparser-0.7.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="459c2786758929b92bfbd0cee25b5aa0" -BUILD { +BUILD() +{ cd uriparser-0.7.5 libtoolize --force --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd uriparser-0.7.5 make install } diff --git a/dev-libs/xerces-c/xerces-c-3.1.1.bep b/dev-libs/xerces_c/xerces_c-3.1.1.recipe similarity index 96% rename from dev-libs/xerces-c/xerces-c-3.1.1.bep rename to dev-libs/xerces_c/xerces_c-3.1.1.recipe index 471c47293..6e0ce264f 100644 --- a/dev-libs/xerces-c/xerces-c-3.1.1.bep +++ b/dev-libs/xerces_c/xerces_c-3.1.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd xerces-c-3.1.1 libtoolize --copy --force --install autoreconf -i @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xerces-c-3.1.1 make install } diff --git a/dev-libs/zziplib/zziplib-0.13.59.bep b/dev-libs/zziplib/zziplib-0.13.59.recipe similarity index 97% rename from dev-libs/zziplib/zziplib-0.13.59.bep rename to dev-libs/zziplib/zziplib-0.13.59.recipe index 7812f068d..dfa96f4ec 100644 --- a/dev-libs/zziplib/zziplib-0.13.59.bep +++ b/dev-libs/zziplib/zziplib-0.13.59.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="14b5a6fc229afe9916d48358479568d3" -BUILD { +BUILD() +{ cd zziplib-0.13.59 sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd zziplib-0.13.59 make install } diff --git a/dev-lua/luarocks/luarocks-2.0.4.1.bep b/dev-lua/luarocks/luarocks-2.0.4.1.recipe similarity index 95% rename from dev-lua/luarocks/luarocks-2.0.4.1.bep rename to dev-lua/luarocks/luarocks-2.0.4.1.recipe index 35715858a..96b10e818 100644 --- a/dev-lua/luarocks/luarocks-2.0.4.1.bep +++ b/dev-lua/luarocks/luarocks-2.0.4.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/lua >= 5.1" CHECKSUM_MD5="2c7caccce3cdf236e6f9aca7bec9bdea" -BUILD { +BUILD() +{ cd luarocks-2.0.4.1 configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd luarocks-2.0.4.1 make install DESTDIR=${DESTDIR} } diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.70.bep b/dev-perl/HTML_Parser/HTML_Parser-3.70.recipe similarity index 100% rename from dev-perl/HTML-Parser/HTML-Parser-3.70.bep rename to dev-perl/HTML_Parser/HTML_Parser-3.70.recipe diff --git a/dev-perl/XML-Parser/XML-Parser-2.36.bep b/dev-perl/XML_Parser/XML_Parser-2.36.recipe similarity index 96% rename from dev-perl/XML-Parser/XML-Parser-2.36.bep rename to dev-perl/XML_Parser/XML_Parser-2.36.recipe index 6067758ff..4bb691719 100644 --- a/dev-perl/XML-Parser/XML-Parser-2.36.bep +++ b/dev-perl/XML_Parser/XML_Parser-2.36.recipe @@ -11,13 +11,15 @@ CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded" # TODO: Remove hardcoded paths. The following shows how to get the the file path: #find /boot/common/lib/perl5 -type f -name unixish.h | grep -FzZ BePC-haiku/CORE/unixish.h -BUILD { +BUILD() +{ cd XML-Parser-2.36 perl Makefile.PL make } -INSTALL { +INSTALL() +{ cd XML-Parser-2.36 make install DESTDIR="${DESTDIR}" } diff --git a/dev-python/cnf/cnf-1.0-git.bep b/dev-python/cnf/cnf-1.0_git.recipe similarity index 95% rename from dev-python/cnf/cnf-1.0-git.bep rename to dev-python/cnf/cnf-1.0_git.recipe index 85971864e..5b0f89989 100644 --- a/dev-python/cnf/cnf-1.0-git.bep +++ b/dev-python/cnf/cnf-1.0_git.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ echo "No build step" } -INSTALL { +INSTALL() +{ cd cnf-1.0-git python install_cnf.py } diff --git a/dev-python/numpy/numpy-1.4.1.bep b/dev-python/numpy/numpy-1.4.1.recipe similarity index 95% rename from dev-python/numpy/numpy-1.4.1.bep rename to dev-python/numpy/numpy-1.4.1.recipe index 0a4917f13..776c39a1b 100644 --- a/dev-python/numpy/numpy-1.4.1.bep +++ b/dev-python/numpy/numpy-1.4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="5c7b5349dc3161763f7f366ceb96516b" REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-lang/python >= 2.6.5" -BUILD { +BUILD() +{ cd numpy-1.4.1 python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd numpy-1.4.1 python setup.py install } diff --git a/dev-python/numpy/numpy-1.5.0.bep b/dev-python/numpy/numpy-1.5.0.recipe similarity index 96% rename from dev-python/numpy/numpy-1.5.0.bep rename to dev-python/numpy/numpy-1.5.0.recipe index 14bb87b27..59be61f97 100644 --- a/dev-python/numpy/numpy-1.5.0.bep +++ b/dev-python/numpy/numpy-1.5.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3a8bfdc434df782d647161c48943ee09" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.6.5" -BUILD { +BUILD() +{ cd numpy-1.5.0 python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd numpy-1.5.0 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/paramiko/paramiko-1.7.6.bep b/dev-python/paramiko/paramiko-1.7.6.recipe similarity index 88% rename from dev-python/paramiko/paramiko-1.7.6.bep rename to dev-python/paramiko/paramiko-1.7.6.recipe index 5a5289fdc..7dc55604a 100644 --- a/dev-python/paramiko/paramiko-1.7.6.bep +++ b/dev-python/paramiko/paramiko-1.7.6.recipe @@ -1,15 +1,17 @@ DESCRIPTION="Pure python SSH implementation" HOMEPAGE="http://www.lag.net/paramiko/" SRC_URI="http://pypi.python.org/packages/source/p/paramiko/paramiko-1.7.6.zip" -REVISION= "1" +REVISION="1" STATUS_HAIKU="stable" DEPEND="pycrypto >= 1.9" CHECKSUM_MD5="b1cfe0cd55772115f808a11c1baba8a0" -BUILD { +BUILD() +{ cd paramiko-1.7.6 python setup.py build } -INSTALL { +INSTALL() +{ cd paramiko-1.7.6 if [ -n "${DESTDIR}" ];then python setup.py install --root=${DESTDIR} @@ -19,4 +21,4 @@ INSTALL { } LICENSE="GNU LGPL v2.1" -COPYRIGHT="2003-2009 Robey Pointer" \ No newline at end of file +COPYRIGHT="2003-2009 Robey Pointer" diff --git a/dev-python/pychart/pychart-1.39.bep b/dev-python/pychart/pychart-1.39.recipe similarity index 94% rename from dev-python/pychart/pychart-1.39.bep rename to dev-python/pychart/pychart-1.39.recipe index 0d4469f17..eda016918 100644 --- a/dev-python/pychart/pychart-1.39.bep +++ b/dev-python/pychart/pychart-1.39.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f1f509a1c4623056c8e780bb7c9a05c5" -BUILD { +BUILD() +{ cd PyChart-1.39 python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd PyChart-1.39 python setup.py install --root=${DESTDIR} } -TEST { +TEST() +{ cd PyChart-1.39/demos make } diff --git a/dev-python/pychart/pychart-1.39-bzr.bep b/dev-python/pychart/pychart-1.39_bzr.recipe similarity index 94% rename from dev-python/pychart/pychart-1.39-bzr.bep rename to dev-python/pychart/pychart-1.39_bzr.recipe index 000a90264..a83bfdf4a 100644 --- a/dev-python/pychart/pychart-1.39-bzr.bep +++ b/dev-python/pychart/pychart-1.39_bzr.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="f1f509a1c4623056c8e780bb7c9a05c5" -BUILD { +BUILD() +{ cd pychart-1.39-bzr python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd pychart-1.39-bzr python setup.py install --root=${DESTDIR} } -TEST { +TEST() +{ cd pychart-1.39-bzr/demos make } diff --git a/dev-python/pycrypto/pycrypto-2.3.bep b/dev-python/pycrypto/pycrypto-2.3.recipe similarity index 88% rename from dev-python/pycrypto/pycrypto-2.3.bep rename to dev-python/pycrypto/pycrypto-2.3.recipe index f34147622..70209d8cb 100644 --- a/dev-python/pycrypto/pycrypto-2.3.bep +++ b/dev-python/pycrypto/pycrypto-2.3.recipe @@ -1,15 +1,17 @@ DESCRIPTION="Download, build, install, upgrade, and uninstall Python packages -- easily!" HOMEPAGE="http://pypi.python.org/pypi/pycrypto/2.3" SRC_URI="http://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.3.tar.gz" -REVISION= "1" +REVISION="1" STATUS_HAIKU="unstable" DEPEND="" CHECKSUM_MD5="2b811cfbfc342d83ee614097effb8101" -BUILD { +BUILD() +{ cd pycrypto-2.3 python setup.py build } -INSTALL { +INSTALL() +{ cd pycrypto-2.3 if [ -n "${DESTDIR}" ];then python setup.py install --root=${DESTDIR} @@ -18,4 +20,4 @@ INSTALL { fi } LICENSE="pycrypto" -COPYRIGHT="2010 Dwayne C. Litzenberger" \ No newline at end of file +COPYRIGHT="2010 Dwayne C. Litzenberger" diff --git a/dev-python/pydispatcher/pydispatcher-2.0.1.bep b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe similarity index 83% rename from dev-python/pydispatcher/pydispatcher-2.0.1.bep rename to dev-python/pydispatcher/pydispatcher-2.0.1.recipe index 73788bc85..48c54d4f0 100644 --- a/dev-python/pydispatcher/pydispatcher-2.0.1.bep +++ b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe @@ -1,21 +1,23 @@ DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python" HOMEPAGE="http://pydispatcher.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/project/pydispatcher/pydispatcher/2.0.1/PyDispatcher-2.0.1.tar.gz" -REVISION= "1" +REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-python/setuptools >= 0.6" CHECKSUM_MD5="8b1695ed6f5bdbda8fbcde82b62d505c" -BUILD { +BUILD() +{ cd PyDispatcher-2.0.1 python setup.py build } -INSTALL { +INSTALL() +{ cd PyDispatcher-2.0.1 python setup.py install --root=${DESTDIR} } LICENSE="BSD (3-clause)" -COPYRIGHT="2001-2006, Patrick K. O'Brien and Contributors" \ No newline at end of file +COPYRIGHT="2001-2006, Patrick K. O'Brien and Contributors" diff --git a/dev-python/pygame/pygame-1.9.1.bep b/dev-python/pygame/pygame-1.9.1.recipe similarity index 96% rename from dev-python/pygame/pygame-1.9.1.bep rename to dev-python/pygame/pygame-1.9.1.recipe index 37d69521a..eb266e8ba 100644 --- a/dev-python/pygame/pygame-1.9.1.bep +++ b/dev-python/pygame/pygame-1.9.1.recipe @@ -9,13 +9,15 @@ DEPEND="dev-lang/python >= 2.6.4 media-libs/sdl-image >= 1.2.10 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd pygame-1.9.1release LOCALBASE=/boot/common/ python setup.py build } -INSTALL { +INSTALL() +{ cd pygame-1.9.1release python setup.py install --root=${DESTDIR} } diff --git a/dev-python/pylzma/pylzma-0.4.4.bep b/dev-python/pylzma/pylzma-0.4.4.recipe similarity index 95% rename from dev-python/pylzma/pylzma-0.4.4.bep rename to dev-python/pylzma/pylzma-0.4.4.recipe index 72da8b4ea..1cf497c91 100644 --- a/dev-python/pylzma/pylzma-0.4.4.bep +++ b/dev-python/pylzma/pylzma-0.4.4.recipe @@ -7,12 +7,14 @@ DEPEND="dev-lang/python >= 2.6.4 REVISION="1" CHECKSUM_MD5="a2be89cb2288174ebb18bec68fa559fb" -BUILD { +BUILD() +{ cd pylzma-0.4.4 python setup.py build } -INSTALL { +INSTALL() +{ cd pylzma-0.4.4 python setup.py install } diff --git a/dev-python/pyopengl/pyopengl-3.0.1.bep b/dev-python/pyopengl/pyopengl-3.0.1.recipe similarity index 95% rename from dev-python/pyopengl/pyopengl-3.0.1.bep rename to dev-python/pyopengl/pyopengl-3.0.1.recipe index 4365428fc..90519f858 100644 --- a/dev-python/pyopengl/pyopengl-3.0.1.bep +++ b/dev-python/pyopengl/pyopengl-3.0.1.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="unstable" DEPEND="dev-lang/python >= 2.6.4 media-libs/freeglut" -BUILD { +BUILD() +{ cd PyOpenGL-3.0.1 python setup.py build } -INSTALL { +INSTALL() +{ cd PyOpenGL-3.0.1 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/pyserial/pyserial-2.5.bep b/dev-python/pyserial/pyserial-2.5.recipe similarity index 96% rename from dev-python/pyserial/pyserial-2.5.bep rename to dev-python/pyserial/pyserial-2.5.recipe index 2529314bc..c17ff5e6b 100644 --- a/dev-python/pyserial/pyserial-2.5.bep +++ b/dev-python/pyserial/pyserial-2.5.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ cd pyserial-2.5 python setup.py build } -INSTALL { +INSTALL() +{ cd pyserial-2.5 python setup.py install --root=${DESTDIR} diff --git a/dev-python/pyxml/pyxml-0.8.4.bep b/dev-python/pyxml/pyxml-0.8.4.recipe similarity index 95% rename from dev-python/pyxml/pyxml-0.8.4.bep rename to dev-python/pyxml/pyxml-0.8.4.recipe index b833fc30f..b64ff72dd 100644 --- a/dev-python/pyxml/pyxml-0.8.4.bep +++ b/dev-python/pyxml/pyxml-0.8.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="1f7655050cebbb664db976405fdba209" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ cd PyXML-0.8.4 python setup.py build } -INSTALL { +INSTALL() +{ cd PyXML-0.8.4 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/rdflib/rdflib-3.2.0.bep b/dev-python/rdflib/rdflib-3.2.0.recipe similarity index 95% rename from dev-python/rdflib/rdflib-3.2.0.bep rename to dev-python/rdflib/rdflib-3.2.0.recipe index 60cadd742..1de760e0f 100644 --- a/dev-python/rdflib/rdflib-3.2.0.bep +++ b/dev-python/rdflib/rdflib-3.2.0.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="ab3d3a5f71ebb6fe4fd33539f5d5768e" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ cd rdflib-3.2.0 python setup.py build } -INSTALL { +INSTALL() +{ cd rdflib-3.2.0 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/setuptools/setuptools-0.6.bep b/dev-python/setuptools/setuptools-0.6.recipe similarity index 93% rename from dev-python/setuptools/setuptools-0.6.bep rename to dev-python/setuptools/setuptools-0.6.recipe index 6c6708db4..1f274cae1 100644 --- a/dev-python/setuptools/setuptools-0.6.bep +++ b/dev-python/setuptools/setuptools-0.6.recipe @@ -1,17 +1,19 @@ DESCRIPTION="Download, build, install, upgrade, and uninstall Python packages -- easily!" HOMEPAGE="http://pypi.python.org/pypi/setuptools" SRC_URI="http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz" -REVISION= "1" +REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7df2a529a074f613b509fb44feefe74e" -BUILD { +BUILD() +{ cd setuptools-0.6c11 python setup.py build } -INSTALL { +INSTALL() +{ cd setuptools-0.6c11 if [ -n "${DESTDIR}" ];then python setup.py install --root=${DESTDIR} diff --git a/dev-python/simpleparse/simpleparse-2.1.1a2.bep b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe similarity index 95% rename from dev-python/simpleparse/simpleparse-2.1.1a2.bep rename to dev-python/simpleparse/simpleparse-2.1.1a2.recipe index 5c4c5c2ea..673b4ba77 100644 --- a/dev-python/simpleparse/simpleparse-2.1.1a2.bep +++ b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="9c4e13b4f9b087442f76e7382ba97e3b" -BUILD { +BUILD() +{ cd SimpleParse-2.1.1a2 python setup.py build } -INSTALL { +INSTALL() +{ cd SimpleParse-2.1.1a2 python setup.py install --root=${DESTDIR} diff --git a/dev-qt/qtcore/qtcore-4.7.3.bep b/dev-qt/qtcore/qtcore-4.7.3.recipe similarity index 97% rename from dev-qt/qtcore/qtcore-4.7.3.bep rename to dev-qt/qtcore/qtcore-4.7.3.recipe index 2ac139579..5124291b7 100644 --- a/dev-qt/qtcore/qtcore-4.7.3.bep +++ b/dev-qt/qtcore/qtcore-4.7.3.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="49b96eefb1224cc529af6fe5608654fe" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd qt-everywhere-opensource-src-4.7.3 configure --prefix-install=no -no-pch -no-opengl -no-largefile \ -fast -nomake examples -nomake demos -release -opensource \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd qt-everywhere-opensource-src-4.7.3 make install INSTALL_ROOT=${DESTDIR} } diff --git a/dev-qt/qtcore/qtcore-4.8.x-git.bep b/dev-qt/qtcore/qtcore-4.8.x-git.bep deleted file mode 100644 index eacedad16..000000000 --- a/dev-qt/qtcore/qtcore-4.8.x-git.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -HOMEPAGE="http://qt-haiku.ru" -SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { - cd qtcore-4.8.x-git - configure --prefix-install=no -no-pch -no-opengl -no-largefile \ - -fast -nomake examples -nomake demos -release -opensource \ - -confirm-license -no-iconv -phonon -no-phonon-backend \ - -multimedia -no-audio-backend - make -} - -INSTALL { - cd qtcore-4.8.x-git - make install INSTALL_ROOT=${DESTDIR} -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2010 Nokia Corporation and/or its subsidiary(-ies)." diff --git a/dev-qt/qtcore/qtcore-4.8.x.bep b/dev-qt/qtcore/qtcore-4.8.x.recipe similarity index 96% rename from dev-qt/qtcore/qtcore-4.8.x.bep rename to dev-qt/qtcore/qtcore-4.8.x.recipe index af23591c3..e427e3c4f 100644 --- a/dev-qt/qtcore/qtcore-4.8.x.bep +++ b/dev-qt/qtcore/qtcore-4.8.x.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd qtcore-4.8.x configure --prefix-install=no -no-pch -no-opengl -no-largefile \ -fast -nomake examples -nomake demos -release -opensource \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd qtcore-4.8.x make install INSTALL_ROOT=${DESTDIR} } diff --git a/dev-scheme/chicken/chicken-4.5.0.bep b/dev-scheme/chicken/chicken-4.5.0.recipe similarity index 95% rename from dev-scheme/chicken/chicken-4.5.0.bep rename to dev-scheme/chicken/chicken-4.5.0.recipe index 21c470309..60161bb62 100644 --- a/dev-scheme/chicken/chicken-4.5.0.bep +++ b/dev-scheme/chicken/chicken-4.5.0.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="753aea676a18c8dc0161dfb4d1717e20" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd chicken-4.5.0 make PLATFORM=haiku PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd chicken-4.5.0 make PLATFORM=haiku PREFIX=/boot/common install } diff --git a/dev-scheme/chicken/chicken-4.7.0.bep b/dev-scheme/chicken/chicken-4.7.0.recipe similarity index 97% rename from dev-scheme/chicken/chicken-4.7.0.bep rename to dev-scheme/chicken/chicken-4.7.0.recipe index a08075989..5a1e785f4 100644 --- a/dev-scheme/chicken/chicken-4.7.0.bep +++ b/dev-scheme/chicken/chicken-4.7.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9389388fdf04c3c64de29633aae12539" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd chicken-4.7.0 if [ `gcc -dumpversion | cut -f1 -d.` -eq "2" ];then echo "Removing -fwrapv flag for gcc2 build" @@ -18,7 +19,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd chicken-4.7.0 make PLATFORM=haiku PREFIX=`finddir B_COMMON_DIRECTORY` install \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 \ @@ -26,7 +28,8 @@ INSTALL { DATADIR=`finddir B_COMMON_DATA_DIRECTORY`/chicken } -TEST { +TEST() +{ if ! type -p csi > /dev/null;then echo "ERROR: Chicken must be installed before running the test suite" exit 1 diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe similarity index 97% rename from dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep rename to dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe index c16b203e5..3befe3f31 100644 --- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep +++ b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="e2ca96bf71b014eefa11fe10a6f7d1f6" -BUILD { +BUILD() +{ cd abi-compliance-checker-1.98.3 sed -i 's/linux|freebsd|openbsd|netbsd/linux|freebsd|openbsd|netbsd|haiku/' Makefile.pl sed -i 's/$PREFIX\/share\/$TOOL_SNAME/$PREFIX\/data\/$TOOL_SNAME/' Makefile.pl sed -i 's/..\/share\/$TOOL_SNAME/..\/data\/$TOOL_SNAME/' Makefile.pl } -INSTALL { +INSTALL() +{ cd abi-compliance-checker-1.98.3 mkdir -p $DESTDIR/`finddir B_COMMON_DIRECTORY`/example-descriptors perl Makefile.pl -install --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -21,7 +23,8 @@ INSTALL { $DESTDIR/`finddir B_COMMON_DIRECTORY`/data/abi-compliance-checker } -TEST { +TEST() +{ cd abi-compliance-checker-1.98.3 # make test # make check diff --git a/dev-util/abi_compliance_checker/example-descriptors/README b/dev-util/abi_compliance_checker/example-descriptors/README new file mode 100644 index 000000000..0d01be915 --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/README @@ -0,0 +1,29 @@ +This tool can be used to compare the ABIs of different versions of a shared +library. As part of the checking process, it invokes gcc in order to generate +a compiled header, which is not supported by gcc2. +So: only execute this tool if you have gcc4 installed and set as your current +compiler! + +Enclosed are a couple of example descriptors (*.desc), which have been used +to analyze the ABI compatibility of zlib, libpng and libjpeg. + +If you want to do your own checks, you are expected to unpack the sources of +all libraries that you'd like to compare in a folder (such that there is a +subfolder for each library, as usually is the case with xxx.tar.gz +distributions) and build each versions of library. + +Before you can invoke the checker, you need to give it some info about each +library version, by means of a descriptor file. You can ask the checker to +generate a generic descriptor template, or you can use one of the enclosed +descriptor examples as a starting point. + +abi-compliance-checker.pl -l -d1 .desc -d2 .desc + +More info can be found on the tool's homepage: + + http://ispras.linux-foundation.org/index.php/ABI_compliance_checker + +Please send your haiku-specific questions my way: + Oliver Tappe + +Have fun. diff --git a/dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc new file mode 100644 index 000000000..bd989514b --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc @@ -0,0 +1,44 @@ + + + + 6.2 + + + + jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + + + + jpeg-6b/.libs/libjpeg.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + jpeg-6b + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + stdio.h + diff --git a/dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc new file mode 100644 index 000000000..4370d5206 --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc @@ -0,0 +1,44 @@ + + + + 7 + + + + jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + + + + jpeg-7/.libs/libjpeg.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + jpeg-7 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + stdio.h + diff --git a/dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc new file mode 100644 index 000000000..3de5327fb --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc @@ -0,0 +1,44 @@ + + + + 8 + + + + jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + + + + jpeg-8/.libs/libjpeg.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + jpeg-8 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + stdio.h + diff --git a/dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc new file mode 100644 index 000000000..fe6871a3f --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc @@ -0,0 +1,41 @@ + + + + 1.2.42 + + + + pngconf.h + png.h + + + + libpng-1.2.42/.libs/libpng12.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + libpng-1.2.42 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc new file mode 100644 index 000000000..e62a209a2 --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc @@ -0,0 +1,41 @@ + + + + 1.4.0 + + + + pngconf.h + png.h + + + + libpng-1.4.0/.libs/libpng14.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + libpng-1.4.0 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc new file mode 100644 index 000000000..a7b773a9e --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc @@ -0,0 +1,42 @@ + + + + 1.1.4 + + + + zconf.h + zlib.h + zutil.h + + + + zlib-1.1.4/libz.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + zlib-1.1.4 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc new file mode 100644 index 000000000..b1b747ed2 --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc @@ -0,0 +1,42 @@ + + + + 1.2.2 + + + + zconf.h + zlib.h + zutil.h + + + + zlib-1.2.2/libz.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + zlib-1.2.2 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc new file mode 100644 index 000000000..bd15398f4 --- /dev/null +++ b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc @@ -0,0 +1,42 @@ + + + + 1.2.3 + + + + zconf.h + zlib.h + zutil.h + + + + zlib-1.2.3/libz.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + zlib-1.2.3 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/astyle/astyle-r339.bep b/dev-util/astyle/astyle-r339.recipe similarity index 96% rename from dev-util/astyle/astyle-r339.bep rename to dev-util/astyle/astyle-r339.recipe index b7d557061..95757a163 100644 --- a/dev-util/astyle/astyle-r339.bep +++ b/dev-util/astyle/astyle-r339.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd astyle-r339/build/gcc make prefix=$(finddir B_COMMON_DIRECTORY) } -INSTALL { +INSTALL() +{ cd astyle-r339/build/gcc make install \ prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \ diff --git a/dev-util/astyle/astyle-r361.bep b/dev-util/astyle/astyle-r361.recipe similarity index 96% rename from dev-util/astyle/astyle-r361.bep rename to dev-util/astyle/astyle-r361.recipe index 820652fd6..7dcb35fff 100644 --- a/dev-util/astyle/astyle-r361.bep +++ b/dev-util/astyle/astyle-r361.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd astyle-r361/build/gcc make prefix=$(finddir B_COMMON_DIRECTORY) } -INSTALL { +INSTALL() +{ cd astyle-r361/build/gcc make install \ prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \ diff --git a/dev-util/automoc/automoc-4-git.bep b/dev-util/automoc/automoc-4_git.recipe similarity index 93% rename from dev-util/automoc/automoc-4-git.bep rename to dev-util/automoc/automoc-4_git.recipe index c05ae9b06..dc84eeb51 100644 --- a/dev-util/automoc/automoc-4-git.bep +++ b/dev-util/automoc/automoc-4_git.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="qt4, cmake" -BUILD { +BUILD() +{ cd automoc-4-git cmake CMakeLists.txt make } -INSTALL { +INSTALL() +{ cd automoc-4-git make install } diff --git a/dev-util/bakefile/bakefile-0.2.8.bep b/dev-util/bakefile/bakefile-0.2.8.recipe similarity index 86% rename from dev-util/bakefile/bakefile-0.2.8.bep rename to dev-util/bakefile/bakefile-0.2.8.recipe index e668d3760..3c075665b 100644 --- a/dev-util/bakefile/bakefile-0.2.8.bep +++ b/dev-util/bakefile/bakefile-0.2.8.recipe @@ -1,11 +1,12 @@ DESCRIPTION="Native makefiles generator" HOMEPAGE="http://www.bakefile.org" SRC_URI="http://sourceforge.net/projects/bakefile/files/bakefile/0.2.8/bakefile-0.2.8.tar.gz/download" -CHECKSUM_MD5 = "874da5c9035514366b7723bc7657c71c" +CHECKSUM_MD5="874da5c9035514366b7723bc7657c71c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bakefile-0.2.8 touch ./ChangeLog libtoolize --force --copy --install @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bakefile-0.2.8 make install } diff --git a/dev-util/bsdbuild/bsdbuild-2.9.bep b/dev-util/bsdbuild/bsdbuild-2.9.recipe similarity index 97% rename from dev-util/bsdbuild/bsdbuild-2.9.bep rename to dev-util/bsdbuild/bsdbuild-2.9.recipe index e77108333..5503da2bb 100644 --- a/dev-util/bsdbuild/bsdbuild-2.9.bep +++ b/dev-util/bsdbuild/bsdbuild-2.9.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="broken" DEPEND="dev-lang/perl >= 5.10 dev-lang/lua >= 5.1" CHECKSUM_MD5="fd0d4a754024a39d9cf1f5e42f8075b5" -BUILD { +BUILD() +{ cd bsdbuild-2.9 cp mkconfigure.pl mkconfigure # cp gen-dotdepend.pl gen-dotdepend-tmp.pl @@ -24,12 +25,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bsdbuild-2.9 make install } -TEST { +TEST() +{ cd bsdbuild-2.9 # make test # make check diff --git a/dev-util/buildsystem/buildsystem-0.recipe b/dev-util/buildsystem/buildsystem-0.recipe new file mode 100644 index 000000000..e8074bdb9 --- /dev/null +++ b/dev-util/buildsystem/buildsystem-0.recipe @@ -0,0 +1,21 @@ +DESCRIPTION="NetSurf build framework for compiling some of their libraries" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="git://git.netsurf-browser.org/buildsystem" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD() +{ + cd buildsystem-0 + make +} + +INSTALL() +{ + cd buildsystem-0 + make install PREFIX=/boot/common/ +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-util/buildsystem/buildsystem-1.0-HEAD.bep b/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe similarity index 100% rename from dev-util/buildsystem/buildsystem-1.0-HEAD.bep rename to dev-util/buildsystem/buildsystem-1.0_HEAD.recipe diff --git a/dev-util/ccache/ccache-3.0.1.bep b/dev-util/ccache/ccache-3.0.1.bep deleted file mode 100644 index afd44e30a..000000000 --- a/dev-util/ccache/ccache-3.0.1.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="ccache is a fast compiler cache." -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/ccache-3.0.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="223449f7891e5d6a15b25100eca5cca4" -BUILD { - cd ccache-3.0.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} -INSTALL { - cd ccache-3.0.1 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2010 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.4.bep b/dev-util/ccache/ccache-3.1.4.bep deleted file mode 100644 index 82185cdb3..000000000 --- a/dev-util/ccache/ccache-3.1.4.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="ccache is a fast compiler cache." -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.4.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="676fda8a9a5e02574435c32b22942abd" -BUILD { - cd ccache-3.1.4 - sed -i 's/\-lm//g' Ma* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} -INSTALL { - cd ccache-3.1.4 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2011 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.7.bep b/dev-util/ccache/ccache-3.1.7.bep deleted file mode 100644 index 88e8845fc..000000000 --- a/dev-util/ccache/ccache-3.1.7.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="ccache is a fast compiler cache." -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.7.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="82257745eac54826527946e9e3d046f4" -BUILD { - cd ccache-3.1.7 - sed -i 's/\-lm//g' Ma* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} -INSTALL { - cd ccache-3.1.7 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2012 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe new file mode 100644 index 000000000..3ab1af323 --- /dev/null +++ b/dev-util/ccache/ccache-3.1.9.recipe @@ -0,0 +1,37 @@ +SUMMARY="ccache is a fast compiler cache." +DESCRIPTION="ccache is a compiler cache. It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again. Supported languages are C, C++, Objective-C and Objective-C++." +HOMEPAGE="http://ccache.samba.org/" +SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2" +REVISION="1" + +LICENSE="GNU GPL v3" +COPYRIGHT="2002-2007 Andrew Tridgell + 2009-2013 Joel Rosdahl" + +CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8" + +ARCHITECTURES="x86 x86_gcc2" +PROVIDES=" + cmd:ccache + " +REQUIRES=" + lib:libroot >= $haikuVersion + lib:libz >= 1 + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-util/cmake/cmake-2.6.4.bep b/dev-util/cmake/cmake-2.6.4.bep deleted file mode 100644 index 58ad39107..000000000 --- a/dev-util/cmake/cmake-2.6.4.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz" -CHECKSUM_MD5="50f387d0436696c4a68b5512a72c9cde" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.6.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd cmake-2.6.4 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8-git.bep b/dev-util/cmake/cmake-2.8-git.bep deleted file mode 100644 index bb2e85396..000000000 --- a/dev-util/cmake/cmake-2.8-git.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="git+http://cmake.org/cmake.git" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd cmake-2.8-git - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL { - cd cmake-2.8-git - make install -} - -TEST { - cd cmake-2.8-git - make test -} - -LICENSE="CMake" -COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.0.bep b/dev-util/cmake/cmake-2.8.0.bep deleted file mode 100644 index f35325ced..000000000 --- a/dev-util/cmake/cmake-2.8.0.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.0.tar.gz" -CHECKSUM_MD5="3b3679b8a6afaedc38a8c15dd7ff4fcf" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.0 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd cmake-2.8.0 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.1.bep b/dev-util/cmake/cmake-2.8.1.bep deleted file mode 100644 index 461a14f7b..000000000 --- a/dev-util/cmake/cmake-2.8.1.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.1.tar.gz" -CHECKSUM_MD5="feadc2e5ebbfed0efc90178583503725" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd cmake-2.8.1 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.10.2.bep b/dev-util/cmake/cmake-2.8.10.2.recipe similarity index 97% rename from dev-util/cmake/cmake-2.8.10.2.bep rename to dev-util/cmake/cmake-2.8.10.2.recipe index 72db78d2a..3ab461703 100644 --- a/dev-util/cmake/cmake-2.8.10.2.bep +++ b/dev-util/cmake/cmake-2.8.10.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="097278785da7182ec0aea8769d06860c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.10.2 # cmake assumes the aclocal dir is in share/aclocal sed -i 's/share\/aclocal/data\/aclocal/g' Source/cmakemain.cxx @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cmake-2.8.10.2 make install } diff --git a/dev-util/cmake/cmake-2.8.11.2.bep b/dev-util/cmake/cmake-2.8.11.2.bep deleted file mode 100644 index 11538c89b..000000000 --- a/dev-util/cmake/cmake-2.8.11.2.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.11.2 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL { - cd cmake-2.8.11.2 - make install -} - -TEST { - cd cmake-2.8.11.2 - make test -} - -LICENSE="CMake" -COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe new file mode 100644 index 000000000..2c10c2503 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -0,0 +1,63 @@ +SUMMARY="Cross platform Make" +DESCRIPTION="CMake is a cross-platform, open-source build system. It is a + family of tools designed to build, test and package software. CMake is used + to control the software compilation process using simple platform and + compiler independent configuration files. CMake generates native makefiles + and workspaces that can be used in the compiler environment of your choice. + " +HOMEPAGE="http://www.cmake.org" +LICENSE="CMake" +COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." +SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" +CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882" +REVISION="2" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + cmake = $portVersion compat >= 2.8 + cmd:cmake = $portVersion compat >= 2.8 + cmd:ccmake = $portVersion compat >= 2.8 + cmd:cpack = $portVersion compat >= 2.8 + cmd:ctest = $portVersion compat >= 2.8 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libncurses + " +BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:grep + cmd:ld + cmd:libtool + cmd:make + cmd:sed + " +PATCHES="cmake-2.8.11.2.patchset" + +BUILD() +{ + ./configure --prefix=$prefix \ + --datadir=/$relativeDataDir/cmake \ + --docdir=/$relativeDocDir \ + --mandir=/$relativeManDir + make $jobArgs +} + +INSTALL() +{ + make install + + # No way to tell this to configure... + mv $prefix/share/aclocal $dataDir + rmdir $prefix/share +} + +TEST() +{ + make test VERBOSE=1 +} + diff --git a/dev-util/cmake/cmake-2.8.2.bep b/dev-util/cmake/cmake-2.8.2.bep deleted file mode 100644 index 4d8645f05..000000000 --- a/dev-util/cmake/cmake-2.8.2.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz" -CHECKSUM_MD5="8c967d5264657a798f22ee23976ff0d9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd cmake-2.8.2 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.3.bep b/dev-util/cmake/cmake-2.8.3.bep deleted file mode 100644 index aa753fa5a..000000000 --- a/dev-util/cmake/cmake-2.8.3.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz" -CHECKSUM_MD5="a76a44b93acf5e3badda9de111385921" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.3 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd cmake-2.8.3 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.4.bep b/dev-util/cmake/cmake-2.8.4.bep deleted file mode 100644 index 7725b1668..000000000 --- a/dev-util/cmake/cmake-2.8.4.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.4.tar.gz" -CHECKSUM_MD5="209b7d1d04b2e00986538d74ba764fcf" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.4 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL { - cd cmake-2.8.4 - make install -} - -LICENSE="CMake" -COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.5.bep b/dev-util/cmake/cmake-2.8.5.bep deleted file mode 100644 index b08109c16..000000000 --- a/dev-util/cmake/cmake-2.8.5.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" -CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.5 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL { - cd cmake-2.8.5 - make install -} - -LICENSE="CMake" -COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe new file mode 100644 index 000000000..bb36e152c --- /dev/null +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -0,0 +1,48 @@ +SUMMARY="Cross platform Make" +DESCRIPTION="CMake is a cross-platform, open-source build system. It is a family of tools designed to build, test and package software. CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice." +HOMEPAGE="http://www.cmake.org" +LICENSE="CMake" +COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." +SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" +CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="cmake-2.8.5.patchset" + +PROVIDES=" + cmake = $portVersion compat >= 2.8 + cmd:cmake = $portVersion compat >= 2.8 + cmd:cpack = $portVersion compat >= 2.8 + cmd:ctest = $portVersion compat >= 2.8 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:grep + cmd:ld + cmd:libtool + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + ./configure --prefix=$prefix \ + --datadir=/$relativeDataDir/cmake \ + --docdir=/$relativeDocDir \ + --mandir=/$relativeManDir + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-util/cmake/patches/cmake-2.6.0-haiku.diff b/dev-util/cmake/patches/cmake-2.6.0-haiku.diff deleted file mode 100644 index c4cd61e23..000000000 --- a/dev-util/cmake/patches/cmake-2.6.0-haiku.diff +++ /dev/null @@ -1,300 +0,0 @@ -diff -ur cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in ---- cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-06-19 11:16:50.000000000 +0000 -@@ -48,6 +48,10 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+ PRINT *, 'INFO:platform[Haiku]' -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -ur cmake-2.6.0/Modules/CMakePlatformId.h.in cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in ---- cmake-2.6.0/Modules/CMakePlatformId.h.in 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in 2008-06-19 11:16:50.000000000 +0000 -@@ -35,6 +35,11 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+# define PLATFORM_ID "Haiku" -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ -+ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" - -diff -ur cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-haiku/Modules/CheckForPthreads.c ---- cmake-2.6.0/Modules/CheckForPthreads.c 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Modules/CheckForPthreads.c 2008-06-19 11:16:50.000000000 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -Only in cmake-2.6.0-haiku/Modules/Platform: Haiku.cmake -diff -ur cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-06-19 11:16:50.000000000 +0000 -@@ -35,7 +35,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -72,7 +72,8 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__)\ -+ && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -ur cmake-2.6.0/Source/cmCTest.cxx cmake-2.6.0-haiku/Source/cmCTest.cxx ---- cmake-2.6.0/Source/cmCTest.cxx 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/cmCTest.cxx 2008-06-19 11:16:50.000000000 +0000 -@@ -49,10 +49,15 @@ - - #include // auto_ptr - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ -+ - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr - -diff -ur cmake-2.6.0/Source/kwsys/DynamicLoader.cxx cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx ---- cmake-2.6.0/Source/kwsys/DynamicLoader.cxx 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx 2008-06-20 14:08:23.000000000 +0000 -@@ -331,7 +331,7 @@ - - // --------------------------------------------------------------- - // 4. Implementation for BeOS --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined(__HAIKU__) - #include // for strerror() - #include - #include -diff -ur cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c ---- cmake-2.6.0/Source/kwsys/ProcessUNIX.c 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c 2008-06-20 14:06:56.000000000 +0000 -@@ -75,7 +75,7 @@ - typedef int kwsysProcess_ssize_t; - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void kwsysProcess_usleep(unsigned int msec) -diff -ur cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx ---- cmake-2.6.0/Source/kwsys/SystemTools.cxx 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx 2008-06-19 15:49:33.000000000 +0000 -@@ -131,7 +131,12 @@ - #define _chdir chdir - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#ifdef (__HAIKU__) -+#include -+#include -+#endif -+ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - #include - #include - -diff -ur cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-haiku/Source/kwsys/testProcess.c ---- cmake-2.6.0/Source/kwsys/testProcess.c 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/testProcess.c 2008-06-19 11:16:51.000000000 +0000 -@@ -34,7 +34,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -ur cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt 2008-06-19 11:16:51.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ IF(NOT HAIKU) # libm in included in libroot on Haiku -+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-06-19 11:16:51.000000000 +0000 -@@ -38,6 +38,12 @@ - # define PLATFORM_AIX_V3 - #endif - -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+undef (__BEOS__) -+#endif -+ - #if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif -diff -ur cmake-2.6.0/Utilities/cmcurl/curl/curl.h cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h ---- cmake-2.6.0/Utilities/cmcurl/curl/curl.h 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h 2008-06-19 11:16:51.000000000 +0000 -@@ -1133,7 +1133,7 @@ - } - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - #include - #endif - -diff -ur cmake-2.6.0/Utilities/cmcurl/if2ip.c cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c ---- cmake-2.6.0/Utilities/cmcurl/if2ip.c 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c 2008-06-19 11:16:51.000000000 +0000 -@@ -39,7 +39,7 @@ - */ - #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ - !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \ -- !defined(_AMIGASF) && !defined(__minix) -+ !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__) - - #ifdef HAVE_SYS_SOCKET_H - #include -diff -ur cmake-2.6.0/Utilities/cmcurl/select.c cmake-2.6.0-haiku/Utilities/cmcurl/select.c ---- cmake-2.6.0/Utilities/cmcurl/select.c 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/select.c 2008-06-19 11:16:51.000000000 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -ur cmake-2.6.0/Utilities/cmcurl/setup.h cmake-2.6.0-haiku/Utilities/cmcurl/setup.h ---- cmake-2.6.0/Utilities/cmcurl/setup.h 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/setup.h 2008-06-19 11:16:51.000000000 +0000 -@@ -264,7 +264,7 @@ - - #else /* MSDOS */ - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #define sclose(x) closesocket(x) - #else /* __BEOS__ */ - #define sclose(x) close(x) -diff -ur cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-haiku/Utilities/cmtar/libtar.c ---- cmake-2.6.0/Utilities/cmtar/libtar.c 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmtar/libtar.c 2008-06-19 11:16:51.000000000 +0000 -@@ -98,8 +98,8 @@ - { - return -1; - } -- --#if defined(__BEOS__) && !defined(__ZETA__) /* no fchmod on BeOS...do pathname instead. */ -+/* no fchmod on BeOS...do pathname instead. */ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode & 07777)) - { - return -1; -diff -ur cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c ---- cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-06-19 11:16:51.000000000 +0000 -@@ -10,7 +10,7 @@ - - #include "xmlrpc_config.h" - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - /* Some helpful system header has char==bool, then bool.h does int==bool. */ - #define HAVE_BOOL 1 - #endif -diff -ur cmake-2.6.0/Utilities/cmzlib/zconf.h cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h ---- cmake-2.6.0/Utilities/cmzlib/zconf.h 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h 2008-06-19 11:16:51.000000000 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined (__HAIKU__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -ur cmake-2.6.0/Utilities/cmzlib/zutil.h cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h ---- cmake-2.6.0/Utilities/cmzlib/zutil.h 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h 2008-06-19 11:16:51.000000000 +0000 -@@ -147,7 +147,13 @@ - # define OS_CODE 0x0f - #endif - --#if defined(_BEOS_) || defined(RISCOS) -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+undef (__BEOS__) -+#endif -+ -+#if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif - -diff -ur cmake-2.6.0/bootstrap cmake-2.6.0-haiku/bootstrap ---- cmake-2.6.0/bootstrap 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/bootstrap 2008-06-19 11:16:51.000000000 +0000 -@@ -73,6 +73,13 @@ - cmake_system_beos=false - fi - -+# Determine whether this is Haiku -+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then -+ cmake_system_haiku=true -+else -+ cmake_system_haiku=false -+fi -+ - # Choose the generator to use for bootstrapping. - if ${cmake_system_mingw}; then - # Bootstrapping from an MSYS prompt. -@@ -603,6 +610,11 @@ - cmake_ld_flags="${LDFLAGS} -lroot -lbe" - fi - -+# Add Haiku toolkits... -+if ${cmake_system_haiku}; then -+ cmake_ld_flags="${LDFLAGS} -lroot -lbe" -+fi -+ - # Test C compiler - cmake_c_compiler= - diff --git a/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff b/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff deleted file mode 100644 index 8529c3285..000000000 --- a/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff +++ /dev/null @@ -1,474 +0,0 @@ -diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in ---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-09-12 15:11:49.000000000 +0000 -@@ -50,6 +50,8 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+ PRINT *, 'INFO:platform[Haiku]' - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in ---- cmake-2.6.1/Modules/CMakePlatformId.h.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in 2008-09-12 15:12:47.000000000 +0000 -@@ -35,6 +35,9 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+# define PLATFORM_ID "Haiku" -+ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" - -diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c ---- cmake-2.6.1/Modules/CheckForPthreads.c 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c 2008-09-12 15:07:32.000000000 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake ---- cmake-2.6.1/Modules/Platform/Haiku.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake 2008-09-12 15:07:32.000000000 +0000 -@@ -0,0 +1,14 @@ -+SET(BEOS 1) -+ -+# GCC is the default compiler on Haiku. -+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) -+ -+SET(CMAKE_DL_LIBS root be) -+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") -+ -+INCLUDE(Platform/UnixPaths) -diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-09-12 15:07:32.000000000 +0000 -@@ -36,7 +36,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -75,7 +75,8 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__)\ -+ && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx ---- cmake-2.6.1/Source/cmCTest.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmCTest.cxx 2008-09-12 15:07:32.000000000 +0000 -@@ -49,10 +49,15 @@ - - #include // auto_ptr - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ -+ - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr - -@@ -607,7 +612,7 @@ - cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION); - #if defined(_WIN32) - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - disable_debugger(1); - #endif - } -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx ---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -23,7 +23,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined (__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h ---- cmake-2.6.1/Source/cmDependsJavaLexer.h 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h 2008-09-12 15:07:33.000000000 +0000 -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx ---- cmake-2.6.1/Source/cmSystemTools.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx 2008-09-12 15:10:22.000000000 +0000 -@@ -910,7 +910,7 @@ - fflush(stdout); - fflush(stderr); - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - beos_seen_signal = false; - signal(SIGCHLD, beos_popen_workaround); - #endif -@@ -918,7 +918,7 @@ - FILE* cpipe = popen(command, "r"); - if(!cpipe) - { --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - signal(SIGCHLD, SIG_DFL); - #endif - return false; -@@ -931,12 +931,13 @@ - cmSystemTools::Stdout(buffer); - } - output += buffer; -+ buffer[0] = 0; - fgets(buffer, BUFFER_SIZE, cpipe); - } - - retVal = pclose(cpipe); - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - for (int i = 0; (!beos_seen_signal) && (i < 3); i++) - { - ::sleep(1); // signals should interrupt this... -@@ -970,11 +971,13 @@ - error << "SIGFPE"; - break; - #endif -+#ifndef __HAIKU__ - #ifdef SIGBUS - case SIGBUS: - error << "SIGBUS"; - break; - #endif -+#endif - #ifdef SIGSEGV - case SIGSEGV: - error << "SIGSEGV"; -@@ -1696,7 +1699,7 @@ - } - - // no fchmod on BeOS 5...do pathname instead. --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode)) - { - return -1; -diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -335,11 +335,21 @@ - #endif //_WIN32 - - // --------------------------------------------------------------- --// 4. Implementation for BeOS --#ifdef __BEOS__ -+// 4. Implementation for BeOS / Haiku -+#if defined __BEOS__ || defined(__HAIKU__) -+ - #include // for strerror() -+ -+#ifdef __BEOS__ - #include - #include -+#endif -+ -+#ifdef __HAIKU__ -+#include -+#include -+#endif -+ - #define DYNAMICLOADER_DEFINED 1 - - namespace KWSYS_NAMESPACE -diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c ---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c 2008-09-12 15:07:33.000000000 +0000 -@@ -75,7 +75,7 @@ - typedef int kwsysProcess_ssize_t; - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void kwsysProcess_usleep(unsigned int msec) -diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx ---- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -131,7 +131,12 @@ - #define _chdir chdir - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__HAIKU__) -+#include -+#include -+#endif -+ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - #include - #include - -diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -17,10 +17,14 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c ---- cmake-2.6.1/Source/kwsys/testProcess.c 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c 2008-09-12 15:07:33.000000000 +0000 -@@ -34,7 +34,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ IF(NOT HAIKU) # libm in included in libroot on Haiku -+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No limb on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No libm on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-09-12 15:07:34.000000000 +0000 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt ---- cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt 2008-09-12 15:07:34.000000000 +0000 -@@ -165,6 +165,8 @@ - CHECK_LIBRARY_EXISTS_CONCAT("bnetapi" closesocket HAVE_LIBBNETAPI) - ENDIF(BEOS) - -+CHECK_LIBRARY_EXISTS_CONCAT("network" recv HAVE_LIBNETWORK) -+ - IF(NOT NOT_NEED_LIBNSL) - CHECK_LIBRARY_EXISTS_CONCAT("nsl" gethostbyname HAVE_LIBNSL) - ENDIF(NOT NOT_NEED_LIBNSL) -diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h ---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h 2008-09-12 15:07:34.000000000 +0000 -@@ -1133,7 +1133,7 @@ - } - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - #include - #endif - -diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c ---- cmake-2.6.1/Utilities/cmcurl/if2ip.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c 2008-09-12 15:07:34.000000000 +0000 -@@ -39,7 +39,7 @@ - */ - #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ - !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \ -- !defined(_AMIGASF) && !defined(__minix) -+ !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__) - - #ifdef HAVE_SYS_SOCKET_H - #include -diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c ---- cmake-2.6.1/Utilities/cmcurl/select.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c 2008-09-12 15:07:34.000000000 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h ---- cmake-2.6.1/Utilities/cmcurl/setup.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h 2008-09-12 15:07:34.000000000 +0000 -@@ -264,7 +264,7 @@ - - #else /* MSDOS */ - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #define sclose(x) closesocket(x) - #else /* __BEOS__ */ - #define sclose(x) close(x) -diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c ---- cmake-2.6.1/Utilities/cmtar/libtar.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c 2008-09-12 15:07:34.000000000 +0000 -@@ -98,8 +98,8 @@ - { - return -1; - } -- --#if defined(__BEOS__) && !defined(__ZETA__) /* no fchmod on BeOS...do pathname instead. */ -+/* no fchmod on BeOS...do pathname instead. */ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode & 07777)) - { - return -1; -diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c ---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-09-12 15:07:34.000000000 +0000 -@@ -10,7 +10,7 @@ - - #include "xmlrpc_config.h" - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - /* Some helpful system header has char==bool, then bool.h does int==bool. */ - #define HAVE_BOOL 1 - #endif -diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h ---- cmake-2.6.1/Utilities/cmzlib/zconf.h 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h 2008-09-12 15:07:34.000000000 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) - -+#if defined (__BEOS__) && !defined (__HAIKU__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h ---- cmake-2.6.1/Utilities/cmzlib/zutil.h 2008-08-01 15:34:59.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h 2008-09-12 15:07:34.000000000 +0000 -@@ -147,7 +147,13 @@ - # define OS_CODE 0x0f - #endif - --#if defined(_BEOS_) || defined(RISCOS) -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+#undef __BEOS__ -+#endif -+ -+#if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif - -diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap ---- cmake-2.6.1/bootstrap 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/bootstrap 2008-09-12 15:07:34.000000000 +0000 -@@ -73,6 +73,13 @@ - cmake_system_beos=false - fi - -+# Determine whether this is Haiku -+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then -+ cmake_system_haiku=true -+else -+ cmake_system_haiku=false -+fi -+ - # Choose the generator to use for bootstrapping. - if ${cmake_system_mingw}; then - # Bootstrapping from an MSYS prompt. -@@ -603,6 +610,11 @@ - cmake_ld_flags="${LDFLAGS} -lroot -lbe" - fi - -+# Add Haiku toolkits... -+if ${cmake_system_haiku}; then -+ cmake_ld_flags="${LDFLAGS} -lroot -lbe" -+fi -+ - # Test C compiler - cmake_c_compiler= - diff --git a/dev-util/cmake/patches/cmake-2.6.1-haiku.diff b/dev-util/cmake/patches/cmake-2.6.1-haiku.diff deleted file mode 100644 index 1ce790b13..000000000 --- a/dev-util/cmake/patches/cmake-2.6.1-haiku.diff +++ /dev/null @@ -1,449 +0,0 @@ -diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in ---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-08-20 13:49:06.000000000 +0000 -@@ -50,6 +50,10 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+ PRINT *, 'INFO:platform[Haiku]' -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in ---- cmake-2.6.1/Modules/CMakePlatformId.h.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in 2008-08-20 13:49:06.000000000 +0000 -@@ -35,6 +35,11 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+# define PLATFORM_ID "Haiku" -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ -+ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" - -diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c ---- cmake-2.6.1/Modules/CheckForPthreads.c 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c 2008-08-20 13:49:06.000000000 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake ---- cmake-2.6.1/Modules/Platform/Haiku.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake 2008-08-20 13:49:06.000000000 +0000 -@@ -0,0 +1,14 @@ -+SET(BEOS 1) -+ -+# GCC is the default compiler on Haiku. -+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) -+ -+SET(CMAKE_DL_LIBS root be) -+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") -+ -+INCLUDE(Platform/UnixPaths) -diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -36,7 +36,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -75,7 +75,8 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__)\ -+ && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx ---- cmake-2.6.1/Source/cmCTest.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmCTest.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -49,10 +49,15 @@ - - #include // auto_ptr - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ -+ - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr - -@@ -607,7 +612,7 @@ - cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION); - #if defined(_WIN32) - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - disable_debugger(1); - #endif - } -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx ---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -23,7 +23,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined (__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h ---- cmake-2.6.1/Source/cmDependsJavaLexer.h 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h 2008-08-20 13:49:06.000000000 +0000 -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx ---- cmake-2.6.1/Source/cmSystemTools.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -970,11 +970,13 @@ - error << "SIGFPE"; - break; - #endif -+#ifndef __HAIKU__ - #ifdef SIGBUS - case SIGBUS: - error << "SIGBUS"; - break; - #endif -+#endif - #ifdef SIGSEGV - case SIGSEGV: - error << "SIGSEGV"; -@@ -1696,7 +1698,7 @@ - } - - // no fchmod on BeOS 5...do pathname instead. --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode)) - { - return -1; -diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -335,11 +335,21 @@ - #endif //_WIN32 - - // --------------------------------------------------------------- --// 4. Implementation for BeOS --#ifdef __BEOS__ -+// 4. Implementation for BeOS / Haiku -+#if defined __BEOS__ || defined(__HAIKU__) -+ - #include // for strerror() -+ -+#ifdef __BEOS__ - #include - #include -+#endif -+ -+#ifdef __HAIKU__ -+#include -+#include -+#endif -+ - #define DYNAMICLOADER_DEFINED 1 - - namespace KWSYS_NAMESPACE -diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c ---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c 2008-08-20 13:49:06.000000000 +0000 -@@ -75,7 +75,7 @@ - typedef int kwsysProcess_ssize_t; - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void kwsysProcess_usleep(unsigned int msec) -@@ -2534,6 +2534,7 @@ - } - - /* If this is the first process, enable the signal handler. */ -+#ifndef __HAIKU__ - if(newProcesses.Count == 1) - { - /* Install our handler for SIGCHLD. Repeat call until it is not -@@ -2554,6 +2555,7 @@ - &kwsysProcessesOldSigChldAction) < 0) && - (errno == EINTR)); - } -+#endif - } - - return 1; - -diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx ---- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -131,7 +131,12 @@ - #define _chdir chdir - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__HAIKU__) -+#include -+#include -+#endif -+ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - #include - #include - -diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -17,10 +17,14 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c ---- cmake-2.6.1/Source/kwsys/testProcess.c 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c 2008-08-20 13:49:06.000000000 +0000 -@@ -34,7 +34,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt 2008-08-20 13:49:06.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ IF(NOT HAIKU) # libm in included in libroot on Haiku -+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-20 13:49:06.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No limb on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-20 13:49:07.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No libm on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-08-20 13:49:07.000000000 +0000 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h ---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h 2008-08-20 13:49:07.000000000 +0000 -@@ -1133,7 +1133,7 @@ - } - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - #include - #endif - -diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c ---- cmake-2.6.1/Utilities/cmcurl/if2ip.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c 2008-08-20 13:49:07.000000000 +0000 -@@ -39,7 +39,7 @@ - */ - #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ - !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \ -- !defined(_AMIGASF) && !defined(__minix) -+ !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__) - - #ifdef HAVE_SYS_SOCKET_H - #include -diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c ---- cmake-2.6.1/Utilities/cmcurl/select.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c 2008-08-20 13:49:07.000000000 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h ---- cmake-2.6.1/Utilities/cmcurl/setup.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h 2008-08-20 13:49:07.000000000 +0000 -@@ -264,7 +264,7 @@ - - #else /* MSDOS */ - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #define sclose(x) closesocket(x) - #else /* __BEOS__ */ - #define sclose(x) close(x) -diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c ---- cmake-2.6.1/Utilities/cmtar/libtar.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c 2008-08-20 13:49:07.000000000 +0000 -@@ -98,8 +98,8 @@ - { - return -1; - } -- --#if defined(__BEOS__) && !defined(__ZETA__) /* no fchmod on BeOS...do pathname instead. */ -+/* no fchmod on BeOS...do pathname instead. */ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode & 07777)) - { - return -1; -diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c ---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-20 13:49:07.000000000 +0000 -@@ -10,7 +10,7 @@ - - #include "xmlrpc_config.h" - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - /* Some helpful system header has char==bool, then bool.h does int==bool. */ - #define HAVE_BOOL 1 - #endif -diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h ---- cmake-2.6.1/Utilities/cmzlib/zconf.h 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h 2008-08-20 13:49:07.000000000 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined (__HAIKU__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h ---- cmake-2.6.1/Utilities/cmzlib/zutil.h 2008-08-01 15:34:59.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h 2008-08-20 13:49:07.000000000 +0000 -@@ -147,7 +147,13 @@ - # define OS_CODE 0x0f - #endif - --#if defined(_BEOS_) || defined(RISCOS) -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+undef (__BEOS__) -+#endif -+ -+#if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif - -diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap ---- cmake-2.6.1/bootstrap 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/bootstrap 2008-08-20 13:49:07.000000000 +0000 -@@ -73,6 +73,13 @@ - cmake_system_beos=false - fi - -+# Determine whether this is Haiku -+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then -+ cmake_system_haiku=true -+else -+ cmake_system_haiku=false -+fi -+ - # Choose the generator to use for bootstrapping. - if ${cmake_system_mingw}; then - # Bootstrapping from an MSYS prompt. -@@ -603,6 +610,11 @@ - cmake_ld_flags="${LDFLAGS} -lroot -lbe" - fi - -+# Add Haiku toolkits... -+if ${cmake_system_haiku}; then -+ cmake_ld_flags="${LDFLAGS} -lroot -lbe" -+fi -+ - # Test C compiler - cmake_c_compiler= - diff --git a/dev-util/cmake/patches/cmake-2.8.1.patch b/dev-util/cmake/patches/cmake-2.8.1.patch deleted file mode 100644 index 2f5f11180..000000000 --- a/dev-util/cmake/patches/cmake-2.8.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN cmake-2.8.1/bootstrap cmake-2.8.1-haiku/bootstrap ---- cmake-2.8.1/bootstrap 2010-04-06 14:45:29.040370176 +0000 -+++ cmake-2.8.1-haiku/bootstrap 2010-08-31 05:39:55.518520832 +0000 -@@ -132,7 +132,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset new file mode 100644 index 000000000..11b7db37d --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -0,0 +1,549 @@ +From 2e3be20216cac12e4e6ace37d132bdc0b5b68b21 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:26:02 +0200 +Subject: Several fixes to Haiku platform module + + * Do not define BEOS anymore (this includes workarounds which we don't + need most of the time in Haiku, so we prefer opt-in IF(HAIKU) in the + cmake files instead). + * On the other hand, do define UNIX (we are trying to be compliant) and + HAIKU (there is still a number of things we don't do like the + average UNIX clone) + * Do not use UnixPaths, as our filesystem hierarchy isn't anything like + what it expects. + * Do not use -nostart, which the compiler doesn't know about anymore. + This used to be an Haiku extension to gcc, and is equivalent to + -shared which is the default gcc option. + * While "dl" functions are provided in libroot, this is always + implicitly linked so there is no need to tell cmake about it. + * Forcing position-independent code is not needed, so remove it. + * On the other hand, include appropriate linker options for executables + and shared libraries. + * Support for the two available compilers in Haiku (gcc2 and gcc4) and + pick the right headers and libraries according to the currently + selected one. + * With the adoption of the package manager, the directory layout was + changed. Tell cmake where to look for header files and libraries. + * As we don't define BEOS anymore, enable the workaround we still need + for HAIKU as well. This is the lack of a libm (it is part of the + implicitly linked in libroot) + +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index a2bf0c0..770e93a 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY + + if(LUA_LIBRARY) + # include the math library for Unix +- if(UNIX AND NOT APPLE AND NOT BEOS) ++ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + find_library(LUA_MATH_LIBRARY m) + set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index 8987783..825f851 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -1,22 +1,123 @@ +-set(BEOS 1) ++# process only once ++if(HAIKU) ++ return() ++endif() ++ ++set(HAIKU 1) ++set(UNIX 1) + +-set(CMAKE_DL_LIBS root be) +-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") +-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") ++set(CMAKE_DL_LIBS "") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") +-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") ++set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") ++set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++ ++# Determine, if the C or C++ compiler is configured for a secondary ++# architecture. If so, that will change the search paths we set below. We check ++# whether the compiler's library search paths contain a ++# "/boot/system/develop/lib//", which we assume to be the secondary ++# architecture specific subdirectory and extract the name of the architecture ++# accordingly. ++set(__HAIKU_COMPILER ${CMAKE_C_COMPILER}) ++ ++if(NOT __HAIKU_COMPILER) ++ set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) ++endif() ++ ++execute_process( ++ COMMAND ${__HAIKU_COMPILER} -print-search-dirs ++ OUTPUT_VARIABLE _HAIKU_SEARCH_DIRS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ ++string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n") ++set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}") ++ ++if(NOT CMAKE_HAIKU_SECONDARY_ARCH) ++ set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") ++ unset(CMAKE_HAIKU_SECONDARY_ARCH) ++else() ++ set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}") ++ ++ # Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search ++ # the libraries in the correct subdirectory first. It still isn't completely ++ # correct, since the parent directories shouldn't be searched at all. The ++ # primary architecture library might still be found, if there isn't one ++ # installed for the secondary architecture or it is installed in a less ++ # specific location. ++ set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ set(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ set(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++endif() ++ ++list(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/headers/os ++ /boot/system/develop/headers/os/app ++ /boot/system/develop/headers/os/device ++ /boot/system/develop/headers/os/drivers ++ /boot/system/develop/headers/os/game ++ /boot/system/develop/headers/os/interface ++ /boot/system/develop/headers/os/kernel ++ /boot/system/develop/headers/os/locale ++ /boot/system/develop/headers/os/mail ++ /boot/system/develop/headers/os/media ++ /boot/system/develop/headers/os/midi ++ /boot/system/develop/headers/os/midi2 ++ /boot/system/develop/headers/os/net ++ /boot/system/develop/headers/os/opengl ++ /boot/system/develop/headers/os/storage ++ /boot/system/develop/headers/os/support ++ /boot/system/develop/headers/os/translation ++ /boot/system/develop/headers/os/add-ons/graphics ++ /boot/system/develop/headers/os/add-ons/input_server ++ /boot/system/develop/headers/os/add-ons/screen_saver ++ /boot/system/develop/headers/os/add-ons/tracker ++ /boot/system/develop/headers/os/be_apps/Deskbar ++ /boot/system/develop/headers/os/be_apps/NetPositive ++ /boot/system/develop/headers/os/be_apps/Tracker ++ /boot/system/develop/headers/3rdparty ++ /boot/system/develop/headers/bsd ++ /boot/system/develop/headers/glibc ++ /boot/system/develop/headers/gnu ++ /boot/system/develop/headers/posix ++ /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ ) ++IF (CMAKE_HAIKU_SECONDARY_ARCH) ++ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/system/develop/headers ++ ) ++ENDIF (CMAKE_HAIKU_SECONDARY_ARCH) ++ ++LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES ++ /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ ) ++ ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} ++ ) + +-include(Platform/UnixPaths) +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) ++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) + + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH +diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/Complex/Library/CMakeLists.txt ++++ b/Tests/Complex/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt ++++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +-- +1.8.3.4 + + +From e1f3d70eb59d4e87438c2b792a0d64dc2805218d Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:31:36 +0200 +Subject: Remove use of B_COMMON_DIRECTORY + + * The common directory was removed in Haiku. Applications are now + installed in the system directory. + +diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx +index 7cc1522..de394a6 100644 +--- a/Source/CPack/cmCPackGenerator.cxx ++++ b/Source/CPack/cmCPackGenerator.cxx +@@ -26,7 +26,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1263,14 +1264,14 @@ const char* cmCPackGenerator::GetInstallPath() + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +- this->InstallPath = "/boot/common"; ++ this->InstallPath = "/boot/system"; + } + #else + this->InstallPath = "/usr/local/"; +diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx +index 1cc1754..fcb66a7 100644 +--- a/Source/cmExportCommand.cxx ++++ b/Source/cmExportCommand.cxx +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -305,14 +306,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) +diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx +index aa3a73d..1d6530f 100644 +--- a/Source/cmFindPackageCommand.cxx ++++ b/Source/cmFindPackageCommand.cxx +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1584,12 +1586,14 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) +- { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) ++ { ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += Name; ++ this->LoadPackageRegistryDir(fname); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx +index ee5b9d8..1369dab 100644 +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,16 +355,16 @@ void cmLocalGenerator::GenerateInstallRules() + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +- prefix = "/boot/common"; ++ prefix = "/boot/system"; + } + } + #else +-- +1.8.3.4 + + +From a2d6be58cf08774f05427d90de2c0ed7179d16e3 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:33:52 +0200 +Subject: Remove useless preprocessor checks + + * Haiku does not define __BEOS__ anymore, so there is no need to guard + these BeOS specific workaround for Haiku. + * The workaround themselves are not needed for Haiku as it has much + better POSIX compatibility than BeOS did. + +diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx +index 8b25d60..51dba3c 100644 +--- a/Source/kwsys/SystemTools.cxx ++++ b/Source/kwsys/SystemTools.cxx +@@ -152,11 +152,6 @@ public: + #define _chdir chdir + #endif + +-#if defined(__HAIKU__) +-#include +-#include +-#endif +- + #if defined(__BEOS__) && !defined(__ZETA__) + #include + #include +diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c +index d74a4f0..c5ba7c2 100644 +--- a/Utilities/cmcurl/CMake/CurlTests.c ++++ b/Utilities/cmcurl/CMake/CurlTests.c +@@ -38,7 +38,7 @@ main () + # define PLATFORM_AIX_V3 + #endif + +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c +index 51adbcf..82f9dc2 100644 +--- a/Utilities/cmcurl/select.c ++++ b/Utilities/cmcurl/select.c +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h +index 6eb52d1..7a3b6fd 100644 +--- a/Utilities/cmzlib/zconf.h ++++ b/Utilities/cmzlib/zconf.h +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) +diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h +index 74ef1f8..3053cd8 100644 +--- a/Utilities/cmzlib/zutil.h ++++ b/Utilities/cmzlib/zutil.h +@@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif +-- +1.8.3.4 + + +From abc2262574468318d404a9d4271a818926aab507 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:59:25 +0200 +Subject: Include files cleanup + + * No need to use a different path from the BeOS one, which still works. + +diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx +index 322a6a2..2aaedec 100644 +--- a/Source/cmCTest.cxx ++++ b/Source/cmCTest.cxx +@@ -53,14 +53,10 @@ + #include + #include + +-#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + + #define DEBUGOUT std::cout << __LINE__ << " "; std::cout + #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr +diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx +index 61c1572..fc0215e 100644 +--- a/Source/kwsys/testDynamicLoader.cxx ++++ b/Source/kwsys/testDynamicLoader.cxx +@@ -15,14 +15,10 @@ + #include KWSYS_HEADER(ios/iostream) + #include KWSYS_HEADER(stl/string) + +-#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + // Work-around CMake dependency scanning limitation. This must + // duplicate the above list of headers. + #if 0 +-- +1.8.3.4 + + +From b932917065447fbd619e642a67ab294a17ffc97c Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 17:01:03 +0200 +Subject: FindSDL: Fix broken include paths + + * I asked the CMake community about this, and they couldn't even figure +out how this worked even on other platforms. + +diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake +index fec142e..6adec1f 100644 +--- a/Modules/FindSDL.cmake ++++ b/Modules/FindSDL.cmake +@@ -70,7 +70,7 @@ + find_path(SDL_INCLUDE_DIR SDL.h + HINTS + ENV SDLDIR +- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include ++ PATH_SUFFIXES SDL SDL12 SDL11 + ) + + # SDL-1.1 is the name used by FreeBSD ports... +-- +1.8.3.4 + + +From ff28e08e29c0d54d794185ada1ddf496b41285e0 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 14 Oct 2013 09:35:02 +0200 +Subject: Enable command-line length limitation on Haiku. + + +diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx +index 7e48cd7..3d15900 100644 +--- a/Source/cmNinjaNormalTargetGenerator.cxx ++++ b/Source/cmNinjaNormalTargetGenerator.cxx +@@ -563,7 +563,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() + cmSystemTools::GetEnv(forceRspFile) == 0) { + #ifdef _WIN32 + commandLineLengthLimit = 8000 - linkRuleLength; +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__HAIKU__) + // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac + commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))-linkRuleLength-1000; + #else +-- +1.8.3.4 + diff --git a/dev-util/cmake/patches/cmake-2.8.2.patch b/dev-util/cmake/patches/cmake-2.8.2.patch deleted file mode 100644 index 9384e05a9..000000000 --- a/dev-util/cmake/patches/cmake-2.8.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN cmake-2.8.2/bootstrap cmake-2.8.2-haiku/bootstrap ---- cmake-2.8.2/bootstrap 2010-04-06 14:45:29.040370176 +0000 -+++ cmake-2.8.2-haiku/bootstrap 2010-08-31 05:39:55.518520832 +0000 -@@ -132,7 +132,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.3.patch b/dev-util/cmake/patches/cmake-2.8.3.patch deleted file mode 100644 index 68f6a1303..000000000 --- a/dev-util/cmake/patches/cmake-2.8.3.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN cmake-2.8.3/Modules/FindGLUT.cmake cmake-2.8.3-haiku/Modules/FindGLUT.cmake ---- cmake-2.8.3/Modules/FindGLUT.cmake 2010-11-03 19:58:27.020971520 +0000 -+++ cmake-2.8.3-haiku/Modules/FindGLUT.cmake 2011-01-29 10:22:22.032505856 +0000 -@@ -46,12 +46,15 @@ - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib -+ /boot/develop/lib/x86/  - ) -- -+ -+ IF(NOT BEOS) - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi - /usr/openwin/lib - ) -@@ -59,6 +62,7 @@ - FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu - /usr/openwin/lib - ) -+ ENDIF(NOT BEOS) - - ENDIF (APPLE) - -@@ -69,12 +73,18 @@ - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -+ IF(BEOS) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ ELSE(BEOS) - SET( GLUT_LIBRARIES - ${GLUT_glut_LIBRARY} - ${GLUT_Xmu_LIBRARY} - ${GLUT_Xi_LIBRARY} - ${GLUT_cocoa_LIBRARY} - ) -+ ENDIF(BEOS) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +94,16 @@ - ENDIF(GLUT_glut_LIBRARY) - ENDIF(GLUT_INCLUDE_DIR) - -+IF(BEOS) -+MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ ) -+ELSE(BEOS) - MARK_AS_ADVANCED( - GLUT_INCLUDE_DIR - GLUT_glut_LIBRARY - GLUT_Xmu_LIBRARY - GLUT_Xi_LIBRARY - ) -+ENDIF(BEOS) -diff -urN cmake-2.8.3/Modules/FindLua51.cmake cmake-2.8.3-haiku/Modules/FindLua51.cmake ---- cmake-2.8.3/Modules/FindLua51.cmake 2010-11-03 19:58:27.023330816 +0000 -+++ cmake-2.8.3-haiku/Modules/FindLua51.cmake 2011-01-29 10:22:22.035127296 +0000 -@@ -57,13 +57,13 @@ - - IF(LUA_LIBRARY) - # include the math library for Unix -- IF(UNIX AND NOT APPLE) -+ IF(UNIX AND NOT APPLE AND NOT BEOS) - FIND_LIBRARY(LUA_MATH_LIBRARY m) - SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library - ELSE(UNIX AND NOT APPLE) - SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -- ENDIF(UNIX AND NOT APPLE) -+ ENDIF(UNIX AND NOT APPLE AND NOT BEOS) - ENDIF(LUA_LIBRARY) - - INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") -diff -urN cmake-2.8.3/Modules/FindOpenGL.cmake cmake-2.8.3-haiku/Modules/FindOpenGL.cmake ---- cmake-2.8.3/Modules/FindOpenGL.cmake 2010-11-03 19:58:27.024117248 +0000 -+++ cmake-2.8.3-haiku/Modules/FindOpenGL.cmake 2011-01-29 10:22:22.035913728 +0000 -@@ -80,6 +80,7 @@ - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -urN cmake-2.8.3/bootstrap cmake-2.8.3-haiku/bootstrap ---- cmake-2.8.3/bootstrap 2010-11-03 19:58:26.058720256 +0000 -+++ cmake-2.8.3-haiku/bootstrap 2011-01-29 10:22:22.031981568 +0000 -@@ -137,7 +137,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.5.patchset b/dev-util/cmake/patches/cmake-2.8.5.patchset new file mode 100644 index 000000000..40215e05f --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8.5.patchset @@ -0,0 +1,664 @@ +From 63b3bcd0d6804a07fe94d9af0fc7a7810fab538d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 21:42:39 +0200 +Subject: Haiku specific changes + + +diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in +index 4d25de0..f84852a 100644 +--- a/Modules/CMakeFortranCompilerId.F.in ++++ b/Modules/CMakeFortranCompilerId.F.in +@@ -74,12 +74,8 @@ + PRINT *, 'INFO:platform[IRIX]' + #elif defined(__hpux) || defined(__hpux__) + PRINT *, 'INFO:platform[HP-UX]' +-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) ++#elif defined(__HAIKU__) + PRINT *, 'INFO:platform[Haiku]' +-# if 0 +-! Haiku also defines __BEOS__ so we must +-! put it prior to the check for __BEOS__ +-# endif + #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) + PRINT *, 'INFO:platform[BeOS]' + #elif defined(__QNX__) || defined(__QNXNTO__) +diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in +index cb3f40a..db98bc3 100644 +--- a/Modules/CMakePlatformId.h.in ++++ b/Modules/CMakePlatformId.h.in +@@ -35,11 +35,8 @@ + #elif defined(__hpux) || defined(__hpux__) + # define PLATFORM_ID "HP-UX" + +-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) ++#elif defined(__HAIKU__) + # define PLATFORM_ID "Haiku" +-/* Haiku also defines __BEOS__ so we must +- put it prior to the check for __BEOS__ +-*/ + + #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) + # define PLATFORM_ID "BeOS" +diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c +index d831078..02526fb 100644 +--- a/Modules/CheckForPthreads.c ++++ b/Modules/CheckForPthreads.c +@@ -16,7 +16,7 @@ int main(int ac, char*av[]){ + pthread_create(&tid[0], 0, runner, (void*)1); + pthread_create(&tid[1], 0, runner, (void*)2); + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) ++#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) + usleep(1); // for strange behavior on single-processor sun + #endif + +diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake +index af88997..8c0a733 100644 +--- a/Modules/FindGLUT.cmake ++++ b/Modules/FindGLUT.cmake +@@ -46,20 +46,22 @@ ELSE (WIN32) + /usr/openwin/include + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglut ++ /boot/system/develop/headers/os/opengl + ) + + FIND_LIBRARY( GLUT_glut_LIBRARY glut + /usr/openwin/lib + ) +- +- FIND_LIBRARY( GLUT_Xi_LIBRARY Xi +- /usr/openwin/lib +- ) +- +- FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu +- /usr/openwin/lib +- ) +- ++ ++ IF(NOT BEOS AND NOT HAIKU) ++ FIND_LIBRARY( GLUT_Xi_LIBRARY Xi ++ /usr/openwin/lib ++ ) ++ ++ FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu ++ /usr/openwin/lib ++ ) ++ ENDIF(NOT BEOS AND NOT HAIKU) + ENDIF (APPLE) + + ENDIF (WIN32) +@@ -69,12 +71,18 @@ IF(GLUT_INCLUDE_DIR) + IF(GLUT_glut_LIBRARY) + # Is -lXi and -lXmu required on all platforms that have it? + # If not, we need some way to figure out what platform we are on. +- SET( GLUT_LIBRARIES +- ${GLUT_glut_LIBRARY} +- ${GLUT_Xmu_LIBRARY} +- ${GLUT_Xi_LIBRARY} +- ${GLUT_cocoa_LIBRARY} +- ) ++ IF(BEOS OR HAIKU) ++ SET( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ) ++ ELSE(BEOS OR HAIKU) ++ SET( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ${GLUT_Xmu_LIBRARY} ++ ${GLUT_Xi_LIBRARY} ++ ${GLUT_cocoa_LIBRARY} ++ ) ++ ENDIF(BEOS OR HAIKU) + SET( GLUT_FOUND "YES" ) + + #The following deprecated settings are for backwards compatibility with CMake1.4 +@@ -84,9 +92,16 @@ IF(GLUT_INCLUDE_DIR) + ENDIF(GLUT_glut_LIBRARY) + ENDIF(GLUT_INCLUDE_DIR) + +-MARK_AS_ADVANCED( +- GLUT_INCLUDE_DIR +- GLUT_glut_LIBRARY +- GLUT_Xmu_LIBRARY +- GLUT_Xi_LIBRARY +- ) ++IF(BEOS OR HAIKU) ++ MARK_AS_ADVANCED( ++ GLUT_INCLUDE_DIR ++ GLUT_glut_LIBRARY ++ ) ++ELSE(BEOS OR HAIKU) ++ MARK_AS_ADVANCED( ++ GLUT_INCLUDE_DIR ++ GLUT_glut_LIBRARY ++ GLUT_Xmu_LIBRARY ++ GLUT_Xi_LIBRARY ++ ) ++ENDIF(BEOS OR HAIKU) +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index 123fd5d..5047fbd 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -57,13 +57,13 @@ FIND_LIBRARY(LUA_LIBRARY + + IF(LUA_LIBRARY) + # include the math library for Unix +- IF(UNIX AND NOT APPLE) ++ IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + FIND_LIBRARY(LUA_MATH_LIBRARY m) + SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library + ELSE(UNIX AND NOT APPLE) + SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") +- ENDIF(UNIX AND NOT APPLE) ++ ENDIF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + ENDIF(LUA_LIBRARY) + + INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake +index 98d8808..1ac4de6 100644 +--- a/Modules/FindOpenGL.cmake ++++ b/Modules/FindOpenGL.cmake +@@ -80,6 +80,7 @@ ELSE (WIN32) + /usr/share/doc/NVIDIA_GLX-1.0/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include /usr/X11R6/include ++ /boot/system/develop/headers/os/opengl + ) + + FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index 8277a24..7eb0bd5 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -1,20 +1,121 @@ +-SET(BEOS 1) ++# process only once ++IF(HAIKU) ++ RETURN() ++ENDIF(HAIKU) + +-SET(CMAKE_DL_LIBS root be) ++SET(HAIKU 1) ++SET(UNIX 1) ++ ++SET(CMAKE_DL_LIBS "") + SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") +-SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") ++SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") + SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") + SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") ++SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++ ++# Determine, if the C or C++ compiler is configured for a secondary ++# architecture. If so, that will change the search paths we set below. We check ++# whether the compiler's library search paths contain a ++# "/boot/system/develop/lib//", which we assume to be the secondary ++# architecture specific subdirectory and extract the name of the architecture ++# accordingly. ++SET(HAIKU_COMPILER ${CMAKE_C_COMPILER}) ++IF ("${HAIKU_COMPILER}" STREQUAL "") ++ SET(HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) ++ENDIF ("${HAIKU_COMPILER}" STREQUAL "") ++EXECUTE_PROCESS( ++ COMMAND ${HAIKU_COMPILER} -print-search-dirs ++ COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp" ++ COMMAND sed -ne "/\\/boot\\/system\\/develop\\/lib\\/[^\\/]*\\/$/!d; s,.*/\\([^/]*\\)/$,\\1,; p" ++ OUTPUT_VARIABLE CMAKE_HAIKU_SECONDARY_ARCH) ++STRING(STRIP "${CMAKE_HAIKU_SECONDARY_ARCH}" ++ CMAKE_HAIKU_SECONDARY_ARCH) ++ ++IF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") ++ UNSET(CMAKE_HAIKU_SECONDARY_ARCH) ++ELSE ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}") ++ ++ # Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search ++ # the libraries in the correct subdirectory first. It still isn't completely ++ # correct, since the parent directories shouldn't be searched at all. The ++ # primary architecture library might still be found, if there isn't one ++ # installed for the secondary architecture or it is installed in a less ++ # specific location. ++ SET(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ SET(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ SET(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ENDIF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ ++LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/headers/os ++ /boot/system/develop/headers/os/app ++ /boot/system/develop/headers/os/device ++ /boot/system/develop/headers/os/drivers ++ /boot/system/develop/headers/os/game ++ /boot/system/develop/headers/os/interface ++ /boot/system/develop/headers/os/kernel ++ /boot/system/develop/headers/os/locale ++ /boot/system/develop/headers/os/mail ++ /boot/system/develop/headers/os/media ++ /boot/system/develop/headers/os/midi ++ /boot/system/develop/headers/os/midi2 ++ /boot/system/develop/headers/os/net ++ /boot/system/develop/headers/os/opengl ++ /boot/system/develop/headers/os/storage ++ /boot/system/develop/headers/os/support ++ /boot/system/develop/headers/os/translation ++ /boot/system/develop/headers/os/add-ons/graphics ++ /boot/system/develop/headers/os/add-ons/input_server ++ /boot/system/develop/headers/os/add-ons/screen_saver ++ /boot/system/develop/headers/os/add-ons/tracker ++ /boot/system/develop/headers/os/be_apps/Deskbar ++ /boot/system/develop/headers/os/be_apps/NetPositive ++ /boot/system/develop/headers/os/be_apps/Tracker ++ /boot/system/develop/headers/3rdparty ++ /boot/system/develop/headers/bsd ++ /boot/system/develop/headers/glibc ++ /boot/system/develop/headers/gnu ++ /boot/system/develop/headers/posix ++ /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ ) ++IF (CMAKE_HAIKU_SECONDARY_ARCH) ++ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/system/develop/headers ++ ) ++ENDIF (CMAKE_HAIKU_SECONDARY_ARCH) ++ ++LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES ++ /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ ) ++ ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} ++ ) + +-INCLUDE(Platform/UnixPaths) +-LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) ++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) + + IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH +diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx +index 7e5b26d..733c521 100644 +--- a/Source/CPack/cmCPackGenerator.cxx ++++ b/Source/CPack/cmCPackGenerator.cxx +@@ -27,7 +27,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1206,10 +1207,10 @@ const char* cmCPackGenerator::GetInstallPath() + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx +index a04b403..878e8c0 100644 +--- a/Source/CPack/cmCPackGeneratorFactory.cxx ++++ b/Source/CPack/cmCPackGeneratorFactory.cxx +@@ -32,7 +32,7 @@ + #endif + + #if !defined(_WIN32) && !defined(__APPLE__) \ +- && !defined(__QNXNTO__) && !defined(__BEOS__) ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) + # include "cmCPackDebGenerator.h" + # include "cmCPackRPMGenerator.h" + #endif +@@ -73,7 +73,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() + cmCPackOSXX11Generator::CreateGenerator); + #endif + #if !defined(_WIN32) && !defined(__APPLE__) \ +- && !defined(__QNXNTO__) && !defined(__BEOS__) ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) + this->RegisterGenerator("DEB", "Debian packages", + cmCPackDebGenerator::CreateGenerator); + this->RegisterGenerator("RPM", "RPM packages", +diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx +index 75a564e..83e3c6e 100644 +--- a/Source/cmCTest.cxx ++++ b/Source/cmCTest.cxx +@@ -53,14 +53,10 @@ + #include + #include + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + + #define DEBUGOUT std::cout << __LINE__ << " "; std::cout + #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr +diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx +index cb614d4..1954662 100644 +--- a/Source/cmExportCommand.cxx ++++ b/Source/cmExportCommand.cxx +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -297,14 +298,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) +diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx +index 5f106bc..a2f9823 100644 +--- a/Source/cmFindPackageCommand.cxx ++++ b/Source/cmFindPackageCommand.cxx +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1292,12 +1294,13 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) + { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ strlcat(dir, "/cmake/packages/", sizeof(dir)); ++ strlcat(dir, this->Name.c_str(), sizeof(dir)); ++ this->LoadPackageRegistryDir(dir); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx +index 7da35eb..5867030 100644 +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,12 +355,12 @@ void cmLocalGenerator::GenerateInstallRules() + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c +index 9c66a44..6fe4232 100644 +--- a/Source/kwsys/ProcessUNIX.c ++++ b/Source/kwsys/ProcessUNIX.c +@@ -63,10 +63,6 @@ do. + #include /* DIR, dirent */ + #include /* isspace */ + +-#ifdef __HAIKU__ +-#undef __BEOS__ +-#endif +- + #if defined(__VMS) + # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK + #else +diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx +index eefa7f5..8798615 100644 +--- a/Source/kwsys/SystemTools.cxx ++++ b/Source/kwsys/SystemTools.cxx +@@ -145,12 +145,7 @@ public: + #define _chdir chdir + #endif + +-#if defined(__HAIKU__) +-#include +-#include +-#endif +- +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) ++#if defined(__BEOS__) && !defined(__ZETA__) + #include + #include + +diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx +index a7adbca..16b89ad 100644 +--- a/Source/kwsys/testDynamicLoader.cxx ++++ b/Source/kwsys/testDynamicLoader.cxx +@@ -15,14 +15,10 @@ + #include KWSYS_HEADER(ios/iostream) + #include KWSYS_HEADER(stl/string) + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + // Work-around CMake dependency scanning limitation. This must + // duplicate the above list of headers. + #if 0 +diff --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c +index 877002a..17a068c 100644 +--- a/Source/kwsys/testProcess.c ++++ b/Source/kwsys/testProcess.c +@@ -32,7 +32,7 @@ + # pragma warn -8060 /* possibly incorrect assignment */ + #endif + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) ++#if defined(__BEOS__) && !defined(__ZETA__) + /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ + # include + static inline void testProcess_usleep(unsigned int msec) +diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt +index 281e48a..7d8adb2 100644 +--- a/Tests/Complex/Library/CMakeLists.txt ++++ b/Tests/Complex/Library/CMakeLists.txt +@@ -52,9 +52,9 @@ DEFINE_PROPERTY( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") +-ENDIF(NOT BEOS AND NOT WIN32) ++ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) + GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) + IF(${FOO_BAR_VAR} MATCHES "BAR") + ELSE(${FOO_BAR_VAR} MATCHES "BAR") +diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt +index 281e48a..7d8adb2 100644 +--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt ++++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt +@@ -52,9 +52,9 @@ DEFINE_PROPERTY( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") +-ENDIF(NOT BEOS AND NOT WIN32) ++ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) + GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) + IF(${FOO_BAR_VAR} MATCHES "BAR") + ELSE(${FOO_BAR_VAR} MATCHES "BAR") +diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt +index 281e48a..7d8adb2 100644 +--- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt ++++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt +@@ -52,9 +52,9 @@ DEFINE_PROPERTY( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") +-ENDIF(NOT BEOS AND NOT WIN32) ++ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) + GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) + IF(${FOO_BAR_VAR} MATCHES "BAR") + ELSE(${FOO_BAR_VAR} MATCHES "BAR") +diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c +index d74a4f0..c5ba7c2 100644 +--- a/Utilities/cmcurl/CMake/CurlTests.c ++++ b/Utilities/cmcurl/CMake/CurlTests.c +@@ -38,7 +38,7 @@ main () + # define PLATFORM_AIX_V3 + #endif + +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c +index 51adbcf..82f9dc2 100644 +--- a/Utilities/cmcurl/select.c ++++ b/Utilities/cmcurl/select.c +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h +index 6eb52d1..7a3b6fd 100644 +--- a/Utilities/cmzlib/zconf.h ++++ b/Utilities/cmzlib/zconf.h +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) +diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h +index 74ef1f8..3053cd8 100644 +--- a/Utilities/cmzlib/zutil.h ++++ b/Utilities/cmzlib/zutil.h +@@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif +diff --git a/bootstrap b/bootstrap +index c999888..c573a90 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -142,7 +142,9 @@ if ${cmake_system_mingw}; then + cmake_default_prefix="c:/Program Files/CMake" + fi + elif ${cmake_system_haiku}; then +- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` ++ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` ++ cmake_man_dir="/documentation/man" ++ cmake_doc_dir="/documentation/packages/cmake-${cmake_version}" + else + cmake_default_prefix="/usr/local" + fi +-- +1.7.10.2 + diff --git a/dev-util/cppunit/cppunit-1.12.1.bep b/dev-util/cppunit/cppunit-1.12.1.recipe similarity index 86% rename from dev-util/cppunit/cppunit-1.12.1.bep rename to dev-util/cppunit/cppunit-1.12.1.recipe index b6acee2c0..ccad5254c 100644 --- a/dev-util/cppunit/cppunit-1.12.1.bep +++ b/dev-util/cppunit/cppunit-1.12.1.recipe @@ -1,11 +1,12 @@ DESCRIPTION="C++ port of the famous JUnit framework for unit testing" HOMEPAGE="http://cppunit.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download" -CHECKSUM_MD5 = "bd30e9cf5523cdfc019b94f5e1d7fd19" +CHECKSUM_MD5="bd30e9cf5523cdfc019b94f5e1d7fd19" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cppunit-1.12.1 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cppunit-1.12.1 make install } diff --git a/dev-util/cscope/cscope-15.7a.bep b/dev-util/cscope/cscope-15.7a.recipe similarity index 95% rename from dev-util/cscope/cscope-15.7a.bep rename to dev-util/cscope/cscope-15.7a.recipe index de9159eb5..de04966d8 100644 --- a/dev-util/cscope/cscope-15.7a.bep +++ b/dev-util/cscope/cscope-15.7a.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="da43987622ace8c36bbf14c15a350ec1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cscope-15.7a autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cscope-15.7a make install } diff --git a/dev-util/ctags/ctags-5.8.bep b/dev-util/ctags/ctags-5.8.bep deleted file mode 100644 index 409a72ab6..000000000 --- a/dev-util/ctags/ctags-5.8.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors" -HOMEPAGE="http://ctags.sourceforge.net/" -SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" -BUILD { - cd ctags-5.8 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd ctags-5.8 - make install prefix=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ - mandir=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1996-2009, Darren Hiebert" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe new file mode 100644 index 000000000..ada66ce26 --- /dev/null +++ b/dev-util/ctags/ctags-5.8.recipe @@ -0,0 +1,39 @@ +SUMMARY="Exuberant Ctags creates tags files for code browsing in editors" +DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors." +HOMEPAGE="http://ctags.sourceforge.net/" +COPYRIGHT="1996-2009, Darren Hiebert" +LICENSE="GNU GPL v2" +SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz" +CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + ctags = $portVersion compat >= 5.8 + cmd:ctags = $portVersion compat >= 5.8 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-util/diffstat/diffstat-1.51.bep b/dev-util/diffstat/diffstat-1.51.recipe similarity index 95% rename from dev-util/diffstat/diffstat-1.51.bep rename to dev-util/diffstat/diffstat-1.51.recipe index d3a73f46f..2a1663405 100644 --- a/dev-util/diffstat/diffstat-1.51.bep +++ b/dev-util/diffstat/diffstat-1.51.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="a7d3fd1ba2a9a6c9e2b32e867b5e8792" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffstat-1.51 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd diffstat-1.51 make install DESTDIR="${DESTDIR}" } diff --git a/dev-util/fastdep/fastdep-0.16.bep b/dev-util/fastdep/fastdep-0.16.bep deleted file mode 100644 index d299b7249..000000000 --- a/dev-util/fastdep/fastdep-0.16.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="fastdep is a fast dependency generator for C/C++ files." -HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" -SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54" -BUILD { - cd fastdep-0.16 - ./configure - make -} -INSTALL { - cd fastdep-0.16 - mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` - cp -f fastdep ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2003 Bart Vanhauwaert" diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe new file mode 100644 index 000000000..9aebf221e --- /dev/null +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -0,0 +1,44 @@ +SUMMARY="fastdep is a fast dependency generator for C/C++ files." +DESCRIPTION="fastdep is a preprocessor which generates dependency information suitable for Makefile inclusion from C or C++ source files. Meant to run on slower hardware, it is several orders of magnitude faster than gcc." +HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" +SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz" +REVISION="1" +CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54" +LICENSE="GNU GPL v2" +COPYRIGHT="2003 Bart Vanhauwaert" + +ARCHITECTURES="x86 x86_gcc2" + +PATCHES="fastdep-0.16.patch" + +PROVIDES=" + cmd:fastdep = $portVersion compat >= 0 + " + +REQUIRES=" + lib:libstdc++.r4 + lib:libroot >= $haikuVersion" + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + mkdir -p $binDir + cp -f fastdep $binDir +} + + diff --git a/dev-util/global/global-6.2.2.bep b/dev-util/global/global-6.2.2.recipe similarity index 97% rename from dev-util/global/global-6.2.2.bep rename to dev-util/global/global-6.2.2.recipe index 34cb8672f..3c44a3930 100644 --- a/dev-util/global/global-6.2.2.bep +++ b/dev-util/global/global-6.2.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8317d2d6914a8e18cd725f9cd7164b87" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/ctags >= 5.8" -BUILD { +BUILD() +{ cd global-6.2.2 autoreconf -fi ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd global-6.2.2 make install } diff --git a/dev-util/global/global-6.2.4.bep b/dev-util/global/global-6.2.4.recipe similarity index 97% rename from dev-util/global/global-6.2.4.bep rename to dev-util/global/global-6.2.4.recipe index 2fea5fdf7..b98c32ac6 100644 --- a/dev-util/global/global-6.2.4.bep +++ b/dev-util/global/global-6.2.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c778d4e52a30706db7a02070cce1078c" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/ctags >= 5.8" -BUILD { +BUILD() +{ cd global-6.2.4 autoreconf -fi ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd global-6.2.4 make install } diff --git a/dev-util/gperf/gperf-3.0.4.bep b/dev-util/gperf/gperf-3.0.4.bep deleted file mode 100644 index c4071044c..000000000 --- a/dev-util/gperf/gperf-3.0.4.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="gperf" -HOMEPAGE="http://www.gnu.org/software/gperf/" -SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" -BUILD { - cd gperf-3.0.4 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/gperf \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd gperf-3.0.4 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc." diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe new file mode 100644 index 000000000..309ff1491 --- /dev/null +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -0,0 +1,46 @@ +SUMMARY="GNU perfect hash function generator" +DESCRIPTION="GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only. + +GNU gperf is highly customizable. There are options for generating C or C++ code, for emitting switch statements or nested ifs instead of a hash table, and for tuning the algorithm employed by gperf. + +Online Manual is available at www.gnu.org/software/gperf/manual/gperf.html" +HOMEPAGE="http://www.gnu.org/software/gperf/" +COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" +CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="gperf-3.0.4.patch" + +PROVIDES=" + gperf = $portVersion compat >= 3 + cmd:gperf = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +BUILD() +{ + # touch documentation to avoid attempts at rebuilding it (which will fail) + touch doc/*.{pdf,ps} + + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-util/gtk-doc/gtk-doc-1.15.bep b/dev-util/gtk_doc/gtk_doc-1.15.recipe similarity index 95% rename from dev-util/gtk-doc/gtk-doc-1.15.bep rename to dev-util/gtk_doc/gtk_doc-1.15.recipe index dbb09f8c3..87f6e85b7 100644 --- a/dev-util/gtk-doc/gtk-doc-1.15.bep +++ b/dev-util/gtk_doc/gtk_doc-1.15.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23 dev-libs/libxslt >= 1.1.26" -BUILD { +BUILD() +{ cd gtk-doc-1.15 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gtk-doc-1.15 make install } diff --git a/dev-util/gtk-doc/patches/gtk-doc-1.15.patch b/dev-util/gtk_doc/patches/gtk_doc-1.15.patch similarity index 100% rename from dev-util/gtk-doc/patches/gtk-doc-1.15.patch rename to dev-util/gtk_doc/patches/gtk_doc-1.15.patch diff --git a/dev-util/idutils/idutils-20061208.bep b/dev-util/idutils/idutils-20061208.recipe similarity index 95% rename from dev-util/idutils/idutils-20061208.bep rename to dev-util/idutils/idutils-20061208.recipe index 680bf7356..6d0261204 100644 --- a/dev-util/idutils/idutils-20061208.bep +++ b/dev-util/idutils/idutils-20061208.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="75cd31c5401c329cdefc272c60c83422" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd idutils-cvs libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd idutils-cvs make install } diff --git a/dev-util/idutils/idutils-4.2.bep b/dev-util/idutils/idutils-4.2.recipe similarity index 95% rename from dev-util/idutils/idutils-4.2.bep rename to dev-util/idutils/idutils-4.2.recipe index 137fb9d96..8733badb2 100644 --- a/dev-util/idutils/idutils-4.2.bep +++ b/dev-util/idutils/idutils-4.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="4bbd2cb0d566ab29e41088cc028ad710" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd idutils-4.2 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd idutils-4.2 make install } diff --git a/dev-util/indent/indent-2.2.11.bep b/dev-util/indent/indent-2.2.11.recipe similarity index 96% rename from dev-util/indent/indent-2.2.11.bep rename to dev-util/indent/indent-2.2.11.recipe index b9649ad6d..aebc21acc 100644 --- a/dev-util/indent/indent-2.2.11.bep +++ b/dev-util/indent/indent-2.2.11.recipe @@ -7,7 +7,8 @@ DEPEND="sys-devel/gettext >= 0.17 net-misc/rsync >= 3.0.7 app-text/texi2html >= 1.82" CHECKSUM_MD5="98beafca62472805a3739d3867d5d70f" -BUILD { +BUILD() +{ cd indent-2.2.11 libtoolize --force --copy --install ./bootstrap @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd indent-2.2.11 make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd indent-2.2.11 # make test # make check diff --git a/dev-util/intltool/intltool-0.40.6.bep b/dev-util/intltool/intltool-0.40.6.recipe similarity index 96% rename from dev-util/intltool/intltool-0.40.6.bep rename to dev-util/intltool/intltool-0.40.6.recipe index 9b91877ea..05eb668c7 100644 --- a/dev-util/intltool/intltool-0.40.6.bep +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -6,7 +6,8 @@ REVISION="2" STATUS_HAIKU="stable" MESSAGE="Requires XML::Parser perl module installed" DEPEND="" -BUILD { +BUILD() +{ cd intltool-0.40.6 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd intltool-0.40.6 make install make check diff --git a/dev-util/ninja/ninja-1.4.0.recipe b/dev-util/ninja/ninja-1.4.0.recipe new file mode 100644 index 000000000..dad0224b6 --- /dev/null +++ b/dev-util/ninja/ninja-1.4.0.recipe @@ -0,0 +1,61 @@ +SUMMARY="A small build system similar to make." +HOMEPAGE="http://martine.github.io/ninja/" +LICENSE="Apache v2" +COPYRIGHT="2011 Google Inc." +SRC_URI="git://github.com/martine/ninja.git#v1.4.0" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + ninja$secondaryArchSuffix = $portVersion + cmd:ninja = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + cmd:python + cmd:g++$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:as$secondaryArchSuffix +" + +PATCHES="ninja-1.4.0.patchset" + +BUILD() +{ + python ./bootstrap.py +} + +INSTALL() +{ + mkdir -p $binDir + cp ninja $binDir +} + +DESCRIPTION=" + Ninja is a small build system with a focus on speed. It differs from other + build systems in two major respects: it is designed to have its input files + generated by a higher-level build system, and it is designed to run builds + as fast as possible. + + Why yet another build system? + Where other build systems are high-level languages Ninja aims to be an + assembler. + + Ninja build files are human-readable but not especially convenient to write + by hand. (See the generated build file used to build Ninja itself.) These + constrained build files allow Ninja to evaluate incremental builds quickly. + For the Chrome browser on Linux (the motivating project behind Ninja), + Ninja is under a second for a no-op build where the equivalent Makefiles + took over ten seconds. + + Ninja's low-level approach makes it perfect for embedding into more + featureful build systems. Via gyp it can build Chrome and v8 and node.js + etc.; via CMake it can build LLVM and KDE and Blender etc. + " diff --git a/dev-util/ninja/patches/ninja-1.4.0.patchset b/dev-util/ninja/patches/ninja-1.4.0.patchset new file mode 100644 index 000000000..44356c8b4 --- /dev/null +++ b/dev-util/ninja/patches/ninja-1.4.0.patchset @@ -0,0 +1,82 @@ +From d5b906ba41f20ba28ea7044c8933c069dd915616 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Thu, 3 Oct 2013 10:06:13 +0200 +Subject: Add minimal Haiku support + + +diff --git a/platform_helper.py b/platform_helper.py +index b7447a1..bf7a99e 100644 +--- a/platform_helper.py ++++ b/platform_helper.py +@@ -19,7 +19,7 @@ import sys + + def platforms(): + return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5', +- 'mingw', 'msvc', 'gnukfreebsd8', 'bitrig'] ++ 'mingw', 'msvc', 'gnukfreebsd8', 'bitrig', 'haiku'] + + class Platform( object ): + def __init__( self, platform): +@@ -43,6 +43,8 @@ class Platform( object ): + self._platform = 'msvc' + elif self._platform.startswith('bitrig'): + self._platform = 'bitrig' ++ elif self._platform.startswith('haiku'): ++ self._platform = 'haiku' + + def platform(self): + return self._platform +@@ -73,3 +75,6 @@ class Platform( object ): + + def is_bitrig(self): + return self._platform == 'bitrig' ++ ++ def is_haiku(self): ++ return self._platform == 'haiku' +diff --git a/src/util.cc b/src/util.cc +index 6ba3c6c..7142d13 100644 +--- a/src/util.cc ++++ b/src/util.cc +@@ -310,7 +310,7 @@ int GetProcessorCount() { + #endif + } + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__) + double GetLoadAverage() { + // TODO(nicolas.despres@gmail.com): Find a way to implement it on Windows. + // Remember to also update Usage() when this is fixed. +-- +1.8.3.4 + + +From ae6f3e8c5b4d18198ef0c798c4609ac9607ea16f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 13 Oct 2013 22:39:03 +0200 +Subject: Disable has_re2c test + + * The test triggers some bug in our python port, leading to a corrupted +build.ninja file (first 40 lines are written twice to the file). + * re2c is not needed when just building ninja anyway. + +diff --git a/configure.py b/configure.py +index 9fe3be8..61ac9dd 100755 +--- a/configure.py ++++ b/configure.py +@@ -241,12 +241,7 @@ if not platform.is_windows() and not platform.is_solaris(): + + n.comment('the depfile parser and ninja lexers are generated using re2c.') + def has_re2c(): +- import subprocess +- try: +- proc = subprocess.Popen(['re2c', '-V'], stdout=subprocess.PIPE) +- return int(proc.communicate()[0], 10) >= 1103 +- except OSError: +- return False ++ return False + if has_re2c(): + n.rule('re2c', + command='re2c -b -i --no-generation-date -o $out $in', +-- +1.8.3.4 + diff --git a/dev-util/patchutils/patchutils-0.3.1.bep b/dev-util/patchutils/patchutils-0.3.1.recipe similarity index 95% rename from dev-util/patchutils/patchutils-0.3.1.bep rename to dev-util/patchutils/patchutils-0.3.1.recipe index 1e5a0f704..7a5547008 100644 --- a/dev-util/patchutils/patchutils-0.3.1.bep +++ b/dev-util/patchutils/patchutils-0.3.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3fd9bca58a429fbbb1c2126f1b72aa23" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd patchutils-0.3.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd patchutils-0.3.1 make install } diff --git a/dev-util/patchutils/patchutils-0.3.2.bep b/dev-util/patchutils/patchutils-0.3.2.recipe similarity index 95% rename from dev-util/patchutils/patchutils-0.3.2.bep rename to dev-util/patchutils/patchutils-0.3.2.recipe index db1ed8e5e..7d7aba0f1 100644 --- a/dev-util/patchutils/patchutils-0.3.2.bep +++ b/dev-util/patchutils/patchutils-0.3.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="74607b4a28c9009c6aeeed0e91098917" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd patchutils-0.3.2 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" make } -INSTALL { +INSTALL() +{ cd patchutils-0.3.2 make install } diff --git a/dev-util/pjdfstest/pjdfstest-20100807.bep b/dev-util/pjdfstest/pjdfstest-20100807.recipe similarity index 94% rename from dev-util/pjdfstest/pjdfstest-20100807.bep rename to dev-util/pjdfstest/pjdfstest-20100807.recipe index 878545588..be1098a1c 100644 --- a/dev-util/pjdfstest/pjdfstest-20100807.bep +++ b/dev-util/pjdfstest/pjdfstest-20100807.recipe @@ -6,17 +6,20 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This test suite requires expect, which hasn't been ported to Haiku, yet." DEPEND="" -BUILD { +BUILD() +{ cd pjdfstest-20100807 make } -INSTALL { +INSTALL() +{ cd pjdfstest-20100807 } -TEST { +TEST() +{ cd pjdfstest-20100807 } diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.25.patch b/dev-util/pkgconfig/patches/pkgconfig-0.25.patch deleted file mode 100644 index 907a3178d..000000000 --- a/dev-util/pkgconfig/patches/pkgconfig-0.25.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- pkg-config-0.25/parse.c 2010-05-27 20:21:36.003670016 +0000 -+++ pkg-config-0.25-haiku/parse.c 2010-08-05 02:44:44.243269632 +0000 -@@ -880,8 +880,9 @@ - pkg->other_cflags = g_slist_prepend (pkg->other_cflags, - g_strdup (arg)); - if (strcmp("-idirafter", arg) == 0) { -- tmp = trim_string(argv[++i]); -- char *n = strdup_escape_shell(tmp); -+ char *n; -+ tmp = trim_string(argv[++i]); -+ n = strdup_escape_shell(tmp); - pkg->other_cflags = g_slist_prepend(pkg->other_cflags, n); - g_free(tmp); - } -diff -urN pkg-config-0.25/pkg.m4 pkg-config-0.25-dnlfixed/pkg.m4 ---- pkg-config-0.25/pkg.m4 2009-12-06 20:39:02.000524288 +0000 -+++ pkg-config-0.25-dnlfixed/pkg.m4 2010-09-07 20:24:30.345505792 +0000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset b/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset new file mode 100644 index 000000000..2eb090a78 --- /dev/null +++ b/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset @@ -0,0 +1,60 @@ +From 2d186a28945868303f8e40b728058f979f77b3b5 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:59:02 +0200 +Subject: glib/configure.ac: use AC_PROG_CC instead of AM_PROG_CC_STDC + + +diff --git a/glib/configure.ac b/glib/configure.ac +index 9e48cc9..f51d103 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -288,7 +288,7 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) + AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) + AC_LANG_RESTORE + +-AM_PROG_CC_STDC ++AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + +-- +1.7.5 + + +From 8a711d6bac22f0334acf6eecc83a3b38b19e2409 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 16:16:06 +0200 +Subject: glib/configure.ac: search for stuff in -lnetwork + + +diff --git a/glib/configure.ac b/glib/configure.ac +index f51d103..d41bef3 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -1057,11 +1057,19 @@ if test $glib_native_win32 = no; then + [res_query("test", 0, 0, (void *)0, 0);], + [AC_MSG_RESULT([in -lbind]) + NETWORK_LIBS="-lbind $NETWORK_LIBS"], +- [AC_MSG_ERROR(not found)])]) ++ [LIBS="-lnetwork $save_libs" ++ AC_TRY_LINK([#include ], ++ [res_query("test", 0, 0, (void *)0, 0);], ++ [AC_MSG_RESULT([in -lbind]) ++ NETWORK_LIBS="-lnetwork $NETWORK_LIBS"], ++ [AC_MSG_ERROR(not found)])])]) + LIBS="$save_libs"]) +- AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket, +- [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], +- [AC_MSG_ERROR(Could not find socket())])) ++ AC_CHECK_FUNC(socket, :, ++ AC_CHECK_LIB(socket, socket, ++ [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], ++ [AC_CHECK_LIB(network, socket, ++ [NETWORK_LIBS="-lnetwork $NETWORK_LIBS"], ++ [AC_MSG_ERROR(Could not find socket())])])) + fi + AC_SUBST(NETWORK_LIBS) + +-- +1.7.5 + diff --git a/dev-util/pkgconfig/pkgconfig-0.23.bep b/dev-util/pkgconfig/pkgconfig-0.23.bep deleted file mode 100644 index 2a71b584d..000000000 --- a/dev-util/pkgconfig/pkgconfig-0.23.bep +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="pkgconfig" -HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" -SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz" -CHECKSUM_MD5="d922a88782b64441d06547632fd85744" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd pkg-config-0.23/glib-1.2.10 - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - cd .. - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd pkg-config-0.23 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1998, 2001-2006 Red Hat Inc." diff --git a/dev-util/pkgconfig/pkgconfig-0.25.bep b/dev-util/pkgconfig/pkgconfig-0.25.bep deleted file mode 100644 index 6df116054..000000000 --- a/dev-util/pkgconfig/pkgconfig-0.25.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="pkgconfig" -HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" -SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz" -CHECKSUM_MD5="a3270bab3f4b69b7dc6dbdacbcae9745" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd pkg-config-0.25/glib-1.2.10 - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - cd .. - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/pkg-config \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd pkg-config-0.25 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1998, 2001-2006 Red Hat Inc." diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe new file mode 100644 index 000000000..8fa68597d --- /dev/null +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -0,0 +1,63 @@ +SUMMARY="Helper tool for compiling applications and libraries" +DESCRIPTION="pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the correct compiler options on the command line so an application can use gcc -o test test.cpkg-config --libs --cflags glib-2.0 for instance, rather than hard-coding values on where to find glib (or other libraries). It is language-agnostic, so it can be used for defining the location of documentation tools, for instance." +HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" +LICENSE="GNU GPL v2" +COPYRIGHT="1998, 2001-2006 Red Hat Inc." +SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz" +CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="pkgconfig-0.27.1.patchset" + +PROVIDES=" + pkgconfig = $portVersion compat >= 0.27 + cmd:pkg_config = $portVersion compat >= 0.27 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + " +BUILD_REQUIRES=" + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:autoreconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="pkg-config-0.27.1" + +BUILD() +{ + cd glib + libtoolize --force --copy --install + autoreconf + cd .. + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + + pcPathSubdir="develop/lib/pkgconfig" + pcPath="/boot/common/non-packaged/$pcPathSubdir" + pcPath="$pcPath:/boot/common/$pcPathSubdir" + pcPath="$pcPath:/boot/system/$pcPathSubdir" + + runConfigure ./configure \ + --with-internal-glib \ + --with-pc_path="$pcPath" + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-util/pkgconfig/pkgconfig-0.28.bep b/dev-util/pkgconfig/pkgconfig-0.28.recipe similarity index 100% rename from dev-util/pkgconfig/pkgconfig-0.28.bep rename to dev-util/pkgconfig/pkgconfig-0.28.recipe diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.bep b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe similarity index 95% rename from dev-util/posixtestsuite/posixtestsuite-1.5.2.bep rename to dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe index 8343380ce..3a9eda09b 100644 --- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.bep +++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe @@ -5,17 +5,20 @@ CHECKSUM_MD5="9a8e6516585c886fddc257270061b59c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd posixtestsuite make } -INSTALL { +INSTALL() +{ cd posixtestsuite make install } -TEST { +TEST() +{ cd posixtestsuite execute.sh } diff --git a/dev-util/premake/premake-4.3.bep b/dev-util/premake/premake-4.3.recipe similarity index 96% rename from dev-util/premake/premake-4.3.bep rename to dev-util/premake/premake-4.3.recipe index 823710ef2..d01ce86be 100644 --- a/dev-util/premake/premake-4.3.bep +++ b/dev-util/premake/premake-4.3.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd premake-4.3/build/gmake.unix make config=release } -INSTALL { +INSTALL() +{ cd premake-4.3/bin/release mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` diff --git a/dev-util/quilt/quilt-0.48.bep b/dev-util/quilt/quilt-0.48.recipe similarity index 96% rename from dev-util/quilt/quilt-0.48.bep rename to dev-util/quilt/quilt-0.48.recipe index ec42bbf25..ab9333581 100644 --- a/dev-util/quilt/quilt-0.48.bep +++ b/dev-util/quilt/quilt-0.48.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/diffstat >= 1.51 sys-apps/ed >= 1.4" -BUILD { +BUILD() +{ cd quilt-0.48 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make EDITOR=nano } -INSTALL { +INSTALL() +{ cd quilt-0.48 make install BUILD_ROOT="${DESTDIR}" } diff --git a/dev-util/re2c/re2c-0.13.5.bep b/dev-util/re2c/re2c-0.13.5.recipe similarity index 95% rename from dev-util/re2c/re2c-0.13.5.bep rename to dev-util/re2c/re2c-0.13.5.recipe index 14ff7044c..949343943 100644 --- a/dev-util/re2c/re2c-0.13.5.bep +++ b/dev-util/re2c/re2c-0.13.5.recipe @@ -6,18 +6,21 @@ STATUS_HAIKU="broken" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." CHECKSUM_MD5="4a97d8f77ed6d2c76c8bd840a43f5633" -BUILD { +BUILD() +{ cd re2c-0.13.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd re2c-0.13.5 make install } -TEST { +TEST() +{ cd re2c-0.13.5 # make test # make check diff --git a/dev-util/scons/patches/scons-1.0.1-python2.5.patch b/dev-util/scons/patches/scons-1.0.1-python2.5.patch deleted file mode 100644 index 7f07a486d..000000000 --- a/dev-util/scons/patches/scons-1.0.1-python2.5.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur scons-1.0.1/engine/SCons/Platform/__init__.py scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py ---- scons-1.0.1/engine/SCons/Platform/__init__.py 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py 2008-09-28 19:06:30.000000000 +0200 -@@ -76,6 +76,8 @@ - return 'aix' - elif string.find(sys.platform, 'darwin') != -1: - return 'darwin' -+ elif string.find(sys.platform, 'haiku') != -1: -+ return 'haiku' - else: - return 'posix' - elif os.name == 'os2': -diff -Naur scons-1.0.1/engine/SCons/Platform/haiku.py scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py ---- scons-1.0.1/engine/SCons/Platform/haiku.py 1970-01-01 01:00:00.000000000 +0100 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py 2008-10-05 13:27:12.000000000 +0200 -@@ -0,0 +1,41 @@ -+"""SCons.Platform.haiku -+ -+Platform-specific initialization for Haiku systems. -+ -+There normally shouldn't be any need to import this module directly. It -+will usually be imported through the generic SCons.Platform.Platform() -+selection method. -+""" -+ -+# -+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation -+# -+# Permission is hereby granted, free of charge, to any person obtaining -+# a copy of this software and associated documentation files (the -+# "Software"), to deal in the Software without restriction, including -+# without limitation the rights to use, copy, modify, merge, publish, -+# distribute, sublicense, and/or sell copies of the Software, and to -+# permit persons to whom the Software is furnished to do so, subject to -+# the following conditions: -+# -+# The above copyright notice and this permission notice shall be included -+# in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+ -+__revision__ = "" -+ -+import posix -+ -+def generate(env): -+ posix.generate(env) -+ env['ENV']['PATH'] = '.:/boot/home/config/bin:/boot/common/bin:/boot/system/bin:/boot/develop/tools/gnupro/bin' -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = '/boot/develop/lib/x86' -diff -Naur scons-1.0.1/script/scons scons-1.0.1-haiku-1/script/scons ---- scons-1.0.1/script/scons 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons 2008-10-05 13:20:42.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # -diff -Naur scons-1.0.1/script/scons-time scons-1.0.1-haiku-1/script/scons-time ---- scons-1.0.1/script/scons-time 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons-time 2008-10-05 13:20:49.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # scons-time - run SCons timings and collect statistics - # -diff -Naur scons-1.0.1/script/sconsign scons-1.0.1-haiku-1/script/sconsign ---- scons-1.0.1/script/sconsign 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/sconsign 2008-10-05 13:20:59.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # diff --git a/dev-util/scons/patches/scons-1.0.1.patch b/dev-util/scons/patches/scons-1.0.1.patch deleted file mode 100644 index 7f07a486d..000000000 --- a/dev-util/scons/patches/scons-1.0.1.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur scons-1.0.1/engine/SCons/Platform/__init__.py scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py ---- scons-1.0.1/engine/SCons/Platform/__init__.py 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py 2008-09-28 19:06:30.000000000 +0200 -@@ -76,6 +76,8 @@ - return 'aix' - elif string.find(sys.platform, 'darwin') != -1: - return 'darwin' -+ elif string.find(sys.platform, 'haiku') != -1: -+ return 'haiku' - else: - return 'posix' - elif os.name == 'os2': -diff -Naur scons-1.0.1/engine/SCons/Platform/haiku.py scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py ---- scons-1.0.1/engine/SCons/Platform/haiku.py 1970-01-01 01:00:00.000000000 +0100 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py 2008-10-05 13:27:12.000000000 +0200 -@@ -0,0 +1,41 @@ -+"""SCons.Platform.haiku -+ -+Platform-specific initialization for Haiku systems. -+ -+There normally shouldn't be any need to import this module directly. It -+will usually be imported through the generic SCons.Platform.Platform() -+selection method. -+""" -+ -+# -+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation -+# -+# Permission is hereby granted, free of charge, to any person obtaining -+# a copy of this software and associated documentation files (the -+# "Software"), to deal in the Software without restriction, including -+# without limitation the rights to use, copy, modify, merge, publish, -+# distribute, sublicense, and/or sell copies of the Software, and to -+# permit persons to whom the Software is furnished to do so, subject to -+# the following conditions: -+# -+# The above copyright notice and this permission notice shall be included -+# in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+ -+__revision__ = "" -+ -+import posix -+ -+def generate(env): -+ posix.generate(env) -+ env['ENV']['PATH'] = '.:/boot/home/config/bin:/boot/common/bin:/boot/system/bin:/boot/develop/tools/gnupro/bin' -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = '/boot/develop/lib/x86' -diff -Naur scons-1.0.1/script/scons scons-1.0.1-haiku-1/script/scons ---- scons-1.0.1/script/scons 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons 2008-10-05 13:20:42.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # -diff -Naur scons-1.0.1/script/scons-time scons-1.0.1-haiku-1/script/scons-time ---- scons-1.0.1/script/scons-time 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons-time 2008-10-05 13:20:49.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # scons-time - run SCons timings and collect statistics - # -diff -Naur scons-1.0.1/script/sconsign scons-1.0.1-haiku-1/script/sconsign ---- scons-1.0.1/script/sconsign 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/sconsign 2008-10-05 13:20:59.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # diff --git a/dev-util/scons/patches/scons-2.2.0.patchset b/dev-util/scons/patches/scons-2.2.0.patchset new file mode 100644 index 000000000..1ecca99d2 --- /dev/null +++ b/dev-util/scons/patches/scons-2.2.0.patchset @@ -0,0 +1,97 @@ +From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 17:46:35 +0200 +Subject: Add support for the Haiku platform + + +diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py +index 2cab3c8..373938d 100644 +--- a/engine/SCons/Platform/__init__.py ++++ b/engine/SCons/Platform/__init__.py +@@ -78,6 +78,8 @@ def platform_default(): + return 'aix' + elif sys.platform.find('darwin') != -1: + return 'darwin' ++ elif sys.platform.find('haiku') != -1: ++ return 'haiku' + else: + return 'posix' + elif os.name == 'os2': +diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py +new file mode 100644 +index 0000000..5c802dd +--- /dev/null ++++ b/engine/SCons/Platform/haiku.py +@@ -0,0 +1,69 @@ ++"""SCons.Platform.haiku ++ ++Platform-specific initialization for Haiku systems. ++ ++There normally shouldn't be any need to import this module directly. It ++will usually be imported through the generic SCons.Platform.Platform() ++selection method. ++""" ++ ++# ++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation ++# ++# Permission is hereby granted, free of charge, to any person obtaining ++# a copy of this software and associated documentation files (the ++# "Software"), to deal in the Software without restriction, including ++# without limitation the rights to use, copy, modify, merge, publish, ++# distribute, sublicense, and/or sell copies of the Software, and to ++# permit persons to whom the Software is furnished to do so, subject to ++# the following conditions: ++# ++# The above copyright notice and this permission notice shall be included ++# in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY ++# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE ++# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++ ++__revision__ = "" ++ ++import commands ++import os ++import posix ++ ++def findDir(identifier): ++ return commands.getoutput('finddir %s' % identifier) ++ ++def generate(env): ++ posix.generate(env) ++ ++ # determine, if building for the secondary architecture ++ secondaryArch = os.environ.get('HAIKU_SECONDARY_ARCH') ++ archSubDir = '/' + secondaryArch if secondaryArch else '' ++ ++ # PATH ++ pathDescriptions = [ ++ ('B_USER_NONPACKAGED_BIN_DIRECTORY', None), ++ ('B_USER_CONFIG_DIRECTORY', 'bin'), ++ ('B_COMMON_NONPACKAGED_BIN_DIRECTORY', None), ++ ('B_COMMON_BIN_DIRECTORY', None), ++ ('B_SYSTEM_BIN_DIRECTORY', None) ++ ] ++ ++ paths = [] ++ for pathConstant, subDir in pathDescriptions: ++ path = findDir(pathConstant) ++ if subDir: ++ path += '/' + subDir ++ paths.append(path) ++ ++ if secondaryArch: ++ # prepend the secondary arch subdirectories ++ paths = [path + archSubDir for path in paths] + paths ++ ++ env['ENV']['PATH'] = ':'.join(paths) +-- +1.7.10.2 + diff --git a/dev-util/scons/scons-1.0.1-python2.5.bep b/dev-util/scons/scons-1.0.1-python2.5.bep deleted file mode 100644 index d3ac1ef58..000000000 --- a/dev-util/scons/scons-1.0.1-python2.5.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2008 The SCons Foundation" -SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-1.0.1.tar.gz" -CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python <= 2.5.5" -BUILD { - cd scons-1.0.1 - python2.5 setup.py build -} - -INSTALL { - cd scons-1.0.1 - if [ ! -z ${DESTDIR} ];then - python2.5 setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib - else - python2.5 setup.py install --prefix="/boot/common" --symlink-scons --standard-lib - fi -} diff --git a/dev-util/scons/scons-1.0.1.bep b/dev-util/scons/scons-1.0.1.bep deleted file mode 100644 index e007090ee..000000000 --- a/dev-util/scons/scons-1.0.1.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2008 The SCons Foundation" -SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-1.0.1.tar.gz" -CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.5.4" -BUILD { - cd scons-1.0.1 - python setup.py build -} - -INSTALL { - cd scons-1.0.1 - if [ ! -z ${DESTDIR} ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib - else - python setup.py install --prefix="/boot/common" --symlink-scons --standard-lib - fi -} diff --git a/dev-util/scons/scons-2.0.1.bep b/dev-util/scons/scons-2.0.1.bep deleted file mode 100644 index 6ec4b1a5e..000000000 --- a/dev-util/scons/scons-2.0.1.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2010 The SCons Foundation" -SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-2.0.1.tar.gz" -CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.5.4" -BUILD { - cd scons-2.0.1 - for f in "script/scons script/scons-time script/sconsign"; do - sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f - done - python setup.py build -} - -INSTALL { - if [ ! -z ${DESTDIR} ]; then - options="${options} --root=${DESTDIR}" - fi - options="${options} --prefix=`finddir B_COMMON_DIRECTORY`" - options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`" - options="${options} --symlink-scons" - options="${options} --standard-lib" - cd scons-2.0.1 - python setup.py install $options -} diff --git a/dev-util/scons/scons-2.2.0.bep b/dev-util/scons/scons-2.2.0.bep deleted file mode 100644 index 8ecad51b5..000000000 --- a/dev-util/scons/scons-2.2.0.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2012 The SCons Foundation" -SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" -CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.5.4" -BUILD { - cd scons-2.2.0 - for f in "script/scons script/scons-time script/sconsign"; do - sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f - done - python setup.py build -} - -INSTALL { - if [ ! -z ${DESTDIR} ]; then - options="${options} --root=${DESTDIR}" - fi - options="${options} --prefix=`finddir B_COMMON_DIRECTORY`" - options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`" - options="${options} --symlink-scons" - options="${options} --standard-lib" - cd scons-2.2.0 - python setup.py install $options -} diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe new file mode 100644 index 000000000..000be6c55 --- /dev/null +++ b/dev-util/scons/scons-2.2.0.recipe @@ -0,0 +1,47 @@ +SUMMARY="Open Source software construction tool" +DESCRIPTION="SCons is an Open Source software construction tool—that is, a next-generation build tool. Think of SCons as an improved, cross-platform substitute for the classic Make utility with integrated functionality similar to autoconf/automake and compiler caches such as ccache. In short, SCons is an easier, more reliable and faster way to build software." +HOMEPAGE="http://www.scons.org/" +LICENSE="MIT" +COPYRIGHT="2001-2012 The SCons Foundation" +SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" +CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="scons-2.2.0.patchset" + +PROVIDES=" + scons = $portVersion compat >= 2 + cmd:scons = $portVersion compat >= 2 + cmd:scons_2.2.0 = $portVersion compat >= 2 + cmd:scons_time = $portVersion compat >= 2 + cmd:scons_time_2.2.0 = $portVersion compat >= 2 + cmd:sconsign = $portVersion compat >= 2 + cmd:sconsign_2.2.0 = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + cmd:python + " + +BUILD() +{ + for f in "script/scons script/scons-time script/sconsign"; do + sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f + done + python setup.py build +} + +INSTALL() +{ + options="$options --prefix=$prefix" + options="$options --install-data=$documentationDir" + options="$options --symlink-scons" + options="$options --standard-lib" + python setup.py install $options +} diff --git a/dev-vcs/bzr/bzr-2.2.0.bep b/dev-vcs/bzr/bzr-2.2.0.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2.0.bep rename to dev-vcs/bzr/bzr-2.2.0.recipe index d2019e4ec..876b25b26 100644 --- a/dev-vcs/bzr/bzr-2.2.0.bep +++ b/dev-vcs/bzr/bzr-2.2.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2.0 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2.0 COMMON_DIR=`finddir B_COMMON_DIRECTORY` COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` diff --git a/dev-vcs/bzr/bzr-2.2.1.bep b/dev-vcs/bzr/bzr-2.2.1.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2.1.bep rename to dev-vcs/bzr/bzr-2.2.1.recipe index fd707fc9b..4823f24ec 100644 --- a/dev-vcs/bzr/bzr-2.2.1.bep +++ b/dev-vcs/bzr/bzr-2.2.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.2.2.bep b/dev-vcs/bzr/bzr-2.2.2.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2.2.bep rename to dev-vcs/bzr/bzr-2.2.2.recipe index 2fdd8947d..dc46f3f74 100644 --- a/dev-vcs/bzr/bzr-2.2.2.bep +++ b/dev-vcs/bzr/bzr-2.2.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2.2 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2.2 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.2b4.bep b/dev-vcs/bzr/bzr-2.2b4.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2b4.bep rename to dev-vcs/bzr/bzr-2.2b4.recipe index d58e19065..aee57c6ba 100644 --- a/dev-vcs/bzr/bzr-2.2b4.bep +++ b/dev-vcs/bzr/bzr-2.2b4.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2b4 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2b4 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.5.1.bep b/dev-vcs/bzr/bzr-2.5.1.recipe similarity index 62% rename from dev-vcs/bzr/bzr-2.5.1.bep rename to dev-vcs/bzr/bzr-2.5.1.recipe index c13bb217c..f527f3a01 100644 --- a/dev-vcs/bzr/bzr-2.5.1.bep +++ b/dev-vcs/bzr/bzr-2.5.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.5.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,18 +16,19 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.5.1 if [ -n "$(setgcc | grep '2')" ]; then - python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + python setup.py build_ext --allow-python-fallback install --prefix=$COMMON_DIR --root=${DESTDIR} else - python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + python setup.py install --prefix=$COMMON_DIR --root=${DESTDIR} fi ## Now put the man file(s) in the correct directory - mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 - mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/ + mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1 + mv ${DESTDIR}/$COMMON_DIR/man/man1/bzr* ${DESTDIR}/$COMMON_DOCS/man/man1/ if [ -e "${DESTDIR}" ]; then - rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man + rm -rf ${DESTDIR}/$COMMON_DIR/man fi } diff --git a/dev-vcs/bzr/bzr-2.6b1.bep b/dev-vcs/bzr/bzr-2.6b1.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.6b1.bep rename to dev-vcs/bzr/bzr-2.6b1.recipe index d7c6b572a..ea1c17639 100644 --- a/dev-vcs/bzr/bzr-2.6b1.bep +++ b/dev-vcs/bzr/bzr-2.6b1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.6b1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.6b1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/cvs/cvs-1.12.13.1.bep b/dev-vcs/cvs/cvs-1.12.13.1.bep deleted file mode 100644 index e510658db..000000000 --- a/dev-vcs/cvs/cvs-1.12.13.1.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="CVS is a version control system" -HOMEPAGE="http://www.nongnu.org/cvs/" -SRC_URI="http://ports-space.haiku-files.org/dev-vcs/sources/cvs-1.12.13.1.tar.bz2" -CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cvs-1.12.13.1 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-rootcommit \ - EDITOR=nano - make -} - -INSTALL { - cd cvs-1.12.13.1 - make install -} -LICENSE="GNU GPL v1 - GNU LGPL v2" -COPYRIGHT="1986-2005 Free Software Foundation, Inc." diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe new file mode 100644 index 000000000..90733f849 --- /dev/null +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -0,0 +1,64 @@ +SUMMARY="Concurrent Versions System" +DESCRIPTION="CVS is a version control system, an important component of Source Configuration Management (SCM). Using it, you can record the history of sources files, and documents. It fills a similar role to the free software RCS, PRCS, and Aegis packages. + +CVS is a production quality system in wide use around the world, including many free software projects. + +While CVS stores individual file history in the same format as RCS, it offers the following significant advantages over RCS: + + * It can run scripts which you can supply to log CVS operations or enforce site-specific polices. + * Client/server CVS enables developers scattered by geography or slow modems to function as a single team. The version history is stored on a single central server and the client machines have a copy of all the files that the developers are working on. Therefore, the network between the client and the server must be up to perform CVS operations (such as checkins or updates) but need not be up to edit or manipulate the current versions of the files. Clients can perform all the same operations which are available locally. + * In cases where several developers or teams want to each maintain their own version of the files, because of geography and/or policy, CVS's vendor branches can import a version from another team (even if they don't use CVS), and then CVS can merge the changes from the vendor branch with the latest files if that is what is desired. + * Unreserved checkouts, allowing more than one developer to work on the same files at the same time. + * CVS provides a flexible modules database that provides a symbolic mapping of names to components of a larger software distribution. It applies names to collections of directories and files. A single command can manipulate the entire collection. + * CVS servers run on most unix variants, and clients for Windows NT/95, OS/2 and VMS are also available. CVS will also operate in what is sometimes called server mode against local repositories on Windows 95/NT." +HOMEPAGE="http://www.nongnu.org/cvs/" +COPYRIGHT="1986-2005 Free Software Foundation, Inc." +LICENSE="GNU GPL v1 + GNU LGPL v2" +SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" +CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="cvs-1.12.13.1.patch" + +PROVIDES=" + cvs = $portVersion compat >= 1.12 + cmd:cvs = $portVersion compat >= 1.12 + cmd:cvsbug = $portVersion compat >= 1.12 + cmd:rcs2log = $portVersion compat >= 1.12 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:nano + cmd:perl + lib:libz + " +BUILD_REQUIRES=" + cmd:perl + devel:libz >= 1.1.4 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:nano + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + PERL=$portPackageLinksDir/cmd~perl/bin/perl \ + runConfigure ./configure --enable-rootcommit \ + --with-external-zlib + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-vcs/cvs/cvs-1.12.13.bep b/dev-vcs/cvs/cvs-1.12.13.bep deleted file mode 100644 index 2db43f73e..000000000 --- a/dev-vcs/cvs/cvs-1.12.13.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="CVS is a version control system" -HOMEPAGE="http://www.nongnu.org/cvs/" -SRC_URI="http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz" -CHECKSUM_MD5="7a71a2e7a64973ecf255965956a1d338" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd cvs-1.12.13 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-rootcommit \ - EDITOR=nano - make -} - -INSTALL { - cd cvs-1.12.13 - make install -} -LICENSE="GNU GPL v1 - GNU LGPL v2" -COPYRIGHT="1986-2005 Free Software Foundation, Inc." diff --git a/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff b/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff deleted file mode 100644 index d77500487..000000000 --- a/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff +++ /dev/null @@ -1,58 +0,0 @@ -diff -urN cvs-1.12.13/configure cvs-1.12.13-haiku/configure ---- cvs-1.12.13/configure 2005-10-03 13:36:42.000000000 +0000 -+++ cvs-1.12.13-haiku/configure 2008-09-30 18:38:24.000000000 +0000 -@@ -37138,7 +37138,7 @@ - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_cv_search_connect" = no; then -- for ac_lib in xnet socket inet; do -+ for ac_lib in xnet socket network inet; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -diff -urN cvs-1.12.13/configure.in cvs-1.12.13-haiku/configure.in ---- cvs-1.12.13/configure.in 2005-10-03 13:34:45.000000000 +0000 -+++ cvs-1.12.13-haiku/configure.in 2008-09-30 18:38:24.000000000 +0000 -@@ -515,7 +515,7 @@ - - # Try to find connect and gethostbyname. - AC_CHECK_LIB(nsl, main) --AC_SEARCH_LIBS(connect, xnet socket inet, -+AC_SEARCH_LIBS(connect, xnet socket network inet, - AC_DEFINE(HAVE_CONNECT, 1, - [Define if you have the connect function.])) - dnl no need to search nsl for gethostbyname here since we should have -diff -urN cvs-1.12.13/lib/getaddrinfo.h cvs-1.12.13-haiku/lib/getaddrinfo.h ---- cvs-1.12.13/lib/getaddrinfo.h 2005-09-08 15:55:53.000000000 +0000 -+++ cvs-1.12.13-haiku/lib/getaddrinfo.h 2008-09-30 19:33:49.000000000 +0000 -@@ -26,7 +26,7 @@ - # include - - # if !HAVE_GETADDRINFO -- -+#ifndef __HAIKU__ - /* Structure to contain information about address of a service provider. */ - struct addrinfo - { -@@ -61,6 +61,8 @@ - # define EAI_ADDRFAMILY -9 /* Address family for NAME not supported. */ - # define EAI_MEMORY -10 /* Memory allocation failure. */ - # define EAI_SYSTEM -11 /* System error returned in `errno'. */ -+#endif -+ - # define EAI_OVERFLOW -12 /* Argument buffer overflow. */ - # ifdef __USE_GNU - # define EAI_INPROGRESS -100 /* Processing request in progress. */ -diff -urN cvs-1.12.13/lib/getpass.c cvs-1.12.13-haiku/lib/getpass.c ---- cvs-1.12.13/lib/getpass.c 2005-09-19 21:12:21.000000000 +0000 -+++ cvs-1.12.13-haiku/lib/getpass.c 2008-09-30 19:53:05.000000000 +0000 -@@ -104,8 +104,9 @@ - else - { - /* We do the locking ourselves. */ -+#ifdef __HAIKU__ - __fsetlocking (tty, FSETLOCKING_BYCALLER); -- -+#endif - out = in = tty; - } diff --git a/dev-vcs/cvs/patches/cvs-1.12.13.patch b/dev-vcs/cvs/patches/cvs-1.12.13.patch deleted file mode 100644 index a128db9c8..000000000 --- a/dev-vcs/cvs/patches/cvs-1.12.13.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up cvs-1.12.13/configure.in.orig cvs-1.12.13/configure.in ---- cvs-1.12.13/configure.in.orig 2010-04-28 23:59:18.202637312 -0600 -+++ cvs-1.12.13/configure.in 2010-04-29 00:01:51.938999808 -0600 -@@ -515,12 +515,12 @@ CVS_FUNC_PRINTF_PTR - - # Try to find connect and gethostbyname. - AC_CHECK_LIB(nsl, main) --AC_SEARCH_LIBS(connect, xnet socket inet, -+AC_SEARCH_LIBS(connect, xnet socket inet network, - AC_DEFINE(HAVE_CONNECT, 1, - [Define if you have the connect function.])) - dnl no need to search nsl for gethostbyname here since we should have - dnl just added libnsl above if we found it. --AC_SEARCH_LIBS(gethostbyname, netinet) -+AC_SEARCH_LIBS(gethostbyname, netinet network) - - AC_SUBST(cvs_client_objects) - -diff -up cvs-1.12.13/lib/getpass.c.orig cvs-1.12.13/lib/getpass.c ---- cvs-1.12.13/lib/getpass.c.orig 2005-09-19 15:12:21.001835008 -0600 -+++ cvs-1.12.13/lib/getpass.c 2010-04-28 23:55:13.523239424 -0600 -@@ -104,7 +104,7 @@ getpass (const char *prompt) - else - { - /* We do the locking ourselves. */ -- __fsetlocking (tty, FSETLOCKING_BYCALLER); -+// __fsetlocking (tty, FSETLOCKING_BYCALLER); - - out = in = tty; - } -diff -up cvs-1.12.13/lib/stdbool_.h.orig cvs-1.12.13/lib/stdbool_.h ---- cvs-1.12.13/lib/stdbool_.h.orig 2005-05-23 11:44:32.015204352 -0600 -+++ cvs-1.12.13/lib/stdbool_.h 2010-04-28 23:55:13.506724352 -0600 -@@ -55,7 +55,7 @@ - - /* BeOS already #defines false 0, true 1. We use the same - definitions below, but temporarily we have to #undef them. */ --#ifdef __BEOS__ -+#if defined(__BEOS__) && !defined(__HAIKU__) - # include /* defines bool but not _Bool */ - # undef false - # undef true -@@ -70,7 +70,7 @@ - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ --#if !(defined __cplusplus || defined __BEOS__) -+#if !(defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)) - # if !@HAVE__BOOL@ - # if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1) - /* Avoid stupid "warning: _Bool is a keyword in ISO C99". */ -diff -up cvs-1.12.13/m4/getaddrinfo.m4.orig cvs-1.12.13/m4/getaddrinfo.m4 ---- cvs-1.12.13/m4/getaddrinfo.m4.orig 2010-04-29 00:00:46.542638080 -0600 -+++ cvs-1.12.13/m4/getaddrinfo.m4 2010-04-29 00:00:53.830996480 -0600 -@@ -6,7 +6,7 @@ dnl with or without modifications, as lo - - AC_DEFUN([gl_GETADDRINFO], - [ -- AC_SEARCH_LIBS(getaddrinfo, nsl socket) -+ AC_SEARCH_LIBS(getaddrinfo, nsl socket network) - AC_REPLACE_FUNCS(getaddrinfo gai_strerror) - gl_PREREQ_GETADDRINFO - ]) -diff -up cvs-1.12.13/src/buffer.c.orig cvs-1.12.13/src/buffer.c ---- cvs-1.12.13/src/buffer.c.orig 2005-10-02 09:17:20.017563648 -0600 -+++ cvs-1.12.13/src/buffer.c 2010-04-28 23:55:13.536084480 -0600 -@@ -2019,7 +2019,7 @@ fd_buffer_block (void *closure, bool blo - && sb.st_uid == devnull.st_uid - && sb.st_gid == devnull.st_gid - && sb.st_size == devnull.st_size -- && sb.st_blocks == devnull.st_blocks -+// && sb.st_blocks == devnull.st_blocks - && sb.st_blksize == devnull.st_blksize); - if (isdevnull) - errno = 0; diff --git a/dev-vcs/fossil/fossil-1.22-fossil.bep b/dev-vcs/fossil/fossil-1.22-fossil.bep deleted file mode 100644 index 5096cb997..000000000 --- a/dev-vcs/fossil/fossil-1.22-fossil.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Simple, high-reliability, distributed software configuration management" -HOMEPAGE="http://www.fossil-scm.org/" -SRC_URI="fossil+http://www.fossil-scm.org/" -#CHECKSUM_MD5="" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - make install -} - -TEST { - make test -} - -LICENSE="BSD (2-clause)" -COPYRIGHT="2007 D. Richard Hipp" diff --git a/dev-vcs/fossil/fossil-1.22.bep b/dev-vcs/fossil/fossil-1.22.recipe similarity index 94% rename from dev-vcs/fossil/fossil-1.22.bep rename to dev-vcs/fossil/fossil-1.22.recipe index 2faffcee5..f06bf257a 100644 --- a/dev-vcs/fossil/fossil-1.22.bep +++ b/dev-vcs/fossil/fossil-1.22.recipe @@ -6,18 +6,21 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd fossil-src-20120317175325 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd fossil-src-20120317175325 make install } -TEST { +TEST() +{ cd fossil-src-20120317175325 make test } diff --git a/dev-vcs/git/git-1.7.10.2.bep b/dev-vcs/git/git-1.7.10.2.bep deleted file mode 100644 index 16648b18e..000000000 --- a/dev-vcs/git/git-1.7.10.2.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz" -CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1 - dev-vcs/gitdoc == 1.7.10" -BUILD { - cd git-1.7.10.2 - make strip -} - -INSTALL { - cd git-1.7.10.2 - make install -} - -TEST { - cd git-1.7.10.2 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe new file mode 100644 index 000000000..59acbc1d9 --- /dev/null +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -0,0 +1,189 @@ +SUMMARY="Fast, scalable, distributed revision control system" +DESCRIPTION=" + Git is a free and open source distributed version control system designed + to handle everything from small to very large projects with speed and + efficiency. + + Git is easy to learn and has a tiny footprint with lightning fast + performance. It outclasses SCM tools like Subversion, CVS, Perforce, + and ClearCase with features like cheap local branching, convenient + staging areas, and multiple workflows. + " +HOMEPAGE="http://git-scm.com/" +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" + +SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz" +CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce" +SOURCE_DIR="$portVersionedName" +PATCHES="git-1.7.10.2.patch" + +SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz" +CHECKSUM_MD5_2="79bae5456db8366803d28db867892d74" + +SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz" +CHECKSUM_MD5_3="9c401a36aee40d68f5ca3513818e8f29" + +REVISION="2" + +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + git = $portVersion compat >= 1.7 + cmd:git = $portVersion compat >= 1.7 + cmd:git_receive_pack = $portVersion compat >= 1.7 + cmd:git_shell = $portVersion compat >= 1.7 + cmd:git_upload_archive = $portVersion compat >= 1.7 + cmd:git_upload_pack = $portVersion compat >= 1.7 + " +PROVIDES_arch=" + git_arch = $portVersion compat >= 1.7 + cmd:git_archimport = $portVersion compat >= 1.7 + " +PROVIDES_cvs=" + git_cvs = $portVersion compat >= 1.7 + cmd:git_cvsserver = $portVersion compat >= 1.7 + " +PROVIDES_daemon=" + git_daemon = $portVersion compat >= 1.7 + cmd:git_daemon = $portVersion compat >= 1.7 + " +PROVIDES_email=" + git_email = $portVersion compat >= 1.7 + cmd:git_send_email = $portVersion compat >= 1.7 + " +PROVIDES_source=" + git_source = $portVersion compat >= 1.7 + " +PROVIDES_svn=" + git_svn = $portVersion compat >= 1.7 + cmd:git_svn = $portVersion compat >= 1.7 + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:man + cmd:nano + cmd:perl + cmd:python + lib:libcurl + lib:libexpat + lib:libssl + lib:libz + " +REQUIRES_arch=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_cvs=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_daemon=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_email=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_svn=" + haiku >= $haikuVersion + git == $portVersion base + " + +BUILD_REQUIRES=" + cmd:man + cmd:nano + cmd:perl + cmd:python + devel:libcurl + devel:libexpat + devel:libssl + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + cmd:tar + " + +BUILD() +{ + make +} + +INSTALL() +{ + make strip + make install + + # replace copies of git binaries with symlinks + cd $prefix/bin + for program in git*; do + ln -sfn "../lib/git-core/$program" "$program" + done + + # copy manpages + mkdir -p $manDir + cp -rd $sourceDir2/* $manDir/ + + # copy html documentation + htmlDir=$docDir/html + mkdir -p $htmlDir + cp -rd $sourceDir3/*.html $htmlDir/ + rm $htmlDir/git-gui.html + + # copy asciidoc documentation for which there isn't any corresponding html + asciidocDir=$docDir/asciidoc + mkdir -p $asciidocDir + for f in $sourceDir3/*.txt; do + html=$sourceDir3/$(basename $f .txt).html + if ! [ -e $html ]; then + cp -d $f $asciidocDir/ + fi + done + + packageEntries arch \ + documentation/packages/git/html/git-archimport.html \ + documentation/man/man1/git-archimport.1 \ + lib/git-core/git-archimport + + packageEntries cvs \ + bin/git-cvsserver \ + documentation/packages/git/html/git-cvsexportcommit.html \ + documentation/packages/git/html/git-cvsimport.html \ + documentation/packages/git/html/git-cvsserver.html \ + documentation/man/man1/git-cvsexportcommit.1 \ + documentation/man/man1/git-cvsimport.1 \ + documentation/man/man1/git-cvsserver.1 \ + documentation/man/man7/gitcvs-migration.7 \ + lib/git-core/git-cvsexportcommit \ + lib/git-core/git-cvsimport \ + lib/git-core/git-cvsserver + + packageEntries daemon \ + documentation/packages/git/html/git-credential-cache--daemon.html \ + documentation/packages/git/html/git-credential-cache.html \ + documentation/packages/git/html/git-daemon.html \ + documentation/man/man1/git-credential-cache--daemon.1 \ + documentation/man/man1/git-credential-cache.1 \ + documentation/man/man1/git-daemon.1 \ + lib/git-core/git-credential-cache--daemon \ + lib/git-core/git-credential-cache \ + lib/git-core/git-daemon + + packageEntries email \ + documentation/packages/git/html/git-send-email.html \ + documentation/man/man1/git-send-email.1 \ + lib/git-core/git-send-email + + packageEntries svn \ + documentation/packages/git/html/git-svn.html \ + documentation/man/man1/git-svn.1 \ + lib/git-core/git-svn +} diff --git a/dev-vcs/git/git-1.7.11.3.bep b/dev-vcs/git/git-1.7.11.3.recipe similarity index 94% rename from dev-vcs/git/git-1.7.11.3.bep rename to dev-vcs/git/git-1.7.11.3.recipe index b7eb17c0a..e79806686 100644 --- a/dev-vcs/git/git-1.7.11.3.bep +++ b/dev-vcs/git/git-1.7.11.3.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.7.11.3" -BUILD { +BUILD() +{ cd git-1.7.11.3 make strip } -INSTALL { +INSTALL() +{ cd git-1.7.11.3 make install } -TEST { +TEST() +{ cd git-1.7.11.3 make check } diff --git a/dev-vcs/git/git-1.8.0.bep b/dev-vcs/git/git-1.8.0.recipe similarity index 93% rename from dev-vcs/git/git-1.8.0.bep rename to dev-vcs/git/git-1.8.0.recipe index 7f984a813..b96e28c7b 100644 --- a/dev-vcs/git/git-1.8.0.bep +++ b/dev-vcs/git/git-1.8.0.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.8.0" -BUILD { +BUILD() +{ cd git-1.8.0 make strip } -INSTALL { +INSTALL() +{ cd git-1.8.0 make install } -TEST { +TEST() +{ cd git-1.8.0 make check } diff --git a/dev-vcs/git/git-1.8.1.3.bep b/dev-vcs/git/git-1.8.1.3.recipe similarity index 94% rename from dev-vcs/git/git-1.8.1.3.bep rename to dev-vcs/git/git-1.8.1.3.recipe index ba37b6fe3..094ba2ef8 100644 --- a/dev-vcs/git/git-1.8.1.3.bep +++ b/dev-vcs/git/git-1.8.1.3.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.8.0" -BUILD { +BUILD() +{ cd git-1.8.1.3 make strip } -INSTALL { +INSTALL() +{ cd git-1.8.1.3 make install } -TEST { +TEST() +{ cd git-1.8.1.3 make check } diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe new file mode 100644 index 000000000..29cdc9ed1 --- /dev/null +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -0,0 +1,246 @@ +SUMMARY="Fast, scalable, distributed revision control system" +DESCRIPTION=" + Git is a free and open source distributed version control system designed + to handle everything from small to very large projects with speed and + efficiency. + + Git is easy to learn and has a tiny footprint with lightning fast + performance. It outclasses SCM tools like Subversion, CVS, Perforce, + and ClearCase with features like cheap local branching, convenient + staging areas, and multiple workflows. + " +HOMEPAGE="http://git-scm.com/" +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" + +SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz" +CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e" +SOURCE_DIR="$portVersionedName" +PATCHES="git-1.8.3.4.patchset" + +SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz" +CHECKSUM_MD5_2="86fd812754d25201fd72c7476045dfec" + +SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz" +CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a" + +REVISION="2" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + git = $portVersion compat >= 1.8 + cmd:git = $portVersion compat >= 1.8 + cmd:git_receive_pack = $portVersion compat >= 1.8 + cmd:git_shell = $portVersion compat >= 1.8 + cmd:git_upload_archive = $portVersion compat >= 1.8 + cmd:git_upload_pack = $portVersion compat >= 1.8 + " +PROVIDES_arch=" + git_arch = $portVersion compat >= 1.8 + cmd:git_archimport = $portVersion compat >= 1.8 + " +PROVIDES_cvs=" + git_cvs = $portVersion compat >= 1.8 + cmd:git_cvsserver = $portVersion compat >= 1.8 + " +PROVIDES_daemon=" + git_daemon = $portVersion compat >= 1.8 + cmd:git_daemon = $portVersion compat >= 1.8 + " +PROVIDES_email=" + git_email = $portVersion compat >= 1.8 + cmd:git_send_email = $portVersion compat >= 1.8 + " +PROVIDES_remote_helpers=" + git_remote_helpers = $portVersion compat >= 1.8 + " +PROVIDES_source=" + git_source = $portVersion compat >= 1.8 + " +PROVIDES_svn=" + git_svn = $portVersion compat >= 1.8 + cmd:git_svn = $portVersion compat >= 1.8 + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:man + cmd:nano + cmd:perl >= 5 + cmd:python + lib:libcurl + lib:libexpat + lib:libiconv + lib:libintl + lib:libpcre + lib:libssl + lib:libz + vendor_perl + " +REQUIRES_arch=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_cvs=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_daemon=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_email=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_remote_helpers=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_svn=" + haiku >= $haikuVersion + git == $portVersion base + " + +BUILD_REQUIRES=" + cmd:man + cmd:nano + cmd:perl + cmd:python + devel:libcurl + devel:libexpat + devel:libiconv + devel:libintl + devel:libpcre + devel:libssl + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:gettext + cmd:ld + cmd:make + cmd:msgfmt + cmd:sed + cmd:tar + " + +USER_SETTINGS_FILES=" + settings/git directory + " + +makeGit() +{ + make prefix=$prefix \ + bindir_relative=$relativeBinDir \ + mandir=$manDir \ + infodir=$infoDir \ + gitexecdir=$libDir/git-core \ + sharedir=$dataDir \ + template_dir=$dataDir/git-core/templates \ + htmldir=$docDir \ + sysconfdir=$sysconfDir \ + PTHREAD_LIBS= \ + USE_LIBPCRE=YesPlease \ + NO_D_TYPE_IN_DIRENT=YesPlease \ + NO_MEMMEM=YesPlease \ + NO_MKSTEMPS=YesPlease \ + NEEDS_LIBICONV=YesPlease \ + NO_R_TO_GCC_LINKER=YesPlease \ + GNU_ROFF=YesPlease \ + PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \ + PYTHON_PATH=$portPackageLinksDir/cmd~python/bin/python \ + NO_TCLTK=YesPlease \ + OBJECT_CREATION_USES_RENAMES=YesPlease \ + NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \ + NO_INSTALL_HARDLINKS=YesPlease \ + HAVE_DEV_TTY=YesPlease \ + DEFAULT_EDITOR=nano \ + BASIC_LDFLAGS="-lnetwork -lbsd" \ + "$@" +} + + +BUILD() +{ + makeGit $jobArgs + makeGit strip +} + +INSTALL() +{ + makeGit install + + # replace copies of git binaries with symlinks + cd $binDir + for program in git*; do + ln -sfn "../lib/git-core/$program" "$program" + done + + # copy manpages + mkdir -p $manDir + cp -rd $sourceDir2/* $manDir/ + + # copy html documentation + htmlDir=$docDir/html + mkdir -p $htmlDir + cp -rd $sourceDir3/*.html $htmlDir/ + rm $htmlDir/git-gui.html + + # copy asciidoc documentation for which there isn't any corresponding html + asciidocDir=$docDir/asciidoc + mkdir -p $asciidocDir + for f in $sourceDir3/*.txt; do + html=$sourceDir3/$(basename $f .txt).html + if ! [ -e $html ]; then + cp -d $f $asciidocDir/ + fi + done + + packageEntries arch \ + documentation/packages/git/html/git-archimport.html \ + documentation/man/man1/git-archimport.1 \ + lib/git-core/git-archimport + + packageEntries cvs \ + bin/git-cvsserver \ + documentation/packages/git/html/git-cvsexportcommit.html \ + documentation/packages/git/html/git-cvsimport.html \ + documentation/packages/git/html/git-cvsserver.html \ + documentation/man/man1/git-cvsexportcommit.1 \ + documentation/man/man1/git-cvsimport.1 \ + documentation/man/man1/git-cvsserver.1 \ + documentation/man/man7/gitcvs-migration.7 \ + lib/git-core/git-cvsexportcommit \ + lib/git-core/git-cvsimport \ + lib/git-core/git-cvsserver + + packageEntries daemon \ + documentation/packages/git/html/git-credential-cache--daemon.html \ + documentation/packages/git/html/git-credential-cache.html \ + documentation/packages/git/html/git-daemon.html \ + documentation/man/man1/git-credential-cache--daemon.1 \ + documentation/man/man1/git-credential-cache.1 \ + documentation/man/man1/git-daemon.1 \ + lib/git-core/git-credential-cache--daemon \ + lib/git-core/git-credential-cache \ + lib/git-core/git-daemon + + packageEntries email \ + documentation/packages/git/html/git-send-email.html \ + documentation/man/man1/git-send-email.1 \ + lib/git-core/git-send-email + + pythonDir=python$(python -c 'import sys; print("%i.%i" % sys.version_info[:2])') + packageEntries remote_helpers \ + lib/$pythonDir + + packageEntries svn \ + documentation/packages/git/html/git-svn.html \ + documentation/man/man1/git-svn.1 \ + lib/git-core/git-svn +} diff --git a/dev-vcs/git/patches/git-1.7.10.2.patch b/dev-vcs/git/patches/git-1.7.10.2.patch index 36c719f64..29dfa45df 100644 --- a/dev-vcs/git/patches/git-1.7.10.2.patch +++ b/dev-vcs/git/patches/git-1.7.10.2.patch @@ -1,34 +1,30 @@ diff -up git-1.7.10.2/Makefile.orig git-1.7.10.2/Makefile --- git-1.7.10.2/Makefile.orig 2012-05-11 14:25:45.066322432 -0600 +++ git-1.7.10.2/Makefile 2012-05-19 12:53:42.392429568 -0600 -@@ -1242,6 +1242,31 @@ ifeq ($(uname_S),Minix) +@@ -1242,6 +1242,27 @@ ifeq ($(uname_S),Minix) NO_CURL = NO_EXPAT = endif +ifeq ($(uname_S),Haiku) ++ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease ++ NO_GETTEXT = YesPlease ++ NO_ICONV = YesPlease + NO_LIBGEN_H = YesPlease + NO_MEMMEM = YesPlease + NO_MKSTEMPS = YesPlease -+ NEEDS_LIBICONV = YesPlease -+ PERL_PATH = perl -+ PYTHON_PATH = python -+# TCL_PATH = tclsh -+ mandir = /boot/common/documentation/man -+ infodir = /boot/common/documentation/info -+ htmldir = /boot/common/documentation/doc/git-1.7.10.2 -+ gitexecdir = /boot/common/bin/git-core -+ gitwebdir = /boot/common/data/gitweb -+ template_dir = /boot/common/data/git-core/templates + NO_TCLTK = YesPlease -+ DEFAULT_EDITOR = nano -+ CURL_DIR = /boot/common -+ EXPAT_DIR = /boot/common -+ BASIC_CFLAGS += -I/boot/common/include -+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib + PTHREAD_LIBS = -+ prefix = /boot/common -+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease -+ NO_GETTEXT = YesPlease ++ BASIC_LDFLAGS += -lnetwork -lbsd ++ DEFAULT_EDITOR = nano ++ PERL_PATH = $(portPackageLinksDir)/perl/bin/perl ++ PYTHON_PATH = $(portPackageLinksDir)/python/bin/python ++ prefix = $(portPackageLinksDir)/.self ++ mandir = $(manDir) ++ infodir = $(infoDir) ++ htmldir = $(docDir) ++ gitexecdir = $(libDir)/git-core ++ gitwebdir = $(dataDir)/gitweb ++ template_dir = $(dataDir)/git-core/templates +endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; diff --git a/dev-vcs/git/patches/git-1.8.3.4.patchset b/dev-vcs/git/patches/git-1.8.3.4.patchset new file mode 100644 index 000000000..d7aed2420 --- /dev/null +++ b/dev-vcs/git/patches/git-1.8.3.4.patchset @@ -0,0 +1,113 @@ +From 54aaa3773f83a1706140ef842e537b5dc5f37568 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 13 Aug 2013 08:07:25 +0200 +Subject: git-web--browse.sh: use "open" on Haiku + + +diff --git a/git-web--browse.sh b/git-web--browse.sh +index 1d72ec7..e3f254c 100755 +--- a/git-web--browse.sh ++++ b/git-web--browse.sh +@@ -132,6 +132,10 @@ if test -z "$browser" ; then + if test -x /usr/bin/cygstart; then + browser_candidates="cygstart $browser_candidates" + fi ++ # /boot/system/haiku_loader indicates Haiku ++ if test -f /boot/system/haiku_loader; then ++ browser_candidates="open $browser_candidates" ++ fi + + for i in $browser_candidates; do + init_browser_path $i +-- +1.8.3.4 + + +From e42686b933c0999c3c83cac79ceff073ce2bbc32 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 13 Aug 2013 21:03:59 +0200 +Subject: On Haiku use the user settings directory instead of HOME + + +diff --git a/path.c b/path.c +index 04ff148..8668534 100644 +--- a/path.c ++++ b/path.c +@@ -5,6 +5,11 @@ + #include "strbuf.h" + #include "string-list.h" + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + #ifndef get_st_mode_bits + /* + * The replacement lstat(2) we use on Cygwin is incomplete and +@@ -139,6 +144,19 @@ char *git_path(const char *fmt, ...) + + void home_config_paths(char **global, char **xdg, char *file) + { ++#ifdef __HAIKU__ ++ char settingsPath[B_PATH_NAME_LENGTH]; ++ ++ *xdg = NULL; ++ ++ if (global) { ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath, ++ sizeof(settingsPath)) == B_OK) { ++ *global = mkpathdup("%s/git/%s", settingsPath, file); ++ } else ++ *global = NULL; ++ } ++#else + char *xdg_home = getenv("XDG_CONFIG_HOME"); + char *home = getenv("HOME"); + char *to_free = NULL; +@@ -161,6 +179,7 @@ void home_config_paths(char **global, char **xdg, char *file) + *xdg = mkpathdup("%s/git/%s", xdg_home, file); + + free(to_free); ++#endif + } + + char *git_path_submodule(const char *path, const char *fmt, ...) +-- +1.8.3.4 + + +From 80ed8e810eaebbecf10a20bac95c1e43fc14d2d5 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 15 Oct 2013 21:34:09 +0200 +Subject: Ensure config-directory exists before using it. + + +diff --git a/config.c b/config.c +index 7a85ebd..10be1af 100644 +--- a/config.c ++++ b/config.c +@@ -1343,6 +1343,7 @@ int git_config_set_multivar_in_file(const char *config_filename, + int ret; + struct lock_file *lock = NULL; + char *filename_buf = NULL; ++ char *config_dir = NULL; + + /* parse-key returns negative; flip the sign to feed exit(3) */ + ret = 0 - git_config_parse_key(key, &store.key, &store.baselen); +@@ -1354,6 +1355,12 @@ int git_config_set_multivar_in_file(const char *config_filename, + if (!config_filename) + config_filename = filename_buf = git_pathdup("config"); + ++ config_dir = xstrdup(config_filename); ++ * find_last_dir_sep(config_dir) = '\0'; ++ if (access(config_dir, F_OK) != 0) ++ mkdir(config_dir, 0755); ++ free(config_dir); ++ + /* + * The lock serves a purpose in addition to locking: the new + * contents of .git/config will be written into it. +-- +1.8.3.4 + diff --git a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep b/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.7.10.2.bep rename to dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe index 0eff3fdf2..a0fdaa334 100644 --- a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep +++ b/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep b/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.7.11.3.bep rename to dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe index 2299ff1a8..83b98f209 100644 --- a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep +++ b/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.7.11.3.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/gitdoc/gitdoc-1.8.0.bep b/dev-vcs/gitdoc/gitdoc-1.8.0.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.8.0.bep rename to dev-vcs/gitdoc/gitdoc-1.8.0.recipe index 01bf49658..de6ae1bfc 100644 --- a/dev-vcs/gitdoc/gitdoc-1.8.0.bep +++ b/dev-vcs/gitdoc/gitdoc-1.8.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.8.0.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep b/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.8.1.3.bep rename to dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe index 743a2b073..545cb6c0b 100644 --- a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep +++ b/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.8.1.3.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.bep b/dev-vcs/mercurial/mercurial-2.2.2.bep deleted file mode 100644 index 7afde93e2..000000000 --- a/dev-vcs/mercurial/mercurial-2.2.2.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" -CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.3" -BUILD { - cd mercurial-2.2.2 - python setup.py build --force -} - -INSTALL { - cd mercurial-2.2.2 - if [ -n "${DESTDIR}" ];then - python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force - else - python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force - fi -} - -TEST { - cd mercurial-2.2.2/tests - shopt -s extglob - sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) - python run-tests.py -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Matt Mackall et al." diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe new file mode 100644 index 000000000..8439a5fa0 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -0,0 +1,58 @@ +SUMMARY="Free, distributed source control management tool" +DESCRIPTION="Mercurial is a free, distributed source control management tool." +HOMEPAGE="http://mercurial.selenic.com/" +COPYRIGHT="2005-2012 Matt Mackall et al." +LICENSE="GNU GPL v2" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" +CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="mercurial-2.2.2.patch" + +PROVIDES=" + mercurial = $portVersion compat >= 2 + cmd:hg = $portVersion compat >= 2 + " +REQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + cmd:nano + lib:libintl + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:gettext + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build --force +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix="$prefix" \ + --install-headers="$includedir" \ + --force +} + +shopt -s extglob +TEST() +{ + cd tests + sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) + python run-tests.py +} diff --git a/dev-vcs/mercurial/mercurial-2.2.3.bep b/dev-vcs/mercurial/mercurial-2.2.3.recipe similarity index 94% rename from dev-vcs/mercurial/mercurial-2.2.3.bep rename to dev-vcs/mercurial/mercurial-2.2.3.recipe index 9ea952ad0..c7d8c2dab 100644 --- a/dev-vcs/mercurial/mercurial-2.2.3.bep +++ b/dev-vcs/mercurial/mercurial-2.2.3.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="f4c70af3892d964b83b2718bde44c2f8" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.3" -BUILD { +BUILD() +{ cd mercurial-2.2.3 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.2.3 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,9 +21,10 @@ INSTALL { fi } -TEST { +shopt -s extglob +TEST() +{ cd mercurial-2.2.3/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/mercurial/mercurial-2.3.bep b/dev-vcs/mercurial/mercurial-2.3.recipe similarity index 94% rename from dev-vcs/mercurial/mercurial-2.3.bep rename to dev-vcs/mercurial/mercurial-2.3.recipe index 3889beedc..d6e062095 100644 --- a/dev-vcs/mercurial/mercurial-2.3.bep +++ b/dev-vcs/mercurial/mercurial-2.3.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="8d9f776e432239571dfab2b5f88b3675" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.3" -BUILD { +BUILD() +{ cd mercurial-2.3 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.3 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,9 +21,10 @@ INSTALL { fi } -TEST { +shopt -s extglob +TEST() +{ cd mercurial-2.3/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/mercurial/mercurial-2.4.bep b/dev-vcs/mercurial/mercurial-2.4.recipe similarity index 94% rename from dev-vcs/mercurial/mercurial-2.4.bep rename to dev-vcs/mercurial/mercurial-2.4.recipe index 70186e0c6..b3a628780 100644 --- a/dev-vcs/mercurial/mercurial-2.4.bep +++ b/dev-vcs/mercurial/mercurial-2.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="c1fc9bec6951dd3c913092c3c72da014" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.4" -BUILD { +BUILD() +{ cd mercurial-2.4 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.4 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,9 +21,10 @@ INSTALL { fi } -TEST { +shopt -s extglob +TEST() +{ cd mercurial-2.4/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/subversion/patches/subversion-1.4.x.diff b/dev-vcs/subversion/patches/subversion-1.4.x.diff deleted file mode 100644 index 85c272dc5..000000000 --- a/dev-vcs/subversion/patches/subversion-1.4.x.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 30382) -+++ configure.in (working copy) -@@ -184,7 +184,7 @@ - dnl So we only turn it on for platforms where we know we really need it. - AC_MSG_CHECKING([whether libtool needs -no-undefined]) - case $host in -- *-*-cygwin*) -+ *-*-cygwin* | *-*-beos* | *-*-haiku*) - AC_MSG_RESULT([yes]) - LT_NO_UNDEFINED="-no-undefined" - ;; diff --git a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff b/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff deleted file mode 100644 index 04563f7bb..000000000 --- a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN subversion-1.5.4/configure.ac subversion-1.5.4-haiku/configure.ac ---- subversion-1.5.4/configure.ac 2008-12-15 00:35:49.000000000 -0800 -+++ subversion-1.5.4-haiku/configure.ac 2008-12-15 00:32:30.000000000 -0800 -@@ -220,6 +220,7 @@ - - # Berkeley DB on SCO OpenServer needs -lsocket - AC_CHECK_LIB(socket, socket) -+AC_CHECK_LIB(network, socket) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. diff --git a/dev-vcs/subversion/patches/subversion-1.6.11.patch b/dev-vcs/subversion/patches/subversion-1.6.11.patch deleted file mode 100644 index a3d5f7d17..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.11.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.11/subversion/libsvn_subr/config_file.c subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.11/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.11/subversion/libsvn_subr/config_impl.h subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.11/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.12.patch b/dev-vcs/subversion/patches/subversion-1.6.12.patch deleted file mode 100644 index b9cef3beb..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.12.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.12/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.12/subversion/libsvn_subr/config_impl.h subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.12/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.13.patch b/dev-vcs/subversion/patches/subversion-1.6.13.patch deleted file mode 100644 index e1964f8e5..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.13.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.13/subversion/libsvn_subr/config_file.c subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.13/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.13/subversion/libsvn_subr/config_impl.h subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.13/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.18.patch b/dev-vcs/subversion/patches/subversion-1.6.18.patch index ac6c86321..097f8eebc 100644 --- a/dev-vcs/subversion/patches/subversion-1.6.18.patch +++ b/dev-vcs/subversion/patches/subversion-1.6.18.patch @@ -1,6 +1,6 @@ -diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac ---- subversion-1.6.18/configure.ac 2009-10-13 09:09:30.026214400 -0700 -+++ subversion-1.6.18-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 +diff -ur orig/subversion-1.6.18/configure.ac subversion-1.6.18/configure.ac +--- orig/subversion-1.6.18/configure.ac 2009-10-13 18:09:30.043778048 +0200 ++++ subversion-1.6.18/configure.ac 2013-04-30 22:10:52.741605376 +0200 @@ -249,7 +249,7 @@ dnl Check for libraries -------------------- @@ -10,9 +10,9 @@ diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac # Build the BDB filesystem library only if we have an appropriate # version of Berkeley DB. -diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 +diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18/subversion/libsvn_subr/config_file.c +--- orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 18:27:35.015728640 +0100 ++++ subversion-1.6.18/subversion/libsvn_subr/config_file.c 2013-04-30 22:20:33.557842432 +0200 @@ -32,6 +32,11 @@ #include "svn_private_config.h" @@ -25,28 +25,7 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6. /* Used to terminate lines in large multi-line string literals. */ #define NL APR_EOL_STR -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ +@@ -1115,8 +1120,21 @@ *path = svn_path_join_many(pool, folder, SVN_CONFIG__SUBDIRECTORY, fname, NULL); } @@ -69,18 +48,20 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6. { const char *homedir = svn_user_get_homedir(pool); if (! homedir) -diff -urN subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ +diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18/subversion/libsvn_subr/config_impl.h +--- orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 14:23:50.020971520 +0100 ++++ subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2013-04-30 22:19:32.338427904 +0200 +@@ -109,8 +109,11 @@ or svn_config_get_user_config_path() instead. */ #ifdef WIN32 # define SVN_CONFIG__SUBDIRECTORY "Subversion" -#else /* ! WIN32 */ +-# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" +#elif defined __HAIKU__ /* HAIKU */ +# define SVN_CONFIG__SYS_DIRECTORY "subversion" +# define SVN_CONFIG__USR_DIRECTORY "subversion" +#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" ++# define SVN_CONFIG__SYS_DIRECTORY "@HAIKU_GLOBAL_SETTINGS_DIR@" # define SVN_CONFIG__USR_DIRECTORY ".subversion" #endif /* WIN32 */ + diff --git a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff b/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff deleted file mode 100644 index fe47041ec..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_file.c subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.5/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c 2009-09-03 09:01:10.000000000 +0000 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-03 08:54:11.000000000 +0000 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff b/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff deleted file mode 100644 index bf7847a0d..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-02 13:43:03.000000000 +0000 -@@ -109,6 +109,9 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/boot/common/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "config/settings/subversion" - #else /* ! WIN32 */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" diff --git a/dev-vcs/subversion/patches/subversion-1.6.6.patch b/dev-vcs/subversion/patches/subversion-1.6.6.patch deleted file mode 100644 index 6bbe00b59..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.6.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN subversion-1.6.6/subversion/libsvn_subr/config_file.c subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.6/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000 -+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c 2009-11-23 08:28:19.000000000 +0000 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -diff -urN subversion-1.6.6/subversion/libsvn_subr/config_impl.h subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.6/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h 2009-11-23 08:28:19.000000000 +0000 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.9.patch b/dev-vcs/subversion/patches/subversion-1.6.9.patch deleted file mode 100644 index dee400526..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.9.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.9/subversion/libsvn_subr/config_file.c subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.9/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.9/subversion/libsvn_subr/config_impl.h subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.9/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/subversion-1.6.11.bep b/dev-vcs/subversion/subversion-1.6.11.bep deleted file mode 100644 index 97693b80f..000000000 --- a/dev-vcs/subversion/subversion-1.6.11.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.11.tar.gz" -CHECKSUM_MD5="7331310fc786111899b305c6d141b02d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd subversion-1.6.11 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=lpe \ - --with-zlib=/boot/common - make -} - -INSTALL { - cd subversion-1.6.11 - make install -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.12.bep b/dev-vcs/subversion/subversion-1.6.12.bep deleted file mode 100644 index a6fe5aa74..000000000 --- a/dev-vcs/subversion/subversion-1.6.12.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.12.tar.bz2" -CHECKSUM_MD5="a4b1d0d7f3a4587c59da9c1acf9dedd0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd subversion-1.6.12 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL { - cd subversion-1.6.12 - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.13.bep b/dev-vcs/subversion/subversion-1.6.13.bep deleted file mode 100644 index b2fd911fb..000000000 --- a/dev-vcs/subversion/subversion-1.6.13.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.13.tar.bz2" -CHECKSUM_MD5="7ae1c827689f21cf975804005be30aeb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd subversion-1.6.13 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL { - cd subversion-1.6.13 - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.15.bep b/dev-vcs/subversion/subversion-1.6.15.bep deleted file mode 100644 index 17bb56f2f..000000000 --- a/dev-vcs/subversion/subversion-1.6.15.bep +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" -CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4.2 - dev-libs/apr-util >= 1.3.10 - net-misc/neon >= 0.29.6 - dev-libs/libiconv >= 1.13.1 - dev-db/sqlite >= 3.7.5 - dev-libs/expat >= 2.0.1 - dev-libs/openssl >= 1.0.0d - dev-libs/libxml2 >= 2.7.8" - -BUILD { - cd subversion-1.6.15 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=$COMMON_DIR \ - --with-zlib=$COMMON_DIR \ - --with-editor=nano \ - --disable-nls - make -} - -INSTALL { - cd subversion-1.6.15 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} - -TEST { - cd subversion-1.6.15 - make check -} - -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe new file mode 100644 index 000000000..7f65e4efa --- /dev/null +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -0,0 +1,114 @@ +SUMMARY="Open source version control system" +DESCRIPTION=" + Subversion exists to be universally recognized and adopted as an + open-source, centralized version control system characterized by its + reliability as a safe haven for valuable data; the simplicity of its + model and usage; and its ability to support the needs of a wide + variety of users and projects, from individuals to large-scale enterprise + operations. + " +HOMEPAGE="http://subversion.apache.org" +LICENSE="Apache-Subversion" +COPYRIGHT="2010 The Apache Software Foundation" +SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" +CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" +REVISION="5" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="subversion-1.6.15.patch" + +PROVIDES=" + subversion = $portVersion compat >= 1.6 + cmd:svn = $portVersion compat >= 1.6 + cmd:svnadmin = $portVersion compat >= 1.6 + cmd:svndumpfilter = $portVersion compat >= 1.6 + cmd:svnlook = $portVersion compat >= 1.6 + cmd:svnserve = $portVersion compat >= 1.6 + cmd:svnsync = $portVersion compat >= 1.6 + cmd:svnversion = $portVersion compat >= 1.6 + lib:libsvn_client_1 = 0.0.0 compat >= 0 + lib:libsvn_delta_1 = 0.0.0 compat >= 0 + lib:libsvn_diff_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + lib:libsvn_repos_1 = 0.0.0 compat >= 0 + lib:libsvn_subr_1 = 0.0.0 compat >= 0 + lib:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + apr >= 1.3 + apr_util >= 1.3 + expat >= 2.0 + libiconv >= 1.13 + libxml2 >= 2.7 + neon >= 0.29 + sqlite >= 3.4 + zlib + " +BUILD_REQUIRES=" + $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I build -I build/ac-macros + autoconf + runConfigure ./configure \ + --with-apr=$portPackageLinksDir/apr \ + --with-apr-util=$portPackageLinksDir/apr_util \ + --with-neon=$portPackageLinksDir/neon \ + --with-zlib=$portPackageLinksDir/zlib \ + --with-editor=nano \ + --disable-nls + make $jobArgs +} + +INSTALL() +{ + make install + if type -p swig > /dev/null;then + if type -p python > /dev/null;then + PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn + fi + #if type -p perl > /dev/null;then + # make install-swig-pl + #fi + #if type -p ruby > /dev/null;then + # make install-swig-rb + #fi + fi + + prepareInstalledDevelLibs \ + libsvn_client-1 \ + libsvn_delta-1 \ + libsvn_diff-1 \ + libsvn_fs-1 \ + libsvn_fs_fs-1 \ + libsvn_fs_util-1 \ + libsvn_ra-1 \ + libsvn_ra_local-1 \ + libsvn_ra_neon-1 \ + libsvn_ra_svn-1 \ + libsvn_repos-1 \ + libsvn_subr-1 \ + libsvn_wc-1 +} diff --git a/dev-vcs/subversion/subversion-1.6.17.bep b/dev-vcs/subversion/subversion-1.6.17.bep deleted file mode 100644 index cafa62e18..000000000 --- a/dev-vcs/subversion/subversion-1.6.17.bep +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2" -CHECKSUM_MD5="81e5dc5beee4b3fc025ac70c0b6caa14" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4.4 - dev-libs/apr-util >= 1.3.12 - net-misc/neon >= 0.29.6 - dev-libs/libiconv >= 1.13.1 - dev-db/sqlite >= 3.7.7.1 - dev-libs/expat >= 2.0.1 - dev-libs/openssl >= 1.0.0d - dev-libs/libxml2 >= 2.7.8" - -BUILD { - cd subversion-1.6.17 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=$COMMON_DIR \ - --with-zlib=$COMMON_DIR \ - --with-editor=nano \ - --disable-nls - make -} - -INSTALL { - cd subversion-1.6.17 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} - -TEST { - cd subversion-1.6.17 - make check -} - -LICENSE="Apache-Subversion" -COPYRIGHT="2011 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.18.bep b/dev-vcs/subversion/subversion-1.6.18.bep deleted file mode 100644 index 5985c1fcd..000000000 --- a/dev-vcs/subversion/subversion-1.6.18.bep +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" -CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4.4 - dev-libs/apr-util >= 1.3.12 - net-misc/neon >= 0.29.6 - dev-libs/libiconv >= 1.13.1 - dev-db/sqlite >= 3.7.7.1 - dev-libs/expat >= 2.0.1 - dev-libs/openssl >= 1.0.0d - dev-libs/libxml2 >= 2.7.8" - -BUILD { - cd subversion-1.6.18 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=$COMMON_DIR \ - --with-zlib=$COMMON_DIR \ - --with-editor=nano \ - --disable-nls - make -} - -INSTALL { - cd subversion-1.6.18 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} - -TEST { - cd subversion-1.6.18 - make check -} - -LICENSE="Apache-Subversion" -COPYRIGHT="2000-2009 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe new file mode 100644 index 000000000..310f8886f --- /dev/null +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -0,0 +1,167 @@ +SUMMARY="Open source version control system" +DESCRIPTION=" + Subversion exists to be universally recognized and adopted as an + open-source, centralized version control system characterized by its + reliability as a safe haven for valuable data; the simplicity of its + model and usage; and its ability to support the needs of a wide + variety of users and projects, from individuals to large-scale enterprise + operations. + " +HOMEPAGE="http://subversion.apache.org" +LICENSE="Apache-Subversion" +COPYRIGHT="2010 The Apache Software Foundation" +SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" +CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="subversion-1.6.18.patch" + +PROVIDES=" + subversion = $portVersion compat >= 1.6 + cmd:svn = $portVersion compat >= 1.6 + cmd:svnadmin = $portVersion compat >= 1.6 + cmd:svndumpfilter = $portVersion compat >= 1.6 + cmd:svnlook = $portVersion compat >= 1.6 + cmd:svnserve = $portVersion compat >= 1.6 + cmd:svnsync = $portVersion compat >= 1.6 + cmd:svnversion = $portVersion compat >= 1.6 + lib:libsvn_client_1 = 0.0.0 compat >= 0 + lib:libsvn_delta_1 = 0.0.0 compat >= 0 + lib:libsvn_diff_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + lib:libsvn_repos_1 = 0.0.0 compat >= 0 + lib:libsvn_subr_1 = 0.0.0 compat >= 0 + lib:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libapr_1 + lib:libaprutil_1 + lib:libcrypto + lib:libexpat + lib:libiconv + lib:libneon + lib:libsqlite3 + lib:libssl + lib:libxml2 + lib:libz + " +BUILD_REQUIRES=" + expat_devel >= 2.0 + libiconv_devel >= 1.13 + neon_devel >= 0.29 + sqlite_devel >= 3.4 + devel:libapr_1 >= 0.3 + devel:libaprutil_1 >= 0.3 + devel:libcrypto + devel:libssl + devel:libxml2 >= 2.7 + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + python + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +USER_SETTINGS_FILES=" + settings/subversion directory + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \ + subversion/libsvn_subr/config_impl.h +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I build -I build/ac-macros + autoconf + runConfigure ./configure \ + --with-apr=$portPackageLinksDir/devel~libapr_1 \ + --with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \ + --with-neon=$portPackageLinksDir/neon_devel \ + --with-zlib=$portPackageLinksDir/devel~libz \ + --with-editor=nano \ + --disable-nls + make $jobArgs +} + +INSTALL() +{ + make install + if type -p swig > /dev/null;then + if type -p python > /dev/null;then + PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn + fi + #if type -p perl > /dev/null;then + # make install-swig-pl + #fi + #if type -p ruby > /dev/null;then + # make install-swig-rb + #fi + fi + + prepareInstalledDevelLibs \ + libsvn_client-1 \ + libsvn_delta-1 \ + libsvn_diff-1 \ + libsvn_fs-1 \ + libsvn_fs_fs-1 \ + libsvn_fs_util-1 \ + libsvn_ra-1 \ + libsvn_ra_local-1 \ + libsvn_ra_neon-1 \ + libsvn_ra_svn-1 \ + libsvn_repos-1 \ + libsvn_subr-1 \ + libsvn_wc-1 + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + subversion_devel = $portVersion compat >= 1.6 + devel:libsvn_client_1 = 0.0.0 compat >= 0 + devel:libsvn_delta_1 = 0.0.0 compat >= 0 + devel:libsvn_diff_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_util_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_local_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + devel:libsvn_repos_1 = 0.0.0 compat >= 0 + devel:libsvn_subr_1 = 0.0.0 compat >= 0 + devel:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + subversion == $portVersion base + " diff --git a/dev-vcs/subversion/subversion-1.6.6.bep b/dev-vcs/subversion/subversion-1.6.6.bep deleted file mode 100644 index 969735f17..000000000 --- a/dev-vcs/subversion/subversion-1.6.6.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.6.tar.bz2" -CHECKSUM_MD5="e5109da756d74c7d98f683f004a539af" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd subversion-1.6.6 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=lpe --with-zlib=/boot/common - make -} - -INSTALL { - cd subversion-1.6.6 - make install -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.9.bep b/dev-vcs/subversion/subversion-1.6.9.bep deleted file mode 100644 index 858cd6a22..000000000 --- a/dev-vcs/subversion/subversion-1.6.9.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.9.tar.gz" -CHECKSUM_MD5="facaa0ee78c8f24b9af12c74662bbd24" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd subversion-1.6.9 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=nano --with-zlib=/boot/common - make -} - -INSTALL { - cd subversion-1.6.9 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.7.0-rc2.bep b/dev-vcs/subversion/subversion-1.7.0_rc2.recipe similarity index 98% rename from dev-vcs/subversion/subversion-1.7.0-rc2.bep rename to dev-vcs/subversion/subversion-1.7.0_rc2.recipe index 06ea4070a..1f9c5c8d3 100644 --- a/dev-vcs/subversion/subversion-1.7.0-rc2.bep +++ b/dev-vcs/subversion/subversion-1.7.0_rc2.recipe @@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4 dev-libs/openssl >= 1.0.0d dev-libs/libxml2 >= 2.7.8" -BUILD { +BUILD() +{ cd subversion-1.7.0-rc2 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.7.0-rc2 make install if type -p swig > /dev/null;then @@ -47,7 +49,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd subversion-1.7.0-rc2 make check } diff --git a/dev-vcs/subversion/subversion-1.7.xx-svn.bep b/dev-vcs/subversion/subversion-1.7.xx-svn.bep deleted file mode 100644 index 5e5fa165c..000000000 --- a/dev-vcs/subversion/subversion-1.7.xx-svn.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd subversion-1.7.xx-svn - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL { - cd subversion-1.7.xx-svn - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/tig/tig-0.16.bep b/dev-vcs/tig/tig-0.16.recipe similarity index 82% rename from dev-vcs/tig/tig-0.16.bep rename to dev-vcs/tig/tig-0.16.recipe index cbd93d145..53e29959a 100644 --- a/dev-vcs/tig/tig-0.16.bep +++ b/dev-vcs/tig/tig-0.16.recipe @@ -4,8 +4,9 @@ SRC_URI="http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz" CHECKSUM_MD5="684572d93033d6cbfc5ee71cffe02935" REVISION="1" STATUS_HAIKU="untested" -DEPEND="sys-libs/ncurses >= 5.7"" -BUILD { +DEPEND="sys-libs/ncurses >= 5.7" +BUILD() +{ cd tig-0.16 libtoolize --force --copy --install autoreconf -i @@ -13,9 +14,10 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tig-0.16 make install } LICENSE="GNU GPL v2" -COPYRIGHT="2006-2010 Jonas Fonseca" \ No newline at end of file +COPYRIGHT="2006-2010 Jonas Fonseca" diff --git a/games-action/bzflag/bzflag-2.0.14.bep b/games-action/bzflag/bzflag-2.0.14.recipe similarity index 96% rename from games-action/bzflag/bzflag-2.0.14.bep rename to games-action/bzflag/bzflag-2.0.14.recipe index b169244d9..3301851d6 100644 --- a/games-action/bzflag/bzflag-2.0.14.bep +++ b/games-action/bzflag/bzflag-2.0.14.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="libsdl >= 1.2.14" CHECKSUM_MD5="15a28cd55e46f0f39a7c8b8eea7464c6" -BUILD { +BUILD() +{ cd bzflag-2.0.14 mkdir -p m4 libtoolize --force --copy --install @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bzflag-2.0.14 make install } diff --git a/games-action/cylindrix/cylindrix-1.0.bep b/games-action/cylindrix/cylindrix-1.0.recipe similarity index 94% rename from games-action/cylindrix/cylindrix-1.0.bep rename to games-action/cylindrix/cylindrix-1.0.recipe index 579964e86..ec4d718f2 100644 --- a/games-action/cylindrix/cylindrix-1.0.bep +++ b/games-action/cylindrix/cylindrix-1.0.recipe @@ -5,13 +5,15 @@ REVISION="1" CHECKSUM_MD5="914cf70b0a95f4a36cfdfde7edbaa240" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4.1.1" -BUILD { +BUILD() +{ cd cylindrix CFLAGS='-O2' ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cylindrix make install } diff --git a/games-arcade/alienblaster/alienblaster-1.1.0.bep b/games-arcade/alienblaster/alienblaster-1.1.0.recipe similarity index 97% rename from games-arcade/alienblaster/alienblaster-1.1.0.bep rename to games-arcade/alienblaster/alienblaster-1.1.0.recipe index d8ebd7e39..d4c40c917 100644 --- a/games-arcade/alienblaster/alienblaster-1.1.0.bep +++ b/games-arcade/alienblaster/alienblaster-1.1.0.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" REVISION="1" DEPEND="media-libs/libsdl >= 1.2.7 media-libs/sdl-mixer >= 1.2.5" -BUILD { +BUILD() +{ cd alienblaster make } -INSTALL { +INSTALL() +{ cd alienblaster GAMEDIR=`finddir B_APPS_DIRECTORY`/"AlienBlaster" mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-arcade/supertux/supertux-0.1.3.bep b/games-arcade/supertux/supertux-0.1.3.recipe similarity index 96% rename from games-arcade/supertux/supertux-0.1.3.bep rename to games-arcade/supertux/supertux-0.1.3.recipe index 159c000b3..ecd275ffe 100644 --- a/games-arcade/supertux/supertux-0.1.3.bep +++ b/games-arcade/supertux/supertux-0.1.3.recipe @@ -6,14 +6,16 @@ CHECKSUM_MD5="f2fc288459f33d5cd8f645fbca737a63" DEPEND=">=media-libs/libsdl-1.2.4" REVISION="1" -BUILD { +BUILD() +{ cd supertux-0.1.3 autoreconf --force --install ./configure --prefix="`finddir B_COMMON_DIRECTORY`" make } -INSTALL { +INSTALL() +{ cd supertux-0.1.3 make install } diff --git a/games-emulation/dosbox/dosbox-0.74-svn.bep b/games-emulation/dosbox/dosbox-0.74_svn.recipe similarity index 95% rename from games-emulation/dosbox/dosbox-0.74-svn.bep rename to games-emulation/dosbox/dosbox-0.74_svn.recipe index 0051b990a..e6b48bf79 100644 --- a/games-emulation/dosbox/dosbox-0.74-svn.bep +++ b/games-emulation/dosbox/dosbox-0.74_svn.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="media-libs/libsdl >= 1.2 < " -BUILD { +BUILD() +{ cd dosbox-0.74-svn libtoolize --force --copy --install ./autogen.sh @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd dosbox-0.74-svn make install } diff --git a/games-emulation/dosbox/patches/dosbox-0.74_svn.patch b/games-emulation/dosbox/patches/dosbox-0.74_svn.patch new file mode 100644 index 000000000..1e81c8f9e --- /dev/null +++ b/games-emulation/dosbox/patches/dosbox-0.74_svn.patch @@ -0,0 +1,20 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 3798) ++++ configure.in (working copy) +@@ -121,13 +121,8 @@ + + + dnl Check for powf +-AC_MSG_CHECKING(for powf in libm); +-LIBS_BACKUP=$LIBS; +-LIBS="$LIBS -lm"; +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ +- powf(1.0f, 1.0f); +-]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) +-LIBS=$LIBS_BACKUP ++AC_SEARCH_LIBS([powf], [m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function available])]) ++AC_SEARCH_LIBS([getpeername], [network]) + + + dnl Checks for libraries. diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe similarity index 97% rename from games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep rename to games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe index 68b9d2f0b..2cfddb434 100644 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep +++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe @@ -8,7 +8,8 @@ DEPEND="dev-lang/nasm >= 2.03.01 media-libs/libsdl >= 1.2.14 media-libs/sdl-mixer >= 1.2.11" -BUILD { +BUILD() +{ cd VisualBoyAdvance-1.7.2 libtoolize --force --copy --install autoreconf -i @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd VisualBoyAdvance-1.7.2/src GAMEDIR=`finddir B_APPS_DIRECTORY`/Visualboyadvance mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-engines/freesci/freesci-0.6.4_beos.patch b/games-engines/freesci/patches/freesci-0.6.4_beos.patch similarity index 100% rename from games-engines/freesci/freesci-0.6.4_beos.patch rename to games-engines/freesci/patches/freesci-0.6.4_beos.patch diff --git a/games-misc/sdljoytest/sdljoytest-11102003.bep b/games-misc/sdljoytest/sdljoytest-11102003.recipe similarity index 96% rename from games-misc/sdljoytest/sdljoytest-11102003.bep rename to games-misc/sdljoytest/sdljoytest-11102003.recipe index bd4f42bf0..2a83588e8 100644 --- a/games-misc/sdljoytest/sdljoytest-11102003.bep +++ b/games-misc/sdljoytest/sdljoytest-11102003.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDLJoytest-GL sed -i 's/\-lpthread/ /' Makefile make } -INSTALL { +INSTALL() +{ cd SDLJoytest-GL BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` MANDIR=${DESTDIR}`finddir B_COMMON_DATA_DIRECTORY`/man/man1 diff --git a/games-puzzle/abrick/abrick-1.12.bep b/games-puzzle/abrick/abrick-1.12.recipe similarity index 96% rename from games-puzzle/abrick/abrick-1.12.bep rename to games-puzzle/abrick/abrick-1.12.recipe index b15ac2326..f0ded688c 100644 --- a/games-puzzle/abrick/abrick-1.12.bep +++ b/games-puzzle/abrick/abrick-1.12.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" REVISION="1" DEPEND="media-libs/libsdl >= 1.2.14 media-libs/sdl-mixer >=1.2.0" -BUILD { +BUILD() +{ cd abrick-1.12-src make } -INSTALL { +INSTALL() +{ cd abrick-1.12-src GAMEDIR=`finddir B_APPS_DIRECTORY`/abrick mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.bep b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe similarity index 94% rename from games-puzzle/flobopuyo/flobopuyo-0.20.bep rename to games-puzzle/flobopuyo/flobopuyo-0.20.recipe index 5c3743bed..a4b018125 100644 --- a/games-puzzle/flobopuyo/flobopuyo-0.20.bep +++ b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11" -BUILD { +BUILD() +{ cd flubopuyo-0.2.0 make } -INSTALL { +INSTALL() +{ cd flubopuyo-0.2.0 make install } diff --git a/games-puzzle/gnurobbo/gnurobbo-0.65.bep b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe similarity index 97% rename from games-puzzle/gnurobbo/gnurobbo-0.65.bep rename to games-puzzle/gnurobbo/gnurobbo-0.65.recipe index dcc17c624..9e96c5ba6 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.65.bep +++ b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe @@ -8,12 +8,14 @@ DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11 media-lib/sdl-image >= 1.2.10 media-lib/sdl-ttf >= 2.0.10" -BUILD { +BUILD() +{ cd gnurobbo-0.65.6 make } -INSTALL { +INSTALL() +{ cd gnurobbo-0.65.6 APPS_DIR=`finddir B_APPS_DIRECTORY` mkdir -p ${DESTDIR}${APPS_DIR}/gnurobbo diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2-157.bep b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe similarity index 97% rename from games-puzzle/numptyphysics/numptyphysics-0.2-157.bep rename to games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe index da4986095..66901eda6 100644 --- a/games-puzzle/numptyphysics/numptyphysics-0.2-157.bep +++ b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="media-libs/libsdl >= 1.2.14 dev-games/box2d >= 2.1.2" -BUILD { +BUILD() +{ cd numptyphysics-0.2-157 libtoolize --force --copy --install aclocal @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd numptyphysics-0.2-157 make install } diff --git a/games-puzzle/wizznic/wizznic-0.9.9.bep b/games-puzzle/wizznic/wizznic-0.9.9.recipe similarity index 97% rename from games-puzzle/wizznic/wizznic-0.9.9.bep rename to games-puzzle/wizznic/wizznic-0.9.9.recipe index f81063a12..fdf9bfd4e 100644 --- a/games-puzzle/wizznic/wizznic-0.9.9.bep +++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe @@ -8,12 +8,14 @@ STATUS_HAIKU="stable" DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11 media-lib/sdl-image >= 1.2.10" -BUILD { +BUILD() +{ cd wizznic-0.9.9-src make } -INSTALL { +INSTALL() +{ cd wizznic-0.9.9-src GAMEDIR=`finddir B_APPS_DIRECTORY`/"Wizznic" mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-puzzle/wizznic/wizznic-0.9.bep b/games-puzzle/wizznic/wizznic-0.9.recipe similarity index 96% rename from games-puzzle/wizznic/wizznic-0.9.bep rename to games-puzzle/wizznic/wizznic-0.9.recipe index a9437671b..60c45b509 100644 --- a/games-puzzle/wizznic/wizznic-0.9.bep +++ b/games-puzzle/wizznic/wizznic-0.9.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11 media-lib/sdl-image >= 1.2.10" -BUILD { +BUILD() +{ cd wizznic-0.9_feedback_version-src make -f Makefile.haiku } -INSTALL { +INSTALL() +{ cd wizznic-0.9_feedback_version-src make Makefile.haiku install } diff --git a/games-rpg/freedroid/freedroid-1.0.2.bep b/games-rpg/freedroid/freedroid-1.0.2.recipe similarity index 96% rename from games-rpg/freedroid/freedroid-1.0.2.bep rename to games-rpg/freedroid/freedroid-1.0.2.recipe index 5feecf4fd..8f0dfd3f8 100644 --- a/games-rpg/freedroid/freedroid-1.0.2.bep +++ b/games-rpg/freedroid/freedroid-1.0.2.recipe @@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidClassic/Freedr REVISION="1" DEPEND="SDL >= 1.2.3 " CHECKSUM_MD5="585a65f61c2cd308ab45d5c514f695dc" -BUILD { +BUILD() +{ cd freedroid-1.0.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freedroid-1.0.2 make install } diff --git a/games-simulation/openttd/openttd-1.2.3.bep b/games-simulation/openttd/openttd-1.2.3.recipe similarity index 96% rename from games-simulation/openttd/openttd-1.2.3.bep rename to games-simulation/openttd/openttd-1.2.3.recipe index e97ac9d7c..4f92f7b00 100644 --- a/games-simulation/openttd/openttd-1.2.3.bep +++ b/games-simulation/openttd/openttd-1.2.3.recipe @@ -11,13 +11,15 @@ DEPEND="media-libs/libsdl, pkgconfig, lzo" -BUILD { +BUILD() +{ cd openttd-1.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd openttd-1.2.3 make install cp -R bundle /boot/apps diff --git a/gnome-base/gnome-common/gnome-common-2.28.bep b/gnome-base/gnome_common/gnome_common-2.28.recipe similarity index 95% rename from gnome-base/gnome-common/gnome-common-2.28.bep rename to gnome-base/gnome_common/gnome_common-2.28.recipe index b5cdf1967..e3a6aa65d 100644 --- a/gnome-base/gnome-common/gnome-common-2.28.bep +++ b/gnome-base/gnome_common/gnome_common-2.28.recipe @@ -4,14 +4,16 @@ SRC_URI="git+git://git.gnome.org/gnome-common" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gnome-common-2.28 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gnome-common-2.28 make install } diff --git a/gnome-extra/libgsf/libgsf-1.14.18.bep b/gnome-extra/libgsf/libgsf-1.14.18.recipe similarity index 96% rename from gnome-extra/libgsf/libgsf-1.14.18.bep rename to gnome-extra/libgsf/libgsf-1.14.18.recipe index f91ef5d09..927751361 100644 --- a/gnome-extra/libgsf/libgsf-1.14.18.bep +++ b/gnome-extra/libgsf/libgsf-1.14.18.recipe @@ -9,7 +9,8 @@ DEPEND="pkgconfig >= 0.23 dev-perl/XML-Parser >= 2.3.6 dev-util/intltool >= 0.40.6 dev-lib/glib >= 2.18.3" -BUILD { +BUILD() +{ cd libgsf-1.14.18 libtoolize --force --copy --install autoreconf -i @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgsf-1.14.18 make install cd thumbnailer diff --git a/haiku-apps/W6/W6-1.7.bep b/haiku-apps/W6/W6-1.7.recipe similarity index 96% rename from haiku-apps/W6/W6-1.7.bep rename to haiku-apps/W6/W6-1.7.recipe index 70d7588e6..0a217b667 100644 --- a/haiku-apps/W6/W6-1.7.bep +++ b/haiku-apps/W6/W6-1.7.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd W6Haiku make cd ../ @@ -15,7 +16,8 @@ BUILD { cp -r W6/w6s W6Haiku } -INSTALL { +INSTALL() +{ cd W6Haiku mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/W6 install -m 0755 objects.x86-gcc`setgcc | tail -c -2`-release/W6Haiku $DESTDIR`finddir B_APPS_DIRECTORY`/W6/W6 diff --git a/haiku-apps/album/album-0.9.2.bep b/haiku-apps/album/album-0.9.2.recipe similarity index 95% rename from haiku-apps/album/album-0.9.2.bep rename to haiku-apps/album/album-0.9.2.recipe index dd26abcd6..58c428455 100644 --- a/haiku-apps/album/album-0.9.2.bep +++ b/haiku-apps/album/album-0.9.2.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="d22d1850ba5807c5da0432ecd530c372" STATUS_HAIKU="stable" REVISION="1" DEPEND=" " -BUILD { +BUILD() +{ cd album-0.9.2/src make } -INSTALL { +INSTALL() +{ cd album-0.9.2 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album cp -a Album ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album diff --git a/haiku-apps/aplayer/aplayer-4.0.1.bep b/haiku-apps/aplayer/aplayer-4.0.1.recipe similarity index 95% rename from haiku-apps/aplayer/aplayer-4.0.1.bep rename to haiku-apps/aplayer/aplayer-4.0.1.recipe index 5152ab11d..a6be885ac 100644 --- a/haiku-apps/aplayer/aplayer-4.0.1.bep +++ b/haiku-apps/aplayer/aplayer-4.0.1.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd aplayer-4.0.1/Master make } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer cp -a APlayer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer } diff --git a/haiku-apps/armyknife/armyknife-61.bep b/haiku-apps/armyknife/armyknife-61.recipe similarity index 95% rename from haiku-apps/armyknife/armyknife-61.bep rename to haiku-apps/armyknife/armyknife-61.recipe index 252077a6a..b0628d81b 100644 --- a/haiku-apps/armyknife/armyknife-61.bep +++ b/haiku-apps/armyknife/armyknife-61.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd armyknife-61 make } -INSTALL { +INSTALL() +{ cd armyknife-61 make zipfile mkdir -p ${DESTDIR}/boot/apps diff --git a/haiku-apps/armyknife/armyknife-62.bep b/haiku-apps/armyknife/armyknife-62.recipe similarity index 95% rename from haiku-apps/armyknife/armyknife-62.bep rename to haiku-apps/armyknife/armyknife-62.recipe index 5bff3c87a..b76790c4b 100644 --- a/haiku-apps/armyknife/armyknife-62.bep +++ b/haiku-apps/armyknife/armyknife-62.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd armyknife-62 make } -INSTALL { +INSTALL() +{ cd armyknife-62 make zipfile mkdir -p ${DESTDIR}/boot/apps diff --git a/haiku-apps/armyknife/armyknife-63.bep b/haiku-apps/armyknife/armyknife-63.bep deleted file mode 100644 index c8cd02afa..000000000 --- a/haiku-apps/armyknife/armyknife-63.bep +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" -SRC_URI="svn+http://svn.osdrawer.net/armyknife#63" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD { - cd armyknife-63 - make -} - -INSTALL { - cd armyknife-63 - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe new file mode 100644 index 000000000..471b2c863 --- /dev/null +++ b/haiku-apps/armyknife/armyknife-66.recipe @@ -0,0 +1,38 @@ +SUMMARY="The all-in-one metadata editor for audio files." +DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." +HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" +SRC_URI="git://github.com:HaikuArchives/ArmyKnife.git" +COPYRIGHT="2000-2001 Jason Burgess" +LICENSE="MIT" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + armyknife = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + taglib >= 1.6 + " +BUILD_PREREQUIRED=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + make +} + +INSTALL() +{ + make zipfile + mkdir -p ${DESTDIR}/boot/apps + unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps +} + diff --git a/haiku-apps/armyknife/armyknife-999-git.bep b/haiku-apps/armyknife/armyknife-999-git.bep deleted file mode 100644 index 6307acc63..000000000 --- a/haiku-apps/armyknife/armyknife-999-git.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" -SRC_URI="git+https://github.com/scottmc/ArmyKnife.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD { - cd armyknife-999-git - make -} - -INSTALL { - cd armyknife-999-git - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} - diff --git a/haiku-apps/artpaint/artpaint-339.bep b/haiku-apps/artpaint/artpaint-339.recipe similarity index 95% rename from haiku-apps/artpaint/artpaint-339.bep rename to haiku-apps/artpaint/artpaint-339.recipe index c0514179e..3a80a0bdb 100644 --- a/haiku-apps/artpaint/artpaint-339.bep +++ b/haiku-apps/artpaint/artpaint-339.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ echo "Need to figure out how to build this still" } -INSTALL { +INSTALL() +{ echo "Need to figure out how to install this still" } diff --git a/haiku-apps/beacon/beacon-27.bep b/haiku-apps/beacon/beacon-27.recipe similarity index 93% rename from haiku-apps/beacon/beacon-27.bep rename to haiku-apps/beacon/beacon-27.recipe index bb46aa7a4..929321d21 100644 --- a/haiku-apps/beacon/beacon-27.bep +++ b/haiku-apps/beacon/beacon-27.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="CLucene" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beacon-27 jam } -INSTALL { +INSTALL() +{ cd beacon-27 jam } diff --git a/haiku-apps/beae/beae-20.bep b/haiku-apps/beae/beae-20.recipe similarity index 97% rename from haiku-apps/beae/beae-20.bep rename to haiku-apps/beae/beae-20.recipe index 1ec54472a..e8e81f9f3 100644 --- a/haiku-apps/beae/beae-20.bep +++ b/haiku-apps/beae/beae-20.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beae-20 cmake . make } -INSTALL { +INSTALL() +{ cd beae-20 mkdir -p ${DESTDIR}/boot/apps cp -a BeAE ${DESTDIR}/boot/apps diff --git a/haiku-apps/beae/beae-22.bep b/haiku-apps/beae/beae-22.recipe similarity index 97% rename from haiku-apps/beae/beae-22.bep rename to haiku-apps/beae/beae-22.recipe index 63edcd51f..925c91399 100644 --- a/haiku-apps/beae/beae-22.bep +++ b/haiku-apps/beae/beae-22.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beae-22 cmake . make } -INSTALL { +INSTALL() +{ cd beae-22 mkdir -p ${DESTDIR}/boot/apps cp -a BeAE ${DESTDIR}/boot/apps diff --git a/haiku-apps/beae/beae-25.bep b/haiku-apps/beae/beae-25.recipe similarity index 97% rename from haiku-apps/beae/beae-25.bep rename to haiku-apps/beae/beae-25.recipe index ae9d26e62..6eed421f7 100644 --- a/haiku-apps/beae/beae-25.bep +++ b/haiku-apps/beae/beae-25.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beae-25 cmake . make } -INSTALL { +INSTALL() +{ cd beae-25 mkdir -p ${DESTDIR}/boot/apps cp -a BeAE ${DESTDIR}/boot/apps diff --git a/haiku-apps/beam/beam-1.2alpha.bep b/haiku-apps/beam/beam-1.2alpha.recipe similarity index 96% rename from haiku-apps/beam/beam-1.2alpha.bep rename to haiku-apps/beam/beam-1.2alpha.recipe index f8fe770d2..0237b5074 100644 --- a/haiku-apps/beam/beam-1.2alpha.bep +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="liblayout >= 1.4.0 libpcre >= 8.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beam-1.2alpha jam } -INSTALL { +INSTALL() +{ cd beam-1.2alpha mkdir -p ${DESTDIR}/boot/apps/Beam cp -a generated/distro-haiku/* ${DESTDIR}/boot/apps/Beam diff --git a/haiku-apps/beezer/beezer-1.bep b/haiku-apps/beezer/beezer-1.recipe similarity index 97% rename from haiku-apps/beezer/beezer-1.bep rename to haiku-apps/beezer/beezer-1.recipe index bb215a60a..7b9dbb02f 100644 --- a/haiku-apps/beezer/beezer-1.bep +++ b/haiku-apps/beezer/beezer-1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74" DEPEND="cmake >= 2.8" -BUILD { +BUILD() +{ cd cpr-beezer-82199f683571/Source cmake . make } -INSTALL { +INSTALL() +{ cd cpr-beezer-82199f683571/Source/build BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer mkdir -p $BEEZER_DIR/add-ons diff --git a/haiku-apps/beget/beget-1.2.3.bep b/haiku-apps/beget/beget-1.2.3.recipe similarity index 96% rename from haiku-apps/beget/beget-1.2.3.bep rename to haiku-apps/beget/beget-1.2.3.recipe index c87a6858f..be90a33de 100644 --- a/haiku-apps/beget/beget-1.2.3.bep +++ b/haiku-apps/beget/beget-1.2.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="net-misc/wget" -BUILD { +BUILD() +{ cd beget-1.2.3 cmake . make } -INSTALL { +INSTALL() +{ cd beget-1.2.3 mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY` cp BeGet $DESTDIR`finddir B_APPS_DIRECTORY` diff --git a/haiku-apps/behappy/behappy-16.bep b/haiku-apps/behappy/behappy-16.recipe similarity index 94% rename from haiku-apps/behappy/behappy-16.bep rename to haiku-apps/behappy/behappy-16.recipe index 82da09219..7c14ae33a 100644 --- a/haiku-apps/behappy/behappy-16.bep +++ b/haiku-apps/behappy/behappy-16.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="www-client/netsurf >= 2.6" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd "behappy-16" make } -INSTALL { +INSTALL() +{ cd "behappy-16" } diff --git a/haiku-apps/bepdf/bepdf-1.1.1b4.bep b/haiku-apps/bepdf/bepdf-1.1.1b4.bep deleted file mode 100644 index 61df256e4..000000000 --- a/haiku-apps/bepdf/bepdf-1.1.1b4.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="BePDF is a PDF viewer for the BeOS, Haiku & Zeta" -HOMEPAGE="http://bepdf.sourceforge.net/" -SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="app-text/htmldoc == 1.8.27" - -BUILD { - export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2` - cd bepdf-1.1.1b4 - ./build.sh package -} - -INSTALL { - cd bepdf-1.1.1b4 - mkdir -p ${DESTDIR}/boot/apps - unzip generated/BePDF-1.1.1b4.x86.zip -d ${DESTDIR}/boot/apps -} - -COPYRIGHT="1997 Benoit Triquet - 1999-2000 Hubert Figuiere - 2000-2010 Michael Pfeiffer" -LICENSE="GNU GPL v2" diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe new file mode 100644 index 000000000..7c3e64e4b --- /dev/null +++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe @@ -0,0 +1,61 @@ +SUMMARY="A PDF viewer" +DESCRIPTION=" + BePDF is a PDF viewer for the BeOS, Haiku & Zeta. + + Besides viewing, it supports annotating and user-defined bookmarking for + unencrypted PDFs. It's fully localized for 20 languages at the moment + with additional languages being easily added via text files. + " +HOMEPAGE="http://bepdf.sourceforge.net/" +SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF#04/28/13" +COPYRIGHT=" + 1997 Benoit Triquet + 1999-2000 Hubert Figuiere + 2000-2010 Michael Pfeiffer" +LICENSE="GNU GPL v2" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + bepdf = $portVersion + cmd:BePDF = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:jam + cmd:htmldoc + cmd:ld + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + if [ $targetArchitecture == 'x86_gcc2' ]; then + export BEPDF_BUILD_GCC=gcc2 + else + export BEPDF_BUILD_GCC=gcc4 + fi + + ./build.sh +} + +INSTALL() +{ + bepdfArch=$targetArchitecture + if [ $bepdfArch == 'x86_gcc2' ]; then + bepdfArch='x86' + fi + mkdir -p $appsDir + rm -f generated/$bepdfArch/*Deskbar + cp -dR generated/$bepdfArch $appsDir/BePDF + + addAppDeskbarSymlink $appsDir/BePDF/BePDF +} diff --git a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch b/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch deleted file mode 100644 index 9d1c4df7b..000000000 --- a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: bepdf-1.1.1b2-532/bepdf/Jamfile -=================================================================== ---- bepdf-1.1.1b2-532/bepdf/Jamfile (revision 532) -+++ bepdf-1.1.1b2-532/bepdf/Jamfile (working copy) -@@ -96,10 +96,14 @@ - # 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 = -+LIBS = stdc++.r4 ; -+if $(BEPDF_BUILD_GCC) = gcc4 { -+ # Use the standard libstdc++ name when building with gcc 4. -+ LIBS = stdc++ ; -+} -+LIBS += - # BeOS - be --stdc++.r4 - textencoding - tracker - translation diff --git a/haiku-apps/beshare/beshare-4.bep b/haiku-apps/beshare/beshare-4.recipe similarity index 92% rename from haiku-apps/beshare/beshare-4.bep rename to haiku-apps/beshare/beshare-4.recipe index 70162a75d..cc82033ca 100644 --- a/haiku-apps/beshare/beshare-4.bep +++ b/haiku-apps/beshare/beshare-4.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="muscle >= 4.63" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beshare-4/source make } -INSTALL { +INSTALL() +{ cd beshare-4 } diff --git a/haiku-apps/bowser/bowser-1.1.1-cvs.bep b/haiku-apps/bowser/bowser-1.1.1_cvs.recipe similarity index 86% rename from haiku-apps/bowser/bowser-1.1.1-cvs.bep rename to haiku-apps/bowser/bowser-1.1.1_cvs.recipe index 03e44cf2b..4a127a126 100644 --- a/haiku-apps/bowser/bowser-1.1.1-cvs.bep +++ b/haiku-apps/bowser/bowser-1.1.1_cvs.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { - +BUILD() +{ + true } -INSTALL { - +INSTALL() +{ + true } #COPYRIGHT="" diff --git a/haiku-apps/bsl/bsl-108.bep b/haiku-apps/bsl/bsl-108.recipe similarity index 94% rename from haiku-apps/bsl/bsl-108.bep rename to haiku-apps/bsl/bsl-108.recipe index a64ea3938..df2fcc8e3 100644 --- a/haiku-apps/bsl/bsl-108.bep +++ b/haiku-apps/bsl/bsl-108.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd bsl-108 make } -INSTALL { +INSTALL() +{ cd bsl-108 BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}${BIN_DIR} diff --git a/haiku-apps/burnitnow/burnitnow-2-svn.bep b/haiku-apps/burnitnow/burnitnow-2-svn.bep deleted file mode 100644 index 375b2f3d8..000000000 --- a/haiku-apps/burnitnow/burnitnow-2-svn.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" -HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" -SRC_URI="svn+http://svn.osdrawer.net/burnitnow/trunk" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0 - app-cdr/cdrtools > 3.00" -#CHECKSUM_MD5="" -BUILD { - cd burnitnow-2-svn - cmake . - make -} - -INSTALL { - cd burnitnow-2-svn - mkdir -p ${DESTDIR}/boot/apps/BurnItNow - cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow - if [ -z ${DESTDIR} ];then - find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="MIT" -COPYRIGHT="Copyright 2010-2011 BurnItNow Team" diff --git a/haiku-apps/burnitnow/burnitnow-27.bep b/haiku-apps/burnitnow/burnitnow-27.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-27.bep rename to haiku-apps/burnitnow/burnitnow-27.recipe index 58815a665..7d9667d50 100644 --- a/haiku-apps/burnitnow/burnitnow-27.bep +++ b/haiku-apps/burnitnow/burnitnow-27.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-27 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-27 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-38.bep b/haiku-apps/burnitnow/burnitnow-38.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-38.bep rename to haiku-apps/burnitnow/burnitnow-38.recipe index 08cc6c00d..22f906cb4 100644 --- a/haiku-apps/burnitnow/burnitnow-38.bep +++ b/haiku-apps/burnitnow/burnitnow-38.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-38 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-38 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-39.bep b/haiku-apps/burnitnow/burnitnow-39.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-39.bep rename to haiku-apps/burnitnow/burnitnow-39.recipe index f02e42d17..4ed1fbf85 100644 --- a/haiku-apps/burnitnow/burnitnow-39.bep +++ b/haiku-apps/burnitnow/burnitnow-39.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-39 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-39 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-43.bep b/haiku-apps/burnitnow/burnitnow-43.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-43.bep rename to haiku-apps/burnitnow/burnitnow-43.recipe index afb02e8fa..0d3dcdd90 100644 --- a/haiku-apps/burnitnow/burnitnow-43.bep +++ b/haiku-apps/burnitnow/burnitnow-43.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-43 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-43 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep b/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-beta5-svn.bep rename to haiku-apps/burnitnow/burnitnow-beta5_svn.recipe index 00ea2266f..d2c4e80e7 100644 --- a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep +++ b/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-beta5-svn cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-beta5-svn mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-beta6-git.bep b/haiku-apps/burnitnow/burnitnow-beta6-git.bep deleted file mode 100644 index 99afe0ec0..000000000 --- a/haiku-apps/burnitnow/burnitnow-beta6-git.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" -HOMEPAGE="http://github.com/scottmc/burnitnow" -SRC_URI="git://github.com/scottmc/BurnItNow.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="app-cdr/cdrtools > 3.00" -#CHECKSUM_MD5="" - -BUILD { - cd burnitnow-beta6-git/legacy - cmake . - make -} - -INSTALL { - cd burnitnow-beta6-git/legacy - BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow - mkdir -p ${BURNITNOWDIR}/Docs - cp -a BurnItNow ${BURNITNOWDIR} - cp -a LICENSE ${BURNITNOWDIR}/LICENSE - cp -a TODO ${BURNITNOWDIR}/TODO - cp -a README ${BURNITNOWDIR}/README - cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS - cp -a Changes ${BURNITNOWDIR}/Changes - cp -a Docs ${BURNITNOWDIR}/ - if [ -z ${DESTDIR} ];then - find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf - fi -} - -LICENSE="MIT" -COPYRIGHT="2000-2002 Johan Nilsson - 2010-2013 BurnItNow Maintainers" diff --git a/haiku-apps/burnitnow/burnitnow-beta6.bep b/haiku-apps/burnitnow/burnitnow-beta6.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-beta6.bep rename to haiku-apps/burnitnow/burnitnow-beta6.recipe index cb0e31b32..08a74e2e1 100644 --- a/haiku-apps/burnitnow/burnitnow-beta6.bep +++ b/haiku-apps/burnitnow/burnitnow-beta6.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-beta6/legacy cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-beta6/legacy BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow mkdir -p ${BURNITNOWDIR}/Docs diff --git a/haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch b/haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch new file mode 100644 index 000000000..a07409cfc --- /dev/null +++ b/haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch @@ -0,0 +1,146 @@ +diff -Naur burnitnow-beta5-svn/const.h burnitnow-beta5-svn-patch/const.h +--- burnitnow-beta5-svn/const.h 2012-11-20 19:48:42.045350912 +0100 ++++ burnitnow-beta5-svn-patch/const.h 2012-11-20 17:57:36.000000000 +0100 +@@ -64,7 +64,7 @@ + const uint32 AUDIO_NOFIX = 'AuNF'; + + const uint32 MISC_DAO = 'MiDA'; +-const uint32 MISC_BURNPROOF = 'MiBP'; ++const uint32 MISC_BURNFREE = 'MiBP'; + + + const uint32 BURN_WITH_CDRECORD = 'BWCR'; +diff -Naur burnitnow-beta5-svn/jpWindow.cpp burnitnow-beta5-svn-patch/jpWindow.cpp +--- burnitnow-beta5-svn/jpWindow.cpp 2012-11-20 19:48:42.007602176 +0100 ++++ burnitnow-beta5-svn-patch/jpWindow.cpp 2012-11-20 18:03:09.000000000 +0100 +@@ -65,7 +65,7 @@ + char* BURN_DIR; + BPath CDRTOOLS_DIR; + +-char BURNPROOF[30]; // driveropts = burnproof ++char BURNFREE[30]; // driveropts=burnfree + char PAD[10]; // -pad (audio) + char DAO[10]; // -dao + char NOFIX[10]; // -nofix (audio) +@@ -714,10 +714,10 @@ + else + strcpy(DAO, " "); + +- if (fBurnItPrefs->FindString("BURNPROOF", &tr) == B_OK) +- strcpy(BURNPROOF, tr); ++ if (fBurnItPrefs->FindString("BURNFREE", &tr) == B_OK) ++ strcpy(BURNFREE, tr); + else +- strcpy(BURNPROOF, " "); ++ strcpy(BURNFREE, " "); + + if (fBurnItPrefs->FindString("NOFIX", &tr) == B_OK) + strcpy(NOFIX, tr); +@@ -1398,11 +1398,11 @@ + strcpy(DAO, " "); + break; + +- case MISC_BURNPROOF: +- if (fPrefsView->fBurnProofCheckBox->Value() == 1) +- strcpy(BURNPROOF, "driveropts = burnproof"); ++ case MISC_BURNFREE: ++ if (fPrefsView->fBurnFreeCheckBox->Value() == 1) ++ strcpy(BURNFREE, "driveropts=burnfree"); + else +- strcpy(BURNPROOF, " "); ++ strcpy(BURNFREE, " "); + break; + + case MENU_FILE_ABOUT: +@@ -1643,7 +1643,7 @@ + fBurnItPrefs->SetString("DATA_STRING", DATA_STRING); + fBurnItPrefs->SetString("PAD", PAD); + fBurnItPrefs->SetString("DAO", DAO); +- fBurnItPrefs->SetString("BURNPROOF", BURNPROOF); ++ fBurnItPrefs->SetString("BURNFREE", BURNFREE); + fBurnItPrefs->SetString("SWAB", SWAB); + fBurnItPrefs->SetString("NOFIX", NOFIX); + fBurnItPrefs->SetString("PREEMP", PREEMP); +@@ -1812,7 +1812,7 @@ + commandstr << BURN_DIR << '"' << " | " << CDRTOOLS_DIR.Path(); + commandstr << "/cdrecord dev=" << fBurnDevice->scsiid; + commandstr << " speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF; ++ commandstr << " " << BURNFREE; + commandstr << "tsize" << tsize << " "; + commandstr << DAO << " -data "; + commandstr << DUMMYMODE ; +@@ -1822,7 +1822,7 @@ + commandstr.SetTo(CDRTOOLS_DIR.Path()); + commandstr << "/"; + commandstr << "cdrecord dev=" << fBurnDevice->scsiid << " speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF << " " << DAO; ++ commandstr << " " << BURNFREE << " " << DAO; + commandstr << " -data " << DUMMYMODE ; + commandstr << " " << EJECT ; + commandstr << " -v" ; // aw 110910 +@@ -1847,7 +1847,7 @@ + commandstr << "//"; + commandstr << "cdrecord dev=" << fBurnDevice->scsiid; + commandstr << " speed=" << BURN_SPD; +- commandstr << " " << BURNPROOF ; ++ commandstr << " " << BURNFREE ; + commandstr << " " << DAO; + commandstr << " " << PAD; + commandstr << " " << PREEMP ; +@@ -1880,7 +1880,7 @@ + commandstr << '"' << VOL_NAME << '"' << BURN_DIR << '"' << " |"; + commandstr << CDRTOOLS_DIR.Path() << "/cdrecord dev=" ; + commandstr << fBurnDevice->scsiid << "speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF; ++ commandstr << " " << BURNFREE; + commandstr << " tsize=" << tsize ; + commandstr << " " << DAO << " " << DUMMYMODE ; + commandstr << " " << EJECT << " " << PAD ; +@@ -1893,7 +1893,7 @@ + commandstr << "//"; + commandstr << "cdrecord dev=" << fBurnDevice->scsiid; + commandstr << " speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF << " " << DAO << " " << PAD ; ++ commandstr << " " << BURNFREE << " " << DAO << " " << PAD ; + commandstr << " " << PREEMP << " " << SWAB ; + commandstr << " " << NOFIX ; + commandstr << " " << DUMMYMODE ; +diff -Naur burnitnow-beta5-svn/PrefsView.cpp burnitnow-beta5-svn-patch/PrefsView.cpp +--- burnitnow-beta5-svn/PrefsView.cpp 2012-11-20 19:48:42.031981568 +0100 ++++ burnitnow-beta5-svn-patch/PrefsView.cpp 2012-11-20 18:02:46.000000000 +0100 +@@ -16,7 +16,7 @@ + + + extern char DAO[10]; +-extern char BURNPROOF[30]; ++extern char BURNFREE[30]; + + + PrefsView::PrefsView(BRect size) +@@ -59,9 +59,9 @@ + + r.top += 15; + r.bottom += 15; +- fBurnProofCheckBox = new BCheckBox(r, "burnproof", "BurnProof (read help)", new BMessage(MISC_BURNPROOF)); +- if (!strncmp(BURNPROOF, "driveropts = burnproof", 22)) +- fBurnProofCheckBox->SetValue(B_CONTROL_ON); ++ fBurnFreeCheckBox = new BCheckBox(r, "burnfree", "BurnFree (read help)", new BMessage(MISC_BURNFREE)); ++ if (!strncmp(BURNFREE, "driveropts=burnfree", 22)) ++ fBurnFreeCheckBox->SetValue(B_CONTROL_ON); + +- miscOptBox->AddChild(fBurnProofCheckBox); ++ miscOptBox->AddChild(fBurnFreeCheckBox); + } +diff -Naur burnitnow-beta5-svn/PrefsView.h burnitnow-beta5-svn-patch/PrefsView.h +--- burnitnow-beta5-svn/PrefsView.h 2012-11-20 19:48:42.015990784 +0100 ++++ burnitnow-beta5-svn-patch/PrefsView.h 2012-11-20 17:57:08.000000000 +0100 +@@ -15,7 +15,7 @@ + PrefsView(BRect size); + + BMenu* fRecordersMenu; +- BCheckBox* fDAOCheckBox, *fBurnProofCheckBox; ++ BCheckBox* fDAOCheckBox, *fBurnFreeCheckBox; + }; + + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep deleted file mode 100644 index e7b5d637e..000000000 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" -HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" -SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#36" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="caya" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD { - cd caya-gpl-protocols-36 - ./configure - jam -} - -INSTALL { - cd caya-gpl-protocols-36 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2010-2011 Casalinuovo Dario - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" - diff --git a/haiku-apps/caya/caya-0.HEAD.bep b/haiku-apps/caya/caya-0.HEAD.bep deleted file mode 100644 index 4b0144ad6..000000000 --- a/haiku-apps/caya/caya-0.HEAD.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/expat >= 2.0.1" -#CHECKSUM_MD5="" -BUILD { - cd caya-0.HEAD - ./configure - jam -} - -INSTALL { - cd caya-0.HEAD - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - ARCH=`readlink /boot/develop/abi/current |sed -e s!/!-!g` - cp generated/distro-haiku-${ARCH}-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-${ARCH}-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-2013.07.31.recipe b/haiku-apps/caya/caya-2013.07.31.recipe new file mode 100644 index 000000000..0a68638f9 --- /dev/null +++ b/haiku-apps/caya/caya-2013.07.31.recipe @@ -0,0 +1,71 @@ +SUMMARY="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="git+https://github.com/Barrett17/Caya.git#00440a3ffcafe58360638ed35c2be1e50bb63c65" +REVISION="2" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + caya = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libz + lib:libexpat + lib:libssl + " +BUILD_REQUIRES=" + devel:libexpat + devel:libssl + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:jam + cmd:which + cmd:tr + " + +#PATCHES="caya-$portVersion.patchset" +BUILD() +{ + mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application + echo $portVersion | tr -d . > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision + ./configure + jam +} + +INSTALL() +{ + mkdir -p $appsDir/Caya + mkdir -p $appsDir/Caya/smileys + mkdir -p $appsDir/Caya/protocols + mkdir -p $includeDir/caya/ + + cp generated/distro-haiku-*-debug/Caya $appsDir/Caya + cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/msn $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/gtalk $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/facebook $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/jabber $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/yahoo $appsDir/Caya/protocols + cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys + cp application/Caya.h $includeDir/caya/ + cp application/CayaProtocol.h $includeDir/caya/ + cp application/CayaConstants.h $includeDir/caya/ + cp application/CayaProtocolMessages.h $includeDir/caya/ +} + +LICENSE="MIT" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario + " +DESCRIPTION=" + Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, + google talk, and facebook. + " diff --git a/haiku-apps/caya/caya-236.bep b/haiku-apps/caya/caya-236.recipe similarity index 98% rename from haiku-apps/caya/caya-236.bep rename to haiku-apps/caya/caya-236.recipe index e828b4871..adb7367fc 100644 --- a/haiku-apps/caya/caya-236.bep +++ b/haiku-apps/caya/caya-236.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.21.6" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-236 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-236 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-240.bep b/haiku-apps/caya/caya-240.recipe similarity index 98% rename from haiku-apps/caya/caya-240.bep rename to haiku-apps/caya/caya-240.recipe index e18e4cf32..78f0e79d5 100644 --- a/haiku-apps/caya/caya-240.bep +++ b/haiku-apps/caya/caya-240.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.21.6" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-240 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-240 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-264.bep b/haiku-apps/caya/caya-264.recipe similarity index 98% rename from haiku-apps/caya/caya-264.bep rename to haiku-apps/caya/caya-264.recipe index 98ebf5180..c7a92ce6d 100644 --- a/haiku-apps/caya/caya-264.bep +++ b/haiku-apps/caya/caya-264.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-264 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-264 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-278.bep b/haiku-apps/caya/caya-278.recipe similarity index 98% rename from haiku-apps/caya/caya-278.bep rename to haiku-apps/caya/caya-278.recipe index 7b717dae6..ced844436 100644 --- a/haiku-apps/caya/caya-278.bep +++ b/haiku-apps/caya/caya-278.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-278 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-278 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-279.bep b/haiku-apps/caya/caya-279.recipe similarity index 98% rename from haiku-apps/caya/caya-279.bep rename to haiku-apps/caya/caya-279.recipe index 17b1b63d6..87fce694e 100644 --- a/haiku-apps/caya/caya-279.bep +++ b/haiku-apps/caya/caya-279.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-279 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-279 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-293.recipe b/haiku-apps/caya/caya-293.recipe new file mode 100644 index 000000000..fbf25e70e --- /dev/null +++ b/haiku-apps/caya/caya-293.recipe @@ -0,0 +1,60 @@ +SUMMARY="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#293" +REVISION="2" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + caya = $portVersion + lib:libexpat + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + devel:libexpat + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:jam + cmd:which + " + +BUILD() +{ + mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application + echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision + ./configure + jam +} + +INSTALL() +{ + mkdir -p $appsDir/Caya + mkdir -p $appsDir/Caya/smileys + mkdir -p $appsDir/Caya/protocols + mkdir -p $includeDir/caya/ + + cp generated/distro-haiku-*-debug/Caya $appsDir/Caya + cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols + cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys + cp application/Caya.h $includeDir/caya/ + cp application/CayaProtocol.h $includeDir/caya/ + cp application/CayaConstants.h $includeDir/caya/ + cp application/CayaProtocolMessages.h $includeDir/caya/ +} + +LICENSE="MIT" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario + " +DESCRIPTION=" + Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, + google talk, and facebook. + " diff --git a/haiku-apps/caya/patches/caya-2013.07.31.patchset b/haiku-apps/caya/patches/caya-2013.07.31.patchset new file mode 100644 index 000000000..f052287fc --- /dev/null +++ b/haiku-apps/caya/patches/caya-2013.07.31.patchset @@ -0,0 +1,124 @@ +From e3fab9c91f8ee9f702c65a8a30da98519457133f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Oct 2013 21:59:49 +0200 +Subject: Merge previous patches for Caya and Caya protocols + + * The repos have been merged + * The protocols can now use Caya files directly instead of liooking in +the system + +diff --git a/Jamrules b/Jamrules +index bee60b3..d40d6f5 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -51,12 +51,6 @@ CheckGccPlatform ; + # Echo "** Caya needs Curl" ; + #} + +-CheckCaya ; +-if ! $(HAVE_CAYA) { +- Echo "** Caya library is needed!" ; +- Exit 1 ; +-} +- + CheckOpenSSL ; + if ! $(HAVE_OPENSSL) { + Echo "** MSN, Jabber, GoogleTalk and Facebook protocols are disabled for lack of OpenSSL" ; +diff --git a/build/jam/CheckRules b/build/jam/CheckRules +index a444159..173b67b 100644 +--- a/build/jam/CheckRules ++++ b/build/jam/CheckRules +@@ -14,7 +14,7 @@ rule CheckGccPlatform + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; + if ! $(haveLibStdC++.R4) { + IS_GCC4_PLATFORM = 1 ; + Echo Using GCC4 platform ; +@@ -102,32 +102,3 @@ rule CheckLibYahoo2 + HAVE_LIBYAHOO2 = $(haveLibs) ; + } + } +- +-rule CheckCaya +-{ +- # CheckCaya +- # Check for Caya and defined HAVE_CAYA according, it also defines +- # CAYA_INCLUDE_DIR and CAYA_LIBRARY_DIR with location of respectively +- # include and library files. +- +- HAVE_CAYA = ; +- CAYA_INCLUDE_DIR = ; +- CAYA_LIBRARY_DIR = ; +- +- local haveHeaders = [ Glob $(COMMON_INCLUDE_DIRECTORY)/caya : CayaProtocol.h ] ; +- if $(haveHeaders) { +- CAYA_INCLUDE_DIR = $(COMMON_INCLUDE_DIRECTORY)/caya ; +- +-# local haveLibs = [ Glob $(COMMON_LIB_DIRECTORY) : libinfopopper.so ] ; +-# if $(haveLibs) { +-# CAYA_LIBRARY_DIR = $(COMMON_LIB_DIRECTORY) ; +- +- Echo Caya Headers: $(CAYA_INCLUDE_DIR) ; +-# Echo Caya Libs: $(CAYA_LIBRARY_DIR) ; +-# } +- +-# HAVE_CAYA = $(haveLibs) ; +- } +- +- HAVE_CAYA = $(haveHeaders) ; +-} +diff --git a/configure b/configure +index 6879cee..ca177ba 100755 +--- a/configure ++++ b/configure +@@ -122,22 +122,21 @@ MIMESET = ${mimesetbin} ; + SETVERSION = ${setversionbin} ; + COPYATTR = ${copyattrbin} ; + +-COMMON_DIRECTORY = $(finddir B_COMMON_DIRECTORY) ; +-COMMON_BIN_DIRECTORY = $(finddir B_COMMON_BIN_DIRECTORY) ; +-COMMON_INCLUDE_DIRECTORY = $(finddir B_COMMON_DIRECTORY)/include ; +-COMMON_LIB_DIRECTORY = $(finddir B_COMMON_LIB_DIRECTORY) ; +-COMMON_SERVERS_DIRECTORY = $(finddir B_COMMON_SERVERS_DIRECTORY) ; +-COMMON_ADDONS_DIRECTORY = $(finddir B_COMMON_ADDONS_DIRECTORY) ; +-COMMON_DEVELOP_DIRECTORY = $(finddir B_COMMON_DEVELOP_DIRECTORY) ; ++COMMON_BIN_DIRECTORY = $binDir ; ++COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; ++COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; ++COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ; ++COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ; ++COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; + USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ; +-USER_INCLUDE_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/include ; ++USER_INCLUDE_DIRECTORY = $includeDir ; + SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; +-SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; ++SYSTEM_LIB_DIRECTORY = $libDir ; + BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ; + PREFERENCES_DIRECTORY = $(finddir B_PREFERENCES_DIRECTORY) ; + USER_PREFERENCES_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/be/Preferences ; +-APPS_DIRECTORY = $(finddir B_APPS_DIRECTORY) ; +-CAYA_DIRECTORY = $(finddir B_APPS_DIRECTORY)/Caya ; ++APPS_DIRECTORY = $appsDir ; ++CAYA_DIRECTORY = $appsDir/Caya ; + + DEFINES += ${defines} ; + EOF +diff --git a/protocols/Jamfile b/protocols/Jamfile +index 48298ae..95482a6 100644 +--- a/protocols/Jamfile ++++ b/protocols/Jamfile +@@ -1,5 +1,7 @@ + SubDir TOP protocols ; + ++CAYA_INCLUDE_DIR = $(TOP) application ; ++ + # Include all the components. + SubInclude TOP protocols aim ; + SubInclude TOP protocols xmpp ; +-- +1.8.3.4 + diff --git a/haiku-apps/caya/patches/caya-293.patchset b/haiku-apps/caya/patches/caya-293.patchset new file mode 100644 index 000000000..05202ecd3 --- /dev/null +++ b/haiku-apps/caya/patches/caya-293.patchset @@ -0,0 +1,49 @@ +From abd4aac88a07ea0a9967be553833a121bf98ccf9 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 13:17:26 +0200 +Subject: Fix gcc4 detection + + +diff --git a/build/jam/CheckRules b/build/jam/CheckRules +index 6fbc213..294fab7 100644 +--- a/build/jam/CheckRules ++++ b/build/jam/CheckRules +@@ -14,7 +14,7 @@ rule CheckGccPlatform + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; + if ! $(haveLibStdC++.R4) { + IS_GCC4_PLATFORM = 1 ; + Echo Using GCC4 platform ; +-- +1.8.3.4 + + +From db90c28cb36b59a010abec5406f77c1c4135f378 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 13:19:23 +0200 +Subject: Let haikuporter compute the version + + * The .svn dir isn't available in the chroot, so there is no way it can +be used to detect the SVN revision. + +diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules +index 292a2a5..314c4d7 100644 +--- a/build/jam/MainBuildRules ++++ b/build/jam/MainBuildRules +@@ -368,9 +368,7 @@ rule CreateSVNRevisionFile file + { + # CreateSVNRevisionFile + +- local svnEntries = entries ; +- SEARCH on $(svnEntries) = [ FDirName $(TOP) .svn ] ; +- Depends $(file) : $(svnEntries) ; ++ # Let haikuporter do it as the .svn dir is removed on checkout + } + + actions CreateSVNRevisionFile +-- +1.8.3.4 + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe index 12cc49369..225624b42 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd caya-gpl-protocols-0.HEAD ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-0.HEAD mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols PLATFORM=`setgcc|tr / -|cut -f3 -d' '` diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe index 811ae698c..93816baed 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-19 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-19 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe index 7d9006de3..e6c00dd27 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-24 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-24 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe index af80c8f9b..f6df24bd5 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-35 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-35 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe new file mode 100644 index 000000000..cb9dd4d2c --- /dev/null +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe @@ -0,0 +1,51 @@ +SUMMARY="MSN and XMPPprotocols for Caya" +HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" +SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#36" +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" + +#SUPPLEMENTS="caya" +PROVIDES=" + caya_gpl_protocols = $portVersion + " +SUPPLEMENTS="caya" +BUILD_REQUIRES=" + caya + lib:libssl + devel:libssl + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:jam + cmd:gcc + cmd:which + " + +PATCHES="caya_gpl_protocols-36.patchset" + +BUILD() +{ + includeDir=$includeDir ./configure + jam +} + +INSTALL() +{ + mkdir -p $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/msn $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/gtalk $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/facebook $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/jabber $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/yahoo $appsDir/Caya/protocols +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2010-2011 Casalinuovo Dario + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" +DESCRIPTION=" + Caya is a multi-protocol IM client. + This package enables support for XMPP (jabber, google talk, facebook) + and MSN protocols. + " diff --git a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset new file mode 100644 index 000000000..f928bb875 --- /dev/null +++ b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset @@ -0,0 +1,330 @@ +From 9be75f010b3e37caf04d79ede962676731c6ded9 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Thu, 3 Oct 2013 22:52:00 +0200 +Subject: Import gcc2 compatibility fixes. + + +diff --git a/libs/libgloox/connectionbosh.cpp b/libs/libgloox/connectionbosh.cpp +index f0a1124..c433564 100644 +--- a/libs/libgloox/connectionbosh.cpp ++++ b/libs/libgloox/connectionbosh.cpp +@@ -303,7 +303,7 @@ namespace gloox + + bool ci_equal( char ch1, char ch2 ) + { +- return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 ); ++ return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 ); + } + + std::string::size_type ci_find( const std::string& str1, const std::string& str2 ) +diff --git a/libs/libgloox/gloox.h b/libs/libgloox/gloox.h +index b86462e..8186d20 100644 +--- a/libs/libgloox/gloox.h ++++ b/libs/libgloox/gloox.h +@@ -1214,7 +1214,7 @@ namespace gloox + /** + * A multimap of strings. + */ +- typedef std::multimap StringMultiMap; ++ typedef std::multimap StringMultiMap; + + class StanzaExtension; + /** +diff --git a/libs/libgloox/parser.cpp b/libs/libgloox/parser.cpp +index a72fbdc..5884624 100644 +--- a/libs/libgloox/parser.cpp ++++ b/libs/libgloox/parser.cpp +@@ -141,7 +141,7 @@ namespace gloox + { + if( pos + needle.length() <= data.length() ) + { +- if( !data.compare( pos, needle.length(), needle ) ) ++ if( !data.compare(pos, needle.length(), needle ) ) + { + pos += needle.length() - 1; + return ForwardFound; +diff --git a/libs/libgloox/siprofileft.cpp b/libs/libgloox/siprofileft.cpp +index 4836efd..aeafac4 100644 +--- a/libs/libgloox/siprofileft.cpp ++++ b/libs/libgloox/siprofileft.cpp +@@ -84,11 +84,11 @@ namespace gloox + DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" ); + StringMultiMap sm; + if( streamTypes & FTTypeS5B ) +- sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); ++ sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); + if( streamTypes & FTTypeIBB ) +- sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); ++ sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); + if( streamTypes & FTTypeOOB ) +- sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); ++ sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); + dff->setOptions( sm ); + feature->addChild( df.tag() ); + +diff --git a/libs/libmsn/Jamfile b/libs/libmsn/Jamfile +index ec7bd45..02a1dc4 100644 +--- a/libs/libmsn/Jamfile ++++ b/libs/libmsn/Jamfile +@@ -2,6 +2,7 @@ SubDir TOP libs libmsn ; + + SubDirSysHdrs [ FDirName $(TOP) ] ; + SubDirSysHdrs [ FDirName $(TOP) libs ] ; ++SubDirSysHdrs [ FDirName $(TOP) libs libmsn ] ; + + SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; + +diff --git a/libs/libmsn/connection.h b/libs/libmsn/connection.h +index c469460..c92539b 100644 +--- a/libs/libmsn/connection.h ++++ b/libs/libmsn/connection.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #ifdef _MSC_VER + #pragma warning( disable : 4290 ) +diff --git a/libs/libmsn/message.cpp b/libs/libmsn/message.cpp +index aedf463..26eebd0 100644 +--- a/libs/libmsn/message.cpp ++++ b/libs/libmsn/message.cpp +@@ -124,7 +124,7 @@ namespace MSN + { + std::string color = this->getFormatInfo()["CO"]; + assert(color.size() <= 6 && color.size() >= 0); +- color.insert(0U, 6 - color.size(), '0'); ++ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); + int r = 0, g = 0, b = 0; + + b = strtol(color.substr(0, 2).c_str(), NULL, 16); +@@ -167,7 +167,7 @@ namespace MSN + + void Message::setColor(std::string color) + { +- color.insert(0U, 6 - color.size(), '0'); ++ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); + int r = 0, g = 0, b = 0; + + r = strtol(color.substr(0, 2).c_str(), NULL, 16); +diff --git a/libs/libmsn/msnobject.cpp b/libs/libmsn/msnobject.cpp +index 4a83221..8192c3a 100644 +--- a/libs/libmsn/msnobject.cpp ++++ b/libs/libmsn/msnobject.cpp +@@ -30,7 +30,7 @@ namespace MSN + { + void MSNObject::addMSNObject(std::string filename, int Type) + { +- std::ifstream::pos_type size; ++ std::streampos size; + char * memblock; + SHA_CTX ctx; + unsigned char digest[SHA_DIGEST_LENGTH]; +diff --git a/libs/libmsn/util.cpp b/libs/libmsn/util.cpp +index b2f843f..5e73f54 100644 +--- a/libs/libmsn/util.cpp ++++ b/libs/libmsn/util.cpp +@@ -146,8 +146,8 @@ namespace MSN + it1 != s1.end() && it2 != s2.end(); + ++it1, ++it2) + { +- if (std::toupper(*it1) != std::toupper(*it2)) +- return std::toupper(*it1) - std::toupper(*it2); ++ if (toupper(*it1) != toupper(*it2)) ++ return toupper(*it1) - toupper(*it2); + } + size_t size1 = s1.size(), size2 = s2.size(); + return (int) (size1 - size2); +@@ -358,11 +358,11 @@ namespace MSN + int FileSize(const char* sFileName) + { + std::ifstream f; +- f.open(sFileName, std::ios_base::binary | std::ios_base::in); ++ f.open(sFileName, std::ios::binary | std::ios::in); + if (!f.good() || f.eof() || !f.is_open()) { return 0; } +- f.seekg(0, std::ios_base::beg); +- std::ifstream::pos_type begin_pos = f.tellg(); +- f.seekg(0, std::ios_base::end); ++ f.seekg(0, std::ios::beg); ++ std::streampos begin_pos = f.tellg(); ++ f.seekg(0, std::ios::end); + return static_cast(f.tellg() - begin_pos); + } + +diff --git a/libs/libyahoo2/yahoo_httplib.c b/libs/libyahoo2/yahoo_httplib.c +index 049f6e7..d2f6a53 100755 +--- a/libs/libyahoo2/yahoo_httplib.c ++++ b/libs/libyahoo2/yahoo_httplib.c +@@ -29,19 +29,7 @@ + #include + #include + +-#if STDC_HEADERS + # include +-#else +-# if !HAVE_STRCHR +-# define strchr index +-# define strrchr rindex +-# endif +-char *strchr(), *strrchr(); +-# if !HAVE_MEMCPY +-# define memcpy(d, s, n) bcopy ((s), (d), (n)) +-# define memmove(d, s, n) bcopy ((s), (d), (n)) +-# endif +-#endif + + #include + #if HAVE_UNISTD_H +@@ -374,7 +362,6 @@ void yahoo_http_get(int id, const char *url, const char *cookies, int http11, + void yahoo_http_head(int id, const char *url, const char *cookies, int len, + char *payload, yahoo_get_fd_callback callback, void *data) + { +- printf("yahoo_http_read\n"); + char host[255]; + int port = 80; + char path[255]; +diff --git a/protocols/msn/MSN.cpp b/protocols/msn/MSN.cpp +index 087b949..e987c27 100644 +--- a/protocols/msn/MSN.cpp ++++ b/protocols/msn/MSN.cpp +@@ -52,7 +52,7 @@ const char* kProtocolName = "MSN Protocol"; + const uint32 kAvatarCheckMessage = 'AVMs'; + + struct pollfd* kPollSockets = NULL; +-struct ssl { ++struct Ssl { + bool isSSL; + bool isConnected; + SSL *ssl; +@@ -718,7 +718,7 @@ void MSNP::registerSocket(void *s, int reading, int writing, bool isSSL) + return; + } + +- kSocketsSsl = (struct ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct ssl)); ++ kSocketsSsl = (struct Ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct Ssl)); + if (kSocketsSsl == NULL) { + Error("Memory Error!!\n", NULL); + return; +diff --git a/protocols/xmpp/Jamfile b/protocols/xmpp/Jamfile +index 34351ec..3848ff7 100644 +--- a/protocols/xmpp/Jamfile ++++ b/protocols/xmpp/Jamfile +@@ -2,6 +2,7 @@ SubDir TOP protocols xmpp ; + + SubDirSysHdrs [ FDirName $(TOP) ] ; + SubDirSysHdrs [ FDirName $(TOP) libs ] ; ++SubDirSysHdrs [ FDirName $(TOP) libs libgloox ] ; + SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; + SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ; + +-- +1.8.3.4 + + +From 26bcbc64e44c24a09085fa6d4d86bf05e2213035 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 14:01:13 +0200 +Subject: Fixes for directory moves in PM-Haiku + + +diff --git a/build/jam/CheckRules b/build/jam/CheckRules +index ac2e326..334eee2 100644 +--- a/build/jam/CheckRules ++++ b/build/jam/CheckRules +@@ -14,7 +14,7 @@ rule CheckGccPlatform + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; + if ! $(haveLibStdC++.R4) { + IS_GCC4_PLATFORM = 1 ; + Echo Using GCC4 platform ; +diff --git a/configure b/configure +index 6879cee..55a6251 100755 +--- a/configure ++++ b/configure +@@ -122,22 +122,21 @@ MIMESET = ${mimesetbin} ; + SETVERSION = ${setversionbin} ; + COPYATTR = ${copyattrbin} ; + +-COMMON_DIRECTORY = $(finddir B_COMMON_DIRECTORY) ; +-COMMON_BIN_DIRECTORY = $(finddir B_COMMON_BIN_DIRECTORY) ; +-COMMON_INCLUDE_DIRECTORY = $(finddir B_COMMON_DIRECTORY)/include ; +-COMMON_LIB_DIRECTORY = $(finddir B_COMMON_LIB_DIRECTORY) ; +-COMMON_SERVERS_DIRECTORY = $(finddir B_COMMON_SERVERS_DIRECTORY) ; +-COMMON_ADDONS_DIRECTORY = $(finddir B_COMMON_ADDONS_DIRECTORY) ; +-COMMON_DEVELOP_DIRECTORY = $(finddir B_COMMON_DEVELOP_DIRECTORY) ; ++COMMON_BIN_DIRECTORY = $binDir ; ++COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; ++COMMON_LIB_DIRECTORY = $libDir ; ++COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ; ++COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ; ++COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; + USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ; +-USER_INCLUDE_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/include ; ++USER_INCLUDE_DIRECTORY = $includeDir ; + SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; +-SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; ++SYSTEM_LIB_DIRECTORY = $libDir ; + BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ; + PREFERENCES_DIRECTORY = $(finddir B_PREFERENCES_DIRECTORY) ; + USER_PREFERENCES_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/be/Preferences ; +-APPS_DIRECTORY = $(finddir B_APPS_DIRECTORY) ; +-CAYA_DIRECTORY = $(finddir B_APPS_DIRECTORY)/Caya ; ++APPS_DIRECTORY = $appsDir ; ++CAYA_DIRECTORY = $appsDir/Caya ; + + DEFINES += ${defines} ; + EOF +-- +1.8.3.4 + + +From 31ebae4d014682f95d0e1cc0d0ec6444619d59f2 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 14:12:42 +0200 +Subject: Use BeOS broken prototype for string::compare + + * Our C++ lib has the args in the wrong order + +diff --git a/libs/libgloox/parser.cpp b/libs/libgloox/parser.cpp +index 5884624..5a406d2 100644 +--- a/libs/libgloox/parser.cpp ++++ b/libs/libgloox/parser.cpp +@@ -141,7 +141,7 @@ namespace gloox + { + if( pos + needle.length() <= data.length() ) + { +- if( !data.compare(pos, needle.length(), needle ) ) ++ if( !data.compare(needle, pos, needle.length()) ) + { + pos += needle.length() - 1; + return ForwardFound; +-- +1.8.3.4 + + +From 53370d0138ccb68d6fb4eb7b06ae1493fab140b7 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 14:31:20 +0200 +Subject: Fix lib directory so configure script finds OpenSSL + + +diff --git a/configure b/configure +index 55a6251..ca177ba 100755 +--- a/configure ++++ b/configure +@@ -124,7 +124,7 @@ COPYATTR = ${copyattrbin} ; + + COMMON_BIN_DIRECTORY = $binDir ; + COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; +-COMMON_LIB_DIRECTORY = $libDir ; ++COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; + COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ; + COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ; + COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; +-- +1.8.3.4 + diff --git a/haiku-apps/clockwerk/clockwerk-78.bep b/haiku-apps/clockwerk/clockwerk-78.recipe similarity index 96% rename from haiku-apps/clockwerk/clockwerk-78.bep rename to haiku-apps/clockwerk/clockwerk-78.recipe index caa9ed8d3..85399a2e8 100644 --- a/haiku-apps/clockwerk/clockwerk-78.bep +++ b/haiku-apps/clockwerk/clockwerk-78.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd clockwerk-78 jam } -INSTALL { +INSTALL() +{ cd clockwerk-78 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk diff --git a/haiku-apps/clockwerk/clockwerk-80.bep b/haiku-apps/clockwerk/clockwerk-80.recipe similarity index 96% rename from haiku-apps/clockwerk/clockwerk-80.bep rename to haiku-apps/clockwerk/clockwerk-80.recipe index 7da9b2836..b0fdc9f33 100644 --- a/haiku-apps/clockwerk/clockwerk-80.bep +++ b/haiku-apps/clockwerk/clockwerk-80.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd clockwerk-80 jam } -INSTALL { +INSTALL() +{ cd clockwerk-80 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.bep b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe similarity index 96% rename from haiku-apps/documentviewer/documentviewer-0.3.2.bep rename to haiku-apps/documentviewer/documentviewer-0.3.2.recipe index 510b358a2..40b750dbb 100644 --- a/haiku-apps/documentviewer/documentviewer-0.3.2.bep +++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe @@ -8,12 +8,14 @@ DEPEND="media-libs/fitz >= 1.0 media-libs/djvulibre >= 3.5.25" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd documentviewer-0.3.2 jam } -INSTALL { +INSTALL() +{ cd documentviewer-0.3.2 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer cp application/DocumentViewer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer diff --git a/haiku-apps/friss/friss-0.7-svn.bep b/haiku-apps/friss/friss-0.7_svn.recipe similarity index 97% rename from haiku-apps/friss/friss-0.7-svn.bep rename to haiku-apps/friss/friss-0.7_svn.recipe index 627e6cc41..4ab354445 100644 --- a/haiku-apps/friss/friss-0.7-svn.bep +++ b/haiku-apps/friss/friss-0.7_svn.recipe @@ -4,7 +4,8 @@ SRC_URI="svn://pulkomandy.tk/friss" REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd friss-0.7-svn/src if [ -n "$(setgcc | grep '4')" ]; then sed -i 's/lstdc++.r4/lstdc++/' Jamfile @@ -14,7 +15,8 @@ BUILD { chmod 755 ../bin/apps/friss/FRiSS } -INSTALL { +INSTALL() +{ cd friss-0.7-svn mkdir -p ${DESTDIR}/boot/apps/FRiSS cp -a bin/apps/friss/* ${DESTDIR}/boot/apps/FRiSS diff --git a/haiku-apps/globe/globe-0.4.bep b/haiku-apps/globe/globe-0.4.recipe similarity index 96% rename from haiku-apps/globe/globe-0.4.bep rename to haiku-apps/globe/globe-0.4.recipe index 69c8e3dbe..99039727e 100644 --- a/haiku-apps/globe/globe-0.4.bep +++ b/haiku-apps/globe/globe-0.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="61601576e59b0dc5ab6364f684a47236" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd globe0.4 make } -INSTALL { +INSTALL() +{ cd globe0.4 TARGET_DIR=${DESTDIR}`finddir B_APPS_DIRECTORY`/Globe mkdir -p $TARGET_DIR diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep deleted file mode 100644 index 72c54af13..000000000 --- a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="Twitter client for Haiku OS" -HOMEPAGE="http://code.google.com/p/haikutwitter/" -SRC_URI="svn+http://haikutwitter.googlecode.com/svn/trunk/HaikuTwitter" -REVISION="1" -STATUS_HAIKUE="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="net-misc/curl >= 7.26.0" -BUILD { - cd haikutwitter-1.0-svn - make -} - -INSTALL { - cd haikutwitter-1.0-svn - make install -} -LICENSE="MIT" -COPYRIGHT="2010-2012 Martin Hebnes Pedersen" diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0.bep b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe similarity index 95% rename from haiku-apps/haikutwitter/haikutwitter-1.0.bep rename to haiku-apps/haikutwitter/haikutwitter-1.0.recipe index 008d6f9ba..69e242081 100644 --- a/haiku-apps/haikutwitter/haikutwitter-1.0.bep +++ b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKUE="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="net-misc/curl >= 7.26.0" -BUILD { +BUILD() +{ cd haikutwitter-1.0 make } -INSTALL { +INSTALL() +{ cd haikutwitter-1.0 make install } diff --git a/haiku-apps/hare/hare-beta1-git.bep b/haiku-apps/hare/hare-beta1_git.recipe similarity index 96% rename from haiku-apps/hare/hare-beta1-git.bep rename to haiku-apps/hare/hare-beta1_git.recipe index d7ad0f796..5bb48106f 100644 --- a/haiku-apps/hare/hare-beta1-git.bep +++ b/haiku-apps/hare/hare-beta1_git.recipe @@ -9,13 +9,15 @@ DEPEND="media-libs/lame > 3.98.4 #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd hare-beta1-git cmake . make } -INSTALL { +INSTALL() +{ cd hare-beta1-git HARE_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Hare mkdir -p ${HARE_DIR} diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe new file mode 100644 index 000000000..174a7daa3 --- /dev/null +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -0,0 +1,53 @@ +SUMMARY="Easy to use Keymap Switcher for Haiku" +DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what you used to have in windows to change the keymap with hotkeys, but has some additional features (and lacks some, for sure)." +HOMEPAGE="http://www.sf.net/projects/switcher" +COPYRIGHT="1999-2003 Stas Maximov" +LICENSE="BSD (4-clause)" +SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_10" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + keymapswitcher = $portVersion compat >= 1.2.7 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + # Fix makefile not to use BUILDHOME as an install dir variable. + sed -i "s,BUILDHOME,HPKG_INSTALL_DIR,g" makefile +} + +BUILD() +{ + make $jobArgs BUILDHOME=/boot/common/develop HPKG_INSTALL_DIR=$prefix +} + +INSTALL() +{ + # We're not interested in the package, but that target copies the + # interesting files to a well-known directory structure. Otherwise we'd have + # to find out the name of the object dir and collect everything ourselves. + # Obviously an install target would be even better. + make BUILDHOME=/boot/common/develop HPKG_INSTALL_DIR=$prefix hpkg + + # move misplaced KeymapSwitcher + mkdir $preferencesDir + mv $binDir/KeymapSwitcher $preferencesDir + + addPreferencesDeskbarSymlink $preferencesDir/KeymapSwitcher +} diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe new file mode 100644 index 000000000..d73ddd84a --- /dev/null +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -0,0 +1,67 @@ +SUMMARY="Easy to use Keymap Switcher for Haiku" +DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what you used to have in windows to change the keymap with hotkeys, but has some additional features (and lacks some, for sure)." +HOMEPAGE="http://www.sf.net/projects/switcher" +COPYRIGHT="1999-2003 Stas Maximov" +LICENSE="BSD (4-clause)" +SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)#release_1_2_7_9" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + keymapswitcher = $portVersion compat >= 1.2.7 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + # TODO: Remove once in Haiku PM is in sync with master! + + # B_TRANSLATION_CONTEXT was formerly known as B_TRANSLATE_CONTEXT. + sed -i "s,B_TRANSLATION_CONTEXT,B_TRANSLATE_CONTEXT," \ + DeskView.cpp \ + KeymapSwitcher.cpp \ + SettingsWindow.cpp + + # add liblocale to libraries to link against + sed -i "s,^\(LIBS=.*\),\1 locale," app.makefile + + # patch away building the bindcatalogs target + sed -i "s,bindcatalogs,," makefile +} + +BUILD() +{ + make $jobArgs BUILDHOME=/boot/common/develop +} + +INSTALL() +{ + # We're not interested in the package, but that target copies the + # interesting files to a well-known directory structure. Otherwise we'd have + # to find out the name of the object dir and collect everything ourselves. + # Obviously an install target would be even better. + make BUILDHOME=/boot/common/develop package + + addOnInstallDir=$addOnsDir/input_server/filters + mkdir -p $addOnInstallDir $preferencesDir + cp -a dist/common/add-ons/input_server/filters/keymap_switcher \ + $addOnInstallDir + cp -a dist/common/bin/KeymapSwitcher $preferencesDir + + # TODO: Also copy the catalogs! + # TODO: Declare the Deskbar menu symlink! +} diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep deleted file mode 100644 index 79bb31fb2..000000000 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="keymap switcher for Haiku." -HOMEPAGE="http://www.switcher.sourceforge.net" -SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD { - cd keymapswitcher-1.2.7 - make -} - -INSTALL { - cd keymapswitcher-1.2.7 - make package - cp dist/*.zip ../.. -} - -COPYRIGHT="1999-2003 Stas Maximov" -LICENSE="BSD (4-clause)" diff --git a/haiku-apps/mkdepend/mkdepend-1.7.bep b/haiku-apps/mkdepend/mkdepend-1.7.bep deleted file mode 100644 index eaa3d9d92..000000000 --- a/haiku-apps/mkdepend/mkdepend-1.7.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="mkdepend" -HOMEPAGE="http://www.bearnip.com/lars/be/mkdepend.html" -SRC_URI="http://ports.haiku-files.org/export/1051/haikuports/trunk/haiku-apps/mkdepend/source/mkdepend-1.7.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" -BUILD { - cd mkdepend-1.7 - rc mkdepend.rdef - xres mkdepend.rsrc - gcc args.c getargs.c main.c nodes.c reader.c util.c -o mkdepend -} - -INSTALL { - cd mkdepend-1.7 - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -a mkdepend ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` -} -LICENSE="MIT" -COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe new file mode 100644 index 000000000..d79500d01 --- /dev/null +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -0,0 +1,40 @@ +SUMMARY="MkDepend for BeOS" +DESCRIPTION="MkDepend scans C-source files recursively for includes and writes the found dependency trees into an existing makefile." +HOMEPAGE="http://www.bearnip.com/lars/be/mkdepend.html" +LICENSE="MIT" +COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" +#SRC_URI="http://ports.haiku-files.org/export/1051/haikuports/trunk/haiku-apps/mkdepend/source/mkdepend-1.7.zip" +SRC_URI="source/mkdepend-1.7.zip" +CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + mkdepend = $portVersion + cmd:mkdepend = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rc mkdepend.rdef + xres mkdepend.rsrc + gcc args.c getargs.c main.c nodes.c reader.c util.c -o mkdepend +} + +INSTALL() +{ + mkdir -p $binDir + cp -a mkdepend $binDir +} diff --git a/haiku-apps/open-sum-it/open-sum-it-108.bep b/haiku-apps/open_sum_it/open_sum_it-108.recipe similarity index 96% rename from haiku-apps/open-sum-it/open-sum-it-108.bep rename to haiku-apps/open_sum_it/open_sum_it-108.recipe index f866edbdd..a37479aee 100644 --- a/haiku-apps/open-sum-it/open-sum-it-108.bep +++ b/haiku-apps/open_sum_it/open_sum_it-108.recipe @@ -7,12 +7,14 @@ DEPEND="bsl >= 108 rez >= 108" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd open-sum-it-108 make } -INSTALL { +INSTALL() +{ cd open-sum-it-108 APPS_DIR=`finddir B_APPS_DIRECTORY` mkdir -p ${DESTDIR}${APPS_DIR}/Open-Sum-It diff --git a/haiku-apps/paladin/paladin-1.3.bep b/haiku-apps/paladin/paladin-1.3.recipe similarity index 98% rename from haiku-apps/paladin/paladin-1.3.bep rename to haiku-apps/paladin/paladin-1.3.recipe index cb7986d52..dc671765c 100644 --- a/haiku-apps/paladin/paladin-1.3.bep +++ b/haiku-apps/paladin/paladin-1.3.recipe @@ -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/ diff --git a/haiku-apps/paladin/paladin-1.3-hg.bep b/haiku-apps/paladin/paladin-1.3_hg.recipe similarity index 98% rename from haiku-apps/paladin/paladin-1.3-hg.bep rename to haiku-apps/paladin/paladin-1.3_hg.recipe index fccfd5c99..e107fa3fc 100644 --- a/haiku-apps/paladin/paladin-1.3-hg.bep +++ b/haiku-apps/paladin/paladin-1.3_hg.recipe @@ -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/ diff --git a/haiku-apps/paladin/patches/paladin-1.3.patch b/haiku-apps/paladin/patches/paladin-1.3.patch index d4c81bbc1..2a750a736 100644 --- a/haiku-apps/paladin/patches/paladin-1.3.patch +++ b/haiku-apps/paladin/patches/paladin-1.3.patch @@ -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 diff --git a/haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset b/haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset new file mode 100644 index 000000000..4173d4e5c --- /dev/null +++ b/haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset @@ -0,0 +1,104 @@ +From 38fe29f686b24b11bd946e9cb26975d5b0e540da Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:09:09 +0000 +Subject: Fix development library and header paths + + +diff --git a/Jamrules b/Jamrules +index a3c76de..a18dc02 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -11,7 +11,7 @@ if $(OS) = HAIKU { + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local hasLibStdC++.R4 = [ Glob /boot/system/lib : libstdc++.r4.so ] ; + if ! $(hasLibStdC++.R4) { + IS_GCC_4_PLATFORM = 1 ; + } +diff --git a/build/BuildSettings b/build/BuildSettings +index 31b03c4..2b79ca7 100644 +--- a/build/BuildSettings ++++ b/build/BuildSettings +@@ -48,7 +48,7 @@ if $(haveHeadersPcre) { + CCFLAGS += -isystem /boot/develop/headers/pcre ; + C++FLAGS += -isystem /boot/develop/headers/pcre ; + } else { +- haveHeadersPcre = [ GLOB /boot/common/include : pcre.h ] ; ++ haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ; + if ! $(haveHeadersPcre) { + haveHeadersPcre = [ GLOB /boot/home/config/include : pcre.h ] ; + if ! $(haveHeadersPcre) { +-- +1.8.3.4 + + +From 84b46dea0f1addae8e3fc1248a3f58e73a799690 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:11:55 +0000 +Subject: MainBuildRules: Use -shared instead of -nostart + + +diff --git a/build/MainBuildRules b/build/MainBuildRules +index 8bd12be..119b081 100644 +--- a/build/MainBuildRules ++++ b/build/MainBuildRules +@@ -64,7 +64,7 @@ rule SharedLibrary + MakeLocate $(lib) : $(LOCATE_MAIN_TARGET) ; + local linkFlags ; + if $(OSPLAT) = X86 { +- linkFlags = -nostart -Xlinker -soname=\"$(lib)\" ++ linkFlags = -shared -Xlinker -soname=\"$(lib)\" + -Xlinker --no-undefined ; + } else { + linkFlags = -xms ; +-- +1.8.3.4 + + +From d1ebe32fb70e71545959bfd6b848f6c1858ea96a Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:19:16 +0000 +Subject: node_ref::operator<() is now defined in Haiku + + +diff --git a/Sources/CDocIO.cpp b/Sources/CDocIO.cpp +index 6ad237e..e4f19aa 100644 +--- a/Sources/CDocIO.cpp ++++ b/Sources/CDocIO.cpp +@@ -199,16 +199,6 @@ static bool CopyFile(BEntry& srcEntry, BEntry& dstEntry) + return true; + } + +-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0 +-bool operator< (const node_ref& left, const node_ref& right) +-{ +- if (left.node < right.node) +- return true; +- else +- return left.device < right.device; +-} +-#endif +- + + // #pragma mark - CDocIO + +diff --git a/Sources/CDocIO.h b/Sources/CDocIO.h +index 1eed6ef..b81280c 100644 +--- a/Sources/CDocIO.h ++++ b/Sources/CDocIO.h +@@ -58,10 +58,6 @@ inline time_t CDocIO::LastSaved() const + return fLastSaved; + } + +-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0 +-bool operator< (const node_ref& left, const node_ref& right); +-#endif +- + class CLocalDocIO : public CDocIO + { + public: +-- +1.8.3.4 + diff --git a/haiku-apps/pe/pe-2.4.2-597.bep b/haiku-apps/pe/pe-2.4.2-597.bep deleted file mode 100644 index d8700b6a1..000000000 --- a/haiku-apps/pe/pe-2.4.2-597.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Pe - Programmer's Editor" -HOMEPAGE="http://pe-editor.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/pe-editor/trunk#597" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00" -#CHECKSUM_MD5="" -BUILD { - cd pe-2.4.2-597 - jam -} - -INSTALL { - cd pe-2.4.2-597/generated - if [ -d distro ];then - mv -f distro Pe - fi - mkdir -p ${DESTDIR}/boot/apps - cp -a Pe ${DESTDIR}/boot/apps - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2009 Team Pe" diff --git a/haiku-apps/pe/pe-2.4.3-600.bep b/haiku-apps/pe/pe-2.4.3-600.bep deleted file mode 100644 index bc857b363..000000000 --- a/haiku-apps/pe/pe-2.4.3-600.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Pe - Programmer's Editor" -HOMEPAGE="http://pe-editor.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/pe-editor/trunk#600" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00" -#CHECKSUM_MD5="" -BUILD { - cd pe-2.4.3-600 - jam -} - -INSTALL { - cd pe-2.4.3-600 - mkdir -p ${DESTDIR}/boot/apps - cp -a generated/distro ${DESTDIR}/boot/apps/Pe - cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z "${DESTDIR}" ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2010 Team Pe" diff --git a/haiku-apps/pe/pe-2.4.3-hg.bep b/haiku-apps/pe/pe-2.4.3-hg.bep deleted file mode 100644 index ce5e6fc70..000000000 --- a/haiku-apps/pe/pe-2.4.3-hg.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Pe - Programmer's Editor" -HOMEPAGE="http://pe-editor.berlios.de/" -SRC_URI="hg+http://hg.berlios.de/repos/pe-editor" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00" -#CHECKSUM_MD5="" -BUILD { - cd pe-2.4.3-hg - jam -} - -INSTALL { - cd pe-2.4.3-hg - mkdir -p ${DESTDIR}/boot/apps - cp -a generated/distro ${DESTDIR}/boot/apps/Pe - cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z "${DESTDIR}" ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2012 Team Pe" diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe new file mode 100644 index 000000000..12c5e075b --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -0,0 +1,66 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2012 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86" + +PATCHES="pe-2.4.3_adjustments_for_pm.patchset" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe new file mode 100644 index 000000000..3b8507d15 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe @@ -0,0 +1,66 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#606" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="pe-2.4.3_adjustments_for_pm.patchset" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} diff --git a/haiku-apps/pe/pe-2.4.3_hg610.recipe b/haiku-apps/pe/pe-2.4.3_hg610.recipe new file mode 100644 index 000000000..cd5e867e4 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg610.recipe @@ -0,0 +1,64 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#610" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe new file mode 100644 index 000000000..998ad00e6 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe @@ -0,0 +1,64 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#611" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} diff --git a/haiku-apps/puri/puri-0.3.9.1.bep b/haiku-apps/puri/puri-0.3.9.1.recipe similarity index 96% rename from haiku-apps/puri/puri-0.3.9.1.bep rename to haiku-apps/puri/puri-0.3.9.1.recipe index 8f7f1d4e1..272c4df9d 100644 --- a/haiku-apps/puri/puri-0.3.9.1.bep +++ b/haiku-apps/puri/puri-0.3.9.1.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6e0a48e31dae972ccb010437a2d72dd8" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd puri-0.3.9.1 jam } -INSTALL { +INSTALL() +{ puri=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Puri mkdir -p ${puri} mkdir -p ${puri}/data/ diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep b/haiku-apps/quicklaunch/quicklaunch-0.9.5.recipe similarity index 100% rename from haiku-apps/quicklaunch/quicklaunch-0.9.5.bep rename to haiku-apps/quicklaunch/quicklaunch-0.9.5.recipe diff --git a/haiku-apps/rez/rez-108.bep b/haiku-apps/rez/rez-108.recipe similarity index 94% rename from haiku-apps/rez/rez-108.bep rename to haiku-apps/rez/rez-108.recipe index d0cb76395..d4d1ce2c4 100644 --- a/haiku-apps/rez/rez-108.bep +++ b/haiku-apps/rez/rez-108.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd rez-108 make } -INSTALL { +INSTALL() +{ cd rez-108 BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}${BIN_DIR} diff --git a/haiku-apps/sawteeth/sawteeth-1.3.bep b/haiku-apps/sawteeth/sawteeth-1.3.recipe similarity index 97% rename from haiku-apps/sawteeth/sawteeth-1.3.bep rename to haiku-apps/sawteeth/sawteeth-1.3.recipe index 3155d4445..ef0d7ce6c 100644 --- a/haiku-apps/sawteeth/sawteeth-1.3.bep +++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sawteeth-1.3 cmake . make } -INSTALL { +INSTALL() +{ cd sawteeth-1.3 SAWTEETH_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Sawteeth mkdir -p ${SAWTEETH_DIR}/sounds diff --git a/haiku-apps/thememanager/thememanager-0-svn.bep b/haiku-apps/thememanager/thememanager-0_svn.recipe similarity index 92% rename from haiku-apps/thememanager/thememanager-0-svn.bep rename to haiku-apps/thememanager/thememanager-0_svn.recipe index 49ca68421..69eb763d7 100644 --- a/haiku-apps/thememanager/thememanager-0-svn.bep +++ b/haiku-apps/thememanager/thememanager-0_svn.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd trunk make } -INSTALL { +INSTALL() +{ cd trunk } diff --git a/haiku-apps/ubertuber/ubertuber-0.9.5.bep b/haiku-apps/ubertuber/ubertuber-0.9.5.recipe similarity index 100% rename from haiku-apps/ubertuber/ubertuber-0.9.5.bep rename to haiku-apps/ubertuber/ubertuber-0.9.5.recipe diff --git a/haiku-apps/vision/additional-files/InitialSettings b/haiku-apps/vision/additional-files/InitialSettings new file mode 100644 index 000000000..171833498 Binary files /dev/null and b/haiku-apps/vision/additional-files/InitialSettings differ diff --git a/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch new file mode 100644 index 000000000..081346c85 --- /dev/null +++ b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch @@ -0,0 +1,16 @@ +Index: Makefile +=================================================================== +--- Vision/Makefile (revision 946) ++++ Vision/Makefile (working copy) +@@ -84,10 +84,7 @@ + + LDFLAGS := $(REG_LIBS) -nodefaultlibs + +-ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), ) +-else +- CFLAGS += -DUSE_INFOPOPPER=1 +-endif ++CFLAGS += -DUSE_INFOPOPPER=1 + + DEP := gcc -MM -DBEOS_BUILD + diff --git a/haiku-apps/vision/patches/vision-908-gcc4.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch similarity index 53% rename from haiku-apps/vision/patches/vision-908-gcc4.patch rename to haiku-apps/vision/patches/vision-0.9.7-gcc4.patch index 312c25e3a..37997208f 100644 --- a/haiku-apps/vision/patches/vision-908-gcc4.patch +++ b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch @@ -1,13 +1,25 @@ -Index: Vision/Makefile +Index: Makefile =================================================================== ---- Vision/Makefile (revision 945) +--- Vision/Makefile (revision 946) +++ Vision/Makefile (working copy) @@ -21,7 +21,7 @@ BUILD_TYPE := Release # system libs -REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot -+REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot -lstdc++ -lsupc++ ++REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot -lstdc++ # lua LUA_LIBS := -L./src/lua/lib -llua -llualib +@@ -84,10 +84,7 @@ + + LDFLAGS := $(REG_LIBS) -nodefaultlibs + +-ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), ) +-else +- CFLAGS += -DUSE_INFOPOPPER=1 +-endif ++CFLAGS += -DUSE_INFOPOPPER=1 + + DEP := gcc -MM -DBEOS_BUILD + diff --git a/haiku-apps/vision/vision-0.9.7.bep b/haiku-apps/vision/vision-0.9.7.bep deleted file mode 100644 index 3e5edc7a6..000000000 --- a/haiku-apps/vision/vision-0.9.7.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Vision is an irc client for Haiku" -HOMEPAGE="http://vision.sourceforge.net/" -SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - cd vision-0.9.7 - if [ -n "$(setgcc | grep '4')" ]; then - patch -p1 -ui ../../patches/vision-908-gcc4.patch - fi - make -} - -INSTALL { - cd vision-0.9.7 - mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cp Vision ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cd data - cp -a * ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cp -a `haikuporter -t`/haiku-apps/vision/InitialSettings ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision -} - -COPYRIGHT="1999-2010 The Vision Team" -LICENSE="MPL v1.1" diff --git a/haiku-apps/vision/vision-0.9.7.r946.recipe b/haiku-apps/vision/vision-0.9.7.r946.recipe new file mode 100644 index 000000000..8434bb1e4 --- /dev/null +++ b/haiku-apps/vision/vision-0.9.7.r946.recipe @@ -0,0 +1,57 @@ +SUMMARY="IRC client for Haiku" +DESCRIPTION="Vision is an IRC client for Haiku." +HOMEPAGE="http://vision.sourceforge.net/" +SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#946" +LICENSE="MPL v1.1" +COPYRIGHT="1999-2010 The Vision Team" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +if [ $targetArchitecture == x86_gcc2 ]; then + PATCHES="vision-0.9.7-gcc2.patch" +else + PATCHES="vision-0.9.7-gcc4.patch" +fi + +ADDITIONAL_FILES="InitialSettings" + +PROVIDES=" + vision = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +USER_SETTINGS_FILES=" + settings/Vision directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + make + # multi-job build not supported +} + +INSTALL() +{ + visionDir=$appsDir/Vision + mkdir -p $visionDir + + cp Vision $visionDir + cp -a $portDir/additional-files/InitialSettings $visionDir + + cd data + cp -a * $visionDir + + addAppDeskbarSymlink $visionDir/Vision +} diff --git a/haiku-apps/wonderbrush/licenses/WonderBrush b/haiku-apps/wonderbrush/licenses/WonderBrush new file mode 100644 index 000000000..f8c1c8f84 --- /dev/null +++ b/haiku-apps/wonderbrush/licenses/WonderBrush @@ -0,0 +1,151 @@ + +_English_____________(für deutsche Version bitte nach unten scrollen)__________ + + +WonderBrush License Agreement + Potsdam, Sep.29.2005 + +About this Agreement + +This Agreement regulates the rights and obligations between the purchaser of the "WonderBrush" software package and the producer of this package, the "Stephan Aßmus und Ingo Weinhold GbR". + + +Parties to this contract, definition of terms + +By installing the "WonderBrush" software package, you agree to be bound by the terms of this license. Please read this agreement carefully. DO NOT INSTALL THE SOFTWARE, IF YOU DO NOT AGREE TO THIS LICENSE, BUT RETURN THE COMPLETE PACKAGE TO WHERE YOU OBTAINED IT AND YOUR MONEY WILL BE REFUNDED. + +The computer program "WonderBrush", its documentation and all other material included on the WonderBrush CD, will be referred to as "Software" from hereon. + +By purchasing the WonderBrush package, you have only obtained ownership of the physical materials. The complete Software on the CD remains the intellectual property of the "Stephan Aßmus und Ingo Weinhold GbR", to be referred as "YellowBites" from hereon. + + +Right to use + +If you agree to this license, you obtain furthermore the right to use this Software for your own purposes. This right is limited to yourself, other persons may not use the Software. You may install the Software onto multiple computers, as long as you are the only person using the Software on those computers and the only person with access to it. Should you install the Software on multiple computers, you may only execute it on one of them at the same time. "Execute" means that the WonderBrush program was launched and resides within the main memory (RAM) of the computer. If you want to use the program on more than one computer at the same time, you have to purchase more licenses by purchasing more WonderBrush packages. + + +Limitations + +- The Software is the intellectual property of YellowBites. To protect it, and except as permitted by applicable legislation, you may not decompile, reverse engineer, disassemble or otherwise revert the Software into human perceivable form. + +- You may not create derivative works based upon the Software in whole or in part. + +- You may not rent, lease, distribute, send or otherwise make this Software accessible to other persons, except as described in the following paragraph. + + +Resale + +You have the right to resale the Software to another person, if you pass on your entire rights to use the Software to this person and dispense from it. The other person must accept this agreement and you must delete every installation of the Software from your computers before the resale. You can only resale the complete bundle with all materials which were part of the package when you originally obtained it. If you made a backup copy, as described in the next paragraph, you have to destroy it before the resale. + + +Backup copy + +You may produce a backup copy of the original disc, on which you have obtained the Software. The backup copy must remain in your custody and must be destroyed at the termination of this agreement. + + +Warranty on media + +YellowBites warrents the compact disc on which the Software is recorded to be free from defects in material. This warranty is limited to a period of ninety days under normal use from the date of purchase. Yellowbies entire liability and your exclusive remedy will be replacement of the compact disc not meeting this warranty and which is returned to YellowBites with a copy of the receipt. YellowBites is not responsible to replace a compact disc damaged by accident, abuse or misapplication. + + +Warranty on the Software + +YellowBites delivers the software WonderBrush in the knowledge that it contains errors. All errors known at the time of delivery are described in the document BUGS. These errors do not harm the functionality of the Software. The Software may further contain yet unkown errors, which may hinder the functionality of the Software in non critical or critical ways. If you become aware of any such error within a year after purchase, YellowBites commits to correction of the error(s) or, should this be impossible or mean disproportional economical effort, to partly refunding the price of purchase. For this you must prove that the error(s) are directly contained in the WonderBrush program, and not within the software components that are not part of the original WonderBrush software package. The computer on which you installed the Software must further comply to the system requirements stated on the outside of the package. You further commit to doing your best at helping YellowBites with the localisation of the error(s). Versions of the software, in which such an error has been fixed, may be transfered to you by YellowBites via electronical means, especially via the Internet. + + +Limitation on liability + +The associates of YellowBites are not liable for any kind of economical losses, that result or from the use or indirect use of the Software. This limitation does not extend to injures, that emerged on your live, body or health and that directly lead back to an error in the Software. YellowBites is not liable of any injures that resulted from over use or unergonomic use of the Software. + + +Termination of this agreement + +You can terminate this agreement at any time by deleting every installation and backup copy of the Software. Should you violate any of the terms in this agreement, the agreement and all rights granted therein are terminated also. + + +Court of jurisdiction + +The competend court of jurisdiction is Potsdam, Germany. + + +Copyright (c) 2005, Stephan Aßmus und Ingo Weinhold GbR. All rights reserved. + + + + + + + + + +_Deutsch______________________________________________________________________ + + +WonderBrush Lizenzvertrag + Potsdam, 08.09.2005 + +Vertragsgegenstand + +Dieser Vertrag regelt die Rechte und Pflichten zwischen der Käuferin oder dem Käufer eines "WonderBrush" Softwarepakets und dem Hersteller dieses Pakets, der "Stephan Aßmus und Ingo Weinhold GbR". + +Vertragsparteien, Begriffsdefinitionen + +Mit der Installation des "WonderBrush" Softwarepakets stimmen Sie diesem Vertrag zu. Bitte lesen Sie sich den Vertrag aufmerksam durch. INSTALLIEREN SIE DIE SOFTWARE NICHT, WENN SIE DEM VERTRAG NICHT ZUSTIMMEN, SONDERN BRINGEN SIE BITTE DAS GESAMTE SOFTWAREPAKET DORTHIN ZURüCK, WO SIE ES ERWORBEN HABEN UND LASSEN SIE SICH DEN KAUFPREIS RüCKERSTATTEN. + +Das Computerprogramm "WonderBrush", seine Dokumentation sowie alle weiteren Daten, die sich auf der WonderBrush CD befinden werden im folgenden zusammenfassend "Software" genannt. + +Sie haben durch den Kauf des WonderBrush Pakets nur die physikalischen Materialien erworben. Die gesamte Software auf der CD bleibt das geistige Eigentum der "Stephan Aßmus und Ingo Weinhold GbR", im folgenden "YellowBites" genannt. + + +Nutzungsrecht + +Wenn Sie dem Vertrag zustimmen, erwerben Sie außerdem das Recht, die Software für Ihre Zwecke zu nutzen. Dieses Recht steht Ihnen alleine zu, andere Personen dürfen die Software nicht benutzen. Sie dürfen die Software auf beliebig vielen Rechnern installieren, insofern nur Sie und keine weiteren Personen die Software an diesen Rechnern benutzen oder Zugriff darauf haben. Sollten Sie die Software auf mehreren Rechnern installieren, so dürfen Sie sie nur auf einem dieser Rechner zeitgleich ausführen. "Ausführen" bedeutet, dass das WonderBrush Programm gestartet wurde und sich im Arbeitsspeicher des Rechners befindet. Wenn Sie das Programm auf mehreren Rechnern zeitgleich betreiben wollen, so müssen Sie weitere Nutzungslizenzen erwerben indem Sie weitere WonderBrush Pakete kaufen. + + +Einschränkungen + +- Bei der Software handelt es sich um geistiges Eigentum von YellowBites. Um dieses zu schützen dürfen Sie die Software nicht dekompilieren, disassemblieren oder auf andere Art in eine menschenlesbare Form zurückwandeln, es sei denn, dies wird Ihnen durch für Sie geltendes Recht gestattet. + +- Sie dürfen keine auf der Software oder Teile der Software basierenden Werke oder Produkte anfertigen. + +- Sie dürfen die Software nicht verleihen, vermieten, weiterverbreiten, verschicken oder in anderer Weise dritten Personen zugänglich machen. Eine Ausnahme bildet der Weiterverkauf, wie im folgenden Abschnitt beschrieben. + + +Weiterverkauf + +Sie haben das Recht, die Software an eine andere Person weiterzuverkaufen, sofern Sie Ihr Nutzungsrecht damit komplett an diese Person übertragen und selbst abtreten. Dazu muss diese Person diesem Vertrag zustimmen und Sie müssen sämtliche Installationen dieser Software vor dem Weiterverkauf von Ihren Rechnern löschen. Die Software kann nur vollständig weiterverkauft werden mit sämtlichen Materialien, die ursprünglich Bestandteil des Pakets waren, das Sie selbst gekauft haben. Eventuell angefertigte Sicherheitskopien, wie im nächsten Abschnitt beschrieben, müssen Sie vor dem Weiterverkauf vernichten. + + +Sicherheitskopie + +Sie dürfen eine Sicherheitskopie von der Original-CD anfertigen, auf der Sie das Softwarepaket erhalten haben. Diese Sicherheitskopie muss in Ihrem Besitz verbleiben und bei Beendigung des Vertragsverhältnisses von Ihnen vernichtet werden. + + +Gewährleistung für Materialien + +YellowBites garantiert für die Fehlerfreiheit der CD, auf der die Software aufgezeichnet ist. Diese Garantie gilt nur unter normaler Benutzung der CD innerhalb eines Zeitraums von 90 Tagen ab Kaufdatum. YellowBites' Verpflichtung und Ihr gänzlicher Anspruch besteht in dem Ersatz der CD, die nicht dem garantierten Zustand entspricht, und die an YellowBites samt Kaufbeleg übersendet wurde. YellowBites ist nicht verpflichtet, durch Unfall oder Fehlbenutzung schadhafte CDs zu ersetzen. + + +Gewährleistung für Software + +YellowBites liefert die Software WonderBrush in dem Wissen aus, dass darin Fehler enthalten sind. Alle zum Zeitpunkt der Auslieferung bekannten Fehler sind in der Datei BUGS dokumentiert. Es handelt sich um Fehler, die die Funktionsweise des Programms nicht beeinträchtigen oder mindern. Darüber hinaus kann die Software weitere, gegenwärtig unbekannte Fehler beinhalten, die die Funktionsweise des Programms unwesentlich aber auch wesentlich beeinträchtigen können. Soweit Ihnen diese Mängel innerhalb eines Jahres ab Kaufdatum bekannt werden, verpflichtet sich YellowBites zur Behebung der Mängel oder, sofern dies nicht möglich ist oder wirtschaftlich unverhältnismäßigen Aufwand bedeutet, zu teilweiser Rückerstattung des Kaufpreises. Dazu müssen Sie nachweisen, dass es sich bei den Beanstandungen tatsächlich um Fehler direkt im WonderBrush-Programm handelt, und nicht etwa um Bedienungsfehler oder Fehler in Softwarekomponenten, die nicht original Bestandteil des WonderBrush Softwarepakets sind. Außerdem müssen die auf der Packung genannten Systemvorraussetzungen von dem Rechner erfüllt sein, auf dem Sie WonderBrush installiert haben. Sie verpflichten sich außerdem, YellowBites bei der Fehlerlokalisierung nach bestem Wissen und Gewissen behilflich zu sein. +Softwareversionen von WonderBrush, in denen ein von Ihnen rechtmäßig beanstandeter Fehler behoben wurde, können von YellowBites auf elektronischem Wege, insbesondere über das Internet, an Sie ausgeliefert werden. + + +Haftungsbeschränkung + +Die Gesellschafter von YellowBites haften für keine Art von wirtschaftlichen Schäden, die aus der Verwendung oder der indirekten Verwendung der Software entstanden sind. Von dieser Haftungsbeschränkung ausgenommen sind Schäden, die Ihnen an Leben, Körper oder Gesundheit widerfahren sind und direkt auf einen Fehler in der Software zurückzuführen sind. Für gesundheitliche Schäden, die Ihnen durch übermäßige oder unergonomische Nutzung der Software entstanden sind, übernimmt YellowBites keine Verantwortung. + + +Beendigung des Vertragsverhältnisses + +Sie können dieses Vertragsverhältnis jederzeit beenden, indem Sie sämtliche Installationen und angefertigte Sicherungskopien löschen. Sollten Sie einen Punkt dieses Vertrages verletzen, so erlöschen das Vertragsverhältnis sowie alle damit erworbenen Rechte ebenfalls. + +Rechtsstandort + +Der Rechtsstandort ist Potsdam, Deutschland. + + +Copyright (c) 2005, Stephan Aßmus und Ingo Weinhold GbR. Alle Rechte vorbehalten. + + diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe new file mode 100644 index 000000000..ecfa7adf1 --- /dev/null +++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe @@ -0,0 +1,61 @@ +SUMMARY="Native editor for bitmap graphics" +DESCRIPTION="WonderBrush is an editor for bitmap graphics. The main window holds any number of documents, which are called Canvas. A canvas has an associated name and pixel resolution as well as some other properties. It also references up to two files, which represent it on disk, one is a file in some export format (ie. an SVG document, a flat Translator bitmap or soure code), the other a full-featured project file. +Each canvas can have any number of Layers, currently arranged as a list. Each layer represents an individual bitmap in the size of the canvas. Depending on each layers blending mode, they are composed on top of each other to form the final canvas bitmap. +Each layer can contain any number of Objects, which are created by WonderBrushs tools. Each object has a set of properties which define the unique appearance of the object on the layer. +At any time, it is possible to reorder the layers, or the objects they contain. This could be called non-linear editing. It is also possible to change most of an objects properties later on. This could be called non-destructive editing, because adding another object (like a filter) does not actually destroy any pixel data." +HOMEPAGE="http://yellowbites.com/wonderbrush.html" +LICENSE="WonderBrush" +COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR" +SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive" +CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77" +REVISION="4" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + wonderbrush$secondaryArchSuffix = $portVersion compat >= 2 + " +REQUIRES=" + haiku$secondaryArchSuffix >= r1~alpha3_pm-1 + lib:libfreetype$secondaryArchSuffix >= 6 + lib:libz$secondaryArchSuffix >= 1 + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku$secondaryArchSuffix + coreutils + cmd:unzip + " + +USER_SETTINGS_FILES=" + settings/WonderBrush directory + " + +SOURCE_DIR="WonderBrush" + +BUILD() +{ + : +} + +INSTALL() +{ + wonderbrushDir=$appsDir/WonderBrush + mkdir -p $appsDir + unzip -d $appsDir WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip + + # Hack to make libfreetype and libz available under the name WonderBrush + # has been linked against them. + ln -s $portPackageLinksDir/lib~libfreetype$secondaryArchSuffix/lib/libfreetype.so.6 \ + $wonderbrushDir/lib/libfreetype.so + ln -s $portPackageLinksDir/lib~libz$secondaryArchSuffix/lib/libz.so.1 \ + $wonderbrushDir/lib/libz.so + + addAppDeskbarSymlink $wonderbrushDir/WonderBrush +} diff --git a/haiku-apps/yab/yab-1.6.bep b/haiku-apps/yab/yab-1.6.recipe similarity index 97% rename from haiku-apps/yab/yab-1.6.bep rename to haiku-apps/yab/yab-1.6.recipe index 3c8340fa3..3cf2e5014 100644 --- a/haiku-apps/yab/yab-1.6.bep +++ b/haiku-apps/yab/yab-1.6.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b" -BUILD { +BUILD() +{ cd yab-1.6/src make clean make } -INSTALL { +INSTALL() +{ cd yab-1.6 mkdir -p ${DESTDIR}/boot/apps/yab cp -a src/yab ${DESTDIR}/boot/apps/yab diff --git a/haiku-data/be_book/be_book-2008_10_26.recipe b/haiku-data/be_book/be_book-2008_10_26.recipe new file mode 100644 index 000000000..e80c99ba6 --- /dev/null +++ b/haiku-data/be_book/be_book-2008_10_26.recipe @@ -0,0 +1,27 @@ +SUMMARY="The BeBook" +DESCRIPTION="The BeOS API documentation" +HOMEPAGE="http://www.haiku-os.org/documents" +COPYRIGHT="ACCESS Co., Ltd." +LICENSE="Attribution-NonCommercial-NoDerivs 3.0 Unported" +SRC_URI="http://haiku-files.org/files/data/bebook_20081026.zip" +CHECKSUM_MD5="78d58b64a41ae4e8f84a14f22aea4adb" +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + be_book = $portVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + coreutils + " + +SOURCE_DIR='bebook' + +INSTALL() +{ + mkdir -p $documentationDir + cp -dR $sourceDir $documentationDir/BeBook +} diff --git a/haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported b/haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported new file mode 100644 index 000000000..26ed01699 --- /dev/null +++ b/haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported @@ -0,0 +1,58 @@ +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. + 3. "Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership. + 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, + 2. to Distribute and Publicly Perform the Work including as incorporated in Collections. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. + 2. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works. + 3. If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + 4. + + For the avoidance of doubt: + 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, + 3. Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b). + 5. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 4. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + 5. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe new file mode 100644 index 000000000..68ce3cddf --- /dev/null +++ b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe @@ -0,0 +1,48 @@ +SUMMARY="Bundle of CA root certificates" +HOMEPAGE="http://curl.haxx.se/docs/caextract.html" +COPYRIGHT="2012 " +# No copyright seems to be specified anywhere ... +LICENSE=" + MPL v1.1 + GNU GPL v2 + GNU LGPL v2.1 + " +SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive" +CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a" +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + ca_root_certificates = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + coreutils + " + +INSTALL() +{ + installDir="$dataRootDir/ssl" + mkdir -p "$installDir" + cp cacert_??????.pem "$installDir/CARootCertificates.pem" +} + +DESCRIPTION=" + Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012 + + This is a bundle of X.509 certificates of public Certificate Authorities + (CA). These were automatically extracted from Mozilla's root certificates + file (certdata.txt). This file can be found in the mozilla source tree: + http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 + + It contains the certificates in PEM format and therefore + can be directly used with curl / libcurl / php_curl, or with + an Apache+mod_ssl webserver for SSL client authentication. + Just configure this file as the SSLCACertificateFile. + " diff --git a/haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts b/haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts new file mode 100644 index 000000000..98096c0a2 --- /dev/null +++ b/haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts @@ -0,0 +1,3 @@ +The sound font used by the system is always "big_synth.sy". You can replace the default General Midi sound font with a better version by linking "big_synth.sy" to your alternative sound font. One example of a better quality (and much bigger) sound font can be downloaded here (MIT license): + + diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe new file mode 100644 index 000000000..5ab8ee577 --- /dev/null +++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe @@ -0,0 +1,42 @@ +SUMMARY="A good quality General Midi Soundfont" +DESCRIPTION="A good quality General Midi Soundfont." +HOMEPAGE="http://ocmnet.com/saxguru/Timidity.htm" +LICENSE="Public Domain" +COPYRIGHT="2004 Tim Brechbill" +SRC_URI="http://ocmnet.com/saxguru/TimGM6mb.sf2#noarchive" +CHECKSUM_MD5="1f569cc40159a6bd9250f816225ae222" +REVISION="4" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +ADDITIONAL_FILES="Installing alternative sound fonts" + +PROVIDES=" + timgmsoundfont = $portVersion compat >= 0 + " +REQUIRES=" + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + cmd:cp + " + +BUILD() +{ + true +} + +INSTALL() +{ + synthDir=$dataDir/synth + mkdir -p $synthDir + cp TimGM6mb.sf2 \ + "$portDir/additional-files/Installing alternative sound fonts" \ + $synthDir + ln -s TimGM6mb.sf2 $synthDir/big_synth.sy + # TODO: Since the data directory is read-only, replacing the symlink isn't + # possible as described in the read-me file. This requires changes in the + # midi kit and possibly a preferences application to set the sound font to + # use. +} diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe new file mode 100644 index 000000000..6e30ea577 --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe @@ -0,0 +1,139 @@ +SUMMARY="Open source web browser engine" +DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the Mac OS X system framework version of the engine that's used by Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the KHTML and KJS libraries from KDE." +HOMEPAGE="http://www.webkit.org/" +COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al" +LICENSE=" + GNU LGPL v2 + GNU LGPL v2.1 + WebKit Apple + MIT + " +SRC_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2" +CHECKSUM_MD5="a6551b2573612678e9d2d27fda4fae48" +REVISION="2" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PATCHES="haikuwebkit-1.1.3_2013_08_09.patchset" + +# version info -- usually derived from the git repository +webkitRevision=r115944 +haikuWebkitRevision=de778f7 + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libjavascriptcore$secondaryArchSuffix = $portVersion + lib:libwebcore$secondaryArchSuffix = $portVersion + lib:libwebkit$secondaryArchSuffix = $portVersion + lib:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + icu$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + icu${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gperf + cmd:jam + cmd:ld$secondaryArchSuffix + cmd:m4 + cmd:make + cmd:perl + cmd:python + " + +SOURCE_DIR="haiku-webkit-lastgood" + +BUILD() +{ + export WEBKIT_REVISION=$webkitRevision + export HAIKU_WEBKIT_REVISION=$haikuWebkitRevision + + libxml2Dir=$portPackageLinksDir/devel~libxml2$secondaryArchSuffix + libxml2Includes=$libxml2Dir/$relativeIncludeDir/libxml2 + compileFlags="-sCCFLAGS=-I$libxml2Includes -sC++FLAGS=-I$libxml2Includes" + + cd Source/JavaScriptCore + ./make-generated-sources.sh + NDEBUG=1 jam -q $jobArgs $compileFlags libjavascriptcore.so + + cd ../../Source/WebCore + ./make-generated-sources.sh + NDEBUG=1 jam -q $jobArgs $compileFlags libwebkit.so +} + +INSTALL() +{ + # collect the libraries + local libraries=" + libjavascriptcore + libwebcore + libwebkit + libwtf + " + mkdir -p $libDir + local library + for library in $libraries; do + cp generated/release/${library}.so $libDir + done + + # collect the headers + local headers=" + WebWindow.h + WebViewConstants.h + WebView.h + WebSettings.h + WebPage.h + WebKitInfo.h + WebFrame.h + WebDownload.h + NetworkCookieJar.h + NetworkCookie.h + " + mkdir -p $includeDir + local header + for header in $headers; do + cp Source/WebKit/haiku/API/$header $includeDir + done + + prepareInstalledDevelLibs $libraries + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + haikuwebkit${secondaryArchSuffix}_devel = $portVersion + devel:libjavascriptcore$secondaryArchSuffix = $portVersion + devel:libwebcore$secondaryArchSuffix = $portVersion + devel:libwebkit$secondaryArchSuffix = $portVersion + devel:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + haikuwebkit$secondaryArchSuffix == $portVersion base + " diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe new file mode 100644 index 000000000..d9ffa6c1f --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe @@ -0,0 +1,96 @@ +SUMMARY="Open source web browser engine" +DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the Mac OS X system framework version of the engine that's used by Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the KHTML and KJS libraries from KDE." +HOMEPAGE="http://www.webkit.org/" +COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al" +LICENSE=" + GNU LGPL v2 + GNU LGPL v2.1 + WebKit Apple + MIT + " +SRC_URI="git+https://github.com/haiku/haiku-webkit.git#0a2867a628bbe7cf59127b49b7d66b661eac961c" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libjavascriptcore$secondaryArchSuffix = $portVersion + lib:libwebcore$secondaryArchSuffix = $portVersion + lib:libwebkit$secondaryArchSuffix = $portVersion + lib:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + icu$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libxslt$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + icu${secondaryArchSuffix}_devel + cmd:pkg_config + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libxslt$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:flex + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gperf + cmd:ld$secondaryArchSuffix + cmd:m4 + cmd:make + cmd:perl + cmd:python + cmd:cmake + " + +SOURCE_DIR="haiku-webkit-lastgood" + +BUILD() +{ + Tools/haiku/generate-build-info.sh . $portVersion $portVersion \ + > Source/WebKit/haiku/API/BuildInfo.h + perl Tools/Scripts/build-webkit --haiku --no-webkit2 \ + -cmakearg="-DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=/`echo $secondaryArchSuffix | tr -d _`" +} + +INSTALL() +{ + cd WebKitBuild/Release + make install + + prepareInstalledDevelLibs libWebKit + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + haikuwebkit${secondaryArchSuffix}_devel = $portVersion + devel:libjavascriptcore$secondaryArchSuffix = $portVersion + devel:libwebcore$secondaryArchSuffix = $portVersion + devel:libwebkit$secondaryArchSuffix = $portVersion + devel:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + haikuwebkit$secondaryArchSuffix == $portVersion base + " diff --git a/haiku-libs/haikuwebkit/licenses/WebKit Apple b/haiku-libs/haikuwebkit/licenses/WebKit Apple new file mode 100644 index 000000000..f29b41c3b --- /dev/null +++ b/haiku-libs/haikuwebkit/licenses/WebKit Apple @@ -0,0 +1,21 @@ +Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset new file mode 100644 index 000000000..2f56e1b92 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset @@ -0,0 +1,112 @@ +From 542b92ebe5085880dbcc8903639e2f4f81e6e93d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sat, 10 Aug 2013 07:01:25 +0200 +Subject: Jamfile: Remove Install rule invocations + +Automatically installing stuff in /boot/home/config isn't desirable. + +diff --git a/Jamfile b/Jamfile +index c2e412f..cff37a3 100644 +--- a/Jamfile ++++ b/Jamfile +@@ -11,25 +11,3 @@ SubInclude TOP Source WebCore ; + SubInclude TOP Source WebKit ; + SubInclude TOP Source WebKit haiku HaikuLauncher ; + SubInclude TOP Tools DumpRenderTree ; +- +-#----------------------------------------------------------------------------- +-# Installation rules +-#----------------------------------------------------------------------------- +- +-Install WTF : +- libwtf.so +-; +- +-Install JavaScriptCore : +- libjavascriptcore.so +- jsc +-; +- +-Install WebCore : +- libwebcore.so +-; +- +-Install WebKit : +- libwebkit.so +- HaikuLauncher +-; +-- +1.7.10.2 + + +From 805441db575c8303ddba5688911b66594fff922d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sat, 10 Aug 2013 07:04:09 +0200 +Subject: generate-build-info.sh: make optionally work outside git repo + +If the build variables WEBKIT_REVISION and HAIKU_WEBKIT_REVISION are +set, the script will use the value of those instead of trying to pull +the info from the git repository. + +diff --git a/Tools/haiku/build/MainBuildRules b/Tools/haiku/build/MainBuildRules +index 9304fae..026da44 100644 +--- a/Tools/haiku/build/MainBuildRules ++++ b/Tools/haiku/build/MainBuildRules +@@ -298,5 +298,6 @@ rule CreateBuildInfoFile target + + actions CreateBuildInfoFile + { +- $(TOP)/Tools/haiku/generate-build-info.sh > $(1) ; ++ $(TOP)/Tools/haiku/generate-build-info.sh $(TOP) \ ++ $(WEBKIT_REVISION) $(HAIKU_WEBKIT_REVISION) > $(1) ; + } +diff --git a/Tools/haiku/generate-build-info.sh b/Tools/haiku/generate-build-info.sh +index b870ca4..2bedf4f 100755 +--- a/Tools/haiku/generate-build-info.sh ++++ b/Tools/haiku/generate-build-info.sh +@@ -5,15 +5,24 @@ + # Distributed under the terms of the MIT License. + # + +-CURENT_HASH=`git log --pretty=format:'%h' -n 1` ++# Usage: generate-build-info.sh ++# [ ] + +-MERGE_HASH=`git log --pretty=format:'%H' --date-order --merges -n 1` +-REV_1=`git log $MERGE_HASH^1 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` +-REV_2=`git log $MERGE_HASH^2 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` ++ ++if [ $# -gt 2 ]; then ++ WEBKIT_REVISION=$2 ++ HAIKU_WEBKIT_REVISION=$3 ++else ++ MERGE_HASH=`git log --pretty=format:'%H' --date-order --merges -n 1` ++ REV_1=`git log $MERGE_HASH^1 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` ++ REV_2=`git log $MERGE_HASH^2 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` ++ WEBKIT_REVISION=r$REV_1$REV_2 ++ HAIKU_WEBKIT_REVISION=`git log --pretty=format:'%h' -n 1` ++fi + + HAIKU_WEBKIT_VERSION=1.1 + +-TOP=`git rev-parse --show-toplevel` ++TOP="$1" + WEBKIT_MAJOR=`cat $TOP/Source/WebKit/mac/Configurations/Version.xcconfig | perl -nle '/MAJOR_VERSION = (\d+);/ and print $1'` + WEBKIT_MINOR=`cat $TOP/Source/WebKit/mac/Configurations/Version.xcconfig | perl -nle '/MINOR_VERSION = (\d+);/ and print $1'` + +@@ -23,10 +32,10 @@ echo '/* + #ifndef BuildInfo_h + #define BuildInfo_h + +-#define HAIKU_WEBKIT_REVISION "'$CURENT_HASH'" ++#define HAIKU_WEBKIT_REVISION "'$HAIKU_WEBKIT_REVISION'" + #define HAIKU_WEBKIT_VERSION "'$HAIKU_WEBKIT_VERSION'" + +-#define WEBKIT_REVISION "r'$REV_1$REV_2'" ++#define WEBKIT_REVISION "'$WEBKIT_REVISION'" + #define WEBKIT_MAJOR_VERSION '$WEBKIT_MAJOR' + #define WEBKIT_MINOR_VERSION '$WEBKIT_MINOR' + +-- +1.7.10.2 + diff --git a/haiku-libs/libwalter/libwalter-97.bep b/haiku-libs/libwalter/libwalter-97.recipe similarity index 97% rename from haiku-libs/libwalter/libwalter-97.bep rename to haiku-libs/libwalter/libwalter-97.recipe index 577ee47f0..e90d86b06 100644 --- a/haiku-libs/libwalter/libwalter-97.bep +++ b/haiku-libs/libwalter/libwalter-97.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd libwalter-97 configure jam } -INSTALL { +INSTALL() +{ cd libwalter-97 mkdir -p ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter @@ -19,7 +21,8 @@ INSTALL { cp -a include/. ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter } -TEST { +TEST() +{ cd tests ColorWellTest ComboBoxTest diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep deleted file mode 100644 index 4d1dde0d9..000000000 --- a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Arabeyes Arabic TrueType fonts" -HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" -SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="11000a74da50b461b374f711392f1d46" -BUILD { - cd ae_fonts1-1.1 -} - -INSTALL { - cd ae_fonts1-1.1 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes - mkdir -p ${FONTDIR} - cp -r AAHS ${FONTDIR}/ - cp -r AGA ${FONTDIR}/ - cp -r FS ${FONTDIR}/ - cp -r Kasr ${FONTDIR}/ - cp -r MCS ${FONTDIR}/ - cp -r Shmookh ${FONTDIR}/ -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2007 Arabeyes.org - 2002-2005 Free Software Foundation" diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe new file mode 100644 index 000000000..ce25c8d8e --- /dev/null +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -0,0 +1,41 @@ +SUMMARY="Arabeyes Arabic TrueType fonts" +DESCRIPTION="Arabeyes is a Meta project that is aimed at fully supporting the Arabic language in the Unix/Linux environment. It is designed to be a central location to standardize the Arabization process. Arabeyes relies on voluntary contributions." +HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" +SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2" +REVISION="1" +DEPEND="" +CHECKSUM_MD5="11000a74da50b461b374f711392f1d46" +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2007 Arabeyes.org + 2002-2005 Free Software Foundation" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="arabeyes_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:tar + coreutils + " + +SOURCE_DIR="ae_fonts1-1.1" + +BUILD() +{ + tar xvjf $portDir/download/ae_fonts1_ttf_1.1.tar.bz2 +} + +INSTALL() +{ + cd ae_fonts1-1.1 + FONTDIR=$fontsDir/arabeyes + mkdir -p ${FONTDIR} + cp -rd AAHS ${FONTDIR}/ + cp -rd AGA ${FONTDIR}/ + cp -rd FS ${FONTDIR}/ + cp -rd Kasr ${FONTDIR}/ + cp -rd MCS ${FONTDIR}/ + cp -rd Shmookh ${FONTDIR}/ +} diff --git a/media-fonts/courier-prime/courier-prime-1.0.bep b/media-fonts/courier-prime/courier-prime-1.0.bep deleted file mode 100644 index 91be0bec0..000000000 --- a/media-fonts/courier-prime/courier-prime-1.0.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="It's Courier, just better." -HOMEPAGE="http://quoteunquoteapps.com/courierprime/" -SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738" -BUILD { - echo "No building required." -} - -INSTALL { - cd "Courier Prime" - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/courier-prime - mkdir -p ${FONTDIR} - cp -r *.ttf ${FONTDIR}/ - cp Read\ me.txt ${FONTDIR}/README.txt -} - -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2013 Quote-Unquote Apps" diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe new file mode 100644 index 000000000..9f41b8a26 --- /dev/null +++ b/media-fonts/courier_prime/courier_prime-1.0.recipe @@ -0,0 +1,36 @@ +SUMMARY="It's Courier, just better." +DESCRIPTION="Courier Prime is optimized for 12 point size, and matches the metrics of Courier and Courier Final Draft, so you can often swap it out one-for-one." +HOMEPAGE="http://quoteunquoteapps.com/courierprime/" +SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" +REVISION="1" +CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2013 Quote-Unquote Apps" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + courier_prime = $portVersion + " + +REQUIRES="" + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="Courier Prime" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/courier-prime + mkdir -p ${FONTDIR} + cp -r *.ttf ${FONTDIR}/ + cp Read\ me.txt ${FONTDIR}/README.txt +} diff --git a/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 b/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/droid/droid-113.bep b/media-fonts/droid/droid-113.bep deleted file mode 100644 index b875f1f8d..000000000 --- a/media-fonts/droid/droid-113.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Font family from Google's Android project" -HOMEPAGE="http://developer.android.com/sdk/RELEASENOTES.html" -#SRC_URI="http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=6b8721393400f8e98bb6c29d47b38c79be7ade32;sf=tgz" -SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039" -BUILD { - cd base -} - -INSTALL { - cd base - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/droid - mkdir -p ${FONTDIR} - cp Ahem.ttf ${FONTDIR} - cp DroidSans-Bold.ttf ${FONTDIR} - cp DroidSansFallback.ttf ${FONTDIR} - cp DroidSerif-Bold.ttf ${FONTDIR} - cp DroidSerif-Italic.ttf ${FONTDIR} - cp DroidSans.ttf ${FONTDIR} - cp DroidSansMono.ttf ${FONTDIR} - cp DroidSerif-BoldItalic.ttf ${FONTDIR} - cp DroidSerif-Regular.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/droid-fonts-readme.txt -} - -LICENSE="Apache v2" -COPYRIGHT="2005-2008 The Android Open Source Project" diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe new file mode 100644 index 000000000..86eb4f9ce --- /dev/null +++ b/media-fonts/droid/droid-113.recipe @@ -0,0 +1,40 @@ +SUMMARY="Font family from Google's Android project" +DESCRIPTION="The Droid family of fonts was designed by Ascender's Steve Matteson beginning in the fall of 2006. The goal was to provide optimal quality and reading comfort on a mobile handset. The Droid fonts were optimized for use in application menus, web browsers and for other screen text." +HOMEPAGE="http://www.droidfonts.com" +SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" +CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039" +LICENSE="Apache v2" +COPYRIGHT="2005-2008 The Android Open Source Project" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="droid = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="base" + + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/droid + mkdir -p ${FONTDIR} + cp Ahem.ttf ${FONTDIR} + cp DroidSans-Bold.ttf ${FONTDIR} + cp DroidSansFallback.ttf ${FONTDIR} + cp DroidSerif-Bold.ttf ${FONTDIR} + cp DroidSerif-Italic.ttf ${FONTDIR} + cp DroidSans.ttf ${FONTDIR} + cp DroidSansMono.ttf ${FONTDIR} + cp DroidSerif-BoldItalic.ttf ${FONTDIR} + cp DroidSerif-Regular.ttf ${FONTDIR} + cp README.txt ${FONTDIR}/droid-fonts-readme.txt +} diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe new file mode 100644 index 000000000..1bf34711d --- /dev/null +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -0,0 +1,32 @@ +SUMMARY="Font family from Google's Android project" +DESCRIPTION="The Droid family of fonts was designed by Ascender's Steve Matteson beginning in the fall of 2006. The goal was to provide optimal quality and reading comfort on a mobile handset. The Droid fonts were optimized for use in application menus, web browsers and for other screen text." +HOMEPAGE="http://www.droidfonts.com" +# source zip extracted from git clone https://android.googlesource.com/platform/frameworks/base tag android-4.3_r2.2 /data/fonts +SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zip" +CHECKSUM_MD5="a91c8129ac25f160ca83e23d77c00862" +LICENSE="Apache v2" +COPYRIGHT="2005-2008 The Android Open Source Project" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="droid = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="fonts" + + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/droid + mkdir -p ${FONTDIR} + cp . ${FONTDIR} -R +} diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe similarity index 89% rename from media-fonts/farsi-fonts/farsi-fonts-0.4.bep rename to media-fonts/farsi_fonts/farsi_fonts-0.4.recipe index 103144133..0ad6033be 100644 --- a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep +++ b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ mkdir -p ${FONTDIR} - cp -r *.ttf {FONTDIR} + cp -r *.ttf ${FONTDIR} } LICENSE="GNU GPL v2" diff --git a/media-fonts/inconsolata/inconsolata-1.0.bep b/media-fonts/inconsolata/inconsolata-1.0.recipe similarity index 96% rename from media-fonts/inconsolata/inconsolata-1.0.bep rename to media-fonts/inconsolata/inconsolata-1.0.recipe index d531ce2ef..23cce1f39 100644 --- a/media-fonts/inconsolata/inconsolata-1.0.bep +++ b/media-fonts/inconsolata/inconsolata-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8510443343f43382566511e73abc06f8" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata mkdir -p ${FONTDIR} wget http://levien.com/type/myfonts/Inconsolata.otf diff --git a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe similarity index 96% rename from media-fonts/kacst-fonts/kacst-fonts-5.0.bep rename to media-fonts/kacst_fonts/kacst_fonts-5.0.recipe index 2c773bcf1..c2a34ed0e 100644 --- a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep +++ b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" -BUILD { +BUILD() +{ cd kacst_one_5.0 } -INSTALL { +INSTALL() +{ cd kacst_one_5.0 FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes mkdir -p ${FONTDIR} diff --git a/media-fonts/lateef-font/lateef-font-1.001.bep b/media-fonts/lateef_font/lateef_font-1.001.recipe similarity index 95% rename from media-fonts/lateef-font/lateef-font-1.001.bep rename to media-fonts/lateef_font/lateef_font-1.001.recipe index bc38efee9..0de1633c9 100644 --- a/media-fonts/lateef-font/lateef-font-1.001.bep +++ b/media-fonts/lateef_font/lateef_font-1.001.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} diff --git a/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 b/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe similarity index 96% rename from media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep rename to media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe index 95a836d80..226727d72 100644 --- a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep +++ b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="fontforge" CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80" -BUILD { +BUILD() +{ cd liberation-fonts-1.06.0.20100721 make } -INSTALL { +INSTALL() +{ cd liberation-fonts-1.06.0.20100721 FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/liberation mkdir -p ${FONTDIR} diff --git a/media-fonts/liberation-fonts/licenses/Liberation Exceptions b/media-fonts/liberation_fonts/licenses/Liberation Exceptions similarity index 100% rename from media-fonts/liberation-fonts/licenses/Liberation Exceptions rename to media-fonts/liberation_fonts/licenses/Liberation Exceptions diff --git a/media-fonts/nafees_nastaleeq/licenses/CRULP b/media-fonts/nafees_nastaleeq/licenses/CRULP new file mode 100644 index 000000000..3bbef24a0 --- /dev/null +++ b/media-fonts/nafees_nastaleeq/licenses/CRULP @@ -0,0 +1,19 @@ +License Agreement +  +Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the font accompanying this license ("Font") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +1. The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +2. The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the font is renamed to names not containing either the words "Nafees" or the word "CRULP". + +3. This License becomes null and void to the extent applicable to Font or Font Software that has been modified and is distributed under the "Nafees*" names. + +4. The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +5. The font software is provided "as is", without warranty of any kind, express or implied, including but not limited to any warranties of merchantability, fitness for a particular purpose and noninfringement of copyright, patent, trademark, or other right. In no event shall CRULP or NUCES be liable for any claim, damages or other liability, including any general, special, indirect, incidental, or consequential damages, whether in an action of contract, or otherwise, arising from, out of the use or inability to use the font software or from other dealings in the font software. + +6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from CRULP. + +7. As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to  be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version diff --git a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe similarity index 97% rename from media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep rename to media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe index dd201fb6f..fc56440a3 100644 --- a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep +++ b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" -BUILD { +BUILD() +{ echo "Nothing to be done. To install this font, run haikuporter with -i option" } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq mkdir -p ${FONTDIR} cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} diff --git a/media-fonts/nafees_riqa/licenses/CRULP b/media-fonts/nafees_riqa/licenses/CRULP new file mode 100644 index 000000000..3bbef24a0 --- /dev/null +++ b/media-fonts/nafees_riqa/licenses/CRULP @@ -0,0 +1,19 @@ +License Agreement +  +Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the font accompanying this license ("Font") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +1. The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +2. The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the font is renamed to names not containing either the words "Nafees" or the word "CRULP". + +3. This License becomes null and void to the extent applicable to Font or Font Software that has been modified and is distributed under the "Nafees*" names. + +4. The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +5. The font software is provided "as is", without warranty of any kind, express or implied, including but not limited to any warranties of merchantability, fitness for a particular purpose and noninfringement of copyright, patent, trademark, or other right. In no event shall CRULP or NUCES be liable for any claim, damages or other liability, including any general, special, indirect, incidental, or consequential damages, whether in an action of contract, or otherwise, arising from, out of the use or inability to use the font software or from other dealings in the font software. + +6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from CRULP. + +7. As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to  be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version diff --git a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe similarity index 96% rename from media-fonts/nafees-riqa/nafees-riqa-1.00.bep rename to media-fonts/nafees_riqa/nafees_riqa-1.00.recipe index 805653aed..ca16a2cf9 100644 --- a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep +++ b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" -BUILD { +BUILD() +{ echo "Nothing to be done. To install this font, run haikuporter with -i option" } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa mkdir -p ${FONTDIR} cp "Nafees Riqa v1.0.ttf" ${FONTDIR} diff --git a/media-fonts/nanumfont/nanumfont-2.0.bep b/media-fonts/nanumfont/nanumfont-2.0.recipe similarity index 95% rename from media-fonts/nanumfont/nanumfont-2.0.bep rename to media-fonts/nanumfont/nanumfont-2.0.recipe index 8f0cc9baf..afa82f449 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.bep +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ diff --git a/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 b/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe similarity index 96% rename from media-fonts/scheherazade-font/scheherazade-font-1.005.bep rename to media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 307e71ece..2d438f87a 100644 --- a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -6,11 +6,13 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} diff --git a/media-fonts/ubuntu_font_family/licenses/Ubuntu Font License 1.0 b/media-fonts/ubuntu_font_family/licenses/Ubuntu Font License 1.0 new file mode 100644 index 000000000..ae78a8f94 --- /dev/null +++ b/media-fonts/ubuntu_font_family/licenses/Ubuntu Font License 1.0 @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to +a new environment. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. These can be included either as stand-alone +text files, human-readable headers or in the appropriate machine- +readable metadata fields within text or binary files as long as those +fields can be easily viewed by the user. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/ubuntu/ubuntu-0.80.bep b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe similarity index 53% rename from media-fonts/ubuntu/ubuntu-0.80.bep rename to media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index 5a0da9f2c..c494c73e1 100644 --- a/media-fonts/ubuntu/ubuntu-0.80.bep +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -1,15 +1,30 @@ -DESCRIPTION="Font family from Ubunu operating system" +SUMMARY="Font family from Ubuntu operating system" +DESCRIPTION="Font family from Ubuntu operating system" HOMEPAGE="http://font.ubuntu.com" SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ubuntu-font-family-0.80 +CHECKSUM_MD5="a1fc70f5a5b1d096ab8310886cddaa1c" +LICENSE="Ubuntu Font License 1.0" +COPYRIGHT="2011 Canonical Ltd." +REVISION="3" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="ubuntu_font_family = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="ubuntu-font-family-0.80" + +BUILD() +{ + true } -INSTALL { - cd ubuntu-font-family-0.80 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu + +INSTALL() +{ + FONTDIR=$fontsDir/ubuntu-font-family mkdir -p ${FONTDIR} cp Ubuntu-B.ttf ${FONTDIR} cp Ubuntu-BI.ttf ${FONTDIR} @@ -25,8 +40,4 @@ INSTALL { cp UbuntuMono-R.ttf ${FONTDIR} cp UbuntuMono-RI.ttf ${FONTDIR} cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt - cp LICENCE.txt ${FONTDIR}/ubuntu-fonts-licence.txt } - -LICENSE="Artistic" -COPYRIGHT="Canonical Ltd." diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe similarity index 96% rename from media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep rename to media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe index 5620593ce..05e2c6a67 100644 --- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" -BUILD { +BUILD() +{ echo "Nothing to be done. To install this font, run haikuporter with -i option" } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep b/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep deleted file mode 100644 index 459d3138d..000000000 --- a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="A droid derived Sans-Serif style CJK font" -HOMEPAGE="http://wqy.sourceforge.net/en" -SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-microhei/0.2.0-beta/wqy-microhei-0.2.0-beta.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" -BUILD { - cd wqy-microhei -} - -INSTALL { - cd wqy-microhei - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi - mkdir -p ${FONTDIR} - cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf -} - -LICENSE="Apache v2 - GNU GPL v3 - GNU GPL font exception" -COPYRIGHT="2007 Google Corp. - 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang" diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep deleted file mode 100644 index 87777cc52..000000000 --- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font" -HOMEPAGE="http://wqy.sourceforge.net/en" -SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd" -BUILD { - cd wqy-zenhei -} - -INSTALL { - cd wqy-zenhei - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi - mkdir -p ${FONTDIR} - cp wqy-zenhei.ttc ${FONTDIR}/wqy-zenhei.ttf -} - -LICENSE="GNU GPL v2 - GNU GPL v2 with font embedding exception" -COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe new file mode 100644 index 000000000..7e945a544 --- /dev/null +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -0,0 +1,39 @@ +SUMMARY="A droid derived Sans-Serif style CJK font" +DESCRIPTION="A droid derived Sans-Serif style CJK font." +HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" +SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-microhei/0.2.0-beta/wqy-microhei-0.2.0-beta.tar.gz" +CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" +LICENSE=" + Apache v2 + GNU GPL v3 + GNU GPL font exception + " +COPYRIGHT=" + 2007 Google Corp. + 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang + " +REVISION="3" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + wqy_microhei = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="wqy-microhei" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/wenquanyi + mkdir -p ${FONTDIR} + cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf +} + diff --git a/media-fonts/wqy-zenhei/licenses/GNU GPL v2 with font embedding exception b/media-fonts/wqy_zenhei/licenses/GNU GPL v2 with font embedding exception similarity index 100% rename from media-fonts/wqy-zenhei/licenses/GNU GPL v2 with font embedding exception rename to media-fonts/wqy_zenhei/licenses/GNU GPL v2 with font embedding exception diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe new file mode 100644 index 000000000..07f31932c --- /dev/null +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -0,0 +1,37 @@ +SUMMARY="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font" +DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font." +HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" +SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz" +CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd" +LICENSE=" + GNU GPL v2 + GNU GPL v2 with font embedding exception + " +COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" +REVISION="2" +ARCHITECTURES="any" + +PROVIDES=" + wqy_zenhei = $portVersion + " +REQUIRES="" +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + coreutils + " + +SOURCE_DIR="wqy-zenhei" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/wenquanyi + mkdir -p ${FONTDIR} + cp wqy-zenhei.ttc ${FONTDIR}/wqy-zenhei.ttf +} + diff --git a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe similarity index 99% rename from media-fonts/x-series-fonts/x-series-fonts-2.0.bep rename to media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index 93c2f2064..c63036006 100644 --- a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" -BUILD { +BUILD() +{ cd Zar } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series mkdir -p ${FONTDIR} wget http://irmug.com/downloads/dl.php?id=21 diff --git a/media-gfx/blender/blender-2.49b.bep b/media-gfx/blender/blender-2.49b.recipe similarity index 95% rename from media-gfx/blender/blender-2.49b.bep rename to media-gfx/blender/blender-2.49b.recipe index cb93d13d3..10b445702 100644 --- a/media-gfx/blender/blender-2.49b.bep +++ b/media-gfx/blender/blender-2.49b.recipe @@ -8,12 +8,14 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-util/scons >= 1.0.1 dev-lang/python >= 2.6.0" -BUILD { +BUILD() +{ cd blender-2.49b scons } -INSTALL { +INSTALL() +{ # TODO exit 1 } diff --git a/media-gfx/flam3/flam3-3.0.bep b/media-gfx/flam3/flam3-3.0.recipe similarity index 96% rename from media-gfx/flam3/flam3-3.0.bep rename to media-gfx/flam3/flam3-3.0.recipe index 3f3aa7c32..e5f209772 100644 --- a/media-gfx/flam3/flam3-3.0.bep +++ b/media-gfx/flam3/flam3-3.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-util/pkconfig >= 0.23" -BUILD { +BUILD() +{ cd flam3-3.0/src if [ -n "$(setgcc | grep '2')" ]; then patch -p0 -ui ../../../patches/flam3-3.0-gcc2.patch @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd flam3-3.0/src make install } diff --git a/media-gfx/fontforge/fontforge-201005010.bep b/media-gfx/fontforge/fontforge-201005010.recipe similarity index 95% rename from media-gfx/fontforge/fontforge-201005010.bep rename to media-gfx/fontforge/fontforge-201005010.recipe index d4cadf981..f358a4973 100644 --- a/media-gfx/fontforge/fontforge-201005010.bep +++ b/media-gfx/fontforge/fontforge-201005010.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5f3d20d645ec1aa2b7b4876386df8717" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd fontforge-20100501 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fontforge-20100501 make install } diff --git a/media-gfx/graphviz/graphviz-2.24.bep b/media-gfx/graphviz/graphviz-2.24.recipe similarity index 96% rename from media-gfx/graphviz/graphviz-2.24.bep rename to media-gfx/graphviz/graphviz-2.24.recipe index 2285c4260..6ad367337 100644 --- a/media-gfx/graphviz/graphviz-2.24.bep +++ b/media-gfx/graphviz/graphviz-2.24.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="806a30dbc3f8deb219216f35be0e7a40" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd graphviz-2.24.0 libtoolize -fci aclocal -I m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd graphviz-2.24.0 make install cd `finddir B_COMMON_BIN_DIRECTORY` diff --git a/media-gfx/graphviz/graphviz-2.26.3.bep b/media-gfx/graphviz/graphviz-2.26.3.bep deleted file mode 100644 index 702281e4d..000000000 --- a/media-gfx/graphviz/graphviz-2.26.3.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="graphviz - Open Source Graph Visualization Software." -HOMEPAGE="http://www.graphviz.org/" -SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz" -CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd graphviz-2.26.3 - libtoolize -fci - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-shared \ - --disable-perl - make -} - -INSTALL { - cd graphviz-2.26.3 - make install -} - -LICENSE="CPL v1.0" -COPYRIGHT="1994-2010 AT&T Corp." diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe new file mode 100644 index 000000000..eb05ab454 --- /dev/null +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -0,0 +1,57 @@ +SUMMARY="Open Source Graph Visualization Software" +DESCRIPTION="Graphviz is open source graph visualization software. Graph visualization is a way of representing structural information as diagrams of abstract graphs and networks. It has important applications in networking, bioinformatics, software engineering, database and web design, machine learning, and in visual interfaces for other technical domains. + +The Graphviz layout programs take descriptions of graphs in a simple text language, and make diagrams in useful formats, such as images and SVG for web pages, PDF or Postscript for inclusion in other documents; or display in an interactive graph browser. (Graphviz also supports GXL, an XML dialect.) Graphviz has many useful features for concrete diagrams, such as options for colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom shapes." +HOMEPAGE="http://www.graphviz.org/" +LICENSE="CPL v1.0" +COPYRIGHT="1994-2010 AT&T Corp." +SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz" +CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" +REVISION="2" +ARCHITECTURES="!x86_gcc2" + +PATCHES="graphviz-2.26.3.patch" + +PROVIDES=" + graphviz = $portVersion compat >= 2 + " + +# TODO: There are several of optional features (e.g. png and jpeg), some of +# which should be enabled. +REQUIRES=" + haiku >= $haikuVersion + lib:libfreetype + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize -fci + autoconf + # The CPPFLAGS, LDFLAGS paths hack is currently required to get the freetype + # headers and library to be found. freetype is part of the system package + # and not in the proper paths. + runConfigure ./configure \ + CPPFLAGS="-I/boot/system/develop/headers/3rdparty/freetype2" \ + LDFLAGS="-L/boot/system/lib" \ + --enable-shared \ + --disable-perl + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/media-gfx/hqx/hqx-1.1.bep b/media-gfx/hqx/hqx-1.1.recipe similarity index 96% rename from media-gfx/hqx/hqx-1.1.bep rename to media-gfx/hqx/hqx-1.1.recipe index ba9a5e07f..83976d146 100644 --- a/media-gfx/hqx/hqx-1.1.bep +++ b/media-gfx/hqx/hqx-1.1.recipe @@ -7,14 +7,16 @@ DEPEND="media-libs/devil >= 1.7.8" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." CHECKSUM_MD5="e4d3132b5f3614a75975b62fe6a066bb" -BUILD { +BUILD() +{ cd hqx-1.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd hqx-1.1 make install diff --git a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep b/media-gfx/imagemagick/imagemagick-6.6.1_10.recipe similarity index 97% rename from media-gfx/imagemagick/imagemagick-6.6.1-10.bep rename to media-gfx/imagemagick/imagemagick-6.6.1_10.recipe index 21b575066..a6bf12c1a 100644 --- a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep +++ b/media-gfx/imagemagick/imagemagick-6.6.1_10.recipe @@ -13,7 +13,8 @@ DEPEND="media-libs/libpng, media-libs/lcms, media-libs/freetype" CHECKSUM_MD5="fa42577f4d9ab23171bc6824b515ca13" -BUILD { +BUILD() +{ cd ImageMagick-6.6.1-10 libtoolize --force aclocal -I m4 @@ -27,7 +28,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ImageMagick-6.6.1-10 make install } diff --git a/media-gfx/pngcrush/pngcrush-1.7.11.bep b/media-gfx/pngcrush/pngcrush-1.7.11.recipe similarity index 96% rename from media-gfx/pngcrush/pngcrush-1.7.11.bep rename to media-gfx/pngcrush/pngcrush-1.7.11.recipe index 4f86224ef..30ebeadd0 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.11.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.11.recipe @@ -6,11 +6,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pngcrush-1.7.11-nolib make } -INSTALL { +INSTALL() +{ cd pngcrush-1.7.11-nolib mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -a -f pngcrush ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` diff --git a/media-gfx/pngcrush/pngcrush-1.7.12.bep b/media-gfx/pngcrush/pngcrush-1.7.12.recipe similarity index 96% rename from media-gfx/pngcrush/pngcrush-1.7.12.bep rename to media-gfx/pngcrush/pngcrush-1.7.12.recipe index 5564d42cc..67391fe1f 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.12.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.12.recipe @@ -6,11 +6,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pngcrush-1.7.12-nolib make } -INSTALL { +INSTALL() +{ cd pngcrush-1.7.12-nolib mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -a -f pngcrush ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` diff --git a/media-gfx/pngcrush/pngcrush-1.7.6.bep b/media-gfx/pngcrush/pngcrush-1.7.6.recipe similarity index 95% rename from media-gfx/pngcrush/pngcrush-1.7.6.bep rename to media-gfx/pngcrush/pngcrush-1.7.6.recipe index 20dcd81d1..cf2825ac6 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.6.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.6.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="79fdedccf761f6391c11aa851c9fc6b2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pngcrush-1.7.6-nolib make } -INSTALL { +INSTALL() +{ cd pngcrush-1.7.6-nolib cp -a -f pngcrush `finddir B_COMMON_BIN_DIRECTORY` } diff --git a/media-gfx/potrace/potrace-1.8.bep b/media-gfx/potrace/potrace-1.8.recipe similarity index 95% rename from media-gfx/potrace/potrace-1.8.bep rename to media-gfx/potrace/potrace-1.8.recipe index a9c35063c..973ae7e68 100644 --- a/media-gfx/potrace/potrace-1.8.bep +++ b/media-gfx/potrace/potrace-1.8.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd potrace-1.8 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd potrace-1.8 make install } diff --git a/media-gfx/sane-backends/patches/sane-backends-1.0.21.patch b/media-gfx/sane_backends/patches/sane_backends-1.0.21.patch similarity index 100% rename from media-gfx/sane-backends/patches/sane-backends-1.0.21.patch rename to media-gfx/sane_backends/patches/sane_backends-1.0.21.patch diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21.bep b/media-gfx/tuxpaint/tuxpaint-0.9.21.recipe similarity index 96% rename from media-gfx/tuxpaint/tuxpaint-0.9.21.bep rename to media-gfx/tuxpaint/tuxpaint-0.9.21.recipe index afcd11f6d..192f3bb24 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.21.bep +++ b/media-gfx/tuxpaint/tuxpaint-0.9.21.recipe @@ -15,12 +15,14 @@ DEPEND="media-libs/libsdl >= 1.2.14 dev-util/pkgconfig >= 0.23 sys-devel/gettext >= 0.17" -BUILD { +BUILD() +{ cd tuxpaint-0.9.21 make } -INSTALL { +INSTALL() +{ cd tuxpaint-0.9.21 make install } diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe similarity index 97% rename from media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep rename to media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe index 6dc3f1daf..f0893b193 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep +++ b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe @@ -15,7 +15,8 @@ DEPEND="media-libs/libsdl >= 1.2.14 sys-devel/gettext >= 0.17 dev-utils/gperf >= 3.0.4" -BUILD { +BUILD() +{ cd tuxpaint-0.9.2x-cvs if [ ! -f /boot/common/lib/libstdc++.so ] then @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tuxpaint-0.9.2x-cvs make install DESTDIR=${DESTDIR} } diff --git a/media-libs/a52dec/a52dec-0.7.4.bep b/media-libs/a52dec/a52dec-0.7.4.recipe similarity index 95% rename from media-libs/a52dec/a52dec-0.7.4.bep rename to media-libs/a52dec/a52dec-0.7.4.recipe index ca528ac3c..b062a6fbd 100644 --- a/media-libs/a52dec/a52dec-0.7.4.bep +++ b/media-libs/a52dec/a52dec-0.7.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="caa9f5bc44232dc8aeea773fea56be80" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd a52dec-0.7.4 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd a52dec-0.7.4 make install DESTDIR=${DESTDIR} } diff --git a/media-libs/aalib/aalib-1.4rc4.bep b/media-libs/aalib/aalib-1.4rc4.recipe similarity index 96% rename from media-libs/aalib/aalib-1.4rc4.bep rename to media-libs/aalib/aalib-1.4rc4.recipe index 34b9d7925..29a13d8cb 100644 --- a/media-libs/aalib/aalib-1.4rc4.bep +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -5,7 +5,8 @@ SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd aalib-1.4.0 libtoolize --force --copy --install # aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd aalib-1.4.0 make install } diff --git a/media-libs/agar/agar-1.4.1.bep b/media-libs/agar/agar-1.4.1.recipe similarity index 94% rename from media-libs/agar/agar-1.4.1.bep rename to media-libs/agar/agar-1.4.1.recipe index 5c13d6e2d..e88afa4c9 100644 --- a/media-libs/agar/agar-1.4.1.bep +++ b/media-libs/agar/agar-1.4.1.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="ce71fb11ad79c926a968a4ed29053820" -BUILD { +BUILD() +{ cd agar-1.4.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd agar-1.4.1 make install } -TEST { +TEST() +{ cd agar-1.4.1 # make test # make check diff --git a/media-libs/allegro/allegro-4.4.0.bep b/media-libs/allegro/allegro-4.4.0.recipe similarity index 95% rename from media-libs/allegro/allegro-4.4.0.bep rename to media-libs/allegro/allegro-4.4.0.recipe index c78f14bc2..7a3ff42b1 100644 --- a/media-libs/allegro/allegro-4.4.0.bep +++ b/media-libs/allegro/allegro-4.4.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libvorbis >= 1.2.3" -BUILD { +BUILD() +{ cd allegro-4.4.0 cmake . make } -INSTALL { +INSTALL() +{ cd allegro-4.4.0 make install } diff --git a/media-libs/allegro/allegro-4.4.1.1.bep b/media-libs/allegro/allegro-4.4.1.1.recipe similarity index 97% rename from media-libs/allegro/allegro-4.4.1.1.bep rename to media-libs/allegro/allegro-4.4.1.1.recipe index c4a2019cd..925c2c10a 100644 --- a/media-libs/allegro/allegro-4.4.1.1.bep +++ b/media-libs/allegro/allegro-4.4.1.1.recipe @@ -8,7 +8,8 @@ DEPEND="dev-util/cmake >= 2.6.0 media-libs/libvorbis >= 1.2.3 media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd allegro-4.4.1.1 mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd allegro-4.4.1.1 make install } diff --git a/media-libs/allegro/allegro-4.4.x-svn.bep b/media-libs/allegro/allegro-4.4.x_svn.recipe similarity index 96% rename from media-libs/allegro/allegro-4.4.x-svn.bep rename to media-libs/allegro/allegro-4.4.x_svn.recipe index ca03a5837..e114b9ab5 100644 --- a/media-libs/allegro/allegro-4.4.x-svn.bep +++ b/media-libs/allegro/allegro-4.4.x_svn.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.6.0 media-libs/libvorbis >= 1.2.3 media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd allegro-4.4.x-svn mkdir -p `finddir B_COMMON_DIRECTORY`/share/info mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd allegro-4.4.x-svn make install } diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff deleted file mode 100644 index 8c1ce789b..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff +++ /dev/null @@ -1,736 +0,0 @@ -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800 -+++ allegro-4.3.10-haiku/fix.sh 2008-08-23 17:29:03.000000000 -0700 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.haiku" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 01:13:22.000000000 -0700 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-08-25 22:04:47.000000000 -0700 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/alhakcfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/ainthaiku.h allegro-4.3.10-haiku/include/allegro/platform/ainthaiku.h ---- allegro-4.3.10/include/allegro/platform/ainthaiku.h 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/platform/ainthaiku.h 2006-03-18 07:05:34.000000000 -0800 -@@ -0,0 +1,151 @@ -+/* ______ ___ ___ -+ * /\ _ \ /\_ \ /\_ \ -+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ -+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ -+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ -+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ -+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/ -+ * /\____/ -+ * \_/__/ -+ * -+ * Definitions for internal use by the BeOS configuration. -+ * -+ * By Jason Wilkins. -+ * -+ * See readme.txt for copyright information. -+ */ -+ -+ -+#include "bealleg.h" -+ -+#ifdef __cplusplus -+extern status_t ignore_result; -+ -+extern volatile int32 focus_count; -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define WND_TITLE_SIZE 128 -+ -+AL_ARRAY(char, wnd_title); -+ -+int be_key_init(void); -+void be_key_exit(void); -+void be_key_set_leds(int leds); -+void be_key_set_rate(int delay, int repeat); -+void be_key_wait_for_input(void); -+void be_key_stop_waiting_for_input(void); -+void be_key_suspend(void); -+void be_key_resume(void); -+ -+int be_sys_init(void); -+void be_sys_exit(void); -+void _be_sys_get_executable_name(char *output, int size); -+void be_sys_get_executable_name(char *output, int size); -+int be_sys_find_resource(char *dest, AL_CONST char *resource, int size); -+void be_sys_set_window_title(AL_CONST char *name); -+int be_sys_set_close_button_callback(void (*proc)(void)); -+void be_sys_message(AL_CONST char *msg); -+int be_sys_set_display_switch_mode(int mode); -+int be_sys_desktop_color_depth(void); -+int be_sys_get_desktop_resolution(int *width, int *height); -+void be_sys_get_gfx_safe_mode(int *driver, struct GFX_MODE *mode); -+void be_sys_yield_timeslice(void); -+void *be_sys_create_mutex(void); -+void be_sys_destroy_mutex(void *handle); -+void be_sys_lock_mutex(void *handle); -+void be_sys_unlock_mutex(void *handle); -+void be_sys_suspend(void); -+void be_sys_resume(void); -+void be_main_suspend(void); -+void be_main_resume(void); -+ -+struct BITMAP *be_gfx_bwindowscreen_accel_init(int w, int h, int v_w, int v_h, int color_depth); -+struct BITMAP *be_gfx_bwindowscreen_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_bwindowscreen_exit(struct BITMAP *b); -+void be_gfx_bwindowscreen_acquire(struct BITMAP *b); -+void be_gfx_bwindowscreen_release(struct BITMAP *b); -+void be_gfx_bwindowscreen_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync); -+int be_gfx_bwindowscreen_scroll(int x, int y); -+int be_gfx_bwindowscreen_request_scroll(int x, int y); -+int be_gfx_bwindowscreen_poll_scroll(void); -+int be_gfx_bwindowscreen_request_video_bitmap(struct BITMAP *bitmap); -+void be_gfx_vsync(void); -+struct GFX_MODE_LIST *be_gfx_bwindowscreen_fetch_mode_list(void); -+void be_gfx_bwindowscreen_accelerate(int color_depth); -+#ifdef ALLEGRO_NO_ASM -+uintptr_t be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int lyne); -+void be_gfx_bwindowscreen_unwrite_bank(BITMAP *bmp); -+#else -+uintptr_t _be_gfx_bwindowscreen_read_write_bank_asm(BITMAP *bmp, int lyne); -+void _be_gfx_bwindowscreen_unwrite_bank_asm(BITMAP *bmp); -+#endif -+ -+struct BITMAP *be_gfx_bdirectwindow_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_bdirectwindow_exit(struct BITMAP *b); -+void be_gfx_bdirectwindow_acquire(struct BITMAP *bmp); -+void be_gfx_bdirectwindow_release(struct BITMAP *bmp); -+void be_gfx_bdirectwindow_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync); -+ -+struct BITMAP *be_gfx_bwindow_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_bwindow_exit(struct BITMAP *b); -+void be_gfx_bwindow_acquire(struct BITMAP *bmp); -+void be_gfx_bwindow_release(struct BITMAP *bmp); -+void be_gfx_bwindow_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync); -+ -+#ifdef ALLEGRO_NO_ASM -+void _be_gfx_bwindow_unwrite_bank(BITMAP *bmp); -+uintptr_t _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int lyne); -+#else -+void _be_gfx_bwindow_unwrite_bank_asm(BITMAP *bmp); -+uintptr_t _be_gfx_bwindow_read_write_bank_asm(BITMAP *bmp, int lyne); -+#endif -+ -+struct BITMAP *be_gfx_overlay_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_overlay_exit(struct BITMAP *b); -+ -+int be_time_init(void); -+void be_time_exit(void); -+void be_time_rest(unsigned int tyme, AL_METHOD(void, callback, (void))); -+void be_time_suspend(void); -+void be_time_resume(void); -+ -+int be_mouse_init(void); -+void be_mouse_exit(void); -+void be_mouse_position(int x, int y); -+void be_mouse_set_range(int x1, int y_1, int x2, int y2); -+void be_mouse_set_speed(int xspeed, int yspeed); -+void be_mouse_get_mickeys(int *mickeyx, int *mickeyy); -+ -+int be_joy_init(void); -+void be_joy_exit(void); -+int be_joy_poll(void); -+ -+int be_sound_detect(int input); -+int be_sound_init(int input, int voices); -+void be_sound_exit(int input); -+void *be_sound_lock_voice(int voice, int start, int end); -+void be_sound_unlock_voice(int voice); -+int be_sound_buffer_size(void); -+int be_sound_set_mixer_volume(int volume); -+int be_sound_get_mixer_volume(void); -+void be_sound_suspend(void); -+void be_sound_resume(void); -+ -+int be_midi_detect(int input); -+int be_midi_init(int input, int voices); -+void be_midi_exit(int input); -+int be_midi_set_mixer_volume(int volume); -+int be_midi_get_mixer_volume(void); -+void be_midi_key_on(int inst, int note, int bend, int vol, int pan); -+void be_midi_key_off(int voice); -+void be_midi_set_volume(int voice, int vol); -+void be_midi_set_pitch(int voice, int note, int bend); -+void be_midi_set_pan(int voice, int pan); -+ -+#ifdef __cplusplus -+} -+#endif -diff -urN allegro-4.3.10/include/allegro/platform/alhaiku.h allegro-4.3.10-haiku/include/allegro/platform/alhaiku.h ---- allegro-4.3.10/include/allegro/platform/alhaiku.h 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/platform/alhaiku.h 2002-10-01 11:05:12.000000000 -0700 -@@ -0,0 +1,76 @@ -+/* ______ ___ ___ -+ * /\ _ \ /\_ \ /\_ \ -+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ -+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ -+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ -+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ -+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/ -+ * /\____/ -+ * \_/__/ -+ * -+ * BeOS specific definitions header file. -+ * -+ * By Jason Wilkins. -+ * -+ * See readme.txt for copyright information. -+ */ -+ -+ -+/* system driver */ -+#define SYSTEM_BEOS AL_ID('B','S','Y','S') -+AL_VAR(SYSTEM_DRIVER, system_beos); -+ -+/* timer driver */ -+#define TIMER_BEOS AL_ID('B','T','I','M') -+AL_VAR(TIMER_DRIVER, timer_beos); -+ -+/* keyboard driver */ -+#define KEYBOARD_BEOS AL_ID('B','K','E','Y') -+AL_VAR(KEYBOARD_DRIVER, keyboard_beos); -+ -+/* mouse driver */ -+#define MOUSE_BEOS AL_ID('B','M','O','U') -+AL_VAR(MOUSE_DRIVER, mouse_beos); -+ -+/* joystick driver */ -+#define JOYSTICK_BEOS AL_ID('B','J','O','Y') -+AL_VAR(JOYSTICK_DRIVER, joystick_beos); -+ -+/* graphics drivers */ -+#define GFX_BWINDOWSCREEN_ACCEL AL_ID('B','W','S','A') -+#define GFX_BWINDOWSCREEN AL_ID('B','W','S',' ') -+AL_VAR(GFX_DRIVER, gfx_beos_bwindowscreen_accel); -+AL_VAR(GFX_DRIVER, gfx_beos_bwindowscreen); -+ -+#define GFX_BDIRECTWINDOW AL_ID('B','D','W','N') -+#define GFX_BWINDOW AL_ID('B','W','N',' ') -+AL_VAR(GFX_DRIVER, gfx_beos_bdirectwindow); -+AL_VAR(GFX_DRIVER, gfx_beos_bwindow); -+ -+#define GFX_BWINDOW_OVERLAY AL_ID('B','O','V','L') -+AL_VAR(GFX_DRIVER, gfx_beos_overlay); -+ -+/* digi drivers */ -+#define DIGI_BEOS AL_ID('B','D','I','G') -+AL_VAR(DIGI_DRIVER, digi_beos); -+ -+/* midi drivers */ -+#define MIDI_BEOS AL_ID('B','M','I','D') -+AL_VAR(MIDI_DRIVER, midi_beos); -+ -+#define GFX_DRIVER_BEOS \ -+ { GFX_BWINDOWSCREEN_ACCEL, &gfx_beos_bwindowscreen_accel, TRUE }, \ -+ { GFX_BWINDOWSCREEN, &gfx_beos_bwindowscreen, TRUE }, \ -+ { GFX_BDIRECTWINDOW, &gfx_beos_bdirectwindow, TRUE }, \ -+ { GFX_BWINDOW, &gfx_beos_bwindow, TRUE }, \ -+ { GFX_BWINDOW_OVERLAY, &gfx_beos_overlay, TRUE }, -+ -+#define DIGI_DRIVER_BEOS \ -+ { DIGI_BEOS, &digi_beos, TRUE }, -+ -+#define MIDI_DRIVER_BEOS \ -+ { MIDI_BEOS, &midi_beos, TRUE }, -+ -+#define JOYSTICK_DRIVER_BEOS \ -+ { JOYSTICK_BEOS, &joystick_beos, TRUE }, -+ -diff -urN allegro-4.3.10/include/allegro/platform/alhakcfg.h allegro-4.3.10-haiku/include/allegro/platform/alhakcfg.h ---- allegro-4.3.10/include/allegro/platform/alhakcfg.h 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/platform/alhakcfg.h 2008-08-25 22:07:11.000000000 -0700 -@@ -0,0 +1,43 @@ -+/* ______ ___ ___ -+ * /\ _ \ /\_ \ /\_ \ -+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ -+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ -+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ -+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ -+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/ -+ * /\____/ -+ * \_/__/ -+ * -+ * Configuration defines for use with BeOS. -+ * -+ * By Jason Wilkins. -+ * -+ * See readme.txt for copyright information. -+ */ -+ -+ -+#include -+#include -+ -+/* provide implementations of missing functions */ -+#define ALLEGRO_NO_STRICMP -+#define ALLEGRO_NO_STRLWR -+#define ALLEGRO_NO_STRUPR -+ -+/* a static auto config */ -+#define ALLEGRO_HAVE_DIRENT_H 1 -+#define ALLEGRO_HAVE_INTTYPES_H 1 /* TODO: check this */ -+#define ALLEGRO_HAVE_STDINT_H 1 /* TODO: check this */ -+#define ALLEGRO_HAVE_SYS_TIME_H 1 -+ -+/* describe this platform */ -+#define ALLEGRO_PLATFORM_STR "Haiku" -+#define ALLEGRO_LITTLE_ENDIAN -+#define ALLEGRO_CONSOLE_OK -+#define ALLEGRO_USE_CONSTRUCTOR -+#define ALLEGRO_MULTITHREADED -+ -+/* arrange for other headers to be included later on */ -+#define ALLEGRO_EXTRA_HEADER "allegro/platform/alhaiku.h" -+#define ALLEGRO_INTERNAL_HEADER "allegro/platform/ainthaiku.h" -+#define ALLEGRO_ASMCAPA_HEADER "obj/beos/asmcapa.h" -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.all 2008-08-23 17:44:44.000000000 -0700 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.haiku allegro-4.3.10-haiku/makefile.haiku ---- allegro-4.3.10/makefile.haiku 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.haiku 2008-08-25 21:19:47.000000000 -0700 -@@ -0,0 +1,315 @@ -+# -+# Rules for building the Allegro library with Haiku. This file is included -+# by the primary makefile, and should not be used directly. -+# -+# The "depend" target uses sed. -+# -+# See makefile.all for a list of the available targets. -+ -+ -+ -+# -------- define some variables that the primary makefile will use -------- -+ -+PLATFORM = Haiku -+CC = gcc -+EXE = -+OBJ = .o -+HTML = html -+ -+PLATFORM_DIR = obj/beos -+ -+UNIX_TOOLS = 1 -+ -+ifdef STATICLINK -+ -+# -------- link as a static library -------- -+OBJ_DIR = obj/beos/$(VERSION) -+LIB_NAME = lib/beos/lib$(VERSION).a -+ -+else -+ -+# -------- link as a DLL -------- -+OBJ_DIR = obj/beos/$(VERSION) -+LIB_NAME = lib/beos/lib$(VERSION)-$(shared_version).so -+ -+endif # STATICLINK -+ -+# -------- give a sensible default target for make without any args -------- -+ -+.PHONY: _default -+ -+_default: default -+ -+ -+# -------- decide what compiler options to use -------- -+ -+ifdef WARNMODE -+WFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy -Werror -+else -+WFLAGS = -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy -+endif -+ -+ifdef TARGET_ARCH_COMPAT -+ TARGET_ARCH = $(GCC_MTUNE)=$(TARGET_ARCH_COMPAT) -+else -+ ifdef TARGET_ARCH_EXCL -+ TARGET_ARCH = -march=$(TARGET_ARCH_EXCL) -+ else -+ TARGET_ARCH = $(GCC_MTUNE)=i586 -+ endif -+endif -+ -+ifndef TARGET_OPTS -+ TARGET_OPTS = -O6 -funroll-loops -ffast-math -+endif -+ -+OFLAGS = $(TARGET_ARCH) $(TARGET_OPTS) -+ -+CFLAGS = -DALLEGRO_LIB_BUILD -+ -+ -+ -+ifdef DEBUGMODE -+ -+# -------- debugging build -------- -+CFLAGS += -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g -O0 -+SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -+LFLAGS = -g -+ -+else -+ifdef PROFILEMODE -+ -+# -------- profiling build -------- -+CFLAGS += $(WFLAGS) $(OFLAGS) -pg -+SFLAGS = $(WFLAGS) -+LFLAGS = -pg -+ -+else -+ -+# -------- optimised build -------- -+CFLAGS += $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -+SFLAGS = $(WFLAGS) -+ -+ifndef SYMBOLMODE -+LFLAGS = -s -+else -+LFLAGS = -+endif -+ -+endif -+endif -+ -+ -+# -------- list which platform specific objects to include -------- -+ -+VPATH = src/haiku src/misc src/unix tools/haiku -+ -+ifdef ALLEGRO_USE_C -+ -+# ------ build a C-only version ------ -+ -+VPATH += src/c -+MY_OBJECTS = $(C_OBJECTS) cmiscs -+CFLAGS += -+ -+else -+ -+# ------ build the normal asm version ------ -+ -+VPATH += src/i386 -+MY_OBJECTS = $(I386_OBJECTS) -+ -+endif # ALLEGRO_USE_C -+ -+OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_HAIKU_FILES))) -+ -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+ -+PROGRAMS = bfixicon -+ -+bfixicon: tools/haiku/bfixicon -+ -+DISTCLEAN_FILES += tools/haiku/bfixicon -+ -+ -+ -+# -------- rules for installing and removing the library files -------- -+ -+INSTALLDIR = /boot/develop -+LIBDIR = lib/x86 -+INCDIR = headers -+ -+SHARED_LIBDIR = /boot/common/lib -+ -+ -+ifdef STATICLINK -+ -+$(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).a: $(LIB_NAME) -+ cp $< $@ -+ -+else -+ -+$(SHARED_LIBDIR)/lib$(VERSION)-$(shared_version).so: $(LIB_NAME) -+ cp $< $@ -+ -+endif -+ -+ -+/bin/allegro-config: -+ifdef STATICLINK -+ sed -e "s/@LINK_WITH_STATIC_LIBS@/yes/" misc/allegro-config.in >temp -+else -+ sed -e "s/@LINK_WITH_STATIC_LIBS@/no/" misc/allegro-config.in >temp -+endif -+ sed -e "s/@prefix@/\/boot\/develop/" temp > temp2 -+ sed -e "s/@LIB_TO_LINK@/$(VERSION)/" temp2 > temp -+ sed -e "s/@LDFLAGS@//" temp > temp2 -+ sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp -+ sed -e "s/include/headers/" temp >temp2 -+ sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+ rm -f temp temp2 -+ chmod a+x /bin/allegro-config -+ -+ -+HEADERS = $(INSTALLDIR)/$(INCDIR)/bealleg.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/aintbeos.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/al386gcc.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/albecfg.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/alplatf.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/astdint.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/albeos.h -+ -+ifdef STATICLINK -+ INSTALL_FILES = $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).a -+else -+ INSTALL_FILES = $(SHARED_LIBDIR)/lib$(VERSION)-$(shared_version).so -+endif -+ -+INSTALL_FILES += $(HEADERS) /bin/allegro-config -+ -+ -+install: generic-install -+ @echo The $(DESCRIPTION) $(PLATFORM) library has been installed. -+ -+UNINSTALL_FILES = $(INSTALLDIR)/$(LIBDIR)/liballeg.a \ -+ $(INSTALLDIR)/$(LIBDIR)/liballd.a \ -+ $(INSTALLDIR)/$(LIBDIR)/liballp.a \ -+ $(SHARED_LIBDIR)/liballeg-$(shared_version).so \ -+ $(SHARED_LIBDIR)/liballd-$(shared_version).so \ -+ $(SHARED_LIBDIR)/liballp-$(shared_version).so \ -+ $(HEADERS) \ -+ /bin/allegro-config -+ -+uninstall: generic-uninstall -+ @echo All gone! -+ -+ -+ -+# -------- test capabilities -------- -+ -+TEST_CPP = @echo ...system compiler -+ -+include makefile.tst -+ -+ -+ -+# -------- finally, we get to the fun part... -------- -+ -+ifdef PROFILEMODE -+OTHER_OBJECTS = /boot/develop/lib/x86/i386-mcount.o -+endif -+ -+ifdef STATICLINK -+ -+# -------- link as a static library -------- -+define MAKE_LIB -+ar rs $(LIB_NAME) $(OBJECTS) $(OTHER_OBJECTS) -+endef -+ -+else -+ -+# -------- link as a shared library -------- -+ -+define MAKE_LIB -+$(CC) -nostart $(PFLAGS) -o $(LIB_NAME) $(OBJECTS) $(OTHER_OBJECTS) $(LIBRARIES) -+endef -+ -+endif # STATICLINK -+ -+COMPILE_FLAGS = $(subst src/,-DALLEGRO_SRC ,$(findstring src/, $<))$(CFLAGS) -+ -+$(OBJ_DIR)/%.o: %.c -+ $(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $< -+ -+$(OBJ_DIR)/%.o: %.cpp -+ $(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $< -+ -+$(OBJ_DIR)/%.o: %.s -+ $(CC) $(SFLAGS) -I. -I./include -x assembler-with-cpp -o $@ -c $< -+ -+demos/shooter/shooter: $(OBJECTS_SHOOTER) $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $(OBJECTS_SHOOTER) $(LIB_NAME) $(LIBRARIES) -+ -+demos/skater/skater: $(OBJECTS_SKATER) $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $(OBJECTS_SKATER) $(LIB_NAME) $(LIBRARIES) -+ -+*/%: $(OBJ_DIR)/%.o $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIBRARIES) -+ -+obj/haiku/asmdef.inc: obj/haiku/asmdef -+ obj/haiku/asmdef obj/haiku/asmdef.inc -+ -+obj/haiku/asmdef: src/i386/asmdef.c include/*.h include/allegro/*.h obj/haiku/asmcapa.h -+ $(CC) -O $(WFLAGS) -I. -I./include -o obj/haiku/asmdef src/i386/asmdef.c -+ -+define LINK_WITHOUT_LIB -+ $(CC) $(LFLAGS) -o $@ $^ $(OTHER_OBJECTS) -+endef -+ -+PLUGIN_LIB = lib/haiku/lib$(VERY_SHORT_VERSION)dat.a -+PLUGINS_H = obj/haiku/plugins.h -+PLUGIN_DEPS = $(LIB_NAME) $(PLUGIN_LIB) -+PLUGIN_SCR = scr -+ -+define GENERATE_PLUGINS_H -+cat tools/plugins/*.inc > obj/haiku/plugins.h -+endef -+ -+define MAKE_PLUGIN_LIB -+ar rs $(PLUGIN_LIB) $(PLUGIN_OBJS) -+endef -+ -+define LINK_WITH_PLUGINS -+$(CC) $(LFLAGS) -o $@ $< $(strip $(PLUGIN_LIB) $(addprefix @,$(PLUGIN_SCRIPTS)) $(LIB_NAME)) -+endef -+ -+tools/haiku/%: $(OBJ_DIR)/%.o $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIBRARIES) -+ -+ -+ -+# -------- demo program iconification -------- -+ -+.PHONY: fixdemo -+ -+fixdemo: demos/shooter/shooter demo/demo.dat tools/haiku/bfixicon -+ tools/haiku/bfixicon demos/shooter/shooter -d demos/shooter/demo.dat SHIP3 GAME_PAL -+ -+ -+ -+# -------- generate automatic dependencies -------- -+ -+DEPEND_PARAMS = -MM -MG -I. -I./include -DSCAN_DEPEND -DALLEGRO_HAIKU -+ -+depend: -+ $(CC) $(DEPEND_PARAMS) src/*.c src/haiku/*.c src/i386/*.c src/misc/*.c src/unix/*.c demos/shooter/*.c > _depend.tmp -+ $(CC) $(DEPEND_PARAMS) docs/src/makedoc/*.c examples/*.c setup/*.c tests/*.c tools/*.c tools/plugins/*.c >> _depend.tmp -+ $(CC) $(DEPEND_PARAMS) demos/skater/source/*.c >> _depend.tmp -+ $(CC) $(DEPEND_PARAMS) -x c src/haiku/*.cpp tests/*.cpp tools/haiku/*.cpp >> _depend.tmp -+ $(CC) $(DEPEND_PARAMS) -x assembler-with-cpp src/i386/*.s src/misc/*.s >> _depend.tmp -+ sed -e "s/^[a-zA-Z0-9_\/]*\///" _depend.tmp > _depend2.tmp -+ sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/alleg\/\1/" _depend2.tmp > obj/haiku/alleg/makefile.dep -+ sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/alld\/\1/" _depend2.tmp > obj/haiku/alld/makefile.dep -+ sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/allp\/\1/" _depend2.tmp > obj/haiku/allp/makefile.dep -+ rm _depend.tmp _depend2.tmp -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-08-23 20:56:44.000000000 -0700 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -91,11 +91,11 @@ - - # jpgalleg addon - (cd addons/jpgalleg && rm -rf examples) -- (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) -+ (cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-08-23 20:53:10.000000000 -0700 -@@ -126,6 +126,14 @@ - make depend UNIX_TOOLS=1 CC=gcc - - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc -+ -+ - # generate dependencies for QNX - echo "Generating QNX dependencies..." - -@@ -164,7 +172,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-08-23 20:44:06.000000000 -0700 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-08-23 20:42:07.000000000 -0700 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff deleted file mode 100644 index 362496b24..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff +++ /dev/null @@ -1,657 +0,0 @@ -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800 -+++ allegro-4.3.10-haiku/fix.sh 2008-08-26 23:51:47.000000000 -0700 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 14:37:14.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-08-26 22:35:46.000000000 -0700 -@@ -189,7 +189,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 01:13:22.000000000 -0700 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-08-26 22:20:39.000000000 -0700 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-15 19:52:28.000000000 -0700 -+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-08-26 22:24:41.000000000 -0700 -@@ -31,7 +31,12 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.all 2008-08-23 17:44:44.000000000 -0700 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be ---- allegro-4.3.10/makefile.be 2008-01-11 03:30:16.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.be 2008-08-26 22:11:32.000000000 -0700 -@@ -10,7 +10,15 @@ - - # -------- define some variables that the primary makefile will use -------- - -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o -@@ -123,7 +131,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -167,7 +181,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-08-23 20:56:44.000000000 -0700 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -91,11 +91,11 @@ - - # jpgalleg addon - (cd addons/jpgalleg && rm -rf examples) -- (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) -+ (cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-08-23 20:53:10.000000000 -0700 -@@ -126,6 +126,14 @@ - make depend UNIX_TOOLS=1 CC=gcc - - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc -+ -+ - # generate dependencies for QNX - echo "Generating QNX dependencies..." - -@@ -164,7 +172,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c ---- allegro-4.3.10/setup/keyconf.c 2005-04-07 16:37:20.000000000 -0700 -+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-08-26 22:40:30.000000000 -0700 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp ---- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 16:18:56.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-08-26 22:44:08.000000000 -0700 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 07:18:16.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-08-26 22:44:30.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-08-26 22:44:57.000000000 -0700 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c ---- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 08:05:12.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-08-26 22:45:13.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 13:12:30.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-08-26 22:45:26.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-08-26 22:45:49.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c ---- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 09:16:42.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-08-26 22:46:06.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 07:44:50.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-08-26 22:46:32.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-08-26 22:46:46.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c ---- allegro-4.3.10/src/beos/bkey.c 2004-12-03 12:56:28.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-08-26 22:47:00.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-08-26 22:47:20.000000000 -0700 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-08-26 22:47:53.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c ---- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 07:05:34.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-08-26 22:48:11.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 14:48:38.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-08-26 22:48:29.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c ---- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-08-26 22:48:50.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-08-26 22:49:09.000000000 -0700 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-08-26 22:49:25.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c ---- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 05:24:16.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-08-26 22:49:38.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 03:53:40.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-08-26 22:49:53.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c ---- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 07:05:34.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-08-26 22:50:07.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 07:05:34.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-08-26 22:50:22.000000000 -0700 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-08-26 22:50:52.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-08-26 22:51:53.000000000 -0700 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-08-26 22:52:11.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c ---- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 13:10:58.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-08-26 23:39:03.000000000 -0700 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 04:33:22.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-08-26 22:52:45.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c ---- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-08-26 22:53:00.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c ---- allegro-4.3.10/src/beos/btimer.c 2004-08-21 19:57:14.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-08-26 22:53:13.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 03:53:40.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-08-26 22:53:28.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 09:27:02.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-08-26 22:53:51.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c ---- allegro-4.3.10/src/midi.c 2007-04-12 09:19:54.000000000 -0700 -+++ allegro-4.3.10-haiku/src/midi.c 2008-08-26 22:56:43.000000000 -0700 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-08-23 20:44:06.000000000 -0700 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-08-23 20:42:07.000000000 -0700 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff deleted file mode 100644 index abd3aad5f..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff +++ /dev/null @@ -1,325 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku-fixes/addons/allegrogl/fix.sh ---- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 03:20:16.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/allegrogl/fix.sh 2008-08-31 09:12:54.000000000 -0700 -@@ -18,7 +18,7 @@ - echo "Compilation target adjustment." - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" --echo " is one of: djgpp, mingw32, unix, macosx" -+echo " is one of: djgpp, haiku, mingw32, unix, macosx" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" - echo " --utod converts from Unix format to DOS/Win32" -@@ -79,6 +79,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku-fixes/addons/loadpng/Makefile.be ---- allegro-4.3.10/addons/loadpng/Makefile.be 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/loadpng/Makefile.be 2008-08-31 09:01:30.000000000 -0700 -@@ -0,0 +1,57 @@ -+## Aux -*- Makefile -*- for BeOS/Haiku -+ -+prefix := `/boot/common/bin/allegro-config --prefix` -+libdir := $(prefix)/lib -+includedir := $(prefix)/include -+DESTDIR := -+ -+EXAMPLECFLAGS := -Wno-deprecated-declarations -I/boot/common/include -+EXAMPLELIBS := -lpng -lz `/boot/common/bin/allegro-config --libs --addon` -L/boot/common/lib -+ -+ -+#-------------------------------------------------- -+# Note: this is for gcc -+# And I don't really think you should use it, but it's up to you -+.PHONY: shared -+ -+SHAREDLIB := libloadpng-$(VERSION).so -+ -+shared: $(SHAREDLIB) -+ -+$(SHAREDLIB): loadpng.c savepng.c regpng.c -+ $(CC) -o $(SHAREDLIB) $(CFLAGS) -fPIC -shared loadpng.c savepng.c regpng.c -+ -+#-------------------------------------------------- -+.PHONY: install install-headers install-shared -+ -+install: $(LIB) install-headers -+ install -d -m 755 $(DESTDIR)$(libdir) -+ install -m 644 $(LIB) $(DESTDIR)$(libdir) -+ @echo - -+ @echo loadpng is now installed. -+ -+install-shared: $(SHAREDLIB) install-headers -+ install -d -m 755 $(DESTDIR)$(libdir) -+ install -m 755 $(SHAREDLIB) $(DESTDIR)$(libdir) -+ -+install-headers: -+ install -d -m 755 $(DESTDIR)$(includedir) -+ install -m 644 loadpng.h $(DESTDIR)$(includedir) -+ -+#-------------------------------------------------- -+.PHONY: uninstall -+ -+uninstall: -+ -rm -f $(DESTDIR)$(includedir)/loadpng.h -+ -rm -f $(DESTDIR)$(libdir)/$(LIB) -+ @echo - -+ @echo loadpng is now uninstalled. -+ -+#-------------------------------------------------- -+.PHONY: clean veryclean -+ -+clean: -+ - rm -f loadpng.o savepng.o regpng.o $(LIB) $(SHAREDLIB) -+ -+veryclean: clean -+ - rm -f $(EXAMPLES) examples/saved.png -diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku-fixes/addons/loadpng/fix.sh ---- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-27 17:05:30.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/loadpng/fix.sh 2008-08-31 09:04:07.000000000 -0700 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix" -+ echo "Where platform is one of: beos, djgpp, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -95,7 +95,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku-fixes/addons/logg/Makefile.be ---- allegro-4.3.10/addons/logg/Makefile.be 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/logg/Makefile.be 2008-08-31 08:57:22.000000000 -0700 -@@ -0,0 +1,43 @@ -+PREFIX=`/boot/common/bin/allegro-config --prefix` -+CC=gcc -+FLAGS=-O2 -g0 `/boot/common/bin/allegro-config --cflags --addon` -I/boot/common/include -+LFLAGS=-L. -L/boot/common/lib -llogg -logg -lvorbis -lvorbisfile `/boot/common/bin/allegro-config --libs --addon` -+ -+all: lib play_ogg stream_ogg -+ -+lib: liblogg.a -+ -+liblogg.a: logg.o -+ ar rc $@ $^ -+ ranlib $@ -+ -+logg.o: logg.c logg.h -+ $(CC) $(FLAGS) -c logg.c -+ -+play_ogg: play_ogg.c liblogg.a -+ gcc $(FLAGS) play_ogg.c -o play_ogg $(LFLAGS) -+ -+stream_ogg: stream_ogg.c liblogg.a -+ gcc $(FLAGS) stream_ogg.c -o stream_ogg $(LFLAGS) -+ -+clean: -+ rm -f logg.o -+ -+veryclean: clean -+ rm -f liblogg.a -+ rm -f play_ogg -+ rm -f stream_ogg -+ -+install: -+ cp -f logg.h $(DESTDIR)$(PREFIX)/include -+ cp -f liblogg.a $(DESTDIR)$(PREFIX)/lib -+ @echo - -+ @echo logg is now installed. -+ -+uninstall: -+ rm -f $(DESTDIR)$(PREFIX)/include/logg.h -+ rm -f $(DESTDIR)$(PREFIX)/lib/liblogg.a -+ @echo - -+ @echo logg is now uninstalled. -+ -+examples: play_ogg stream_ogg -diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku-fixes/addons/logg/fix.sh ---- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 11:24:16.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/logg/fix.sh 2008-08-31 09:06:13.000000000 -0700 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix" -+ echo "Where platform is one of: beos, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -94,6 +94,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku-fixes/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/fix.sh 2008-08-26 22:13:03.000000000 -0700 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/platform/alplatf.h allegro-4.3.10-haiku-fixes/include/allegro/platform/alplatf.h ---- allegro-4.3.10/include/allegro/platform/alplatf.h 2008-01-19 16:00:54.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/include/allegro/platform/alplatf.h 2008-08-23 17:23:59.000000000 -0700 -@@ -1,2 +1,2 @@ - /* generated by fix.sh */ --#define ALLEGRO_UNIX -+#define ALLEGRO_BEOS -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku-fixes/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/makefile.all 2008-08-23 17:45:06.000000000 -0700 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku-fixes/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/misc/mkunixdists.sh 2008-08-23 20:56:44.000000000 -0700 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -91,11 +91,11 @@ - - # jpgalleg addon - (cd addons/jpgalleg && rm -rf examples) -- (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) -+ (cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku-fixes/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/misc/zipup.sh 2008-08-23 20:53:10.000000000 -0700 -@@ -126,6 +126,14 @@ - make depend UNIX_TOOLS=1 CC=gcc - - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc -+ -+ - # generate dependencies for QNX - echo "Generating QNX dependencies..." - -@@ -164,7 +172,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku-fixes/src/i386/asmdefs.inc ---- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-15 19:52:28.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/src/i386/asmdefs.inc 2008-08-31 09:35:34.000000000 -0700 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku-fixes/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/tools/dat2c.c 2008-08-23 20:44:06.000000000 -0700 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku-fixes/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/tools/datedit.c 2008-08-23 20:42:07.000000000 -0700 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku-fixes/tools/grabber.c ---- allegro-4.3.10/tools/grabber.c 2006-07-24 06:09:26.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/tools/grabber.c 2008-08-23 20:38:47.000000000 -0700 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff deleted file mode 100644 index eb58d7d82..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff +++ /dev/null @@ -1,792 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh ---- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 11:20:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-09-13 20:09:02.000000000 +0000 -@@ -18,7 +18,7 @@ - echo "Compilation target adjustment." - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" --echo " is one of: djgpp, mingw32, unix, macosx" -+echo " is one of: djgpp, haiku, mingw32, unix, macosx" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" - echo " --utod converts from Unix format to DOS/Win32" -@@ -79,6 +79,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10/addons/jpgalleg/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh ---- allegro-4.3.10/addons/jpgalleg/fix.sh 2008-01-04 19:55:22.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh 2008-09-13 18:13:30.000000000 +0000 -@@ -94,6 +94,7 @@ - "mingw" ) proc_fix "MinGW32" "makefile.mgw";; - "msvc" ) proc_fix "MSVC" "makefile.vc";; - "beos" ) proc_fix "BeOS" "makefile.be";; -+ "haiku" ) proc_fix "Haiku" "makefile.be";; - "unix" ) proc_fix "Unix" "makefile.uni";; - "macosx" ) proc_fix "MacOS X" "makefile.osx";; - "help" ) proc_help;; -diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh ---- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-28 01:05:30.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-09-13 20:09:10.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix" -+ echo "Where platform is one of: beos, djgpp, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -95,7 +95,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh ---- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 19:24:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix" -+ echo "Where platform is one of: beos, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -94,6 +94,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 21:59:18.000000000 +0000 -+++ allegro-4.3.10-haiku/fix.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 22:37:14.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-09-13 20:11:46.000000000 +0000 -@@ -189,7 +189,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 08:13:22.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-09-13 20:11:46.000000000 +0000 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-16 02:52:28.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-09-13 20:11:46.000000000 +0000 -@@ -31,7 +31,13 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+ #define ALLEGRO_HAVE_LIBPTHREAD 1 -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/include/allegro/platform/albeos.h ---- allegro-4.3.10/include/allegro/platform/albeos.h 2002-10-01 18:05:12.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h 2008-09-13 20:11:46.000000000 +0000 -@@ -74,3 +74,7 @@ - #define JOYSTICK_DRIVER_BEOS \ - { JOYSTICK_BEOS, &joystick_beos, TRUE }, - -+#if defined __HAIKU__ -+#define TIMERDRV_UNIX_PTHREADS AL_ID('P','T','H','R') -+#endif -+ -diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin ---- allegro-4.3.10/include/allegro/platform/alunixac.hin 2007-07-15 05:28:14.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin 2008-09-13 20:11:46.000000000 +0000 -@@ -68,7 +68,7 @@ - #undef ALLEGRO_DARWIN - - /* Define if you have the pthread library. */ --#undef ALLEGRO_HAVE_LIBPTHREAD -+/* #undef ALLEGRO_HAVE_LIBPTHREAD */ - - /* Define if constructor attribute is supported. */ - #undef ALLEGRO_USE_CONSTRUCTOR -@@ -159,7 +159,7 @@ - - /* Define as the return type of signal handlers (`int' or `void'). */ - /* TODO: rename this */ --#undef RETSIGTYPE -+/* #undef RETSIGTYPE */ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/allegro/system.h ---- allegro-4.3.10/include/allegro/system.h 2008-01-02 10:39:24.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/system.h 2008-09-13 20:11:46.000000000 +0000 -@@ -61,6 +61,7 @@ - #define OSTYPE_QNX AL_ID('Q','N','X',' ') - #define OSTYPE_UNIX AL_ID('U','N','I','X') - #define OSTYPE_BEOS AL_ID('B','E','O','S') -+#define OSTYPE_HAIKU AL_ID('H','A','I','K') - #define OSTYPE_MACOS AL_ID('M','A','C',' ') - #define OSTYPE_MACOSX AL_ID('M','A','C','X') - -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 11:55:28.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.all 2008-09-13 20:11:46.000000000 +0000 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be ---- allegro-4.3.10/makefile.be 2008-01-11 11:30:16.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.be 2008-09-13 20:11:46.000000000 +0000 -@@ -10,7 +10,15 @@ - - # -------- define some variables that the primary makefile will use -------- - -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o -@@ -123,7 +131,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -167,7 +181,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 21:45:48.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -94,8 +94,8 @@ - (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 12:16:56.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -125,6 +125,12 @@ - - make depend UNIX_TOOLS=1 CC=gcc - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc - - # generate dependencies for QNX - echo "Generating QNX dependencies..." -@@ -164,7 +170,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c ---- allegro-4.3.10/setup/keyconf.c 2005-04-07 23:37:20.000000000 +0000 -+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-09-13 20:11:46.000000000 +0000 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp ---- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 23:18:56.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 15:18:16.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c ---- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 16:05:12.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 21:12:30.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c ---- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 17:16:42.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 14:44:50.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c ---- allegro-4.3.10/src/beos/bkey.c 2004-12-03 20:56:28.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c ---- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 15:05:34.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 21:48:38.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c ---- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c ---- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 13:24:16.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 11:53:40.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c ---- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 15:05:34.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 15:05:34.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-09-13 20:11:47.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c ---- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 21:10:58.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 11:33:22.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c ---- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-09-13 20:11:47.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c ---- allegro-4.3.10/src/beos/btimer.c 2004-08-22 02:57:14.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 11:53:40.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 17:27:02.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc ---- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-16 02:52:28.000000000 +0000 -+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-09-13 20:11:47.000000000 +0000 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c ---- allegro-4.3.10/src/midi.c 2007-04-12 16:19:54.000000000 +0000 -+++ allegro-4.3.10-haiku/src/midi.c 2008-09-13 20:11:47.000000000 +0000 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 09:53:38.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-09-13 20:11:47.000000000 +0000 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 16:23:36.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-09-13 20:11:47.000000000 +0000 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c ---- allegro-4.3.10/tools/grabber.c 2006-07-24 13:09:26.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/grabber.c 2008-09-13 20:11:48.000000000 +0000 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff deleted file mode 100644 index 5b3a25a4f..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff +++ /dev/null @@ -1,792 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh ---- allegro-4.3.10/addons/allegrogl/fix.sh 2008-10-04 20:41:29.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-10-04 21:07:34.000000000 +0000 -@@ -26,7 +26,7 @@ - echo "Compilation target adjustment." - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" -- echo " is one of: djgpp, mingw32, unix, macosx," -+ echo " is one of: djgpp, haiku, mingw32, unix, macosx," - echo " macosx-universal" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" -@@ -81,6 +81,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10/addons/jpgalleg/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh ---- allegro-4.3.10/addons/jpgalleg/fix.sh 2008-10-04 20:41:12.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh 2008-10-04 21:01:19.000000000 +0000 -@@ -85,6 +85,7 @@ - "mingw" ) proc_fix "MinGW32" "makefile.mgw";; - "msvc" ) proc_fix "MSVC" "makefile.vc";; - "beos" ) proc_fix "BeOS" "makefile.be";; -+ "haiku" ) proc_fix "Haiku" "makefile.be";; - "unix" ) proc_fix "Unix" "makefile.uni";; - "macosx" ) proc_fix "MacOS X" "makefile.osx";; - "macosx-universal" ) proc_fix_osx_ub ;; -diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh ---- allegro-4.3.10/addons/loadpng/fix.sh 2008-10-04 20:41:10.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-10-04 21:08:47.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: djgpp, haiku, mingw32, unix, macosx, macosx-universal" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -88,7 +88,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh ---- allegro-4.3.10/addons/logg/fix.sh 2008-10-04 20:41:29.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-10-04 21:12:47.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: beos, haiku, mingw32, unix, macosx, macosx-universal" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -80,6 +80,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-10-04 20:41:32.000000000 +0000 -+++ allegro-4.3.10-haiku/fix.sh 2008-10-04 21:01:20.000000000 +0000 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." -@@ -90,6 +90,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10/include/allegro/internal/aintern.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-10-04 21:01:20.000000000 +0000 -@@ -190,7 +190,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-10-04 21:01:20.000000000 +0000 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10/include/allegro/platform/albecfg.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-10-04 21:01:20.000000000 +0000 -@@ -31,7 +31,13 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+ #define ALLEGRO_HAVE_LIBPTHREAD 1 -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/include/allegro/platform/albeos.h ---- allegro-4.3.10/include/allegro/platform/albeos.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h 2008-10-04 21:01:20.000000000 +0000 -@@ -74,3 +74,7 @@ - #define JOYSTICK_DRIVER_BEOS \ - { JOYSTICK_BEOS, &joystick_beos, TRUE }, - -+#if defined __HAIKU__ -+#define TIMERDRV_UNIX_PTHREADS AL_ID('P','T','H','R') -+#endif -+ -diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin ---- allegro-4.3.10/include/allegro/platform/alunixac.hin 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin 2008-10-04 21:01:20.000000000 +0000 -@@ -68,7 +68,7 @@ - #undef ALLEGRO_DARWIN - - /* Define if you have the pthread library. */ --#undef ALLEGRO_HAVE_LIBPTHREAD -+/* #undef ALLEGRO_HAVE_LIBPTHREAD */ - - /* Define if constructor attribute is supported. */ - #undef ALLEGRO_USE_CONSTRUCTOR -@@ -159,7 +159,7 @@ - - /* Define as the return type of signal handlers (`int' or `void'). */ - /* TODO: rename this */ --#undef RETSIGTYPE -+/* #undef RETSIGTYPE */ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/allegro/system.h ---- allegro-4.3.10/include/allegro/system.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/system.h 2008-10-04 21:01:20.000000000 +0000 -@@ -61,6 +61,7 @@ - #define OSTYPE_QNX AL_ID('Q','N','X',' ') - #define OSTYPE_UNIX AL_ID('U','N','I','X') - #define OSTYPE_BEOS AL_ID('B','E','O','S') -+#define OSTYPE_HAIKU AL_ID('H','A','I','K') - #define OSTYPE_MACOS AL_ID('M','A','C',' ') - #define OSTYPE_MACOSX AL_ID('M','A','C','X') - -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-10-04 20:41:32.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.all 2008-10-04 21:01:20.000000000 +0000 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be ---- allegro-4.3.10/makefile.be 2008-10-04 20:41:32.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.be 2008-10-04 21:01:20.000000000 +0000 -@@ -10,7 +10,15 @@ - - # -------- define some variables that the primary makefile will use -------- - -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o -@@ -123,7 +131,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -167,7 +181,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-10-04 21:01:20.000000000 +0000 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -94,8 +94,8 @@ - (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-10-04 21:01:20.000000000 +0000 -@@ -125,6 +125,12 @@ - - make depend UNIX_TOOLS=1 CC=gcc - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc - - # generate dependencies for QNX - echo "Generating QNX dependencies..." -@@ -164,7 +170,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c ---- allegro-4.3.10/setup/keyconf.c 2008-10-04 20:41:31.000000000 +0000 -+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-10-04 21:01:20.000000000 +0000 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp ---- allegro-4.3.10/src/beos/baccel.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10/src/beos/bdispsw.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10/src/beos/bdwindow.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c ---- allegro-4.3.10/src/beos/bgfx.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10/src/beos/bgfxapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10/src/beos/bgfxdrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c ---- allegro-4.3.10/src/beos/bjoy.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10/src/beos/bjoyapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10/src/beos/bjoydrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c ---- allegro-4.3.10/src/beos/bkey.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10/src/beos/bkeyapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10/src/beos/bkeydrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c ---- allegro-4.3.10/src/beos/bmidi.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10/src/beos/bmidiapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c ---- allegro-4.3.10/src/beos/bmididrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10/src/beos/bmousapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10/src/beos/bmousdrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c ---- allegro-4.3.10/src/beos/bmouse.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10/src/beos/boverlay.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c ---- allegro-4.3.10/src/beos/bsnd.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10/src/beos/bsndapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10/src/beos/bsnddrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10/src/beos/bsysapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10/src/beos/bsysdrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-10-04 21:01:21.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c ---- allegro-4.3.10/src/beos/bsystem.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10/src/beos/btimeapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c ---- allegro-4.3.10/src/beos/btimedrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-10-04 21:01:21.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c ---- allegro-4.3.10/src/beos/btimer.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10/src/beos/bwindow.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10/src/beos/bwscreen.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc ---- allegro-4.3.10/src/i386/asmdefs.inc 2008-10-04 20:40:57.000000000 +0000 -+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-10-04 21:01:21.000000000 +0000 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c ---- allegro-4.3.10/src/midi.c 2008-10-04 20:41:01.000000000 +0000 -+++ allegro-4.3.10-haiku/src/midi.c 2008-10-04 21:01:21.000000000 +0000 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2008-10-04 20:41:07.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-10-04 21:01:21.000000000 +0000 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2008-10-04 20:41:07.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-10-04 21:01:21.000000000 +0000 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c ---- allegro-4.3.10/tools/grabber.c 2008-10-04 20:41:07.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/grabber.c 2008-10-04 21:01:21.000000000 +0000 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.3.10-lm.diff b/media-libs/allegro/patches/allegro-4.3.10-lm.diff deleted file mode 100644 index a2b22d939..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-lm.diff +++ /dev/null @@ -1,190 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/configure allegro-4.3.10-haiku/addons/allegrogl/configure ---- allegro-4.3.10/addons/allegrogl/configure 2008-01-19 23:57:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/configure 2008-09-13 19:57:44.000000000 +0000 -@@ -3624,6 +3624,70 @@ - LIBS="-lpthread $LIBS" - fi - -+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5 -+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; } -+if test "${ac_cv_lib_m_cos+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char cos (); -+int -+main () -+{ -+return cos (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_m_cos=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_m_cos=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 -+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; } -+if test $ac_cv_lib_m_cos = yes; then -+ LIBS="-lm $LIBS" -+fi - - - if test -n "$agl_build_generic"; then -@@ -4247,7 +4311,7 @@ - if test -n "$x_libraries"; then - LDFLAGS="-L$x_libraries $LDFLAGS" - fi -- LIBS="-lXext -lX11 -lm $LIBS" -+ LIBS="-lXext -lX11 $LIBS" - - - if test -n "$agl_enable_xf86vidmode"; then -diff -urN allegro-4.3.10/addons/allegrogl/configure.in allegro-4.3.10-haiku/addons/allegrogl/configure.in ---- allegro-4.3.10/addons/allegrogl/configure.in 2008-01-01 11:20:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/configure.in 2008-09-13 19:56:10.000000000 +0000 -@@ -54,7 +54,7 @@ - dnl Check for pthread support, which GL libs may require (e.g. FreeBSD) - AC_CHECK_HEADER(pthread.h, , dontcare=y) - AC_CHECK_LIB(pthread, pthread_create, LIBS="-lpthread $LIBS") -- -+AC_CHECK_LIB(m, cos, LIBS="-lm $LIBS") - - dnl Build Mesa generic driver - if test -n "$agl_build_generic"; then -@@ -76,7 +76,7 @@ - if test -n "$x_libraries"; then - LDFLAGS="-L$x_libraries $LDFLAGS" - fi -- LIBS="-lXext -lX11 -lm $LIBS" -+ LIBS="-lXext -lX11 $LIBS" - - - dnl Test for VidMode extension - -diff -urN allegro-4.3.10/addons/jpgalleg/makefile.be allegro-4.3.10-haiku/addons/jpgalleg/makefile.be ---- allegro-4.3.10/addons/jpgalleg/makefile.be 2008-01-01 21:59:18.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/jpgalleg/makefile.be 2008-09-13 20:09:02.000000000 +0000 -@@ -38,7 +38,7 @@ - endif - endif - --LIBS = -lm `../../allegro-config --libs --addon` -+LIBS = `../../allegro-config --libs --addon` - LDFLAGS = -L../../lib/$(PLATFORM_PATH) - INSTALL_LIB_PATH = /boot/develop/lib/x86 - INSTALL_HEADER_PATH = /boot/develop/headers -diff -urN allegro-4.3.10/configure allegro-4.3.10-haiku/configure ---- allegro-4.3.10/configure 2008-01-19 23:57:12.000000000 +0000 -+++ allegro-4.3.10-haiku/configure 2008-09-13 19:53:14.000000000 +0000 -@@ -5436,6 +5436,14 @@ - allegro_build_normal_library=yes - _programs="release" - fi -+ -+M_LIBS="-lm" -+case "$host_os" in -+ beos* | haiku*) -+ M_LIBS="" -+ ;; -+esac -+ - if test "X$allegro_build_static_programs" = "Xyes"; then - LIBALLEG=lib/unix/lib$LIB_TO_LINK.a - LINK_LIBALLEG="$LIBALLEG \$(LIBS)" -@@ -5444,7 +5452,7 @@ - _programs="statically linked $_programs" - else - LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a" -- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm" -+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)" - LINK_WITH_STATIC_LIBS=no - allegro_shared_libraries=yes - _programs="dynamically linked $_programs" -@@ -11167,7 +11175,7 @@ - - #-----------------------------------------------------------------------------# - --LIBS="-lm $LIBS" -+LIBS="$(M_LIBS) $LIBS" - - case "$allegro_system" in - -diff -urN allegro-4.3.10/configure.in allegro-4.3.10-haiku/configure.in ---- allegro-4.3.10/configure.in 2008-01-03 20:47:10.000000000 +0000 -+++ allegro-4.3.10-haiku/configure.in 2008-09-13 19:52:03.000000000 +0000 -@@ -298,6 +298,15 @@ - allegro_build_normal_library=yes - _programs="release" - fi -+ -+M_LIBS="-lm" -+case "$host_os" in -+ beos* | haiku*) -+ M_LIBS="" -+ ;; -+esac -+ -+ - if test "X$allegro_build_static_programs" = "Xyes"; then - LIBALLEG=lib/unix/lib$LIB_TO_LINK.a - LINK_LIBALLEG="$LIBALLEG \$(LIBS)" -@@ -306,7 +315,7 @@ - _programs="statically linked $_programs" - else - LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a" -- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm" -+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)" - LINK_WITH_STATIC_LIBS=no - allegro_shared_libraries=yes - _programs="dynamically linked $_programs" -@@ -873,7 +882,7 @@ - #-----------------------------------------------------------------------------# - - dnl Additional libraries. --LIBS="-lm $LIBS" -+LIBS="$(M_LIBS) $LIBS" - - case "$allegro_system" in - diff --git a/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff b/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff deleted file mode 100644 index d70c44369..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff +++ /dev/null @@ -1,922 +0,0 @@ -diff -urN allegro-4.3.10plus/addons/allegrogl/fix.sh allegro-4.3.10plus-haiku/addons/allegrogl/fix.sh ---- allegro-4.3.10plus/addons/allegrogl/fix.sh 2008-10-15 14:42:13.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/allegrogl/fix.sh 2008-10-15 15:04:09.000000000 +0000 -@@ -27,7 +27,7 @@ - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" - echo " is one of: djgpp, mingw32, unix, macosx," -- echo " macosx-universal" -+ echo " macosx-universal, beos, haiku" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" - echo " --utod converts from Unix format to DOS/Win32" -@@ -81,6 +81,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10plus/addons/jpgalleg/fix.sh allegro-4.3.10plus-haiku/addons/jpgalleg/fix.sh ---- allegro-4.3.10plus/addons/jpgalleg/fix.sh 2008-10-15 14:40:17.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/jpgalleg/fix.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -85,6 +85,7 @@ - "mingw" ) proc_fix "MinGW32" "makefile.mgw";; - "msvc" ) proc_fix "MSVC" "makefile.vc";; - "beos" ) proc_fix "BeOS" "makefile.be";; -+ "haiku" ) proc_fix "Haiku" "makefile.be";; - "unix" ) proc_fix "Unix" "makefile.uni";; - "macosx" ) proc_fix "MacOS X" "makefile.osx";; - "macosx-universal" ) proc_fix_osx_ub ;; -diff -urN allegro-4.3.10plus/addons/loadpng/fix.sh allegro-4.3.10plus-haiku/addons/loadpng/fix.sh ---- allegro-4.3.10plus/addons/loadpng/fix.sh 2008-10-15 14:39:18.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/loadpng/fix.sh 2008-10-15 15:04:58.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal, beos, haiku" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -88,7 +88,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10plus/addons/logg/fix.sh allegro-4.3.10plus-haiku/addons/logg/fix.sh ---- allegro-4.3.10plus/addons/logg/fix.sh 2008-10-15 14:42:14.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/logg/fix.sh 2008-10-15 15:07:15.000000000 +0000 -@@ -8,7 +8,8 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: mingw32, unix, macosx, macosx-universal," -+ echo " beos, haiku" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -80,6 +81,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10plus/fix.sh allegro-4.3.10plus-haiku/fix.sh ---- allegro-4.3.10plus/fix.sh 2008-10-15 14:44:47.000000000 +0000 -+++ allegro-4.3.10plus-haiku/fix.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." -@@ -90,6 +90,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10plus/include/allegro/internal/aintern.h allegro-4.3.10plus-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10plus/include/allegro/internal/aintern.h 2008-10-15 14:42:48.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/internal/aintern.h 2008-10-15 15:01:00.000000000 +0000 -@@ -190,7 +190,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10plus/include/allegro/internal/alconfig.h allegro-4.3.10plus-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10plus/include/allegro/internal/alconfig.h 2008-10-15 14:42:48.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/internal/alconfig.h 2008-10-15 15:01:00.000000000 +0000 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10plus/include/allegro/platform/albecfg.h allegro-4.3.10plus-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10plus/include/allegro/platform/albecfg.h 2008-10-15 14:42:46.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/platform/albecfg.h 2008-10-15 15:01:00.000000000 +0000 -@@ -31,7 +31,13 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+ #define ALLEGRO_HAVE_LIBPTHREAD 1 -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10plus/include/allegro/platform/albeos.h allegro-4.3.10plus-haiku/include/allegro/platform/albeos.h ---- allegro-4.3.10plus/include/allegro/platform/albeos.h 2008-10-15 14:42:46.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/platform/albeos.h 2008-10-15 15:01:00.000000000 +0000 -@@ -74,3 +74,7 @@ - #define JOYSTICK_DRIVER_BEOS \ - { JOYSTICK_BEOS, &joystick_beos, TRUE }, - -+#if defined __HAIKU__ -+#define TIMERDRV_UNIX_PTHREADS AL_ID('P','T','H','R') -+#endif -+ -diff -urN allegro-4.3.10plus/include/allegro/platform/alunixac.hin allegro-4.3.10plus-haiku/include/allegro/platform/alunixac.hin ---- allegro-4.3.10plus/include/allegro/platform/alunixac.hin 2008-10-15 14:42:46.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/platform/alunixac.hin 2008-10-15 15:01:00.000000000 +0000 -@@ -68,7 +68,7 @@ - #undef ALLEGRO_DARWIN - - /* Define if you have the pthread library. */ --#undef ALLEGRO_HAVE_LIBPTHREAD -+/* #undef ALLEGRO_HAVE_LIBPTHREAD */ - - /* Define if constructor attribute is supported. */ - #undef ALLEGRO_USE_CONSTRUCTOR -@@ -159,7 +159,7 @@ - - /* Define as the return type of signal handlers (`int' or `void'). */ - /* TODO: rename this */ --#undef RETSIGTYPE -+/* #undef RETSIGTYPE */ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -diff -urN allegro-4.3.10plus/include/allegro/system.h allegro-4.3.10plus-haiku/include/allegro/system.h ---- allegro-4.3.10plus/include/allegro/system.h 2008-10-15 14:42:57.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/system.h 2008-10-15 15:01:00.000000000 +0000 -@@ -61,6 +61,7 @@ - #define OSTYPE_QNX AL_ID('Q','N','X',' ') - #define OSTYPE_UNIX AL_ID('U','N','I','X') - #define OSTYPE_BEOS AL_ID('B','E','O','S') -+#define OSTYPE_HAIKU AL_ID('H','A','I','K') - #define OSTYPE_MACOS AL_ID('M','A','C',' ') - #define OSTYPE_MACOSX AL_ID('M','A','C','X') - -diff -urN allegro-4.3.10plus/makefile.all allegro-4.3.10plus-haiku/makefile.all ---- allegro-4.3.10plus/makefile.all 2008-10-15 14:44:47.000000000 +0000 -+++ allegro-4.3.10plus-haiku/makefile.all 2008-10-15 15:01:00.000000000 +0000 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10plus/makefile.be allegro-4.3.10plus-haiku/makefile.be ---- allegro-4.3.10plus/makefile.be 2008-10-15 14:44:47.000000000 +0000 -+++ allegro-4.3.10plus-haiku/makefile.be 2008-10-15 15:01:00.000000000 +0000 -@@ -10,11 +10,20 @@ - - # -------- define some variables that the primary makefile will use -------- - -+OS=$(shell uname -s) -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o --HTML = html -+#HTML = html - - PLATFORM_DIR = obj/beos - -@@ -109,7 +118,7 @@ - # ------ build a C-only version ------ - - VPATH += src/c --MY_OBJECTS = $(C_OBJECTS) cmiscs -+MY_OBJECTS = $(C_OBJECTS) - CFLAGS += -DALLEGRO_NO_ASM - - else -@@ -123,7 +132,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -135,11 +150,21 @@ - - # -------- rules for installing and removing the library files -------- - -+ifeq ($(OS),BeOS) - INSTALLDIR = /boot/develop - LIBDIR = lib/x86 - INCDIR = headers - - SHARED_LIBDIR = /boot/home/config/lib -+endif -+ -+ifeq ($(OS),Haiku) -+INSTALLDIR = /boot/common -+LIBDIR = lib -+INCDIR = include -+ -+SHARED_LIBDIR = /boot/common/lib -+endif - - - ifdef STATICLINK -@@ -167,7 +192,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10plus/misc/mkunixdists.sh allegro-4.3.10plus-haiku/misc/mkunixdists.sh ---- allegro-4.3.10plus/misc/mkunixdists.sh 2008-10-15 14:43:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/misc/mkunixdists.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -94,8 +94,8 @@ - (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10plus/misc/zipup.sh allegro-4.3.10plus-haiku/misc/zipup.sh ---- allegro-4.3.10plus/misc/zipup.sh 2008-10-15 14:43:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/misc/zipup.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -125,6 +125,12 @@ - - make depend UNIX_TOOLS=1 CC=gcc - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc - - # generate dependencies for QNX - echo "Generating QNX dependencies..." -@@ -164,7 +170,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10plus/setup/keyconf.c allegro-4.3.10plus-haiku/setup/keyconf.c ---- allegro-4.3.10plus/setup/keyconf.c 2008-10-15 14:43:30.000000000 +0000 -+++ allegro-4.3.10plus-haiku/setup/keyconf.c 2008-10-15 15:01:00.000000000 +0000 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10plus/src/beos/baccel.cpp allegro-4.3.10plus-haiku/src/beos/baccel.cpp ---- allegro-4.3.10plus/src/beos/baccel.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/baccel.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bdispsw.cpp allegro-4.3.10plus-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10plus/src/beos/bdispsw.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bdispsw.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bdwindow.cpp allegro-4.3.10plus-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10plus/src/beos/bdwindow.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bdwindow.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -@@ -260,8 +260,10 @@ - cmap[i] = BScreen().IndexForColor(((i >> 4) & 0xF0) | (i >> 8), (i & 0xF0) | ((i >> 4) & 0xF), (i & 0xF) | ((i & 0xF) << 4)); - } - } -+#if 0 - TRACE(PREFIX_I "Color conversion mode set: %d->%d\n", - (int)screen_depth, (int)display_depth); -+#endif - } - - if (rects) { -diff -urN allegro-4.3.10plus/src/beos/bgfx.c allegro-4.3.10plus-haiku/src/beos/bgfx.c ---- allegro-4.3.10plus/src/beos/bgfx.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bgfx.c 2008-10-15 15:01:00.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/bgfxapi.cpp allegro-4.3.10plus-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10plus/src/beos/bgfxapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bgfxapi.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bgfxdrv.c allegro-4.3.10plus-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10plus/src/beos/bgfxdrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bgfxdrv.c 2008-10-15 15:01:00.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bjoy.c allegro-4.3.10plus-haiku/src/beos/bjoy.c ---- allegro-4.3.10plus/src/beos/bjoy.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bjoy.c 2008-10-15 15:01:00.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bjoyapi.cpp allegro-4.3.10plus-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10plus/src/beos/bjoyapi.cpp 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bjoyapi.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -@@ -64,12 +64,12 @@ - device_config = get_config_string("joystick", "joystick_device", ""); - - /* Let's try to open selected device */ -- if ((device_config[0] == '\0') || (be_joy->Open(device_config) < 0)) { -+ if ((device_config[0] == '\0') || (be_joy->Open(device_config, true) < 0)) { - /* ok, let's try to open first available device */ - if (be_joy->GetDeviceName(0, device_name) != B_OK) { - goto cleanup; - } -- if (be_joy->Open(device_name) == B_ERROR) { -+ if (be_joy->Open(device_name, true) == B_ERROR) { - goto cleanup; - } - } -diff -urN allegro-4.3.10plus/src/beos/bjoydrv.c allegro-4.3.10plus-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10plus/src/beos/bjoydrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bjoydrv.c 2008-10-15 15:01:00.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bkey.c allegro-4.3.10plus-haiku/src/beos/bkey.c ---- allegro-4.3.10plus/src/beos/bkey.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bkey.c 2008-10-15 15:01:00.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/bkeyapi.cpp allegro-4.3.10plus-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10plus/src/beos/bkeyapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bkeyapi.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -@@ -260,7 +260,9 @@ - key_info_old = key_info_new; - } - -+#if 0 - TRACE(PREFIX_I "keyboard thread exited\n"); -+#endif - - return 0; - } -diff -urN allegro-4.3.10plus/src/beos/bkeydrv.c allegro-4.3.10plus-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10plus/src/beos/bkeydrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bkeydrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10plus/src/beos/bmidi.c allegro-4.3.10plus-haiku/src/beos/bmidi.c ---- allegro-4.3.10plus/src/beos/bmidi.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmidi.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10plus/src/beos/bmidiapi.cpp allegro-4.3.10plus-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10plus/src/beos/bmidiapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmidiapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10plus/src/beos/bmididrv.c allegro-4.3.10plus-haiku/src/beos/bmididrv.c ---- allegro-4.3.10plus/src/beos/bmididrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmididrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bmousapi.cpp allegro-4.3.10plus-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10plus/src/beos/bmousapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmousapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -@@ -78,7 +78,9 @@ - - if (mouse_thread_running == false) { - release_sem(_be_mouse_view_attached); -+#if 0 - TRACE(PREFIX_I "mouse thread exited\n"); -+#endif - - return 0; - } -diff -urN allegro-4.3.10plus/src/beos/bmousdrv.c allegro-4.3.10plus-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10plus/src/beos/bmousdrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmousdrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/bmouse.c allegro-4.3.10plus-haiku/src/beos/bmouse.c ---- allegro-4.3.10plus/src/beos/bmouse.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmouse.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/boverlay.cpp allegro-4.3.10plus-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10plus/src/beos/boverlay.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/boverlay.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bsnd.c allegro-4.3.10plus-haiku/src/beos/bsnd.c ---- allegro-4.3.10plus/src/beos/bsnd.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsnd.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10plus/src/beos/bsndapi.cpp allegro-4.3.10plus-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10plus/src/beos/bsndapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsndapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bsnddrv.c allegro-4.3.10plus-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10plus/src/beos/bsnddrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsnddrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bsysapi.cpp allegro-4.3.10plus-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10plus/src/beos/bsysapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsysapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -@@ -144,7 +144,9 @@ - - _be_allegro_app->Run(); - -+#if 0 - TRACE(PREFIX_I "system thread exited\n"); -+#endif - - return 0; - } -@@ -201,8 +203,6 @@ - uname(&os_name); - os_type = OSTYPE_BEOS; - os_multitasking = TRUE; -- os_version = atoi(strtok(os_name.release, ".")); -- os_revision = atoi(strtok(NULL, ".")); - - chdir(app_path); - -diff -urN allegro-4.3.10plus/src/beos/bsysdrv.c allegro-4.3.10plus-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10plus/src/beos/bsysdrv.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsysdrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10plus/src/beos/bsystem.c allegro-4.3.10plus-haiku/src/beos/bsystem.c ---- allegro-4.3.10plus/src/beos/bsystem.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsystem.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10plus/src/beos/btimeapi.cpp allegro-4.3.10plus-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10plus/src/beos/btimeapi.cpp 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/btimeapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/btimedrv.c allegro-4.3.10plus-haiku/src/beos/btimedrv.c ---- allegro-4.3.10plus/src/beos/btimedrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/btimedrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10plus/src/beos/btimer.c allegro-4.3.10plus-haiku/src/beos/btimer.c ---- allegro-4.3.10plus/src/beos/btimer.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/btimer.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bwindow.cpp allegro-4.3.10plus-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10plus/src/beos/bwindow.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bwindow.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -@@ -117,7 +117,7 @@ - /* _be_gfx_bwindow_read_write_bank: - * Returns new line and marks it as dirty. - */ --extern "C" unsigned long _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int line) -+extern "C" uintptr_t _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int line) - { - if (!bmp->id & BMP_ID_LOCKED) { - bmp->id |= (BMP_ID_LOCKED | BMP_ID_AUTOLOCK); -diff -urN allegro-4.3.10plus/src/beos/bwscreen.cpp allegro-4.3.10plus-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10plus/src/beos/bwscreen.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bwscreen.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -@@ -474,7 +474,7 @@ - /* be_gfx_bwindowscreen_read_write_bank: - * Returns new line and synchronizes framebuffer if needed. - */ --extern "C" unsigned long be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int line) -+extern "C" uintptr_t be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int line) - { - if (!(bmp->id & BMP_ID_LOCKED)) { - _be_sync_func(); -@@ -490,7 +490,7 @@ - */ - extern "C" void be_gfx_bwindowscreen_unwrite_bank(BITMAP *bmp) - { -- if (bmp->id & BMP_AUTOLOCK) { -+ if (bmp->id & BMP_ID_AUTOLOCK) { - bmp->id &= ~(BMP_ID_LOCKED | BMP_ID_AUTOLOCK); - } - } -diff -urN allegro-4.3.10plus/src/i386/asmdefs.inc allegro-4.3.10plus-haiku/src/i386/asmdefs.inc ---- allegro-4.3.10plus/src/i386/asmdefs.inc 2008-10-15 14:31:06.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/i386/asmdefs.inc 2008-10-15 15:01:01.000000000 +0000 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10plus/src/midi.c allegro-4.3.10plus-haiku/src/midi.c ---- allegro-4.3.10plus/src/midi.c 2008-10-15 14:33:58.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/midi.c 2008-10-15 15:01:01.000000000 +0000 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10plus/tools/dat2c.c allegro-4.3.10plus-haiku/tools/dat2c.c ---- allegro-4.3.10plus/tools/dat2c.c 2008-10-15 14:36:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/tools/dat2c.c 2008-10-15 15:01:01.000000000 +0000 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10plus/tools/datedit.c allegro-4.3.10plus-haiku/tools/datedit.c ---- allegro-4.3.10plus/tools/datedit.c 2008-10-15 14:36:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/tools/datedit.c 2008-10-15 15:01:01.000000000 +0000 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10plus/tools/grabber.c allegro-4.3.10plus-haiku/tools/grabber.c ---- allegro-4.3.10plus/tools/grabber.c 2008-10-15 14:36:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/tools/grabber.c 2008-10-15 15:01:01.000000000 +0000 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.4.x_svn.patch b/media-libs/allegro/patches/allegro-4.4.x_svn.patch new file mode 100644 index 000000000..2e81e77f1 --- /dev/null +++ b/media-libs/allegro/patches/allegro-4.4.x_svn.patch @@ -0,0 +1,51 @@ +diff -urN allegro-4.4.x-svn/CMakeLists.txt allegro-4.4.x-svn-haiku/CMakeLists.txt +--- allegro-4.4.x-svn/CMakeLists.txt 2012-11-18 01:16:37.000000000 -0800 ++++ allegro-4.4.x-svn-haiku/CMakeLists.txt 2012-11-18 01:06:24.541065216 -0800 +@@ -291,18 +291,18 @@ + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) +- else(CMAKE_SYSTEM_NAME STREQUAL Haiku) ++ else(CMAKE_SYSTEM_NAME STREQUAL BeOS) + set(ALLEGRO_BEOS 1) + endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") + set(WFLAGS_C_ONLY "") + set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") +-endif(BEOS) ++endif(HAIKU) + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -628,10 +628,10 @@ + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif(HAIKU) + + # -- Mac OS X -- + +@@ -727,9 +727,9 @@ + if(ALLEGRO_WITH_XWINDOWS) + add_headers("" include/xalleg.h) + endif(ALLEGRO_WITH_XWINDOWS) +-if(BEOS) ++if(HAIKU) + add_headers("" include/bealleg.h) +-endif(BEOS) ++endif(HAIKU) + + #-----------------------------------------------------------------------------# + # diff --git a/media-libs/almp3/almp3-2.0.4.bep b/media-libs/almp3/almp3-2.0.4.recipe similarity index 96% rename from media-libs/almp3/almp3-2.0.4.bep rename to media-libs/almp3/almp3-2.0.4.recipe index e86b5a825..7e5cfe81a 100644 --- a/media-libs/almp3/almp3-2.0.4.bep +++ b/media-libs/almp3/almp3-2.0.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4" CHECKSUM_MD5="8fe1517750acf23c07442b31447791a8" -BUILD { +BUILD() +{ cd almp3 mkdir -p obj/haiku/dynamic mkdir -p obj/haiku/static @@ -14,7 +15,8 @@ BUILD { make TARGET=HAIKU_SHARED } -INSTALL { +INSTALL() +{ cd almp3 make install prefix=/boot/common \ diff --git a/media-libs/cal3d/cal3d-0.11.0.bep b/media-libs/cal3d/cal3d-0.11.0.recipe similarity index 95% rename from media-libs/cal3d/cal3d-0.11.0.bep rename to media-libs/cal3d/cal3d-0.11.0.recipe index 1522e449d..37460b671 100644 --- a/media-libs/cal3d/cal3d-0.11.0.bep +++ b/media-libs/cal3d/cal3d-0.11.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="82ad09c1c28e73bc9596aec47237bfba" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cal3d-0.11.0 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cal3d-0.11.0 make install } diff --git a/media-libs/devil/devil-1.7.8.bep b/media-libs/devil/devil-1.7.8.recipe similarity index 96% rename from media-libs/devil/devil-1.7.8.bep rename to media-libs/devil/devil-1.7.8.recipe index 29a5e75d9..8734b2381 100644 --- a/media-libs/devil/devil-1.7.8.bep +++ b/media-libs/devil/devil-1.7.8.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/jasper >= 1.900.1 openexr >= 1.5.0 dev-util/pkg-config >= 0.23 media-libs/tiff >= 3.8.2" -BUILD { +BUILD() +{ cd devil-1.7.8 libtoolize --force --copy --install autoreconf -i @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd devil-1.7.8 make install } diff --git a/media-libs/djvulibre/djvulibre-3.5.25.bep b/media-libs/djvulibre/djvulibre-3.5.25.recipe similarity index 97% rename from media-libs/djvulibre/djvulibre-3.5.25.bep rename to media-libs/djvulibre/djvulibre-3.5.25.recipe index a4355f690..7cf3da398 100644 --- a/media-libs/djvulibre/djvulibre-3.5.25.bep +++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd djvulibre-3.5.25 COMMON_DIR=`finddir B_COMMON_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd djvulibre-3.5.25 make install } diff --git a/media-libs/dumb/dumb-0.9.3.bep b/media-libs/dumb/dumb-0.9.3.recipe similarity index 97% rename from media-libs/dumb/dumb-0.9.3.bep rename to media-libs/dumb/dumb-0.9.3.recipe index 133679aa6..187e82fb2 100644 --- a/media-libs/dumb/dumb-0.9.3.bep +++ b/media-libs/dumb/dumb-0.9.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4.1.1" CHECKSUM_MD5="f48da5b990aa8aa822d3b6a951baf5c2" -BUILD { +BUILD() +{ if [ ! -f dumb-0.9.3-autotools.tar.gz ]; then # get the autotools to help in building dumb wget http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz?download @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd dumb-0.9.3 make install DESTDIR=${DESTDIR} } diff --git a/media-libs/faac/faac-1.28.bep b/media-libs/faac/faac-1.28.recipe similarity index 97% rename from media-libs/faac/faac-1.28.bep rename to media-libs/faac/faac-1.28.recipe index 5d03c0a98..85ace122a 100644 --- a/media-libs/faac/faac-1.28.bep +++ b/media-libs/faac/faac-1.28.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c5dde68840cefe46532089c9392d1df0" MESSAGE="See FAAC file in licenses directory for restrictions on binary releases. Binary releases may require a patent license in some countries." -BUILD { +BUILD() +{ cd faac-1.28 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd faac-1.28 make install } diff --git a/media-libs/faad2/faad2-2.7.bep b/media-libs/faad2/faad2-2.7.recipe similarity index 96% rename from media-libs/faad2/faad2-2.7.bep rename to media-libs/faad2/faad2-2.7.recipe index 215d00dbb..9f84734f3 100644 --- a/media-libs/faad2/faad2-2.7.bep +++ b/media-libs/faad2/faad2-2.7.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="ee1b4d67ea2d76ee52c5621bc6dbf61e" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd faad2-2.7 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd faad2-2.7 make install } diff --git a/media-libs/fblend/fblend-0.4.bep b/media-libs/fblend/fblend-0.4.recipe similarity index 96% rename from media-libs/fblend/fblend-0.4.bep rename to media-libs/fblend/fblend-0.4.recipe index 513feb254..6150e6298 100644 --- a/media-libs/fblend/fblend-0.4.bep +++ b/media-libs/fblend/fblend-0.4.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="broken" DEPEND="media-libs/allegro >= 4.4 app-text/dos2unix >= 1.0" CHECKSUM_MD5="e252ae521e099793fe6caa0fb7d048f3" -BUILD { +BUILD() +{ cd fblend dos2unix * dos2unix src/* @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fblend make install INSTALL_DIR=/boot/common } diff --git a/media-libs/fitz/fitz-1.0.bep b/media-libs/fitz/fitz-1.0.recipe similarity index 97% rename from media-libs/fitz/fitz-1.0.bep rename to media-libs/fitz/fitz-1.0.recipe index aab114c98..85c20222f 100644 --- a/media-libs/fitz/fitz-1.0.bep +++ b/media-libs/fitz/fitz-1.0.recipe @@ -9,12 +9,14 @@ DEPEND="jbig2dec >= 0.11 jpeg >= 8d zlib >= 1.2.5 freetype >=2.4.9" -BUILD { +BUILD() +{ cd mupdf-1.0-source make libs } -INSTALL { +INSTALL() +{ cd mupdf-1.0-source make install \ prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.bep deleted file mode 100644 index 1a5b26f0a..000000000 --- a/media-libs/flac/flac-1.2.1.bep +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="flac - Free Lossless Audio Codec" -HOMEPAGE="http://flac.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/flac/flac-src/flac-1.2.1-src/flac-1.2.1.tar.gz" -CHECKSUM_MD5="153c8b15a54da428d1f0fadc756c22c7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gettext >= 0.17" -BUILD { - cd flac-1.2.1 - haikuporter -b libiconv-1.13.1 - cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC/M* - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC++/M* - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc/flac \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd flac-1.2.1 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - BSD (3-clause)" -COPYRIGHT="2000-2007 Josh Coalson" diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe new file mode 100644 index 000000000..d274dbb07 --- /dev/null +++ b/media-libs/flac/flac-1.3.0.recipe @@ -0,0 +1,97 @@ +SUMMARY="flac - Free Lossless Audio Codec" +DESCRIPTION="FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo) just like you would an MP3 file." +HOMEPAGE="http://flac.sourceforge.net/" +SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz" +CHECKSUM_MD5="13b5c214cee8373464d3d65dee362cdd" +REVISION="1" + +LICENSE="GNU LGPL v2.1 + GNU GPL v2 + BSD (3-clause) + " + +COPYRIGHT="2000-2007 Josh Coalson" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libFLAC = 1.3.0 compat >= 1 + cmd:flac + cmd:metaflac + lib:libFLAC++ + lib:libFLAC + " + +REQUIRES=" + haiku + lib:libiconv + lib:libogg + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:nasm + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:ld + cmd:make + cmd:gawk + cmd:perl + devel:libiconv + devel:libogg + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libFLAC + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + +} + +TEST() +{ + test_grabbag.sh + test_streams.sh + test_libFLAC.sh + test_wrapper.sh + test_bins.sh + test_libFLAC++.sh + test_compression.sh + test_metaflac.sh + test_flac.sh + test_seeking.sh +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libFLAC_devel = $portVersion + devel:flac = 8.3.0 compat >= 8 + devel:libFLAC = 8.3.0 compat >= 8 + devel:libFLAC++ = 8.3.0 compat >= 8 + " + +REQUIRES_devel=" + libFLAC == $portVersion + " diff --git a/media-libs/flac/patches/flac-1.2.1.patch b/media-libs/flac/patches/flac-1.2.1.patch deleted file mode 100644 index be91dfc97..000000000 --- a/media-libs/flac/patches/flac-1.2.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN flac-1.2.1/examples/cpp/encode/file/main.cpp flac-1.2.1-haiku/examples/cpp/encode/file/main.cpp ---- flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-09-13 15:58:03.004718592 +0000 -+++ flac-1.2.1-haiku/examples/cpp/encode/file/main.cpp 2010-09-20 12:47:33.520617984 +0000 -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/media-libs/fontconfig/fontconfig-2.10.0.bep b/media-libs/fontconfig/fontconfig-2.10.0.recipe similarity index 98% rename from media-libs/fontconfig/fontconfig-2.10.0.bep rename to media-libs/fontconfig/fontconfig-2.10.0.recipe index 271be1d39..27a33a18c 100644 --- a/media-libs/fontconfig/fontconfig-2.10.0.bep +++ b/media-libs/fontconfig/fontconfig-2.10.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23 media-libs/freetype >= 2.4.9" -BUILD { +BUILD() +{ cd fontconfig-2.10.0 mkdir -p `finddir B_USER_CACHE_DIRECTORY` libtoolize --force --copy --install @@ -31,7 +32,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fontconfig-2.10.0 make install } diff --git a/media-libs/fontconfig/fontconfig-2.10.2.bep b/media-libs/fontconfig/fontconfig-2.10.2.recipe similarity index 98% rename from media-libs/fontconfig/fontconfig-2.10.2.bep rename to media-libs/fontconfig/fontconfig-2.10.2.recipe index b082b6fd1..d7510c929 100644 --- a/media-libs/fontconfig/fontconfig-2.10.2.bep +++ b/media-libs/fontconfig/fontconfig-2.10.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23 media-libs/freetype >= 2.4.9" -BUILD { +BUILD() +{ cd fontconfig-2.10.2 mkdir -p `finddir B_USER_CACHE_DIRECTORY` libtoolize --force --copy --install @@ -31,7 +32,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fontconfig-2.10.2 make install } diff --git a/media-libs/freealut/freealut-1.1.0.bep b/media-libs/freealut/freealut-1.1.0.recipe similarity index 96% rename from media-libs/freealut/freealut-1.1.0.bep rename to media-libs/freealut/freealut-1.1.0.recipe index 33cdd225b..b234c477b 100644 --- a/media-libs/freealut/freealut-1.1.0.bep +++ b/media-libs/freealut/freealut-1.1.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/openal >= 1.6.372 dev-util/cmake >= 2.8.1" -BUILD { +BUILD() +{ cd freealut-1.1.0 libtoolize --force --copy --install ./autogen.sh @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freealut-1.1.0 make install } diff --git a/media-libs/freeimage/freeimage-3.15.3.bep b/media-libs/freeimage/freeimage-3.15.3.recipe similarity index 97% rename from media-libs/freeimage/freeimage-3.15.3.bep rename to media-libs/freeimage/freeimage-3.15.3.recipe index a24b5c2f4..31acb2cf8 100644 --- a/media-libs/freeimage/freeimage-3.15.3.bep +++ b/media-libs/freeimage/freeimage-3.15.3.recipe @@ -6,14 +6,16 @@ CHECKSUM_MD5="6c305b4086500ff8541c596ea6fc7cd7" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd FreeImage make -f Makefile.gnu \ INCDIR=`finddir B_COMMON_HEADERS_DIRECTORY` \ INSTALLDIR=`finddir B_COMMON_LIB_DIRECTORY` } -INSTALL { +INSTALL() +{ cd FreeImage make -f Makefile.gnu install \ INCDIR=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ diff --git a/media-libs/freetype/freetype-2.3.11.bep b/media-libs/freetype/freetype-2.3.11.bep deleted file mode 100644 index d3cf73bb5..000000000 --- a/media-libs/freetype/freetype-2.3.11.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases-noredirect/freetype/freetype-2.3.11.tar.gz" -CHECKSUM_MD5="a693c9a4b0121890ca71e39364ffea4a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd freetype-2.3.11 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd freetype-2.3.11 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2009 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.11.bep b/media-libs/freetype/freetype-2.4.11.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.11.bep rename to media-libs/freetype/freetype-2.4.11.recipe index eba796d93..ff524a88f 100644 --- a/media-libs/freetype/freetype-2.4.11.bep +++ b/media-libs/freetype/freetype-2.4.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b93435488942486c8d0ca22e8f768034" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.11 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freetype-2.4.11 make install } diff --git a/media-libs/freetype/freetype-2.4.2.bep b/media-libs/freetype/freetype-2.4.2.bep deleted file mode 100644 index a8b96329f..000000000 --- a/media-libs/freetype/freetype-2.4.2.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.2.tar.bz2" -CHECKSUM_MD5="647ee8ed266f9a4117c8d0a4855b3d3e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd freetype-2.4.2 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd freetype-2.4.2 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2010 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.4.bep b/media-libs/freetype/freetype-2.4.4.bep deleted file mode 100644 index ea267c28f..000000000 --- a/media-libs/freetype/freetype-2.4.4.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.4.tar.bz2" -CHECKSUM_MD5="b3e2b6e2f1c3e0dffa1fd2a0f848b671" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd freetype-2.4.4 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd freetype-2.4.4 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2011 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.6.bep b/media-libs/freetype/freetype-2.4.6.bep deleted file mode 100644 index fc759031f..000000000 --- a/media-libs/freetype/freetype-2.4.6.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2" -CHECKSUM_MD5="5e6510613f612809d2d7862592b92ab7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd freetype-2.4.6 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=/boot/develop/headers/3rdparty \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd freetype-2.4.6 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2011 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.9.bep b/media-libs/freetype/freetype-2.4.9.bep deleted file mode 100644 index 088c810cf..000000000 --- a/media-libs/freetype/freetype-2.4.9.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" -CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd freetype-2.4.9 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=/boot/develop/headers/3rdparty \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd freetype-2.4.9 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe new file mode 100644 index 000000000..1f3d233d6 --- /dev/null +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -0,0 +1,64 @@ +SUMMARY="A Free, High-Quality, and Portable Font Engine" +DESCRIPTION="FreeType is written in C, designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images) of most vector and bitmap font formats." +HOMEPAGE="http://www.freetype.org" +LICENSE="FreeType" +COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" +CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + freetype$secondaryArchSuffix = $portVersion + lib:libfreetype$secondaryArchSuffix = 6.8.1 compat >= 6 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1 + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + ./autogen.sh + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libfreetype + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $dataRootDir/aclocal \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + freetype${secondaryArchSuffix}_devel = $portVersion + cmd:freetype_config${secondaryArchSuffix} = $portVersion + devel:libfreetype${secondaryArchSuffix} = 6.8.1 compat >= 6 + " +REQUIRES_devel=" + freetype${secondaryArchSuffix} == $portVersion base + " diff --git a/media-libs/freetype/freetype-2.5.0.1.recipe b/media-libs/freetype/freetype-2.5.0.1.recipe new file mode 100644 index 000000000..4d98521c2 --- /dev/null +++ b/media-libs/freetype/freetype-2.5.0.1.recipe @@ -0,0 +1,70 @@ +SUMMARY="A Free, High-Quality, and Portable Font Engine" +DESCRIPTION="FreeType is written in C, designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images) of most vector and bitmap font formats." +HOMEPAGE="http://www.freetype.org" +LICENSE="FreeType" +COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.1.tar.bz2" +CHECKSUM_MD5="c72e9010b1d986d556fc0b2b5fcbf31a" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + freetype$secondaryArchSuffix = $portVersion + lib:libfreetype$secondaryArchSuffix = 6.8.1 compat >= 6 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1 + lib:libpng$secondaryArchSuffix + devel:libbz2 + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + devel:libpng + " + +BUILD() +{ + ./autogen.sh + runConfigure ./configure --without-png + make $jobArgs +} + +INSTALL() +{ + mkdir -p $includeDir/freetype2/freetype/cache + mkdir -p $includeDir/freetype2/freetype/internal + make install + + prepareInstalledDevelLibs libfreetype + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $dataRootDir/aclocal \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + freetype${secondaryArchSuffix}_devel = $portVersion + cmd:freetype_config${secondaryArchSuffix} = $portVersion + devel:libfreetype${secondaryArchSuffix} = 6.8.1 compat >= 6 + " +REQUIRES_devel=" + freetype${secondaryArchSuffix} == $portVersion base + " diff --git a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep b/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep rename to media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe index 088c810cf..5c2a3adf1 100644 --- a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep +++ b/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.9 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freetype-2.4.9 make install } diff --git a/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch b/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch new file mode 100644 index 000000000..407d769c7 --- /dev/null +++ b/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch @@ -0,0 +1,12 @@ +diff -urN freetype-2.4.9/include/freetype/config/ftoption.h freetype-2.4.9-enable-subpixel-rendering/include/freetype/config/ftoption.h +--- freetype-2.4.9/include/freetype/config/ftoption.h 2011-07-20 04:46:15.035913728 +0000 ++++ freetype-2.4.9-enable-subpixel-rendering/include/freetype/config/ftoption.h 2012-09-05 16:30:50.453509120 +0000 +@@ -92,7 +92,7 @@ + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/media-libs/ftgl/ftgl-2.1-svn.bep b/media-libs/ftgl/ftgl-2.1-svn.bep deleted file mode 100644 index 4c482e482..000000000 --- a/media-libs/ftgl/ftgl-2.1-svn.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -HOMEPAGE="http://sourceforge.net/projects/ftgl" -SRC_URI="svn+https://ftgl.svn.sourceforge.net/svnroot/ftgl/trunk" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23" - -BUILD { - cd ftgl-2.1-svn - libtoolize --copy --force --install - aclocal --install -I m4 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd ftgl-2.1-svn - make install DESTDIR=${DESTDIR} -} - -LICENSE="MIT" -COPYRIGHT="2001-2004 Unicode, Inc. - 2001-2010 Henry Maddocks" diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.recipe similarity index 97% rename from media-libs/ftgl/ftgl-2.1.3.bep rename to media-libs/ftgl/ftgl-2.1.3.recipe index 83126fce8..e9c2e2ec4 100644 --- a/media-libs/ftgl/ftgl-2.1.3.bep +++ b/media-libs/ftgl/ftgl-2.1.3.recipe @@ -6,7 +6,8 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd ftgl-2.1.3~rc5 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" libtoolize --copy --force --install @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ftgl-2.1.3~rc5 make install } diff --git a/media-libs/gd/gd-2.0.36rc1.bep b/media-libs/gd/gd-2.0.36rc1.recipe similarity index 96% rename from media-libs/gd/gd-2.0.36rc1.bep rename to media-libs/gd/gd-2.0.36rc1.recipe index a6190b52f..4fc6c7b1e 100644 --- a/media-libs/gd/gd-2.0.36rc1.bep +++ b/media-libs/gd/gd-2.0.36rc1.recipe @@ -8,7 +8,8 @@ DEPEND="media-libs/libpng >= 1.2.44 media-libs/giflib >= 4.1.6" CHECKSUM_MD5="39ac48e6d5e0012a3bd2248a0102f209" -BUILD { +BUILD() +{ cd gd-2.0.36RC1 libtoolize --force --copy --install aclocal -I config @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gd-2.0.36RC1 make install } diff --git a/media-libs/giflib/giflib-4.1.6.bep b/media-libs/giflib/giflib-4.1.6.recipe similarity index 96% rename from media-libs/giflib/giflib-4.1.6.bep rename to media-libs/giflib/giflib-4.1.6.recipe index 886c54f3f..137b9a547 100644 --- a/media-libs/giflib/giflib-4.1.6.bep +++ b/media-libs/giflib/giflib-4.1.6.recipe @@ -6,7 +6,8 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd giflib-4.1.6 sed -i 's#gl/gl.h#GL/gl.h#' configure.ac sed -i 's#gl.gl.h#GL/gl.h#' lib/dev2gif.c @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd giflib-4.1.6 make install } diff --git a/media-libs/glew/glew-1.5.7.bep b/media-libs/glew/glew-1.5.7.recipe similarity index 94% rename from media-libs/glew/glew-1.5.7.bep rename to media-libs/glew/glew-1.5.7.recipe index 8374fc9dd..d3a352eb2 100644 --- a/media-libs/glew/glew-1.5.7.bep +++ b/media-libs/glew/glew-1.5.7.recipe @@ -6,17 +6,20 @@ STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="f913ce9dbde4cd250b932731b3534ded" -BUILD { +BUILD() +{ cd glew-1.5.7 make } -INSTALL { +INSTALL() +{ cd glew-1.5.7 make install } -TEST { +TEST() +{ cd glew-1.5.7/bin glewinfo visualinfo diff --git a/media-libs/glpng/glpng-1.4.5.bep b/media-libs/glpng/glpng-1.4.5.recipe similarity index 94% rename from media-libs/glpng/glpng-1.4.5.bep rename to media-libs/glpng/glpng-1.4.5.recipe index 386babf10..d30cd4c31 100644 --- a/media-libs/glpng/glpng-1.4.5.bep +++ b/media-libs/glpng/glpng-1.4.5.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd src make -f Makefile.HAIKU } -INSTALL { +INSTALL() +{ cd src make install -f Makefile.HAIKU } diff --git a/media-libs/guilib/guilib-1.2.1.bep b/media-libs/guilib/guilib-1.2.1.recipe similarity index 96% rename from media-libs/guilib/guilib-1.2.1.bep rename to media-libs/guilib/guilib-1.2.1.recipe index c04395032..f95c87490 100644 --- a/media-libs/guilib/guilib-1.2.1.bep +++ b/media-libs/guilib/guilib-1.2.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a0114b925d79d6c66161e24cbeaa88b1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd GUIlib-1.2.1 rm aclocal.m4 rm acinclude.m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd GUIlib-1.2.1 make install } diff --git a/media-libs/ilmbase/ilmbase-1.0.1.bep b/media-libs/ilmbase/ilmbase-1.0.1.recipe similarity index 95% rename from media-libs/ilmbase/ilmbase-1.0.1.bep rename to media-libs/ilmbase/ilmbase-1.0.1.recipe index 72cc3fdff..14c7f90b9 100644 --- a/media-libs/ilmbase/ilmbase-1.0.1.bep +++ b/media-libs/ilmbase/ilmbase-1.0.1.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="f76f094e69a6079b0beb93d97e2a217e" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ilmbase-1.0.1 libtoolize --copy --force --install ./bootstrap @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ilmbase-1.0.1 make install } diff --git a/media-libs/ilmbase/ilmbase-1.0.2.bep b/media-libs/ilmbase/ilmbase-1.0.2.recipe similarity index 96% rename from media-libs/ilmbase/ilmbase-1.0.2.bep rename to media-libs/ilmbase/ilmbase-1.0.2.recipe index 23c6197f2..a9ae4fa91 100644 --- a/media-libs/ilmbase/ilmbase-1.0.2.bep +++ b/media-libs/ilmbase/ilmbase-1.0.2.recipe @@ -6,7 +6,8 @@ CHECKSUM_MD5="26c133ee8ca48e1196fbfb3ffe292ab4" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ilmbase-1.0.2 libtoolize --copy --force --install ./bootstrap @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ilmbase-1.0.2 make install } diff --git a/media-libs/jasper/jasper-1.900.1.bep b/media-libs/jasper/jasper-1.900.1.recipe similarity index 96% rename from media-libs/jasper/jasper-1.900.1.bep rename to media-libs/jasper/jasper-1.900.1.recipe index 9c8c58270..dee1e1aec 100644 --- a/media-libs/jasper/jasper-1.900.1.bep +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754" DEPEND="" -BUILD { +BUILD() +{ cd jasper-1.900.1 libtoolize --force --copy --install aclocal -I acaux @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jasper-1.900.1 make install } diff --git a/media-libs/jbig2dec/jbig2dec-0.11.bep b/media-libs/jbig2dec/jbig2dec-0.11.recipe similarity index 96% rename from media-libs/jbig2dec/jbig2dec-0.11.bep rename to media-libs/jbig2dec/jbig2dec-0.11.recipe index 96224f0ff..3103fbe4f 100644 --- a/media-libs/jbig2dec/jbig2dec-0.11.bep +++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jbig2dec-0.11 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jbig2dec-0.11 make install } diff --git a/media-libs/jbigkit/jbigkit-1.6.bep b/media-libs/jbigkit/jbigkit-1.6.recipe similarity index 92% rename from media-libs/jbigkit/jbigkit-1.6.bep rename to media-libs/jbigkit/jbigkit-1.6.recipe index a2219b351..c6d8ea142 100644 --- a/media-libs/jbigkit/jbigkit-1.6.bep +++ b/media-libs/jbigkit/jbigkit-1.6.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="ce196e45f293d40ba76af3dc981ccfd7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jbigkit make } -INSTALL { +INSTALL() +{ cd jbigkit make test } diff --git a/media-libs/jbigkit/jbigkit-2.0.bep b/media-libs/jbigkit/jbigkit-2.0.recipe similarity index 96% rename from media-libs/jbigkit/jbigkit-2.0.bep rename to media-libs/jbigkit/jbigkit-2.0.recipe index ec96ef2a2..579a0da09 100644 --- a/media-libs/jbigkit/jbigkit-2.0.bep +++ b/media-libs/jbigkit/jbigkit-2.0.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="3dd87f605abb1a97a22dc79d8b3e8f6c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jbigkit make cd libjbig make -f Makefile-libjbig_so } -INSTALL { +INSTALL() +{ cd jbigkit make test cd libjbig diff --git a/media-libs/jgmod/jgmod-0.99.bep b/media-libs/jgmod/jgmod-0.99.recipe similarity index 97% rename from media-libs/jgmod/jgmod-0.99.bep rename to media-libs/jgmod/jgmod-0.99.recipe index 07dedc4f6..a5b1bcb32 100644 --- a/media-libs/jgmod/jgmod-0.99.bep +++ b/media-libs/jgmod/jgmod-0.99.recipe @@ -8,7 +8,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4" CHECKSUM_MD5="0e6e540ffadced9283251a7f86c106fe" -BUILD { +BUILD() +{ cd jgmod chmod 777 ./fixbe.sh ./fixbe.sh @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jgmod/src if [ -n ${DESTDIR} ];then mkdir -p ${DESTDIR}/boot/common/lib diff --git a/media-libs/jpeg/jpeg-7.bep b/media-libs/jpeg/jpeg-7.bep deleted file mode 100644 index 119a1b211..000000000 --- a/media-libs/jpeg/jpeg-7.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="jpeg" -HOMEPAGE="http://www.ijg.org" -SRC_URI="http://www.ijg.org/files/jpegsrc.v7.tar.gz" -CHECKSUM_MD5="382ef33b339c299b56baf1296cda9785" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd jpeg-7 - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared - make -} - -INSTALL { - cd jpeg-7 - make install -} diff --git a/media-libs/jpeg/jpeg-8b.bep b/media-libs/jpeg/jpeg-8b.bep deleted file mode 100644 index d25212bf5..000000000 --- a/media-libs/jpeg/jpeg-8b.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="jpeg" -HOMEPAGE="http://www.ijg.org" -SRC_URI="http://www.ijg.org/files/jpegsrc.v8b.tar.gz" -CHECKSUM_MD5="e022acbc5b36cd2cb70785f5b575661e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd jpeg-8b - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared - make -} - -INSTALL { - cd jpeg-8b - make install -} diff --git a/media-libs/jpeg/jpeg-8c.bep b/media-libs/jpeg/jpeg-8c.bep deleted file mode 100644 index 95a9958ce..000000000 --- a/media-libs/jpeg/jpeg-8c.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="jpeg" -HOMEPAGE="http://www.ijg.org" -SRC_URI="http://www.ijg.org/files/jpegsrc.v8c.tar.gz" -CHECKSUM_MD5="a2c10c04f396a9ce72894beb18b4e1f9" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd jpeg-8c - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-shared - make -} - -INSTALL { - cd jpeg-8c - make install -} - -LICENSE="JPEG" -COPYRIGHT="1991-2011, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" - diff --git a/media-libs/jpeg/jpeg-8d.bep b/media-libs/jpeg/jpeg-8d.recipe similarity index 96% rename from media-libs/jpeg/jpeg-8d.bep rename to media-libs/jpeg/jpeg-8d.recipe index 5a6db9b8a..400231715 100644 --- a/media-libs/jpeg/jpeg-8d.bep +++ b/media-libs/jpeg/jpeg-8d.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="52654eb3b2e60c35731ea8fc87f1bd29" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jpeg-8d aclocal libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jpeg-8d make install } diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe new file mode 100644 index 000000000..7f9645aed --- /dev/null +++ b/media-libs/jpeg/jpeg-9.recipe @@ -0,0 +1,104 @@ +SUMMARY="JPEG image compression library and tools" +DESCRIPTION="This package contains C software to implement JPEG image encoding, decoding, +and transcoding. JPEG is a standardized compression method for full-color +and gray-scale images. + +The distributed programs provide conversion between JPEG "JFIF" format and +image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The +core compression and decompression library can easily be reused in other +programs, such as image viewers. The package is highly portable C code; +we have tested it on many machines ranging from PCs to Crays." +HOMEPAGE="http://www.ijg.org" +LICENSE="JPEG" +COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" +SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz" +CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="jpeg-9.patchset" + +PROVIDES=" + jpeg$secondaryArchSuffix = $portVersion compat >= 9 + lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:grep + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + aclocal + libtoolize --force --copy --install + automake --add-missing + autoconf + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libjpeg + + # devel package + packageEntries devel \ + $developDir + + # tools package + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir \ + $documentationDir + fi + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9 + devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 + " +REQUIRES_devel=" + jpeg$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The JPEG tools" + PROVIDES_tools=" + jpeg_tools = $portVersion compat >= 9 + cmd:cjpeg = $portVersion compat >= 9 + cmd:djpeg = $portVersion compat >= 9 + cmd:jpegtran = $portVersion compat >= 9 + cmd:rdjpgcom = $portVersion compat >= 9 + cmd:wrjpgcom = $portVersion compat >= 9 + " + REQUIRES_tools=" + haiku >= $haikuVersion + jpeg == $portVersion base + " +fi diff --git a/media-libs/jpeg/patches/jpeg-9.patchset b/media-libs/jpeg/patches/jpeg-9.patchset new file mode 100644 index 000000000..87b0aac39 --- /dev/null +++ b/media-libs/jpeg/patches/jpeg-9.patchset @@ -0,0 +1,27 @@ +From b176455d2abc3a95f7e9133c8f4e18ba6f8678b5 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 13 Jun 2013 23:56:48 +0200 +Subject: jconfig.cfg: fix handling of "boolean" on Haiku + + +diff --git a/jconfig.cfg b/jconfig.cfg +index bb7435c..69a1c31 100644 +--- a/jconfig.cfg ++++ b/jconfig.cfg +@@ -25,6 +25,13 @@ typedef unsigned char boolean; + #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ + #endif + ++/* On Haiku defines macros TRUE and FALSE, but not the type ++ boolean. */ ++#ifdef __HAIKU__ ++typedef int boolean; ++#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++#endif ++ + #ifdef JPEG_INTERNALS + + #undef RIGHT_SHIFT_IS_UNSIGNED +-- +1.7.5 + diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep b/media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe similarity index 94% rename from media-libs/ladspa-sdk/ladspa-sdk-1.13.bep rename to media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe index 196f9d5ba..39bd1ae7f 100644 --- a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep +++ b/media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe @@ -6,11 +6,13 @@ COPYRIGHT="Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan LICENSE="GNU LGPL v2.1" REVISION="1" CHECKSUM_MD5="671be3e1021d0722cadc7fb27054628e" -BUILD { +BUILD() +{ cd ladspa_sdk/src make } -INSTALL { +INSTALL() +{ cd ladspa_sdk/src make install } diff --git a/media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch b/media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch new file mode 100644 index 000000000..2cb5fcf3d --- /dev/null +++ b/media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch @@ -0,0 +1,50 @@ +diff -Naur ladspa_sdk-1.13/src/makefile ladspa_sdk-1.13-haiku/src/makefile +--- ladspa_sdk/src/makefile 2007-11-06 10:42:45.008388608 +0000 ++++ ladspa_sdk-haiku/src/makefile 2012-12-17 19:04:36.860094464 +0000 +@@ -4,9 +4,9 @@ + # + # Change these if you want to install somewhere else. + +-INSTALL_PLUGINS_DIR = /usr/lib/ladspa/ +-INSTALL_INCLUDE_DIR = /usr/include/ +-INSTALL_BINARY_DIR = /usr/bin/ ++INSTALL_PLUGINS_DIR = ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` ++INSTALL_INCLUDE_DIR = ${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` ++INSTALL_BINARY_DIR = ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` + + ############################################################################### + # +@@ -14,7 +14,6 @@ + # + + INCLUDES = -I. +-LIBRARIES = -ldl -lm + CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC + CXXFLAGS = $(CFLAGS) + PLUGINS = ../plugins/amp.so \ +@@ -46,22 +45,10 @@ + # TARGETS + # + +-test: /tmp/test.wav ../snd/noise.wav always +- @echo --------------------------------------------- +- @echo First listen to the white noise input signal: +- @echo --------------------------------------------- +- -sndfile-play ../snd/noise.wav +- @echo ------------------------- +- @echo Compare to plugin output. +- @echo ------------------------- +- @echo Should be a noise band around 6000Hz, repeated quietly after 1s. +- -sndfile-play /tmp/test.wav +- @echo Test complete. +- + install: targets +- -mkdirhier $(INSTALL_PLUGINS_DIR) +- -mkdirhier $(INSTALL_INCLUDE_DIR) +- -mkdirhier $(INSTALL_BINARY_DIR) ++ mkdir -p $(INSTALL_PLUGINS_DIR) ++ mkdir -p $(INSTALL_INCLUDE_DIR) ++ mkdir -p $(INSTALL_BINARY_DIR) + cp ../plugins/* $(INSTALL_PLUGINS_DIR) + cp ladspa.h $(INSTALL_INCLUDE_DIR) + cp ../bin/* $(INSTALL_BINARY_DIR) diff --git a/media-libs/lcms/lcms-1.18a.bep b/media-libs/lcms/lcms-1.18a.recipe similarity index 95% rename from media-libs/lcms/lcms-1.18a.bep rename to media-libs/lcms/lcms-1.18a.recipe index 00157df16..5db51c5b9 100644 --- a/media-libs/lcms/lcms-1.18a.bep +++ b/media-libs/lcms/lcms-1.18a.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f4abfe1c57ea3f633c2e9d034e74e3e8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lcms-1.18 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lcms-1.18 make install } diff --git a/media-libs/lcms/lcms-1.19.bep b/media-libs/lcms/lcms-1.19.recipe similarity index 96% rename from media-libs/lcms/lcms-1.19.bep rename to media-libs/lcms/lcms-1.19.recipe index 3b1a1421e..e5a20d3c1 100644 --- a/media-libs/lcms/lcms-1.19.bep +++ b/media-libs/lcms/lcms-1.19.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8af94611baf20d9646c7c2c285859818" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lcms-1.19 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lcms-1.19 make install } diff --git a/media-libs/lcms/lcms-2.0a.bep b/media-libs/lcms/lcms-2.0a.bep deleted file mode 100644 index 44fc0404c..000000000 --- a/media-libs/lcms/lcms-2.0a.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="lcms - Little cms intends to be a small-footprint, speed optimized color management engine" -HOMEPAGE="http://littlecms.com/" -SRC_URI="http://sourceforge.net/projects/lcms/files/lcms/2.0/lcms2-2.0a.tar.gz/download" -CHECKSUM_MD5="c4f115462a7a5b306c247d018d7a8982" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd lcms-2.0 - libtoolize --force --copy --install - aclocal - automake - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - CFLAGS=-O0 - make -} - -INSTALL { - cd lcms-2.0 - make install -} -LICENSE="MIT" -COPYRIGHT="2007 Marti Maria" diff --git a/media-libs/lcms/lcms-2.1.bep b/media-libs/lcms/lcms-2.1.bep deleted file mode 100644 index 556745787..000000000 --- a/media-libs/lcms/lcms-2.1.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="lcms - Little cms intends to be a small-footprint, speed optimized color management engine" -HOMEPAGE="http://littlecms.com/" -SRC_URI="http://downloads.sourceforge.net/project/lcms/lcms/2.1/lcms2-2.1.tar.gz" -CHECKSUM_MD5="08036edb115ad74456dfa20b1998b5f4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd lcms2-2.1 - libtoolize --force --copy --install - aclocal - automake - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - CFLAGS=-O0 - make -} - -INSTALL { - cd lcms2-2.1 - make install -} -LICENSE="MIT" -COPYRIGHT="2007 Marti Maria" diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe new file mode 100644 index 000000000..d119d7fd1 --- /dev/null +++ b/media-libs/lcms/lcms-2.5.recipe @@ -0,0 +1,73 @@ +SUMMARY="lcms - Little cms intends to be a small-footprint, speed optimized color management engine" +DESCRIPTION="Little CMS intends to be an OPEN SOURCE small-footprint color management engine, with special focus on accuracy and performance. It uses the International Color Consortium standard (ICC), which is the modern standard when regarding to color management. The ICC specification is widely used and is referred to in many International and other de-facto standards. It was approved as an International Standard, ISO 15076-1, in 2005." +HOMEPAGE="http://littlecms.com/" +SRC_URI="http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.5.tar.gz" +CHECKSUM_MD5="396d106600251441ff195fcaa277d10b" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2007 Marti Maria" + +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + lcms = 2.5 compat >= 2 + lib:liblcms2 + cmd:jpgicc + cmd:linkicc + cmd:psicc + cmd:tificc + cmd:transicc + " + +REQUIRES=" + lib:libroot + lib:libjpeg + lib:libtiff + lib:libz" + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:make + " +SOURCE_DIR="lcms2-2.5" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + automake + autoconf + + runConfigure ./configure CFLAGS=-O0 + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs liblcms2 + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package --------------------------------------- + +PROVIDES_devel=" + lcms_devel = $portVersion + devel:lcms = 2.5 compat >= 2 + devel:liblcms2 = 2.0.1 compat >= 2 + " +REQUIRES_devel=" + lcms == $portVersion base + " diff --git a/media-libs/leptonica/leptonica-1.68.bep b/media-libs/leptonica/leptonica-1.68.recipe similarity index 94% rename from media-libs/leptonica/leptonica-1.68.bep rename to media-libs/leptonica/leptonica-1.68.recipe index 979d047af..9006867da 100644 --- a/media-libs/leptonica/leptonica-1.68.bep +++ b/media-libs/leptonica/leptonica-1.68.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="5cd7092f9ff2ca7e3f3e73bfcd556403" -BUILD { +BUILD() +{ cd leptonica-1.68 libtoolize aclocal @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd leptonica-1.68 make install } -TEST { +TEST() +{ cd leptonica-1.68 # make test # make check diff --git a/media-libs/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.bep deleted file mode 100644 index 65c91b962..000000000 --- a/media-libs/libao/libao-1.0.0.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="Libao is a cross-platform audio library" -HOMEPAGE="http://xiph.org/ao/" -SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="08283fbe1f587619053a156254afecec" -BUILD { - cd libao-1.0.0 - libtoolize --force --copy --install - aclocal - autoconf - automake - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --datarootdir=$COMMON_DOCS \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd libao-1.0.0 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1999 Aaron Holtzman - 2000 Rik Hemsley - 2000 Timothy J. Wood - 2000-2001 Stan Seibert - 2001 Christian Weisgerber - 2001 Wil Mahan - 2002 Stefan Tibus - 2008 Alexandre Ratchov - 2008-2010 Philipp 'ph3-der-loewe' Schafft - 2010 2010 Monty" - diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe new file mode 100644 index 000000000..2ee94f010 --- /dev/null +++ b/media-libs/libao/libao-1.0.0.recipe @@ -0,0 +1,84 @@ +SUMMARY="libao is a cross platform audio library" +DESCRIPTION="Libao is a cross-platform audio library that allows programs to output audio using a simple API on a wide variety of platforms. It currently supports Null output, WAV files, AU files, RAW files, OSS, ALSA, aRts, PulseAudio, esd, Mac OS X, Windows, AIX, Sun/NetBSD/OpenBSD, IRIX, NAS, RoarAudio and OpenBSD's sndio" +HOMEPAGE="http://xiph.org/ao/" +SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz" +CHECKSUM_MD5="08283fbe1f587619053a156254afecec" + +LICENSE="GNU GPL v2" +COPYRIGHT="1999 Aaron Holtzman + 2000 Rik Hemsley + 2000 Timothy J. Wood + 2000-2001 Stan Seibert + 2001 Christian Weisgerber + 2001 Wil Mahan + 2002 Stefan Tibus + 2008 Alexandre Ratchov + 2008-2010 Philipp 'ph3-der-loewe' Schafft + 2010 2010 Monty" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libao$secondaryArchSuffix = $portVersion + lib:libao$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + + + + +BUILD() +{ +# sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libao + fixPkgconfig + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libao_devel = $portVersion + devel:libao = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libao == $portVersion base + " + + diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep b/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep deleted file mode 100644 index e5590ac61..000000000 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Libart is a library for high-performance 2D graphics" -HOMEPAGE="http://www.levien.com/libart/" -SRC_URI="http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="722471ec8ae084af4293126d06b60880" -BUILD { - cd libart_lgpl-2.3.21 - libtoolize --force --copy --install - autoreconf -i - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd libart_lgpl-2.3.21 - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe new file mode 100644 index 000000000..83ef89b8e --- /dev/null +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -0,0 +1,59 @@ +SUMMARY="Libart is a library for high-performance 2D graphics" +DESCRIPTION="Libart is free software (all components are either GPL or LGPL). Libart is also available for commercial licensing. Libart supports a very powerful imaging model, basically the same as SVG and the Java 2D API. It includes all PostScript imaging operations, and adds antialiasing and alpha-transparency. Libart is also highly tuned for incremental rendering. It contains data structures and algorithms suited to rapid, precise computation of Region of Interest, as well as a two-phase rendering pipeline optimized for interactive display." +HOMEPAGE="http://www.levien.com/libart/" +SRC_URI="http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.gz" +CHECKSUM_MD5="722471ec8ae084af4293126d06b60880" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libart_lgpl= $portVersion + cmd:libart2_config = $portVersion compat >= 2 + lib:libart_lgpl_2 = 2.3.21 compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoreconf + cmd:libtool + cmd:make + cmd:ld + cmd:gcc + " +BUILD() +{ + libtoolize --force --copy --install + autoreconf -i + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare devel/lib + prepareInstalledDevelLibs libart_lgpl_2 + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package + +PROVIDES_devel=" + libart_lgpl_2 = $portVersion + devel:libart_lgpl_2 = 2.3.21 compat >= 2 + " +REQUIRES_devel=" + libart_lgpl_2 == $portVersion base + " diff --git a/media-libs/libass/libass-0.10.1.bep b/media-libs/libass/libass-0.10.1.recipe similarity index 96% rename from media-libs/libass/libass-0.10.1.bep rename to media-libs/libass/libass-0.10.1.recipe index 99767580b..8c668db6b 100644 --- a/media-libs/libass/libass-0.10.1.bep +++ b/media-libs/libass/libass-0.10.1.recipe @@ -8,13 +8,15 @@ CHECKSUM_MD5="6cace482a013a3c4bf3b31a68ac66026" DEPEND="pkgconfig >= 0.23 freetype >= 2.0" -BUILD { +BUILD() +{ cd libass-0.10.1 configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libass-0.10.1 make install } diff --git a/media-libs/libass/libass-0.9.11.bep b/media-libs/libass/libass-0.9.11.recipe similarity index 96% rename from media-libs/libass/libass-0.9.11.bep rename to media-libs/libass/libass-0.9.11.recipe index f86497901..70930cc41 100644 --- a/media-libs/libass/libass-0.9.11.bep +++ b/media-libs/libass/libass-0.9.11.recipe @@ -8,13 +8,15 @@ CHECKSUM_MD5="f9042884397002ba40aa89dc7d34f59f" DEPEND="pkgconfig >= 0.23 freetype >= 2.0" -BUILD { +BUILD() +{ cd libass-0.9.11 configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libass-0.9.11 make install } diff --git a/media-libs/libbluray/libbluray-0.2.2.bep b/media-libs/libbluray/libbluray-0.2.2.recipe similarity index 96% rename from media-libs/libbluray/libbluray-0.2.2.bep rename to media-libs/libbluray/libbluray-0.2.2.recipe index 2484d3694..1a001d1fb 100644 --- a/media-libs/libbluray/libbluray-0.2.2.bep +++ b/media-libs/libbluray/libbluray-0.2.2.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd libbluray-0.2.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libbluray-0.2.2 make install } diff --git a/media-libs/libcddb/libcddb-1.3.2.bep b/media-libs/libcddb/libcddb-1.3.2.recipe similarity index 95% rename from media-libs/libcddb/libcddb-1.3.2.bep rename to media-libs/libcddb/libcddb-1.3.2.recipe index 43eb3b6db..4e88f2272 100644 --- a/media-libs/libcddb/libcddb-1.3.2.bep +++ b/media-libs/libcddb/libcddb-1.3.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="gettext >= 0.18.1.1-dev" CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a" -BUILD { +BUILD() +{ cd libcddb-1.3.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcddb-1.3.2 make install } diff --git a/media-libs/libcoverart/libcoverart-1.0.0.bep b/media-libs/libcoverart/libcoverart-1.0.0.recipe similarity index 95% rename from media-libs/libcoverart/libcoverart-1.0.0.bep rename to media-libs/libcoverart/libcoverart-1.0.0.recipe index 6fce1e477..3cba4dded 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.bep +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -6,18 +6,21 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/jansson >= 2.4 net-misc/neon >= 0.29.6" CHECKSUM_MD5="6380056bb4bc1a69790e706b4d506f50" -BUILD { +BUILD() +{ cd libcoverart-{PROJECT_VERSION} cmake . make } -INSTALL { +INSTALL() +{ cd libcoverart-{PROJECT_VERSION} make install } -TEST { +TEST() +{ cd libcoverart-{PROJECT_VERSION} make test cd tests diff --git a/media-libs/libdca/libdca-0.0.5.bep b/media-libs/libdca/libdca-0.0.5.recipe similarity index 96% rename from media-libs/libdca/libdca-0.0.5.bep rename to media-libs/libdca/libdca-0.0.5.recipe index e76da1d66..aafd99eab 100644 --- a/media-libs/libdca/libdca-0.0.5.bep +++ b/media-libs/libdca/libdca-0.0.5.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="dab6b2795c66a82a6fcd4f8343343021" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdca-0.0.5 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libdca-0.0.5 make install } diff --git a/media-libs/libdiscid/libdiscid-0.3.0.bep b/media-libs/libdiscid/libdiscid-0.3.0.recipe similarity index 94% rename from media-libs/libdiscid/libdiscid-0.3.0.bep rename to media-libs/libdiscid/libdiscid-0.3.0.recipe index 8c64d1bed..53a53d0e2 100644 --- a/media-libs/libdiscid/libdiscid-0.3.0.bep +++ b/media-libs/libdiscid/libdiscid-0.3.0.recipe @@ -7,18 +7,21 @@ DEPEND="" CHECKSUM_MD5="17e51260062b7583e5981c82cf618127" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd libdiscid-0.3.0 cmake . make } -INSTALL { +INSTALL() +{ cd libdiscid-0.3.0 make install } -TEST { +TEST() +{ cd libdiscid-0.3.0 make test } diff --git a/media-libs/libdvbpsi/libdvbpsi-0.1.7.bep b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe similarity index 94% rename from media-libs/libdvbpsi/libdvbpsi-0.1.7.bep rename to media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe index 64663e387..aeddf2a5f 100644 --- a/media-libs/libdvbpsi/libdvbpsi-0.1.7.bep +++ b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="af419575719e356b908b0c6946499052" -BUILD { +BUILD() +{ cd libdvbpsi-0.1.7 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` LDFLAGS="-lnetwork" make } -INSTALL { +INSTALL() +{ cd libdvbpsi-0.1.7 make install } -TEST { +TEST() +{ cd libdvbpsi-0.1.7 # make test # make check diff --git a/media-libs/libdvdcss/libdvdcss-1.2.10.bep b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe similarity index 95% rename from media-libs/libdvdcss/libdvdcss-1.2.10.bep rename to media-libs/libdvdcss/libdvdcss-1.2.10.recipe index fe0d6ef85..74e037a57 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.10.bep +++ b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7b03a9571c3a85d801330c7772cd69c4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdcss-1.2.10 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdcss-1.2.10 make install } diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.bep b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe similarity index 95% rename from media-libs/libdvdcss/libdvdcss-1.2.12.bep rename to media-libs/libdvdcss/libdvdcss-1.2.12.recipe index 2b69402a5..d2b3df7ec 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.12.bep +++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2218a193900e3203aa10dc24cdf54275" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdcss-1.2.12 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdcss-1.2.12 make install } diff --git a/media-libs/libdvdnav/libdvdnav-4.1.3.bep b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe similarity index 96% rename from media-libs/libdvdnav/libdvdnav-4.1.3.bep rename to media-libs/libdvdnav/libdvdnav-4.1.3.recipe index ec98982b9..31ec8bbc1 100644 --- a/media-libs/libdvdnav/libdvdnav-4.1.3.bep +++ b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libdvdcss >= 1.20.10 media-libs/libdvdread >= 4.1.3" -BUILD { +BUILD() +{ cd libdvdnav-4.1.3 ./autogen.sh CFLAGS="-I/boot/common/include -DHAVE_DVDCSS_DVDCSS_H " \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdnav-4.1.3 make install } diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.bep b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe similarity index 96% rename from media-libs/libdvdnav/libdvdnav-4.2.0.bep rename to media-libs/libdvdnav/libdvdnav-4.2.0.recipe index 99a06b297..acd52cd0d 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.0.bep +++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libdvdcss >= 1.20.10 media-libs/libdvdread >= 4.2.0" -BUILD { +BUILD() +{ cd libdvdnav-4.2.0 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdnav-4.2.0 make install } diff --git a/media-libs/libdvdread/libdvdread-4.1.3.bep b/media-libs/libdvdread/libdvdread-4.1.3.recipe similarity index 94% rename from media-libs/libdvdread/libdvdread-4.1.3.bep rename to media-libs/libdvdread/libdvdread-4.1.3.recipe index 44e410dff..b016206fe 100644 --- a/media-libs/libdvdread/libdvdread-4.1.3.bep +++ b/media-libs/libdvdread/libdvdread-4.1.3.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="6dc068d442c85a3cdd5ad3da75f6c6e8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread-4.1.3 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libdvdread-4.1.3 make install } diff --git a/media-libs/libdvdread/libdvdread-4.2.0.bep b/media-libs/libdvdread/libdvdread-4.2.0.recipe similarity index 96% rename from media-libs/libdvdread/libdvdread-4.2.0.bep rename to media-libs/libdvdread/libdvdread-4.2.0.recipe index 20479a269..0b149a165 100644 --- a/media-libs/libdvdread/libdvdread-4.2.0.bep +++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="ab7a19d3ab1a437ae754ef477d6231a4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread-4.2.0 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdread-4.2.0 make install } diff --git a/media-libs/libdvdread/libdvdread-svn1168.bep b/media-libs/libdvdread/libdvdread-svn1168.recipe similarity index 95% rename from media-libs/libdvdread/libdvdread-svn1168.bep rename to media-libs/libdvdread/libdvdread-svn1168.recipe index 01b1a3b6c..2c9bfcf7d 100644 --- a/media-libs/libdvdread/libdvdread-svn1168.bep +++ b/media-libs/libdvdread/libdvdread-svn1168.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdread make install } diff --git a/media-libs/libdvdread/libdvdread-svn1226.bep b/media-libs/libdvdread/libdvdread-svn1226.recipe similarity index 95% rename from media-libs/libdvdread/libdvdread-svn1226.bep rename to media-libs/libdvdread/libdvdread-svn1226.recipe index 3315cd103..f40b24a82 100644 --- a/media-libs/libdvdread/libdvdread-svn1226.bep +++ b/media-libs/libdvdread/libdvdread-svn1226.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread svn up -r 1226 libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdread make install } diff --git a/media-libs/libharu/libharu-2.1.0.bep b/media-libs/libharu/libharu-2.1.0.recipe similarity index 95% rename from media-libs/libharu/libharu-2.1.0.bep rename to media-libs/libharu/libharu-2.1.0.recipe index 4d16209e5..95b94accc 100644 --- a/media-libs/libharu/libharu-2.1.0.bep +++ b/media-libs/libharu/libharu-2.1.0.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="app-arch/zlib >= 1.25 media-libs/libpng >= 1.2.44" CHECKSUM_MD5="0623b8fb08ae1b28af08b2cdbd66b662" -BUILD { +BUILD() +{ cd libharu-2.1.0 libtoolize --force --install --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libharu-2.1.0 make install } diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.bep b/media-libs/libid3tag/libid3tag-0.15.1b.recipe similarity index 94% rename from media-libs/libid3tag/libid3tag-0.15.1b.bep rename to media-libs/libid3tag/libid3tag-0.15.1b.recipe index 8fa5ca2ba..207c25f23 100644 --- a/media-libs/libid3tag/libid3tag-0.15.1b.bep +++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e5808ad997ba32c498803822078748c3" -BUILD { +BUILD() +{ cd libid3tag-0.15.1b libtoolize --force --copy --install aclocal @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libid3tag-0.15.1b make install } -TEST { +TEST() +{ cd libid3tag-0.15.1b # make test # make check diff --git a/media-libs/liblo/liblo-0.26.bep b/media-libs/liblo/liblo-0.26.recipe similarity index 96% rename from media-libs/liblo/liblo-0.26.bep rename to media-libs/liblo/liblo-0.26.recipe index 7463fae96..8a661854b 100644 --- a/media-libs/liblo/liblo-0.26.bep +++ b/media-libs/liblo/liblo-0.26.recipe @@ -4,7 +4,8 @@ SRC_URI="http://downloads.sourceforge.net/liblo/liblo-0.26.tar.gz" REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="5351de14262560e15e7f23865293b16f" -BUILD { +BUILD() +{ cd liblo-0.26 libtoolize --force --copy --install aclocal @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd liblo-0.26 make install DESTDIR="${DESTDIR}" } diff --git a/media-libs/libmad/libmad-0.15.1b.bep b/media-libs/libmad/libmad-0.15.1b.bep deleted file mode 100644 index ce4468e5c..000000000 --- a/media-libs/libmad/libmad-0.15.1b.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="libmad - Mpeg Audio Decoder library" -HOMEPAGE="http://mad.sourceforge.net/" -SRC_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c" -DEPEND="" -BUILD { - cd libmad-0.15.1b - libtoolize --force --copy --install - aclocal - sed -i 's/$optimize -fforce-mem/$optimize/g' configure.ac - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd libmad-0.15.1b - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2004 Underbit Technologies, Inc." diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe new file mode 100644 index 000000000..cae468cd4 --- /dev/null +++ b/media-libs/libmad/libmad-0.15.1b.recipe @@ -0,0 +1,66 @@ +SUMMARY="Mpeg Audio Decoder library" +DESCRIPTION="MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG 2.5 format. All three audio layers -- Layer I, Layer II, and Layer III (i.e. MP3) -- are fully implemented." +HOMEPAGE="http://mad.sourceforge.net/" +SRC_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz" +CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2004 Underbit Technologies, Inc." +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + libmad$secondaryArchSuffix = $portVersion + lib:libmad$secondaryArchSuffix = 0.2.1 compat >= 0 + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +BUILD() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + libtoolize --force --copy --install + aclocal + sed -i 's/$optimize -fforce-mem/$optimize/g' configure.ac + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libmad + fixPkgconfig + + #devel Package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------ + +PROVIDES_devel=" + libmad$secondaryArchSuffix_devel = $portVersion + devel:libmad$secondaryArchSuffix = 0.2.1 compat >= 0 + " +REQUIRES_devel=" + libmad$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/libmatroska/libmatroska-1.0.0.bep b/media-libs/libmatroska/libmatroska-1.0.0.recipe similarity index 96% rename from media-libs/libmatroska/libmatroska-1.0.0.bep rename to media-libs/libmatroska/libmatroska-1.0.0.recipe index 0f406830e..4db5ffdc4 100644 --- a/media-libs/libmatroska/libmatroska-1.0.0.bep +++ b/media-libs/libmatroska/libmatroska-1.0.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libebml >= 1.0.0" CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de" -BUILD { +BUILD() +{ cd libmatroska-1.0.0/make/linux make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libmatroska-1.0.0/make/linux if [ -n ${DESTDIR} ];then make install DESTDIR="${DESTDIR}" diff --git a/media-libs/libmikmod/libmikmod-3.1.11.bep b/media-libs/libmikmod/libmikmod-3.1.11.recipe similarity index 97% rename from media-libs/libmikmod/libmikmod-3.1.11.bep rename to media-libs/libmikmod/libmikmod-3.1.11.recipe index 086377bf7..7768c5702 100644 --- a/media-libs/libmikmod/libmikmod-3.1.11.bep +++ b/media-libs/libmikmod/libmikmod-3.1.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="705106da305e8de191549f1e7393185c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libmikmod-3.1.11 rm aclocal.m4 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -25,7 +26,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmikmod-3.1.11 make install } diff --git a/media-libs/libmms/libmms-0.5.bep b/media-libs/libmms/libmms-0.5.recipe similarity index 95% rename from media-libs/libmms/libmms-0.5.bep rename to media-libs/libmms/libmms-0.5.recipe index 9b8ec7c26..41e701a92 100644 --- a/media-libs/libmms/libmms-0.5.bep +++ b/media-libs/libmms/libmms-0.5.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/glib >= 2.0" -BUILD { +BUILD() +{ cd libmms-0.5 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libmms-0.5 make install } diff --git a/media-libs/libmng/libmng-1.0.10.bep b/media-libs/libmng/libmng-1.0.10.bep deleted file mode 100644 index 1b61ed321..000000000 --- a/media-libs/libmng/libmng-1.0.10.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="libmng" -HOMEPAGE="http://www.libmng.com" -SRC_URI="http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz?download" -CHECKSUM_MD5="a464ae7d679781beebdf7440d144b7bd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libmng-1.0.10 - cp unmaintained/autogen.sh . - cp makefiles/configure.in . - cp makefiles/Makefile.am . - libtoolize --force --copy --install - aclocal - ./autogen.sh -# ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ -# LDFLAGS=-L/boot/common/lib \ -# CPPFLAGS=-I/boot/common/include - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd libmng-1.0.10 - make install -} -LICENSE="LIBMNG" -COPYRIGHT="2000-2007 Gerard Juyn" diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe new file mode 100644 index 000000000..044b8cf1d --- /dev/null +++ b/media-libs/libmng/libmng-1.0.10.recipe @@ -0,0 +1,88 @@ +SUMMARY="A PNG-like Image Format Supporting Multiple Image, Animation and Transparent JPEG" +DESCRIPTION="A PNG-like Image Format Supporting Multiple Image, Animation and Transparent JPEG" +HOMEPAGE="http://www.libmng.com" +COPYRIGHT="2000-2007 Gerard Juyn" +LICENSE="LIBMNG" +SRC_URI="http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz?download" +CHECKSUM_MD5="a464ae7d679781beebdf7440d144b7bd" +REVISION="1" + +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + libpng$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 1.0 + lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 1.0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix >= 1.0.4 + libpng >= 1.5 + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake == 1.12 + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + cp unmaintained/autogen.sh . + cp makefiles/configure.in configure.ac + cp makefiles/Makefile.am . + + libtoolize --force --copy --install + aclocal + ./autogen.sh + runConfigure ./configure + make $jobArgs + +## libtoolize --force --copy --install +## aclocal +## ./autogen.sh +# ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ +# LDFLAGS=-L/boot/common/lib \ +# CPPFLAGS=-I/boot/common/include +## MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +## LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` +## ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ +## --libdir=$LIBDIR \ +## --mandir=$MANDIR +## make +} + +INSTALL() +{ + make install + +# prepareInstalledDevelLibs libmng libmng1 +# fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libmng${secondaryArchSuffix}_devel = $portVersion compat >= 1.0 + cmd:libmng_config$secondaryArchSuffix = $portVersion compat >= 1.0 +# cmd:libmng1_config$secondaryArchSuffix = $portVersion compat >= 1.0 +# devel:libmng$secondaryArchSuffix = 10.0 compat >= 15 +# devel:libmng15$secondaryArchSuffix = 10.0 compat >= 15 + " +REQUIRES_devel=" + libmng$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libmodplug/libmodplug-0.8.7.bep b/media-libs/libmodplug/libmodplug-0.8.7.bep deleted file mode 100644 index e10ce86ed..000000000 --- a/media-libs/libmodplug/libmodplug-0.8.7.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="libmodplug is a lib for playing mod files" -HOMEPAGE="http://modplug-xmms.sourceforge.net" -SRC_URI="http://softlayer.dl.sourceforge.net/project/modplug-xmms/libmodplug/0.8.7/libmodplug-0.8.7.tar.gz" -CHECKSUM_MD5="d2d9ccd8da22412999caed076140f786" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libmodplug-0.8.7 - libtoolize --force --copy --install - aclocal - autoconf - automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-static - make -} - -INSTALL { - cd libmodplug-0.8.7 - make install -} -LICENSE="Public Domain" -COPYRIGHT=" diff --git a/media-libs/libmodplug/libmodplug-0.8.8.1.bep b/media-libs/libmodplug/libmodplug-0.8.8.1.bep deleted file mode 100644 index c692b6826..000000000 --- a/media-libs/libmodplug/libmodplug-0.8.8.1.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="libmodplug is a lib for playing mod files" -HOMEPAGE="http://modplug-xmms.sourceforge.net" -SRC_URI="http://softlayer.dl.sourceforge.net/project/modplug-xmms/libmodplug/0.8.8.1/libmodplug-0.8.8.1.tar.gz" -CHECKSUM_MD5="f7fa53a60c650024ff51cca88341776b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libmodplug-0.8.8.1 - libtoolize --force --copy --install - aclocal - autoconf - automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-static - make -} - -INSTALL { - cd libmodplug-0.8.8.1 - make install -} - -#LICENSE="Public Domain" -#COPYRIGHT="" diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.bep b/media-libs/libmodplug/libmodplug-0.8.8.4.bep deleted file mode 100644 index 183c2df62..000000000 --- a/media-libs/libmodplug/libmodplug-0.8.8.4.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="libmodplug is a lib for playing mod files" -HOMEPAGE="http://modplug-xmms.sourceforge.net" -SRC_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz" -CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libmodplug-0.8.8.4 - libtoolize --force --copy --install - aclocal - autoconf - automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-static - make -} - -INSTALL { - cd libmodplug-0.8.8.4 - make install -} - -LICENSE="Public Domain" -#COPYRIGHT="" diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe new file mode 100644 index 000000000..849df8f12 --- /dev/null +++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe @@ -0,0 +1,88 @@ +SUMMARY="libmodplug is a lib for playing mod files" +DESCRIPTION="Olivier Lapicque, author of Modplug, which is arguably the best quality +MOD-playing software available, has placed his sound rendering code in the +public domain. This library and plugin is based on that code. +- Plays 22 different mod formats, including: + MOD, S3M, XM, IT, 669, AMF (both of them), AMS, DBM, DMF, DSM, FAR, + MDL, MED, MTM, OKT, PTM, STM, ULT, UMX, MT2, PSM +- Plays zip, rar, gzip, and bzip2 compressed mods. The following + extensions are recognized: + zip: MDZ, S3Z, XMZ, ITZ + rar: MDR, S3R, XMR, ITR + gzip: MDGZ, S3GZ, XMGZ, ITGZ + You can also load plain old ZIP, RAR, and GZ files. If ModPlug finds + a mod in them, it will play it. + Note: To play these formats, you need to have the associated + decompression utilities (unzip, gunzip, unrar) installed. + Note(2): The format of the mod is NOT determined from the extension on + compressed mods. For example, if you zipped a UMX mod and gave it the + extension MDZ, it would work fine. +- plays timidity's GUS patch files (*.pat): + a multi sample pat file with n samples can be played with a Frere Jacques + canon with n voices. +- plays all types of MIDI files (*.mid): + uses the timidity .pat files for samples (when available)" +HOMEPAGE="http://modplug-xmms.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz" +CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db" + +LICENSE="Public Domain" +COPYRIGHT="Public Domain" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libmodplug$secondaryArchSuffix = $portVersion + lib:libmodplug$secondaryArchSuffix = 0.8.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + + runConfigure ./configure \ + --enable-static + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libmodplug + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libmodplug${secondaryArchSuffix}_devel = $portVersion + devel:libmodplug$secondaryArchSuffix = 0.8.0 compat >= 0 + " +REQUIRES_devel=" + libmodplug$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.bep b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe similarity index 95% rename from media-libs/libmpeg2/libmpeg2-0.5.1.bep rename to media-libs/libmpeg2/libmpeg2-0.5.1.recipe index 71b8d295f..b23630399 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1.bep +++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0f92c7454e58379b4a5a378485bbd8ef" -BUILD { +BUILD() +{ cd libmpeg2-0.5.1 rm aclocal.m4 libtoolize --force --copy --install @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmpeg2-0.5.1 make install } diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3.bep b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe similarity index 94% rename from media-libs/libnsbmp/libnsbmp-0.0.3.bep rename to media-libs/libnsbmp/libnsbmp-0.0.3.recipe index dea51e029..667f0b108 100644 --- a/media-libs/libnsbmp/libnsbmp-0.0.3.bep +++ b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.ta REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libnsbmp-0.0.3 make } -INSTALL { +INSTALL() +{ cd libnsbmp-0.0.3 make install } diff --git a/media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.bep b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe similarity index 100% rename from media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.bep rename to media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe diff --git a/media-libs/libnsgif/libnsgif-0.0.3.bep b/media-libs/libnsgif/libnsgif-0.0.3.recipe similarity index 94% rename from media-libs/libnsgif/libnsgif-0.0.3.bep rename to media-libs/libnsgif/libnsgif-0.0.3.recipe index e5598c573..7b5fa0c2b 100644 --- a/media-libs/libnsgif/libnsgif-0.0.3.bep +++ b/media-libs/libnsgif/libnsgif-0.0.3.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.0.3-src.ta REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libnsgif-0.0.3 make } -INSTALL { +INSTALL() +{ cd libnsgif-0.0.3 make install } diff --git a/media-libs/libnsgif/libnsgif-0.1.0-HEAD.bep b/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe similarity index 100% rename from media-libs/libnsgif/libnsgif-0.1.0-HEAD.bep rename to media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe diff --git a/media-libs/libogg/libogg-1.1.3.bep b/media-libs/libogg/libogg-1.1.3.bep deleted file mode 100644 index a7d06d6ee..000000000 --- a/media-libs/libogg/libogg-1.1.3.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz" -CHECKSUM_MD5="eaf7dc6ebbff30975de7527a80831585" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libogg-1.1.3 - ./configure --prefix=/boot/home/config - make -} - -INSTALL { - cd libogg-1.1.3 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.1.4.bep b/media-libs/libogg/libogg-1.1.4.bep deleted file mode 100644 index 2859a806d..000000000 --- a/media-libs/libogg/libogg-1.1.4.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.1.4.tar.gz" -CHECKSUM_MD5="10200ec22543841d9d1c23e0aed4e5e9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libogg-1.1.4 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libogg-1.1.4 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.2.0.bep b/media-libs/libogg/libogg-1.2.0.bep deleted file mode 100644 index b82d6c503..000000000 --- a/media-libs/libogg/libogg-1.2.0.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.2.0.tar.gz" -CHECKSUM_MD5="c95b73759acfc30712beef6ce4e88efa" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libogg-1.2.0 - rm aclocal.m4 - mkdir -p m4 - libtoolize --force --copy --install - echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in' - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libogg-1.2.0 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.2.2.bep b/media-libs/libogg/libogg-1.2.2.bep deleted file mode 100644 index f1828f98e..000000000 --- a/media-libs/libogg/libogg-1.2.2.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz" -CHECKSUM_MD5="5a9fcabc9a1b7c6f1cd75ddc78f36c56" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libogg-1.2.2 - rm aclocal.m4 - mkdir -p m4 - cp `aclocal --print-ac-dir`/ltversion.m4 m4 - libtoolize -fci - echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in' - libtoolize -fci - aclocal --install -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' Make* - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/Make* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS - make -} - -INSTALL { - cd libogg-1.2.2 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.3.0.bep b/media-libs/libogg/libogg-1.3.0.bep deleted file mode 100644 index ed2ac6726..000000000 --- a/media-libs/libogg/libogg-1.3.0.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" -CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libogg-1.3.0 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS - make -} - -INSTALL { - cd libogg-1.3.0 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2011 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe new file mode 100644 index 000000000..5cc057bbf --- /dev/null +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -0,0 +1,71 @@ +SUMMARY="Ogg multimedia container format library" +DESCRIPTION="Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. As with all Xiph.org technology is it an open format free for anyone to use. + +As with most container formats it encapsulates raw compressed data and allows the interleaving of audio and video data inside a single convient format. Other examples of container formats are Quicktime .mov, the MPEG program stream, and AVI. + +In addition to encapsulation and interleave of multiple data streams, Ogg provides packet framing, error detection, and periodic timestamps for seeking, and in a small, bounded percentage bitrate overhead. + +Ogg is a stream oriented container, meaning it can be written and read in one pass, making it a natural fit for internet streaming and use in processing pipelines. This stream orientation is the major design difference over other file-based container formats." +HOMEPAGE="http://www.xiph.org" +LICENSE="BSD (3-clause)" +COPYRIGHT="1994-2011 Xiph.Org Foundation" +SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" +CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libogg-1.3.0.patchset" + +PROVIDES=" + libogg$secondaryArchSuffix = $portVersion + lib:libogg$secondaryArchSuffix = 0.8.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure \ + --docdir $developDocDir + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libogg + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libogg${secondaryArchSuffix}_devel = $portVersion + devel:libogg$secondaryArchSuffix = 0.8.0 compat >= 0 + " +REQUIRES_devel=" + libogg$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/libogg/patches/libogg-1.3.0.patchset b/media-libs/libogg/patches/libogg-1.3.0.patchset new file mode 100644 index 000000000..12ee3c920 --- /dev/null +++ b/media-libs/libogg/patches/libogg-1.3.0.patchset @@ -0,0 +1,57 @@ +From 2620afc432e102f21a44de0576eb9d901cb7c069 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:17:52 +0200 +Subject: configure.in: use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER + + +diff --git a/configure.in b/configure.in +index 7141645..3a01896 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,7 +19,7 @@ AM_PROG_LIBTOOL + AM_PROG_CC_C_O + + dnl config.h +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + dnl Set some options based on environment + +-- +1.7.5 + + +From 79c094d54944f3a970851157f7937811fb73f9d7 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:18:38 +0200 +Subject: doc[/libogg]/Makefile.am: don't hard-code docdir + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 9c2c316..9c727c4 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -2,8 +2,6 @@ + + SUBDIRS = libogg + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \ + stream.png vorbisword2.png white-ogg.png white-xifish.png \ + rfc3533.txt rfc5334.txt skeleton.html +diff --git a/doc/libogg/Makefile.am b/doc/libogg/Makefile.am +index 9eb7d34..e34c8a8 100644 +--- a/doc/libogg/Makefile.am ++++ b/doc/libogg/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg +- + doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\ + general.html index.html ogg_packet.html ogg_packet_clear.html\ + ogg_page.html ogg_page_bos.html ogg_page_checksum_set.html\ +-- +1.7.5 + diff --git a/media-libs/libpng/libpng-1.2.29.bep b/media-libs/libpng/libpng-1.2.29.bep deleted file mode 100644 index 3115d3d32..000000000 --- a/media-libs/libpng/libpng-1.2.29.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.29.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.29 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.29 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.30.bep b/media-libs/libpng/libpng-1.2.30.bep deleted file mode 100644 index bed0800f5..000000000 --- a/media-libs/libpng/libpng-1.2.30.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.30.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.30 - cp /boot/common/share/libtool/config.guess . - cp /boot/common/share/libtool/config.sub - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.30 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.40.bep b/media-libs/libpng/libpng-1.2.40.bep deleted file mode 100644 index e43975616..000000000 --- a/media-libs/libpng/libpng-1.2.40.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/png/src/history/libpng-1.2.40.tar.gz" -CHECKSUM_MD5="a2f6808735bf404967f81519a967fb2a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.40 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.40 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.41.bep b/media-libs/libpng/libpng-1.2.41.bep deleted file mode 100644 index f18fd1c07..000000000 --- a/media-libs/libpng/libpng-1.2.41.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng-1.2.41.tar.gz" -CHECKSUM_MD5="82ab87818fb22961620aac7eca9fea14" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.41 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.41 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.43.bep b/media-libs/libpng/libpng-1.2.43.bep deleted file mode 100644 index 869e467ce..000000000 --- a/media-libs/libpng/libpng-1.2.43.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng-1.2.43.tar.gz" -CHECKSUM_MD5="00f3f6bfadbd4f83e351558ad6bb46b5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.43 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.43 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.44.bep b/media-libs/libpng/libpng-1.2.44.bep deleted file mode 100644 index 2a9d84070..000000000 --- a/media-libs/libpng/libpng-1.2.44.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.2.44.tar.gz?download" -CHECKSUM_MD5="89b62f8daaeeab1342e307d6d1411ff1" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.44 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.44 - make install -} -LICENSE="LibPNG" -COPYRIGHT="1998-2010 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.46.bep b/media-libs/libpng/libpng-1.2.46.bep deleted file mode 100644 index 9917b9c14..000000000 --- a/media-libs/libpng/libpng-1.2.46.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.2.46.tar.gz?download" -CHECKSUM_MD5="03ddfc17ad321db93f984581e9415d22" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.2.46 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.2.46 - make install -} -LICENSE="LibPNG" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.4.1.bep b/media-libs/libpng/libpng-1.4.1.bep deleted file mode 100644 index d5c4a7bc7..000000000 --- a/media-libs/libpng/libpng-1.4.1.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.1.tar.gz" -CHECKSUM_MD5="fa0b2a84733463f90d3ac9f43ccafabc" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.4.1 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.4.1 - make install -} -LICENSE="LibPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.4.2.bep b/media-libs/libpng/libpng-1.4.2.bep deleted file mode 100644 index 72bb98aae..000000000 --- a/media-libs/libpng/libpng-1.4.2.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.2.tar.gz" -CHECKSUM_MD5="89fd334dc5fc84ff146b9269c4fa452f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.4.2 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.4.2 - make install -} diff --git a/media-libs/libpng/libpng-1.4.3.bep b/media-libs/libpng/libpng-1.4.3.bep deleted file mode 100644 index dd7d1af3f..000000000 --- a/media-libs/libpng/libpng-1.4.3.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2010 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.3.tar.gz" -CHECKSUM_MD5="df3521f61a1b8b69489d297c0ca8c1f8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.4.3 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.4.3 - make install -} diff --git a/media-libs/libpng/libpng-1.4.4.bep b/media-libs/libpng/libpng-1.4.4.bep deleted file mode 100644 index 7950fef2c..000000000 --- a/media-libs/libpng/libpng-1.4.4.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2010 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.4.tar.gz" -CHECKSUM_MD5="297b38f925e745061489b41b1f7c4bb1" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd libpng-1.4.4 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libpng-1.4.4 - make install -} diff --git a/media-libs/libpng/libpng-1.5.0.bep b/media-libs/libpng/libpng-1.5.0.bep deleted file mode 100644 index e8a1f7ac7..000000000 --- a/media-libs/libpng/libpng-1.5.0.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.0.tar.gz?download" -CHECKSUM_MD5="32a9f9c8f7f020bf7867a453d81fcb51" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.5.0 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libpng-1.5.0 - make install -} diff --git a/media-libs/libpng/libpng-1.5.12.bep b/media-libs/libpng/libpng-1.5.12.bep deleted file mode 100644 index 6afaf8263..000000000 --- a/media-libs/libpng/libpng-1.5.12.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" -CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.5.12 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libpng-1.5.12 - make install -} diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe new file mode 100644 index 000000000..15d1b0e83 --- /dev/null +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -0,0 +1,75 @@ +SUMMARY="Portable Network Graphics library" +DESCRIPTION="libpng is the official PNG reference library. It supports almost all PNG features, is extensible, and has been extensively tested for over 17 years." +HOMEPAGE="http://www.libpng.org" +COPYRIGHT=" + 1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc. + " +LICENSE="LibPNG" +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" +CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libpng-1.5.12.patchset" + +PROVIDES=" + libpng$secondaryArchSuffix = $portVersion compat >= 1.5 + lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix >= 1.0.4 + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + aclocal + libtoolize --force --copy --install + ./autogen.sh + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libpng libpng15 + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 + cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5 + cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5 + devel:libpng$secondaryArchSuffix = 15.12.0 compat >= 15 + devel:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15 + " +REQUIRES_devel=" + libpng$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libpng/libpng-1.5.13.bep b/media-libs/libpng/libpng-1.5.13.recipe similarity index 95% rename from media-libs/libpng/libpng-1.5.13.bep rename to media-libs/libpng/libpng-1.5.13.recipe index 89333093c..99bfdb083 100644 --- a/media-libs/libpng/libpng-1.5.13.bep +++ b/media-libs/libpng/libpng-1.5.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9c5a584d4eb5fe40d0f1bc2090112c65" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.13 libtoolize --force --copy ./autogen.sh @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.13 make install } -TEST { +TEST() +{ cd libpng-1.5.13 make test } diff --git a/media-libs/libpng/libpng-1.5.2.bep b/media-libs/libpng/libpng-1.5.2.bep deleted file mode 100644 index ceba7bf1a..000000000 --- a/media-libs/libpng/libpng-1.5.2.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.2.tar.gz?download" -CHECKSUM_MD5="31d448eb93a1646359a23f1b23434ab3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.5.2 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libpng-1.5.2 - make install -} diff --git a/media-libs/libpng/libpng-1.5.4.bep b/media-libs/libpng/libpng-1.5.4.bep deleted file mode 100644 index 3cec3fe68..000000000 --- a/media-libs/libpng/libpng-1.5.4.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.4.tar.gz?download" -CHECKSUM_MD5="dea4d1fd671160424923e92ff0cdda78" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.5.4 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libpng-1.5.4 - make install -} diff --git a/media-libs/libpng/libpng-1.5.7.bep b/media-libs/libpng/libpng-1.5.7.bep deleted file mode 100644 index 5c86a6209..000000000 --- a/media-libs/libpng/libpng-1.5.7.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.7.tar.gz?download" -CHECKSUM_MD5="944b56a84b65d94054cc73d7ff965de8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libpng-1.5.7 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libpng-1.5.7 - make install -} diff --git a/media-libs/libpng/patches/libpng-1.5.12.patchset b/media-libs/libpng/patches/libpng-1.5.12.patchset new file mode 100644 index 000000000..9d93644d2 --- /dev/null +++ b/media-libs/libpng/patches/libpng-1.5.12.patchset @@ -0,0 +1,22 @@ +From ca47ea510b8f381f4cd3f0dbf887faa0b95257ca Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Mon, 10 Jun 2013 23:42:11 +0200 +Subject: configure.ac: replace obsolete AM_CONFIG_HEADER + + +diff --git a/configure.ac b/configure.ac +index beeeb81..8f51ada 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,7 @@ PNGLIB_RELEASE=12 + dnl End of version number stuff + + AC_CONFIG_SRCDIR([pngget.c]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Checks for programs. + AC_LANG([C]) +-- +1.7.5 + diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.bep b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe similarity index 95% rename from media-libs/libsamplerate/libsamplerate-0.1.8.bep rename to media-libs/libsamplerate/libsamplerate-0.1.8.recipe index fb08c551e..14a344eba 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.8.bep +++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe @@ -8,14 +8,16 @@ CHECKSUM_MD5="1c7fb25191b4e6e3628d198a66a84f47" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libsamplerate-0.1.8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd libsamplerate-0.1.8 make install } diff --git a/media-libs/libsdl/libsdl-1.2.12.bep b/media-libs/libsdl/libsdl-1.2.12.recipe similarity index 94% rename from media-libs/libsdl/libsdl-1.2.12.bep rename to media-libs/libsdl/libsdl-1.2.12.recipe index f65d7263e..602fc6123 100644 --- a/media-libs/libsdl/libsdl-1.2.12.bep +++ b/media-libs/libsdl/libsdl-1.2.12.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="544b4554986e51eed6d34435cf9c5f3f" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.12 ./configure --prefix=/boot/home/config make } -INSTALL { +INSTALL() +{ cd SDL-1.2.12 make install } diff --git a/media-libs/libsdl/libsdl-1.2.13.bep b/media-libs/libsdl/libsdl-1.2.13.recipe similarity index 94% rename from media-libs/libsdl/libsdl-1.2.13.bep rename to media-libs/libsdl/libsdl-1.2.13.recipe index 3e8c4c0a9..e75b3534d 100644 --- a/media-libs/libsdl/libsdl-1.2.13.bep +++ b/media-libs/libsdl/libsdl-1.2.13.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="c6660feea2a6834de10bc71b2f8e4d88" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.13 ./configure --prefix=/boot/home/config make } -INSTALL { +INSTALL() +{ cd SDL-1.2.13 make install } diff --git a/media-libs/libsdl/libsdl-1.2.14.bep b/media-libs/libsdl/libsdl-1.2.14.recipe similarity index 96% rename from media-libs/libsdl/libsdl-1.2.14.bep rename to media-libs/libsdl/libsdl-1.2.14.recipe index 68e0ae7dd..30554ec8d 100644 --- a/media-libs/libsdl/libsdl-1.2.14.bep +++ b/media-libs/libsdl/libsdl-1.2.14.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.14 ./autogen.sh rm aclocal.m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL-1.2.14 make install diff --git a/media-libs/libsdl/libsdl-1.2.15.bep b/media-libs/libsdl/libsdl-1.2.15.bep deleted file mode 100644 index 7618b080a..000000000 --- a/media-libs/libsdl/libsdl-1.2.15.bep +++ /dev/null @@ -1,101 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" -CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd SDL-1.2.15 - ./autogen.sh - rm aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in - libtoolize -fci - aclocal -I acinclude - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd SDL-1.2.15 - make install -} - -TEST { - cd SDL-1.2.15/test - ./configure - make - echo testvidoinfo - testvidinfo - echo testgl - testgl - echo testwm - testwm - echo testhread - testhread - echo testsprite - testsprite - echo testdyngl - testdyngl - echo testoverlay - testoverlay - echo testoverlay2 - testoverlay2 - echo threadwin - threadwin - echo testalpha - testalpha - echo testiconv - testiconv - echo testtimer - testtimer - echo graywin - graywin - echo testerror - testerror - echo torturethread - torturethread - echo testbitmap - testbitmap - echo testjoystick - testjoystick - echo testver - testver - echo testfile - testfile - echo testpalette - testpalette - echo loopwave - loopwave - echo testblitspeed - testblitspeed - echo testkeys - testkeys - echo testcursor - testcursor - echo checkkeys - checkkeys - echo testgamma - testgamma - echo testplatform - testplatform - echo testcdrom - testcdrom - echo testloadso - testloadso - echo testwim - testwin - echo testsem - testsem - echo testlock - testlock -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe new file mode 100644 index 000000000..94990c4f0 --- /dev/null +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -0,0 +1,153 @@ +SUMMARY="Simple Direct Media Layer" +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" +CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1997-2012 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libsdl = $portVersion compat >= 1.2 + lib:libsdl = $portVersion compat >= 1.2 + lib:libSDL = $portVersion compat >= 1.2 + lib:libSDL_1.2 = 0.11.4 compat >= 0.11 + " +REQUIRES=" + haiku + lib:libGLU + " +BUILD_REQUIRES=" + lib:libpng + lib:libjpeg + lib:libtiff + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + " + +SOURCE_DIR="SDL-$portVersion" + +PATCH() +{ + sed -i 's/AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)/have_alsa=no/' configure.in + sed -i 's/AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)/have_esd=no/' configure.in + echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I acinclude + autoconf + runConfigure ./configure --includedir=$includeDir + make $jobArgs +} + +INSTALL() +{ + make install + + # devel package + prepareInstalledDevelLibs \ + libSDL libSDL-1.2 \ + libSDLmain + + fixPkgconfig + fixDevelopLibDirReferences $binDir/sdl-config + + packageEntries devel \ + $developDir $binDir/sdl-config +} + +TEST() +{ + cd test + runConfigure ./configure + make $jobArgs + echo testvidoinfo + testvidinfo + echo testgl + testgl + echo testwm + testwm + echo testhread + testhread + echo testsprite + testsprite + echo testdyngl + testdyngl + echo testoverlay + testoverlay + echo testoverlay2 + testoverlay2 + echo threadwin + threadwin + echo testalpha + testalpha + echo testiconv + testiconv + echo testtimer + testtimer + echo graywin + graywin + echo testerror + testerror + echo torturethread + torturethread + echo testbitmap + testbitmap + echo testjoystick + testjoystick + echo testver + testver + echo testfile + testfile + echo testpalette + testpalette + echo loopwave + loopwave + echo testblitspeed + testblitspeed + echo testkeys + testkeys + echo testcursor + testcursor + echo checkkeys + checkkeys + echo testgamma + testgamma + echo testplatform + testplatform + echo testcdrom + testcdrom + echo testloadso + testloadso + echo testwim + testwin + echo testsem + testsem + echo testlock + testlock +} + +# ----- devel package ------------------------ + +PROVIDES_devel=" + cmd:sdl_config = $portVersion compat >= 1.2 + devel:libSDL_1.2 = 0.11.4 compat >= 0.11 + devel:libSDL = 0.11.4 compat >= 0.11 + devel:libSDLmain = 0.11.4 compat >= 0.11 + " + +REQUIRES_devel=" + libsdl == $portVersion base + " diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2_hg.recipe similarity index 98% rename from media-libs/libsdl/libsdl-1.2-hg.bep rename to media-libs/libsdl/libsdl-1.2_hg.recipe index 217a36dae..830489f2e 100644 --- a/media-libs/libsdl/libsdl-1.2-hg.bep +++ b/media-libs/libsdl/libsdl-1.2_hg.recipe @@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL#SDL-1.2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libsdl-1.2-hg cp `aclocal --print-ac-dir`/libtool.m4 acinclude ./autogen.sh @@ -19,13 +20,15 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsdl-1.2-hg make install cp ../../sdl-config `which sdl-config` } -TEST { +TEST() +{ cd libsdl-1.2-hg/test ./configure make diff --git a/media-libs/libsdl/libsdl-1.3-gsoc.bep b/media-libs/libsdl/libsdl-1.3_gsoc.recipe similarity index 95% rename from media-libs/libsdl/libsdl-1.3-gsoc.bep rename to media-libs/libsdl/libsdl-1.3_gsoc.recipe index 7d5af823c..1ae926ca8 100644 --- a/media-libs/libsdl/libsdl-1.3-gsoc.bep +++ b/media-libs/libsdl/libsdl-1.3_gsoc.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This is a work in progress and not ready for release." DEPEND="" -BUILD { +BUILD() +{ cd libsdl-1.3-gsoc ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsdl-1.3-gsoc make install } -TEST { +TEST() +{ cd libsdl-1.3-gsoc/test ./autogen ./configure diff --git a/media-libs/libsdl/patches/libsdl-1.2-hg.patch b/media-libs/libsdl/patches/libsdl-1.2_hg.patch similarity index 100% rename from media-libs/libsdl/patches/libsdl-1.2-hg.patch rename to media-libs/libsdl/patches/libsdl-1.2_hg.patch diff --git a/media-libs/libsdl/libsdl-2.0.0.bep b/media-libs/libsdl2/libsdl-2.0_hg.recipe similarity index 65% rename from media-libs/libsdl/libsdl-2.0.0.bep rename to media-libs/libsdl2/libsdl-2.0_hg.recipe index 6f7de2ebd..b2300d2b4 100644 --- a/media-libs/libsdl/libsdl-2.0.0.bep +++ b/media-libs/libsdl2/libsdl-2.0_hg.recipe @@ -1,12 +1,13 @@ DESCRIPTION="Simple Direct Media Layer" HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" -CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" +SRC_URI="hg+http://hg.libsdl.org/SDL" +#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" REVISION="1" STATUS_HAIKU="unstable" -DEPEND="pkgconfig >= 0.9.0" -BUILD { - cd SDL2-2.0.0 +DEPEND="" +BUILD() +{ + cd libsdl-2.0-hg MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` DATADIR=`finddir B_COMMON_DATA_DIRECTORY` @@ -15,13 +16,13 @@ BUILD { ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR \ - --datadir=$DATADIR \ - --enable-shared + --datadir=$DATADIR make } -INSTALL { - cd SDL2-2.0.0/build_haiku +INSTALL() +{ + cd libsdl-2.0-hg/build_haiku make install } LICENSE="Zlib" diff --git a/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe b/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe new file mode 100644 index 000000000..c421c0e28 --- /dev/null +++ b/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe @@ -0,0 +1,30 @@ +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="hg+http://hg.libsdl.org/SDL" +#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="" +BUILD() +{ + cd libsdl-2.0-hg-cmake +# MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +# LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` +# DATADIR=`finddir B_COMMON_DATA_DIRECTORY` +# mkdir build_haiku +# cd build_haiku +# ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ +# --libdir=$LIBDIR \ +# --mandir=$MANDIR \ +# --datadir=$DATADIR + cmake . + make +} + +INSTALL() +{ + cd libsdl-2.0-hg-cmake + make install +} +LICENSE="Zlib" +COPYRIGHT="1997-2013 Sam Lantinga" diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe new file mode 100644 index 000000000..f7ef6f199 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -0,0 +1,87 @@ +SUMMARY="Simple Direct Media Layer 2.0" +DESCRIPTION="Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. It is used by video playback software, emulators, and popular games." +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" +CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" +REVISION="1" +LICENSE="Zlib" +COPYRIGHT="1997-2013 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libsdl2 = $portVersion compat >= 2.0 + lib:libsdl2 = $portVersion compat >= 2.0 + lib:libsdl2_2.0 = 0.0.0 compat >= 0.12 + " + +REQUIRES=" + haiku + lib:libGL + lib:libroot + lib:libbe + lib:libmedia + lib:libgame + lib:libdevice + lib:libtextencoding + lib:libpng + lib:libjpeg + lib:libtiff + " + +BUILD_REQUIRES=" + haiku_devel + devel:libpng + devel:libjpeg +# devel:libtiff + " + +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc + cmd:ld + " + +SOURCE_DIR="SDL2-$portVersion" + +PATCHES="libsdl2-2.0.0.patch" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # devel package + prepareInstalledDevelLibs \ + libSDL2 \ + libSDL2main \ + libSDL2_test + + fixPkgconfig + fixDevelopLibDirReferences $binDir/sdl2-config + + packageEntries devel \ + $developDir $binDir/sdl2-config $dataDir +} + +# ----- devel package ------------------------------------- +PROVIDES_devel=" + cmd:sdl2_config = $portVersion compat >= 2.0 + devel:libsdl2_2.0 = 0.12.0 compat >= 0 + devel:libsdl2 = 0.12.0 compat >= 0 + devel:libsdl2main = 0.12.0 compat >= 0 + devel:libsdl2_test = 0.12.0 compat >= 0 + " + +REQUIRES_devel=" + libsdl2 == $portVersion base + " + diff --git a/media-libs/libsdl2/patches/libsdl2-2.0.0.patch b/media-libs/libsdl2/patches/libsdl2-2.0.0.patch new file mode 100644 index 000000000..dae2a97bf --- /dev/null +++ b/media-libs/libsdl2/patches/libsdl2-2.0.0.patch @@ -0,0 +1,39 @@ +diff -Naur SDL2-2.0.0/include/begin_code.h SDL2-2.0.0-haiku/include/begin_code.h +--- SDL2-2.0.0/include/begin_code.h 2013-08-11 21:57:54.011796480 -0500 ++++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-19 15:12:06.654049280 -0500 +@@ -35,13 +35,7 @@ + + /* Some compilers use a special export keyword */ + #ifndef DECLSPEC +-# if defined(__BEOS__) || defined(__HAIKU__) +-# if defined(__GNUC__) +-# define DECLSPEC __declspec(dllexport) +-# else +-# define DECLSPEC __declspec(export) +-# endif +-# elif defined(__WIN32__) ++# if defined(__WIN32__) + # ifdef __BORLANDC__ + # ifdef BUILD_SDL + # define DECLSPEC +@@ -54,6 +48,8 @@ + # else + # if defined(__GNUC__) && __GNUC__ >= 4 + # define DECLSPEC __attribute__ ((visibility("default"))) ++# elif defined(__GNUC__) && __GNUC__ >= 2 ++# define DECLSPEC __declspec(dllexport) + # else + # define DECLSPEC + # endif +diff -Naur SDL2-2.0.0/src/main/beos/SDL_BApp.h SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h +--- SDL2-2.0.0/src/main/beos/SDL_BApp.h 2013-08-11 21:57:54.058982400 -0500 ++++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-19 15:10:50.412876800 -0500 +@@ -371,7 +371,7 @@ + + + /* Members */ +- vector _window_map; /* Keeps track of SDL_Windows by index-id*/ ++ std::vector _window_map; /* Keeps track of SDL_Windows by index-id*/ + + display_mode *_saved_mode; + BGLView *_current_context; diff --git a/media-libs/libsndfile/libsndfile-1.0.21.bep b/media-libs/libsndfile/libsndfile-1.0.21.recipe similarity index 98% rename from media-libs/libsndfile/libsndfile-1.0.21.bep rename to media-libs/libsndfile/libsndfile-1.0.21.recipe index 9558dd293..56901f30a 100644 --- a/media-libs/libsndfile/libsndfile-1.0.21.bep +++ b/media-libs/libsndfile/libsndfile-1.0.21.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/flac >= 1.2.1 media-libs/libogg >= 1.2.0 media-libs/libvorbis >= 1.3.1" -BUILD { +BUILD() +{ cd libsndfile-1.0.21 rm aclocal.m4 echo "AC_CONFIG_MACRO_DIR([M4]) >> configure.in" @@ -27,7 +28,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsndfile-1.0.21 make install } diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.bep b/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe similarity index 100% rename from media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.bep rename to media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe diff --git a/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe new file mode 100644 index 000000000..c6db21792 --- /dev/null +++ b/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe @@ -0,0 +1,24 @@ +DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" +HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" +SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libxml2 >= 2.7.7 + dev-util/gperf >= 3.0.4 + dev-util/buildsystem >= 0 + dev-libs/libwapcaplet >= 0.1.1-HEAD + net-libs/libdom >= 0" +#CHECKSUM_MD5="" +BUILD() +{ + cd libsvgtiny-0-HEAD + make PREFIX=/boot/common +} + +INSTALL() +{ + cd libsvgtiny-0-HEAD + make install PREFIX=/boot/common +} +LICENSE="MIT" +COPYRIGHT="2003-2012 The NetSurf Developers" diff --git a/media-libs/libsvgtiny/libsvgtiny-10856.bep b/media-libs/libsvgtiny/libsvgtiny-10856.recipe similarity index 95% rename from media-libs/libsvgtiny/libsvgtiny-10856.bep rename to media-libs/libsvgtiny/libsvgtiny-10856.recipe index d4a28bff6..b902f7b8c 100644 --- a/media-libs/libsvgtiny/libsvgtiny-10856.bep +++ b/media-libs/libsvgtiny/libsvgtiny-10856.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/libxml2 >= 2.7.7 dev-util/gperf >= 3.0.4" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd libsvgtiny-10856 make make install PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libsvgtiny-10856 make install } diff --git a/media-libs/libtheora/libtheora-1.1.1.bep b/media-libs/libtheora/libtheora-1.1.1.bep deleted file mode 100644 index 922a87a52..000000000 --- a/media-libs/libtheora/libtheora-1.1.1.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Theora is a free and open video compression format from the Xiph.org Foundation." -HOMEPAGE="http://www.theora.org/" -SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.2.0 - media-libs/libvorbis >= 1.3.0" -CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" -BUILD { - cd libtheora-1.1.1 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --disable-asm - make -} - -INSTALL { - cd libtheora-1.1.1 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="2002-2009 Xiph.Org Foundation" diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe new file mode 100644 index 000000000..684117a3e --- /dev/null +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -0,0 +1,78 @@ +SUMMARY="Theora video compression format library" +DESCRIPTION="Theora is a free and open video compression format from the Xiph.org Foundation. Like all our multimedia technology it can be used to distribute film and video online and on disc without the licensing and royalty fees or vendor lock-in associated with other formats. + +Theora scales from postage stamp to HD resolution, and is considered particularly competitive at low bitrates. It is in the same class as MPEG-4/DiVX, and like the Vorbis audio codec it has lots of room for improvement as encoder technology develops. + +Theora is in full public release as of November 3, 2008. The bitstream format for Theora I was frozen Thursday, 2004 July 1. All bitstreams encoded since that date will remain compatible with future releases." +HOMEPAGE="http://www.theora.org/" +LICENSE="BSD (3-clause)" +COPYRIGHT="2002-2009 Xiph.Org Foundation" +SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2" +CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libtheora-1.1.1.patchset" + +PROVIDES=" + libtheora$secondaryArchSuffix = $portVersion + lib:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0 + lib:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1 + lib:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libogg$secondaryArchSuffix + " + # Note: The build system also looks for libvorbis and SDL, but that seems + # to be needed only for building the sample player, which we don't need. +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + automake --add-missing + runConfigure ./configure \ + --docdir $developDocDir \ + --disable-asm + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libtheora libtheoradec libtheoraenc + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libtheora${secondaryArchSuffix}_devel = $portVersion + devel:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0 + devel:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1 + devel:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1 + " +REQUIRES_devel=" + libtheora$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/libtheora/patches/libtheora-1.0.patch b/media-libs/libtheora/patches/libtheora-1.0.patch deleted file mode 100644 index 965a4ad18..000000000 --- a/media-libs/libtheora/patches/libtheora-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libtheora-1.0/configure.ac libtheora-1.0-haiku/configure.ac ---- libtheora-1.0/configure.ac 2008-10-24 04:07:32.000000000 +0000 -+++ libtheora-1.0-haiku/configure.ac 2009-09-14 02:21:57.000000000 +0000 -@@ -404,7 +404,7 @@ - if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then - BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example" - fi --if test x$HAVE_PNG = xyes; then -+if test x$HAVE_PNG = xyes -a $target_os != 'haiku'; then - BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES png2theora" - fi - AC_SUBST(BUILDABLE_EXAMPLES) diff --git a/media-libs/libtheora/patches/libtheora-1.1.1.patchset b/media-libs/libtheora/patches/libtheora-1.1.1.patchset new file mode 100644 index 000000000..f18435cd1 --- /dev/null +++ b/media-libs/libtheora/patches/libtheora-1.1.1.patchset @@ -0,0 +1,58 @@ +From 57bef9f56b8e4baa23023a8bc044e1a0c35f9431 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 19:50:31 +0200 +Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS + + +diff --git a/configure.ac b/configure.ac +index 8260bdf..c81fdb6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,7 @@ AC_INIT(libtheora,[1.1.1]) + AC_CANONICAL_HOST + AC_CANONICAL_TARGET + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR([lib/fdct.c]) + AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE +-- +1.7.5 + + +From bb50525dec8c8c7f11ec958ac9329333be027949 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 20:20:58 +0200 +Subject: */Makefile.am: remove hard-coded docdir + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 30eaad8..5aeda7d 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -2,8 +2,6 @@ + + SUBDIRS = spec + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + static_docs = vp3-format.txt color.html \ + draft-ietf-avt-rtp-theora-00.xml \ + draft-ietf-avt-rtp-theora-00.txt +diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am +index 3a181a2..00e9271 100644 +--- a/doc/spec/Makefile.am ++++ b/doc/spec/Makefile.am +@@ -3,8 +3,6 @@ + # makefile to generate the spec document from sources + # requires transfig and pdflatex + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + built_docs = Theora.pdf + + if BUILD_SPEC +-- +1.7.5 + diff --git a/media-libs/libvorbis/libvorbis-1.2.3.bep b/media-libs/libvorbis/libvorbis-1.2.3.bep deleted file mode 100644 index cf406657e..000000000 --- a/media-libs/libvorbis/libvorbis-1.2.3.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libvorbis" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.gz" -CHECKSUM_MD5="5aa77f55c0e0aab8eb8ed982335daac8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { - cd libvorbis-1.2.3 - libtoolize --force --copy --install - mkdir -p m4 - aclocal --install -I m4 - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libvorbis-1.2.3 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/libvorbis-1.3.1.bep b/media-libs/libvorbis/libvorbis-1.3.1.bep deleted file mode 100644 index b618fa7a6..000000000 --- a/media-libs/libvorbis/libvorbis-1.3.1.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libvorbis" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.1.tar.gz" -CHECKSUM_MD5="016e523fac70bdd786258a9d15fd36e9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkgconfig >= 0.23 - media-libs/libogg >= 1.2.0" -BUILD { - cd libvorbis-1.3.1 - libtoolize --force --copy --install - mkdir -p m4 - aclocal --install -I m4 - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd libvorbis-1.3.1 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/libvorbis-1.3.2.bep b/media-libs/libvorbis/libvorbis-1.3.2.bep deleted file mode 100644 index b2c084782..000000000 --- a/media-libs/libvorbis/libvorbis-1.3.2.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="libvorbis" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz" -CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkgconfig >= 0.23 - media-libs/libogg >= 1.2.0" -BUILD { - cd libvorbis-1.3.2 - libtoolize -fci - mkdir -p m4 - aclocal --install -I m4 - autoconf - automake - sed -i 's/-lvorbis -lm/-lvorbis/' vorbis.pc.in - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS - make -} - -INSTALL { - cd libvorbis-1.3.2 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe new file mode 100644 index 000000000..ab7e7da9f --- /dev/null +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -0,0 +1,76 @@ +SUMMARY="Ogg Vorbis audio compression format library" +DESCRIPTION="Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to 128 kbps/channel. This places Vorbis in the same competitive class as audio representations such as MPEG-4 (AAC), and similar to, but higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC. + +The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All bitstreams encoded since will remain compatible with all future releases of Vorbis." +HOMEPAGE="http://www.xiph.org/vorbis/" +LICENSE="BSD (3-clause)" +COPYRIGHT="1994-2010 Xiph.Org Foundation" +SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz" +CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libvorbis-1.3.2.patchset" + +PROVIDES=" + libvorbis$secondaryArchSuffix = $portVersion + lib:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0 + lib:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2 + lib:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libogg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config + " + +BUILD() +{ + libtoolize -fci + mkdir -p m4 + aclocal --install -I m4 + autoconf + automake + runConfigure ./configure \ + --docdir $developDocDir + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libvorbis${secondaryArchSuffix}_devel = $portVersion + devel:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0 + devel:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2 + devel:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 + " +REQUIRES_devel=" + libvorbis$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/libvorbis/patches/libvorbis-1.2.0.patch b/media-libs/libvorbis/patches/libvorbis-1.2.0.patch deleted file mode 100644 index bbec77239..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.2.0.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN libvorbis-1.2.0/aclocal.m4 libvorbis-1.2.0-haiku/aclocal.m4 ---- libvorbis-1.2.0/aclocal.m4 2007-07-25 16:46:33.000000000 +0000 -+++ libvorbis-1.2.0-haiku/aclocal.m4 2008-07-14 09:15:18.000000000 +0000 -@@ -1291,7 +1291,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -2276,7 +2276,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2492,7 +2492,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -4825,7 +4825,7 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | os2* | pw32*) -@@ -5098,7 +5098,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - diff --git a/media-libs/libvorbis/patches/libvorbis-1.2.3.patch b/media-libs/libvorbis/patches/libvorbis-1.2.3.patch deleted file mode 100644 index e3dea0b64..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.2.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libvorbis-1.2.3/configure.ac libvorbis-1.2.3-haiku/configure.ac ---- libvorbis-1.2.3/configure.ac 2009-07-09 10:02:25.000000000 +0000 -+++ libvorbis-1.2.3-haiku/configure.ac 2009-09-13 21:56:38.000000000 +0000 -@@ -185,6 +185,10 @@ - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.1.patch b/media-libs/libvorbis/patches/libvorbis-1.3.1.patch deleted file mode 100644 index ecacce794..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.3.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libvorbis-1.3.1-orig/configure.ac libvorbis-1.3.1/configure.ac ---- libvorbis-1.3.1-orig/configure.ac 2010-03-26 06:56:58.061079552 +0000 -+++ libvorbis-1.3.1/configure.ac 2010-05-12 05:56:55.536870912 +0000 -@@ -206,6 +206,10 @@ - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.2.patch b/media-libs/libvorbis/patches/libvorbis-1.3.2.patch deleted file mode 100644 index 2aa48fe68..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.3.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libvorbis-1.3.2-orig/configure.ac libvorbis-1.3.2/configure.ac ---- libvorbis-1.3.2-orig/configure.ac 2010-03-26 06:56:58.061079552 +0000 -+++ libvorbis-1.3.2/configure.ac 2010-05-12 05:56:55.536870912 +0000 -@@ -206,6 +206,10 @@ - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset new file mode 100644 index 000000000..8bac20948 --- /dev/null +++ b/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset @@ -0,0 +1,127 @@ +From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:54:49 +0200 +Subject: applying patch libvorbis-1.3.2.patch + + +diff --git a/configure.ac b/configure.ac +index 98b78ac..4b881b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,6 +206,10 @@ else + DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" + PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; ++ *-*-haiku*) ++ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" ++ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" ++ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; + *) + DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" +-- +1.7.5 + + +From c5e8052a27c7c178afbc25194eeb48b7d1394ad7 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:58:19 +0200 +Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS + + +diff --git a/configure.ac b/configure.ac +index 4b881b6..64858d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,7 @@ AC_CANONICAL_TARGET([]) + + AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) + AM_MAINTAINER_MODE +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + dnl Add parameters for aclocal + AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") +-- +1.7.5 + + +From 3e8abf19defbbef8ac44abc602112f8b5b2c4273 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:58:44 +0200 +Subject: vorbis.pc.in: remove -lm + + +diff --git a/vorbis.pc.in b/vorbis.pc.in +index 259abe7..54dca60 100644 +--- a/vorbis.pc.in ++++ b/vorbis.pc.in +@@ -10,5 +10,5 @@ Description: vorbis is the primary Ogg Vorbis library + Version: @VERSION@ + Requires: ogg + Conflicts: +-Libs: -L${libdir} -lvorbis -lm ++Libs: -L${libdir} -lvorbis + Cflags: -I${includedir} +-- +1.7.5 + + +From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 18:06:31 +0200 +Subject: doc/*/Makefile.am: remove hard-coded docdir + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 2870528..6d7851b 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -2,8 +2,6 @@ + + SUBDIRS = libvorbis vorbisfile vorbisenc + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + ### all of the static docs, commited to SVN and included as is + static_docs = \ + rfc5215.xml \ +diff --git a/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am +index 0bcc135..aea57e9 100644 +--- a/doc/libvorbis/Makefile.am ++++ b/doc/libvorbis/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis +- + doc_DATA = index.html reference.html style.css vorbis_comment.html\ + vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\ + vorbis_analysis_headerout.html vorbis_analysis_init.html \ +diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am +index bbab3c5..008586e 100644 +--- a/doc/vorbisenc/Makefile.am ++++ b/doc/vorbisenc/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc +- + doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \ + ovectl_ratemanage_arg.html overview.html reference.html style.css\ + vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \ +diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am +index fb27d44..faa6352 100644 +--- a/doc/vorbisfile/Makefile.am ++++ b/doc/vorbisfile/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile +- + doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\ + chainingexample.html crosslap.html datastructures.html decoding.html\ + example.html exampleindex.html fileinfo.html index.html\ +-- +1.7.5 + diff --git a/media-libs/libvpx/libvpx-0.9.2-git.bep b/media-libs/libvpx/libvpx-0.9.2-git.bep deleted file mode 100644 index 9eb7d31d4..000000000 --- a/media-libs/libvpx/libvpx-0.9.2-git.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libvpx - WebM VP8 Codec SDK" -HOMEPAGE="http://www.webmproject.org" -SRC_URI="git+git://review.webmproject.org/libvpx.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libvpx-0.9.2-git - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-pic \ - --enable-vp8 - make -} - -INSTALL { - cd libvpx-0.9.2-git - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="2009-2010 Google Inc., - The Mozilla Foundation and - The Xiph.Org Foundation" diff --git a/media-libs/libvpx/libvpx-1.0.0.bep b/media-libs/libvpx/libvpx-1.0.0.bep deleted file mode 100644 index ce97faebd..000000000 --- a/media-libs/libvpx/libvpx-1.0.0.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="libvpx - WebM VP8 Codec SDK" -HOMEPAGE="http://www.webmproject.org" -SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" -CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libvpx-v1.0.0 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-pic \ - --enable-vp8 - make -} - -INSTALL { - cd libvpx-v1.0.0 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="2009-2012 Google Inc., - The Mozilla Foundation and - The Xiph.Org Foundation" diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe new file mode 100644 index 000000000..796faa0ab --- /dev/null +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -0,0 +1,92 @@ +SUMMARY="WebM VP8 video codec library" +DESCRIPTION="The WebM VP8 SDK allows you to integrate your applications with the VP8 video codec, a high quality, royalty free, open source codec deployed on millions of computers and devices worldwide. + +This distribution of the WebM VP8 Codec SDK includes the following support: + * WebM VP8 Encoder + * WebM VP8 Decoder" +HOMEPAGE="http://www.webmproject.org" +LICENSE="BSD (3-clause)" +COPYRIGHT="2009-2012 Google Inc., + The Mozilla Foundation and + The Xiph.Org Foundation" +SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" +CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libvpx-1.0.0.patchset" + +PROVIDES=" + libvpx$secondaryArchSuffix = $portVersion + lib:libvpx$secondaryArchSuffix = $portVersion compat >= 1 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:vp8_scalable_patterns = $portVersion + cmd:vpxdec = $portVersion compat >= 1 + cmd:vpxenc = $portVersion compat >= 1 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " + # Note: The build system also looks for libvorbis and SDL, but that seems + # to be needed only for building the sample player, which we don't need. +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:perl + cmd:yasm + " + +SOURCE_DIR="libvpx-v1.0.0" + +BUILD() +{ + # not an auto tools configure + ./configure \ + --prefix="$prefix" \ + --libdir="$libDir" \ + --as=yasm \ + --enable-pic \ + --enable-shared \ + --enable-vp8 + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libvpx + fixPkgconfig + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libvpx${secondaryArchSuffix}_devel = $portVersion + devel:libvpx$secondaryArchSuffix = $portVersion compat >= 1 + " +REQUIRES_devel=" + libvpx$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/libvpx/patches/libvpx-0.9.2-git.patch b/media-libs/libvpx/patches/libvpx-0.9.2-git.patch deleted file mode 100644 index 29d5cd342..000000000 --- a/media-libs/libvpx/patches/libvpx-0.9.2-git.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur libvpx-0.9.2-git/build/make/configure.sh libvpx-0.9.2-git-haiku/build/make/configure.sh ---- libvpx-0.9.2-git/build/make/configure.sh 2010-10-01 11:22:21.319815680 +0000 -+++ libvpx-0.9.2-git-haiku/build/make/configure.sh 2010-10-01 11:30:22.888406016 +0000 -@@ -905,8 +908,14 @@ - # Almost every platform uses pthreads. - if enabled multithread; then - case ${toolchain} in -- *-win*);; -- *) check_header pthread.h && add_extralibs -lpthread -+ *-win*) -+ ;; -+ *linux*|*bsd*) -+ check_header pthread.h && add_extralibs -lpthread -+ ;; -+ *-haiku*) -+ check_header pthread.h -+ ;; - esac - fi - -diff -Naur libvpx-0.9.2-git/examples.mk libvpx-0.9.2-git-haiku/examples.mk ---- libvpx-0.9.2-git/examples.mk 2010-10-01 11:22:21.332398592 +0000 -+++ libvpx-0.9.2-git-haiku/examples.mk 2010-10-01 11:19:40.000000000 +0000 -@@ -72,7 +72,9 @@ - - - # Handle extra library flags depending on codec configuration -+ifeq ($(TOOLCHAIN),Unix) - CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+endif - - # - # End of specified files. The rest of the build rules should happen -diff -Naur libvpx-0.9.2-git/libs.mk libvpx-0.9.2-git-haiku/libs.mk ---- libvpx-0.9.2-git/libs.mk 2010-10-01 11:22:21.525074432 +0000 -+++ libvpx-0.9.2-git-haiku/libs.mk 2010-10-01 11:13:12.000000000 +0000 -@@ -182,6 +182,9 @@ - LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO) - $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver - $(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm -pthread -+ifeq ($(TOOLCHAIN),Haiku) -+ extralibs += -+endif - $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR) - $(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver - LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \ diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patchset b/media-libs/libvpx/patches/libvpx-1.0.0.patchset new file mode 100644 index 000000000..eba3dc397 --- /dev/null +++ b/media-libs/libvpx/patches/libvpx-1.0.0.patchset @@ -0,0 +1,132 @@ +From 0c31cfc2c7429f81129c3403d9bc03bd245db71c Mon Sep 17 00:00:00 2001 +From: korli +Date: Wed, 14 Mar 2012 00:15:38 +0000 +Subject: patch for 1.0.0 + + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index cbf000b..4222e52 100755 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -579,6 +579,9 @@ process_common_toolchain() { + *solaris2.10) + tgt_os=solaris + ;; ++ *haiku*) ++ tgt_os=haiku ++ ;; + esac + + if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then +@@ -909,8 +912,8 @@ process_common_toolchain() { + esac + ;; + gcc*) +- add_cflags -m${bits} +- add_ldflags -m${bits} ++ enabled haiku || add_cflags -m${bits} ++ enabled haiku || add_ldflags -m${bits} + link_with_cc=gcc + tune_cflags="-march=" + setup_gnu_toolchain +@@ -939,7 +942,7 @@ process_common_toolchain() { + add_asflags -f x64 + enabled debug && add_asflags -g cv8 + ;; +- linux*|solaris*) ++ linux*|solaris*|haiku*) + add_asflags -f elf${bits} + enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 + enabled debug && [ "${AS}" = nasm ] && add_asflags -g +@@ -1019,6 +1022,7 @@ EOF + case ${toolchain} in + *-win*);; + *-android-gcc);; ++ *-haiku*);; + *) check_header pthread.h && add_extralibs -lpthread + esac + fi +diff --git a/configure b/configure +index 6195b2d..eb8a359 100755 +--- a/configure ++++ b/configure +@@ -107,6 +107,7 @@ all_platforms="${all_platforms} x86-darwin8-icc" + all_platforms="${all_platforms} x86-darwin9-gcc" + all_platforms="${all_platforms} x86-darwin9-icc" + all_platforms="${all_platforms} x86-darwin10-gcc" ++all_platforms="${all_platforms} x86-haiku-gcc" + all_platforms="${all_platforms} x86-linux-gcc" + all_platforms="${all_platforms} x86-linux-icc" + all_platforms="${all_platforms} x86-solaris-gcc" +diff --git a/examples.mk b/examples.mk +index f6c9045..ab9657f 100644 +--- a/examples.mk ++++ b/examples.mk +@@ -113,7 +113,9 @@ vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding + # We should not link to math library (libm) on RVCT + # when building for bare-metal targets + ifeq ($(CONFIG_OS_SUPPORT), yes) +-CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m ++ ifneq ($(TOOLCHAIN),x86-haiku-gcc) ++ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m ++ endif + else + ifeq ($(CONFIG_GCC), yes) + CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m +-- +1.7.5 + + +From dd76984687465e457d9e3dcd0b4bdc4bd46225dd Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 21:09:11 +0200 +Subject: configure: enable shared library building for Haiku + + +diff --git a/configure b/configure +index eb8a359..a2ef98d 100755 +--- a/configure ++++ b/configure +@@ -438,7 +438,7 @@ process_detect() { + # Can only build shared libs on a subset of platforms. Doing this check + # here rather than at option parse time because the target auto-detect + # magic happens after the command line has been parsed. +- enabled linux || die "--enable-shared only supported on ELF for now" ++ enabled linux || enabled haiku || die "--enable-shared only supported on ELF for now" + fi + if [ -z "$CC" ]; then + echo "Bypassing toolchain for environment detection." +-- +1.7.5 + + +From 87b2816834bb2bbfc1e13765084a0c21eb46cf13 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 21:09:28 +0200 +Subject: libs.mk: no -lm or -lpthread on Haiku + + +diff --git a/libs.mk b/libs.mk +index 79a1d00..d88cfa7 100644 +--- a/libs.mk ++++ b/libs.mk +@@ -196,7 +196,6 @@ LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION + LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\ + $(notdir $(LIBVPX_SO_SYMLINKS)) + $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver +-$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm + $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR) + $(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver + LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \ +@@ -398,7 +397,7 @@ $(foreach bin,$(LIBVPX_TEST_BINS),\ + $(if $(BUILD_LIBVPX),$(eval $(bin): libvpx.a libgtest.a ))\ + $(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\ + $(bin).cc.o \ +- -L. -lvpx -lgtest -lpthread -lm)\ ++ -L. -lvpx -lgtest)\ + )))\ + $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\ + +-- +1.7.5 + diff --git a/media-libs/libwebm/libwebm-0.9.2-git.bep b/media-libs/libwebm/libwebm-0.9.2_git.recipe similarity index 95% rename from media-libs/libwebm/libwebm-0.9.2-git.bep rename to media-libs/libwebm/libwebm-0.9.2_git.recipe index 3688b9542..109c6e7d5 100644 --- a/media-libs/libwebm/libwebm-0.9.2-git.bep +++ b/media-libs/libwebm/libwebm-0.9.2_git.recipe @@ -4,12 +4,14 @@ SRC_URI="git+git://review.webmproject.org/libwebm.git" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libwebm-0.9.2-git make } -INSTALL { +INSTALL() +{ cd libwebm-0.9.2-git LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` echo "cp libmkvparser.a " ${LIBDIR} diff --git a/media-libs/libwebp/libwebp-0.1.2-git.bep b/media-libs/libwebp/libwebp-0.1.2_git.recipe similarity index 95% rename from media-libs/libwebp/libwebp-0.1.2-git.bep rename to media-libs/libwebp/libwebp-0.1.2_git.recipe index 7ee89fb3a..86b78e0c9 100644 --- a/media-libs/libwebp/libwebp-0.1.2-git.bep +++ b/media-libs/libwebp/libwebp-0.1.2_git.recipe @@ -4,7 +4,8 @@ SRC_URI="git+git://review.webmproject.org/libwebp.git" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libwebp-0.1.2-git ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libwebp-0.1.2-git make install } diff --git a/media-libs/libwebp/libwebp-0.1.3.bep b/media-libs/libwebp/libwebp-0.1.3.recipe similarity index 95% rename from media-libs/libwebp/libwebp-0.1.3.bep rename to media-libs/libwebp/libwebp-0.1.3.recipe index 061e805d0..44b614dd6 100644 --- a/media-libs/libwebp/libwebp-0.1.3.bep +++ b/media-libs/libwebp/libwebp-0.1.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="254d4670e14e9ed881f0536b006ab336" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libwebp-0.1.3 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libwebp-0.1.3 make install } diff --git a/media-libs/loadpng/loadpng-1.5.bep b/media-libs/loadpng/loadpng-1.5.recipe similarity index 97% rename from media-libs/loadpng/loadpng-1.5.bep rename to media-libs/loadpng/loadpng-1.5.recipe index b5245c3b9..005b91d34 100644 --- a/media-libs/loadpng/loadpng-1.5.bep +++ b/media-libs/loadpng/loadpng-1.5.recipe @@ -7,12 +7,14 @@ DEPEND="media-libs/allegro >= 4.4 media-libs/libpng >=1.2" MESSAGE="This might not build with libpng >= 1.4" CHECKSUM_MD5="5e9ecdf1762c3fca47477bf0263b96ba" -BUILD { +BUILD() +{ cd loadpng-1.5 make } -INSTALL { +INSTALL() +{ cd loadpng-1.5 if [ -n ${DESTDIR} ];then mkdir -p ${DESTDIR}/boot/common/lib diff --git a/media-libs/lv2/lv2-1.2.0.bep b/media-libs/lv2/lv2-1.2.0.recipe similarity index 97% rename from media-libs/lv2/lv2-1.2.0.bep rename to media-libs/lv2/lv2-1.2.0.recipe index d422249be..840e2ae60 100644 --- a/media-libs/lv2/lv2-1.2.0.bep +++ b/media-libs/lv2/lv2-1.2.0.recipe @@ -10,7 +10,8 @@ DEPEND="app-doc/doxygen>=1.6.1 media-libs/libsndfile>=1.0.21 dev-python/rdflib>=3.2.0 dev-python/pyxml>=0.8.4" -BUILD { +BUILD() +{ cd lv2-1.2.0 sed -e '1,2s:/usr/bin/env:/bin/env:g' waf > waf2 cp waf2 waf @@ -21,7 +22,8 @@ BUILD { ./waf build } -INSTALL { +INSTALL() +{ cd lv2-1.2.0 ./waf install } diff --git a/media-libs/mediainfo/mediainfo-0.7.61.bep b/media-libs/mediainfo/mediainfo-0.7.61.recipe similarity index 97% rename from media-libs/mediainfo/mediainfo-0.7.61.bep rename to media-libs/mediainfo/mediainfo-0.7.61.recipe index ba77d79b4..5c0ddf1c4 100644 --- a/media-libs/mediainfo/mediainfo-0.7.61.bep +++ b/media-libs/mediainfo/mediainfo-0.7.61.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd MediaInfo_CLI_GNU_FromSource cp `finddir B_COMMON_DATA_DIRECTORY`/libtool/config/config.* ZenLib/Project/GNU/Library @@ -16,7 +17,8 @@ BUILD { ./CLI_Compile.sh } -INSTALL { +INSTALL() +{ cd MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI make install prefix=`finddir B_COMMON_DIRECTORY` } diff --git a/media-libs/musicbrainz/musicbrainz-5.0.1.bep b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe similarity index 95% rename from media-libs/musicbrainz/musicbrainz-5.0.1.bep rename to media-libs/musicbrainz/musicbrainz-5.0.1.recipe index 3f00634d5..b8a85c876 100644 --- a/media-libs/musicbrainz/musicbrainz-5.0.1.bep +++ b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe @@ -7,18 +7,21 @@ DEPEND="" CHECKSUM_MD5="a0406b94c341c2b52ec0fe98f57cadf3" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd libmusicbrainz-5.0.1 cmake . make } -INSTALL { +INSTALL() +{ cd libmusicbrainz-5.0.1 make install } -TEST { +TEST() +{ cd libmusicbrainz-5.0.1 make test } diff --git a/media-libs/openal/openal-1.12-git.bep b/media-libs/openal/openal-1.12-git.bep deleted file mode 100644 index 1e2fd7b74..000000000 --- a/media-libs/openal/openal-1.12-git.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="OpenAL - A software implementation of the OpenAL 3D audio API" -HOMEPAGE="http://kcat.strangesoft.net/openal.html" -SRC_URI="git+git://repo.or.cz/openal-soft.git" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" - -BUILD { - cd openal-1.12-git - cmake . - make -} - -INSTALL { - cd openal-1.12-git - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2000 Loki Software - 2005-2010 OpenAL Soft team" - diff --git a/media-libs/openal/openal-1.12.854.bep b/media-libs/openal/openal-1.12.854.recipe similarity index 95% rename from media-libs/openal/openal-1.12.854.bep rename to media-libs/openal/openal-1.12.854.recipe index 939c448f4..7d0674383 100644 --- a/media-libs/openal/openal-1.12.854.bep +++ b/media-libs/openal/openal-1.12.854.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" -BUILD { +BUILD() +{ cd openal-soft-1.12.854 cmake . make } -INSTALL { +INSTALL() +{ cd openal-soft-1.12.854 make install } diff --git a/media-libs/openal/openal-1.13.bep b/media-libs/openal/openal-1.13.recipe similarity index 95% rename from media-libs/openal/openal-1.13.bep rename to media-libs/openal/openal-1.13.recipe index 466527faa..b5633603d 100644 --- a/media-libs/openal/openal-1.13.bep +++ b/media-libs/openal/openal-1.13.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" -BUILD { +BUILD() +{ cd openal-soft-1.13 cmake . make } -INSTALL { +INSTALL() +{ cd openal-soft-1.13 make install } diff --git a/media-libs/openjpeg/openjpeg-1.5.0.bep b/media-libs/openjpeg/openjpeg-1.5.0.recipe similarity index 97% rename from media-libs/openjpeg/openjpeg-1.5.0.bep rename to media-libs/openjpeg/openjpeg-1.5.0.recipe index 63604c945..6f6b1f48f 100644 --- a/media-libs/openjpeg/openjpeg-1.5.0.bep +++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e5d66193ddfa59a87da1eb08ea86293b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd openjpeg-1.5.0 ./bootstrap.sh COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openjpeg-1.5.0 make install } diff --git a/media-libs/plib/plib-1.8.5.bep b/media-libs/plib/plib-1.8.5.recipe similarity index 95% rename from media-libs/plib/plib-1.8.5.bep rename to media-libs/plib/plib-1.8.5.recipe index 460ce966e..c95d99ace 100644 --- a/media-libs/plib/plib-1.8.5.bep +++ b/media-libs/plib/plib-1.8.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd plib-1.8.5 libtoolize --force --copy --install ./autogen.sh @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd plib-1.8.5 make install } diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe new file mode 100644 index 000000000..675e2d86a --- /dev/null +++ b/media-libs/portaudio/portaudio-19.recipe @@ -0,0 +1,71 @@ +DESCRIPTION="Port Audio is a free, cross-platform, audio I/O library" +SUMMARY="Port Audio is a free, cross-platform, audio I/O library" +HOMEPAGE="http://portaudio.com" +SRC_URI="http://portaudio.com/archives/pa_stable_v19_20111121.tgz" +CHECKSUM_MD5="25c85c1cc5e9e657486cbc299c6c035a" +LICENSE="MIT" +COPYRIGHT="1999-2011 Ross Bencina and Phil Burk" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + portaudio$secondaryArchSuffix = $portVersion + lib:libportaudio$secondaryArchSuffix = 19 + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + " + +BUILD_REQUIRES=" + cmd:gcc + cmd:cmake + cmd:make + " + +SOURCE_DIR="portaudio" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $libDir + cp bin/Win32/libportaudio.so $libDir + mkdir -p $developDir/lib + #cp bin/Win32/libportaudio.so $developDir/lib/ + cp bin/Win32/libportaudio_static.a $developDir/lib/ + mkdir -p $includeDir + cp include/* $includeDir + + prepareInstalledDevelLibs \ + libportaudio + + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:libportaudio = 19 + devel:libportaudio_static = 19 + " + +REQUIRES_devel=" + libportaudio == $portVersion base + " diff --git a/media-libs/schroedinger/schroedinger-1.0.11.bep b/media-libs/schroedinger/schroedinger-1.0.11.recipe similarity index 96% rename from media-libs/schroedinger/schroedinger-1.0.11.bep rename to media-libs/schroedinger/schroedinger-1.0.11.recipe index 94cee4162..31bdc5fbb 100644 --- a/media-libs/schroedinger/schroedinger-1.0.11.bep +++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-util/pkg-config >= 0.23 dev-lang/orc >= 0.4.16" CHECKSUM_MD5="da6af08e564ca1157348fb8d92efc891" -BUILD { +BUILD() +{ cd schroedinger-1.0.11 autoconf COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd schroedinger-1.0.11 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.12.bep b/media-libs/sdl-image/sdl-image-1.2.12.bep deleted file mode 100644 index 8641128f6..000000000 --- a/media-libs/sdl-image/sdl-image-1.2.12.bep +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_image" -SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz" -CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.14 - media-libs/jpeg >= 8b - media-libs/libpng >= 1.2.46 - media-libs/tiff >= 3.8.2 - media-libs/giflib >= 4.1.6 - media-libs/libwebp >= 0.1.3" -BUILD { - cd SDL_image-1.2.12 - libtoolize --force --copy --install - aclocal --install -I acinclude - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-bmp --enable-lbm --enable-pcx \ - --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ - --enable-gif --enable-jpg --disable-jpg-shared \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd SDL_image-1.2.12 - make install -} - -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-image/sdl-image.OptionalPackageDescription b/media-libs/sdl-image/sdl-image.OptionalPackageDescription deleted file mode 100644 index c0af9ed47..000000000 --- a/media-libs/sdl-image/sdl-image.OptionalPackageDescription +++ /dev/null @@ -1,5 +0,0 @@ -Package: sdl-image -Version: 1.2.10 -Copyright: 1997-2009 Sam Lantinga and Mattias Engdegård -License: GNU LGPL v2.1 -URL: http://www.libsdl.org/projects/SDL_image/ diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep deleted file mode 100644 index a884056b7..000000000 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="Simple Direct Layer Mixer Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" -SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz" -CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="libsdl >= 1.2.14 - media-libs/flac >= 1.2.1 - media-libs/libmad >= 0.15.1 - media-libs/libvorbis >= 1.3.1 - media-libs/libmikmod >= 3.1.11 - media-libs/libogg >= 1.2.0 - media-libs/smpeg >= 0.4.5" - -BUILD { - cd SDL_mixer-1.2.12 - libtoolize --force --copy --install - aclocal --install -I acinclude - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-music-midi - make -} - -INSTALL { - cd SDL_mixer-1.2.12 - make install -} -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-net/sdl-net-1.2.8.bep b/media-libs/sdl-net/sdl-net-1.2.8.bep deleted file mode 100644 index 7a5dfd4a8..000000000 --- a/media-libs/sdl-net/sdl-net-1.2.8.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer Net Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_net" -SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" -CHECKSUM_MD5="20e64e61d65662db66c379034f11f718" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd SDL_net-1.2.8 - aclocal --force --install -I acinclude - libtoolize -fci - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd SDL_net-1.2.8 - make install -} - -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.bep deleted file mode 100644 index 6432c7014..000000000 --- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="sdl-sound" -HOMEPAGE="http://www.icculus.org/SDL_sound" -SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.1.4" -BUILD { - cd sdl-sound-1.0.3 - libtoolize --copy --force --install - ./bootstrap - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd sdl-sound-1.0.3 - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2009 Ryan C. Gordon" diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep deleted file mode 100644 index 28f407403..000000000 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" -SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" -CHECKSUM_MD5="61e29bd9da8d245bc2471d1b2ce591aa" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.12 - dev-util/pkgconfig >= 0.9" -BUILD { - cd SDL_ttf-2.0.11 - rm -f acinclude.m4 - libtoolize --copy --force --install - aclocal --install -I acinclude - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd SDL_ttf-2.0.11 - make install -} - -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" - diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe new file mode 100644 index 000000000..a8ded08ac --- /dev/null +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe @@ -0,0 +1,47 @@ +SUMMARY="Simple Direct Media Layer Image Library" +DESCRIPTION="SDL" +HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" +SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz" +CHECKSUM_MD5="79787216b56cb4707f39d538f2225e00" +REVISION="1" +LICENSE="Zlib" +COPYRIGHT="1997-2013 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lib:SDL2_ttf + " + +REQUIRES=" + lib:libsdl2 + " + +BUILD_REQUIRES=" + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc + " + +BUILD_PREREQUIRES=" + " + +SOURCE_DIR="SDL2_ttf-$portVersion" + +BUILD() +{ +# rm -f acinclude.m4 +# libtoolize --copy --force --install +# aclocal --install -I acinclude +# echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" +# ./autogen.sh + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} diff --git a/media-libs/sdl-gfx/patches/sdl-gfx-2.0.20.patch b/media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch similarity index 100% rename from media-libs/sdl-gfx/patches/sdl-gfx-2.0.20.patch rename to media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep b/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe similarity index 97% rename from media-libs/sdl-gfx/sdl-gfx-2.0.20.bep rename to media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe index f32b9e0ef..e7c5561df 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8a787e538a8e4d80d4927535be5af083" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.14" -BUILD { +BUILD() +{ cd SDL_gfx-2.0.20 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_gfx-2.0.20 make install } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.22.bep b/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe similarity index 97% rename from media-libs/sdl-gfx/sdl-gfx-2.0.22.bep rename to media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe index 57cf26491..a2401bf20 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.22.bep +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="330f291f1f09a1bdf397c9b40d92ca41" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.14" -BUILD { +BUILD() +{ cd SDL_gfx-2.0.22 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_gfx-2.0.22 make install } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep b/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe similarity index 97% rename from media-libs/sdl-gfx/sdl-gfx-2.0.23.bep rename to media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe index 44752b346..c5cc83e8b 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fcc3c4f2d1b4943409bf7e67dd65d03a" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.14" -BUILD { +BUILD() +{ cd SDL_gfx-2.0.23 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_gfx-2.0.23 make install } diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe new file mode 100644 index 000000000..a8eefad7c --- /dev/null +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe @@ -0,0 +1,84 @@ +SUMMARY="SDL_gfx - SDL graphics drawing primitives and other support functions" +DESCRIPTION="The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing routines such as lines, circles or polygons and SDL_rotozoom which implemented a interpolating rotozoomer for SDL_surfaces." +HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" +SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.24.tar.gz" +CHECKSUM_MD5="838514185ff9a3b6377760aaa52fef8a" +LICENSE="Zlib" +COPYRIGHT="1999-2012 A. Schiffler" + +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_gfx = $portVersion compat >= 2 + lib:libSDL_gfx = 14.9.1 compat >= 14 + " + +REQUIRES=" + haiku + libsdl + " + +BUILD_REQUIRES=" + devel:libsdl + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + " + +SOURCE_DIR="SDL_gfx-$portVersion" + +#BUILD_PACKAGE_ACTIVATION_PHASE = "TEST" + +BUILD() +{ + ./autogen.sh + libtoolize --force --copy --install + aclocal --force --install -I acinclude + autoconf + automake + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libSDL_gfx + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_gfx = 14.9.1 compat >= 0 + devel:libSDL_gfx = 14.9.1 compat >= 0 + devel:libSDL_gfx = $portVersion compat >= 2.0 + devel:sdl_gfx = 14.9.1 compat >= 0 + " + +REQUIRES_devel=" + sdl_gfx == $portVersion base + " + + +TEST() +{ + cd Test + runConfigure ./configure +# fails to configure due to missing sdl_gfx + make + ls +} diff --git a/media-libs/sdl-image/sdl-image-1.2.10.bep b/media-libs/sdl_image/sdl_image-1.2.10.recipe similarity index 97% rename from media-libs/sdl-image/sdl-image-1.2.10.bep rename to media-libs/sdl_image/sdl_image-1.2.10.recipe index 49613d96e..c298649cc 100644 --- a/media-libs/sdl-image/sdl-image-1.2.10.bep +++ b/media-libs/sdl_image/sdl_image-1.2.10.recipe @@ -8,7 +8,8 @@ DEPEND="media-libs/jpeg >= 8b media-libs/libpng >= 1.2.44 < 1.4.0 media-libs/tiff >= 3.8.2 media-libs/giflib >= 4.1.6" -BUILD { +BUILD() +{ cd SDL_image-1.2.10 libtoolize --force --copy --install aclocal --install -I acinclude @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.10 make install } diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe new file mode 100644 index 000000000..8ebbdc8a9 --- /dev/null +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -0,0 +1,81 @@ +SUMMARY="Simple Direct Media Layer Image Library" +DESCRIPTION="Simple Direct Media Layer Image Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_image" +SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz" +CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb" +REVISION="2" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_image =$portVersion + lib:libSDL_image_1.2 = $portVersion compat >= 1.2 + devel:libSDL_image = $portVersion compat >= 1.2 + " + +REQUIRES=" + haiku + libsdl + lib:libjpeg + " + +BUILD_REQUIRES=" + devel:libsdl + lib:libjpeg + lib:libpng + lib:libtiff +# lib:giflib +# lib:libwebp + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + devel:libpng + devel:libjpeg +# devel:libtiff +# devel:libwebp + " + +SOURCE_DIR="SDL_image-1.2.12" + +BUILD() +{ + libtoolize --force --copy --install + aclocal --install -I acinclude + ./autogen.sh + runConfigure ./configure \ + --enable-bmp --enable-lbm --enable-pcx \ + --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ + --enable-gif --enable-jpg --disable-jpg-shared + make +} + +INSTALL() +{ + make install + + fixPkgconfig + prepareInstalledDevelLib libSDL_image + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_image = 0.8.4 compat >= 0 + devel:libSDL_image = 0.8.4 compat >= 0 + " + +REQUIRES_devel=" + sdl_image == $portVersion base + " diff --git a/media-libs/sdl-image/sdl-image-1.2.6.bep b/media-libs/sdl_image/sdl_image-1.2.6.recipe similarity index 96% rename from media-libs/sdl-image/sdl-image-1.2.6.bep rename to media-libs/sdl_image/sdl_image-1.2.6.recipe index d52989c78..3e79c65b7 100644 --- a/media-libs/sdl-image/sdl-image-1.2.6.bep +++ b/media-libs/sdl_image/sdl_image-1.2.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b866dc4f647517bdaf57f6ffdefd013e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sdl-image-1.2.6 cat acinclude/libtool.m4 >> aclocal.m4 cat acinclude/sdl.m4 >> aclocal.m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-image-1.2.6 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.8.bep b/media-libs/sdl_image/sdl_image-1.2.8.recipe similarity index 95% rename from media-libs/sdl-image/sdl-image-1.2.8.bep rename to media-libs/sdl_image/sdl_image-1.2.8.recipe index 3f0fd1054..d9f80df59 100644 --- a/media-libs/sdl-image/sdl-image-1.2.8.bep +++ b/media-libs/sdl_image/sdl_image-1.2.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2e7c3efa0ec2acc039c46960e27c0792" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_image-1.2.8 libtoolize --force --copy --install aclocal --install -I acinclude @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.8 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.9.bep b/media-libs/sdl_image/sdl_image-1.2.9.recipe similarity index 95% rename from media-libs/sdl-image/sdl-image-1.2.9.bep rename to media-libs/sdl_image/sdl_image-1.2.9.recipe index 3318cb3db..eb781ba26 100644 --- a/media-libs/sdl-image/sdl-image-1.2.9.bep +++ b/media-libs/sdl_image/sdl_image-1.2.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="793eb3e7bbbf396f83fc6cd031842aa3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_image-1.2.9 libtoolize --force --copy --install aclocal --install -I acinclude @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.9 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2-hg.bep b/media-libs/sdl_image/sdl_image-1.2_hg.recipe similarity index 97% rename from media-libs/sdl-image/sdl-image-1.2-hg.bep rename to media-libs/sdl_image/sdl_image-1.2_hg.recipe index 5ab8e0d40..370b1e1d9 100644 --- a/media-libs/sdl-image/sdl-image-1.2-hg.bep +++ b/media-libs/sdl_image/sdl_image-1.2_hg.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/libsdl >= 1.2.14 media-libs/tiff >= 3.8.2 media-libs/giflib >= 4.1.6 media-libs/libwebp >= 0.1.3" -BUILD { +BUILD() +{ cd sdl-image-1.2-hg libtoolize --force --copy --install aclocal --install -I acinclude @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-image-1.2-hg make install } diff --git a/media-libs/sdl-libpak/sdl-libpak.OptionalPackageDescription b/media-libs/sdl_libpak/sdl-libpak.OptionalPackageDescription similarity index 100% rename from media-libs/sdl-libpak/sdl-libpak.OptionalPackageDescription rename to media-libs/sdl_libpak/sdl-libpak.OptionalPackageDescription diff --git a/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch similarity index 100% rename from media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch rename to media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep b/media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe similarity index 96% rename from media-libs/sdl-mixer/sdl-mixer-1.2.10.bep rename to media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe index 930a94ac7..e9d30d1d9 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a357558552436b0b5ea0333b3e2327df" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.10 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.10 make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep b/media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe similarity index 97% rename from media-libs/sdl-mixer/sdl-mixer-1.2.11.bep rename to media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe index 964492470..f4a205f2f 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe @@ -11,7 +11,8 @@ DEPEND="libsdl >= 1.2.14 media-libs/libmikmod >= 3.1.11 media-libs/libogg >= 1.2.0 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.11 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.11 make install } diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe new file mode 100644 index 000000000..19e265b7a --- /dev/null +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -0,0 +1,80 @@ +SUMMARY="sdl_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." +DESCRIPTION="Simple Direct Layer Mixer Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" +SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz" +CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_net =$portVersion + lib:libSDL_mixer_1.2 = $portVersion compat >= 1.2 + devel:libSDL_mixer = $portVersion compat >= 1.2 + " + +REQUIRES=" + haiku + libsdl + flac + libmad + libvorbis + libogg +# libmikmod +# smpeg + " + +BUILD_REQUIRES=" + devel:libsdl + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + devel:libogg + devel:flac + devel:libmad + devel:libvorbis + devel:libogg +# devel:libmikmod +# devel:smpeg + " + +SOURCE_DIR="SDL_mixer-$portVersion" +BUILD() +{ + libtoolize --force --copy --install + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libSDL_mixer + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_mixer = 0.0.0 compat >= 0 + devel:libSDL_mixer = 0.0.0 compat >= 0 + " + +REQUIRES_devel=" + sdl_mixer == $portVersion base + " diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep b/media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe similarity index 96% rename from media-libs/sdl-mixer/sdl-mixer-1.2.9.bep rename to media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe index c9bf5b91b..b1e9c4e91 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="09eb4585f46d3527fe7fce8af8f9e591" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.9 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.9 make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep b/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe similarity index 97% rename from media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep rename to media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe index c25d1478c..670953ed7 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep +++ b/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe @@ -12,7 +12,8 @@ DEPEND="libsdl >= 1.2.14 media-libs/libogg >= 1.2.0 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd sdl-mixer-1.2-hg MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-mixer-1.2-hg make install } diff --git a/media-libs/sdl-net/patches/sdl-net-1.2.7.patch b/media-libs/sdl_net/patches/sdl_net-1.2.7.patch similarity index 100% rename from media-libs/sdl-net/patches/sdl-net-1.2.7.patch rename to media-libs/sdl_net/patches/sdl_net-1.2.7.patch diff --git a/media-libs/sdl_net/patches/sdl_net-1.2.8.patch b/media-libs/sdl_net/patches/sdl_net-1.2.8.patch new file mode 100644 index 000000000..d51642a8e --- /dev/null +++ b/media-libs/sdl_net/patches/sdl_net-1.2.8.patch @@ -0,0 +1,13 @@ +diff -urN SDL_net-1.2.8/chat.cpp SDL_net-1.2.8-haiku/chat.cpp +--- SDL_net-1.2.8/chat.cpp 2012-01-15 16:20:10.063963136 +0000 ++++ SDL_net-1.2.8-haiku/chat.cpp 2012-02-29 23:58:48.552861696 +0000 +@@ -18,9 +18,6 @@ + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ +- Pleasanton, CA 94588 (USA) +- slouken@devolution.com +-*/ + + /* Note that this isn't necessarily the way to run a chat system. + This is designed to excercise the network code more than be really diff --git a/media-libs/sdl-net/sdl-net-1.2.7.bep b/media-libs/sdl_net/sdl_net-1.2.7.recipe similarity index 96% rename from media-libs/sdl-net/sdl-net-1.2.7.bep rename to media-libs/sdl_net/sdl_net-1.2.7.recipe index fbc4fe049..3ba48eb2b 100644 --- a/media-libs/sdl-net/sdl-net-1.2.7.bep +++ b/media-libs/sdl_net/sdl_net-1.2.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6bd4662d1423810f3140d4da21b6d912" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_net-1.2.7 aclocal --force --install -I acinclude libtoolize -fci @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_net-1.2.7 make install } diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe new file mode 100644 index 000000000..82459fe0d --- /dev/null +++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe @@ -0,0 +1,67 @@ +SUMMARY="Simple Direct Media Layer Net Library" +DESCRIPTION="This is a small simple cross-platform networking library for SDL" +HOMEPAGE="http://www.libsdl.org/projects/SDL_net" +SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" +CHECKSUM_MD5="20e64e61d65662db66c379034f11f718" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_net =$portVersion + lib:libSDL_net_1.2 = $portVersion compat >= 1.2 + devel:libSDL_net = $portVersion compat >= 1.2 + " + +REQUIRES=" + haiku + libsdl + " + +BUILD_REQUIRES=" + devel:libsdl + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + " + +SOURCE_DIR="SDL_net-$portVersion" +BUILD() +{ + libtoolize --force --copy --install + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + + prepareInstalledDevelLib libSDL_net + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_net = 0.8.0 compat >= 0 + devel:libSDL_net = 0.8.0 compat >= 0 + " + +REQUIRES_devel=" + sdl_net == $portVersion base + " diff --git a/media-libs/sdl-net/sdl-net-1.2-hg.bep b/media-libs/sdl_net/sdl_net-1.2_hg.recipe similarity index 96% rename from media-libs/sdl-net/sdl-net-1.2-hg.bep rename to media-libs/sdl_net/sdl_net-1.2_hg.recipe index 30f868251..bbea0675b 100644 --- a/media-libs/sdl-net/sdl-net-1.2-hg.bep +++ b/media-libs/sdl_net/sdl_net-1.2_hg.recipe @@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL_net" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sdl-net-1.2-hg aclocal --force --install -I acinclude libtoolize -fci @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-net-1.2-hg make install } diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe similarity index 97% rename from media-libs/sdl-rtf/sdl-rtf-0.1.0.bep rename to media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe index 9b81a0285..ce2f2658e 100644 --- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep +++ b/media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fe36733167b5c89f128414f32612121a" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/sdl-ttf >= 2.0.9" -BUILD { +BUILD() +{ cd SDL_rtf-0.1.0 rm aclocal.m4 rm acinclude.m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_rtf-0.1.0 make install } diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe new file mode 100644 index 000000000..76e780272 --- /dev/null +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -0,0 +1,73 @@ +SUMMARY="Library that handles decoding of several popular sound file formats." +DESCRIPTION="sdl-sound is a library that handles the decoding of several popular file formats, such as .WAV and .MP3. It is meant to make the programmer's sound playback tasks simpler." +HOMEPAGE="http://www.icculus.org/SDL_sound" +SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2001-2009 Ryan C. Gordon" +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_sound =$portVersion + cmd:playsound = $portVersion compat >= 2 + cmd:playsound_simple = $portVersion compat >= 2 + lib:libSDL_sound_1.0 = $portVersion compat >= 1.0 + " + +REQUIRES=" + haiku + libsdl + " + +BUILD_REQUIRES=" + devel:libsdl + devel:libogg + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + " + +SOURCE_DIR="SDL_sound-$portVersion" + +BUILD() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + libtoolize --force --copy --install + ./bootstrap + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libSDL_sound + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_sound = 0.8.0 compat >= 0 + devel:libSDL_sound = 0.8.0 compat >= 0 +# devel:libSDL_sound = $portVersion compat >= 1.0 + devel:sdl_sound = 0.0.0 compat >= 0 + " + +REQUIRES_devel=" + sdl_sound == $portVersion base + " diff --git a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep b/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe similarity index 96% rename from media-libs/sdl-sound/sdl-sound-1.0-hg.bep rename to media-libs/sdl_sound/sdl_sound-1.0_hg.recipe index 275fb2fca..86fe30fca 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep +++ b/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd sdl-sound-1.0-hg libtoolize --copy --force --install ./bootstrap @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-sound-1.0-hg make install } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe similarity index 97% rename from media-libs/sdl-ttf/sdl-ttf-2.0.10.bep rename to media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe index 15cd7c98e..7fd96a9d8 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.12 dev-util/pkgconfig >= 0.9" -BUILD { +BUILD() +{ cd SDL_ttf-2.0.10 rm -f acinclude.m4 libtoolize --copy --force --install @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_ttf-2.0.10 make install } diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe new file mode 100644 index 000000000..bad25b15d --- /dev/null +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -0,0 +1,76 @@ +DESCRIPTION=" + SDL_ttf is a TrueType font rendering library that is used with the SDL + library, and almost as portable. It depends on freetype2 to handle the + TrueType font data. It allows a programmer to use multiple TrueType fonts + without having to code a font rendering routine themselves. With the power + of outline fonts and antialiasing, high quality text output can be obtained + without much effort. + " +SUMMARY="Simple Direct Media Layer Image Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html" +SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" +CHECKSUM_MD5="61e29bd9da8d245bc2471d1b2ce591aa" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" + +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_ttf = $portVersion + lib:libSDL_ttf = $portVersion + devel:libSDL_ttf + lib:libSDL_ttf_2.0 = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + libsdl >= 1.2.12 + lib:libfreetype + lib:libz + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:libtoolize + cmd:aclocal + cmd:automake + cmd:autoconf + cmd:gcc + cmd:sdl_config + cmd:make + cmd:freetype_config + devel:libz + " + +SOURCE_DIR="SDL_ttf-$portVersion" +BUILD() +{ + libtoolize --copy --force --install + aclocal --install -I acinclude + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libSDL_ttf + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_ttf = 0.10.1 compat >= 0 + devel:libSDL_ttf = 0.10.1 compat >= 0 + " + +REQUIRES_devel=" + sdl_ttf == $portVersion base + " + diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep b/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe similarity index 96% rename from media-libs/sdl-ttf/sdl-ttf-2.0.9.bep rename to media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe index 18f5cb80d..b068d6603 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6dd5a85e4924689a35a5fb1cb3336156" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_ttf-2.0.9 rm aclocal.m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_ttf-2.0.9 make install } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep b/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe similarity index 97% rename from media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep rename to media-libs/sdl_ttf/sdl_ttf-2.0_.recipe index df5fda109..b6bec4fe4 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep +++ b/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.12 dev-util/pkgconfig >= 0.9" -BUILD { +BUILD() +{ cd sdl-ttf-2.0-hg rm -f acinclude.m4 libtoolize --copy --force --install @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-ttf-2.0-hg make install } diff --git a/media-libs/sge/sge-030809.bep b/media-libs/sge/sge-030809.recipe similarity index 94% rename from media-libs/sge/sge-030809.bep rename to media-libs/sge/sge-030809.recipe index 2b05bbd16..d8b9f38b5 100644 --- a/media-libs/sge/sge-030809.bep +++ b/media-libs/sge/sge-030809.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="a76975665b6a2bf189130fa2c8821caf" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sge030809 make } -INSTALL { +INSTALL() +{ cd sge030809 make install } diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.recipe similarity index 96% rename from media-libs/smjpeg/smjpeg-0.2.1.bep rename to media-libs/smjpeg/smjpeg-0.2.1.recipe index 2208d923a..62199881e 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.bep +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -4,7 +4,8 @@ SRC_URI="svn://svn.icculus.org/smjpeg/trunk/" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd smjpeg-0.2.1 rm -f acinclude.m4 rm -f aclocal.m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd smjpeg-0.2.1 make install } diff --git a/media-libs/smpeg/smpeg-0.4.5.bep b/media-libs/smpeg/smpeg-0.4.5.bep deleted file mode 100644 index 76a86a1ff..000000000 --- a/media-libs/smpeg/smpeg-0.4.5.bep +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="smpeg" -HOMEPAGE="http://www.icculus.org/smpeg" -SRC_URI="svn://svn.icculus.org/smpeg/trunk/" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd smpeg-0.4.5 - rm -f acinclude.m4 - rm -f aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" - libtoolize --copy --force --install - aclocal --install -I acinclude - automake --foreign --add-missing - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd smpeg-0.4.5 - make install -} - -LICENSE="GNU LGPL v2" -COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies." diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe new file mode 100644 index 000000000..b15205392 --- /dev/null +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -0,0 +1,88 @@ +SUMMARY="smpeg" +DESCRIPTION="smpeg is an mpeg decoding library, which runs on just about any platform. It comes with a sample decoder, plaympeg." +HOMEPAGE="http://www.icculus.org/smpeg" +SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5" +LICENSE="GNU LGPL v2" +COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies." +REVISION="1" + + +#BUILD() +#{ +# cd smpeg-0.4.5 +# rm -f acinclude.m4 +# rm -f aclocal.m4 +# echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" +# libtoolize --copy --force --install +# aclocal --install -I acinclude +# automake --foreign --add-missing +# autoconf +# MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +# LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` +# ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ +# --libdir=$LIBDIR \ +# --mandir=$MANDIR \ +# --datadir=`finddir B_COMMON_DATA_DIRECTORY` +# make +#} + + +ARCHITECTURES="?x86 ?x86_gcc2" + +PROVIDES=" + smpeg = 0.4.5 compat >= 0 + cmd:smpeg + cmd:plaympeg + " + +REQUIRES=" + haiku + lib:libogg + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:ld + cmd:make + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libFLAC + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + smpeg_devel = $portVersion + devel:smpeg = 0.4.5 compat >= 0 + " + +REQUIRES_devel=" + smpeg == $portVersion base + " diff --git a/media-libs/speex/patches/speex-1.2rc1.patch b/media-libs/speex/patches/speex-1.2rc1.patch deleted file mode 100644 index 8950f992d..000000000 --- a/media-libs/speex/patches/speex-1.2rc1.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN speex-1.2rc1/include/speex/speex_types.h speex-1.2rc1-haiku/include/speex/speex_types.h ---- speex-1.2rc1/include/speex/speex_types.h 2009-02-19 00:38:33.000000000 +0000 -+++ speex-1.2rc1-haiku/include/speex/speex_types.h 2009-02-19 00:35:50.000000000 +0000 -@@ -73,6 +73,15 @@ - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -+#elif defined(__HAIKU__) -+ -+ /* Haiku */ -+# include -+ typedef short spx_int16_t; -+ typedef unsigned short spx_uint16_t; -+ typedef int spx_int32_t; -+ typedef unsigned int spx_uint32_t; -+ - #elif defined (__EMX__) - - /* OS/2 GCC */ diff --git a/media-libs/speex/patches/speex-1.2~rc1.patchset b/media-libs/speex/patches/speex-1.2~rc1.patchset new file mode 100644 index 000000000..c979f0257 --- /dev/null +++ b/media-libs/speex/patches/speex-1.2~rc1.patchset @@ -0,0 +1,52 @@ +From 1342da5851b17b65e2fe12136cd854b47acc7452 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sat, 4 Sep 2010 06:59:30 +0000 +Subject: Speex patch to fix typedefs for Haiku build + + +diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h +index 852fed8..217bdfc 100644 +--- a/include/speex/speex_types.h ++++ b/include/speex/speex_types.h +@@ -73,6 +73,15 @@ + typedef int32_t spx_int32_t; + typedef u_int32_t spx_uint32_t; + ++#elif defined(__HAIKU__) ++ ++ /* Haiku */ ++# include ++ typedef short spx_int16_t; ++ typedef unsigned short spx_uint16_t; ++ typedef int spx_int32_t; ++ typedef unsigned int spx_uint32_t; ++ + #elif defined (__EMX__) + + /* OS/2 GCC */ +-- +1.7.5 + + +From 7ec1c5672675e7d89ab5b6d1d6550f7d04c7e688 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:15:15 +0200 +Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS + + +diff --git a/configure.ac b/configure.ac +index 057d888..9d0caec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*- + + AC_INIT(libspeex/speex.c) + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + SPEEX_MAJOR_VERSION=1 + SPEEX_MINOR_VERSION=1 +-- +1.7.5 + diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.bep deleted file mode 100644 index 320e8878a..000000000 --- a/media-libs/speex/speex-1.2-git.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="Speex" -HOMEPAGE="http://www.speex.org" -SRC_URI="git+http://git.xiph.org/speex.git" -#CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="libogg >= 1.2.0" -BUILD { - cd speex-1.2-git - libtoolize --copy --force --install - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --mandir=$COMMON_DIR/man - make -} - -INSTALL { - cd speex-1.2-git - make install -} -LICENSE="Speex" -COPYRIGHT="2002-2009 Xiph.org Foundation - 2002-2008 Jean-Marc Valin - 2005-2007 Analog Devices Inc. - 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) - 1993, 2002, 2006 David Rowe - 2003 EpicGames - 1992-1994 Jutta Degener, Carsten Bormann" diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.bep deleted file mode 100644 index e8d06c9ed..000000000 --- a/media-libs/speex/speex-1.2rc1.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="Speex" -HOMEPAGE="http://www.speex.org" -SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" -CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.25 - libogg > 1.3.0" -BUILD { - cd speex-1.2rc1 - libtoolize --copy --force --install - aclocal - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/speex \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd speex-1.2rc1 - make install -} -LICENSE="Speex" -COPYRIGHT="2002-2009 Xiph.org Foundation - 2002-2008 Jean-Marc Valin - 2005-2007 Analog Devices Inc. - 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) - 1993, 2002, 2006 David Rowe - 2003 EpicGames - 1992-1994 Jutta Degener, Carsten Bormann" diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe new file mode 100644 index 000000000..c89e4279e --- /dev/null +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -0,0 +1,93 @@ +SUMMARY="A Free Codec For Free Speech" +DESCRIPTION="Speex is an Open Source/Free Software patent-free audio compression format designed for speech. The Speex Project aims to lower the barrier of entry for voice applications by providing a free alternative to expensive proprietary speech codecs. Moreover, Speex is well-adapted to Internet applications and provides useful features that are not present in most other codecs. Finally, Speex is part of the GNU Project and is available under the revised BSD license." +HOMEPAGE="http://www.speex.org" +LICENSE="Speex" +COPYRIGHT=" + 2002-2009 Xiph.org Foundation + 2002-2008 Jean-Marc Valin + 2005-2007 Analog Devices Inc. + 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) + 1993, 2002, 2006 David Rowe + 2003 EpicGames + 1992-1994 Jutta Degener, Carsten Bormann + " +SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" +CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="speex-1.2~rc1.patchset" + +PROVIDES=" + speex$secondaryArchSuffix = $portVersion + lib:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + lib:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:speexdec = $portVersion + cmd:speexenc = $portVersion + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libogg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config + " + +SOURCE_DIR="speex-1.2rc1" + +BUILD() +{ + libtoolize --copy --force --install + aclocal + automake + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libspeex libspeexdsp + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir/aclocal \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + speex${secondaryArchSuffix}_devel = $portVersion + devel:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + devel:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 + " +REQUIRES_devel=" + speex$secondaryArchSuffix == $portVersion + " diff --git a/media-libs/taglib/taglib-1.6.1.bep b/media-libs/taglib/taglib-1.6.1.recipe similarity index 94% rename from media-libs/taglib/taglib-1.6.1.bep rename to media-libs/taglib/taglib-1.6.1.recipe index 62ca47242..08a332fbf 100644 --- a/media-libs/taglib/taglib-1.6.1.bep +++ b/media-libs/taglib/taglib-1.6.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="db0502b3c3448ff1f1f9b090c1daa5f7" -BUILD { +BUILD() +{ cd taglib-1.6.1 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.6.1 make install } diff --git a/media-libs/taglib/taglib-1.6.2.bep b/media-libs/taglib/taglib-1.6.2.recipe similarity index 94% rename from media-libs/taglib/taglib-1.6.2.bep rename to media-libs/taglib/taglib-1.6.2.recipe index d9235c09f..bf9d09163 100644 --- a/media-libs/taglib/taglib-1.6.2.bep +++ b/media-libs/taglib/taglib-1.6.2.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7c936a07acfc53b2beda4151a0f66336" -BUILD { +BUILD() +{ cd taglib-1.6.2 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.6.2 make install } diff --git a/media-libs/taglib/taglib-1.6.3.bep b/media-libs/taglib/taglib-1.6.3.recipe similarity index 94% rename from media-libs/taglib/taglib-1.6.3.bep rename to media-libs/taglib/taglib-1.6.3.recipe index 14b6ed2c5..3395ffa3d 100644 --- a/media-libs/taglib/taglib-1.6.3.bep +++ b/media-libs/taglib/taglib-1.6.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="ddf02f4e1d2dc30f76734df806e613eb" -BUILD { +BUILD() +{ cd taglib-1.6.3 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.6.3 make install } diff --git a/media-libs/taglib/taglib-1.7.1.bep b/media-libs/taglib/taglib-1.7.1.recipe similarity index 94% rename from media-libs/taglib/taglib-1.7.1.bep rename to media-libs/taglib/taglib-1.7.1.recipe index d8a160ffd..0eb629e5c 100644 --- a/media-libs/taglib/taglib-1.7.1.bep +++ b/media-libs/taglib/taglib-1.7.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="aa0f7e2d9700bbb78c5f990ed2f5d9b6" -BUILD { +BUILD() +{ cd taglib-1.7.1 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.7.1 make install } diff --git a/media-libs/taglib/taglib-1.7.2.bep b/media-libs/taglib/taglib-1.7.2.bep deleted file mode 100644 index d8aba64fd..000000000 --- a/media-libs/taglib/taglib-1.7.2.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="TagLib Audio Meta-Data Library" -HOMEPAGE="http://github.com/taglib" -SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.7.2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="cmake" -CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" -BUILD { - cd taglib-1.7.2 - cmake . - make -} - -INSTALL { - cd taglib-1.7.2 - make install -} - -LICENSE="GNU LGPL v2 - MPL v1.1" -COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe new file mode 100644 index 000000000..fe9a3cb83 --- /dev/null +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -0,0 +1,34 @@ +SUMMARY="TabLib Audio Meta-Data Library" +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://github.com/taglib" +SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" +CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" +COPYRIGHT="2002-2012 Scott Wheeler" +LICENSE="GNU LGPL v2 + MPL v1.1 + " +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + taglib = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + make install +} diff --git a/media-libs/taglib/taglib-1.7.bep b/media-libs/taglib/taglib-1.7.recipe similarity index 94% rename from media-libs/taglib/taglib-1.7.bep rename to media-libs/taglib/taglib-1.7.recipe index 0716bb487..862ebbe76 100644 --- a/media-libs/taglib/taglib-1.7.bep +++ b/media-libs/taglib/taglib-1.7.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6a7e312668f153fa905a81714aebc257" -BUILD { +BUILD() +{ cd taglib-1.7 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.7 make install } diff --git a/media-libs/taglib/taglib-1.8.bep b/media-libs/taglib/taglib-1.8.bep deleted file mode 100644 index a7abbd2ff..000000000 --- a/media-libs/taglib/taglib-1.8.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="TagLib Audio Meta-Data Library" -HOMEPAGE="http://github.com/taglib" -SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" -BUILD { - cd taglib-1.8 - cmake . - make -} - -INSTALL { - cd taglib-1.8 - make install -} - -LICENSE="GNU LGPL v2 - MPL v1.1" -COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/media-libs/taglib/taglib-1.8.recipe b/media-libs/taglib/taglib-1.8.recipe new file mode 100644 index 000000000..6bec8fd82 --- /dev/null +++ b/media-libs/taglib/taglib-1.8.recipe @@ -0,0 +1,34 @@ +SUMMARY="TabLib Audio Meta-Data Library" +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://github.com/taglib" +SRC_URI="http://taglib.github.io/releases/taglib-1.8.tar.gz" +CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" +COPYRIGHT="2002-2012 Scott Wheeler" +LICENSE="GNU LGPL v2 + MPL v1.1 + " +REVISION="1" +ARCHITECTURES="x86" + +PROVIDES=" + taglib = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + make install +} diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe new file mode 100644 index 000000000..8e017a001 --- /dev/null +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -0,0 +1,36 @@ +SUMMARY="TabLib Audio Meta-Data Library" +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://github.com/taglib" +SRC_URI="http://taglib.github.io/releases/taglib-1.9.1.tar.gz" +CHECKSUM_MD5="0d35df96822bbd564c5504cb3c2e4d86" +COPYRIGHT="2002-2013 Scott Wheeler" +LICENSE="GNU LGPL v2 + MPL v1.1 + " +REVISION="1" + +ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64" + +PROVIDES=" + taglib = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + make install +} diff --git a/media-libs/tiff/tiff-3.8.2.bep b/media-libs/tiff/tiff-3.8.2.recipe similarity index 96% rename from media-libs/tiff/tiff-3.8.2.bep rename to media-libs/tiff/tiff-3.8.2.recipe index 4a2338e42..5e5826c88 100644 --- a/media-libs/tiff/tiff-3.8.2.bep +++ b/media-libs/tiff/tiff-3.8.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fbb6f446ea4ed18955e2714934e5b698" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.8.2 cp /boot/home/config/share/libtool/config.guess config.guess cp /boot/home/config/share/libtool/config.sub config.sub @@ -20,6 +21,7 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } diff --git a/media-libs/tiff/tiff-3.9.1.bep b/media-libs/tiff/tiff-3.9.1.recipe similarity index 94% rename from media-libs/tiff/tiff-3.9.1.bep rename to media-libs/tiff/tiff-3.9.1.recipe index d0aa4e446..d1b0b6a18 100644 --- a/media-libs/tiff/tiff-3.9.1.bep +++ b/media-libs/tiff/tiff-3.9.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="63c59a44f34ae0787f2d71de3d256e20" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.9.1 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tiff-3.9.1 make install } diff --git a/media-libs/tiff/tiff-3.9.4.bep b/media-libs/tiff/tiff-3.9.4.recipe similarity index 94% rename from media-libs/tiff/tiff-3.9.4.bep rename to media-libs/tiff/tiff-3.9.4.recipe index 4718a9b5f..8e13c6bb1 100644 --- a/media-libs/tiff/tiff-3.9.4.bep +++ b/media-libs/tiff/tiff-3.9.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2006c1bdd12644dbf02956955175afd6" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.9.4 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tiff-3.9.4 make install } diff --git a/media-libs/tiff/tiff-3.9.6.bep b/media-libs/tiff/tiff-3.9.6.bep deleted file mode 100644 index a8fc84aaa..000000000 --- a/media-libs/tiff/tiff-3.9.6.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Tiff library" -HOMEPAGE="http://www.libtiff.org" -SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz" -CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd tiff-3.9.6 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - autoheader - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd tiff-3.9.6 - make install -} diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe new file mode 100644 index 000000000..695872366 --- /dev/null +++ b/media-libs/tiff/tiff-3.9.6.recipe @@ -0,0 +1,117 @@ +SUMMARY="Tiff library" +DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for storing image data. Included in this software is a library, libtiff, for reading and writing TIFF." +HOMEPAGE="http://www.libtiff.org" +SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz" +CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="1988-1997 Sam Leffler + 1991-1997 Silicon Graphics, Inc." + +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + tiff$secondaryArchSuffix = $portVersion compat >= 3 + lib:libtiff$secondaryArchSuffix = $portVersion compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL + lib:libjpeg + lib:libz + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + aclocal + libtoolize --force --copy --install + automake --add-missing + autoconf + autoheader + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libtiff + + # devel package + packageEntries devel \ + $developDir + + # tools package + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir \ + $documentationDir + fi + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + tiff${secondaryArchSuffix}_devel = $portVersion compat >= 3 + devel:libtiff$secondaryArchSuffix = $portVersion compat >= 3 + " +REQUIRES_devel=" + tiff$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The TIFF tools" + PROVIDES_tools=" + tiff_tools = $portVersion compat >= 3 + cmd:bmp2tiff = $portVersion compat >= 3 + cmd:fax2ps = $portVersion compat >= 3 + cmd:fax2tiff = $portVersion compat >= 3 + cmd:gif2tiff = $portVersion compat >= 3 + cmd:pal2rgb = $portVersion compat >= 3 + cmd:ppm2tiff = $portVersion compat >= 3 + cmd:ras2tiff = $portVersion compat >= 3 + cmd:raw2tiff = $portVersion compat >= 3 + cmd:rgb2ycbcr = $portVersion compat >= 3 + cmd:thumbnail = $portVersion compat >= 3 + cmd:tiff2bw = $portVersion compat >= 3 + cmd:tiff2pdf = $portVersion compat >= 3 + cmd:tiff2ps = $portVersion compat >= 3 + cmd:tiff2rgba = $portVersion compat >= 3 + cmd:tiffcmp = $portVersion compat >= 3 + cmd:tiffcp = $portVersion compat >= 3 + cmd:tiffcrop = $portVersion compat >= 3 + cmd:tiffdither = $portVersion compat >= 3 + cmd:tiffdump = $portVersion compat >= 3 + cmd:tiffinfo = $portVersion compat >= 3 + cmd:tiffmedian = $portVersion compat >= 3 + cmd:tiffset = $portVersion compat >= 3 + cmd:tiffsplit = $portVersion compat >= 3 + " + REQUIRES_tools=" + haiku >= $haikuVersion + tiff == $portVersion base + " +fi diff --git a/media-libs/tiff/tiff-4.0.2.bep b/media-libs/tiff/tiff-4.0.2.bep deleted file mode 100644 index c94a19245..000000000 --- a/media-libs/tiff/tiff-4.0.2.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Tiff library" -HOMEPAGE="http://www.libtiff.org" -SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz" -CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd tiff-4.0.2 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - autoheader - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd tiff-4.0.2 - make install -} diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff-4.0.2.recipe new file mode 100644 index 000000000..8008c97d6 --- /dev/null +++ b/media-libs/tiff/tiff-4.0.2.recipe @@ -0,0 +1,118 @@ +SUMMARY="Tiff library" +DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for storing image data. Included in this software is a library, libtiff, for reading and writing TIFF." +HOMEPAGE="http://www.libtiff.org" +SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz" +CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="1988-1997 Sam Leffler + 1991-1997 Silicon Graphics, Inc." + +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + tiff$secondaryArchSuffix = $portVersion compat >= 4 + lib:libtiff$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL + lib:libjpeg + lib:libz + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + aclocal + libtoolize --force --copy --install + automake --add-missing + autoconf + autoheader + runConfigure ./configure +# --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libtiff + + # devel package + packageEntries devel \ + $developDir + + # tools package + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir \ + $documentationDir + fi + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4 + devel:libtiff$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES_devel=" + tiff$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The TIFF tools" + PROVIDES_tools=" + tiff_tools = $portVersion compat >= 4 + cmd:bmp2tiff = $portVersion compat >= 4 + cmd:fax2ps = $portVersion compat >= 4 + cmd:fax2tiff = $portVersion compat >= 4 + cmd:gif2tiff = $portVersion compat >= 4 + cmd:pal2rgb = $portVersion compat >= 4 + cmd:ppm2tiff = $portVersion compat >= 4 + cmd:ras2tiff = $portVersion compat >= 4 + cmd:raw2tiff = $portVersion compat >= 4 + cmd:rgb2ycbcr = $portVersion compat >= 4 + cmd:thumbnail = $portVersion compat >= 4 + cmd:tiff2bw = $portVersion compat >= 4 + cmd:tiff2pdf = $portVersion compat >= 4 + cmd:tiff2ps = $portVersion compat >= 4 + cmd:tiff2rgba = $portVersion compat >= 4 + cmd:tiffcmp = $portVersion compat >= 4 + cmd:tiffcp = $portVersion compat >= 4 + cmd:tiffcrop = $portVersion compat >= 4 + cmd:tiffdither = $portVersion compat >= 4 + cmd:tiffdump = $portVersion compat >= 4 + cmd:tiffinfo = $portVersion compat >= 4 + cmd:tiffmedian = $portVersion compat >= 4 + cmd:tiffset = $portVersion compat >= 4 + cmd:tiffsplit = $portVersion compat >= 4 + " + REQUIRES_tools=" + haiku >= $haikuVersion + tiff == $portVersion base + " +fi diff --git a/media-libs/vigra/vigra-1.8.0.bep b/media-libs/vigra/vigra-1.8.0.recipe similarity index 96% rename from media-libs/vigra/vigra-1.8.0.bep rename to media-libs/vigra/vigra-1.8.0.recipe index dee691ec6..e05e7b3c5 100644 --- a/media-libs/vigra/vigra-1.8.0.bep +++ b/media-libs/vigra/vigra-1.8.0.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="cmake" -BUILD { +BUILD() +{ cd vigra-1.8.0 cmake CMakelists.txt make } -INSTALL { +INSTALL() +{ cd vigra-1.8.0 make install } diff --git a/media-libs/waave/waave-1.01.bep b/media-libs/waave/waave-1.01.recipe similarity index 94% rename from media-libs/waave/waave-1.01.bep rename to media-libs/waave/waave-1.01.recipe index 2c42eff3f..262d8426f 100644 --- a/media-libs/waave/waave-1.01.bep +++ b/media-libs/waave/waave-1.01.recipe @@ -6,18 +6,21 @@ STATUS_HAIKU="broken" DEPEND="media-libs/libsdl >= 1.2.15 media-video/ffmeg >= 0.10.2" CHECKSUM_MD5="7f168d3122a3889ee6da3a380cfe1c99" -BUILD { +BUILD() +{ cd waave-1.01 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd waave-1.01 make install } -TEST { +TEST() +{ cd waave-1.01/test make } diff --git a/media-libs/x264/x264-20120803.bep b/media-libs/x264/x264-20120803.recipe similarity index 96% rename from media-libs/x264/x264-20120803.bep rename to media-libs/x264/x264-20120803.recipe index 21aed8d29..e0881ff35 100644 --- a/media-libs/x264/x264-20120803.bep +++ b/media-libs/x264/x264-20120803.recipe @@ -6,13 +6,15 @@ REVISION="1" MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd x264-snapshot-20120803-2245 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd x264-snapshot-20120803-2245 make install-lib-static } diff --git a/media-sound/bladeenc/bladeenc-0.94.2.bep b/media-sound/bladeenc/bladeenc-0.94.2.recipe similarity index 96% rename from media-sound/bladeenc/bladeenc-0.94.2.bep rename to media-sound/bladeenc/bladeenc-0.94.2.recipe index dd03383d4..24e084884 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.bep +++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9b9f6eafe1637a48a67f0a0f8f6e71ad" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bladeenc-0.94.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bladeenc-0.94.2 make install } diff --git a/media-sound/fluidsynth/fluidsynth-1.1.3.bep b/media-sound/fluidsynth/fluidsynth-1.1.3.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth-1.1.3.bep rename to media-sound/fluidsynth/fluidsynth-1.1.3.recipe index d4792455e..9b759f617 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.3.bep +++ b/media-sound/fluidsynth/fluidsynth-1.1.3.recipe @@ -7,13 +7,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/glib >= 2.24.1 media-libs/libsndfile >= 1.0.18" -BUILD { +BUILD() +{ cd fluidsynth-1.1.3 cmake . make } -INSTALL { +INSTALL() +{ cd fluidsynth-1.1.3 make install } diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.bep b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth-1.1.6.bep rename to media-sound/fluidsynth/fluidsynth-1.1.6.recipe index 86ea54247..d4b900964 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.bep +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -8,13 +8,15 @@ DEPEND="dev-libs/glib >= 2.26.1 media-libs/libsndfile >= 1.0.21 sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd fluidsynth-1.1.6 cmake . make } -INSTALL { +INSTALL() +{ cd fluidsynth-1.1.6 make install prefix=`finddir B_COMMON_DIRECTORY` } diff --git a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep b/media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep rename to media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe index 093c96677..e76b7af16 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep +++ b/media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe @@ -7,14 +7,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/glib >= 2.24.1 media-libs/libsndfile >= 1.0.18" -BUILD { +BUILD() +{ cd fluidsynth-1.1-midi-buffer cd fluidsynth cmake . make } -INSTALL { +INSTALL() +{ cd fluidsynth-1.1-midi-buffer cd fluidsynth make install diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch new file mode 100644 index 000000000..e21a1f21f --- /dev/null +++ b/media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch @@ -0,0 +1,38 @@ +diff -Naur fluidsynth-1.1-midi-buffer/fluidsynth/CMakeLists.txt fluidsynth-1.1-midi-buffer-haiku/fluidsynth/CMakeLists.txt +--- fluidsynth-1.1-midi-buffer/fluidsynth/CMakeLists.txt 2011-04-24 20:59:42.047710208 -0300 ++++ fluidsynth-1.1-midi-buffer-haiku/fluidsynth/CMakeLists.txt 2011-04-24 21:01:20.278134784 -0300 +@@ -166,10 +166,18 @@ + add_definitions ( -mms-bitfields ) + endif ( MINGW ) + else ( WIN32 ) +-# Check PThreads, but not in Windows +- find_package ( Pthreads REQUIRED ) +- set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) +- set ( LIBFLUID_LIBS "m" ) ++ ++if (UNIX AND NOT BEOS) ++# Check PThreads, but not in Windows ++ find_package ( Pthreads REQUIRED ) ++ set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) ++ set ( LIBFLUID_LIBS "m" ) ++endif (UNIX AND NOT BEOS) ++ ++if (BEOS) ++set ( LIBFLUID_LIBS "network") ++endif (BEOS) ++ + endif ( WIN32 ) + + # IBM OS/2 +diff -Naur fluidsynth-1.1-midi-buffer/fluidsynth/src/utils/fluid_sys.h fluidsynth-1.1-midi-buffer-haiku/fluidsynth/src/utils/fluid_sys.h +--- fluidsynth-1.1-midi-buffer/fluidsynth/src/utils/fluid_sys.h 2011-04-24 20:59:42.047710208 -0300 ++++ fluidsynth-1.1-midi-buffer-haiku/fluidsynth/src/utils/fluid_sys.h 2011-04-24 21:02:01.829685760 -0300 +@@ -335,7 +335,7 @@ + sample data. + */ + +-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) ++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__) + #define fluid_mlock(_p,_n) mlock(_p, _n) + #define fluid_munlock(_p,_n) munlock(_p,_n) + #else diff --git a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep b/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep deleted file mode 100644 index a69303f3f..000000000 --- a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Mp3 encoder based on LAME3.88, which is optimized for Enhanced 3D Now!/SSE/SSE2 and dual-CPUs." -HOMEPAGE="https://github.com/teragonaudio/gogo-no-coda" -SRC_URI="https://github.com/teragonaudio/gogo-no-coda/archive/master.zip" -CHECKSUM_MD5="b60ae82f7fc70cbefd2e4003b9e13c8f" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc2. Use 'setgcc gcc2' before building." -DEPEND="dev-lang/nasm" - -BUILD { - cd gogo-no-coda-master/linux - make -} - -INSTALL { - cd gogo-no-coda-master/linux - make install prefix=`finddir B_COMMON_DIRECTORY` -} - -LICENSE="GNU LGPL v2" -COPYRIGHT="2001-2003 Respective gogo-no-coda creators" diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe new file mode 100644 index 000000000..f1293900c --- /dev/null +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -0,0 +1,43 @@ +SUMMARY="Mp3 encoder based on LAME3.88" +DESCRIPTION="Mp3 encoder based on LAME3.88, which is optimized for Enhanced 3D Now!/SSE/SSE2 and dual-CPUs." +HOMEPAGE="https://github.com/teragonaudio/gogo-no-coda" +SRC_URI="https://github.com/teragonaudio/gogo-no-coda/archive/master.zip" +CHECKSUM_MD5="7b3008a0aba2578a2b428ba538452e87" +LICENSE="GNU LGPL v2" +COPYRIGHT="2001-2003 Respective gogo-no-coda creators" +REVISION="1" +ARCHITECTURES="?x86 x86_gcc2" + +PATCHES="gogo_no_coda-3.13.patch" + +PROVIDES=" + gogo_enc = $portVersion compat >= 1 + " +REQUIRES="haiku >= $haikuVersion" + +BUILD_REQUIRES="haiku >= $haikuVersion" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:nasm + " + + +SOURCE_DIR="gogo-no-coda-master" + +BUILD() +{ + cd linux + make $jobArgs +} + +INSTALL() +{ + cd linux + mkdir $prefix/bin + make install prefix=$prefix +} + diff --git a/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch b/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch new file mode 100644 index 000000000..41d4e1716 --- /dev/null +++ b/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch @@ -0,0 +1,117 @@ +diff -Naur gogo-no-coda-master/engine/i386/cpu.c gogo-no-coda-master-haiku/engine/i386/cpu.c +--- gogo-no-coda-master/engine/i386/cpu.c 2011-05-17 09:51:26.045350912 +0000 ++++ gogo-no-coda-master-haiku/engine/i386/cpu.c 2012-12-30 16:42:53.811073536 +0000 +@@ -162,7 +162,7 @@ + } + return nCPU; + +-#elif defined(BeOS) ++#elif defined(BeOS) || defined(__HAIKU__) + + system_info udtsystem_info; + get_system_info(&udtsystem_info); +diff -Naur gogo-no-coda-master/engine/i386/fftsse.nas gogo-no-coda-master-haiku/engine/i386/fftsse.nas +--- gogo-no-coda-master/engine/i386/fftsse.nas 2011-05-17 09:51:26.045613056 +0000 ++++ gogo-no-coda-master-haiku/engine/i386/fftsse.nas 2012-12-30 16:42:53.823656448 +0000 +@@ -23,14 +23,14 @@ + Q_SQRT2 dd 1.41421356237, 1.41421356237, 1.41421356237, 1.41421356237 + + Q_1 dd 1.0, 1.0, 1.0, 1.0 +-costab dd 9.238795325112867e-01F, 9.238795325112867e-01F, 9.238795325112867e-01F, 9.238795325112867e-01F +- dd 3.826834323650898e-01F, 3.826834323650898e-01F, 3.826834323650898e-01F, 3.826834323650898e-01F +- dd 9.951847266721969e-01F, 9.951847266721969e-01F, 9.951847266721969e-01F, 9.951847266721969e-01F +- dd 9.801714032956060e-02F, 9.801714032956060e-02F, 9.801714032956060e-02F, 9.801714032956060e-02F +- dd 9.996988186962042e-01F, 9.996988186962042e-01F, 9.996988186962042e-01F, 9.996988186962042e-01F +- dd 2.454122852291229e-02F, 2.454122852291229e-02F, 2.454122852291229e-02F, 2.454122852291229e-02F +- dd 9.999811752826011e-01F, 9.999811752826011e-01F, 9.999811752826011e-01F, 9.999811752826011e-01F +- dd 6.135884649154475e-03F, 6.135884649154475e-03F, 6.135884649154475e-03F, 6.135884649154475e-03F ++costab dd 9.238795325112867e-01, 9.238795325112867e-01, 9.238795325112867e-01, 9.238795325112867e-01 ++ dd 3.826834323650898e-01, 3.826834323650898e-01, 3.826834323650898e-01, 3.826834323650898e-01 ++ dd 9.951847266721969e-01, 9.951847266721969e-01, 9.951847266721969e-01, 9.951847266721969e-01 ++ dd 9.801714032956060e-02, 9.801714032956060e-02, 9.801714032956060e-02, 9.801714032956060e-02 ++ dd 9.996988186962042e-01, 9.996988186962042e-01, 9.996988186962042e-01, 9.996988186962042e-01 ++ dd 2.454122852291229e-02, 2.454122852291229e-02, 2.454122852291229e-02, 2.454122852291229e-02 ++ dd 9.999811752826011e-01, 9.999811752826011e-01, 9.999811752826011e-01, 9.999811752826011e-01 ++ dd 6.135884649154475e-03, 6.135884649154475e-03, 6.135884649154475e-03, 6.135884649154475e-03 + + align 32 + revLongInit db 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 +diff -Naur gogo-no-coda-master/engine/i386/makecfg.c gogo-no-coda-master-haiku/engine/i386/makecfg.c +--- gogo-no-coda-master/engine/i386/makecfg.c 2011-05-17 09:51:26.045875200 +0000 ++++ gogo-no-coda-master-haiku/engine/i386/makecfg.c 2012-12-30 16:42:53.837812224 +0000 +@@ -18,7 +18,7 @@ + RW_t RW; + RO_t RO; + +-#if (defined(WIN32) || defined(__linux__) || defined(__os2__)) && !defined(__BORLANDC__) && !defined(__MINGW32_VERSION) ++#if (defined(WIN32) || defined(__linux__) || defined(__os2__) || defined(__HAIKU__)) && !defined(__BORLANDC__) && !defined(__MINGW32_VERSION) + #define USE_BSS + #endif + +diff -Naur gogo-no-coda-master/linux/Makefile gogo-no-coda-master-haiku/linux/Makefile +--- gogo-no-coda-master/linux/Makefile 2011-05-17 09:51:26.057147392 +0000 ++++ gogo-no-coda-master-haiku/linux/Makefile 2012-12-30 16:44:48.008912896 +0000 +@@ -8,6 +8,8 @@ + ####################################################### + + TARGET = gogo ++prefix = ++BINDIR = $(prefix)/bin + + ####################################################### + +@@ -16,12 +18,11 @@ + AS = nasm -i../engine/i386/ + LD = gcc + MAKECFG = makecfg +-LIBS = -lm + VPATH = ../engine:../engine/i386:../file_io + + LDFLAGS = $(PROF) + AFLAGS = -f elf -D__unix__ $(E3DN) +-CFLAGS = -Wall $(PROF) -DNDEBUG ++CFLAGS = -Wall $(PROF) -D__unix__ + #CFLAGS += -Wpointer-arith -Wshadow -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs + + CFLAGS += -DHAVE_CONFIG_H -DLAMEPARSE -DLAMESNDFILE +@@ -97,7 +98,6 @@ + #COBJS += $(LIBSNDCOBJS) + + # if FreeBSD then change -lc_r +-LIBS += -lpthread + CFLAGS += -DUSE_PTHREAD + COBJS += thread.o + +@@ -105,9 +105,10 @@ + + all: $(TARGET) + +-install : $(TARGET) +- cp $(TARGET) /usr/local/bin +- strip /usr/local/bin/$(TARGET) ++install : $(TARGET) $(BINDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) ++ install -m 0755 $(TARGET) $(DESTDIR)$(BINDIR) ++ strip $(DESTDIR)$(BINDIR)/$(TARGET) + + $(TARGET): $(COBJS) $(AOBJS) + $(LD) $(COBJS) $(AOBJS) $(LDFLAGS) -o $(TARGET) $(LIBS) +diff -Naur gogo-no-coda-master/main.c gogo-no-coda-master-haiku/main.c +--- gogo-no-coda-master/main.c 2011-05-17 09:51:26.057409536 +0000 ++++ gogo-no-coda-master-haiku/main.c 2012-12-30 16:42:53.853803008 +0000 +@@ -5,13 +5,13 @@ + * Copyright(C) 2001,2002,2003 gogo-developer + */ + +-#if defined(__linux__) || defined(__ppc__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__ppc__) || defined(__FreeBSD__) || defined(__HAIKU__) + #define USE_ITIMER + #include + #include + #include + #endif +-#if defined(__linux__) || defined(__os2__) || defined(__ppc__) || defined(__CYGWIN32__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__os2__) || defined(__ppc__) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__HAIKU__) + # define min(x,y) (((x)<(y))?(x):(y)) + # define max(x,y) (((x)>(y))?(x):(y)) + #endif diff --git a/media-sound/jack2/jack2-1.9.8.bep b/media-sound/jack2/jack2-1.9.8.recipe similarity index 96% rename from media-sound/jack2/jack2-1.9.8.bep rename to media-sound/jack2/jack2-1.9.8.recipe index 9f83969e5..a19991b37 100644 --- a/media-sound/jack2/jack2-1.9.8.bep +++ b/media-sound/jack2/jack2-1.9.8.recipe @@ -7,13 +7,15 @@ DEPEND="media-libs/libsamplerate >= 0.1.8 media-libs/libsndfile >= 1.0.21" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd jack2-1.9.8 python ./waf configure --prefix=/boot/common/ python ./waf build } -INSTALL { +INSTALL() +{ cd jack2-1.9.8 python ./waf build install } diff --git a/media-sound/lame/additional-files/gtk.m4 b/media-sound/lame/additional-files/gtk.m4 new file mode 100644 index 000000000..f2dd47219 --- /dev/null +++ b/media-sound/lame/additional-files/gtk.m4 @@ -0,0 +1,194 @@ +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS +dnl +AC_DEFUN([AM_PATH_GTK], +[dnl +dnl Get the cflags and libraries from the gtk-config script +dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], + , enable_gtktest=yes) + + for module in . $4 + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk-config to some extent +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GTK_CONFIG" = "no" ; then + echo "*** The gtk-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK_CONFIG environment variable to the" + echo "*** full path to gtk-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** or that you have moved GTK since it was installed. In the latter case, you" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) diff --git a/media-sound/lame/additional-files/lib-ld.m4 b/media-sound/lame/additional-files/lib-ld.m4 new file mode 100644 index 000000000..ae003f7c5 --- /dev/null +++ b/media-sound/lame/additional-files/lib-ld.m4 @@ -0,0 +1,109 @@ +# lib-ld.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 /dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL([acl_cv_path_LD], +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT([$LD]) +else + AC_MSG_RESULT([no]) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) diff --git a/media-sound/lame/additional-files/lib-link.m4 b/media-sound/lame/additional-files/lib-link.m4 new file mode 100644 index 000000000..2f8b7ff38 --- /dev/null +++ b/media-sound/lame/additional-files/lib-link.m4 @@ -0,0 +1,764 @@ +# lib-link.m4 serial 20 (gettext-0.18) +dnl Copyright (C) 2001-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_PREREQ([2.54]) + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + popdef([NAME]) + popdef([Name]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + LIB[]NAME[]_PREFIX= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + dnl Tell automake >= 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE([rpath], + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$acl_hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) + +dnl For those cases where a variable contains several -L and -l options +dnl referring to unknown libraries and directories, this macro determines the +dnl necessary additional linker options for the runtime path. +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, +dnl otherwise linking without libtool is assumed. +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], +[ + AC_REQUIRE([AC_LIB_RPATH]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + $1= + if test "$enable_rpath" != no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode directories into the resulting + dnl binary. + rpathdirs= + next= + for opt in $2; do + if test -n "$next"; then + dir="$next" + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= + else + case $opt in + -L) next=yes ;; + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= ;; + *) next= ;; + esac + fi + done + if test "X$rpathdirs" != "X"; then + if test -n ""$3""; then + dnl libtool is used for linking. Use -R options. + for dir in $rpathdirs; do + $1="${$1}${$1:+ }-R$dir" + done + else + dnl The linker is used for linking directly. + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user + dnl must pass all path elements in one option. + alldirs= + for dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="$flag" + else + dnl The -rpath options are cumulative. + for dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="${$1}${$1:+ }$flag" + done + fi + fi + fi + fi + fi + AC_SUBST([$1]) +]) diff --git a/media-sound/lame/additional-files/lib-prefix.m4 b/media-sound/lame/additional-files/lib-prefix.m4 new file mode 100644 index 000000000..4b7ee3358 --- /dev/null +++ b/media-sound/lame/additional-files/lib-prefix.m4 @@ -0,0 +1,224 @@ +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], +[ + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" +]) diff --git a/media-sound/lame/lame-3.98.4.bep b/media-sound/lame/lame-3.98.4.bep deleted file mode 100644 index d5f82fbe4..000000000 --- a/media-sound/lame/lame-3.98.4.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.98.4/lame-3.98.4.tar.gz" -CHECKSUM_MD5="8e9866ad6b570c6c95c8cba48060473f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd lame-3.98.4 - mkdir -p m4 -# configure checks for gtk, but they didn't include the gtk.m4 so we need to. - cp ../../patches/gtk.m4 m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in - libtoolize --force --copy --install - aclocal -I m4 - autoconf --warnings=none - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --without-gtk - make -} - -INSTALL { - cd lame-3.98.4 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1998-2010 Mike Cheng et al." diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe new file mode 100644 index 000000000..9d6217bfc --- /dev/null +++ b/media-sound/lame/lame-3.99.5.recipe @@ -0,0 +1,91 @@ +SUMMARY="LAME is a high quality MPEG Audio Layer III (MP3) encoder" +DESCRIPTION="Following the great history of GNU naming, LAME originally stood for LAME Ain't an Mp3 Encoder. LAME started life as a GPL'd patch against the dist10 ISO demonstration source, and thus was incapable of producing an mp3 stream or even being compiled by itself. But in May 2000, the last remnants of the ISO source code were replaced, and now LAME is the source code for a fully LGPL'd MP3 encoder, with speed and quality to rival and often surpass all commercial competitors." + +HOMEPAGE="http://lame.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" +CHECKSUM_MD5="84835b313d4a8b68f5349816d33e07ce" +LICENSE="GNU LGPL v2" +COPYRIGHT="1998-2012 Mike Cheng et al." +REVISION="2" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lame = $portVersion compat >= 1 + cmd:lame = $portVersion compat >= 1 + lib:libmp3lame = $portVersion compat >= 0.0.0 + " +REQUIRES=" + haiku + lib:libiconv + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:m4 + cmd:sed + devel:libiconv + " + +PATCHES="lame-3.99.5.patch" +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + mkdir -p m4 +# configure checks for gtk, but they didn't include the gtk.m4 so we need to. + cp $portDir/additional-files/gtk.m4 m4/gtk.m4 + cp `aclocal --print-ac-dir`/iconv.m4 m4/iconv.m4 + cp $portDir/additional-files/lib-link.m4 m4/lib-link.m4 + cp $portDir/additional-files/lib-ld.m4 m4/lib-ld.m4 + cp $portDir/additional-files/lib-prefix.m4 m4/lib-prefix.m4 + + sed -i 's/AM_C_PROTOTYPES//' configure.in + sed -i 's/AUTOMAKE_OPTIONS = foreign $(top_srcdir)\/ansi2knr//' \ + libmp3lame/i386/Makefile.am + sed -i 's/AUTOMAKE_OPTIONS = foreign ansi2knr//' \ + doc/man/Makefile.am + sed -i 's/AUTOMAKE_OPTIONS = foreign ansi2knr//' \ + doc/html/Makefile.am + sed -i 's/HAVE_SNDFILE="yes"/HAVE_SNDFILE="no"/g' configure.in + sed -i 's/PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2, HAVE_SNDFILE="no", HAVE_SNDFILE="no")/HAVE_SNDFILE="no"/' configure.in + sed -i 's/@SNDFILE_CFLAGS@/-ffast-math/g' frontend/* + sed -i 's/@SNDFILE_LIBS@/-ffast-math/g' frontend/* + + libtoolize --force --copy --install + aclocal -I m4 + automake + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare devel/lib + prepareInstalledDevelLibs libmp3lame + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + lame_devel = $portVersion + devel:libmp3lame = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libmp3lame == $portVersion base + lib:libiconv >= 2 + lib:libroot + " diff --git a/media-sound/lame/lame-3.99.bep b/media-sound/lame/lame-3.99.bep deleted file mode 100644 index 79a54d80d..000000000 --- a/media-sound/lame/lame-3.99.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.tar.gz" -CHECKSUM_MD5="7abacd1d0a65a63733335786015626db" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd lame-3.99 - mkdir -p m4 -# configure checks for gtk, but they didn't include the gtk.m4 so we need to. - cp ../../patches/gtk.m4 m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in - libtoolize --force --copy --install - aclocal -I m4 - autoconf --warnings=none - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --without-gtk - make -} - -INSTALL { - cd lame-3.99 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1998-2011 Mike Cheng et al." diff --git a/media-sound/lame/lame-398-2.bep b/media-sound/lame/lame-398-2.bep deleted file mode 100644 index 35b0cb71b..000000000 --- a/media-sound/lame/lame-398-2.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.98.2/lame-398-2.tar.gz" -CHECKSUM_MD5="719dae0ee675d0c16e0e89952930ed35" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="dev-lang/nasm >= 2.03.01" -BUILD { - cd lame-398-2 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd lame-398-2 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1998-2008 Mike Cheng et al." diff --git a/media-sound/lame/patches/lame-3.99.5.patch b/media-sound/lame/patches/lame-3.99.5.patch new file mode 100644 index 000000000..9973b6bf2 --- /dev/null +++ b/media-sound/lame/patches/lame-3.99.5.patch @@ -0,0 +1,13 @@ +diff -urN lame-3.99.5/configure.in lame-3.99.5-haiku/configure.in +--- lame-3.99.5/configure.in 2010-06-21 14:16:05.000000000 +0000 ++++ lame-3.99.5-haiku/configure.in 2010-06-21 15:12:31.000000000 +0000 +@@ -343,6 +343,9 @@ + *solaris*) + LIBS="$LIBS -lnsl" + ;; ++ *haiku*) ++ LIBS="$LIBS -lnetwork" ++ ;; + esac + fi + fi diff --git a/media-sound/lame/patches/lame-398-2.patch b/media-sound/lame/patches/lame-398-2.patch deleted file mode 100644 index dc58cb068..000000000 --- a/media-sound/lame/patches/lame-398-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN lame-398-2/configure.in lame-398-2-haiku/configure.in ---- lame-398-2/configure.in 2008-08-05 14:16:05.000000000 +0000 -+++ lame-398-2-haiku/configure.in 2009-07-18 07:33:31.000000000 +0000 -@@ -343,6 +343,9 @@ - *solaris*) - LIBS="$LIBS -lnsl" - ;; -+ *haiku*) -+ LIBS="$LIBS -lnetwork" -+ ;; - esac - fi - fi -@@ -385,14 +388,13 @@ - - dnl configure use of features - --AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") -+dnl AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") - - dnl ElectricFence malloc debugging - AC_MSG_CHECKING(use of ElectricFence malloc debugging) - AC_ARG_ENABLE(efence, - [ --enable-efence Use ElectricFence for malloc debugging], - CONFIG_EFENCE="${enableval}", CONFIG_EFENCE="no") -- - case "${CONFIG_EFENCE}" in - yes) - AC_CHECK_LIB(efence, EF_Print, HAVE_EFENCE="-lefence") -diff -urN lame-398-2/frontend/Makefile.am lame-398-2-haiku/frontend/Makefile.am ---- lame-398-2/frontend/Makefile.am 2006-09-30 09:17:05.000000000 +0000 -+++ lame-398-2-haiku/frontend/Makefile.am 2009-07-18 07:42:04.000000000 +0000 -@@ -60,7 +60,7 @@ - $(top_builddir)/libmp3lame/libmp3lame.la \ - @FRONTEND_LDADD@ - --mp3x_LDADD = $(LDADD) @GTK_LIBS@ -+mp3x_LDADD = $(LDADD) - - CLEANFILES = lclint.txt $(EXTRA_PROGRAMS) - diff --git a/media-sound/milkytracker/milkytracker-0.90.85.bep b/media-sound/milkytracker/milkytracker-0.90.85.recipe similarity index 97% rename from media-sound/milkytracker/milkytracker-0.90.85.bep rename to media-sound/milkytracker/milkytracker-0.90.85.recipe index 6a8dd7a64..a5835b041 100644 --- a/media-sound/milkytracker/milkytracker-0.90.85.bep +++ b/media-sound/milkytracker/milkytracker-0.90.85.recipe @@ -7,14 +7,16 @@ REVISION="1" DEPEND="media-libs/libsdl >= 1.2 sys-libs/zlib >= 1.2.5" -BUILD { +BUILD() +{ cd 'MilkyTracker Source Code'/platforms/haiku bash ./Add_Jamfiles.sh cd ../.. jam } -INSTALL { +INSTALL() +{ cd 'MilkyTracker Source Code'/src/tracker APPDIR=`finddir B_APPS_DIRECTORY`/MilkyTracker APPSETTINGSDIR=`finddir B_USER_SETTINGS_DIRECTORY`/MilkyTracker/ diff --git a/media-sound/mpg123/mpg123-1.12.1.bep b/media-sound/mpg123/mpg123-1.12.1.recipe similarity index 96% rename from media-sound/mpg123/mpg123-1.12.1.bep rename to media-sound/mpg123/mpg123-1.12.1.recipe index 361107799..753a9e082 100644 --- a/media-sound/mpg123/mpg123-1.12.1.bep +++ b/media-sound/mpg123/mpg123-1.12.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2" CHECKSUM_MD5="e7d810a75d22954169f1530a436aca4c" -BUILD { +BUILD() +{ cd mpg123-1.12.1 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpg123-1.12.1 make install } diff --git a/media-sound/naspro/naspro-0.2.9-hg.bep b/media-sound/naspro/naspro-0.2.9_hg.recipe similarity index 95% rename from media-sound/naspro/naspro-0.2.9-hg.bep rename to media-sound/naspro/naspro-0.2.9_hg.recipe index 7129d2e0f..468000b09 100644 --- a/media-sound/naspro/naspro-0.2.9-hg.bep +++ b/media-sound/naspro/naspro-0.2.9_hg.recipe @@ -5,14 +5,16 @@ SRC_URI="hg+http://hg.atheme.org/naspro" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd naspro-0.2.9-hg/naspro-core ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd naspro-0.2.9-hg-core make install } diff --git a/media-sound/ocp/ocp-0.1.21-git.bep b/media-sound/ocp/ocp-0.1.21_git.recipe similarity index 96% rename from media-sound/ocp/ocp-0.1.21-git.bep rename to media-sound/ocp/ocp-0.1.21_git.recipe index f300ccc3b..0abc28e07 100644 --- a/media-sound/ocp/ocp-0.1.21-git.bep +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -10,14 +10,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1 # media-libs/flac >= 1.2.1" # ncurses zlib ... cf. ocp.spec MESSAGE="This port requires gcc4" -BUILD { +BUILD() +{ cd code autoconf CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd code make install } diff --git a/media-sound/ocp/ocp-snapshot20110319.bep b/media-sound/ocp/ocp-snapshot20110319.recipe similarity index 97% rename from media-sound/ocp/ocp-snapshot20110319.bep rename to media-sound/ocp/ocp-snapshot20110319.recipe index 1998800f0..5884c5770 100644 --- a/media-sound/ocp/ocp-snapshot20110319.bep +++ b/media-sound/ocp/ocp-snapshot20110319.recipe @@ -11,14 +11,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1 # media-libs/flac >= 1.2.1" # ncurses zlib ... cf. ocp.spec MESSAGE="This port requires gcc4" -BUILD { +BUILD() +{ cd ocp-snapshot-20110319 autoconf CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ocp-snapshot-20110319 make install } diff --git a/media-sound/ocp/ocp-snapshot20110320.bep b/media-sound/ocp/ocp-snapshot20110320.recipe similarity index 97% rename from media-sound/ocp/ocp-snapshot20110320.bep rename to media-sound/ocp/ocp-snapshot20110320.recipe index 0df6d4339..5fb1ed52c 100644 --- a/media-sound/ocp/ocp-snapshot20110320.bep +++ b/media-sound/ocp/ocp-snapshot20110320.recipe @@ -11,14 +11,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1 # media-libs/flac >= 1.2.1" # ncurses zlib ... cf. ocp.spec MESSAGE="This port requires gcc4" -BUILD { +BUILD() +{ cd ocp-snapshot-20110320 autoconf CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ocp-snapshot-20110320 make install } diff --git a/media-sound/opensound/opensound-232d0de71550.bep b/media-sound/opensound/opensound-232d0de71550.recipe similarity index 96% rename from media-sound/opensound/opensound-232d0de71550.bep rename to media-sound/opensound/opensound-232d0de71550.recipe index 7b6582407..21c69c1f3 100644 --- a/media-sound/opensound/opensound-232d0de71550.bep +++ b/media-sound/opensound/opensound-232d0de71550.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound/ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd opensound-232d0de71550 mkdir -p build cd build @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd opensound-232d0de71550/build if [ -n "${DESTDIR}" ];then make package diff --git a/media-sound/opensound/opensound-4.2.bep b/media-sound/opensound/opensound-4.2.recipe similarity index 96% rename from media-sound/opensound/opensound-4.2.bep rename to media-sound/opensound/opensound-4.2.recipe index bfcc02c84..d5e2e0ff7 100644 --- a/media-sound/opensound/opensound-4.2.bep +++ b/media-sound/opensound/opensound-4.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="da28b1fea261554a1480fcd3c5509cb5" -BUILD { +BUILD() +{ cd oss-v4.2-build2002-src-bsd mkdir -p build cd build @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd oss-v4.2-build2002-src-bsd/build if [ -n "${DESTDIR}" ];then make package diff --git a/media-sound/opensound/opensound-cac211efd60d.bep b/media-sound/opensound/opensound-cac211efd60d.recipe similarity index 95% rename from media-sound/opensound/opensound-cac211efd60d.bep rename to media-sound/opensound/opensound-cac211efd60d.recipe index 452abdbed..149d67b74 100644 --- a/media-sound/opensound/opensound-cac211efd60d.bep +++ b/media-sound/opensound/opensound-cac211efd60d.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://mercurial.opensound.com/#cac211efd60d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd opensound-cac211efd60d mkdir -p build cd build @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd opensound-cac211efd60d/build if [ -n "${DESTDIR}" ];then make package diff --git a/media-sound/schismtracker/schismtracker-20100713.bep b/media-sound/schismtracker/schismtracker-20100713.recipe similarity index 96% rename from media-sound/schismtracker/schismtracker-20100713.bep rename to media-sound/schismtracker/schismtracker-20100713.recipe index d1c10a5d2..bc19e05ae 100644 --- a/media-sound/schismtracker/schismtracker-20100713.bep +++ b/media-sound/schismtracker/schismtracker-20100713.recipe @@ -7,7 +7,8 @@ MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="libsdl >= 1.2.14 gcc >= 4" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd schismtracker-20100713 aclocal autoconf @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd schismtracker-20100713 make install } diff --git a/media-sound/twolame/twolame-0.3.13.bep b/media-sound/twolame/twolame-0.3.13.recipe similarity index 96% rename from media-sound/twolame/twolame-0.3.13.bep rename to media-sound/twolame/twolame-0.3.13.recipe index 4fc7b7d54..2afb81b4b 100644 --- a/media-sound/twolame/twolame-0.3.13.bep +++ b/media-sound/twolame/twolame-0.3.13.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="4113d8aa80194459b45b83d4dbde8ddb" -BUILD { +BUILD() +{ cd twolame-0.3.13 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd twolame-0.3.13 make install } diff --git a/media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch b/media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch deleted file mode 100644 index 5ce4810d9..000000000 --- a/media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urN vorbis-tools-1.2.0/configure.ac vorbis-tools-1.2.0-haiku/configure.ac ---- vorbis-tools-1.2.0/configure.ac 2008-03-03 05:37:31.000000000 +0000 -+++ vorbis-tools-1.2.0-haiku/configure.ac 2009-09-15 06:49:02.000000000 +0000 -@@ -155,6 +155,7 @@ - - SOCKET_LIBS= - AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket") -+AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork") - AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS") - - -diff -urN vorbis-tools-1.2.0/oggenc/oggenc.c vorbis-tools-1.2.0-haiku/oggenc/oggenc.c ---- vorbis-tools-1.2.0/oggenc/oggenc.c 2008-03-03 05:37:27.000000000 +0000 -+++ vorbis-tools-1.2.0-haiku/oggenc/oggenc.c 2009-09-15 06:55:48.000000000 +0000 -@@ -262,12 +262,12 @@ - { - /* Create a filename from existing filename, replacing extension with .ogg or .oga */ - char *start, *end; -- -+ char *extension = (opt.with_skeleton) ? ".oga" : ".ogg"; - start = infiles[i]; -+ - end = strrchr(infiles[i], '.'); - end = end?end:(start + strlen(infiles[i])+1); - -- char *extension = (opt.with_skeleton) ? ".oga" : ".ogg"; - out_fn = malloc(end - start + 5); - strncpy(out_fn, start, end-start); - out_fn[end-start] = 0; diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep deleted file mode 100644 index 6e314d7c3..000000000 --- a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format" -HOMEPAGE="http://www.vorbis.com/" -SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz" -CHECKSUM_MD5="df976d24e51ef3d87cd462edf747bf9a" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD { - cd vorbis-tools-1.2.0 - libtoolize --force --copy --install - aclocal -I m4 - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd vorbis-tools-1.2.0 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers" diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep deleted file mode 100644 index 9ee4fdad5..000000000 --- a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format" -HOMEPAGE="http://www.vorbis.com/" -SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz" -CHECKSUM_MD5="567e0fb8d321b2cd7124f8208b8b90e6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libvorbis >= 1.3.1 - media-libs/flac >= 1.2.1 - media-libs/libao >= 1.0.0 - media-libs/speex >1.2" -BUILD { - cd vorbis-tools-1.4.0 - libtoolize --force --copy --install - aclocal -I m4 - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd vorbis-tools-1.4.0 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2008 Michael Smith, Stan Seibert and other contributers" diff --git a/media-sound/vorbis-tools/patches/vorbis-tools-1.4.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.4.0.patch similarity index 100% rename from media-sound/vorbis-tools/patches/vorbis-tools-1.4.0.patch rename to media-sound/vorbis_tools/patches/vorbis_tools-1.4.0.patch diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe new file mode 100644 index 000000000..f3e3e3430 --- /dev/null +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -0,0 +1,73 @@ +SUMMARY="vorbis-tools - tools for using the Ogg Vorbis sound file format" +DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format" +HOMEPAGE="http://www.vorbis.com/" +SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz" +CHECKSUM_MD5="567e0fb8d321b2cd7124f8208b8b90e6" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + vorbis_tools = 1.4.0 compat >= 1 + cmd:oggenc + cmd:oggdec + cmd:ogginfo + cmd:vcut + cmd:vorbiscomment + " + +REQUIRES=" + haiku + lib:libvorbis + lib:libflac + lib:speex + lib:libao + lib:libogg + lib:libvorbis + lib:libcurl + lib:libvorbisfile + lib:libvorbisenc + lib:libFLAC + " + +BUILD_REQUIRES=" + " + +SOURCE_DIR="vorbis-tools-$portVersion" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:pkg_config + devel:libogg + devel:libvorbis + devel:libflac + " + +PATCH="vorbis_tools-1.4.0.patch" + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + automake + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep deleted file mode 100644 index 9d69e0e65..000000000 --- a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" -CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.3.0 - media-libs/speex >= 1.2rc1 - media-libs/libtheora >= 1.1.0 - media-libs/libvorbis >= 1.3.2 - media-libs/libvpx >= 1.0.0" -BUILD { - cd ffmpeg-0.10.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ - --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ - --enable-gpl --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd ffmpeg-0.10.2 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.bep b/media-video/ffmpeg/ffmpeg-0.10.2.bep deleted file mode 100644 index 30b0122b7..000000000 --- a/media-video/ffmpeg/ffmpeg-0.10.2.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" -CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.3.0 - media-libs/speex >= 1.2rc1 - media-libs/libtheora >= 1.1.0 - media-libs/libvorbis >= 1.3.2 - media-libs/libvpx >= 1.0.0" -BUILD { - cd ffmpeg-0.10.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ - --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd ffmpeg-0.10.2 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe new file mode 100644 index 000000000..f26d636b9 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -0,0 +1,154 @@ +SUMMARY="Audio and video recording, conversion, and streaming library" +DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." +HOMEPAGE="http://www.ffmpeg.org" +LICENSE=" + GNU LGPL v2.1 + GNU GPL v2 + " +COPYRIGHT=" + 2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers + " +SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" +CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="ffmpeg-0.10.2-gcc2.patch" + +PROVIDES=" + ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10 + lib:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 + lib:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53 + lib:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2 + lib:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 + lib:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 + lib:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 + lib:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:ffmpeg = $portVersion compat >= 0.10 + cmd:ffprobe = $portVersion compat >= 0.10 + cmd:ffserver = $portVersion compat >= 0.10 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libtheoradec$secondaryArchSuffix + lib:libtheoraenc$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libvorbisenc$secondaryArchSuffix + lib:libvpx$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libogg$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libtheora$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libvpx$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:perl + cmd:pkg_config + cmd:texi2html + cmd:yasm + " + +GLOBAL_WRITABLE_FILES=" + settings/ffserver.conf + " + +PATCH() +{ + # patch hard-coded config file path + sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \ + ffserver.c \ + doc/ffserver.texi + + # patch hard-coded paths to perl + sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \ + Doxyfile \ + doc/texi2pod.pl +} + +BUILD() +{ + # not an auto tools configure + ./configure \ + --prefix=$prefix \ + --bindir=$binDir \ + --datadir=$dataDir/$portName \ + --incdir=$includeDir \ + --libdir=$libDir \ + --shlibdir=$libDir \ + --mandir=$manDir \ + --disable-debug \ + --enable-shared \ + --enable-libvorbis \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libvpx + make $jobArgs +} + +INSTALL() +{ + make install + + rm $binDir/ffprobe + # TODO: Determine and fix what is wrong with ffprobe! The executable + # seems to be broken. The NEEDED entries in the dynamic section look + # weird and the runtime loader fails relocating with "Operation not + # allowed". + + prepareInstalledDevelLibs \ + libavcodec \ + libavdevice \ + libavfilter \ + libavformat \ + libavutil \ + libswresample \ + libswscale + fixPkgconfig + + # include the documented ffserver.conf + mkdir -p $docDir + cp doc/ffserver.conf $docDir + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.10 + devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 + devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53 + devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2 + devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 + devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 + devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 + devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 + " +REQUIRES_devel=" + ffmpeg$secondaryArchSuffix == $portVersion + " diff --git a/media-video/ffmpeg/ffmpeg-0.10.bep b/media-video/ffmpeg/ffmpeg-0.10.bep deleted file mode 100644 index 0df10e0e6..000000000 --- a/media-video/ffmpeg/ffmpeg-0.10.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.tar.bz2" -CHECKSUM_MD5="dc665cc599a739e3c5262ccdac13d129" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.3.0 - media-libs/speex >= 1.2rc1 - media-libs/libtheora >= 1.1.0 - media-libs/libvorbis >= 1.3.2 - media-libs/libvpx >= 1.0.0" -BUILD { - cd ffmpeg-0.10 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ - --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx - make -} - -INSTALL { - cd ffmpeg-0.10 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.11.1.bep b/media-video/ffmpeg/ffmpeg-0.11.1.recipe similarity index 97% rename from media-video/ffmpeg/ffmpeg-0.11.1.bep rename to media-video/ffmpeg/ffmpeg-0.11.1.recipe index d1921cc63..5397f247f 100644 --- a/media-video/ffmpeg/ffmpeg-0.11.1.bep +++ b/media-video/ffmpeg/ffmpeg-0.11.1.recipe @@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0 media-libs/libtheora >= 1.1.0 media-libs/libvorbis >= 1.3.2 media-libs/libvpx >= 1.0.0" -BUILD { +BUILD() +{ cd ffmpeg-0.11.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.11.1 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.5.bep b/media-video/ffmpeg/ffmpeg-0.5.bep deleted file mode 100644 index 8cd65dcd9..000000000 --- a/media-video/ffmpeg/ffmpeg-0.5.bep +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2" -CHECKSUM_MD5="be8503f15c3b81ba00eb8379ca8dcf33" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ffmpeg-0.5 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared - make -} - -INSTALL { - cd ffmpeg-0.5 - make install -} diff --git a/media-video/ffmpeg/ffmpeg-0.6.bep b/media-video/ffmpeg/ffmpeg-0.6.bep deleted file mode 100644 index 861154286..000000000 --- a/media-video/ffmpeg/ffmpeg-0.6.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.6.tar.bz2" -CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ffmpeg-0.6 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared - make -} - -INSTALL { - cd ffmpeg-0.6 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2010 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-23081.bep b/media-video/ffmpeg/ffmpeg-23081.recipe similarity index 95% rename from media-video/ffmpeg/ffmpeg-23081.bep rename to media-video/ffmpeg/ffmpeg-23081.recipe index 6a0cbb238..f423a2a47 100644 --- a/media-video/ffmpeg/ffmpeg-23081.bep +++ b/media-video/ffmpeg/ffmpeg-23081.recipe @@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#23081" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ffmpeg-23081 chmod 777 configure ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl make } -INSTALL { +INSTALL() +{ cd ffmpeg-23081 make install } diff --git a/media-video/ffmpeg/ffmpeg-7407.bep b/media-video/ffmpeg/ffmpeg-7407.recipe similarity index 95% rename from media-video/ffmpeg/ffmpeg-7407.bep rename to media-video/ffmpeg/ffmpeg-7407.recipe index 2f2d3e0d2..832de1171 100644 --- a/media-video/ffmpeg/ffmpeg-7407.bep +++ b/media-video/ffmpeg/ffmpeg-7407.recipe @@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#7407" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd ffmpeg-7407 chmod 777 configure ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp make } -INSTALL { +INSTALL() +{ cd ffmpeg-7407 make install } diff --git a/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch b/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch index 48b059d5a..7c7f0231f 100644 --- a/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch +++ b/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch @@ -210,8 +210,8 @@ index e1ba799..3820056 100644 av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); diff --git a/configure b/configure ---- ffmpeg-0.10.2/configure 2012-01-26 22:15:59.047710208 +0000 -+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 +--- ffmpeg-0.10.2/configure ++++ ffmpeg-0.10-haiku/configure @@ -1359,7 +1359,6 @@ aligned_stack_if_any="ppc x86" diff --git a/media-video/ffmpeg/patches/ffmpeg-0.5.patch b/media-video/ffmpeg/patches/ffmpeg-0.5.patch deleted file mode 100644 index 1b507ea74..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-0.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urN ffmpeg-0.5/configure ffmpeg-0.5-haiku/configure ---- ffmpeg-0.5/configure 2009-03-01 17:57:14.000000000 +0000 -+++ ffmpeg-0.5-haiku/configure 2009-10-18 22:24:38.000000000 +0000 -@@ -1483,7 +1483,7 @@ - - # OS specific - case $target_os in -- beos|haiku|zeta) -+ beos|zeta) - prefix_default="$HOME/config" - # helps building libavcodec - add_cflags -DPIC -fomit-frame-pointer -@@ -1509,6 +1509,13 @@ - enable beos_netserver - network_extralibs="-lnet" - fi ;; -+ haiku) -+ prefix_default="/boot/common" -+ SHFLAGS=' -shared' -+ disable audio_beos -+ enable beosthreads -+ network_extralibs="-lnetwork" -+ ;; - sunos) - FFSERVERLDFLAGS="" - SHFLAGS='-shared -Wl,-h,$$(@F)' diff --git a/media-video/ffmpeg/patches/ffmpeg-0.6.patch b/media-video/ffmpeg/patches/ffmpeg-0.6.patch deleted file mode 100644 index c29fea383..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-0.6.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ffmpeg-0.6/configure 2010-06-15 19:44:30.020447232 +0000 -+++ ffmpeg-0.6-haiku/configure 2010-07-13 20:40:48.244056064 +0000 -@@ -2127,7 +2127,7 @@ - - # OS specific - case $target_os in -- beos|haiku|zeta) -+ beos|zeta) - prefix_default="$HOME/config" - # 3 gcc releases known for BeOS, each with ugly bugs - gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)" -@@ -2151,6 +2148,10 @@ - enable beos_netserver - network_extralibs="-lnet" - fi ;; -+ haiku) -+ prefix_default="/boot/common" -+ network_extralibs="-lnetwork" -+ ;; - sunos) - FFSERVERLDFLAGS="" - SHFLAGS='-shared -Wl,-h,$$(@F)' diff --git a/media-video/gnash/gnash.hvif b/media-video/gnash/additional-files/gnash.hvif similarity index 100% rename from media-video/gnash/gnash.hvif rename to media-video/gnash/additional-files/gnash.hvif diff --git a/media-video/gnash/mime.zip b/media-video/gnash/additional-files/mime.zip similarity index 100% rename from media-video/gnash/mime.zip rename to media-video/gnash/additional-files/mime.zip diff --git a/media-video/gnash/gnash-0.bep b/media-video/gnash/gnash-0.recipe similarity index 98% rename from media-video/gnash/gnash-0.bep rename to media-video/gnash/gnash-0.recipe index 3c1644d43..88b02a692 100644 --- a/media-video/gnash/gnash-0.bep +++ b/media-video/gnash/gnash-0.recipe @@ -23,7 +23,8 @@ DEPEND="media-video/ffmpeg >= 0.5 # -BUILD { +BUILD() +{ if test ! -e gnash; then bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/ gnash || true; fi @@ -67,7 +68,8 @@ BUILD { popd } -INSTALL { +INSTALL() +{ cd gnash setgcc gcc4 make install "CXXFLAGS=-I/boot/common/include/boost-1_38/" @@ -103,7 +105,7 @@ INSTALL { done strip --strip-debug boot/apps/Gnash/haiku-gnash || true - xres -o boot/apps/Gnash/haiku-gnash -a VICN:101:BEOS:ICON $ROOTDIR/gnash.hvif + xres -o boot/apps/Gnash/haiku-gnash -a VICN:101:BEOS:ICON $ROOTDIR/additional-files/gnash.hvif popd diff --git a/media-video/handbrake/handbrake-0.9.5.bep b/media-video/handbrake/handbrake-0.9.5.recipe similarity index 98% rename from media-video/handbrake/handbrake-0.9.5.bep rename to media-video/handbrake/handbrake-0.9.5.recipe index ba4f05613..ff4aca03a 100644 --- a/media-video/handbrake/handbrake-0.9.5.bep +++ b/media-video/handbrake/handbrake-0.9.5.recipe @@ -14,7 +14,8 @@ DEPEND="dev-libs/libxml2 >= 2.7.7 media-libs/libass >= 0.9.9 media-libs/dvdread >= 4.1.3" -BUILD { +BUILD() +{ cd HandBrake-0.9.5 cp make/variant/linux.defs make/variant/haiku.defs @@ -35,7 +36,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd HandBrake-0.9.5 make install } diff --git a/media-video/mplayer/mplayer-1.0.bep b/media-video/mplayer/mplayer-1.0.recipe similarity index 97% rename from media-video/mplayer/mplayer-1.0.bep rename to media-video/mplayer/mplayer-1.0.recipe index f36c5081e..7950db12e 100644 --- a/media-video/mplayer/mplayer-1.0.bep +++ b/media-video/mplayer/mplayer-1.0.recipe @@ -16,7 +16,8 @@ DEPEND="pkgconfig >= 0.23 media-libs/libdvdread >= 4.1.3 media-libs/libdvdnav >= 4.1.3" -BUILD { +BUILD() +{ cd mplayer-1.0 cp /boot/common/share/libtool/config/config.* . libtoolize --force --copy --install @@ -28,7 +29,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mplayer-1.0 make install } diff --git a/media-video/vlc/patches/vlc-0.8.6i.patch.old b/media-video/vlc/patches/vlc-0.8.6i.patch.old deleted file mode 100644 index 852fc33bf..000000000 --- a/media-video/vlc/patches/vlc-0.8.6i.patch.old +++ /dev/null @@ -1,529 +0,0 @@ -diff -ur vlc-0.8.6i-original/configure.ac vlc-0.8.6i/configure.ac ---- vlc-0.8.6i-original/configure.ac 2008-07-08 21:59:22.000000000 +0100 -+++ vlc-0.8.6i/configure.ac 2009-11-07 23:47:24.000000000 +0000 -@@ -270,6 +270,12 @@ - VLC_ADD_LDFLAGS([beos],[-lzeta]) - fi - ;; -+ haiku) -+ SYS=beos -+ VLC_ADD_CXXFLAGS([beos],[]) -+ VLC_ADD_LDFLAGS([vlc logger],[-lbe]) -+ VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) -+ ;; - *) - SYS="${target_os}" - ;; -diff -ur vlc-0.8.6i-original/include/vlc_common.h vlc-0.8.6i/include/vlc_common.h ---- vlc-0.8.6i-original/include/vlc_common.h 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/include/vlc_common.h 2009-11-08 00:28:56.000000000 +0000 -@@ -898,7 +898,7 @@ - # define vlc_strtoll NULL - #endif - --#if defined(SYS_BEOS) \ -+#if defined(SYS_BEOS) && !(defined(__HAIKU__))\ - || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) - typedef struct { - long long quot; /* Quotient. */ -diff -ur vlc-0.8.6i-original/include/vlc_threads.h vlc-0.8.6i/include/vlc_threads.h ---- vlc-0.8.6i-original/include/vlc_threads.h 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/include/vlc_threads.h 2009-11-07 23:53:51.000000000 +0000 -@@ -45,7 +45,7 @@ - #elif defined( HAVE_KERNEL_SCHEDULER_H ) /* BeOS */ - # include - # include --# include -+# include - - #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */ - # include -diff -ur vlc-0.8.6i-original/modules/codec/cinepak.c vlc-0.8.6i/modules/codec/cinepak.c ---- vlc-0.8.6i-original/modules/codec/cinepak.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/codec/cinepak.c 2009-11-08 00:57:55.000000000 +0000 -@@ -279,7 +279,7 @@ - int i_strip, int i_x, int i_y, - int i_x2, int i_y2, uint8_t *p_data ) - { -- uint8_t i_index[4]; -+ uint8_t i_index[4], *p_dst_y, *p_dst_u, *p_dst_v; - int i,j; - - size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5; -@@ -292,7 +292,7 @@ - if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz ) - return; - -- uint8_t *p_dst_y, *p_dst_u, *p_dst_v; -+ - #define PIX_SET_Y( x, y, v ) \ - p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v); - -@@ -336,7 +336,7 @@ - int i_strip, int i_x, int i_y, - int i_x2, int i_y2, uint8_t *p_data ) - { -- uint8_t i_index; -+ uint8_t i_index, *p_dst_y, *p_dst_u, *p_dst_v; - int i,j; - - size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5; -@@ -349,7 +349,6 @@ - if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz ) - return; - -- uint8_t *p_dst_y, *p_dst_u, *p_dst_v; - #define PIX_SET_Y( x, y, v ) \ - p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v); - -diff -ur vlc-0.8.6i-original/modules/codec/telx.c vlc-0.8.6i/modules/codec/telx.c ---- vlc-0.8.6i-original/modules/codec/telx.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/codec/telx.c 2009-11-08 00:59:26.000000000 +0000 -@@ -450,7 +450,7 @@ - vlc_bool_t b_update = VLC_FALSE; - char psz_text[512], *pt = psz_text; - char psz_line[256]; -- int i, total; -+ int i, total, mpag, row, magazine; - - if( pp_block == NULL || *pp_block == NULL ) return NULL; - p_block = *pp_block; -@@ -473,8 +473,7 @@ - /* continue; */ - /* } */ - -- int mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] ); -- int row, magazine; -+ mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] ); - if ( mpag < 0 ) - { - /* decode error */ -diff -ur vlc-0.8.6i-original/modules/demux/a52.c vlc-0.8.6i/modules/demux/a52.c ---- vlc-0.8.6i-original/modules/demux/a52.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/demux/a52.c 2009-11-08 01:00:41.000000000 +0000 -@@ -80,7 +80,7 @@ - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - byte_t *p_peek; -- int i_peek = 0; -+ int i_peek = 0, i_size; - vlc_bool_t b_big_endian = 0; /* Arbitrary initialisation */ - - /* Check if we are dealing with a WAV file */ -@@ -104,7 +104,7 @@ - - /* Some A52 wav files don't begin with a sync code so we do a more - * extensive search */ -- int i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2); -+ i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2); - i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE); - - while( i_peek < i_size ) -diff -ur vlc-0.8.6i-original/modules/demux/dts.c vlc-0.8.6i/modules/demux/dts.c ---- vlc-0.8.6i-original/modules/demux/dts.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/demux/dts.c 2009-11-08 01:01:49.000000000 +0000 -@@ -74,7 +74,8 @@ - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - byte_t * p_peek; -- int i_peek = 0; -+ int i_peek = 0, i_size; -+ uint32_t i_len; - - /* Check if we are dealing with a WAV file */ - if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 && -@@ -94,7 +95,7 @@ - } - - /* Sanity check the wave format header */ -- uint32_t i_len = GetDWLE( p_peek + i_peek - 4 ); -+ i_len = GetDWLE( p_peek + i_peek - 4 ); - if( i_len > DTS_PROBE_SIZE ) - return VLC_EGENERIC; - -@@ -124,7 +125,7 @@ - - /* Some DTS wav files don't begin with a sync code so we do a more - * extensive search */ -- int i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE ); -+ i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE ); - i_size -= DTS_MAX_HEADER_SIZE; - - while( i_peek < i_size ) -diff -ur vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp ---- vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp 2009-11-08 01:03:41.000000000 +0000 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+//#include - #include - #include - -diff -ur vlc-0.8.6i-original/modules/misc/network/ipv6.c vlc-0.8.6i/modules/misc/network/ipv6.c ---- vlc-0.8.6i-original/modules/misc/network/ipv6.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/misc/network/ipv6.c 2009-11-08 01:12:23.000000000 +0000 -@@ -239,6 +239,7 @@ - return 0; - } - -+#ifndef __HAIKU__ - /* Join the multicast group if the socket is a multicast address */ - if( IN6_IS_ADDR_MULTICAST(&loc.sin6_addr) ) - { -@@ -384,4 +385,5 @@ - p_socket->i_mtu = val.i_int; - - return 0; -+ #endif - } -diff -ur vlc-0.8.6i-original/modules/mux/mpeg/ts.c vlc-0.8.6i/modules/mux/mpeg/ts.c ---- vlc-0.8.6i-original/modules/mux/mpeg/ts.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/mux/mpeg/ts.c 2009-11-08 01:15:10.000000000 +0000 -@@ -1719,27 +1719,30 @@ - static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt ) - { - uint8_t *p_extra = p_fmt->p_extra; -+ int i_index, i_profile, i_channels, i_fullness; -+ uint8_t *p_buffer; -+ block_t *p_bak_block, *p_new_block; - - if( !p_data || p_fmt->i_extra < 2 || !p_extra ) - return p_data; /* no data to construct the headers */ - -- int i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f; -- int i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */ -+ i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f; -+ i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */ - - if( i_index == 0x0f && p_fmt->i_extra < 5 ) - return p_data; /* not enough data */ - -- int i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f; -+ i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f; - - #define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */ - - - /* keep a copy in case block_Realloc() fails */ -- block_t *p_bak_block = block_Duplicate( p_data ); -+ p_bak_block = block_Duplicate( p_data ); - if( !p_bak_block ) /* OOM, block_Realloc() is likely to lose our block */ - return p_data; /* the frame isn't correct but that's the best we have */ - -- block_t *p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE, -+ p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE, - p_data->i_buffer ); - if( !p_new_block ) - return p_bak_block; /* OOM, send the (incorrect) original frame */ -@@ -1747,7 +1750,7 @@ - block_Release( p_bak_block ); /* we don't need the copy anymore */ - - -- uint8_t *p_buffer = p_new_block->p_buffer; -+ p_buffer = p_new_block->p_buffer; - - /* fixed header */ - p_buffer[0] = 0xff; -@@ -1757,7 +1760,7 @@ - - /* variable header (starts at last 2 bits of 4th byte) */ - -- int i_fullness = 0x7ff; /* 0x7ff means VBR */ -+ i_fullness = 0x7ff; /* 0x7ff means VBR */ - /* XXX: We should check if it's CBR or VBR, but no known implementation - * do that, and it's a pain to calculate this field */ - -diff -ur vlc-0.8.6i-original/modules/packetizer/h264.c vlc-0.8.6i/modules/packetizer/h264.c ---- vlc-0.8.6i-original/modules/packetizer/h264.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/packetizer/h264.c 2009-11-08 01:21:24.000000000 +0000 -@@ -219,13 +219,14 @@ - i_sps = (*p++)&0x1f; - for( i = 0; i < i_sps; i++ ) - { -+ block_t *p_sps; - uint16_t i_length = GetWBE( p ); p += 2; - if( i_length > - (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p ) - { - return VLC_EGENERIC; - } -- block_t *p_sps = nal_get_annexeb( p_dec, p, i_length ); -+ p_sps = nal_get_annexeb( p_dec, p, i_length ); - if( !p_sps ) - return VLC_EGENERIC; - p_sys->p_sps = block_Duplicate( p_sps ); -@@ -237,13 +238,14 @@ - i_pps = *p++; - for( i = 0; i < i_pps; i++ ) - { -+ block_t *p_pps; - uint16_t i_length = GetWBE( p ); p += 2; - if( i_length > - (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p ) - { - return VLC_EGENERIC; - } -- block_t *p_pps = nal_get_annexeb( p_dec, p, i_length ); -+ p_pps = nal_get_annexeb( p_dec, p, i_length ); - if( !p_pps ) - return VLC_EGENERIC; - p_sys->p_pps = block_Duplicate( p_pps ); -@@ -446,7 +448,7 @@ - - for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; ) - { -- block_t *p_pic; -+ block_t *p_pic, *p_part; - int i_size = 0; - int i; - -@@ -462,7 +464,7 @@ - break; - } - -- block_t *p_part = nal_get_annexeb( p_dec, p, i_size ); -+ p_part = nal_get_annexeb( p_dec, p, i_size ); - if( !p_part ) - break; - p_part->i_dts = p_block->i_dts; -diff -ur vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c vlc-0.8.6i/modules/packetizer/mpeg4audio.c ---- vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/packetizer/mpeg4audio.c 2009-11-08 01:18:22.000000000 +0000 -@@ -332,6 +332,7 @@ - { - int i_profile, i_sample_rate_idx, i_frame_size; - vlc_bool_t b_crc; -+ unsigned short i_raw_blocks_in_frame; - - /* Fixed header between frames */ - //int i_id = ( (p_buf[1] >> 3) & 0x01) ? 2 : 4; /* MPEG-2 or 4 */ -@@ -350,7 +351,7 @@ - i_frame_size = ((p_buf[3] & 0x03) << 11) | (p_buf[4] << 3) | - ((p_buf[5] >> 5) /*& 0x7*/); - //uint16_t buffer_fullness = ((p_buf[5] & 0x1f) << 6) | (p_buf[6] >> 2); -- unsigned short i_raw_blocks_in_frame = p_buf[6] & 0x03; -+ i_raw_blocks_in_frame = p_buf[6] & 0x03; - - if( !*pi_sample_rate || !*pi_channels || !i_frame_size ) - { -@@ -436,15 +437,16 @@ - { - /* TODO compute channels count ? */ - int i_tag = bs_read( s, 4 ); -- if( i_tag != 0x05 ) -- return -1; -- bs_skip( s, 2 + 4 ); // object type + sampling index - int i_num_front = bs_read( s, 4 ); - int i_num_side = bs_read( s, 4 ); - int i_num_back = bs_read( s, 4 ); - int i_num_lfe = bs_read( s, 2 ); - int i_num_assoc_data = bs_read( s, 3 ); - int i_num_valid_cc = bs_read( s, 4 ); -+ int i_comment; -+ if( i_tag != 0x05 ) -+ return -1; -+ bs_skip( s, 2 + 4 ); // object type + sampling index - - if( bs_read1(s) ) - bs_skip( s, 4 ); // mono downmix -@@ -460,19 +462,20 @@ - bs_skip( s, i_num_assoc_data * (4) ); - bs_skip( s, i_num_valid_cc * (5) ); - bs_align( s ); -- int i_comment = bs_read( s, 8 ); -+ i_comment = bs_read( s, 8 ); - bs_skip( s, i_comment * 8 ); - return 0; - } - - static int Mpeg4GASpecificConfig( mpeg4_cfg_t *p_cfg, bs_t *s ) - { -+ int i_extension_flag; - p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024; - - if( bs_read1( s ) ) // depend on core coder - bs_skip( s, 14 ); // core coder delay - -- int i_extension_flag = bs_read1( s ); -+ i_extension_flag = bs_read1( s ); - if( p_cfg->i_channel == 0 ) - { - Mpeg4GAProgramConfigElement( s ); -diff -ur vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c vlc-0.8.6i/modules/stream_out/mosaic_bridge.c ---- vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/stream_out/mosaic_bridge.c 2009-11-08 01:22:30.000000000 +0000 -@@ -339,11 +339,12 @@ - - if ( p_sys->p_decoder != NULL ) - { -+ void *p_owner; - picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics; - - if( p_sys->p_decoder->p_module ) - module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module ); -- void *p_owner = p_sys->p_decoder->p_owner; -+ p_owner = p_sys->p_decoder->p_owner; - vlc_object_detach( p_sys->p_decoder ); - vlc_object_destroy( p_sys->p_decoder ); - -diff -ur vlc-0.8.6i-original/modules/stream_out/switcher.c vlc-0.8.6i/modules/stream_out/switcher.c ---- vlc-0.8.6i-original/modules/stream_out/switcher.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/stream_out/switcher.c 2009-11-08 01:23:24.000000000 +0000 -@@ -657,8 +657,9 @@ - - if ( i_len > 0 ) - { -+ int i_cmd; - psz_buffer[i_len] = '\0'; -- int i_cmd = strtol( psz_buffer, NULL, 0 ); -+ i_cmd = strtol( psz_buffer, NULL, 0 ); - if ( i_cmd < -1 || i_cmd > p_sys->i_nb_pictures ) - { - msg_Err( p_stream, "got a wrong command (%d)", i_cmd ); -diff -ur vlc-0.8.6i-original/src/extras/libc.c vlc-0.8.6i/src/extras/libc.c ---- vlc-0.8.6i-original/src/extras/libc.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/extras/libc.c 2009-11-08 00:44:49.000000000 +0000 -@@ -348,7 +348,7 @@ - /***************************************************************************** - * lldiv: returns quotient and remainder - *****************************************************************************/ --#if defined(SYS_BEOS) \ -+#if defined(SYS_BEOS) & !(defined(__HAIKU__))\ - || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) - lldiv_t vlc_lldiv( long long numer, long long denom ) - { -diff -ur vlc-0.8.6i-original/src/input/input.c vlc-0.8.6i/src/input/input.c ---- vlc-0.8.6i-original/src/input/input.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/input/input.c 2009-11-08 00:30:10.000000000 +0000 -@@ -1913,11 +1913,11 @@ - { - vlc_meta_t *tk = p_meta->track[i]; - int j; -+ char *psz_cat; - - if( tk->i_meta > 0 ) - { - msg_Dbg( p_input, " - track[%d]:", i ); -- char *psz_cat; - if( asprintf( &psz_cat, "%s %d", _("Stream"), i ) != -1 ) - { - for( j = 0; j < tk->i_meta; j++ ) -diff -ur vlc-0.8.6i-original/src/misc/beos_specific.cpp vlc-0.8.6i/src/misc/beos_specific.cpp ---- vlc-0.8.6i-original/src/misc/beos_specific.cpp 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/misc/beos_specific.cpp 2009-11-09 18:46:51.000000000 +0000 -@@ -154,7 +154,7 @@ - { - BAlert *alert; - alert = new BAlert( "VLC " PACKAGE_VERSION, -- "VLC " PACKAGE_VERSION " for BeOS\n\n" -+ "VLC " PACKAGE_VERSION " for Haiku\n\n" - "", "OK"); - alert->Go( NULL ); - } -diff -ur vlc-0.8.6i-original/src/misc/threads.c vlc-0.8.6i/src/misc/threads.c ---- vlc-0.8.6i-original/src/misc/threads.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/misc/threads.c 2009-11-08 17:02:02.000000000 +0000 -@@ -647,6 +647,7 @@ - int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file, - int i_line, int i_priority ) - { -+/* - #if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H ) - #elif defined( WIN32 ) || defined( UNDER_CE ) - if( !SetThreadPriority(GetCurrentThread(), i_priority) ) -@@ -689,7 +690,7 @@ - } - } - #endif -- -+*/ - return 0; - } - -@@ -790,3 +791,7 @@ - p_this->b_thread = 0; - } - -+ -+ -+ -+ -Only in vlc-0.8.6i-original/src/misc: version.c -diff -ur vlc-0.8.6i-original/src/misc/vlm.c vlc-0.8.6i/src/misc/vlm.c ---- vlc-0.8.6i-original/src/misc/vlm.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/misc/vlm.c 2009-11-08 00:42:59.000000000 +0000 -@@ -1368,10 +1368,11 @@ - - vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name ) - { -+ vlm_schedule_t *p_sched; - if( !psz_name ) - return NULL; - -- vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) ); -+ p_sched = malloc( sizeof( vlm_schedule_t ) ); - if( !p_sched ) - return NULL; - -diff -ur vlc-0.8.6i-original/src/network/httpd.c vlc-0.8.6i/src/network/httpd.c ---- vlc-0.8.6i-original/src/network/httpd.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/network/httpd.c 2009-11-08 00:33:09.000000000 +0000 -@@ -365,7 +365,7 @@ - static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query ) - { - httpd_file_t *file = (httpd_file_t*)p_sys; -- uint8_t **pp_body, *p_body; -+ uint8_t **pp_body, *p_body, *psz_args; - char *psz_connection = NULL; - int *pi_body, i_body; - -@@ -402,7 +402,7 @@ - /* msg_Warn not supported */ - } - -- uint8_t *psz_args = query->psz_args; -+ psz_args = query->psz_args; - file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body ); - - if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL ) -@@ -487,6 +487,7 @@ - { - httpd_handler_t *handler = (httpd_handler_t*)p_sys; - char psz_remote_addr[NI_MAXNUMERICHOST]; -+ uint8_t *psz_args; - - if( answer == NULL || query == NULL ) - { -@@ -502,7 +503,7 @@ - if( httpd_ClientIP( cl, psz_remote_addr ) == NULL ) - *psz_remote_addr = '\0'; - -- uint8_t *psz_args = query->psz_args; -+ psz_args = query->psz_args; - handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args, - query->i_type, query->p_body, query->i_body, - psz_remote_addr, NULL, -diff -ur vlc-0.8.6i-original/src/stream_output/sap.c vlc-0.8.6i/src/stream_output/sap.c ---- vlc-0.8.6i-original/src/stream_output/sap.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/stream_output/sap.c 2009-11-08 01:26:17.000000000 +0000 -@@ -287,7 +287,8 @@ - - memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 ); -- if( IN6_IS_ADDR_MULTICAST( a6 ) ) -+ #ifndef __HAIKU__ -+ if( IN6_IS_ADDR_MULTICAST( a6 ) ) - { - /* SSM <=> ff3x::/32 */ - b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000; -@@ -301,6 +302,7 @@ - - b_ipv6 = VLC_TRUE; - break; -+ #endif - } - #endif - diff --git a/media-video/vlc/vlc-0.8.6i.bep b/media-video/vlc/vlc-0.8.6i.recipe similarity index 96% rename from media-video/vlc/vlc-0.8.6i.bep rename to media-video/vlc/vlc-0.8.6i.recipe index 0cc7f3333..8b1e4981e 100644 --- a/media-video/vlc/vlc-0.8.6i.bep +++ b/media-video/vlc/vlc-0.8.6i.recipe @@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23, libmad ffmpeg = 7407" CHECKSUM_MD5="fd852166d1705573cd7768a06117ed51" -BUILD { +BUILD() +{ cd vlc-0.8.6i libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd vlc-0.8.6i make install } diff --git a/media-video/vlc/vlc-1.1.5-20101107.bep b/media-video/vlc/vlc-1.1.5_20101107.recipe similarity index 96% rename from media-video/vlc/vlc-1.1.5-20101107.bep rename to media-video/vlc/vlc-1.1.5_20101107.recipe index 53aca8ef8..f949fcd33 100644 --- a/media-video/vlc/vlc-1.1.5-20101107.bep +++ b/media-video/vlc/vlc-1.1.5_20101107.recipe @@ -16,14 +16,16 @@ DEPEND="pkgconfig >= 0.23 libdca ffmpeg >= 0.6" CHECKSUM_MD5="9ab7d8218ff37e362f996fd7d8879dbc" -BUILD { +BUILD() +{ cd vlc-1.1.5 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-postproc --disable-xcb --disable-skins2 --disable-qt4 --disable-libgcrypt --disable-remoteosd make } -INSTALL { +INSTALL() +{ cd vlc-1.1.5 make install } diff --git a/media-video/vlc/vlc-2.0.5.bep b/media-video/vlc/vlc-2.0.5.recipe similarity index 97% rename from media-video/vlc/vlc-2.0.5.bep rename to media-video/vlc/vlc-2.0.5.recipe index 8fc3003ea..f8376144c 100644 --- a/media-video/vlc/vlc-2.0.5.bep +++ b/media-video/vlc/vlc-2.0.5.recipe @@ -24,14 +24,16 @@ DEPEND="faad2, libsdl sdl-image" CHECKSUM_MD5="4f959c0766ada8cea5a72c65fce94ebe" -BUILD { +BUILD() +{ cd vlc-2.0.5 bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-kde-solid=no --disable-xcb --enable-run-as-root --enable-static make } -INSTALL { +INSTALL() +{ cd vlc-2.0.5 make install } diff --git a/meta-ports/meta_portsfile/meta_portsfile-1.recipe b/meta-ports/meta_portsfile/meta_portsfile-1.recipe new file mode 100644 index 000000000..0a00238bd --- /dev/null +++ b/meta-ports/meta_portsfile/meta_portsfile-1.recipe @@ -0,0 +1,14 @@ +SUMMARY="Meta package for building all ports of a given portsfile" +DESCRIPTION="Meta package for building all ports of a given portsfile" +REVISION="1" +COPYRIGHT="2013 The HaikuPorts team" +LICENSE="MIT" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + meta_portsfile = $portVersion + " +BUILD_REQUIRES=" + $portsfileAsRequires + " diff --git a/net-ftp/tnftp/tnftp-20091122.bep b/net-ftp/tnftp/tnftp-20091122.recipe similarity index 96% rename from net-ftp/tnftp/tnftp-20091122.bep rename to net-ftp/tnftp/tnftp-20091122.recipe index 44df64778..548a015ae 100644 --- a/net-ftp/tnftp/tnftp-20091122.bep +++ b/net-ftp/tnftp/tnftp-20091122.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="e7f86e7680648b675ee27c94655de494" -BUILD { +BUILD() +{ cd tnftpd-20091122 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tnftpd-20091122 make install } diff --git a/net-irc/irssi/irssi-0.8.15.bep b/net-irc/irssi/irssi-0.8.15.recipe similarity index 96% rename from net-irc/irssi/irssi-0.8.15.bep rename to net-irc/irssi/irssi-0.8.15.recipe index 6399e319a..8018d3fc9 100644 --- a/net-irc/irssi/irssi-0.8.15.bep +++ b/net-irc/irssi/irssi-0.8.15.recipe @@ -9,7 +9,8 @@ DEPEND="sys-devel/gettext >= 0.18.1 dev-util/pkgconfig >= 0.25 dev-libs/glib >= 2.24.2" -BUILD { +BUILD() +{ cd irssi-0.8.15 libtoolize --force --copy --install autoreconf -i @@ -19,7 +20,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd irssi-0.8.15 make install } diff --git a/net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch b/net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch new file mode 100644 index 000000000..82a32bbd2 --- /dev/null +++ b/net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch @@ -0,0 +1,38 @@ +diff -ur rhapsody-0.28b.org/configure rhapsody-0.28b/configure +--- rhapsody-0.28b.org/configure 2006-02-24 07:46:19.017301504 +0100 ++++ rhapsody-0.28b/configure 2012-11-22 20:29:15.727973888 +0100 +@@ -168,6 +168,25 @@ + + STDDOCSPATH="/usr/share/doc/rhapsody" + ++elif [ "$OS" = "Haiku" ] ; then ++ CCPATH="/boot/develop/tools/gnupro/bin /boot/develop/bin" ++ CURSESPATH="/boot/develop/headers/3rdparty /boot/develop/headers /boot/develop/headers/gnu" ++ ++ GCCBASELIBS="-lncurses -lnetwork" ++ GCCBASELIBPATHS="" ++ GCCBASEINCPATHS="" ++ GCCBASEFLAGS="-g -Wall -Wno-unused" ++ ++ CCBASELIBS="" ++ CCBASELIBPATHS="" ++ CCBASEINCPATHS="" ++ CCBASEFLAGS="" ++ ++ STDDOCSPATH="`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/rhapsody" ++ if [ -z "$INSTALLPATH" ] ; then ++ INSTALLPATH="`finddir B_COMMON_BIN_DIRECTORY`" ++ fi ++ + elif [ "$OS" = "HP-UX" ] ; then + CCPATH="/bin /usr/bin /usr/local/bin" + CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses" +@@ -235,7 +254,7 @@ + # Set install, docs, header and lib path if not provided # + ########################################################### + +-if [ $USER = "root" ] ; then ++if [ $USER = "root" -o "$UID" = "0" ] ; then + echo "Running as root." + + if [ -z "$INSTALLPATH" ] ; then diff --git a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep b/net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe similarity index 95% rename from net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep rename to net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe index 922b8640b..36f23e23e 100644 --- a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep +++ b/net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="untested" DEPEND="" CHECKSUM_MD5="0792de636a2625a826491e387fcb1305" -BUILD { +BUILD() +{ cd rhapsody-0.28b ./configure make } -INSTALL { +INSTALL() +{ cd rhapsody-0.28b make install } diff --git a/net-libs/enet/enet-1.2.2.bep b/net-libs/enet/enet-1.2.2.recipe similarity index 94% rename from net-libs/enet/enet-1.2.2.bep rename to net-libs/enet/enet-1.2.2.recipe index 0cca6af8c..cb333e94b 100644 --- a/net-libs/enet/enet-1.2.2.bep +++ b/net-libs/enet/enet-1.2.2.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd enet-1.2.2 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd enet-1.2.2 make install } diff --git a/net-libs/enet/enet-1.3.0.bep b/net-libs/enet/enet-1.3.0.recipe similarity index 94% rename from net-libs/enet/enet-1.3.0.bep rename to net-libs/enet/enet-1.3.0.recipe index 6373d6cee..4d50c2c85 100644 --- a/net-libs/enet/enet-1.3.0.bep +++ b/net-libs/enet/enet-1.3.0.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd enet-1.3.0 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd enet-1.3.0 make install } diff --git a/net-libs/gnutls/gnutls-2.8.6.bep b/net-libs/gnutls/gnutls-2.8.6.recipe similarity index 97% rename from net-libs/gnutls/gnutls-2.8.6.bep rename to net-libs/gnutls/gnutls-2.8.6.recipe index 274b38205..5555e8d64 100644 --- a/net-libs/gnutls/gnutls-2.8.6.bep +++ b/net-libs/gnutls/gnutls-2.8.6.recipe @@ -10,7 +10,8 @@ LICENSE="GNU LGPL v2.1" COPYRIGHT="2009-2010 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" -BUILD { +BUILD() +{ cd gnutls-2.8.6 libtoolize --force --copy --install autoreconf @@ -25,7 +26,8 @@ BUILD { ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gnutls-2.8.6 make install } diff --git a/net-libs/hubbub/hubbub-0.1.2.bep b/net-libs/hubbub/hubbub-0.1.2.recipe similarity index 94% rename from net-libs/hubbub/hubbub-0.1.2.bep rename to net-libs/hubbub/hubbub-0.1.2.recipe index 18e4c6314..46bb76916 100644 --- a/net-libs/hubbub/hubbub-0.1.2.bep +++ b/net-libs/hubbub/hubbub-0.1.2.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar. REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd hubbub-0.1.2 make } -INSTALL { +INSTALL() +{ cd hubbub-0.1.2 make install } diff --git a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe similarity index 95% rename from net-libs/hubbub/hubbub-0.1.2-HEAD.bep rename to net-libs/hubbub/hubbub-0.1.2_HEAD.recipe index f39828ea1..32617af60 100644 --- a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep +++ b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="dev-util/buildsystem >= 0 dev-libs/libparserutils >= 0.1.1" -BUILD { +BUILD() +{ cd hubbub-0.1.2-HEAD make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd hubbub-0.1.2-HEAD make install PREFIX=/boot/common } diff --git a/net-libs/hubbub/hubbub-0.2.0-HEAD.bep b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe similarity index 100% rename from net-libs/hubbub/hubbub-0.2.0-HEAD.bep rename to net-libs/hubbub/hubbub-0.2.0_HEAD.recipe diff --git a/net-libs/libdom/libdom-0.0.1-HEAD.bep b/net-libs/libdom/libdom-0.0.1_HEAD.recipe similarity index 100% rename from net-libs/libdom/libdom-0.0.1-HEAD.bep rename to net-libs/libdom/libdom-0.0.1_HEAD.recipe diff --git a/net-libs/libdom/libdom-0.recipe b/net-libs/libdom/libdom-0.recipe new file mode 100644 index 000000000..c40feeb05 --- /dev/null +++ b/net-libs/libdom/libdom-0.recipe @@ -0,0 +1,22 @@ +DESCRIPTION="LibDOM is an implementation of the W3C DOM" +HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" +SRC_URI="git://git.netsurf-browser.org/libdom.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lib/hubbub >= 0.1.2-HEAD" + +BUILD() +{ + cd libdom-0 + make PREFIX=/boot/common +} + +INSTALL() +{ + cd libdom-0 + make install PREFIX=/boot/common +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/libs3/libs3-2.0.bep b/net-libs/libs3/libs3-2.0.recipe similarity index 95% rename from net-libs/libs3/libs3-2.0.bep rename to net-libs/libs3/libs3-2.0.recipe index 7d2683e9c..b17e948e3 100644 --- a/net-libs/libs3/libs3-2.0.bep +++ b/net-libs/libs3/libs3-2.0.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/libxml2>=2.7.3 net-misc/curl>=7.18.2" -BUILD { +BUILD() +{ cd libs3-2.0 make DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd libs3-2.0 make install DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY` } diff --git a/net-libs/libtorrent/libtorrent-0.12.5.bep b/net-libs/libtorrent/libtorrent-0.12.5.recipe similarity index 96% rename from net-libs/libtorrent/libtorrent-0.12.5.bep rename to net-libs/libtorrent/libtorrent-0.12.5.recipe index cb29cf3cb..fa8156d4b 100644 --- a/net-libs/libtorrent/libtorrent-0.12.5.bep +++ b/net-libs/libtorrent/libtorrent-0.12.5.recipe @@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-libs/openssl >= 0.9.8l libsigc++ >= ??" -BUILD { +BUILD() +{ cd libtorrent-0.12.5 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-mincore make } -INSTALL { +INSTALL() +{ cd libtorrent-0.12.5 make install } diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.bep b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe similarity index 96% rename from net-libs/libyahoo2/libyahoo2-1.0.1.bep rename to net-libs/libyahoo2/libyahoo2-1.0.1.recipe index 73e0b396a..5ffba2e85 100644 --- a/net-libs/libyahoo2/libyahoo2-1.0.1.bep +++ b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe @@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.net/projects/libyahoo2/files/libyahoo2/1.0.1/libyaho DEPEND="glib >= 1.2.8" REVISION="1" CHECKSUM_MD5="e62dd7bc2dd77622cc0987a4dbf9b38c" -BUILD { +BUILD() +{ cd libyahoo2-1.0.1 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libyahoo2-1.0.1 make install } diff --git a/net-misc/axel/axel-2.4.bep b/net-misc/axel/axel-2.4.recipe similarity index 95% rename from net-misc/axel/axel-2.4.bep rename to net-misc/axel/axel-2.4.recipe index f8a7e1722..367d54498 100644 --- a/net-misc/axel/axel-2.4.bep +++ b/net-misc/axel/axel-2.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="a2a762fce0c96781965c8f9786a3d09d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd axel-2.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --i18n=0 make } -INSTALL { +INSTALL() +{ cd axel-2.4 make install DESTDIR="${DESTDIR}" } diff --git a/net-misc/curl/curl-7.18.2.bep b/net-misc/curl/curl-7.18.2.bep deleted file mode 100644 index 2dfa3a06c..000000000 --- a/net-misc/curl/curl-7.18.2.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.18.2.tar.bz2" -CHECKSUM_MD5="c389be5b0525276e58865956b7465562" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.18.2 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.18.2 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.1.bep b/net-misc/curl/curl-7.19.1.bep deleted file mode 100644 index 2aa33457c..000000000 --- a/net-misc/curl/curl-7.19.1.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.19.1.tar.bz2" -CHECKSUM_MD5="6c4921e55ad276154065052c9e34e1cb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.19.1 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.19.1 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.2.bep b/net-misc/curl/curl-7.19.2.bep deleted file mode 100644 index a5aec318b..000000000 --- a/net-misc/curl/curl-7.19.2.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.19.2.tar.bz2" -CHECKSUM_MD5="3a461b145a4a31fe7d5a44684e7fbdbc" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.19.2 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.19.2 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.5.bep b/net-misc/curl/curl-7.19.5.bep deleted file mode 100644 index 00a363fbe..000000000 --- a/net-misc/curl/curl-7.19.5.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.19.5.tar.bz2" -CHECKSUM_MD5="426d161661dce70c8ea9ad8f553363a3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.19.5 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.19.5 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.7.bep b/net-misc/curl/curl-7.19.7.bep deleted file mode 100644 index 8f1b9aab4..000000000 --- a/net-misc/curl/curl-7.19.7.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.19.7.tar.gz" -CHECKSUM_MD5="ecb2e37e45c9933e2a963cabe03670ab" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.19.7 - cmake -DCMAKE_INSTALL_PREFIX=`finddir B_COMMON_DIRECTORY` -DCURL_DISABLE_LDAP=ON . - make -} - -INSTALL { - cd curl-7.19.7 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.20.0.bep b/net-misc/curl/curl-7.20.0.bep deleted file mode 100644 index 904bc0e74..000000000 --- a/net-misc/curl/curl-7.20.0.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.20.0.tar.bz2" -CHECKSUM_MD5="3dda78c4a808d9a779dc3a2ae81b47d8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.20.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.20.0 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.20.1.bep b/net-misc/curl/curl-7.20.1.bep deleted file mode 100644 index 56a82aeb8..000000000 --- a/net-misc/curl/curl-7.20.1.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.20.1.tar.bz2" -CHECKSUM_MD5="244b16b2a38c70e47130c8494b7371b9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.20.1 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.20.1 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.1.bep b/net-misc/curl/curl-7.21.1.bep deleted file mode 100644 index eb7349259..000000000 --- a/net-misc/curl/curl-7.21.1.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.1.tar.bz2" -CHECKSUM_MD5="eafde5b933bce1c1dca82d1054c8d967" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.21.1 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.21.1 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.2.bep b/net-misc/curl/curl-7.21.2.bep deleted file mode 100644 index 1a0e915f9..000000000 --- a/net-misc/curl/curl-7.21.2.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.2.tar.bz2" -CHECKSUM_MD5="ca96df88e044c7c25d19692ec8b250b2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.21.2 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.21.2 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.3.bep b/net-misc/curl/curl-7.21.3.bep deleted file mode 100644 index 8d4c718da..000000000 --- a/net-misc/curl/curl-7.21.3.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.3.tar.bz2" -CHECKSUM_MD5="5b57fee22090b5c43a6886fdd35af2ce" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.21.3 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd curl-7.21.3 - make install -} - -TEST { - cd curl-7.21.3 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.4.bep b/net-misc/curl/curl-7.21.4.bep deleted file mode 100644 index 255a593ed..000000000 --- a/net-misc/curl/curl-7.21.4.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.4.tar.bz2" -CHECKSUM_MD5="e2dd20c88a7d01c745af9d788545ab2a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.21.4 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd curl-7.21.4 - make install -} - -TEST { - cd curl-7.21.4 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.6.bep b/net-misc/curl/curl-7.21.6.bep deleted file mode 100644 index 117f23860..000000000 --- a/net-misc/curl/curl-7.21.6.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.6.tar.bz2" -CHECKSUM_MD5="6611989a81ebd7b03a35adc3001ddee0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.21.6 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd curl-7.21.6 - make install -} - -TEST { - cd curl-7.21.6 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.7.bep b/net-misc/curl/curl-7.21.7.bep deleted file mode 100644 index a06380a11..000000000 --- a/net-misc/curl/curl-7.21.7.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.7.tar.bz2" -CHECKSUM_MD5="5f6d50c4d4ee38c57fe37e3cff75adbd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.21.7 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL { - cd curl-7.21.7 - make install -} - -TEST { - cd curl-7.21.7 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.22.0.bep b/net-misc/curl/curl-7.22.0.recipe similarity index 95% rename from net-misc/curl/curl-7.22.0.bep rename to net-misc/curl/curl-7.22.0.recipe index 50d927213..ad9fd6a90 100644 --- a/net-misc/curl/curl-7.22.0.bep +++ b/net-misc/curl/curl-7.22.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="bdb5c226d37c4a6082c70e7ef6f63060" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.22.0 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.22.0 make install } -TEST { +TEST() +{ cd curl-7.22.0 make check } diff --git a/net-misc/curl/curl-7.24.0.bep b/net-misc/curl/curl-7.24.0.bep deleted file mode 100644 index 2510ae640..000000000 --- a/net-misc/curl/curl-7.24.0.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.24.0.tar.bz2" -CHECKSUM_MD5="f912221d75eb8d8fe08900eaf011b023" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.24.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL { - cd curl-7.24.0 - make install -} - -TEST { - cd curl-7.24.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.25.0.bep b/net-misc/curl/curl-7.25.0.bep deleted file mode 100644 index 63d578dd4..000000000 --- a/net-misc/curl/curl-7.25.0.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.25.0.tar.bz2" -CHECKSUM_MD5="f0303d47d9d3e6e4f08c2863c6504823" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.25.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL { - cd curl-7.25.0 - make install -} - -TEST { - cd curl-7.25.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.26.0.bep b/net-misc/curl/curl-7.26.0.bep deleted file mode 100644 index 6159dc157..000000000 --- a/net-misc/curl/curl-7.26.0.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" -CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.26.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL { - cd curl-7.26.0 - make install -} - -TEST { - cd curl-7.26.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe new file mode 100644 index 000000000..f7c24844c --- /dev/null +++ b/net-misc/curl/curl-7.26.0.recipe @@ -0,0 +1,115 @@ +SUMMARY="A commandline-tool and library for downloading data from URLs" +HOMEPAGE="http://curl.haxx.se" +COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." +LICENSE="Curl" +SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" +CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="curl-7.26.0.patch" + +PROVIDES=" + curl$secondaryArchSuffix = $portVersion + lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:curl = $portVersion compat >= 7.16 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + ca_root_certificates + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + certsInstallDir="$portPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + + libtoolize --force --copy --install + autoconf + runConfigure ./configure \ + --enable-ipv6 \ + --with-ca-bundle="$certsDir/CARootCertificates.pem" + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libcurl + fixPkgconfig + + # fix curl-config + fixDevelopLibDirReferences $binDir/curl-config + sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ + -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config + + # install html documentation for curl + mkdir -p "$docDir" + install -c -m 644 "docs/curl.html" "$docDir" + + # install html development documentation for libcurl + mkdir -p "$developDocDir" + for h in docs/libcurl/*.html; do + install -c -m 644 "$h" "$developDocDir" + done + + # devel package + packageEntries devel \ + $binDir/curl-config \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +TEST() +{ + make check +} + +DESCRIPTION=" + Curl is a command line tool for transferring data with URL syntax, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, + LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. + curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, + HTTP form based upload, proxies, cookies, user+password authentication + (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, + proxy tunneling and a busload of other useful tricks. + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + curl${secondaryArchSuffix}_devel = $portVersion + cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 + devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +REQUIRES_devel=" + curl$secondaryArchSuffix == $portVersion base + " diff --git a/net-misc/curl/curl-7.28.1.bep b/net-misc/curl/curl-7.28.1.recipe similarity index 95% rename from net-misc/curl/curl-7.28.1.bep rename to net-misc/curl/curl-7.28.1.recipe index db5cc8c17..4edbc9429 100644 --- a/net-misc/curl/curl-7.28.1.bep +++ b/net-misc/curl/curl-7.28.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="26eb081c999b0e203770869427e9a93d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.28.1 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.28.1 make install } -TEST { +TEST() +{ cd curl-7.28.1 make check } diff --git a/net-misc/curl/curl-7.29.0.bep b/net-misc/curl/curl-7.29.0.recipe similarity index 95% rename from net-misc/curl/curl-7.29.0.bep rename to net-misc/curl/curl-7.29.0.recipe index 5e17b146e..c9ffc72c0 100644 --- a/net-misc/curl/curl-7.29.0.bep +++ b/net-misc/curl/curl-7.29.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fa5f37f38a8042020e292ce7ec5341ce" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.29.0 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.29.0 make install } -TEST { +TEST() +{ cd curl-7.29.0 make check } diff --git a/net-misc/curl/curl-7.30.0.bep b/net-misc/curl/curl-7.30.0.bep deleted file mode 100644 index 4248b463f..000000000 --- a/net-misc/curl/curl-7.30.0.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.30.0.tar.bz2" -CHECKSUM_MD5="0db5ec03a5001b42a2edc03bf63b5ceb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd curl-7.30.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL { - cd curl-7.30.0 - make install -} - -TEST { - cd curl-7.30.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.32.0.recipe b/net-misc/curl/curl-7.32.0.recipe new file mode 100644 index 000000000..bf40b05b3 --- /dev/null +++ b/net-misc/curl/curl-7.32.0.recipe @@ -0,0 +1,115 @@ +SUMMARY="A commandline-tool and library for downloading data from URLs" +HOMEPAGE="http://curl.haxx.se" +COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." +LICENSE="Curl" +SRC_URI="http://curl.haxx.se/download/curl-7.32.0.tar.bz2" +CHECKSUM_MD5="30d04b0a8c43c6770039d1bf033dfe79" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PATCHES="" + +PROVIDES=" + curl$secondaryArchSuffix = $portVersion + lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:curl = $portVersion compat >= 7.16 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + ca_root_certificates + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + certsInstallDir="$portPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + + libtoolize --force --copy --install + autoconf + runConfigure ./configure \ + --enable-ipv6 \ + --with-ca-bundle="$certsDir/CARootCertificates.pem" + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libcurl + fixPkgconfig + + # fix curl-config + fixDevelopLibDirReferences $binDir/curl-config + sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ + -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config + + # install html documentation for curl + mkdir -p "$docDir" + install -c -m 644 "docs/curl.html" "$docDir" + + # install html development documentation for libcurl + mkdir -p "$developDocDir" + for h in docs/libcurl/*.html; do + install -c -m 644 "$h" "$developDocDir" + done + + # devel package + packageEntries devel \ + $binDir/curl-config \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +TEST() +{ + make check +} + +DESCRIPTION=" + Curl is a command line tool for transferring data with URL syntax, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, + LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. + curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, + HTTP form based upload, proxies, cookies, user+password authentication + (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, + proxy tunneling and a busload of other useful tricks. + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + curl${secondaryArchSuffix}_devel = $portVersion + cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 + devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +REQUIRES_devel=" + curl$secondaryArchSuffix == $portVersion base + " diff --git a/net-misc/curl/curl-7.33.0.recipe b/net-misc/curl/curl-7.33.0.recipe new file mode 100644 index 000000000..52c364ca9 --- /dev/null +++ b/net-misc/curl/curl-7.33.0.recipe @@ -0,0 +1,115 @@ +SUMMARY="A commandline-tool and library for downloading data from URLs" +HOMEPAGE="http://curl.haxx.se" +COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." +LICENSE="Curl" +SRC_URI="http://curl.haxx.se/download/curl-7.33.0.tar.bz2" +CHECKSUM_MD5="57409d6bf0bd97053b8378dbe0cadcef" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PATCHES="" + +PROVIDES=" + curl$secondaryArchSuffix = $portVersion + lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:curl = $portVersion compat >= 7.16 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + ca_root_certificates + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + certsInstallDir="$portPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + + libtoolize --force --copy --install + autoconf + runConfigure ./configure \ + --enable-ipv6 \ + --with-ca-bundle="$certsDir/CARootCertificates.pem" + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libcurl + fixPkgconfig + + # fix curl-config + fixDevelopLibDirReferences $binDir/curl-config + sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ + -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config + + # install html documentation for curl + mkdir -p "$docDir" + install -c -m 644 "docs/curl.html" "$docDir" + + # install html development documentation for libcurl + mkdir -p "$developDocDir" + for h in docs/libcurl/*.html; do + install -c -m 644 "$h" "$developDocDir" + done + + # devel package + packageEntries devel \ + $binDir/curl-config \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +TEST() +{ + make check +} + +DESCRIPTION=" + Curl is a command line tool for transferring data with URL syntax, + supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, + LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. + curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, + HTTP form based upload, proxies, cookies, user+password authentication + (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, + proxy tunneling and a busload of other useful tricks. + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + curl${secondaryArchSuffix}_devel = $portVersion + cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 + devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +REQUIRES_devel=" + curl$secondaryArchSuffix == $portVersion base + " diff --git a/net-misc/mediatomb/mediatomb-0.12.1.bep b/net-misc/mediatomb/mediatomb-0.12.1.recipe similarity index 97% rename from net-misc/mediatomb/mediatomb-0.12.1.bep rename to net-misc/mediatomb/mediatomb-0.12.1.recipe index 4fcad94e2..2d39714bb 100644 --- a/net-misc/mediatomb/mediatomb-0.12.1.bep +++ b/net-misc/mediatomb/mediatomb-0.12.1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." CHECKSUM_MD5="e927dd5dc52d3cfcebd8ca1af6f0d3c2" -BUILD { +BUILD() +{ cd mediatomb-0.12.1 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mediatomb-0.12.1 make install } diff --git a/net-misc/minidlna/minidlna-1.0.21.bep b/net-misc/minidlna/minidlna-1.0.21.recipe similarity index 97% rename from net-misc/minidlna/minidlna-1.0.21.bep rename to net-misc/minidlna/minidlna-1.0.21.recipe index 03bf74f5f..8839d9911 100644 --- a/net-misc/minidlna/minidlna-1.0.21.bep +++ b/net-misc/minidlna/minidlna-1.0.21.recipe @@ -12,12 +12,14 @@ DEPEND="dev-db/sqlite >= 3.0 media-lib/libid3tag >= 0.15.1b" CHECKSUM_MD5="a53e0008ad225843a1782e4af6e5bf0b" -BUILD { +BUILD() +{ cd minidlna-1.0.21 make } -INSTALL { +INSTALL() +{ cd minidlna-1.0.21 make install } diff --git a/net-misc/neon/neon-0.29.1.bep b/net-misc/neon/neon-0.29.1.recipe similarity index 96% rename from net-misc/neon/neon-0.29.1.bep rename to net-misc/neon/neon-0.29.1.recipe index 1736b67db..950c45d2c 100644 --- a/net-misc/neon/neon-0.29.1.bep +++ b/net-misc/neon/neon-0.29.1.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 0.9.8l dev-libs/libxml2 >= 2.7.3" CHECKSUM_MD5="eb4eac0499cb6fced6e3b11e4b720ebb" -BUILD { +BUILD() +{ cd neon-0.29.1 autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } -INSTALL { +INSTALL() +{ cd neon-0.29.1 make install } diff --git a/net-misc/neon/neon-0.29.3.bep b/net-misc/neon/neon-0.29.3.recipe similarity index 96% rename from net-misc/neon/neon-0.29.3.bep rename to net-misc/neon/neon-0.29.3.recipe index 074fcef9e..b3c3da7a5 100644 --- a/net-misc/neon/neon-0.29.3.bep +++ b/net-misc/neon/neon-0.29.3.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="ba1015b59c112d44d7797b62fe7bee51" -BUILD { +BUILD() +{ cd neon-0.29.3 autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } -INSTALL { +INSTALL() +{ cd neon-0.29.3 make install } diff --git a/net-misc/neon/neon-0.29.4.bep b/net-misc/neon/neon-0.29.4.recipe similarity index 96% rename from net-misc/neon/neon-0.29.4.bep rename to net-misc/neon/neon-0.29.4.recipe index 8634d568f..dd059582c 100644 --- a/net-misc/neon/neon-0.29.4.bep +++ b/net-misc/neon/neon-0.29.4.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="29438dbdaee84db2d7fbc73248a92d93" -BUILD { +BUILD() +{ cd neon-0.29.4 autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } -INSTALL { +INSTALL() +{ cd neon-0.29.4 make install } diff --git a/net-misc/neon/neon-0.29.5.bep b/net-misc/neon/neon-0.29.5.recipe similarity index 97% rename from net-misc/neon/neon-0.29.5.bep rename to net-misc/neon/neon-0.29.5.recipe index 89d0f5957..1cd36b5e1 100644 --- a/net-misc/neon/neon-0.29.5.bep +++ b/net-misc/neon/neon-0.29.5.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="ff369e69ef0f0143beb5626164e87ae2" -BUILD { +BUILD() +{ cd neon-0.29.5 echo 'LT_INIT' >> configure.in. echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in @@ -28,7 +29,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd neon-0.29.5 make install } diff --git a/net-misc/neon/neon-0.29.6.bep b/net-misc/neon/neon-0.29.6.bep deleted file mode 100644 index 77b8e060d..000000000 --- a/net-misc/neon/neon-0.29.6.bep +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface" -HOMEPAGE="http://www.webdav.org/neon/" -SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libxml2 >= 2.7.8" -CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" -BUILD { - cd neon-0.29.6 - echo 'LT_INIT' >> configure.in - echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in - autogen.sh - libtoolize --force --copy --install - aclocal - autoconf - autogen.sh - libtoolize --force --copy --install - aclocal -I macros - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-ssl \ - --with-libxml2 \ - --enable-shared \ - --disable-nls \ - --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd neon-0.29.6 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1999-2011 Joe Orton" diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe new file mode 100644 index 000000000..9c86751fe --- /dev/null +++ b/net-misc/neon/neon-0.29.6.recipe @@ -0,0 +1,105 @@ +SUMMARY="HTTP and WebDAV client library, with a C interface" +DESCRIPTION=" + neon is an HTTP and WebDAV client library, with a C interface. Features: + + - high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, + DELETE, etc) + - low-level interface to the HTTP request/response engine, allowing the + use of arbitrary HTTP methods, headers, etc. + - authentication support including Basic and Digest support, along with + GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32 + - SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer + for verifying server certificates, handling client certificates, and + examining certificate properties. Smartcard-based client certificates + are also supported via a PKCS#11 wrapper interface. + - abstract interface to parsing XML using libxml2 or expat, and wrappers + for simplifying handling XML HTTP response bodies + - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify + property manipulation. + " +HOMEPAGE="http://www.webdav.org/neon/" +LICENSE="GNU LGPL v2" +COPYRIGHT="1999-2011 Joe Orton" +SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" +CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" +REVISION="7" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="neon-0.29.6.patch" + +PROVIDES=" + neon = $portVersion compat >= 0.29 + lib:libneon = 27.2.6 compat >= 27.2 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libcrypto + lib:libncurses + lib:libssl + lib:libxml2 + lib:libz + " +BUILD_REQUIRES=" + devel:libcrypto + devel:libncurses + devel:libssl >= 1.0.0 + devel:libxml2 >= 2.7.8 + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + echo 'LT_INIT' >> configure.in + echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in + ./autogen.sh + libtoolize --force --copy --install + aclocal + autoconf + ./autogen.sh + libtoolize --force --copy --install + aclocal -I macros + autoconf + runConfigure ./configure \ + --with-ssl \ + --with-libxml2 \ + --enable-shared \ + --disable-nls + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libneon + fixDevelopLibDirReferences $binDir/neon-config + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir/neon-config \ + $developDir \ + $documentationDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + neon_devel = $portVersion compat >= 0.29 + cmd:neon_config = $portVersion compat >= 0.29 + devel:libneon = 27.2.6 compat >= 27 + " +REQUIRES_devel=" + neon == $portVersion base + " diff --git a/net-misc/neon/patches/neon-0.29.6.patch b/net-misc/neon/patches/neon-0.29.6.patch new file mode 100644 index 000000000..7bdb12180 --- /dev/null +++ b/net-misc/neon/patches/neon-0.29.6.patch @@ -0,0 +1,12 @@ +diff -ur orig/neon-0.29.6/Makefile.in neon-0.29.6/Makefile.in +--- orig/neon-0.29.6/Makefile.in 2009-09-04 09:36:26.062914560 +0200 ++++ neon-0.29.6/Makefile.in 2013-04-30 19:33:32.347340800 +0200 +@@ -22,7 +22,7 @@ + man3dir = $(mandir)/man3 + datarootdir = @datarootdir@ + datadir = @datadir@ +-docdir = $(datadir)/doc/neon-@NEON_VERSION@ ++docdir = @docdir@ + includedir = @includedir@ + neonincludes = $(includedir)/neon + pkgconfigdir = $(libdir)/pkgconfig diff --git a/net-misc/ntp/ntp-4.2.6p2.bep b/net-misc/ntp/ntp-4.2.6p2.recipe similarity index 96% rename from net-misc/ntp/ntp-4.2.6p2.bep rename to net-misc/ntp/ntp-4.2.6p2.recipe index a49f06770..b35017e6c 100644 --- a/net-misc/ntp/ntp-4.2.6p2.bep +++ b/net-misc/ntp/ntp-4.2.6p2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="cf73cd85f248232c62f8029e6eb05938" -BUILD { +BUILD() +{ cd ntp-4.2.6p2 libtoolize --force --copy --install ./bootstrap @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ntp-4.2.6p2 make install } diff --git a/net-misc/openssh/sshd_keymaker.sh b/net-misc/openssh/additional-files/sshd_keymaker.sh similarity index 100% rename from net-misc/openssh/sshd_keymaker.sh rename to net-misc/openssh/additional-files/sshd_keymaker.sh diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.bep deleted file mode 100644 index 50854a365..000000000 --- a/net-misc/openssh/openssh-5.4p1.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.4p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 0.9.8l" -CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e" -BUILD { - cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h - cd openssh-5.4p1 - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=PATH \ - --with-md5-passwords - make -} - -INSTALL { - cd openssh-5.4p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} -LICENSE="OpenSSH" -COPYRIGHT="2005-2010 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.5p1.bep b/net-misc/openssh/openssh-5.5p1.bep deleted file mode 100644 index c07b09b58..000000000 --- a/net-misc/openssh/openssh-5.5p1.bep +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.5p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb" -BUILD { - cd openssh-5.5p1 - autoconf - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-5.5p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} -LICENSE="OpenSSH" -COPYRIGHT="2005-2010 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.6p1.bep b/net-misc/openssh/openssh-5.6p1.bep deleted file mode 100644 index e2691ddfe..000000000 --- a/net-misc/openssh/openssh-5.6p1.bep +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.6p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="e6ee52e47c768bf0ec42a232b5d18fb0" -BUILD { - cd openssh-5.6p1 - autoconf - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-5.6p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST { - cd openssh-5.6p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2010 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.7p1.bep b/net-misc/openssh/openssh-5.7p1.bep deleted file mode 100644 index 6763b784f..000000000 --- a/net-misc/openssh/openssh-5.7p1.bep +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.7p1.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.7p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="50231fa257219791fa41b84a16c9df04" -BUILD { - cd openssh-5.7p1 - autoconf - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-5.7p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST { - cd openssh-5.7p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.8p1.bep b/net-misc/openssh/openssh-5.8p1.bep deleted file mode 100644 index 07b4d6461..000000000 --- a/net-misc/openssh/openssh-5.8p1.bep +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p1.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="86f5e1c23b4c4845f23b9b7b493fb53d" -BUILD { - cd openssh-5.8p1 - autoconf - mkdir -p m4 - aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-5.8p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST { - cd openssh-5.8p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.8p2.bep b/net-misc/openssh/openssh-5.8p2.bep deleted file mode 100644 index d5d99c515..000000000 --- a/net-misc/openssh/openssh-5.8p2.bep +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e" -BUILD { - cd openssh-5.8p2 - autoconf - mkdir -p m4 - aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --sbindir=$COMMON_BIN \ - --bindir=$COMMON_BIN \ - --libexecdir=$COMMON_BIN \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=$COMMON_DIR/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-5.8p2 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST { - cd openssh-5.8p2 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe new file mode 100644 index 000000000..8b0c28a9f --- /dev/null +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -0,0 +1,95 @@ +SUMMARY="Secure Shell Client and Server (Remote Login Program)" +HOMEPAGE="http://www.openssh.com/" +LICENSE="OpenSSH" +COPYRIGHT="2005-2011 Tatu Ylonen et al." +SRC_URI=" + http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz + http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz + " +CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="openssh-5.8p2.patch" + +ADDITIONAL_FILES="sshd_keymaker.sh" + +PROVIDES=" + openssh = $portVersion compat >= 5 + cmd:scp = $portVersion compat >= 5 + cmd:sftp = $portVersion compat >= 5 + cmd:sftp_server = $portVersion compat >= 5 + cmd:slogin = $portVersion compat >= 5 + cmd:ssh = $portVersion compat >= 5 + cmd:ssh_add = $portVersion compat >= 5 + cmd:ssh_agent = $portVersion compat >= 5 + cmd:ssh_keygen = $portVersion compat >= 5 + cmd:ssh_keyscan = $portVersion compat >= 5 + cmd:ssh_keysign = $portVersion compat >= 5 + cmd:ssh_pkcs11_helper = $portVersion compat >= 5 + cmd:sshd = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libcrypto + lib:libedit + lib:libssl + lib:libz + " +BUILD_REQUIRES=" + openssl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac +} + +BUILD() +{ + mkdir -p m4 + aclocal --install -I m4 + libtoolize --force --copy + aclocal -I m4 + autoconf + defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin" + defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin" + defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps" + defaultPath+=":/boot/system/preferences" + runConfigure ./configure \ + --with-privsep-path=$dataDir/openssh/empty \ + --with-default-path="$defaultPath" \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make $jobArgs +} + +INSTALL() +{ + make install-nokeys + postInstallDir=$prefix/boot/post_install + mkdir -p $postInstallDir + cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir +} + +TEST() +{ + make tests +} + +DESCRIPTION="OpenSSH is a FREE version of the SSH connectivity tools that technical users of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH provides secure tunneling capabilities and several authentication methods, and supports all SSH protocol versions. + +The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with scp, and ftp with sftp. Also included is sshd (the server side of the package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, ssh-keygen and sftp-server." diff --git a/net-misc/openssh/openssh-5.9p1.bep b/net-misc/openssh/openssh-5.9p1.bep deleted file mode 100644 index b99bf3fd4..000000000 --- a/net-misc/openssh/openssh-5.9p1.bep +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="afe17eee7e98d3b8550cc349834a85d0" -BUILD { - cd openssh-5.9p1 - autoconf - mkdir -p m4 - aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --sbindir=$COMMON_BIN \ - --bindir=$COMMON_BIN \ - --libexecdir=$COMMON_BIN \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=$COMMON_DIR/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-5.9p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST { - cd openssh-5.9p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-6.0p1.bep b/net-misc/openssh/openssh-6.0p1.bep deleted file mode 100644 index dfc6c758d..000000000 --- a/net-misc/openssh/openssh-6.0p1.bep +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -BUILD { - cd openssh-6.0p1 - autoconf - mkdir -p m4 - aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --sbindir=$COMMON_BIN \ - --bindir=$COMMON_BIN \ - --libexecdir=$COMMON_BIN \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=$COMMON_DIR/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL { - cd openssh-6.0p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST { - cd openssh - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2012 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe new file mode 100644 index 000000000..7bb7085e7 --- /dev/null +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -0,0 +1,122 @@ +SUMMARY="Secure Shell Client and Server (Remote Login Program)" +HOMEPAGE="http://www.openssh.com/" +LICENSE="OpenSSH" +COPYRIGHT="2005-2012 Tatu Ylonen et al." +SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" +CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" +REVISION="8" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="openssh-6.0p1.patch" + +ADDITIONAL_FILES="sshd_keymaker.sh" + +PROVIDES=" + openssh = $portVersion compat >= 5 + cmd:scp = $portVersion compat >= 5 + cmd:sftp = $portVersion compat >= 5 + cmd:sftp_server = $portVersion compat >= 5 + cmd:slogin = $portVersion compat >= 5 + cmd:ssh = $portVersion compat >= 5 + cmd:ssh_add = $portVersion compat >= 5 + cmd:ssh_agent = $portVersion compat >= 5 + cmd:ssh_keygen = $portVersion compat >= 5 + cmd:ssh_keyscan = $portVersion compat >= 5 + cmd:ssh_keysign = $portVersion compat >= 5 + cmd:ssh_pkcs11_helper = $portVersion compat >= 5 + cmd:sshd = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:login + cmd:passwd + lib:libcrypto + lib:libedit + lib:libncurses + lib:libssl + lib:libz + " +BUILD_REQUIRES=" + devel:libcrypto + devel:libedit + devel:libncurses + devel:libssl + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config + " + +GLOBAL_WRITABLE_FILES=" + settings/ssh directory keep-old + " +USER_SETTINGS_FILES=" + settings/ssh directory + " +POST_INSTALL_SCRIPTS=" + $relativePostInstallDir/sshd_keymaker.sh + " +sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty" +PACKAGE_USERS=" + sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\" + " +PACKAGE_GROUPS="sshd" + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac +} + +BUILD() +{ + mkdir -p m4 + aclocal --install -I m4 + libtoolize --force --copy + aclocal -I m4 + autoconf + defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin" + defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin" + defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps" + defaultPath+=":/boot/system/preferences" + + # Note: override sysconfdir and libexecdir since ssh doesn't create + # subdirectories as it should. + PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \ + LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \ + runConfigure ./configure \ + --sysconfdir=$sysconfDir/ssh \ + --libexecdir=$libExecDir/openssh \ + --with-privsep-path=$dataDir/openssh/empty \ + --with-pid-dir=$prefix/var/run \ + --with-default-path="$defaultPath" \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make $jobArgs +} + +INSTALL() +{ + make install-nokeys + mkdir -p $postInstallDir + cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir +} + +TEST() +{ + make tests +} + +DESCRIPTION="OpenSSH is a FREE version of the SSH connectivity tools that technical users of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH provides secure tunneling capabilities and several authentication methods, and supports all SSH protocol versions. + +The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with scp, and ftp with sftp. Also included is sshd (the server side of the package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, ssh-keygen and sftp-server." diff --git a/net-misc/openssh/openssh-6.1p1.bep b/net-misc/openssh/openssh-6.1p1.recipe similarity index 97% rename from net-misc/openssh/openssh-6.1p1.bep rename to net-misc/openssh/openssh-6.1p1.recipe index 774fd80b5..42e495aa7 100644 --- a/net-misc/openssh/openssh-6.1p1.bep +++ b/net-misc/openssh/openssh-6.1p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="3345cbf4efe90ffb06a78670ab2d05d5" -BUILD { +BUILD() +{ cd openssh-6.1p1 autoconf mkdir -p m4 @@ -35,14 +36,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-6.1p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-6.1p1 make tests diff --git a/net-misc/openssh/openssh-6.2p1.bep b/net-misc/openssh/openssh-6.2p1.recipe similarity index 97% rename from net-misc/openssh/openssh-6.2p1.bep rename to net-misc/openssh/openssh-6.2p1.recipe index 478b6ea04..6ae4454c7 100644 --- a/net-misc/openssh/openssh-6.2p1.bep +++ b/net-misc/openssh/openssh-6.2p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="7b2d9dd75b5cf267ea1737ec75500316" -BUILD { +BUILD() +{ cd openssh-6.2p1 # sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g' #Makefile.in @@ -37,14 +38,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-6.2p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-6.2p1 make tests } diff --git a/net-misc/openssh/patches/openssh-5.2p1-haiku.patch b/net-misc/openssh/patches/openssh-5.2p1-haiku.patch deleted file mode 100644 index 61f87e9e8..000000000 --- a/net-misc/openssh/patches/openssh-5.2p1-haiku.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -urN openssh-5.2p1/configure.ac openssh-5.2p1-haiku/configure.ac ---- openssh-5.2p1/configure.ac 2009-05-19 03:58:15.000000000 +0000 -+++ openssh-5.2p1-haiku/configure.ac 2009-05-19 05:02:04.000000000 +0000 -@@ -484,6 +484,11 @@ - *-*-dragonfly*) - SSHDLIBS="$SSHDLIBS -lcrypt" - ;; -+*-*-haiku*) -+ LIBS="$LIBS -lbsd " -+ AC_CHECK_LIB(network, socket) -+ MANTYPE=man -+ ;; - *-*-hpux*) - # first we define all of the options common to all HP-UX releases - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" -@@ -2611,6 +2616,19 @@ - ) - fi - -+if test -z "$have_u_int64_t" ; then -+ AC_MSG_CHECKING([for u_int64_t type in posix/stdint.h]) -+ AC_TRY_COMPILE( -+ [ #include ], -+ [ u_int64_t a; a = 1], -+ [ -+ AC_DEFINE(HAVE_U_INT64_T) -+ AC_MSG_RESULT(yes) -+ ], -+ [ AC_MSG_RESULT(no) ] -+ ) -+fi -+ - if test -z "$have_u_intxx_t" ; then - AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ - AC_TRY_COMPILE( diff --git a/net-misc/openssh/patches/openssh-5.4p1.patch b/net-misc/openssh/patches/openssh-5.4p1.patch deleted file mode 100644 index 6b2669972..000000000 --- a/net-misc/openssh/patches/openssh-5.4p1.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -urN openssh-5.4p1/configure.ac openssh-5.4p1-haiku/configure.ac ---- openssh-5.4p1/configure.ac 2010-03-05 04:04:35.015990784 +0000 -+++ openssh-5.4p1-haiku/configure.ac 2010-03-16 09:39:10.537133056 +0000 -@@ -488,6 +488,11 @@ - *-*-dragonfly*) - SSHDLIBS="$SSHDLIBS -lcrypt" - ;; -+*-*-haiku*) -+ LIBS="$LIBS -lbsd " -+ AC_CHECK_LIB(network, socket) -+ MANTYPE=man -+ ;; - *-*-hpux*) - # first we define all of the options common to all HP-UX releases - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" -@@ -2648,6 +2653,19 @@ - ) - fi - -+if test -z "$have_u_int64_t" ; then -+ AC_MSG_CHECKING([for u_int64_t type in posix/stdint.h]) -+ AC_TRY_COMPILE( -+ [ #include ], -+ [ u_int64_t a; a = 1], -+ [ -+ AC_DEFINE(HAVE_U_INT64_T) -+ AC_MSG_RESULT(yes) -+ ], -+ [ AC_MSG_RESULT(no) ] -+ ) -+fi -+ - if test -z "$have_u_intxx_t" ; then - AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ - AC_TRY_COMPILE( diff --git a/net-misc/openssh/patches/openssh-5.5p1.patch b/net-misc/openssh/patches/openssh-5.5p1.patch deleted file mode 100644 index 055b257d0..000000000 --- a/net-misc/openssh/patches/openssh-5.5p1.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -urN openssh-5.5p1/configure.ac openssh-5.5p1-haiku/configure.ac ---- openssh-5.5p1/configure.ac 2010-04-10 12:58:01.014942208 +0000 -+++ openssh-5.5p1-haiku/configure.ac 2010-04-30 05:09:08.936378368 +0000 -@@ -1277,7 +1277,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.5p1/pathnames.h openssh-5.5p1-haiku/pathnames.h ---- openssh-5.5p1/pathnames.h 2010-02-24 06:17:58.023592960 +0000 -+++ openssh-5.5p1-haiku/pathnames.h 2010-04-30 04:53:52.000000000 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -44,7 +52,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -57,24 +65,24 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -82,7 +90,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -92,10 +100,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -103,7 +111,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -147,17 +155,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -169,11 +176,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.6p1.patch b/net-misc/openssh/patches/openssh-5.6p1.patch deleted file mode 100644 index df54e5193..000000000 --- a/net-misc/openssh/patches/openssh-5.6p1.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -urN openssh-5.6p1/configure.ac openssh-5.6p1-haiku/configure.ac ---- openssh-5.6p1/configure.ac 2010-04-10 12:58:01.014942208 +0000 -+++ openssh-5.6p1-haiku/configure.ac 2010-04-30 05:09:08.936378368 +0000 -@@ -1277,7 +1277,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.6p1/pathnames.h openssh-5.6p1-haiku/pathnames.h ---- openssh-5.6p1/pathnames.h 2010-02-24 06:17:58.023592960 +0000 -+++ openssh-5.6p1-haiku/pathnames.h 2010-04-30 04:53:52.000000000 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -44,7 +52,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -57,24 +65,24 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -82,7 +90,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -92,10 +100,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -103,7 +111,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -147,17 +155,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -169,11 +176,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.7p1.patch b/net-misc/openssh/patches/openssh-5.7p1.patch deleted file mode 100644 index fc1b8579d..000000000 --- a/net-misc/openssh/patches/openssh-5.7p1.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -urN openssh-5.7p1/configure.ac openssh-5.7p1-haiku/configure.ac ---- openssh-5.7p1/configure.ac 2011-01-21 22:37:05.026738688 +0000 -+++ openssh-5.7p1-haiku/configure.ac 2011-01-25 08:26:16.039583744 +0000 -@@ -1347,7 +1347,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h ---- openssh-5.7p1/pathnames.h 2010-08-31 12:41:14.035651584 +0000 -+++ openssh-5.7p1-haiku/pathnames.h 2011-01-25 08:26:32.062914560 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +53,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +66,25 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -84,7 +92,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +102,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +113,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -149,17 +157,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +178,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.8p1.patch b/net-misc/openssh/patches/openssh-5.8p1.patch deleted file mode 100644 index cfa13681b..000000000 --- a/net-misc/openssh/patches/openssh-5.8p1.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -urN openssh-5.8p1/configure.ac openssh-5.8p1-haiku/configure.ac ---- openssh-5.8p1/configure.ac 2011-01-21 22:37:05.026738688 +0000 -+++ openssh-5.8p1-haiku/configure.ac 2011-01-25 08:26:16.039583744 +0000 -@@ -1347,7 +1347,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.8p1/pathnames.h openssh-5.8p1-haiku/pathnames.h ---- openssh-5.8p1/pathnames.h 2010-08-31 12:41:14.035651584 +0000 -+++ openssh-5.8p1-haiku/pathnames.h 2011-01-25 08:26:32.062914560 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +53,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +66,25 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -84,7 +92,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +102,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +113,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -149,17 +157,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +178,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-6.0p1.patch b/net-misc/openssh/patches/openssh-6.0p1.patch index a61ef0c9e..018ec093b 100644 --- a/net-misc/openssh/patches/openssh-6.0p1.patch +++ b/net-misc/openssh/patches/openssh-6.0p1.patch @@ -1,7 +1,18 @@ -diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-haiku/configure.ac ---- openssh-6.0p1/configure.ac 2012-04-19 11:46:38.030408704 +0000 -+++ openssh-6.0p1-haiku/configure.ac 2012-09-24 16:55:13.139198464 +0000 -@@ -1432,7 +1432,7 @@ +diff -ur orig/openssh-6.0p1/configure.ac openssh-6.0p1/configure.ac +--- orig/openssh-6.0p1/configure.ac 2012-04-19 13:46:38.045613056 +0200 ++++ openssh-6.0p1/configure.ac 2013-04-29 21:27:34.023068672 +0200 +@@ -92,7 +92,9 @@ + fi + fi + +-AC_PATH_PROG([PATH_PASSWD_PROG], [passwd]) ++if test -z "$PATH_PASSWD_PROG" ; then ++ AC_PATH_PROG([PATH_PASSWD_PROG], [passwd]) ++fi + if test ! -z "$PATH_PASSWD_PROG" ; then + AC_DEFINE_UNQUOTED([_PATH_PASSWD_PROG], ["$PATH_PASSWD_PROG"], + [Full path of your "passwd" program]) +@@ -1432,7 +1434,7 @@ LIBEDIT=`$PKGCONFIG --libs-only-l libedit` CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" else @@ -10,35 +21,10 @@ diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-haiku/configure.ac fi OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` AC_CHECK_LIB([edit], [el_init], -diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h ---- openssh-6.0p1/pathnames.h 2011-05-29 11:39:38.039583744 +0000 -+++ openssh-6.0p1-haiku/pathnames.h 2012-09-24 16:55:13.148373504 +0000 -@@ -12,7 +12,14 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +52,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +65,25 @@ +diff -ur orig/openssh-6.0p1/pathnames.h openssh-6.0p1/pathnames.h +--- orig/openssh-6.0p1/pathnames.h 2011-05-29 13:39:38.054788096 +0200 ++++ openssh-6.0p1/pathnames.h 2013-04-29 21:29:17.578289664 +0200 +@@ -58,25 +58,25 @@ * The directory in user's home directory in which the files reside. The * directory should be world-readable (though not all files are). */ @@ -51,10 +37,10 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h * contain anything particularly secret. */ -#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "~/" _PATH_SSH_USER_DIR "/known_hosts" /* backward compat for protocol 2 */ -#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "~/" _PATH_SSH_USER_DIR "/known_hosts2" /* * Name of the default file containing client-side authentication key. This @@ -71,7 +57,7 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h /* * Configuration file in user's home directory. This file need not be -@@ -84,7 +91,7 @@ +@@ -84,7 +84,7 @@ * particularly secret. If the user's home directory resides on an NFS * volume where root is mapped to nobody, this may need to be world-readable. */ @@ -80,7 +66,7 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h /* * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +101,10 @@ +@@ -94,10 +94,10 @@ * may need to be world-readable. (This file is read by the daemon which is * running as root.) */ @@ -93,7 +79,7 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h /* * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +112,7 @@ +@@ -105,7 +105,7 @@ * passed "proto cookie" as arguments if X11 forwarding with spoofing is in * use. xauth will be run if neither of these exists. */ @@ -102,38 +88,15 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" /* -@@ -149,17 +156,16 @@ +diff -ur orig/openssh-6.0p1/sshd_config openssh-6.0p1/sshd_config +--- orig/openssh-6.0p1/sshd_config 2011-05-29 13:39:39.064225280 +0200 ++++ openssh-6.0p1/sshd_config 2013-04-29 12:51:20.314834944 +0200 +@@ -47,7 +47,7 @@ - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" - #endif + # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 + # but this is overridden so installations will only check .ssh/authorized_keys +-AuthorizedKeysFile .ssh/authorized_keys ++AuthorizedKeysFile config/settings/ssh/authorized_keys - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +177,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ + # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts + #RhostsRSAAuthentication no diff --git a/net-misc/putty/putty-0.60.bep b/net-misc/putty/putty-0.60.recipe similarity index 95% rename from net-misc/putty/putty-0.60.bep rename to net-misc/putty/putty-0.60.recipe index b3d5378bd..560513fb6 100644 --- a/net-misc/putty/putty-0.60.bep +++ b/net-misc/putty/putty-0.60.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="07e65fd98b16d115ae38a180bfb242e2" -BUILD { +BUILD() +{ cd putty-0.60/unix autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make all-cli } -INSTALL { +INSTALL() +{ cd putty-0.60/unix make install } diff --git a/net-misc/rsync/rsync-3.0.6.bep b/net-misc/rsync/rsync-3.0.6.recipe similarity index 96% rename from net-misc/rsync/rsync-3.0.6.bep rename to net-misc/rsync/rsync-3.0.6.recipe index 05957249e..a6f65b494 100644 --- a/net-misc/rsync/rsync-3.0.6.bep +++ b/net-misc/rsync/rsync-3.0.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e9865d093a18e4668b9d31b635dc8e99" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd rsync-3.0.6 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-ipv6 --disable-locale --disable-debug @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd rsync-3.0.6 make install make test diff --git a/net-misc/rsync/rsync-3.0.7.bep b/net-misc/rsync/rsync-3.0.7.recipe similarity index 95% rename from net-misc/rsync/rsync-3.0.7.bep rename to net-misc/rsync/rsync-3.0.7.recipe index 8870b43cc..f41741b4c 100644 --- a/net-misc/rsync/rsync-3.0.7.bep +++ b/net-misc/rsync/rsync-3.0.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b53525900817cf1ba7ad3a516ab5bfe9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd rsync-3.0.7 libtoolize --force --copy --install aclocal @@ -21,12 +22,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd rsync-3.0.7 make install } -TEST { +TEST() +{ cd rsync-3.0.7 make test } diff --git a/net-misc/tor/tor-0.2.2.35.bep b/net-misc/tor/tor-0.2.2.35.recipe similarity index 94% rename from net-misc/tor/tor-0.2.2.35.bep rename to net-misc/tor/tor-0.2.2.35.recipe index d55bb8c24..25429e380 100644 --- a/net-misc/tor/tor-0.2.2.35.bep +++ b/net-misc/tor/tor-0.2.2.35.recipe @@ -6,19 +6,22 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 0.9.8 dev-libs/libevent >= 2.0.10" CHECKSUM_MD5="dcecf699c4b929319d5f1ce0358d4835" -BUILD { +BUILD() +{ cd tor-0.2.2.35 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd tor-0.2.2.35 make install } -TEST { +TEST() +{ cd tor-0.2.2.35 make test } diff --git a/net-misc/tor/tor-0.2.3.25.bep b/net-misc/tor/tor-0.2.3.25.recipe similarity index 96% rename from net-misc/tor/tor-0.2.3.25.bep rename to net-misc/tor/tor-0.2.3.25.recipe index e94e06d86..5ad986a9d 100644 --- a/net-misc/tor/tor-0.2.3.25.bep +++ b/net-misc/tor/tor-0.2.3.25.recipe @@ -7,7 +7,8 @@ DEPEND="dev-libs/openssl >= 0.9.8 dev-libs/libevent >= 2.0.10" CHECKSUM_MD5="a1c364189a9a66ed9daa8e6436489daf" -BUILD { +BUILD() +{ cd tor-0.2.3.25 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tor-0.2.3.25 make install } -TEST { +TEST() +{ cd tor-0.2.3.25 make test } diff --git a/net-misc/wget/wget-1.12.bep b/net-misc/wget/wget-1.12.recipe similarity index 95% rename from net-misc/wget/wget-1.12.bep rename to net-misc/wget/wget-1.12.recipe index 8954800d9..88030be1d 100644 --- a/net-misc/wget/wget-1.12.bep +++ b/net-misc/wget/wget-1.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="141461b9c04e454dc8933c9d1f2abf83" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd wget-1.12 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd wget-1.12 make install } diff --git a/net-misc/wget/wget-1.13.4.bep b/net-misc/wget/wget-1.13.4.recipe similarity index 94% rename from net-misc/wget/wget-1.13.4.bep rename to net-misc/wget/wget-1.13.4.recipe index 673ebc9ea..8b3a0e2f3 100644 --- a/net-misc/wget/wget-1.13.4.bep +++ b/net-misc/wget/wget-1.13.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="1df489976a118b9cbe1b03502adbfc27" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd wget-1.13.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl=openssl make } -INSTALL { +INSTALL() +{ cd wget-1.13.4 make install } diff --git a/net-misc/wput/wput-0.6.1.bep b/net-misc/wput/wput-0.6.1.recipe similarity index 96% rename from net-misc/wput/wput-0.6.1.bep rename to net-misc/wput/wput-0.6.1.recipe index 063e55f5b..0d1884ebf 100644 --- a/net-misc/wput/wput-0.6.1.bep +++ b/net-misc/wput/wput-0.6.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="92b41efed4db8eb4f3443c23bf7ceecf" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd wput-0.6.1 echo 'LT_INIT' >> configure.in echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd wput-0.6.1 make install } diff --git a/net-p2p/rtorrent/rtorrent-0.8.5.bep b/net-p2p/rtorrent/rtorrent-0.8.5.recipe similarity index 96% rename from net-p2p/rtorrent/rtorrent-0.8.5.bep rename to net-p2p/rtorrent/rtorrent-0.8.5.recipe index b5f3f8eee..60b24ccb1 100644 --- a/net-p2p/rtorrent/rtorrent-0.8.5.bep +++ b/net-p2p/rtorrent/rtorrent-0.8.5.recipe @@ -11,14 +11,16 @@ DEPEND="pkgconfig >= 0.23 libsigc++ >= ?? net-libs/libtorrent >= 0.12.5" -BUILD { +BUILD() +{ cd rtorrent-0.8.5 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd rtorrent-0.8.5 make install } diff --git a/net-p2p/seeks/seeks-0.x-git.bep b/net-p2p/seeks/seeks-0.x_git.recipe similarity index 96% rename from net-p2p/seeks/seeks-0.x-git.bep rename to net-p2p/seeks/seeks-0.x_git.recipe index 0b074c7a6..71ce8179b 100644 --- a/net-p2p/seeks/seeks-0.x-git.bep +++ b/net-p2p/seeks/seeks-0.x_git.recipe @@ -8,14 +8,16 @@ STATUS_HAIKU="untested" # pkgconfig is only a build dependency DEPEND="pkgconfig >= 0.25" -BUILD { +BUILD() +{ cd seeks-0.x-git ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd seeks-0.x-git make install } diff --git a/net-p2p/transmission/patches/transmission-2.73.patch b/net-p2p/transmission/patches/transmission-2.73.patch index b719e158a..80d694fa4 100644 --- a/net-p2p/transmission/patches/transmission-2.73.patch +++ b/net-p2p/transmission/patches/transmission-2.73.patch @@ -1,6 +1,6 @@ -diff -Naur ./transmission-2.73/third-party/miniupnp/connecthostport.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c ---- ./transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/connecthostport.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c +--- transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur ./transmission-2.73/third-party/miniupnp/connecthostport.c ./transmis #include #define closesocket close #include -diff -Naur ./transmission-2.73/third-party/miniupnp/miniupnpc.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c ---- ./transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/miniupnpc.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c +--- transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur ./transmission-2.73/third-party/miniupnp/miniupnpc.c ./transmission-2 #define HAS_IP_MREQN #endif -diff -Naur ./transmission-2.73/third-party/miniupnp/portlistingparse.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c ---- ./transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/portlistingparse.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c +--- transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */ diff --git a/net-p2p/transmission/patches/transmission-2.75.patch b/net-p2p/transmission/patches/transmission-2.75.patch index 074c85751..91a47f0a3 100644 --- a/net-p2p/transmission/patches/transmission-2.75.patch +++ b/net-p2p/transmission/patches/transmission-2.75.patch @@ -1,6 +1,6 @@ -diff -Naur ./transmission-2.75/third-party/miniupnp/connecthostport.c ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c ---- ./transmission-2.75/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 +diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c +--- transmission-2.75/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 ++++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur ./transmission-2.75/third-party/miniupnp/connecthostport.c ./transmis #include #define closesocket close #include -diff -Naur ./transmission-2.75/third-party/miniupnp/miniupnpc.c ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c ---- ./transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 +diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c +--- transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 ++++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur ./transmission-2.75/third-party/miniupnp/miniupnpc.c ./transmission-2 #define HAS_IP_MREQN #endif -diff -Naur ./transmission-2.75/third-party/miniupnp/portlistingparse.c ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c ---- ./transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ ./transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 +diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c +--- transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 ++++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */ diff --git a/net-p2p/transmission/transmission-1.72.bep b/net-p2p/transmission/transmission-1.72.recipe similarity index 96% rename from net-p2p/transmission/transmission-1.72.bep rename to net-p2p/transmission/transmission-1.72.recipe index 7bad2285c..09e7cdb9c 100644 --- a/net-p2p/transmission/transmission-1.72.bep +++ b/net-p2p/transmission/transmission-1.72.recipe @@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-1.72 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-1.72 make install } diff --git a/net-p2p/transmission/transmission-1.73.bep b/net-p2p/transmission/transmission-1.73.recipe similarity index 96% rename from net-p2p/transmission/transmission-1.73.bep rename to net-p2p/transmission/transmission-1.73.recipe index 1b0aef828..a52a5c4ff 100644 --- a/net-p2p/transmission/transmission-1.73.bep +++ b/net-p2p/transmission/transmission-1.73.recipe @@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-1.73 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-1.73 make install } diff --git a/net-p2p/transmission/transmission-1.93.bep b/net-p2p/transmission/transmission-1.93.recipe similarity index 97% rename from net-p2p/transmission/transmission-1.93.bep rename to net-p2p/transmission/transmission-1.93.recipe index 1c00284ba..edda11292 100644 --- a/net-p2p/transmission/transmission-1.93.bep +++ b/net-p2p/transmission/transmission-1.93.recipe @@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-1.93 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-1.93 make install } diff --git a/net-p2p/transmission/transmission-2.01.bep b/net-p2p/transmission/transmission-2.01.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.01.bep rename to net-p2p/transmission/transmission-2.01.recipe index 432836baf..51c142d8e 100644 --- a/net-p2p/transmission/transmission-2.01.bep +++ b/net-p2p/transmission/transmission-2.01.recipe @@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-2.01 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-2.01 make install } diff --git a/net-p2p/transmission/transmission-2.12.bep b/net-p2p/transmission/transmission-2.12.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.12.bep rename to net-p2p/transmission/transmission-2.12.recipe index 125121a95..46c99ffde 100644 --- a/net-p2p/transmission/transmission-2.12.bep +++ b/net-p2p/transmission/transmission-2.12.recipe @@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-2.12 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-2.12 make install } diff --git a/net-p2p/transmission/transmission-2.21.bep b/net-p2p/transmission/transmission-2.21.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.21.bep rename to net-p2p/transmission/transmission-2.21.recipe index 5609c0d99..20c92b794 100644 --- a/net-p2p/transmission/transmission-2.21.bep +++ b/net-p2p/transmission/transmission-2.21.recipe @@ -11,7 +11,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 2.0.10" -BUILD { +BUILD() +{ cd transmission-2.21 autoreconf -vfi @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd transmission-2.21 make install } diff --git a/net-p2p/transmission/transmission-2.73.bep b/net-p2p/transmission/transmission-2.73.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.73.bep rename to net-p2p/transmission/transmission-2.73.recipe index 6033b9893..5170abbcb 100644 --- a/net-p2p/transmission/transmission-2.73.bep +++ b/net-p2p/transmission/transmission-2.73.recipe @@ -13,7 +13,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-libs/libevent >= 2.0.10 dev-libs/openssl >= 0.9.8" -BUILD { +BUILD() +{ cd transmission-2.73 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd transmission-2.73 make install } diff --git a/net-p2p/transmission/transmission-2.75.bep b/net-p2p/transmission/transmission-2.75.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.75.bep rename to net-p2p/transmission/transmission-2.75.recipe index 7252e2e99..047f0d56e 100644 --- a/net-p2p/transmission/transmission-2.75.bep +++ b/net-p2p/transmission/transmission-2.75.recipe @@ -13,7 +13,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-libs/libevent >= 2.0.10 dev-libs/openssl >= 0.9.8" -BUILD { +BUILD() +{ cd transmission-2.75 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd transmission-2.75 make install } diff --git a/net-proxy/privoxy/privoxy-3.0.19.bep b/net-proxy/privoxy/privoxy-3.0.19.recipe similarity index 97% rename from net-proxy/privoxy/privoxy-3.0.19.bep rename to net-proxy/privoxy/privoxy-3.0.19.recipe index d7dc1ebac..c862b36a9 100644 --- a/net-proxy/privoxy/privoxy-3.0.19.bep +++ b/net-proxy/privoxy/privoxy-3.0.19.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="57acc79059565cc42eda67982842785d" -BUILD { +BUILD() +{ cd privoxy-3.0.19-stable autoheader autoconf @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd privoxy-3.0.19-stable make install } diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep b/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe similarity index 97% rename from net-wireless/b43-fwcutter/b43-fwcutter-012.bep rename to net-wireless/b43_fwcutter/b43_fwcutter-012.recipe index 3f5bf8b68..43d1a74d7 100644 --- a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep +++ b/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="69eadf67b459f313a8d6b37aaabef96c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd b43-fwcutter-012 wget http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc/string/byteswap.h mkdir bits @@ -13,7 +14,8 @@ BUILD { make PREFIX=`finddir B_COMMON_DIRECTORY` CFLAGS="-I. -Wall -D_BSD_SOURCE" } -INSTALL { +INSTALL() +{ cd b43-fwcutter-012 make PREFIX=$DESTDIR/`finddir B_COMMON_DIRECTORY` install } diff --git a/net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch b/net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch new file mode 100644 index 000000000..575dd4e3e --- /dev/null +++ b/net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch @@ -0,0 +1,14 @@ +diff -up b43-fwcutter-012/Makefile.orig b43-fwcutter-012/Makefile +--- b43-fwcutter-012/Makefile.orig 2009-06-02 09:52:55.058982400 -0600 ++++ b43-fwcutter-012/Makefile 2012-06-16 16:13:04.182452224 -0600 +@@ -24,8 +24,8 @@ $(BIN): $(OBJECTS) + install: all + -install -d -o 0 -g 0 -m 755 $(PREFIX)/bin/ + -install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/ +- -install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/ +- -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/ ++ -install -d -o 0 -g 0 -m 755 $(PREFIX)/documentation/man/man1/ ++ -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/documentation/man/man1/ + + clean: + -rm -f *.o $(BIN) diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch index 3e318adb4..8ff5d9c4d 100644 --- a/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch @@ -777,9 +777,9 @@ diff -urN wpa_supplicant-0.7.3/wpa_supplicant/.config wpa_supplicant-0.7.3-haiku +LIBS += -L/boot/common/lib + +# for private Haiku headers -+CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_network/compat -+CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_wlan -+CFLAGS += -I/Source/Haiku/trunk/headers/private/net ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan ++CFLAGS += -I/system/develop/headers/private/net +CFLAGS += -Wno-multichar + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch index d2fa387d9..e6d7dea3b 100644 --- a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch @@ -829,9 +829,9 @@ index 0000000..7d73f13 +LIBS += -L/boot/common/lib + +# for private Haiku headers -+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_network/compat -+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_wlan -+CFLAGS += -I/Source/haiku/git/haiku/headers/private/net ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan ++CFLAGS += -I/system/develop/headers/private/net +CFLAGS += -Wno-multichar + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep deleted file mode 100644 index ac9dcb041..000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." -HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" -SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz" -CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd wpa_supplicant-0.7.3/wpa_supplicant - CFLAGS="-MMD -O2 -Wall" make wpa_supplicant -} -INSTALL { - cd wpa_supplicant-0.7.3/wpa_supplicant - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ -} -LICENSE="BSD (2-clause) - GNU GPL v2" -COPYRIGHT="2003-2010 Jouni Malinen" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe new file mode 100644 index 000000000..e6dd12837 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -0,0 +1,44 @@ +SUMMARY="A WPA Supplicant with support for WPA and WPA2" +DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz" +CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda" +LICENSE=" + BSD (2-clause) + GNU GPL v2 + " +COPYRIGHT="2003-2010 Jouni Malinen" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="wpa_supplicant-0.7.3.patch" + +PROVIDES=" + wpa_supplicant = $portVersion compat >= 0.7 + " +REQUIRES=" + haiku >= $haikuVersion + openssl >= 1.0.0 + " +BUILD_REQUIRES=" + openssl >= 1.0.0 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="$portVersionedName/wpa_supplicant" + +BUILD() +{ + CFLAGS="-MMD -O2 -Wall" make wpa_supplicant +} + +INSTALL() +{ + mkdir -p $binDir + cp -v wpa_supplicant $binDir +} diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep deleted file mode 100644 index e99053fc4..000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." -HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" -SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" -CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd wpa_supplicant-2.0/wpa_supplicant - CFLAGS="-MMD -O2 -Wall" make wpa_supplicant -} -INSTALL { - cd wpa_supplicant-2.0/wpa_supplicant - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ -} -LICENSE="BSD (2-clause) - GNU GPL v2" -COPYRIGHT="2003-2012 Jouni Malinen" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe new file mode 100644 index 000000000..e40f8f37e --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -0,0 +1,47 @@ +SUMMARY="A WPA Supplicant with support for WPA and WPA2" +DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" +CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" +LICENSE=" + BSD (2-clause) + GNU GPL v2 + " +COPYRIGHT="2003-2012 Jouni Malinen" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="wpa_supplicant-2.0.patch" + +PROVIDES=" + wpa_supplicant = $portVersion compat >= 2 + cmd:wpa_supplicant = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libssl + " +BUILD_REQUIRES=" + devel:libssl >= 1.0.0 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + cd wpa_supplicant + CFLAGS="-MMD -O2 -Wall" make wpa_supplicant +} + +INSTALL() +{ + cd wpa_supplicant + mkdir -p $binDir + cp -v wpa_supplicant $binDir +} diff --git a/packs/libpak/libpak-0.9.1.bep b/packs/libpak/libpak-0.9.1.bep deleted file mode 100644 index a71ef6ef9..000000000 --- a/packs/libpak/libpak-0.9.1.bep +++ /dev/null @@ -1,115 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.1.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/mercurial >= 1.6 - dev-libs/libedit >= 20100424" -CHECKSUM_MD5="16c697819a60958a4aaaef772a46c726" -BUILD { - HPLOC=`haikuporter -t` - cd libpak-0.9.1 - -## these are needed for building package in the libpak - haikuporter -i cmake-2.8.1 - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip . - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip . - haikuporter -i -d -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip . -## - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i zlib-1.2.5 - mv ${HPLOC}/sys-libs/zlib/*.zip . - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip . - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip . - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . - haikuporter -y -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -y -d -i jpeg-7 - mv ${HPLOC}/media-libs/jpeg/*.zip . - haikuporter -y -d -i libpng-1.2.44 - mv ${HPLOC}/media-libs/libpng/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i tiff-3.9.1 - mv ${HPLOC}/media-libs/tiff/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . -## these don't build correctly with gcc4 - if [ -n "$(setgcc | grep '2')" ]; then - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip . - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip . - fi -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL { - cd libpak-0.9.1 - mkdir -p ${DESTDIR}/boot - echo "" > ${DESTDIR}/boot/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR}/boot - echo -e "\n" >> ${DESTDIR}/boot/.opd - cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd - done - cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/.OptionalPackageDescription -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.2.bep b/packs/libpak/libpak-0.9.2.bep deleted file mode 100644 index 7e58d2d67..000000000 --- a/packs/libpak/libpak-0.9.2.bep +++ /dev/null @@ -1,120 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.2.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-vcs/mercurial >= 1.6 - dev-vcs/git >= 1.7.1 - dev-libs/libedit >= 20100424" -CHECKSUM_MD5="7c42abb8d837ead79bf64e3c276b1170" -BUILD { - HPLOC=`haikuporter -t` - cd libpak-0.9.2 - -## these are needed for building package in the libpak - haikuporter -i cmake-2.8.1 - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip . - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip . - haikuporter -i -d -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip . -## - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i zlib-1.2.5 - mv ${HPLOC}/sys-libs/zlib/*.zip . - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip . - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip . - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip . - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . - haikuporter -y -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -y -d -i jpeg-8b - mv ${HPLOC}/media-libs/jpeg/*.zip . - haikuporter -y -d -i libpng-1.2.44 - mv ${HPLOC}/media-libs/libpng/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i giflib-4.1.6 - mv ${HPLOC}/media-libs/giflib/*.zip . - haikuporter -y -d -i tiff-3.9.4 - mv ${HPLOC}/media-libs/tiff/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip . - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip . -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL { - cd libpak-0.9.2 - mkdir -p ${DESTDIR}/boot - echo "" > ${DESTDIR}/boot/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR}/boot - echo -e "\n" >> ${DESTDIR}/boot/.opd - cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd - done - cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/Full.OptionalPackageDescription - rm ${DESTDIR}/boot/.opd -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.3.bep b/packs/libpak/libpak-0.9.3.bep deleted file mode 100644 index 34378d9db..000000000 --- a/packs/libpak/libpak-0.9.3.bep +++ /dev/null @@ -1,164 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.3.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="f183eb4b0b6ac2282a9f1c7fd41ac282" -BUILD { - HPLOC=`haikuporter -t` - cd libpak-0.9.3 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip . - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip . -## - setgcc gcc2 - haikuporter -y -d -i readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip . - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . - haikuporter -y -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip . - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip . - - setgcc gcc4 - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -c -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -c -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . -## Flac fails to build on gcc4 currently -## haikuporter -c -y -d -i flac-1.2.1 -## mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -c -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -c -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -c -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -c -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -c -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -c -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -c -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -c -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -c -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -c -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -c -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -c -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -c -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -c -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -c -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -c -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip . - haikuporter -c -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -c -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -c -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . - haikuporter -c -y -d -i box2d-2.1.2 - mv ${HPLOC}/dev-games/box2d/*.zip . - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL { - cd libpak-0.9.3 - mkdir -p ${DESTDIR}/boot - echo "" > ${DESTDIR}/boot/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR}/boot - echo -e "\n" >> ${DESTDIR}/boot/.opd - cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd - done - cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/Full.OptionalPackageDescription - rm ${DESTDIR}/boot/.opd -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4-gcc2.bep b/packs/libpak/libpak-0.9.4-gcc2.bep deleted file mode 100644 index d105198fa..000000000 --- a/packs/libpak/libpak-0.9.4-gcc2.bep +++ /dev/null @@ -1,138 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a3" - cd libpak-0.9.4 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i speex-1.2-git -#b mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.1 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.2.2 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.22 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL { - cd libpak-0.9.4 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4-gcc4.bep b/packs/libpak/libpak-0.9.4-gcc4.bep deleted file mode 100644 index c6d34055c..000000000 --- a/packs/libpak/libpak-0.9.4-gcc4.bep +++ /dev/null @@ -1,145 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a3" - cd libpak-0.9.4 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i speex-1.2rc1 -#b mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.1 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.2.2 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i physfs-2.0.1 -#b mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.22 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i box2d-2.1.2 - mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL { - cd libpak-0.9.4 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4.bep b/packs/libpak/libpak-0.9.4.bep deleted file mode 100644 index 630bfa5f3..000000000 --- a/packs/libpak/libpak-0.9.4.bep +++ /dev/null @@ -1,261 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="" - cd libpak-0.9.4 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - setgcc gcc2 - haikuporter -y -d -i readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -c -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.xz ${HPLOC}/packs/optionalpackages/sources - -# haikuporter -y -d -i sdl-ttf-2.0.10 -# mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sge-030809 - mv ${HPLOC}/media-libs/sge/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - setgcc gcc4 - haikuporter -c -y -d -i readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - -## Flac fails to build on gcc4 currently -## haikuporter -c -y -d -i flac-1.2.1 -## mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - -# haikuporter -c -y -d -i sdl-ttf-2.0.10 -# mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i box2d-2.1.2 - mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL { - cd libpak-0.9.4 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.5-gcc2.bep b/packs/libpak/libpak-0.9.5-gcc2.bep deleted file mode 100644 index a6c22aa88..000000000 --- a/packs/libpak/libpak-0.9.5-gcc2.bep +++ /dev/null @@ -1,141 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a4" - cd libpak-0.9.5 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i speex-1.2rc1 - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.1 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i libogg-1.3.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.22 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i ffmpeg-0.10 - mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL { - cd libpak-0.9.5 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.6-gcc2.bep b/packs/libpak/libpak-0.9.6-gcc2.bep deleted file mode 100644 index 4355acd4e..000000000 --- a/packs/libpak/libpak-0.9.6-gcc2.bep +++ /dev/null @@ -1,150 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a4" - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jpeg-8d - mv ${HPLOC}/media-libs/jpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpng-1.5.12 - mv ${HPLOC}/media-libs/libpng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i speex-1.2rc1 - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.4 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.3.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i freetype-2.4.9 - mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.15 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.23 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.11 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.12 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.8 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i allegro-4.4.1.1 -#b mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvpx-1.0.0 - mv ${HPLOC}/media-libs/libvpx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i ffmpeg-0.10.2 - mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL { - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.6-gcc4.bep b/packs/libpak/libpak-0.9.6-gcc4.bep deleted file mode 100644 index 508433dc2..000000000 --- a/packs/libpak/libpak-0.9.6-gcc4.bep +++ /dev/null @@ -1,157 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a4" - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jpeg-8d - mv ${HPLOC}/media-libs/jpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpng-1.5.12 - mv ${HPLOC}/media-libs/libpng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i speex-1.2rc1 - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.4 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.3.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i physfs-2.0.1 -#b mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i freetype-2.4.9 - mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.15 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.23 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.11 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.12 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.8 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i allegro-4.4.1.1 -#b mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -c -y -d -i box2d-2.1.2 -#b mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvpx-1.0.0 - mv ${HPLOC}/media-libs/libvpx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i ffmpeg-0.10.2 - mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL { - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.bep b/packs/libpak/libpak-0.9.bep deleted file mode 100644 index 5c15c47b1..000000000 --- a/packs/libpak/libpak-0.9.bep +++ /dev/null @@ -1,110 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/mercurial >= 1.6 - dev-libs/libedit >= 20100424" -CHECKSUM_MD5="59bc51118c6be6ef40f4fe681ef783a0" -BUILD { - HPLOC=`haikuporter -t` - cd libpak-0.9 -## these are needed for building package in the libpak - haikuporter -i cmake-2.8.1 - haikuporter -i dos2unix - haikuporter -i pkgconfig-0.25 -## - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i zlib-1.2.5 - mv ${HPLOC}/sys-libs/zlib/*.zip . - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip . - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip . - haikuporter -y -d -i jpeg-7 - mv ${HPLOC}/media-libs/jpeg/*.zip . - haikuporter -y -d -i libpng-1.2.44 - mv ${HPLOC}/media-libs/libpng/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i tiff-3.9.1 - mv ${HPLOC}/media-libs/tiff/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . -## these don't build correctly with gcc4 - if [ -n "$(setgcc | grep '2')" ]; then - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - fi -## these don't build correctly yet -## haikuporter -y -d -i freetype-2.4.2 -## mv ${HPLOC}/media-libs/freetype/*.zip . -## haikuporter -y -d -i fribidi-0.19.2 -## mv ${HPLOC}/dev-libs/fribidi/*.zip . -## haikuporter -y -d -i flac-1.2.1 -## mv ${HPLOC}/media-libs/flac/*.zip . -## haikuporter -y -d -i speex-1.2rc1 -## mv ${HPLOC}/media-libs/speex/*.zip . -## haikuporter -y -d -i jgmod-0.99 -## mv ${HPLOC}/media-libs/jgmod/*.zip . -## haikuporter -y -d -i dumb-0.9.3 -## mv ${HPLOC}/media-libs/dumb/*.zip . -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL { - cd libpak-0.9 - mkdir -p ${DESTDIR} - echo "" > ${DESTDIR}/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR} - echo -e "\n" >> ${DESTDIR}/.opd - cat ${DESTDIR}/.OptionalPackageDescription >> ${DESTDIR}/.opd - done - cp ${DESTDIR}/.opd ${DESTDIR}/.OptionalPackageDescription -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.5.bep b/packs/optionalpackages/optionalpackages-0.5.bep deleted file mode 100644 index dca30b895..000000000 --- a/packs/optionalpackages/optionalpackages-0.5.bep +++ /dev/null @@ -1,258 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gcc-2.95.3 - gcc-4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3test" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - setgcc gcc2 - -## Group 1 - haikuporter -i readline-6.1 - haikuporter -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i bison-2.4.1 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z bison-2.4.1 - mv ${HPLOC}/sys-devel/bison/*.xz ${HPLOC}/packs/optionalpackages/sources - -#b haikuporter -y -d -i m4-1.4.14 -#b mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -z m4-1.4.14 -#b mv ${HPLOC}/sys-devel/m4/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z make-3.82 - mv ${HPLOC}/sys-devel/make/*.xz ${HPLOC}/packs/optionalpackages/sources - -## Group 2 - -#b haikuporter -y -c -d -i mercurial-1.6 -#b mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.3 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.0 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y bzr-2.2.0 - mv ${HPLOC}/dev-vcs/bzr/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cdrtools-3.00 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cmake-2.8.2 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.2 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i subversion-1.6.13 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i friss-0.5pre7 - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.1 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y git-1.7.1 - mv ${HPLOC}/dev-vcs/git/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.7 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y man-1.6f - mv ${HPLOC}/sys-apps/man/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i nano-2.2.5 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y nano-2.2.5 - mv ${HPLOC}/app-editors/nano/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i neon-0.29.4 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 - haikuporter -y -d -i opensound-4.2 - mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.6p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.02 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d python-2.6.6 - mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.22 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-933 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#b haikuporter -y -d -i vlc-0.8.6d -#b mv ${HPLOC}/media-video/vlc/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - - setgcc gcc4 - haikuporter -y -d -i libevent-1.4.14b - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d bzr-2.2.0 -#b mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i vision-933 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -c -d -i WebPositive - haikuporter -y -c -d -i transmission-2.01 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i paladin-1.3 -#b mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i pe-2.4.3-600 -#b mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.xz ${HPLOC}/packs/optionalpackages/sources - -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources -} - -INSTALL { - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep b/packs/optionalpackages/optionalpackages-0.6-gcc2.bep deleted file mode 100644 index 946bdc58c..000000000 --- a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep +++ /dev/null @@ -1,177 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gcc-2.95.3 - gcc-4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - setgcc gcc2 - -## Group 1 - haikuporter -i readline-6.2 - haikuporter -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0d - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.4 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - -## Group 2 - - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d wqy-microhei-0.2.0-beta - mv ${HPLOC}/media-fonts/wqy-microhei/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-1.8.3 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.5 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a01 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.6 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.15 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i friss-0.5pre7 - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.5 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.8 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.8p2 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.25 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - - -} - -INSTALL { - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep b/packs/optionalpackages/optionalpackages-0.6-gcc4.bep deleted file mode 100644 index 4a7196378..000000000 --- a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep +++ /dev/null @@ -1,177 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gcc >= 4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - - haikuporter -i readline-6.2 - haikuporter -y -d -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.4 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.8 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i xz-utils-5.0.1 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0d - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.6 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.15 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.5 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.8p2 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-1.8.3 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips - - - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.5 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a01 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i transmission-2.21 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.25 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i clockwerk-78 -#b mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre -#3 haikuporter -y -d -i friss-0.5pre7 -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i liblayout-1.4.0 -#3 haikuporter -y -d -i links -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#3 haikuporter -y -d -i WonderBrush-2.1.2 -#3 haikuporter -y -c -d -i WebPositive -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - -} - -INSTALL { - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6.bep b/packs/optionalpackages/optionalpackages-0.6.bep deleted file mode 100644 index 7bfb26aef..000000000 --- a/packs/optionalpackages/optionalpackages-0.6.bep +++ /dev/null @@ -1,260 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gcc-2.95.3 - gcc-4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3test" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - setgcc gcc2 - -## Group 1 - haikuporter -i readline-6.1 - haikuporter -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.xz ${HPLOC}/packs/optionalpackages/sources - -#b haikuporter -y -d -i m4-1.4.15 -#b mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -z m4-1.4.15 -#b mv ${HPLOC}/sys-devel/m4/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z make-3.82 - mv ${HPLOC}/sys-devel/make/*.xz ${HPLOC}/packs/optionalpackages/sources - -## Group 2 - - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-1.7.3 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.5 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cdrtools-3.00 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cmake-2.8.4 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.3 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i subversion-1.6.15 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i friss-0.5pre7 - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.3.5 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y git-1.7.3.5 - mv ${HPLOC}/dev-vcs/git/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.8 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y man-1.6f - mv ${HPLOC}/sys-apps/man/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i neon-0.29.5 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 - haikuporter -y -d -i opensound-4.2 - mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.8p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d python-2.7.1 - mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.25 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#b haikuporter -y -d -i vlc-0.8.6d -#b mv ${HPLOC}/media-video/vlc/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - - setgcc gcc4 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d bzr-2.2.2 -#b mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -c -d -i WebPositive - haikuporter -y -c -d -i transmission-2.01 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i paladin-1.3 -#b mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i pe-2.4.3-600 -#b mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.xz ${HPLOC}/packs/optionalpackages/sources - -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources -} - -INSTALL { - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep b/packs/optionalpackages/optionalpackages-0.7-gcc2.bep deleted file mode 100644 index e024c32dc..000000000 --- a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep +++ /dev/null @@ -1,182 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="gcc == 2.95.3 - liblayout == 1.4.0 - dev-util/cmake >= 2.8.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a4" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - -## Group 1 - haikuporter -i readline-6.2 - haikuporter -i libedit-20120601-3.0 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0j - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.5 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i yasm-1.2.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i freetype-2.4.9 - mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/optionalpackages/zips - -## Group 2 - - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d wqy-microhei-0.2.0-beta - mv ${HPLOC}/media-fonts/wqy-microhei/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-2.2.2 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.6 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.4.1 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.13 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.5.1 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beam-1.2alpha - mv ${HPLOC}/haiku-apps/beam/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a07 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.21 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-80 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.26.0 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.18 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i friss-29 - mv ${HPLOC}/haiku-apps/friss/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gitdoc-1.7.10.2 - mv ${HPLOC}/dev-vcs/gitdoc/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.10.2 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.8.0 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6g - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-6.0p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.20.1 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.26 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - - -} - -INSTALL { - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep b/packs/optionalpackages/optionalpackages-0.7-gcc4.bep deleted file mode 100644 index 2661a45e2..000000000 --- a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep +++ /dev/null @@ -1,176 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gcc >= 4.6.2" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a4" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - - haikuporter -i readline-6.2 - haikuporter -y -d -i libedit-20120601-3.0 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.5 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.8.0 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i yasm-1.2.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i xz-utils-5.0.1 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0j - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.26.0 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.18 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.10.2 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-6.0p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-2.2.2 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips - - - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-1.4.6 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.4.1 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.13 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.6b1 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a07 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i man-1.6g - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.20.1 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i transmission-2.21 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.26 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i clockwerk-78 -#b mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre -#3 haikuporter -y -d -i friss-0.5pre7 -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i links -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#3 haikuporter -y -d -i WonderBrush-2.1.2 -#3 haikuporter -y -c -d -i WebPositive -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - -} - -INSTALL { - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/sci-astronomy/celestia/celestia-1.6.0.bep b/sci-astronomy/celestia/celestia-1.6.0.recipe similarity index 96% rename from sci-astronomy/celestia/celestia-1.6.0.bep rename to sci-astronomy/celestia/celestia-1.6.0.recipe index b49b90048..f7d34d146 100644 --- a/sci-astronomy/celestia/celestia-1.6.0.bep +++ b/sci-astronomy/celestia/celestia-1.6.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="unstable" DEPEND="dev-lang/lua >= 5.1.4 sys-devel/gettext >= 0.17" -BUILD { +BUILD() +{ cd celestia-1.6.0 libtoolize --force --copy --install autoreconf -i @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd celestia-1.6.0 make install } diff --git a/sci-libs/cln/cln-1.3.2.bep b/sci-libs/cln/cln-1.3.2.recipe similarity index 96% rename from sci-libs/cln/cln-1.3.2.bep rename to sci-libs/cln/cln-1.3.2.recipe index f1cd7d57a..bbde965c6 100644 --- a/sci-libs/cln/cln-1.3.2.bep +++ b/sci-libs/cln/cln-1.3.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd cln-1.3.2 autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cln-1.3.2 make install } diff --git a/sci-libs/fftw/fftw-3.2.2.bep b/sci-libs/fftw/fftw-3.2.2.recipe similarity index 95% rename from sci-libs/fftw/fftw-3.2.2.bep rename to sci-libs/fftw/fftw-3.2.2.recipe index abd185311..78768e63d 100644 --- a/sci-libs/fftw/fftw-3.2.2.bep +++ b/sci-libs/fftw/fftw-3.2.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b616e5c91218cc778b5aa735fefb61ae" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd fftw-3.2.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd fftw-3.2.2 make install } diff --git a/sci-libs/gdal/gdal-1.7.2.bep b/sci-libs/gdal/gdal-1.7.2.recipe similarity index 96% rename from sci-libs/gdal/gdal-1.7.2.bep rename to sci-libs/gdal/gdal-1.7.2.recipe index 5e0bbc0c8..be839a25e 100644 --- a/sci-libs/gdal/gdal-1.7.2.bep +++ b/sci-libs/gdal/gdal-1.7.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd gdal-1.7.2 libtoolize --force --copy --install ./autogen.sh @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gdal-1.7.2 make install } diff --git a/sci-libs/gsl/gsl-1.13.bep b/sci-libs/gsl/gsl-1.13.recipe similarity index 94% rename from sci-libs/gsl/gsl-1.13.bep rename to sci-libs/gsl/gsl-1.13.recipe index c388c8e58..95070ad2f 100644 --- a/sci-libs/gsl/gsl-1.13.bep +++ b/sci-libs/gsl/gsl-1.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d9fcfa367c44ab68a25b4edf34c3c5f7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gsl-1.13 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gsl-1.13 make install } diff --git a/sci-libs/gsl/gsl-1.14.bep b/sci-libs/gsl/gsl-1.14.recipe similarity index 88% rename from sci-libs/gsl/gsl-1.14.bep rename to sci-libs/gsl/gsl-1.14.recipe index 93efa709b..899dfb251 100644 --- a/sci-libs/gsl/gsl-1.14.bep +++ b/sci-libs/gsl/gsl-1.14.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d55e7b141815412a072a3f0e12442042" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gsl-1.14 libtoolize --force --copy --install aclocal @@ -18,10 +19,11 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gsl-1.14 make install } LICENSE="GNU GPL v3" -COPYRIGHT="1996-2000, 2007 Brian Gough, Gerard Jungman, Mark Galassi, James Theiler, Reid Priedhorsky, Jim Davies and others. +COPYRIGHT="1996-2000, 2007 Brian Gough, Gerard Jungman, Mark Galassi, James Theiler, Reid Priedhorsky, Jim Davies and others." diff --git a/sci-physics/bullet/bullet-2.78.bep b/sci-physics/bullet/bullet-2.78.recipe similarity index 95% rename from sci-physics/bullet/bullet-2.78.bep rename to sci-physics/bullet/bullet-2.78.recipe index b49bedd4f..b4ffe6c11 100644 --- a/sci-physics/bullet/bullet-2.78.bep +++ b/sci-physics/bullet/bullet-2.78.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.3" -BUILD { +BUILD() +{ cd bullet-2.78 cmake -DBUILD_DEMOS=ON . make } -INSTALL { +INSTALL() +{ cd bullet-2.78 make install } diff --git a/sys-apps/coreutils/coreutils-8.5.bep b/sys-apps/coreutils/coreutils-8.5.recipe similarity index 95% rename from sys-apps/coreutils/coreutils-8.5.bep rename to sys-apps/coreutils/coreutils-8.5.recipe index b01781390..23abb5040 100644 --- a/sys-apps/coreutils/coreutils-8.5.bep +++ b/sys-apps/coreutils/coreutils-8.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c1ffe586d001e87d66cd80c4536ee823" -BUILD { +BUILD() +{ cd coreutils-8.5 MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd coreutils-8.5 make install } -TEST { +TEST() +{ cd coreutils-8.5 make check } diff --git a/sys-apps/dbus/dbus-1.6.8.bep b/sys-apps/dbus/dbus-1.6.8.recipe similarity index 95% rename from sys-apps/dbus/dbus-1.6.8.bep rename to sys-apps/dbus/dbus-1.6.8.recipe index 6eafcc6a8..9ee5b2dbe 100644 --- a/sys-apps/dbus/dbus-1.6.8.bep +++ b/sys-apps/dbus/dbus-1.6.8.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="untested" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd dbus-1.6.8 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd dbus-1.6.8 make install } -TEST { +TEST() +{ cd dbus-1.6.8 make check } diff --git a/sys-apps/diffutils/diffutils-2.9.bep b/sys-apps/diffutils/diffutils-2.9.recipe similarity index 95% rename from sys-apps/diffutils/diffutils-2.9.bep rename to sys-apps/diffutils/diffutils-2.9.recipe index bf83c0540..0f2e94ede 100644 --- a/sys-apps/diffutils/diffutils-2.9.bep +++ b/sys-apps/diffutils/diffutils-2.9.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="d6bc1bdc874ddb14cfed4d1655a0dbbe" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffutils-2.9 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd diffutils-2.9 make install } diff --git a/sys-apps/diffutils/diffutils-3.0.bep b/sys-apps/diffutils/diffutils-3.0.recipe similarity index 94% rename from sys-apps/diffutils/diffutils-3.0.bep rename to sys-apps/diffutils/diffutils-3.0.recipe index 9912eb089..9f729b672 100644 --- a/sys-apps/diffutils/diffutils-3.0.bep +++ b/sys-apps/diffutils/diffutils-3.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="684aaba1baab743a2a90e52162ff07da" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffutils-3.0 MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd diffutils-3.0 make install } -TEST { +TEST() +{ cd diffutils-3.0 make check } diff --git a/sys-apps/diffutils/diffutils-3.2.bep b/sys-apps/diffutils/diffutils-3.2.recipe similarity index 95% rename from sys-apps/diffutils/diffutils-3.2.bep rename to sys-apps/diffutils/diffutils-3.2.recipe index 9e9e9c088..1c047549b 100644 --- a/sys-apps/diffutils/diffutils-3.2.bep +++ b/sys-apps/diffutils/diffutils-3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="22e4deef5d8949a727b159d6bc65c1cc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffutils-3.2 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd diffutils-3.2 make install } -TEST { +TEST() +{ cd diffutils-3.2 make check } diff --git a/sys-apps/dmidecode/dmidecode-2.11.bep b/sys-apps/dmidecode/dmidecode-2.11.recipe similarity index 97% rename from sys-apps/dmidecode/dmidecode-2.11.bep rename to sys-apps/dmidecode/dmidecode-2.11.recipe index 1810d2489..2fa3b81b2 100644 --- a/sys-apps/dmidecode/dmidecode-2.11.bep +++ b/sys-apps/dmidecode/dmidecode-2.11.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="9fddbbc3e330bee5950b8b5d424a57cb" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd dmidecode-2.11 make } -INSTALL { +INSTALL() +{ cd dmidecode-2.11 make install prefix=`finddir B_COMMON_DIRECTORY` \ sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ diff --git a/sys-apps/dtc/dtc-1.3.0-git.bep b/sys-apps/dtc/dtc-1.3.0_git.recipe similarity index 94% rename from sys-apps/dtc/dtc-1.3.0-git.bep rename to sys-apps/dtc/dtc-1.3.0_git.recipe index 08edd3315..d29ddcb4f 100644 --- a/sys-apps/dtc/dtc-1.3.0-git.bep +++ b/sys-apps/dtc/dtc-1.3.0_git.recipe @@ -7,17 +7,20 @@ DEPEND="sys-devel/bison >= 2.5" # TODO: test gcc2 build MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd dtc-1.3.0-git make PREFIX=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd dtc-1.3.0-git make install PREFIX=`finddir B_COMMON_DIRECTORY` } -TEST { +TEST() +{ cd dtc-1.3.0-git make tests } diff --git a/sys-apps/dtc/patches/dtc-1.3.0_git.patch b/sys-apps/dtc/patches/dtc-1.3.0_git.patch new file mode 100644 index 000000000..64b4229f5 --- /dev/null +++ b/sys-apps/dtc/patches/dtc-1.3.0_git.patch @@ -0,0 +1,66 @@ +diff --git a/Makefile dtc-1.3.0-git/Makefile +index 1169e6c..60077a5 100644 +--- a/Makefile ++++ dtc-1.3.0-git/Makefile +@@ -41,6 +41,15 @@ SHAREDLIB_EXT=so + SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, + endif + ++ifeq ($(HOSTOS),haiku) ++INSTALL = /bin/install ++endif ++ ++ifneq ($(HOSTOS),haiku) ++LIBDL = -ldl ++endif ++ ++ + # + # Overall rules + # +diff --git a/tests/Makefile.tests dtc-1.3.0-git/tests/Makefile.tests +index 1795466..97b6131 100644 +--- a/tests/Makefile.tests ++++ dtc-1.3.0-git/tests/Makefile.tests +@@ -50,7 +50,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) + + $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) + @$(VECHO) LD [libdl] $@ +- $(LINK.c) -o $@ $^ -ldl ++ $(LINK.c) -o $@ $^ $(LIBDL) + + $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ + util.o $(LIBFDT_archive) +diff --git a/tests/testutils.c dtc-1.3.0-git/tests/testutils.c +index f185133..66b34df 100644 +--- a/tests/testutils.c ++++ dtc-1.3.0-git/tests/testutils.c +@@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc) + { + cleanup(); + fprintf(stderr, "%s: %s (pid=%d)\n", test_name, +- strsignal(signum), getpid()); ++ strsignal(signum), (int)getpid()); + exit(RC_BUG); + } + + void test_init(int argc, char *argv[]) + { + int err; +- struct sigaction sa_int = { +- .sa_sigaction = sigint_handler, +- }; ++ struct sigaction sa_int = { }; ++ sa_int.sa_sigaction = sigint_handler; + + test_name = argv[0]; + +@@ -66,7 +65,7 @@ void test_init(int argc, char *argv[]) + verbose_test = 0; + + verbose_printf("Starting testcase \"%s\", pid %d\n", +- test_name, getpid()); ++ test_name, (int)getpid()); + } + + void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size) diff --git a/sys-apps/ed/ed-1.4.bep b/sys-apps/ed/ed-1.4.bep deleted file mode 100644 index 5284c8e06..000000000 --- a/sys-apps/ed/ed-1.4.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="Your basic line editor" -HOMEPAGE="http://www.gnu.org/sofrware/ed/" -SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.4.tar.gz" -CHECKSUM_MD5="da0ddc0e0b0bec2da4b13b0d0d1bce2b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ed-1.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd ed-1.4 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe new file mode 100644 index 000000000..1ce1ffa25 --- /dev/null +++ b/sys-apps/ed/ed-1.7.recipe @@ -0,0 +1,39 @@ +SUMMARY="Your basic line editor" +DESCRIPTION="Your basic line editor" +HOMEPAGE="http://www.gnu.org/software/ed/" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.7.tar.gz" +CHECKSUM_MD5="0aa4e2428e325203d0d7c3e86c961b1c" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + ed = $portVersion compat >= 1 + cmd:ed = $portVersion compat >= 1 + cmd:red = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} diff --git a/sys-apps/file/file-5.04.bep b/sys-apps/file/file-5.04.recipe similarity index 95% rename from sys-apps/file/file-5.04.bep rename to sys-apps/file/file-5.04.recipe index ebeca7087..f209cef63 100644 --- a/sys-apps/file/file-5.04.bep +++ b/sys-apps/file/file-5.04.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="accade81ff1cc774904b47c72c8aeea0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd file-5.04 autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd file-5.04 make install } diff --git a/sys-apps/file/file-5.11.bep b/sys-apps/file/file-5.11.recipe similarity index 96% rename from sys-apps/file/file-5.11.bep rename to sys-apps/file/file-5.11.recipe index d2af82c38..a4c0c9db7 100644 --- a/sys-apps/file/file-5.11.bep +++ b/sys-apps/file/file-5.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="16a407bd66d6c7a832f3a5c0d609c27b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd file-5.11 autoreconf -fvi ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd file-5.11 make install } diff --git a/sys-apps/findutils/findutils-4.4.2.bep b/sys-apps/findutils/findutils-4.4.2.recipe similarity index 95% rename from sys-apps/findutils/findutils-4.4.2.bep rename to sys-apps/findutils/findutils-4.4.2.recipe index df895eda2..cb8b14ff4 100644 --- a/sys-apps/findutils/findutils-4.4.2.bep +++ b/sys-apps/findutils/findutils-4.4.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="351cc4adb07d54877fa15f75fb77d39f" -BUILD { +BUILD() +{ cd findutils-4.4.2 ./import-gnulib.sh libtoolize --force --copy --install @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd findutils-4.4.2 make install } -TEST { +TEST() +{ cd findutils-4.4.2 make install } diff --git a/sys-apps/gawk/gawk-3.1.8.bep b/sys-apps/gawk/gawk-3.1.8.bep deleted file mode 100644 index b3c8cdc4e..000000000 --- a/sys-apps/gawk/gawk-3.1.8.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="standard GNU file utilities" -HOMEPAGE="http://www.gnu.org/software/coreutils" -SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" -BUILD { - cd gawk-3.1.8 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd gawk-3.1.8 - make install -} - -TEST { - cd gawk-3.1.8 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1983-2010 Free Software Foundation, Inc." diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe new file mode 100644 index 000000000..0b1fe50e5 --- /dev/null +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -0,0 +1,59 @@ +SUMMARY="A pattern scanning and processing language" +DESCRIPTION=" + If you are like many computer users, you would frequently like to make + changes in various text files wherever certain patterns appear, or + extract data from parts of certain lines while discarding the rest. To + write a program to do this in a language such as C or Pascal is a + time-consuming inconvenience that may take many lines of code. The job + is easy with awk, especially the GNU implementation: gawk. + + The awk utility interprets a special-purpose programming language that + makes it possible to handle simple data-reformatting jobs with just a + few lines of code. + " +HOMEPAGE="http://www.gnu.org/software/coreutils" +SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2" +CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + gawk = $portVersion compat >= 3 + cmd:awk = $portVersion compat >= 3 + cmd:gawk = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + ./configure $configureDirArgs + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1983-2010 Free Software Foundation, Inc." diff --git a/sys-apps/gawk/gawk-4.0.1.bep b/sys-apps/gawk/gawk-4.0.1.recipe similarity index 96% rename from sys-apps/gawk/gawk-4.0.1.bep rename to sys-apps/gawk/gawk-4.0.1.recipe index 798af1565..2ae99b32d 100644 --- a/sys-apps/gawk/gawk-4.0.1.bep +++ b/sys-apps/gawk/gawk-4.0.1.recipe @@ -4,7 +4,8 @@ SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.0.1.tar.gz" CHECKSUM_MD5="bab2bda483e9f32be65b43b8dab39fa5" STATUS_HAIKU="stable" REVISION="1" -BUILD { +BUILD() +{ cd gawk-4.0.1 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gawk-4.0.1 make install } diff --git a/sys-apps/grep/grep-2.12.bep b/sys-apps/grep/grep-2.12.bep deleted file mode 100644 index 15fa46273..000000000 --- a/sys-apps/grep/grep-2.12.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftpmirror.gnu.org/grep/grep-2.12.tar.xz" -CHECKSUM_MD5="8d2f0346d08b13c18afb81f0e8aa1e2f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" -BUILD { - cd grep-2.12 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd grep-2.12 - make install -} - -TEST { - cd grep-2.12 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14-bz2.bep b/sys-apps/grep/grep-2.14-bz2.bep deleted file mode 100644 index fafecfa4a..000000000 --- a/sys-apps/grep/grep-2.14-bz2.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2" -CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" -BUILD { - cd grep-2.14 - - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd grep-2.14 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14.bep b/sys-apps/grep/grep-2.14.bep deleted file mode 100644 index cde4042d8..000000000 --- a/sys-apps/grep/grep-2.14.bep +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" -CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" - -BUILD { - cd grep-2.14 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --disable-perl-regexp - make -} - -INSTALL { - cd grep-2.14 - make install -} - -TEST { - cd grep-2.14 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe new file mode 100644 index 000000000..07bed6a21 --- /dev/null +++ b/sys-apps/grep/grep-2.14.recipe @@ -0,0 +1,71 @@ +SUMMARY="GNU regular expression matcher" +DESCRIPTION="The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines." +HOMEPAGE="http://www.gnu.org/software/grep/" +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." +SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2" +CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" +# XZ file format: +#SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" +#CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="grep-2.14-gcc2.patch" + +PROVIDES=" + grep = $portVersion compat >= 2 + cmd:egrep = $portVersion compat >= 2 + cmd:fgrep = $portVersion compat >= 2 + cmd:grep = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + lib:libintl + " +BUILD_REQUIRES=" + devel:libiconv + devel:libintl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:gettext + cmd:ld + cmd:libtoolize + cmd:make + " + +defineDebugInfoPackage grep \ + $binDir/egrep \ + $binDir/fgrep \ + $binDir/grep + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + runConfigure ./configure \ + --disable-perl-regexp + make $jobArgs +} + +INSTALL() +{ + make install + + rm $libDir/charset.alias + rmdir $libDir +} + +TEST() +{ + make check +} diff --git a/sys-apps/grep/grep-2.5.4.bep b/sys-apps/grep/grep-2.5.4.bep deleted file mode 100644 index 6b60cb53b..000000000 --- a/sys-apps/grep/grep-2.5.4.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.5.4.tar.bz2" -CHECKSUM_MD5="5650ee2ae6ea4b39e9459d7d0585b315" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd grep-2.5.4 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd grep-2.5.4 - make install -} - -TEST { - cd grep-2.5.4 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.6.1.bep b/sys-apps/grep/grep-2.6.1.bep deleted file mode 100644 index ec6be1fb0..000000000 --- a/sys-apps/grep/grep-2.6.1.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.1.tar.gz" -CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd grep-2.6.1 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd grep-2.6.1 - make install -} - -TEST { - cd grep-2.6.1 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.6.3.bep b/sys-apps/grep/grep-2.6.3.bep deleted file mode 100644 index dfbd623d2..000000000 --- a/sys-apps/grep/grep-2.6.3.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.3.tar.gz" -CHECKSUM_MD5="3095b57837b312f087c0680559de7f13" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd grep-2.6.3 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd grep-2.6.3 - make install -} - -TEST { - cd grep-2.6.3 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.7.bep b/sys-apps/grep/grep-2.7.bep deleted file mode 100644 index b3db2cf09..000000000 --- a/sys-apps/grep/grep-2.7.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="ftp://mirrors.kernel.org/gnu/grep/grep-2.7.tar.gz" -CHECKSUM_MD5="e848f07e3e79aa7899345d17c7e4115e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" -BUILD { - cd grep-2.7 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd grep-2.7 - make install -} - -TEST { - cd grep-2.7 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/patches/grep-2.14-gcc2.patch b/sys-apps/grep/patches/grep-2.14-gcc2.patch index c59075af6..eb81be74b 100644 --- a/sys-apps/grep/patches/grep-2.14-gcc2.patch +++ b/sys-apps/grep/patches/grep-2.14-gcc2.patch @@ -1,6 +1,6 @@ -diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c ---- ./grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000 -+++ ./grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000 +diff -Naur grep-2.14-original/lib/fts.c grep-2.14/lib/fts.c +--- grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000 ++++ grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000 @@ -1278,6 +1278,7 @@ nlink_t nlinks; bool nostat; @@ -20,9 +20,9 @@ diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c /* * Nlinks is the number of possible entries of type directory in the -diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c ---- ./grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000 -+++ ./grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000 +diff -Naur grep-2.14-original/lib/regcomp.c grep-2.14/lib/regcomp.c +--- grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000 ++++ grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000 @@ -952,10 +952,10 @@ internal_function init_word_char (re_dfa_t *dfa) @@ -35,9 +35,9 @@ diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c if (BE (dfa->map_notascii == 0, 1)) { bitset_word_t bits0 = 0x00000000; -diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c ---- ./grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000 -+++ ./grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000 +diff -Naur grep-2.14-original/src/dfasearch.c grep-2.14/src/dfasearch.c +--- grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000 ++++ grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000 @@ -216,6 +216,7 @@ int backref; regoff_t start; @@ -55,9 +55,9 @@ diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c mb_case_map_apply (map, &off, &len); *match_size = len; ret_val = off; -diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c ---- ./grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000 -+++ ./grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000 +diff -Naur grep-2.14-original/src/kwsearch.c grep-2.14/src/kwsearch.c +--- grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000 ++++ grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000 @@ -39,9 +39,9 @@ ? mbtolower (pattern, &psize, &map) : pattern); @@ -104,9 +104,9 @@ diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c mb_case_map_apply (map, &off, &len); *match_size = len; -diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c ---- ./grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000 -+++ ./grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000 +diff -Naur grep-2.14-original/src/main.c grep-2.14/src/main.c +--- grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000 ++++ grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000 @@ -460,6 +460,7 @@ if (SEEK_HOLE != SEEK_END && usable_st_size (st)) { @@ -140,9 +140,9 @@ diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode)) out_stat = tmp_stat; -diff -Naur ./grep-2.14-original/src/searchutils.c ./grep-2.14/src/searchutils.c ---- ./grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000 -+++ ./grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000 +diff -Naur grep-2.14-original/src/searchutils.c grep-2.14/src/searchutils.c +--- grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000 ++++ grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000 @@ -80,6 +80,7 @@ static mb_len_map_t *len_map; static size_t outalloc; diff --git a/sys-apps/grep/patches/grep-2.7.patch b/sys-apps/grep/patches/grep-2.7.patch deleted file mode 100644 index 8f4fb7f6d..000000000 --- a/sys-apps/grep/patches/grep-2.7.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN grep-2.7/src/kwsearch.c grep-2.7-haiku/src/kwsearch.c ---- grep-2.7/src/kwsearch.c 2010-08-13 23:36:17.039059456 +0000 -+++ grep-2.7-haiku/src/kwsearch.c 2010-09-22 12:39:11.677642240 +0000 -@@ -111,8 +111,9 @@ - /* The match was a part of multibyte character, advance at least - one byte to ensure no infinite loop happens. */ - mbstate_t s; -+ size_t mb_len; - memset (&s, 0, sizeof s); -- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); -+ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); - if (mb_len == (size_t) -2) - goto failure; - beg = mb_start; diff --git a/sys-apps/groff/groff-1.20.1.bep b/sys-apps/groff/groff-1.20.1.bep deleted file mode 100644 index fb330f71b..000000000 --- a/sys-apps/groff/groff-1.20.1.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="The groff (GNU troff) software is a typesetting package which reads plain text mixed with formatting commands and produces formatted output." -HOMEPAGE="http://www.gnu.org/software/groff/" -SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz" -CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd groff-1.20.1 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - sed -i 's/docdir=$(datadir)\/doc\/groff\//docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/doc\/groff/g' Ma* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd groff-1.20.1 - make install -} - -TEST { - cd groff-1.20.1 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2003-2009 Free Software Foundation, Inc." diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe new file mode 100644 index 000000000..66cbd7eb0 --- /dev/null +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -0,0 +1,94 @@ +SUMMARY="GNU troff typesetting package" +DESCRIPTION="The groff (GNU troff) software is a typesetting package which reads plain text mixed with formatting commands and produces formatted output." +HOMEPAGE="http://www.gnu.org/software/groff/" +SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz" +CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" +LICENSE="GNU GPL v3" +COPYRIGHT="2003-2009 Free Software Foundation, Inc." +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + groff = $portVersion compat >= 1.20 + cmd:addftinfo = $portVersion compat >= 1.20 + cmd:afmtodit = $portVersion compat >= 1.20 + cmd:chem = $portVersion compat >= 1.20 + cmd:eqn = $portVersion compat >= 1.20 + cmd:eqn2graph = $portVersion compat >= 1.20 + cmd:gdiffmk = $portVersion compat >= 1.20 + cmd:grap2graph = $portVersion compat >= 1.20 + cmd:grn = $portVersion compat >= 1.20 + cmd:grodvi = $portVersion compat >= 1.20 + cmd:groff = $portVersion compat >= 1.20 + cmd:groffer = $portVersion compat >= 1.20 + cmd:grog = $portVersion compat >= 1.20 + cmd:grolbp = $portVersion compat >= 1.20 + cmd:grolj4 = $portVersion compat >= 1.20 + cmd:grops = $portVersion compat >= 1.20 + cmd:grotty = $portVersion compat >= 1.20 + cmd:hpftodit = $portVersion compat >= 1.20 + cmd:indxbib = $portVersion compat >= 1.20 + cmd:lkbib = $portVersion compat >= 1.20 + cmd:lookbib = $portVersion compat >= 1.20 + cmd:mmroff = $portVersion compat >= 1.20 + cmd:neqn = $portVersion compat >= 1.20 + cmd:nroff = $portVersion compat >= 1.20 + cmd:pdfroff = $portVersion compat >= 1.20 + cmd:pfbtops = $portVersion compat >= 1.20 + cmd:pic = $portVersion compat >= 1.20 + cmd:pic2graph = $portVersion compat >= 1.20 + cmd:post_grohtml = $portVersion compat >= 1.20 + cmd:pre_grohtml = $portVersion compat >= 1.20 + cmd:preconv = $portVersion compat >= 1.20 + cmd:refer = $portVersion compat >= 1.20 + cmd:roff2dvi = $portVersion compat >= 1.20 + cmd:roff2html = $portVersion compat >= 1.20 + cmd:roff2pdf = $portVersion compat >= 1.20 + cmd:roff2ps = $portVersion compat >= 1.20 + cmd:roff2text = $portVersion compat >= 1.20 + cmd:roff2x = $portVersion compat >= 1.20 + cmd:soelim = $portVersion compat >= 1.20 + cmd:tbl = $portVersion compat >= 1.20 + cmd:tfmtodit = $portVersion compat >= 1.20 + cmd:troff = $portVersion compat >= 1.20 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +DEPEND="" +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + sed -i s@docdir='$(datadir)/doc/groff/'@docdir=$docDir/@g Ma* + PERLPATH="/bin/env perl" \ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + rm $prefix/lib/charset.alias +} + +TEST() +{ + make check +} diff --git a/sys-apps/hgrep/hgrep-1.0.1.bep b/sys-apps/hgrep/hgrep-1.0.1.recipe similarity index 95% rename from sys-apps/hgrep/hgrep-1.0.1.bep rename to sys-apps/hgrep/hgrep-1.0.1.recipe index 5e94a7b5a..b4ad651a2 100644 --- a/sys-apps/hgrep/hgrep-1.0.1.bep +++ b/sys-apps/hgrep/hgrep-1.0.1.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1c11724bc9fedd058fde03b5a9f242c2" -BUILD { +BUILD() +{ cd hgrep-1.0.1 } -INSTALL { +INSTALL() +{ cd hgrep-1.0.1 BINDIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p $DESTDIR/$BINDIR diff --git a/sys-apps/hgrep/hgrep-1.0.bep b/sys-apps/hgrep/hgrep-1.0.recipe similarity index 95% rename from sys-apps/hgrep/hgrep-1.0.bep rename to sys-apps/hgrep/hgrep-1.0.recipe index c4cf23569..0aa95c571 100644 --- a/sys-apps/hgrep/hgrep-1.0.bep +++ b/sys-apps/hgrep/hgrep-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e909cea8f7ae7f6c73fe75a691b0440f" -BUILD { +BUILD() +{ cd hgrep-1.0 } -INSTALL { +INSTALL() +{ cd hgrep-1.0 BINDIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p $DESTDIR/$BINDIR diff --git a/sys-apps/less/less-436.bep b/sys-apps/less/less-436.recipe similarity index 96% rename from sys-apps/less/less-436.bep rename to sys-apps/less/less-436.recipe index b0199b2d6..734ed9dac 100644 --- a/sys-apps/less/less-436.bep +++ b/sys-apps/less/less-436.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="817bf051953ad2dea825a1cdf460caa4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd less-436 autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd less-436 make install DESTDIR="${DESTDIR}" } diff --git a/sys-apps/less/less-451.bep b/sys-apps/less/less-451.recipe similarity index 96% rename from sys-apps/less/less-451.bep rename to sys-apps/less/less-451.recipe index 1927de598..030b4844f 100644 --- a/sys-apps/less/less-451.bep +++ b/sys-apps/less/less-451.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="765f082658002b2b46b86af4a0da1842" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd less-451 autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd less-451 make install DESTDIR="${DESTDIR}" } diff --git a/sys-apps/lgrep/lgrep-1.0.bep b/sys-apps/lgrep/lgrep-1.0.recipe similarity index 95% rename from sys-apps/lgrep/lgrep-1.0.bep rename to sys-apps/lgrep/lgrep-1.0.recipe index 1abb6f3fe..eeda1bc24 100644 --- a/sys-apps/lgrep/lgrep-1.0.bep +++ b/sys-apps/lgrep/lgrep-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="2a699321a362a64d0999bf883be21452" -BUILD { +BUILD() +{ cd lgrep-1.0 } -INSTALL { +INSTALL() +{ cd lgrep-1.0 BINDIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p $DESTDIR/$BINDIR diff --git a/sys-apps/man/man-1.6f.bep b/sys-apps/man/man-1.6f.bep deleted file mode 100644 index 3f91d74ee..000000000 --- a/sys-apps/man/man-1.6f.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="Standard commands to read man pages." -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" -SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz" -CHECKSUM_MD5="67aaaa6df35215e812fd7d89472c44b6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-apps/groff >= 1.20.1" -BUILD { - cd man-1.6f - ./configure -prefix=`finddir B_COMMON_DIRECTORY` -sbindir=`finddir B_COMMON_BIN_DIRECTORY` -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL { - cd man-1.6f - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-apps/man/man-1.6g.bep b/sys-apps/man/man-1.6g.bep deleted file mode 100644 index 593d7f308..000000000 --- a/sys-apps/man/man-1.6g.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Standard commands to read man pages." -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" -SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" -CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-apps/groff >= 1.20.1" -BUILD { - cd man-1.6g - ./configure -prefix=`finddir B_COMMON_DIRECTORY` \ - -sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL { - cd man-1.6g - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1989-2012 Free Software Foundation, Inc." diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe new file mode 100644 index 000000000..2a0a618aa --- /dev/null +++ b/sys-apps/man/man-1.6g.recipe @@ -0,0 +1,94 @@ +SUMMARY="Standard commands to read man pages" +DESCRIPTION="Standard commands to read man pages." +HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" +SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" +CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" +LICENSE="GNU GPL v2" +COPYRIGHT="1989-2012 Free Software Foundation, Inc." +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="man-1.6g.patchset" + +PROVIDES=" + man = $portVersion compat >= 1.6 + cmd:apropos = $portVersion compat >= 1.6 + cmd:makewhatis = $portVersion compat >= 1.6 + cmd:man = $portVersion compat >= 1.6 + cmd:man2dvi = $portVersion compat >= 1.6 + cmd:man2html = $portVersion compat >= 1.6 + cmd:whatis = $portVersion compat >= 1.6 + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + cmd:bzip2 + cmd:cat + cmd:cmp + cmd:eqn + cmd:groff + cmd:gunzip + cmd:less + cmd:nroff + cmd:refer + cmd:tbl + cmd:zcat + " +BUILD_REQUIRES=" + cmd:awk + cmd:bzip2 + cmd:cat + cmd:cmp + cmd:eqn + cmd:groff + cmd:gunzip + cmd:less + cmd:nroff + cmd:pic + cmd:refer + cmd:tbl + cmd:zcat + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/man.conf keep-old +" + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + awk=$portPackageLinksDir/cmd~awk/bin/awk \ + bzip2=$portPackageLinksDir/cmd~bzip2/bin/bzip2 \ + cat=$portPackageLinksDir/cmd~cat/bin/cat \ + cmp=$portPackageLinksDir/cmd~cmp/bin/cmp \ + eqn=$portPackageLinksDir/cmd~eqn/bin/eqn \ + groff=$portPackageLinksDir/cmd~groff/bin/groff \ + gunzip=$portPackageLinksDir/cmd~gunzip/bin/gunzip \ + nroff=$portPackageLinksDir/cmd~nroff/bin/nroff \ + less=$portPackageLinksDir/cmd~less/bin/less \ + pic=$portPackageLinksDir/cmd~pic/bin/pic \ + refer=$portPackageLinksDir/cmd~refer/bin/refer \ + tbl=$portPackageLinksDir/cmd~tbl/bin/tbl \ + zcat=$portPackageLinksDir/cmd~zcat/bin/zcat \ + LIBS=-lbe ./configure -prefix=$prefix \ + -bindir=$binDir \ + -sbindir=$sbinDir \ + -confdir=$sysconfDir \ + -mandir=$manDir + # no autotools configure + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/sys-apps/man/patches/man-1.6f.patch b/sys-apps/man/patches/man-1.6f.patch deleted file mode 100644 index 83bd61983..000000000 --- a/sys-apps/man/patches/man-1.6f.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -up man-1.6f/configure.orig man-1.6f/configure ---- man-1.6f/configure.orig 2007-08-20 22:15:21.024379392 -0600 -+++ man-1.6f/configure 2010-08-30 21:38:47.617349120 -0600 -@@ -283,6 +283,12 @@ if test -f /xenix; then - esac - fi - -+echo checking for Haiku -+if test `uname` = "Haiku"; then -+ LIBS="$LIBS -llocale" -+ mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man -+fi -+ - echo checking how to get alloca - echo ' - #ifdef __GNUC__ -diff -up man-1.6f/man2html/Makefile.in.orig man-1.6f/man2html/Makefile.in ---- man-1.6f/man2html/Makefile.in.orig 2006-04-25 00:44:15.028835840 -0600 -+++ man-1.6f/man2html/Makefile.in 2010-08-30 21:35:20.566493184 -0600 -@@ -1,7 +1,7 @@ - CC = @CC@ - CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes - OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o --bindir = $(DESTDIR)$(PREFIX)/usr/bin -+bindir = $(DESTDIR)$(PREFIX)/bin - mandir = $(DESTDIR)$(PREFIX)@mandir@ - vardir = $(DESTDIR)$(PREFIX)/var - httpdir = $(DESTDIR)$(PREFIX)/home/httpd -diff -up man-1.6f/src/Makefile.in.orig man-1.6f/src/Makefile.in ---- man-1.6f/src/Makefile.in.orig 2010-08-30 21:36:40.814219264 -0600 -+++ man-1.6f/src/Makefile.in 2010-08-30 21:36:58.706740224 -0600 -@@ -29,6 +29,8 @@ LDFLAGS ?= -s - - LIBOBJS = @LIBOBJS@ - -+LIBS = @LIBS@ -+ - all: man man.conf apropos whatis makewhatis - - MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ -diff -up man-1.6f/src/man.conf.in.orig man-1.6f/src/man.conf.in ---- man-1.6f/src/man.conf.in.orig 2007-08-20 22:15:21.026476544 -0600 -+++ man-1.6f/src/man.conf.in 2010-08-30 21:35:20.568328192 -0600 -@@ -36,11 +36,14 @@ - # - # Every automatically generated MANPATH includes these fields - # --MANPATH /usr/man --MANPATH /usr/share/man --MANPATH /usr/local/man --MANPATH /usr/local/share/man --MANPATH /usr/X11R6/man -+MANPATH /boot/common/man -+MANPATH /boot/common/share/man -+MANPATH /boot/home/config/man -+MANPATH /boot/home/config/share/man -+MANPATH /boot/common/*/man -+MANPATH /boot/common/*/share/man -+MANPATH /boot/home/config/*/man -+MANPATH /boot/home/config/*/share/man - # - # Uncomment if you want to include one of these by default - # -@@ -58,15 +61,9 @@ MANPATH /usr/X11R6/man - # in the mandatory manpath already, but will keep man from statting - # lots of other nearby files and directories. - # --MANPATH_MAP /bin /usr/share/man --MANPATH_MAP /sbin /usr/share/man --MANPATH_MAP /usr/bin /usr/share/man --MANPATH_MAP /usr/sbin /usr/share/man --MANPATH_MAP /usr/local/bin /usr/local/share/man --MANPATH_MAP /usr/local/sbin /usr/local/share/man --MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man --MANPATH_MAP /usr/bin/X11 /usr/X11R6/man --MANPATH_MAP /usr/bin/mh /usr/share/man -+MANPATH_MAP /bin /boot/common/share/man -+MANPATH_MAP /boot/common/bin /boot/common/share/man -+MANPATH_MAP /boot/home/config/bin /boot/home/config/share/man - # - # NOAUTOPATH keeps man from automatically adding directories that look like - # manual page directories to the path. diff --git a/sys-apps/man/patches/man-1.6g.patchset b/sys-apps/man/patches/man-1.6g.patchset new file mode 100644 index 000000000..6fefdfc58 --- /dev/null +++ b/sys-apps/man/patches/man-1.6g.patchset @@ -0,0 +1,184 @@ +From 6cf4a0ec87d16e849eb8b2ec9563f75e5ef0c802 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:20:36 +0200 +Subject: Set correct default man page search paths + + +diff --git a/configure b/configure +index 4928ae0..72f37a5 100755 +--- a/configure ++++ b/configure +@@ -1368,6 +1368,10 @@ s,@man_config_dir@,$man_config_dir, + s,@man_config_file@,$man_config_file, + s,@manpathoption@,$manpathoption, + s/@sections@/$sections/ ++s,@haikuSystemManDir@,`finddir B_SYSTEM_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuSystemNonPackagedManDir@,`finddir B_SYSTEM_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuUserManDir@,`finddir B_USER_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuUserNonPackagedManDir@,`finddir B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, + ' $infile.in >> $infile + done + EOS +diff --git a/src/man.conf.in b/src/man.conf.in +index ce73ffc..346230f 100644 +--- a/src/man.conf.in ++++ b/src/man.conf.in +@@ -36,11 +36,10 @@ + # + # Every automatically generated MANPATH includes these fields + # +-MANPATH /usr/man +-MANPATH /usr/share/man +-MANPATH /usr/local/man +-MANPATH /usr/local/share/man +-MANPATH /usr/X11R6/man ++MANPATH @haikuUserNonPackagedManDir@ ++MANPATH @haikuUserManDir@ ++MANPATH @haikuSystemNonPackagedManDir@ ++MANPATH @haikuSystemManDir@ + # + # Uncomment if you want to include one of these by default + # +@@ -58,15 +57,7 @@ MANPATH /usr/X11R6/man + # in the mandatory manpath already, but will keep man from statting + # lots of other nearby files and directories. + # +-MANPATH_MAP /bin /usr/share/man +-MANPATH_MAP /sbin /usr/share/man +-MANPATH_MAP /usr/bin /usr/share/man +-MANPATH_MAP /usr/sbin /usr/share/man +-MANPATH_MAP /usr/local/bin /usr/local/share/man +-MANPATH_MAP /usr/local/sbin /usr/local/share/man +-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man +-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man +-MANPATH_MAP /usr/bin/mh /usr/share/man ++MANPATH_MAP /bin @haikuSystemManDir@ + # + # NOAUTOPATH keeps man from automatically adding directories that look like + # manual page directories to the path. +-- +1.8.3.4 + + +From 9e1bfb921e27bbe735ad965c72de53c2f5183d0d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:21:37 +0200 +Subject: src/Makefile.in: Add missing LIBS + + +diff --git a/src/Makefile.in b/src/Makefile.in +index 0b08305..4df0661 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -30,6 +30,8 @@ LDFLAGS ?= -s + + LIBOBJS = @LIBOBJS@ + ++LIBS = @LIBS@ ++ + all: man$(EXEEXT) man.conf apropos whatis makewhatis + + MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ +-- +1.8.3.4 + + +From 7444be20edf578bb159e26e1e808470377709802 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:22:08 +0200 +Subject: man2html/Makefile.in: Fix mandir and bindir + + +diff --git a/man2html/Makefile.in b/man2html/Makefile.in +index b41eaba..0c87919 100644 +--- a/man2html/Makefile.in ++++ b/man2html/Makefile.in +@@ -2,8 +2,8 @@ CC = @CC@ + CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes + OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o + EXEEXT = @EXEEXT@ +-bindir = $(DESTDIR)$(PREFIX)/usr/bin +-mandir = $(DESTDIR)$(PREFIX)@mandir@ ++bindir = $(DESTDIR)@bindir@ ++mandir = $(DESTDIR)@mandir@ + vardir = $(DESTDIR)$(PREFIX)/var + httpdir = $(DESTDIR)$(PREFIX)/home/httpd + cgiowner = nobody +-- +1.8.3.4 + + +From 914beae0b7420f8bddf3b2b89883c3a561c9c30e Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:22:33 +0200 +Subject: configure: Support presetting env vars for commands + + +diff --git a/configure b/configure +index 72f37a5..c838d25 100755 +--- a/configure ++++ b/configure +@@ -406,6 +406,11 @@ if test "$ans" = "false" + then + for i in more less cmp cat awk gawk mawk + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ continue ++ fi + eval F$i="missing" + for j in $DEFPATH + do +@@ -450,6 +455,11 @@ then + else + for i in nroff groff geqn gtbl col vgrind grefer grap gpic more less lynx cmp cat awk gawk mawk + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ continue ++ fi + eval F$i="missing" + for j in $DEFPATH + do +@@ -464,6 +474,11 @@ else + do + if test `eval echo \\$Fg$i` = "missing" + then ++ if eval "test \"x\$$i\" != x" ++ then ++ eval Fg$i=\$$i ++ continue ++ fi + for j in $DEFPATH + do + if test -f $j/$i +@@ -1021,6 +1036,12 @@ then + compress= + for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ if [ x$compress = x ]; then eval compress=\$$i; fi ++ continue ++ fi + eval F$i=missing + for j in $DEFPATH + do +@@ -1119,6 +1140,11 @@ fi + UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba" + for i in $UNCOMPRESSORS + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ continue ++ fi + eval F$i=missing + for j in $DEFPATH + do +-- +1.8.3.4 + diff --git a/sys-apps/sed/patches/sed-4.2.1.patch b/sys-apps/sed/patches/sed-4.2.1.patch deleted file mode 100644 index cd8b63ea3..000000000 --- a/sys-apps/sed/patches/sed-4.2.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN sed-4.2.1.orig/lib/regexec.c sed-4.2.1/lib/regexec.c ---- sed-4.2.1.orig/lib/regexec.c 2008-06-04 18:23:17.189401740 +0000 -+++ sed-4.2.1/lib/regexec.c 2008-06-04 18:26:00.994736475 +0000 -@@ -18,6 +18,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include "stdbool.h" -+ - static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - int n) internal_function; - static void match_ctx_clean (re_match_context_t *mctx) internal_function; diff --git a/sys-apps/sed/patches/sed-4.2.1.patchset b/sys-apps/sed/patches/sed-4.2.1.patchset new file mode 100644 index 000000000..243da1404 --- /dev/null +++ b/sys-apps/sed/patches/sed-4.2.1.patchset @@ -0,0 +1,42 @@ +From 5eb924fdedd1daece9dad63c4f6d65fbfc476c54 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Thu, 8 Aug 2013 11:44:47 +0200 +Subject: applying patch sed-4.2.1.patch + + +diff --git a/lib/regexec.c b/lib/regexec.c +index 4853551..47cccca 100644 +--- a/lib/regexec.c ++++ b/lib/regexec.c +@@ -20,6 +20,8 @@ + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + ++#include "stdbool.h" ++ + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, + Idx n) internal_function; + static void match_ctx_clean (re_match_context_t *mctx) internal_function; +-- +1.7.10.2 + + +From b9af23f6ce44497d53c5ea4668096bbadd1c9d62 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Thu, 8 Aug 2013 11:50:12 +0200 +Subject: Fix path to 'env' in help2man + + +diff --git a/build-aux/help2man b/build-aux/help2man +index af57f41..89638a0 100755 +--- a/build-aux/help2man ++++ b/build-aux/help2man +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/bin/env perl + + # Generate a short man page from --help and --version output. + # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software +-- +1.7.10.2 + diff --git a/sys-apps/sed/sed-4.2.1.bep b/sys-apps/sed/sed-4.2.1.bep deleted file mode 100644 index 5d8d171ff..000000000 --- a/sys-apps/sed/sed-4.2.1.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="sed - a stream editor" -HOMEPAGE="http://www.gnu.org/software/sed" -SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" -CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd sed-4.2.1 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --disable-nls - make -} - -INSTALL { - cd sed-4.2.1 - make install -} - -TEST { - cd sed-4.2.1 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe new file mode 100644 index 000000000..7038c8e07 --- /dev/null +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -0,0 +1,56 @@ +SUMMARY="A stream editor" +DESCRIPTION=" + Sed is a stream editor, i.e. it can be used to perform basic text + transformations on an input stream (a file or input from a pipeline). + + While in some ways similar to an editor which permits scripted edits + (such as ed), sed works by making only one pass over the input(s), and + is consequently more efficient. But it is sed's ability to filter text + in a pipeline which particularly distinguishes it from other types of + editors. + " +HOMEPAGE="http://www.gnu.org/software/sed" +COPYRIGHT="1989-2009 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" +CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="sed-4.2.1.patchset" + +PROVIDES=" + sed = $portVersion compat >= 4 + cmd:sed = $portVersion compat >= 4 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:sed + " + +defineDebugInfoPackage sed \ + $binDir/sed + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure \ + --enable-regex-tests --without-included-regex \ + --disable-rpath --with-gnu-ld + make $jobArgs +} + +INSTALL() +{ + make install + rm $libDir/charset.alias + rmdir $libDir +} diff --git a/sys-apps/texinfo/texinfo-4.13a.bep b/sys-apps/texinfo/texinfo-4.13a.bep deleted file mode 100644 index 7825b6a29..000000000 --- a/sys-apps/texinfo/texinfo-4.13a.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Texinfo is the official documentation format of the GNU project." -HOMEPAGE="http://www.gnu.org/software/texinfo/" -SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" -CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd texinfo-4.13 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd texinfo-4.13 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2008 Free Software Foundation, Inc." diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe new file mode 100644 index 000000000..4601c846e --- /dev/null +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -0,0 +1,53 @@ +SUMMARY="Standard GNU documentation format tool" +DESCRIPTION="Texinfo is the official documentation format of the GNU project." +HOMEPAGE="http://www.gnu.org/software/texinfo/" +COPYRIGHT="1992-2008 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" +CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" +REVISION="7" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="texinfo-4.13a.patch" + +PROVIDES=" + texinfo = $portVersion compat >= 4.13 + cmd:info = $portVersion compat >= 4.13 + cmd:makeinfo = $portVersion compat >= 4.13 + cmd:install_info = $portVersion compat >= 4.13 + cmd:texi2dvi = $portVersion compat >= 4.13 + cmd:texi2pdf = $portVersion compat >= 4.13 + cmd:texindex = $portVersion compat >= 4.13 + cmd:infokey = $portVersion compat >= 4.13 + cmd:pdftexi2dvi = $portVersion compat >= 4.13" +REQUIRES=" + haiku >= $haikuVersion + lib:libncurses + " +BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:sed + " + +SOURCE_DIR="texinfo-4.13" + +BUILD() +{ + libtoolize --force --copy --install + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + rm $libDir/charset.alias + rmdir $libDir +} diff --git a/sys-apps/which/patches/which-2.20.patchset b/sys-apps/which/patches/which-2.20.patchset new file mode 100644 index 000000000..e69de29bb diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe new file mode 100644 index 000000000..dff494944 --- /dev/null +++ b/sys-apps/which/which-2.20.recipe @@ -0,0 +1,38 @@ +SUMMARY="Prints out location of specified executables that are in your path" +HOMEPAGE="http://carlo17.home.xs4all.nl/which/" +COPYRIGHT="Free Software Foundation" +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.gnu.org/gnu/which/which-2.20.tar.gz" +CHECKSUM_MD5="95be0501a466e515422cde4af46b2744" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + which = $portVersion + cmd:which = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion +" +BUILD_REQUIRES=" +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make +" + +BUILD() +{ + runConfigure ./configure --disable-dependency-tracking + make $jobArgs +} + +INSTALL() +{ + make install +} + +DESCRIPTION="GNU which is an utility that is used to find which executable + (or alias or shell function) is executed when entered on the shell prompt. +" diff --git a/sys-apps/xinetd/xinetd-2.3.14.bep b/sys-apps/xinetd/xinetd-2.3.14.recipe similarity index 98% rename from sys-apps/xinetd/xinetd-2.3.14.bep rename to sys-apps/xinetd/xinetd-2.3.14.recipe index 4957efced..cc3d0868b 100644 --- a/sys-apps/xinetd/xinetd-2.3.14.bep +++ b/sys-apps/xinetd/xinetd-2.3.14.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="567382d7972613090215c6c54f9b82d9" -BUILD { +BUILD() +{ cd xinetd-2.3.14 # if we don't have rpc/rpc.h then why does it still try to use it?? @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xinetd-2.3.14 mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5 diff --git a/sys-devel/autoconf/autoconf-2.65.bep b/sys-devel/autoconf/autoconf-2.65.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.65.bep rename to sys-devel/autoconf/autoconf-2.65.recipe index 17def4b3b..f3bcfcf3c 100644 --- a/sys-devel/autoconf/autoconf-2.65.bep +++ b/sys-devel/autoconf/autoconf-2.65.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="46cfb40e0babf4c64f8325f03da81c9b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.65 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.65 make install } diff --git a/sys-devel/autoconf/autoconf-2.66.bep b/sys-devel/autoconf/autoconf-2.66.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.66.bep rename to sys-devel/autoconf/autoconf-2.66.recipe index fafe8e8c8..c2c2d6ff4 100644 --- a/sys-devel/autoconf/autoconf-2.66.bep +++ b/sys-devel/autoconf/autoconf-2.66.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="d2d22a532ee0e4d6d86a02e6425ecfce" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.66 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.66 make install } diff --git a/sys-devel/autoconf/autoconf-2.67.bep b/sys-devel/autoconf/autoconf-2.67.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.67.bep rename to sys-devel/autoconf/autoconf-2.67.recipe index 8930dea1b..ac2f75749 100644 --- a/sys-devel/autoconf/autoconf-2.67.bep +++ b/sys-devel/autoconf/autoconf-2.67.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3fbf92eb8eaca1e0d33dff9710edb5f0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.67 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.67 make install } diff --git a/sys-devel/autoconf/autoconf-2.67xz.bep b/sys-devel/autoconf/autoconf-2.67xz.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.67xz.bep rename to sys-devel/autoconf/autoconf-2.67xz.recipe index a2bda5564..f83fde14b 100644 --- a/sys-devel/autoconf/autoconf-2.67xz.bep +++ b/sys-devel/autoconf/autoconf-2.67xz.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="1da24eebe4e6a774e4039242a4f06aad" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.67 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.67 make install } diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep deleted file mode 100644 index 2d5051429..000000000 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="autoconf - Used to create autoconfiguration files" -HOMEPAGE="http://www.gnu.org/software/autoconf/" -SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" -CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd autoconf-2.68 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd autoconf-2.68 - make install -} - -TEST { - cd autoconf-2.68 - make check -} - -LICENSE="GNU GPL v2 - GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe new file mode 100644 index 000000000..9065d079d --- /dev/null +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -0,0 +1,70 @@ +SUMMARY="A tool for automatically configuring source code" +DESCRIPTION=" + GNU Autoconf is a tool for configuring source code and makefiles. Using + autoconf, programmers can create portable and configurable packages, + because the person building the package is allowed to specify various + configuration options. + " +HOMEPAGE="http://www.gnu.org/software/autoconf/" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" +CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" +REVISION="5" +ARCHITECTURES="x86_gcc2 ?x86" +LICENSE=" + GNU GPL v2 + GNU GPL v3" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." + +PROVIDES=" + autoconf = $portVersion compat >= 2.60 + cmd:autoconf = $portVersion compat >= 2.60 + cmd:autoheader = $portVersion compat >= 2.60 + cmd:autom4te = $portVersion compat >= 2.60 + cmd:autoreconf = $portVersion compat >= 2.60 + cmd:autoscan = $portVersion compat >= 2.60 + cmd:autoupdate = $portVersion compat >= 2.60 + cmd:ifnames = $portVersion compat >= 2.60 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5 + cmd:sh + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:automake >= 1.11 + cmd:autoreconf >= 2.60 + cmd:make + cmd:sed + " + +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + autoreconf + PERL="perl" M4="m4" SED="sed" \ + ./configure $configureDirArgs + make -j$jobs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} + +# ----- source package ------------------------------------------------------- + +PROVIDES_source="autoconf_source = $portVersion" diff --git a/sys-devel/autoconf/autoconf-2.69.bep b/sys-devel/autoconf/autoconf-2.69.bep deleted file mode 100644 index 73321003d..000000000 --- a/sys-devel/autoconf/autoconf-2.69.bep +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="autoconf - Used to create autoconfiguration files" -HOMEPAGE="http://www.gnu.org/software/autoconf/" -SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" -CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd autoconf-2.69 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd autoconf-2.69 - make install -} - -TEST { - cd autoconf-2.69 - make check -} - -LICENSE="GNU GPL v2 - GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe new file mode 100644 index 000000000..d754e0e88 --- /dev/null +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -0,0 +1,76 @@ +SUMMARY="A tool for automatically configuring source code" +DESCRIPTION=" + GNU Autoconf is a tool for configuring source code and makefiles. Using + autoconf, programmers can create portable and configurable packages, + because the person building the package is allowed to specify various + configuration options. + " +HOMEPAGE="http://www.gnu.org/software/autoconf/" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." +LICENSE=" + GNU GPL v2 + GNU GPL v3 + " +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" +CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES='autoconf-2.69.patchset' + +PROVIDES=" + autoconf = $portVersion compat >= 2.60 + cmd:autoconf = $portVersion compat >= 2.60 + cmd:autoheader = $portVersion compat >= 2.60 + cmd:autom4te = $portVersion compat >= 2.60 + cmd:autoreconf = $portVersion compat >= 2.60 + cmd:autoscan = $portVersion compat >= 2.60 + cmd:autoupdate = $portVersion compat >= 2.60 + cmd:ifnames = $portVersion compat >= 2.60 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5 + cmd:sh + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:automake >= 1.13.1 + cmd:autoreconf >= 2.60 + cmd:make + cmd:makeinfo + cmd:sed + " + +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + autoreconf + + # make sure that the build system doesn't try to update the manpages, + # as that requires help2man, which isn't available + touch man/*.1 + + PERL="/bin/env perl" M4="m4" SED="sed" \ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + make install-html +} + +TEST() +{ + make check +} diff --git a/sys-devel/autoconf/patches/autoconf-2.69.patchset b/sys-devel/autoconf/patches/autoconf-2.69.patchset new file mode 100644 index 000000000..a95094865 --- /dev/null +++ b/sys-devel/autoconf/patches/autoconf-2.69.patchset @@ -0,0 +1,82 @@ +From 3c6f6a572d4cf01a29db436929e435e0499387df Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Mon, 16 Sep 2013 22:37:49 +0200 +Subject: Bypass checks for autoconf git checkout + +* As part of test preparations, autoconf's build system tries to determine + if it lives in a checkout of the autoconf repository by looking if .git + exists. In our case, .git exists, so the test preparation code tries + to checkout a git submodule, which fails as the .git refers to the + git repository created by haikuporter, not the autoconf repository. + Circumvent this by causing the check for .git to always fail. + +diff --git a/maint.mk b/maint.mk +index 1c7af03..41e4030 100644 +--- a/maint.mk ++++ b/maint.mk +@@ -1294,7 +1294,7 @@ endef + + .PHONY: no-submodule-changes + no-submodule-changes: +- if test -d $(srcdir)/.git; then \ ++ if test -d $(srcdir)/.gitFOOBAR; then \ + diff=$$(cd $(srcdir) && git submodule -q foreach \ + git diff-index --name-only HEAD) \ + || exit 1; \ +@@ -1312,7 +1312,7 @@ submodule-checks ?= no-submodule-changes public-submodule-commit + # cannot be built from a fresh clone. + .PHONY: public-submodule-commit + public-submodule-commit: +- $(AM_V_GEN)if test -d $(srcdir)/.git; then \ ++ $(AM_V_GEN)if test -d $(srcdir)/.gitFOOBAR; then \ + cd $(srcdir) && \ + git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \ + = '$$(git merge-base origin $$sha1)' \ +-- +1.8.3.4 + + +From 66a0514f74a0e29994e3d42a10b5f4b1162aaa27 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Wed, 2 Oct 2013 16:18:53 +0200 +Subject: Install prefix is now /boot/system + + +diff --git a/INSTALL b/INSTALL +index d60e29a..f386627 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -247,10 +247,10 @@ directory contains several dysfunctional programs; working variants of + these programs are available in '/usr/bin'. So, if you need '/usr/ucb' + in your 'PATH', put it _after_ '/usr/bin'. + +- On Haiku, software installed for all users goes in '/boot/common', ++ On Haiku, software installed for all users goes in '/boot/system', + not '/usr/local'. It is recommended to use the following options: + +- ./configure --prefix=/boot/common ++ ./configure --prefix=/boot/system + + Specifying the System Type + ========================== +diff --git a/doc/install.texi b/doc/install.texi +index 4c2ffb5..c1a987b 100644 +--- a/doc/install.texi ++++ b/doc/install.texi +@@ -287,11 +287,11 @@ directory contains several dysfunctional programs; working variants + of these programs are available in @code{/usr/bin}. So, if you need + @code{/usr/ucb} in your @env{PATH}, put it @emph{after} @code{/usr/bin}. + +-On Haiku, software installed for all users goes in @file{/boot/common}, ++On Haiku, software installed for all users goes in @file{/boot/system}, + not @file{/usr/local}. It is recommended to use the following options: + + @example +-./configure --prefix=/boot/common ++./configure --prefix=/boot/system + @end example + + @node System Type +-- +1.8.3.4 + diff --git a/sys-devel/automake/automake-1.10.3.bep b/sys-devel/automake/automake-1.10.3.recipe similarity index 95% rename from sys-devel/automake/automake-1.10.3.bep rename to sys-devel/automake/automake-1.10.3.recipe index fbf875cae..0fa193e63 100644 --- a/sys-devel/automake/automake-1.10.3.bep +++ b/sys-devel/automake/automake-1.10.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="03bc9ebfa805f9ee5635f1f53fa1fa5f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.10.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd automake-1.10.3 make install } diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep deleted file mode 100644 index b809f2126..000000000 --- a/sys-devel/automake/automake-1.11.1.bep +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" -HOMEPAGE="http://www.gnu.org/software/automake/" -SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" -CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd automake-1.11.1 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=$COMMON_DATA \ - --docdir=$COMMON_DOCS/doc/automake \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd automake-1.11.1 - make install -} - -TEST { - cd automake-1.11.1 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2009 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe new file mode 100644 index 000000000..41723ca7c --- /dev/null +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -0,0 +1,58 @@ +SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" +DESCRIPTION=" + Automake is a tool for automatically generating 'Makefile.in' files + from 'Makefile.am' files. 'Makefile.am' is a series of 'make' macro + definitions (with rules occasionally thrown in). The generated + 'Makefile.in' files are compatible with the GNU Makefile standards. + " +HOMEPAGE="http://www.gnu.org/software/automake/" +COPYRIGHT="2009 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" +CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" +REVISION="5" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + automake = $portVersion compat >= 1.11 + cmd:automake = $portVersion compat >= 1.11 + cmd:automake_1.11 = $portVersion compat >= 1.11 + cmd:aclocal = $portVersion compat >= 1.11 + cmd:aclocal_1.11 = $portVersion compat >= 1.11 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5.8 + cmd:sh + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf >= 2.60 + cmd:make + cmd:perl >= 5.8 + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + PERL="/bin/env perl" ./configure $configureDirArgs + make -j$jobs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} diff --git a/sys-devel/automake/automake-1.12.2.bep b/sys-devel/automake/automake-1.12.2.bep deleted file mode 100644 index 491853e4b..000000000 --- a/sys-devel/automake/automake-1.12.2.bep +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" -HOMEPAGE="http://www.gnu.org/software/automake/" -SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz" -CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd automake-1.12.2 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=$COMMON_DATA \ - --docdir=$COMMON_DOCS/doc/automake \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd automake-1.12.2 - make install -} - -TEST { - cd automake-1.12.2 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2012 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe new file mode 100644 index 000000000..c91eb34bc --- /dev/null +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -0,0 +1,64 @@ +SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" +DESCRIPTION=" + Automake is a tool for automatically generating 'Makefile.in' files + from 'Makefile.am' files. 'Makefile.am' is a series of 'make' macro + definitions (with rules occasionally thrown in). The generated + 'Makefile.in' files are compatible with the GNU Makefile standards. + " +HOMEPAGE="http://www.gnu.org/software/automake/" +COPYRIGHT="2012 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz" +CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + automake = $portVersion compat >= 1.12 + cmd:automake = $portVersion compat >= 1.12 + cmd:automake_1.12 = $portVersion compat >= 1.12 + cmd:aclocal = $portVersion compat >= 1.12 + cmd:aclocal_1.12 = $portVersion compat >= 1.12 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5.8 + cmd:sh + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf >= 2.60 + cmd:gcc + cmd:ld + cmd:make + cmd:makeinfo + cmd:perl >= 5.8 + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + ./bootstrap.sh + PERL="/bin/env perl" runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + make install-html +} + +TEST() +{ + make check +} + diff --git a/sys-devel/automake/automake-1.12.5.bep b/sys-devel/automake/automake-1.12.5.recipe similarity index 95% rename from sys-devel/automake/automake-1.12.5.bep rename to sys-devel/automake/automake-1.12.5.recipe index 2d8fc54b8..46843dcbe 100644 --- a/sys-devel/automake/automake-1.12.5.bep +++ b/sys-devel/automake/automake-1.12.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="674f6d28f8723e0f478cb03de30f36f1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.12.5 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd automake-1.12.5 make install } -TEST { +TEST() +{ cd automake-1.12.5 make check } diff --git a/sys-devel/automake/automake-1.13.1.bep b/sys-devel/automake/automake-1.13.1.bep deleted file mode 100644 index e59db8f10..000000000 --- a/sys-devel/automake/automake-1.13.1.bep +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" -HOMEPAGE="http://www.gnu.org/software/automake/" -SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" -CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd automake-1.13.1 - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=$COMMON_DATA \ - --docdir=$COMMON_DOCS/doc/automake \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd automake-1.13.1 - make install -} - -TEST { - cd automake-1.13.1 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2013 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe new file mode 100644 index 000000000..2b271b2b6 --- /dev/null +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -0,0 +1,64 @@ +SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" +DESCRIPTION=" + Automake is a tool for automatically generating 'Makefile.in' files + from 'Makefile.am' files. 'Makefile.am' is a series of 'make' macro + definitions (with rules occasionally thrown in). The generated + 'Makefile.in' files are compatible with the GNU Makefile standards. + " +HOMEPAGE="http://www.gnu.org/software/automake/" +COPYRIGHT="2013 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" +CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + automake = $portVersion compat >= 1.13 + cmd:automake = $portVersion compat >= 1.13 + cmd:automake_1.13 = $portVersion compat >= 1.13 + cmd:aclocal = $portVersion compat >= 1.13 + cmd:aclocal_1.13 = $portVersion compat >= 1.13 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5.8 + cmd:sh + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf >= 2.60 + cmd:gcc + cmd:ld + cmd:make + cmd:makeinfo + cmd:perl >= 5.8 + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + ./bootstrap.sh + PERL="/bin/env perl" runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + make install-html +} + +TEST() +{ + make check +} + diff --git a/sys-devel/automake/automake-1.13.bep b/sys-devel/automake/automake-1.13.recipe similarity index 95% rename from sys-devel/automake/automake-1.13.bep rename to sys-devel/automake/automake-1.13.recipe index d31d5c63c..2169760e4 100644 --- a/sys-devel/automake/automake-1.13.bep +++ b/sys-devel/automake/automake-1.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="255661c7729d04ef2f8f58d076c89ecc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.13 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd automake-1.13 make install } -TEST { +TEST() +{ cd automake-1.13 make check } diff --git a/sys-devel/bc/bc-1.06.bep b/sys-devel/bc/bc-1.06.recipe similarity index 95% rename from sys-devel/bc/bc-1.06.bep rename to sys-devel/bc/bc-1.06.recipe index 67808119b..cf88b843d 100644 --- a/sys-devel/bc/bc-1.06.bep +++ b/sys-devel/bc/bc-1.06.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117" -BUILD { +BUILD() +{ cd bc-1.06 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bc-1.06 make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd bc-1.06/Test timetest } diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe new file mode 100644 index 000000000..b2db590e1 --- /dev/null +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -0,0 +1,175 @@ +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" +REVISION="2" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2006 Free Software Foundation, Inc." + +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PROVIDES=" + binutils$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:as$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:size$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.17 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:tar + " + +SOURCE_DIR="$portVersionedName/legacy/binutils" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +binutilsDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +binutilsObjectsDir=$binutilsDir/../binutils-obj + +BUILD() +{ + rm -rf $binutilsObjectsDir + + # Touch all *.info files, as newer texinfos don't like their format + cd $binutilsDir + find . -name \*.info | xargs touch + + # build binutils + mkdir -p $binutilsObjectsDir + cd $binutilsObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" runConfigure --omit-dirs "docDir dataRootDir" \ + "$binutilsDir/configure" \ + --exec-prefix=$installDir \ + --includedir=$includeDir/binutils \ + --with-htmldir=$relativeDocDir \ + --disable-nls --enable-shared=yes + make +} + +INSTALL() +{ + cd $binutilsObjectsDir + archName=$(grep '^target_alias' Makefile | cut -d= -f2) + + make install + make install-html + + # Remove the development libraries and headers. Nobody uses those anyway. + rm -r $libDir + rm -r $developDir/headers + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm libiberty.html standards.html + + # no info documentation + rm -r $infoDir + + ### Strip ################################################# + + echo "Strip debug info" + + cd $prefix + find bin -type f | xargs -r strip --strip-debug + strip --strip-debug $installDir/$archName/bin/* + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # There are copies of a subset of the commands below installDir. We + # overwrite those with symlinks to the ones in binDir. + for file in $installDir/i586-pc-haiku/bin/*; do + symlinkRelative -sfn $binDir/$(basename $file) $file + done + + ### Cleanup ################################################# + + echo "Cleanup" + + # delete man pages for commands that we aren't including + cd $manDir + for cmd in dlltool nlmconv windmc windres; do + rm -f man1/$cmd.1 + done +} + +DESCRIPTION=" + The GNU Binutils are a collection of binary tools. The main ones are: + + ld - the GNU linker. + as - the GNU assembler. + + But they also include: + + addr2line - Converts addresses into filenames and line numbers. + ar - A utility for creating, modifying and extracting from archives. + c++filt - Filter to demangle encoded C++ symbols. + dlltool - Creates files for building and using DLLs. + gold - A new, faster, ELF only linker, still in beta test. + gprof - Displays profiling information. + nlmconv - Converts object code into an NLM. + nm - Lists symbols from object files. + objcopy - Copys and translates object files. + objdump - Displays information from object files. + ranlib - Generates an index to the contents of an archive. + readelf - Displays information from any ELF format object file. + size - Lists the section sizes of an object or archive file. + strings - Lists printable strings from files. + strip - Discards symbols. + windmc - A Windows compatible message compiler. + windres - A compiler for Windows resource files. + + Most of these programs use BFD, the Binary File Descriptor library, to do low-level + manipulation. Many of them also use the opcodes library to assemble and disassemble machine + instructions. + + The binutils have been ported to most major Unix variants as well as Wintel systems, and their + main reason for existence is to give the GNU system (and GNU/Linux) the facility to compile + and link programs. + " diff --git a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe new file mode 100644 index 000000000..3db357b10 --- /dev/null +++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe @@ -0,0 +1,172 @@ +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" +REVISION="2" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + binutils$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:as$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:elfedit$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld.bfd$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:size$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libbfd_2.23.2$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libopcodes_2.23.2$secondaryArchSuffix = $portVersion compat >= 2.23 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + " + +SOURCE_DIR="binutils-$portVersion/binutils" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch all *.info files, as newer texinfos don't like their format + (cd $sourceDir; find . -name \*.info | xargs touch) + + mkdir -p $objectsDir + cd $objectsDir + + CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \ + --exec-prefix=$installDir \ + --includedir=$includeDir/binutils \ + --docdir=$docDir \ + --disable-nls --enable-shared=yes \ + --with-sysroot=/ + # Note: The sysroot option is normally superfluous. We have to specify + # it, however, since these binutils may be used by the bootstrap-gcc, + # which passes --sysroot= to ld. + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install + make install-html + + # Remove the development libraries and headers. Nobody uses those anyway. + rm $libDir/*.a $libDir/*.la $libDir/libbfd.so $libDir/libopcodes.so + rm -r $developDir/headers + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + + # beautify HTML docs and remove stuff we don't need + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm libiberty.html standards.html + + # no info documentation + rm -r $infoDir + + ### Strip ################################################# + + echo "Strip debug info" + + strip --strip-debug $binDir/* + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # There are copies of a subset of the commands below installDir. We + # overwrite those with symlinks to the ones in binDir. + for file in $installDir/$effectiveTargetMachineTriple/bin/*; do + symlinkRelative -sfn $binDir/$(basename $file) $file + done + + ### Cleanup ################################################# + + echo "Cleanup" + + # delete man pages for commands that we aren't including + cd $manDir + for cmd in dlltool nlmconv windmc windres; do + rm -f man1/$cmd.1 + done +} + +DESCRIPTION=" + The GNU Binutils are a collection of binary tools. The main ones are: + + ld - the GNU linker. + as - the GNU assembler. + + But they also include: + + addr2line - Converts addresses into filenames and line numbers. + ar - A utility for creating, modifying and extracting from archives. + c++filt - Filter to demangle encoded C++ symbols. + nm - Lists symbols from object files. + objcopy - Copys and translates object files. + objdump - Displays information from object files. + ranlib - Generates an index to the contents of an archive. + readelf - Displays information from any ELF format object file. + size - Lists the section sizes of an object or archive file. + strings - Lists printable strings from files. + strip - Discards symbols. + + The tools of this package can be used for cross-builds to $effectiveTargetMachineTriple. + " diff --git a/sys-devel/bison/bison-2.4.1.bep b/sys-devel/bison/bison-2.4.1.bep deleted file mode 100644 index a537c49e8..000000000 --- a/sys-devel/bison/bison-2.4.1.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" -HOMEPAGE="http://www.gnu.org/software/bison/bison.html" -SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.1.tar.gz" -CHECKSUM_MD5="c58aa1da418dc9704070872489e89bf5" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd bison-2.4.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls - make -} - -INSTALL { - cd bison-2.4.1 - make install -} - -TEST { - cd bison-2.4.1 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2008 Free Software Foundation, Inc." diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep deleted file mode 100644 index b97aa9410..000000000 --- a/sys-devel/bison/bison-2.4.3.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" -HOMEPAGE="http://www.gnu.org/software/bison/bison.html" -SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" -CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd bison-2.4.3 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --disable-nls - make -} - -INSTALL { - cd bison-2.4.3 - make install -} - -TEST { - cd bison-2.4.3 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe new file mode 100644 index 000000000..1263bfbda --- /dev/null +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -0,0 +1,70 @@ +SUMMARY="A yacc-compatible parser generator" +DESCRIPTION=" + Bison is a general-purpose parser generator that converts an annotated + context-free grammar into an LALR(1) or GLR parser for that grammar. Once + you are proficient with Bison, you can use it to develop a wide range of + language parsers, from those used in simple desk calculators to complex + programming languages. + + Bison is upward compatible with Yacc: all properly-written Yacc grammars + ought to work with Bison with no change. Anyone familiar with Yacc should + be able to use Bison with little trouble. You need to be fluent in C or + C++ programming in order to use Bison. + " +HOMEPAGE="http://www.gnu.org/software/bison/bison.html" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" +CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="bison-2.4.3.patch" + +PROVIDES=" + bison = $portVersion compat >= 2.4 + cmd:bison = $portVersion compat >= 2.4 + cmd:yacc + devel:liby = $portVersion compat >= 2.4 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:m4 + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:m4 + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + # bison looks for m4 in an absolute path, but uses that only within + # its own testsuite, so we let it be ... + M4=$portPackageLinksDir/cmd~m4/bin/m4 runConfigure ./configure \ + --disable-rpath --with-gnu-ld + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs liby + + rm $libDir/charset.alias + rmdir $libDir +} + +TEST() +{ + make check +} diff --git a/sys-devel/bison/bison-2.4.bep b/sys-devel/bison/bison-2.4.bep deleted file mode 100644 index 5e6b68cc2..000000000 --- a/sys-devel/bison/bison-2.4.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" -HOMEPAGE="http://www.gnu.org/software/bison/bison.html" -SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.tar.gz" -CHECKSUM_MD5="2b9b088b46271c7fa902a7e85f503e1e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd bison-2.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls - make -} - -INSTALL { - cd bison-2.4 - make install - make check -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2008 Free Software Foundation, Inc." diff --git a/sys-devel/bison/bison-2.5.bep b/sys-devel/bison/bison-2.5.recipe similarity index 95% rename from sys-devel/bison/bison-2.5.bep rename to sys-devel/bison/bison-2.5.recipe index 002b5e015..fd0151916 100644 --- a/sys-devel/bison/bison-2.5.bep +++ b/sys-devel/bison/bison-2.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd bison-2.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bison-2.5 make install } -TEST { +TEST() +{ cd bison-2.5 make check } diff --git a/sys-devel/bison/bison-2.6.2.bep b/sys-devel/bison/bison-2.6.2.recipe similarity index 96% rename from sys-devel/bison/bison-2.6.2.bep rename to sys-devel/bison/bison-2.6.2.recipe index be4759628..e6414b836 100644 --- a/sys-devel/bison/bison-2.6.2.bep +++ b/sys-devel/bison/bison-2.6.2.recipe @@ -6,7 +6,8 @@ REVISION="15" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd bison-2.6.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bison-2.6.2 make install } -TEST { +TEST() +{ cd bison-2.6.2 make check } diff --git a/sys-devel/bison/patches/bison-2.4.1.patch b/sys-devel/bison/patches/bison-2.4.1.patch deleted file mode 100644 index 2e2966269..000000000 --- a/sys-devel/bison/patches/bison-2.4.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur bison-2.4.1.orig/src/location.c bison-2.4.1/src/location.c ---- bison-2.4.1.orig/src/location.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4.1/src/location.c 2008-11-09 15:03:06.000000000 +0000 -@@ -121,11 +121,11 @@ - /* Must search in reverse since the file name field may - * contain `.' or `:'. */ - char *delim = strrchr (loc_str, '.'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->column = atoi (delim+1); - delim = strrchr (loc_str, ':'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->line = atoi (delim+1); - bound->file = uniqstr_new (loc_str); -diff -ur bison-2.4.1.orig/src/muscle_tab.c bison-2.4.1/src/muscle_tab.c ---- bison-2.4.1.orig/src/muscle_tab.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4.1/src/muscle_tab.c 2008-11-09 15:11:17.000000000 +0000 -@@ -336,7 +336,7 @@ - { - location loc; - char const *value = muscle_find_const (key); -- aver (value); -+ aver (value != NULL); - aver (*value == '['); - aver (*++value == '['); - while (*++value) diff --git a/sys-devel/bison/patches/bison-2.4.patch b/sys-devel/bison/patches/bison-2.4.patch deleted file mode 100644 index 7f3e5377c..000000000 --- a/sys-devel/bison/patches/bison-2.4.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur bison-2.4.orig/lib/config.charset bison-2.4/lib/config.charset ---- bison-2.4.orig/lib/config.charset 2008-11-02 21:59:28.000000000 +0000 -+++ bison-2.4/lib/config.charset 2008-11-09 14:56:56.000000000 +0000 -@@ -478,8 +478,8 @@ - # space nevertheless. - echo "* UTF-8" - ;; -- beos*) -- # BeOS has a single locale, and it has UTF-8 encoding. -+ beos*|haiku*) -+ # BeOS has a single locale, and it has UTF-8 encoding. Same for Haiku. - echo "* UTF-8" - ;; - msdosdjgpp*) -diff -ur bison-2.4.orig/src/location.c bison-2.4/src/location.c ---- bison-2.4.orig/src/location.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4/src/location.c 2008-11-09 15:03:06.000000000 +0000 -@@ -121,11 +121,11 @@ - /* Must search in reverse since the file name field may - * contain `.' or `:'. */ - char *delim = strrchr (loc_str, '.'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->column = atoi (delim+1); - delim = strrchr (loc_str, ':'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->line = atoi (delim+1); - bound->file = uniqstr_new (loc_str); -diff -ur bison-2.4.orig/src/muscle_tab.c bison-2.4/src/muscle_tab.c ---- bison-2.4.orig/src/muscle_tab.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4/src/muscle_tab.c 2008-11-09 15:11:17.000000000 +0000 -@@ -336,7 +336,7 @@ - { - location loc; - char const *value = muscle_find_const (key); -- aver (value); -+ aver (value != NULL); - aver (*value == '['); - aver (*++value == '['); - while (*++value) diff --git a/sys-devel/clang/clang-3.0.bep b/sys-devel/clang/clang-3.0.recipe similarity index 96% rename from sys-devel/clang/clang-3.0.bep rename to sys-devel/clang/clang-3.0.recipe index 1b9813895..19d1c2497 100644 --- a/sys-devel/clang/clang-3.0.bep +++ b/sys-devel/clang/clang-3.0.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="groff" CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd llvm-3.0.src/tools wget "http://llvm.org/releases/3.0/clang-3.0.tar.gz" echo "Extracting clang llvm tool..." @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd llvm-3.0.src make install } diff --git a/sys-devel/clang/clang-3.2.bep b/sys-devel/clang/clang-3.2.recipe similarity index 96% rename from sys-devel/clang/clang-3.2.bep rename to sys-devel/clang/clang-3.2.recipe index 56f007d2d..9ed169501 100644 --- a/sys-devel/clang/clang-3.2.bep +++ b/sys-devel/clang/clang-3.2.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="untested" DEPEND="groff" CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ if [ ! -L /usr ]; then ln -s /boot/system/ /usr fi @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd llvm-3.2.src make install } -TEST { +TEST() +{ cd llvm-3.2.src make check } diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe new file mode 100644 index 000000000..5333ce91c --- /dev/null +++ b/sys-devel/distcc/distcc-3.1.recipe @@ -0,0 +1,75 @@ +SUMMARY="Distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.org/" +COPYRIGHT="Copyright (C) 2002, 2003, 2004 by Martin Pool + Portions Copyright 2005 Google Inc." +LICENSE="GNU GPL v2" +SRC_URI="http://distcc.googlecode.com/files/distcc-3.1.tar.bz2" +CHECKSUM_MD5="a1a9d3853df7133669fffec2a9aab9f3" +REVISION="2" +ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + distcc = $portVersion + cmd:distcc = $portVersion + cmd:distccd = $portVersion + cmd:distccmon_text = $portVersion + cmd:lsdistcc = $portVersion + cmd:pump =$portVersion + " +GLOBAL_WRITABLE_FILES=" + settings/default/distcc keep-old + settings/distcc/hosts keep-old + settings/distcc/clients.allow keep-old + settings/distcc/commands.allow.sh keep-old + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpython2.6 + " + +BUILD_REQUIRES=" + devel:libpython2.6 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:libtoolize + cmd:which + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:gdb + cmd:g++ + cmd:make + " + +PATCHES="distcc-3.1.patchset" + +BUILD() +{ + libtoolize --copy --force --install + ./autogen.sh + runConfigure ./configure \ + LDFLAGS=-L/boot/system/lib/python2.6/config + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check RESTRICTED_PATH=/sources/distcc-3.1:/boot/system/develop/tools/bin:/bin +} + +DESCRIPTION=" + distcc is a program to distribute builds of C, C++, Objective C or Objective C++ code + across several machines on a network. distcc should always generate the same results + as a local build, is simple to install and use, and is usually much faster than a local compile. + + distcc does not require all machines to share a filesystem, have synchronized clocks, + or to have the same libraries or header files installed. They can even have different + processors or operating systems, if cross-compilers are installed. + " diff --git a/sys-devel/distcc/patches/distcc-3.1.patchset b/sys-devel/distcc/patches/distcc-3.1.patchset new file mode 100644 index 000000000..7c0ad6f32 --- /dev/null +++ b/sys-devel/distcc/patches/distcc-3.1.patchset @@ -0,0 +1,197 @@ +From 0bd21201f254f5d040d88af9a99198109899d2d8 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 30 Sep 2013 21:16:54 +0200 +Subject: Convert existing patch to git patchset. + + +diff --git a/Makefile.in b/Makefile.in +index 073482e..2759efa 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -554,7 +554,7 @@ distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj) + + # The include-server is a python app, so we use Python's build system. We pass + # the distcc version, the source location, the CPP flags (for location of the +-# includes), and the build location. ++# includes), LD flags and the build location. + include-server: + if test -z "$(INCLUDESERVER_PYTHON)"; then \ + echo "Not building $@: No suitable python found"; \ +@@ -564,6 +564,7 @@ include-server: + SRCDIR="$(srcdir)" \ + CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ ++ LDFLAGS="$(LDFLAGS)" \ + $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ + build \ + --build-base="$(include_server_builddir)" \ +diff --git a/configure.ac b/configure.ac +index 757dbe3..8456596 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -329,9 +329,12 @@ AC_CHECK_TYPES([in_port_t, in_addr_t], , , + # only looks in /etc/hosts), so we only look for -lsocket if we need + # it. + AC_SEARCH_LIBS(gethostent, [nsl]) +-AC_SEARCH_LIBS(setsockopt, [socket]) ++AC_SEARCH_LIBS(setsockopt, [socket network]) + AC_SEARCH_LIBS(hstrerror, [resolv]) + AC_SEARCH_LIBS(inet_aton, [resolv]) ++AC_SEARCH_LIBS(strsep, [bsd]) ++AC_SEARCH_LIBS(wait3, [bsd]) ++AC_SEARCH_LIBS(wait4, [bsd]) + + if test x"$with_included_popt" != x"yes" && test x"$with_included_popt" != xno + then +@@ -379,6 +382,7 @@ AC_CHECK_FUNCS([snprintf vsnprintf vasprintf asprintf getcwd getwd mkdtemp]) + AC_CHECK_FUNCS([getrusage strsignal gettimeofday]) + AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa]) + AC_CHECK_FUNCS([strndup strsep mmap strlcpy]) ++AC_CHECK_FUNCS([nice]) + + AC_CHECK_FUNCS([getloadavg]) + +@@ -471,6 +475,8 @@ AC_CHECK_MEMBER([struct sockaddr_storage.ss_family], + AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [define if you have struct sockaddr_storage]),, + [#include ]) + ++AC_CHECK_MEMBERS([struct rusage.ru_minflt, struct rusage.ru_majflt]) ++ + AC_ARG_WITH(avahi, + AC_HELP_STRING([--without-avahi], [build without avahi])) + +diff --git a/src/daemon.c b/src/daemon.c +index 5b06971..cdfd452 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -172,15 +172,19 @@ int main(int argc, char *argv[]) + if ((ret = dcc_set_lifetime()) != 0) + dcc_exit(ret); + ++#ifdef HAVE_NICE + /* do this before giving away root */ + if (nice(opt_niceness) == -1) { + rs_log_warning("nice %d failed: %s", opt_niceness, + strerror(errno)); + /* continue anyhow */ + } ++#endif + ++#ifndef __HAIKU__ + if ((ret = dcc_discard_root()) != 0) + dcc_exit(ret); ++#endif + + /* Discard privileges before opening log so that if it's created, it has + * the right ownership. */ +diff --git a/src/exec.c b/src/exec.c +index 8d2df86..bd92d4f 100644 +--- a/src/exec.c ++++ b/src/exec.c +@@ -488,12 +488,19 @@ int dcc_collect_child(const char *what, pid_t pid, + * critique_status(). */ + rs_trace("%s child %ld terminated with status %#x", + what, (long) ret_pid, *wait_status); ++#if defined HAVE_RUSAGE_RU_MINFLT && defined HAVE_RUSAGE_RU_MAJFLT + rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds, " + "%ld minflt, %ld majflt", + what, + ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, + ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec, + ru.ru_minflt, ru.ru_majflt); ++#else ++ rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds", ++ what, ++ ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, ++ ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); ++#endif + + return 0; + } +-- +1.8.3.4 + + +From c7121172e07205189fe1b10e49ab0256863ba1a2 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 1 Oct 2013 17:26:29 +0200 +Subject: C89 fixes for gcc2 compatibility + + +diff --git a/src/compile.c b/src/compile.c +index 2fc60b7..15bc8ad 100644 +--- a/src/compile.c ++++ b/src/compile.c +@@ -89,6 +89,8 @@ int dcc_discrepancy_filename(char **filename) + return 0; + } else if (str_endswith(include_server_port_suffix, + include_server_port)) { ++ int slash_pos; ++ + /* We're going to make a longer string from include_server_port: one + * that replaces include_server_port_suffix with discrepancy_suffix. */ + int delta = strlen(discrepancy_suffix) - +@@ -100,7 +102,7 @@ int dcc_discrepancy_filename(char **filename) + return EXIT_OUT_OF_MEMORY; + } + strcpy(*filename, include_server_port); +- int slash_pos = strlen(include_server_port) ++ slash_pos = strlen(include_server_port) + - strlen(include_server_port_suffix); + /* Because include_server_port_suffix is a suffix of include_server_port + * we expect to find a '/' at slash_pos in filename. */ +@@ -119,8 +121,9 @@ int dcc_discrepancy_filename(char **filename) + **/ + static int dcc_read_number_discrepancies(const char *discrepancy_filename) + { +- if (!discrepancy_filename) return 0; + struct stat stat_record; ++ ++ if (!discrepancy_filename) return 0; + if (stat(discrepancy_filename, &stat_record) == 0) { + size_t size = stat_record.st_size; + /* Does size fit in an 'int'? */ +diff --git a/src/emaillog.c b/src/emaillog.c +index fdb5e37..971e229 100644 +--- a/src/emaillog.c ++++ b/src/emaillog.c +@@ -107,12 +107,13 @@ int dcc_add_file_to_log_email(const char *description, + void dcc_maybe_send_email(void) { + int child_pid = 0; + const char *whom_to_blame; ++ char *will_send_message_to; ++ char *cant_send_message_to; ++ + if ((whom_to_blame = getenv("DISTCC_EMAILLOG_WHOM_TO_BLAME")) + == NULL) { + whom_to_blame = dcc_emaillog_whom_to_blame; + } +- char *will_send_message_to; +- char *cant_send_message_to; + + if (should_send_email == 0) return; + if (never_send_email) return; +diff --git a/src/lsdistcc.c b/src/lsdistcc.c +index 2cbca66..50f10c8 100644 +--- a/src/lsdistcc.c ++++ b/src/lsdistcc.c +@@ -920,6 +920,8 @@ int detect_distcc_servers(const char **argv, int argc, int opti, + const char *default_format = DEFAULT_FORMAT; + const char **sformat = &default_format; + const char *domain_name; ++ struct rlimit rlim = {0, 0}; ++ + if (opt_domain) { + if (dcc_get_dns_domain(&domain_name)) { + fprintf(stderr, "Can't get domain name\n"); +@@ -942,7 +944,6 @@ int detect_distcc_servers(const char **argv, int argc, int opti, + * We'll ideally use n + 2 fds in our poll loop, so ask for n + 10 + * fds total. + */ +- struct rlimit rlim = {0, 0}; + getrlimit(RLIMIT_NOFILE, &rlim); + if (rlim.rlim_cur < (rlim_t)n + 10) { + rlim.rlim_cur = (rlim_t)n + 10; +-- +1.8.3.4 + diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep deleted file mode 100644 index 4144cf665..000000000 --- a/sys-devel/flex/flex-2.5.35.bep +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="Flex is a tool for generating scanners." -HOMEPAGE="http://flex.sourceforge.net/" -SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" - -BUILD { - cd flex-2.5.35 - rm aclocal.m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - automake --add-missing --force-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL { - cd flex-2.5.35 - make install -} - -LICENSE="Flex" - -COPYRIGHT="2001-2007 The Flex Project - 1990, 1997 The Regents of the University of California" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe new file mode 100644 index 000000000..3a5ac50a0 --- /dev/null +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -0,0 +1,61 @@ +SUMMARY="A tool for generating scanners." +DESCRIPTION=" + Flex is a fast lexical analyser generator. It is a tool for generating + programs that perform pattern-matching on text. + " +HOMEPAGE="http://flex.sourceforge.net/" +COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" +LICENSE="Flex" +SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" +CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="flex-2.5.35.patch" + +PROVIDES=" + flex = $portVersion compat >= 2.5 + cmd:flex = $portVersion compat >= 2.5 + devel:libfl = $portVersion compat >= 2.5 + devel:libfl_pic = $portVersion compat >= 2.5 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:m4 + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm aclocal.m4 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + automake --add-missing --force-missing + runConfigure ./configure \ + --disable-rpath --with-gnu-ld + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libfl libfl_pic + rmdir $libDir +} diff --git a/sys-devel/flex/patches/flex-2.5.35.patch b/sys-devel/flex/patches/flex-2.5.35.patch new file mode 100644 index 000000000..2f7258f81 --- /dev/null +++ b/sys-devel/flex/patches/flex-2.5.35.patch @@ -0,0 +1,31 @@ +diff -ruw flex-2.5.35/configure.in flex-2.5.35-haiku/configure.in +--- flex-2.5.35/configure.in 2008-02-09 16:46:28.027525120 +0100 ++++ flex-2.5.35-haiku/configure.in 2011-03-05 18:05:15.222822400 +0100 +@@ -45,12 +45,12 @@ + AC_PROG_AWK + AC_PROG_INSTALL + +-AC_PATH_PROG(BISON, bison,bison) ++AC_CHECK_PROG(BISON, bison,bison) + AC_PATH_PROG(HELP2MAN, help2man, help2man) + + # Check for a GNU m4 that supports --prefix-builtins + +-AC_PATH_PROGS(M4, gm4 gnum4 m4, m4) ++AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) + + if test x"$M4" != x; then + AC_MSG_CHECKING([for GNU m4]) +diff -ruw flex-2.5.35/tests/test-pthread/Makefile.am flex-2.5.35-haiku/tests/test-pthread/Makefile.am +--- flex-2.5.35/tests/test-pthread/Makefile.am 2006-11-09 21:14:49.001310720 +0100 ++++ flex-2.5.35-haiku/tests/test-pthread/Makefile.am 2011-03-05 18:04:53.553648128 +0100 +@@ -27,7 +27,8 @@ + OBJS = scanner.o # parser.o + + AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +-LDFLAGS = -lpthread ++ ++#LDFLAGS = -lpthread + #LFLAGS = --header="scanner.h" + #YFLAGS = --defines --output=parser.c + diff --git a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe new file mode 100644 index 000000000..d95b4638f --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe @@ -0,0 +1,159 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#b1ef802 + git+git://github.com/haiku/BuildtoolsPM.git#b1ef802 + " +REVISION="2" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PROVIDES=" + gcc = $portVersion compat >= 2.95.3 + cmd:cc$secondaryArchSuffix + cmd:c++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcov$secondaryArchSuffix = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:protoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:unprotoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + binutils$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + gcc$secondaryArchSuffix + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName/legacy/gcc" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd) +gccDate=$(echo $portVersion | sed 's,.*_,,') +relativeGccInstallDir="develop/tools$secondaryArchSubDir" +gccInstallDir="$prefix/$relativeGccInstallDir" +gccObjectsDir=$gccDir/../gcc-obj + +BUILD() +{ + rm -rf $gccObjectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + # build gcc + mkdir -p $gccObjectsDir + cd $gccObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ + make bootstrap +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + rm $gccInstallDir/lib/libiberty.a + # only needed for building gcc + + base=$gccInstallDir + + ### HTML documentation #################################### + + html_base=$docDir + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $base/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc i586-pc-haiku-gcc + + # make all tools available via default paths if this is the system + # compiler + if [ $targetArchitecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + cd $binDir + ln -sfn ../$relativeGccInstallDir/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug bin/* + strip --strip-debug i586-pc-haiku/bin/* + strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi + + rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $base/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ + ln -snf /boot/system/lib/libstdc++.so $base/lib/ +} diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe new file mode 100644 index 000000000..79349b7c1 --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe @@ -0,0 +1,159 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + " +REVISION="1" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PROVIDES=" + gcc = $portVersion compat >= 2.95.3 + cmd:cc$secondaryArchSuffix + cmd:c++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcov$secondaryArchSuffix = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:protoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:unprotoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + binutils$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + gcc$secondaryArchSuffix + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName/legacy/gcc" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd) +gccDate=$(echo $portVersion | sed 's,.*_,,') +relativeGccInstallDir="develop/tools$secondaryArchSubDir" +gccInstallDir="$prefix/$relativeGccInstallDir" +gccObjectsDir=$gccDir/../gcc-obj + +BUILD() +{ + rm -rf $gccObjectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + # build gcc + mkdir -p $gccObjectsDir + cd $gccObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ + make bootstrap +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + rm $gccInstallDir/lib/libiberty.a + # only needed for building gcc + + base=$gccInstallDir + + ### HTML documentation #################################### + + html_base=$docDir + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $base/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc i586-pc-haiku-gcc + + # make all tools available via default paths if this is the system + # compiler + if [ $targetArchitecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + cd $binDir + ln -sfn ../$relativeGccInstallDir/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug bin/* + strip --strip-debug i586-pc-haiku/bin/* + strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi + + rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $base/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ + ln -snf /boot/system/lib/libstdc++.so $base/lib/ +} diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe new file mode 100644 index 000000000..2e0d0f70b --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe @@ -0,0 +1,154 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6 + git+git://github.com/haiku/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6 + " +REVISION="2" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cc$secondaryArchSuffix + cmd:c++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcov$secondaryArchSuffix = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:protoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:unprotoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + binutils$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + gcc$secondaryArchSuffix + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName/legacy/gcc" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd) +relativeGccInstallDir="develop/tools$secondaryArchSubDir" +gccInstallDir="$prefix/$relativeGccInstallDir" +gccObjectsDir=$gccDir/../gcc-obj + +BUILD() +{ + rm -rf $gccObjectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $gccObjectsDir + cd $gccObjectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ \ + $additionalConfigureFlags + make bootstrap +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + rm $gccInstallDir/lib/libiberty.a + # only needed for building gcc + + ### HTML documentation #################################### + + local html_base=$docDir + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $gccInstallDir/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc $effectiveTargetMachineTriple-gcc + + # make all tools available via default paths + echo "Symlinking binaries into default path" + mkdir -p $binDir + symlinkRelative -s $gccInstallDir/bin/* $binDir + + ### Strip ################################################# + + echo "Strip debug info" + + cd $gccInstallDir + strip --strip-debug bin/* + strip --strip-debug lib/gcc-lib/$effectiveTargetMachineTriple/2.95.3-*/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + cd $gccInstallDir + rm -rf info + rm -rf share + rm man/man1/cccp.1 + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $gccInstallDir/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $gccInstallDir/include/g++ + + ln -snf /boot/system/lib$secondaryArchSubDir/libstdc++.r4.so $gccInstallDir/lib/ +} diff --git a/sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe b/sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe new file mode 100644 index 000000000..4edcf9112 --- /dev/null +++ b/sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe @@ -0,0 +1,130 @@ +SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}" +DESCRIPTION="Standard compiler for x86 platform." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#7a87db2a172a406b79540188a23e52491ad3b741 + git+git://github.com/haiku/BuildtoolsPM.git#7a87db2a172a406b79540188a23e52491ad3b741 + " +REVISION="1" +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc_4.7.3$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + " + +SOURCE_DIR="gcc-$portVersion/gcc" + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $objectsDir + cd $objectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + + CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ + --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ + --docdir=$docDir \ + --disable-nls --enable-shared \ + --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ + --with-pkgversion=$(echo $portVersion | cut -c 7-) \ + $additionalConfigureFlags + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install-strip + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + for dir in gmp libquadmath mpc mpfr; do + mv ${dir}.html $dir + ln -s $dir/index.html ${dir}.html + done + + ### Strip ################################################# + + echo "Strip debug info" + + cd $installDir + strip --strip-debug bin/* + for f in cc1 cc1plus collect2 lto1; do + strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f + done + strip --strip-debug lib/*.a + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # make all tools available via default paths + mkdir -p $binDir + for f in c++ cpp g++ gcc gcov; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + ### Cleanup ############################################### + + echo "Cleanup" + rm -rf $installDir/info + rm -rf $installDir/share +} diff --git a/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe new file mode 100644 index 000000000..32ce0a89b --- /dev/null +++ b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe @@ -0,0 +1,139 @@ +SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}" +DESCRIPTION="Standard compiler for x86 platform." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + " +REVISION="2" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc_4.7.3$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + " + +SOURCE_DIR="gcc-$portVersion/gcc" + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $objectsDir + cd $objectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + if [ $effectiveTargetArchitecture == x86_64 ]; then + # disable multilib support, as x86_64 by default tries to build the + # 32-bit libraries, too, which fails as no 32-bit libroot is available + additionalConfigureFlags+=" --disable-multilib" + fi + + CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ + --build=$effectiveTargetMachineTriple \ + --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ + --docdir=$docDir \ + --disable-nls --enable-shared \ + --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ + --with-pkgversion=$(echo $portVersion | cut -c 7-) \ + $additionalConfigureFlags + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install-strip + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + for dir in gmp libquadmath mpc mpfr; do + mv ${dir}.html $dir + ln -s $dir/index.html ${dir}.html + done + + ### Strip ################################################# + + echo "Strip debug info" + + cd $installDir + strip --strip-debug bin/* + for f in cc1 cc1plus collect2 lto1; do + strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f + done + strip --strip-debug lib/*.a + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # create missing cc symlink + ln -sf gcc $installDir/bin/cc + + # make all tools available via default paths + mkdir -p $binDir + for f in c++ cc cpp g++ gcc gcov; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + ### Cleanup ############################################### + + echo "Cleanup" + rm -rf $installDir/info + rm -rf $installDir/share +} diff --git a/sys-devel/gettext/gettext-0.17.bep b/sys-devel/gettext/gettext-0.17.bep deleted file mode 100644 index da33c7509..000000000 --- a/sys-devel/gettext/gettext-0.17.bep +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION="gettext" -HOMEPAGE="http://www.gnu.org/software/gettext/" -SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz" -CHECKSUM_MD5="58a2bc6d39c0ba57823034d55d65d606" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd gettext-0.17 - rm ./gettext-tools/gnulib-m4/openmp.m4 - libtoolize --force --copy --install - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd autoconf-lib-link - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd .. - cd gettext-runtime - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd .. - cd gettext-tools - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd .. - cd gettext-runtime/libasprintf - libtoolize --force --copy --install - cd ../.. - export EXTRA_CONF="--disable-java" -# export LDFLAGS="-lnetwork -liconv" - ./autogen.sh --quick --skip-gnulib - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd gettext-0.17 - make install -} - -TEST { - cd gettext-0.17 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1998, 2009 Free Software Foundation, Inc." diff --git a/sys-devel/gettext/gettext-0.18.1.1-dev.bep b/sys-devel/gettext/gettext-0.18.1.1-dev.bep deleted file mode 100644 index dc485e35a..000000000 --- a/sys-devel/gettext/gettext-0.18.1.1-dev.bep +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="gettext-dev - full tools included" -HOMEPAGE="http://www.gnu.org/software/gettext/" -SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" -CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd gettext-0.18.1.1 - libtoolize --force --copy --install - ./autogen.sh --quick --skip-gnulib - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-java --without-git \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd gettext-0.18.1.1 - make install -} - -TEST { - cd gettext-0.18.1.1/gettext-runtime/tests - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1998, 2010 Free Software Foundation, Inc." diff --git a/sys-devel/gettext/gettext-0.18.1.1.bep b/sys-devel/gettext/gettext-0.18.1.1.bep deleted file mode 100644 index 9254ac9b2..000000000 --- a/sys-devel/gettext/gettext-0.18.1.1.bep +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION="gettext" -HOMEPAGE="http://www.gnu.org/software/gettext/" -SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" -CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd gettext-0.18.1.1 - libtoolize --force --copy --install - sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac - ./autogen.sh --quick --skip-gnulib - cd gettext-runtime - sed -i 's/AC_INIT/AC_INIT([gettext-runtime],[0.18.1.1])/' configure.ac - sed -i 's/gl_INIT_PACKAGE/dnl gl_INIT_PACKAGE was here/' configure.ac - sed -i 's/gl_WOE32_DLL/dnl gl_WOE32_DLL was here/' configure.ac - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - autoconf -Wnone - aclocal -I m4 -I gnulib-m4 --install --force - libtoolize --force --copy --install - autoconf -Wnone - export EXTRA_CONF="--disable-java" -# export LDFLAGS="-lnetwork -liconv" - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd gettext-0.18.1.1/gettext-runtime - make install -} - -TEST { - cd gettext-0.18.1.1/gettext-runtime - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1998, 2010 Free Software Foundation, Inc." diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe new file mode 100644 index 000000000..5b1090fe9 --- /dev/null +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -0,0 +1,117 @@ +SUMMARY="GNU tools for native language support" +DESCRIPTION="GNU 'gettext' is an important step for the GNU Translation Project, as it is an asset on which we may build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools and documentation. Specifically, the GNU 'gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable strings, or already translated strings. A special GNU Emacs mode also helps interested parties in preparing these sets, or bringing them up to date." +HOMEPAGE="http://www.gnu.org/software/gettext/" +LICENSE="GNU GPL v3" +COPYRIGHT="1998, 2010 Free Software Foundation, Inc." +SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" +CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="gettext-0.18.1.1.patch" + +PROVIDES=" + gettext$secondaryArchSuffix = $portVersion compat >= 0.18.1 + devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libgettextlib$secondaryArchSuffix = $portVersion + devel:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion + devel:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0 + devel:libgettextsrc$secondaryArchSuffix = $portVersion + devel:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion + devel:libintl$secondaryArchSuffix = 8.1.1 compat >= 8 + lib:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion + lib:libgettextpo = 0.5.1$secondaryArchSuffix compat >= 0 + lib:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:autopoint = $portVersion compat >= 0 + cmd:envsubst = $portVersion compat >= 0 + cmd:gettext = $portVersion compat >= 0 + cmd:gettext.sh = $portVersion compat >= 0 + cmd:gettextize = $portVersion compat >= 0 + cmd:msgattrib = $portVersion compat >= 0 + cmd:msgcat = $portVersion compat >= 0 + cmd:msgcmp = $portVersion compat >= 0 + cmd:msgcomm = $portVersion compat >= 0 + cmd:msgconv = $portVersion compat >= 0 + cmd:msgen = $portVersion compat >= 0 + cmd:msgexec = $portVersion compat >= 0 + cmd:msgfilter = $portVersion compat >= 0 + cmd:msgfmt = $portVersion compat >= 0 + cmd:msggrep = $portVersion compat >= 0 + cmd:msginit = $portVersion compat >= 0 + cmd:msgmerge = $portVersion compat >= 0 + cmd:msgunfmt = $portVersion compat >= 0 + cmd:msguniq = $portVersion compat >= 0 + cmd:ngettext = $portVersion compat >= 0 + cmd:recode_sr_latin = $portVersion compat >= 0 + cmd:xgettext = $portVersion compat >= 0 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + gettext${secondaryArchSuffix}_libintl == $portVersion base + lib:libiconv$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libiconv$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:makeinfo + " + +BUILD() +{ + libtoolize --force --copy --install + ./autogen.sh --quick --skip-gnulib + runConfigure ./configure \ + --disable-java --without-git + make $jobArgs +} + +INSTALL() +{ + make install + + rm $libDir/charset.alias + + prepareInstalledDevelLibs libasprintf libgettextpo libintl + prepareInstalledDevelLib libgettextlib '*.so' '*' + prepareInstalledDevelLib libgettextsrc '*.so' '*' + + # libintl package + packageEntries libintl \ + $libDir/libintl* +} + +TEST() +{ + cd gettext-runtime/tests + make check +} + +# ----- libintl package ------------------------------------------------------- + +SUMMARY_libintl="The gettext internationalization library" +PROVIDES_libintl=" + gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.18.1 + lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8 + " +REQUIRES_libintl=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libiconv${secondaryArchSuffix} + " diff --git a/sys-devel/gettext/patches/gettext-0.17.patch b/sys-devel/gettext/patches/gettext-0.17.patch deleted file mode 100644 index 0af1e7c81..000000000 --- a/sys-devel/gettext/patches/gettext-0.17.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- gettext-0.17/gettext-runtime/intl/vasnprintf.c 2009-03-03 02:29:54.000000000 +0000 -+++ work-gettext/gettext-runtime/intl/vasnprintf.c 2009-03-03 02:27:36.000000000 +0000 -@@ -186,7 +186,7 @@ - # /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. - But don't use it on BeOS, since BeOS snprintf produces no output if the - size argument is >= 0x3000000. */ --# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ -+# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __HAIKU__ - # define USE_SNPRINTF 1 - # else - # define USE_SNPRINTF 0 - ---- gettext-0.17/gettext-runtime/libasprintf/vasnprintf.c 2009-03-03 02:29:54.000000000 +0000 -+++ work-gettext/gettext-runtime/libasprintf/vasnprintf.c 2009-03-03 02:27:52.000000000 +0000 -@@ -186,7 +186,7 @@ - # /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. - But don't use it on BeOS, since BeOS snprintf produces no output if the - size argument is >= 0x3000000. */ --# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ -+# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __HAIKU__ - # define USE_SNPRINTF 1 - # else - # define USE_SNPRINTF 0 - ---- gettext-0.17/gettext-tools/gnulib-lib/float.in.h 2009-03-03 02:29:57.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/float.in.h 2009-03-03 02:28:19.000000000 +0000 -@@ -24,7 +24,7 @@ - #define _GL_FLOAT_H - - /* 'long double' properties. */ --#if defined __i386__ && defined __BEOS__ -+#if defined __i386__ && defined __HAIKU__ - /* Number of mantissa units, in base FLT_RADIX. */ - # undef LDBL_MANT_DIG - # define LDBL_MANT_DIG 64 - ---- gettext-0.17/gettext-tools/gnulib-lib/term-ostream.c 2009-03-03 02:29:57.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/term-ostream.c 2009-03-03 02:28:43.000000000 +0000 -@@ -1780,7 +1780,7 @@ - stream->exit_underline_mode = xstrdup0 (tgetstr ("ue", TEBP)); - stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP)); - --# ifdef __BEOS__ -+# ifdef __HAIKU__ - /* The BeOS termcap entry for "beterm" is broken: For "AF" and "AB" - it contains balues in terminfo syntax but the system's tparam() - function understands only the termcap syntax. */ - ---- gettext-0.17/gettext-tools/tests/gettext-4-prg.c 2009-03-03 02:29:58.000000000 +0000 -+++ work-gettext/gettext-tools/tests/gettext-4-prg.c 2009-03-03 02:29:26.000000000 +0000 -@@ -53,7 +53,7 @@ - /* Here we expect output in ISO-8859-1. - Except on Darwin 7 or newer and on BeOS, for which locale_charset () - always returns "UTF-8" (see config.charset). */ --#if !((defined __APPLE__ && defined __MACH__) || defined __BEOS__) -+#if !((defined __APPLE__ && defined __MACH__) || defined __HAIKU__) - s = gettext ("cheese"); - if (strcmp (s, "K\344se")) - { - ---- gettext-0.17/gnulib-local/lib/term-ostream.oo.c 2009-03-03 02:29:53.000000000 +0000 -+++ work-gettext/gnulib-local/lib/term-ostream.oo.c 2009-03-03 02:29:43.000000000 +0000 -@@ -1803,7 +1803,7 @@ - stream->exit_underline_mode = xstrdup0 (tgetstr ("ue", TEBP)); - stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP)); - --# ifdef __BEOS__ -+# ifdef __HAIKU__ - /* The BeOS termcap entry for "beterm" is broken: For "AF" and "AB" - it contains balues in terminfo syntax but the system's tparam() - function understands only the termcap syntax. */ - ---- gettext-0.17/gettext-tools/gnulib-lib/libxml/encoding.c 2009-03-05 02:09:23.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/libxml/encoding.c 2009-03-05 02:16:35.000000000 +0000 -@@ -1611,20 +1611,20 @@ - - #ifdef LIBXML_ICONV_ENABLED - /* check whether iconv can handle this */ -- icv_in = iconv_open("UTF-8", name); -- icv_out = iconv_open(name, "UTF-8"); -+ icv_in = libiconv_open("UTF-8", name); -+ icv_out = libiconv_open(name, "UTF-8"); - if (icv_in == (iconv_t) -1) { -- icv_in = iconv_open("UTF-8", upper); -+ icv_in = libiconv_open("UTF-8", upper); - } - if (icv_out == (iconv_t) -1) { -- icv_out = iconv_open(upper, "UTF-8"); -+ icv_out = libiconv_open(upper, "UTF-8"); - } - if ((icv_in != (iconv_t) -1) && (icv_out != (iconv_t) -1)) { - enc = (xmlCharEncodingHandlerPtr) - xmlMalloc(sizeof(xmlCharEncodingHandler)); - if (enc == NULL) { -- iconv_close(icv_in); -- iconv_close(icv_out); -+ libiconv_close(icv_in); -+ libiconv_close(icv_out); - return(NULL); - } - enc->name = xmlMemStrdup(name); -@@ -1703,7 +1703,7 @@ - } - icv_inlen = *inlen; - icv_outlen = *outlen; -- ret = iconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen); -+ ret = libiconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen); - *inlen -= icv_inlen; - *outlen -= icv_outlen; - if ((icv_inlen != 0) || (ret == -1)) { -@@ -2121,12 +2121,12 @@ - xmlFree(handler->name); - handler->name = NULL; - if (handler->iconv_out != NULL) { -- if (iconv_close(handler->iconv_out)) -+ if (libiconv_close(handler->iconv_out)) - ret = -1; - handler->iconv_out = NULL; - } - if (handler->iconv_in != NULL) { -- if (iconv_close(handler->iconv_in)) -+ if (libiconv_close(handler->iconv_in)) - ret = -1; - handler->iconv_in = NULL; - } diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1.patch b/sys-devel/gettext/patches/gettext-0.18.1.1.patch index a96aa8646..0250765dc 100644 --- a/sys-devel/gettext/patches/gettext-0.18.1.1.patch +++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch @@ -1,40 +1,11 @@ -diff -up gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac ---- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig 2010-06-06 06:49:57.058720256 -0600 -+++ gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2012-05-04 20:40:00.847511552 -0600 -@@ -44,7 +44,7 @@ LT_INIT([win32-dll]) - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -diff -up gettext-0.18.1.1/gettext-tools/configure.ac.orig gettext-0.18.1.1/gettext-tools/configure.ac ---- gettext-0.18.1.1/gettext-tools/configure.ac.orig 2010-06-06 14:04:04.007602176 -0600 -+++ gettext-0.18.1.1/gettext-tools/configure.ac 2012-05-04 20:40:00.860880896 -0600 -@@ -100,7 +100,7 @@ LT_LANG([Windows Resource]) - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h ---- gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig 2012-05-04 21:23:18.533200896 -0600 -+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-05-04 21:23:54.882900992 -0600 -@@ -31,11 +31,6 @@ +--- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h 2010-05-24 09:42:36.028573696 +0000 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-08-03 20:17:21.155189248 +0000 +@@ -31,7 +31,7 @@ # define O_BINARY _O_BINARY # define O_TEXT _O_TEXT #endif -#if defined __BEOS__ || defined __HAIKU__ -- /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ --# undef O_BINARY --# undef O_TEXT --#endif - - /* SET_BINARY (fd); - changes the file descriptor fd to perform binary I/O. */ -diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c ++#if defined __BEOS__ + /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ + # undef O_BINARY + # undef O_TEXT diff --git a/sys-devel/gettext/patches/gettext-CVS.diff b/sys-devel/gettext/patches/gettext-CVS.diff deleted file mode 100644 index d93cfe755..000000000 --- a/sys-devel/gettext/patches/gettext-CVS.diff +++ /dev/null @@ -1,33 +0,0 @@ -? gettext-runtime/libasprintf/autom4te.cache -Index: gettext-runtime/libasprintf/configure.ac -=================================================================== -RCS file: /sources/gettext/gettext/gettext-runtime/libasprintf/configure.ac,v -retrieving revision 1.24 -diff -u -r1.24 configure.ac ---- gettext-runtime/libasprintf/configure.ac 20 Apr 2008 06:48:03 -0000 1.24 -+++ gettext-runtime/libasprintf/configure.ac 4 May 2008 17:26:34 -0000 -@@ -41,7 +41,7 @@ - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -Index: gettext-tools/configure.ac -=================================================================== -RCS file: /sources/gettext/gettext/gettext-tools/configure.ac,v -retrieving revision 1.96 -diff -u -r1.96 configure.ac ---- gettext-tools/configure.ac 20 Apr 2008 06:48:03 -0000 1.96 -+++ gettext-tools/configure.ac 4 May 2008 17:29:23 -0000 -@@ -92,7 +92,7 @@ - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) diff --git a/sys-devel/jam/jam-2.5.bep b/sys-devel/jam/jam-2.5.bep deleted file mode 100644 index 42d0b0c75..000000000 --- a/sys-devel/jam/jam-2.5.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="jam" -HOMEPAGE="http://www.perforce.com/jam/jam.html" -SRC_URI="git://git.haiku-os.org/buildtools" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD { - cd jam-2.5/jam - make -} - -INSTALL { - cd jam-2.5/jam - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -a bin.haikux86/jam ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/jam -} -LICENSE="Jam" -COPYRIGHT="1993-2003 Christopher Seiwald" diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe new file mode 100644 index 000000000..7479d30b2 --- /dev/null +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -0,0 +1,59 @@ +SUMMARY="Build tool, replacement for make" +DESCRIPTION=" + Jam is a small open-source build tool that can be used as a replacement + for Make. Even though Jam is a lot simpler to use than Make, it is far + more powerful and easy to master. Its design is sufficiently clear to + allow any average programmer to extend it with advanced features at will. + + The main differences between Jam and Make are as follows: + + - Jam uses ‘Jamfiles’ instead of ‘Makefiles’. + + - Jamfiles do not normally contain toolset-specific rules or actions. + They are thus portable among distinct compilers. + + - Jamfiles are a lot simpler than Makefiles to write and understand, + while providing the same functionality, and much, much more. + " +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+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 + " +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + jam = $portVersion + cmd:jam = $portVersion compat >= 2.5 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:ld + " + +SOURCE_DIR="$portVersionedName/jam" + +BUILD() +{ + make +} + +INSTALL() +{ + mkdir -p "$binDir" + cp bin.haikux86/jam "$binDir" + + mkdir -p "$docDir" + cp Jam.html Jambase.html Jamfile.html README* "$docDir" +} diff --git a/sys-devel/lemon/lemon-3.7.5.bep b/sys-devel/lemon/lemon-3.7.5.recipe similarity index 95% rename from sys-devel/lemon/lemon-3.7.5.bep rename to sys-devel/lemon/lemon-3.7.5.recipe index af7eeb1f6..d10849a5a 100644 --- a/sys-devel/lemon/lemon-3.7.5.bep +++ b/sys-devel/lemon/lemon-3.7.5.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="612fa38f920df9b588ce90006eb4b53a" -BUILD { +BUILD() +{ gcc lemon.c -o lemon } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp lemon ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/lemon } diff --git a/sys-devel/libtool/libtool-2.2.10.bep b/sys-devel/libtool/libtool-2.2.10.recipe similarity index 93% rename from sys-devel/libtool/libtool-2.2.10.bep rename to sys-devel/libtool/libtool-2.2.10.recipe index 186945748..d1c5f448c 100644 --- a/sys-devel/libtool/libtool-2.2.10.bep +++ b/sys-devel/libtool/libtool-2.2.10.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="b745d220e88163fcd9eea0a90ccf21b0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.10 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.10 make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/libtool/libtool-2.2.6.bep b/sys-devel/libtool/libtool-2.2.6.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.6.bep rename to sys-devel/libtool/libtool-2.2.6.recipe index edfbbcdae..25796d1ae 100644 --- a/sys-devel/libtool/libtool-2.2.6.bep +++ b/sys-devel/libtool/libtool-2.2.6.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="8ca1ea241cd27ff9832e045fe9afe4fd" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.6 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.6 make install make check diff --git a/sys-devel/libtool/libtool-2.2.6b.bep b/sys-devel/libtool/libtool-2.2.6b.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.6b.bep rename to sys-devel/libtool/libtool-2.2.6b.recipe index 20e87fecc..5e883a244 100644 --- a/sys-devel/libtool/libtool-2.2.6b.bep +++ b/sys-devel/libtool/libtool-2.2.6b.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="07da460450490148c6d2df0f21481a25" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.6b ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.6b make install # make check diff --git a/sys-devel/libtool/libtool-2.2.7b.bep b/sys-devel/libtool/libtool-2.2.7b.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.7b.bep rename to sys-devel/libtool/libtool-2.2.7b.recipe index bbc0f7af6..59e86ce63 100644 --- a/sys-devel/libtool/libtool-2.2.7b.bep +++ b/sys-devel/libtool/libtool-2.2.7b.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="9f66a85efaeed0d9652f647986f6ad5b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.7b ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.7b make install # make check diff --git a/sys-devel/libtool/libtool-2.2.8.bep b/sys-devel/libtool/libtool-2.2.8.recipe similarity index 93% rename from sys-devel/libtool/libtool-2.2.8.bep rename to sys-devel/libtool/libtool-2.2.8.recipe index 58dadb83a..6f6212797 100644 --- a/sys-devel/libtool/libtool-2.2.8.bep +++ b/sys-devel/libtool/libtool-2.2.8.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="cad2a7188242bc8dbab0645532ae3d6f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.8 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.8 make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/libtool/libtool-2.2.x.bep b/sys-devel/libtool/libtool-2.2.x.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.x.bep rename to sys-devel/libtool/libtool-2.2.x.recipe index 6ba36a6ad..882c40316 100644 --- a/sys-devel/libtool/libtool-2.2.x.bep +++ b/sys-devel/libtool/libtool-2.2.x.recipe @@ -6,14 +6,16 @@ REVISION="1" MESSAGE="This is for building and testing of unreleased libtool" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.x ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.x make install make check diff --git a/sys-devel/libtool/libtool-2.4.2.bep b/sys-devel/libtool/libtool-2.4.2.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.4.2.bep rename to sys-devel/libtool/libtool-2.4.2.recipe index ffb7ebf6b..a81f7819f 100644 --- a/sys-devel/libtool/libtool-2.4.2.bep +++ b/sys-devel/libtool/libtool-2.4.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d2f3b7d4627e69e13514a40e72a24d50" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.4.2 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libtool-2.4.2 make install } -TEST { +TEST() +{ cd libtool-2.4.2 make check } diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep deleted file mode 100644 index 85330f714..000000000 --- a/sys-devel/libtool/libtool-2.4.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="libtool - a generic library support script" -HOMEPAGE="http://www.gnu.org/software/libtool" -SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" -CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd libtool-2.4 - ./bootstrap - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd libtool-2.4 - make install -} - -TEST { - cd libtool-2.4 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2004-2010 Free Software Foundation, Inc." diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe new file mode 100644 index 000000000..cec49589f --- /dev/null +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -0,0 +1,97 @@ +SUMMARY="A generic library support script" +DESCRIPTION=" + GNU libtool is a set of shell scripts to automatically configure UNIX + architectures to build shared libraries in a generic fashion. + " +HOMEPAGE="http://www.gnu.org/software/libtool" +COPYRIGHT="2004-2010 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" +SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" +CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" +REVISION="8" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES=" + 2.4/adjust_config_for_packaging.patch + 2.4/remove_help2man_dependency.patch + " + +PROVIDES=" + libtool = $portVersion compat >= 2.4 + cmd:libtool = $portVersion compat >= 2.4 + cmd:libtoolize = $portVersion compat >= 2.4 + devel:libltdl = 7.3.0 compat >= 7 + " +REQUIRES=" + haiku >= $haikuVersion + libtool_libltdl == $portVersion base + cmd:aclocal + cmd:automake + cmd:sed + cmd:tar + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf >= 2.62 + cmd:autoheader >= 2.62 + cmd:gcc + cmd:ld + cmd:make + cmd:nm + cmd:ranlib + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + ./bootstrap + SED='sed' NM='nm' LD=ld runConfigure ./configure \ + --with-gnu-ld + make $jobArgs + # Desperate move to remove the absolute paths from libtool. For some reason + # only for the C++ compiler those are set (not for the C compiler). In + # openSuse libtool doesn't have those variables set either, but building + # according to their libroot.spec produces a libtool that has them set as + # well. My guess is that one has to build libtool without a C++ compiler + # installed to get that result. + sed -i -e 's@^predep_objects=".*"$@predep_objects=""'@ \ + -e 's@^postdep_objects=".*"$@postdep_objects=""'@ \ + -e 's@^postdeps=".*"$@postdeps=""'@ \ + -e 's@^compiler_lib_search_path=".*"$@compiler_lib_search_path=""'@ \ + -e 's@^compiler_lib_search_dirs=".*"$@compiler_lib_search_dirs=""'@ \ + libtool +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libltdl + + # libltdl package + packageEntries libltdl \ + $libDir/libltdl* + + # main package + rmdir $libDir +} + +TEST() +{ + make check +} + +# ----- libltdl package ------------------------------------------------------- + +SUMMARY_libltdl="The libtool libltdl library" +PROVIDES_libltdl=" + libtool_libltdl = $portVersion compat >= 2.4 + lib:libltdl = 7.3.0 compat >= 7 + " +REQUIRES_libltdl=" + haiku >= $haikuVersion + " diff --git a/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch new file mode 100644 index 000000000..53cdd3033 --- /dev/null +++ b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch @@ -0,0 +1,17 @@ +Adjust haiku configuration of upstream libtool for packaging. + +diff -ruwN libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4_haiku/libltdl/m4/libtool.m4 +--- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 10:41:19.021233664 +0200 ++++ libtool-2.4_haiku/libltdl/m4/libtool.m4 2013-04-27 21:00:11.784859136 +0200 +@@ -2473,8 +2473,9 @@ + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' +- hardcode_into_libs=yes ++ sys_lib_search_path_spec='/boot/common/non-packaged/lib /boot/common/develop/lib /boot/common/lib /boot/system/develop/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/common/non-packaged/lib /boot/common/lib /boot/system/lib' ++ hardcode_into_libs=no + ;; + + hpux9* | hpux10* | hpux11*) diff --git a/sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch b/sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch new file mode 100644 index 000000000..de7615273 --- /dev/null +++ b/sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch @@ -0,0 +1,24 @@ +Remove dependency to help2man, which tries to regenerate the manpages. +As the failure to use help2man has become an error with automake-1.13, +we just use the manpages that come with the source. + +diff -ruwN libtool-2.4/Makefile.am libtool-2.4_haiku/Makefile.am +--- libtool-2.4/Makefile.am 2010-09-21 09:07:22.038535168 +0200 ++++ libtool-2.4_haiku/Makefile.am 2013-04-23 23:41:18.886833152 +0200 +@@ -322,16 +322,6 @@ + $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi + + dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 +-MAINTAINERCLEANFILES += $(dist_man1_MANS) +-update_mans = \ +- PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ +- $(HELP2MAN) --output=$@ +-$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh +- $(update_mans) --help-option=--help-all libtool +-$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in +- $(update_mans) libtoolize +- +- + ## ------------- ## + ## Installation. ## + ## ------------- ## diff --git a/sys-devel/llvm/llvm-3.0.bep b/sys-devel/llvm/llvm-3.0.bep deleted file mode 100644 index 63e4b04b7..000000000 --- a/sys-devel/llvm/llvm-3.0.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="LLVM is a collection of modular and reuseable compiler and toolchain technologies." -HOMEPAGE="http://www.llvm.org/" -SRC_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { - cd llvm-3.0.src - ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd llvm-3.0.src - make install -} - -LICENSE="UIUC" -COPYRIGHT="2003-2011 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/llvm/llvm-3.0.recipe b/sys-devel/llvm/llvm-3.0.recipe new file mode 100644 index 000000000..82bd1fc02 --- /dev/null +++ b/sys-devel/llvm/llvm-3.0.recipe @@ -0,0 +1,111 @@ +SUMMARY="collection of modular and reuseable compiler and toolchain technologies" +HOMEPAGE="http://www.llvm.org/" +COPYRIGHT="2003-2011 University of Illinois at Urbana-Champaign" +LICENSE="UIUC" +SRC_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz" +CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" +REVISION="1" +#ARCHITECTURES="x86" +#if [ $effectiveTargetArchitecture != x86_gcc2 ]; then +# # x86_gcc2 is fine as primary target architecture as long as we're building +# # for a different secondary architecture. +# ARCHITECTURES="$ARCHITECTURES x86_gcc2" +#fi +#SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + llvm$secondaryArchSuffix = $portVersion compat >= 3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion +# cmd:autoconf +# cmd:flex + cmd:groff + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +# cmd:makeinfo + cmd:perl +# cmd:sed +# cmd:strip +# cmd:tar + " + +#POLICY WARNING: Invalid top-level package entry "docs" +#POLICY WARNING: Invalid top-level package entry "include" +#POLICY WARNING: Invalid top-level package entry "share" +#POLICY WARNING: no matching provides "cmd:bugpoint" for "bin/bugpoint" +#POLICY WARNING: no matching provides "cmd:llc" for "bin/llc" +#POLICY WARNING: no matching provides "cmd:lli" for "bin/lli" +#POLICY WARNING: no matching provides "cmd:llvm_ar" for "bin/llvm-ar" +#POLICY WARNING: no matching provides "cmd:llvm_as" for "bin/llvm-as" +#POLICY WARNING: no matching provides "cmd:llvm_bcanalyzer" for "bin/llvm-bcanalyzer" +#POLICY WARNING: no matching provides "cmd:llvm_config" for "bin/llvm-config" +#POLICY WARNING: no matching provides "cmd:llvm_cov" for "bin/llvm-cov" +#POLICY WARNING: no matching provides "cmd:llvm_diff" for "bin/llvm-diff" +#POLICY WARNING: no matching provides "cmd:llvm_dis" for "bin/llvm-dis" +#POLICY WARNING: no matching provides "cmd:llvm_dwarfdump" for "bin/llvm-dwarfdump" +#POLICY WARNING: no matching provides "cmd:llvm_extract" for "bin/llvm-extract" +#POLICY WARNING: no matching provides "cmd:llvm_ld" for "bin/llvm-ld" +#POLICY WARNING: no matching provides "cmd:llvm_link" for "bin/llvm-link" +#POLICY WARNING: no matching provides "cmd:llvm_mc" for "bin/llvm-mc" +#POLICY WARNING: no matching provides "cmd:llvm_nm" for "bin/llvm-nm" +#POLICY WARNING: no matching provides "cmd:llvm_objdump" for "bin/llvm-objdump" +#POLICY WARNING: no matching provides "cmd:llvm_prof" for "bin/llvm-prof" +#POLICY WARNING: no matching provides "cmd:llvm_ranlib" for "bin/llvm-ranlib" +#POLICY WARNING: no matching provides "cmd:llvm_rtdyld" for "bin/llvm-rtdyld" +#POLICY WARNING: no matching provides "cmd:llvm_size" for "bin/llvm-size" +#POLICY WARNING: no matching provides "cmd:llvm_stub" for "bin/llvm-stub" +#POLICY WARNING: no matching provides "cmd:llvm_tblgen" for "bin/llvm-tblgen" +#POLICY WARNING: no matching provides "cmd:macho_dump" for "bin/macho-dump" +#POLICY WARNING: no matching provides "cmd:opt" for "bin/opt" + +SOURCE_DIR="llvm-$portVersion.src" + +BUILD() +{ + runConfigure ./configure --enable-optimized + make $jobArgs +} + +INSTALL() +{ + make install +} + + +DESCRIPTION="The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them. The name \"LLVM\" itself is not an acronym; it is the full name of the project. + +LLVM began as a research project at the University of Illinois, with the goal of providing a modern, SSA-based compilation strategy capable of supporting both static and dynamic compilation of arbitrary programming languages. Since then, LLVM has grown to be an umbrella project consisting of a number of subprojects, many of which are being used in production by a wide variety of commercial and open source projects as well as being widely used in academic research. Code in the LLVM project is licensed under the \"UIUC\" BSD-Style license. + +The primary sub-projects of LLVM are: + +The LLVM Core libraries provide a modern source- and target-independent optimizer, along with code generation support for many popular CPUs (as well as some less common ones!) These libraries are built around a well specified code representation known as the LLVM intermediate representation (\"LLVM IR\"). The LLVM Core libraries are well documented, and it is particularly easy to invent your own language (or port an existing compiler) to use LLVM as an optimizer and code generator. + +Clang is an \"LLVM native\" C/C++/Objective-C compiler, which aims to deliver amazingly fast compiles (e.g. about 3x faster than GCC when compiling Objective-C code in a debug configuration), extremely useful error and warning messages and to provide a platform for building great source level tools. The Clang Static Analyzer is a tool that automatically finds bugs in your code, and is a great example of the sort of tool that can be built using the Clang frontend as a library to parse C/C++ code. + +dragonegg integrates the LLVM optimizers and code generator with the GCC parsers. This allows LLVM to compile Ada, Fortran, and other languages supported by the GCC compiler frontends, and access to C features not supported by Clang (such as OpenMP). + +The LLDB project builds on libraries provided by LLVM and Clang to provide a great native debugger. It uses the Clang ASTs and expression parser, LLVM JIT, LLVM disassembler, etc so that it provides an experience that \"just works\". It is also blazing fast and much more memory efficient than GDB at loading symbols. + +The libc++ and libc++ ABI projects provide a standard conformant and high-performance implementation of the C++ Standard Library, including full support for C++11. + +The compiler-rt project provides highly tuned implementations of the low-level code generator support routines like \"__fixunsdfdi\" and other calls generated when a target doesn't have a short sequence of native instructions to implement a core IR operation. + +The vmkit project is an implementation of the Java and .NET Virtual Machines that is built on LLVM technologies. + +The polly project implements a suite of cache-locality optimizations as well as auto-parallelism and vectorization using a polyhedral model. + +The libclc project aims to implement the OpenCL standard library. + +The klee project implements a \"symbolic virtual machine\" which uses a theorem prover to try to evaluate all dynamic paths through a program in an effort to find bugs and to prove properties of functions. A major feature of klee is that it can produce a testcase in the event that it detects a bug. + +The SAFECode project is a memory safety compiler for C/C++ programs. It instruments code with run-time checks to detect memory safety errors (e.g., buffer overflows) at run-time. It can be used to protect software from security attacks and can also be used as a memory safety error debugging tool like Valgrind. + +In addition to official subprojects of LLVM, there are a broad variety of other projects that use components of LLVM for various tasks. Through these external projects you can use LLVM to compile Ruby, Python, Haskell, Java, D, PHP, Pure, Lua, and a number of other languages. A major strength of LLVM is its versatility, flexibility, and reusability, which is why it is being used for such a wide variety of different tasks: everything from doing light-weight JIT compiles of embedded languages like Lua to compiling Fortran code for massive super computers." diff --git a/sys-devel/llvm/llvm-3.2.bep b/sys-devel/llvm/llvm-3.2.bep deleted file mode 100644 index 1fdabddd4..000000000 --- a/sys-devel/llvm/llvm-3.2.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="LLVM is a collection of modular and reuseable compiler and toolchain technologies." -HOMEPAGE="http://www.llvm.org/" -SRC_URI="http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { - if [ ! -L /usr ]; then - ln -s /boot/system/ /usr - fi - cd llvm-3.2.src - cp -r /boot/common/data/libtool/config/. autoconf/ - cp -r /boot/common/data/libtool/config/. projects/sample/autoconf/ - ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd llvm-3.2.src - make install -} - -LICENSE="UIUC" -COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe new file mode 100644 index 000000000..c88cb43ce --- /dev/null +++ b/sys-devel/llvm/llvm-3.2.recipe @@ -0,0 +1,58 @@ +SUMMARY="Modular and reuseable compiler and toolchain technologies." +DESCRIPTION="LLVM is a collection of modular and reuseable compiler and and toolchain technologies." +HOMEPAGE="http://www.llvm.org/" +LICENSE="UIUC" +COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" +SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz" +REVISION="1" +CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + llvm$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:python + cmd:sed + " + +SOURCE_DIR="llvm-${portVersion}.src" + +PATCH() +{ + find . -type f -exec sed -i 's/\/usr\/bin\/env/\/bin\/env/g' "{}" \; +} + +BUILD() +{ + # Haiku C++ requires rtti in a lot of central system components + # such as Mesa + export REQUIRES_RTTI=1 + runConfigure ./configure --enable-optimized + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/sys-devel/m4/m4-1.4.14.bep b/sys-devel/m4/m4-1.4.14.bep deleted file mode 100644 index 10453555d..000000000 --- a/sys-devel/m4/m4-1.4.14.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="m4 - GNU macro processor" -HOMEPAGE="http://www.gnu.org/software/m4/" -SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.14.tar.gz" -CHECKSUM_MD5="f0542d58f94c7d0ce0d01224e447be66" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="" - -BUILD { - cd m4-1.4.14 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-changeword - make -} - -INSTALL { - cd m4-1.4.14 - make install -} - -TEST { - cd m4-1.4.14 - makecheck -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2000, 2005-2010 Free Software Foundation, Inc." diff --git a/sys-devel/m4/m4-1.4.14.recipe b/sys-devel/m4/m4-1.4.14.recipe new file mode 100644 index 000000000..8d4435360 --- /dev/null +++ b/sys-devel/m4/m4-1.4.14.recipe @@ -0,0 +1,39 @@ +DESCRIPTION="m4 - GNU macro processor" +HOMEPAGE="http://www.gnu.org/software/m4/" +SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.14.tar.gz" +CHECKSUM_MD5="f0542d58f94c7d0ce0d01224e447be66" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="" + +BUILD() +{ + cd m4-1.4.14 + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.14 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/packages/m4 \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld \ + --enable-changeword + make +} + +INSTALL() +{ + cd m4-1.4.14 + make install +} + +TEST() +{ + cd m4-1.4.14 + makecheck +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2000, 2005-2010 Free Software Foundation, Inc." diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.recipe similarity index 57% rename from sys-devel/m4/m4-1.4.15.bep rename to sys-devel/m4/m4-1.4.15.recipe index ed67467a5..8e141440e 100644 --- a/sys-devel/m4/m4-1.4.15.bep +++ b/sys-devel/m4/m4-1.4.15.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd m4-1.4.15 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac echo >> configure.ac @@ -15,16 +16,28 @@ BUILD { libtoolize --force --copy --install aclocal -I m4 autoreconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-changeword + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.15 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/packages/m4 \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld \ + --enable-changeword make } -INSTALL { +INSTALL() +{ cd m4-1.4.15 make install } -TEST { +TEST() +{ cd m4-1.4.15 make check } diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep deleted file mode 100644 index c8fdfe4c5..000000000 --- a/sys-devel/m4/m4-1.4.16.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="m4 - GNU macro processor" -HOMEPAGE="http://www.gnu.org/software/m4/" -SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" -CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD { - cd m4-1.4.16 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-changeword \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd m4-1.4.16 - make install -} - -TEST { - cd m4-1.4.16 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc." diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe new file mode 100644 index 000000000..31d1cf934 --- /dev/null +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -0,0 +1,65 @@ +SUMMARY="A macro processor" +DESCRIPTION=" + GNU M4 is an implementation of the traditional Unix macro processor. + It is mostly SVR4 compatible although it has some extensions (for + example, handling more than 9 positional parameters to macros). + GNU M4 also has built-in functions for including files, running shell + commands, doing arithmetic, etc. + + M4 is a macro processor in the sense that it copies its input to the + output expanding macros as it goes. Macros are either builtin or + user-defined and can take any number of arguments. Besides just doing + macro expansion, m4 has builtin functions for including named files, + running UNIX commands, doing integer arithmetic, manipulating text in + various ways, recursion etc... M4 can be used either as a front-end to + a compiler or as a macro processor in its own right. + + One of the biggest users of M4 is the GNU Autoconf project. + " +HOMEPAGE="http://www.gnu.org/software/m4/" +COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" +CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + m4 = $portVersion compat >= 1.4 + cmd:m4 = $portVersion compat >= 1.4 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure \ + --disable-rpath --with-gnu-ld \ + --enable-changeword + make $jobArgs +} + +INSTALL() +{ + make install + + rm $libDir/charset.alias + rmdir $libDir +} + +TEST() +{ + make check +} diff --git a/sys-devel/make/make-3.81.bep b/sys-devel/make/make-3.81.bep deleted file mode 100644 index 5038fab80..000000000 --- a/sys-devel/make/make-3.81.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Standard tool to compile source trees." -HOMEPAGE="http://www.gnu.org/software/make/" -SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.81.tar.bz2" -CHECKSUM_MD5="354853e0b2da90c527e35aabb8d6f1e6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd make-3.81 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-nls \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - ./build.sh -} - -INSTALL { - cd make-3.81 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1988-2006 Free Software Foundation, Inc." diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep deleted file mode 100644 index cd32f8eab..000000000 --- a/sys-devel/make/make-3.82.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Standard tool to compile source trees." -HOMEPAGE="http://www.gnu.org/software/make/" -SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" -CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd make-3.82 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-nls \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - ./build.sh -} - -INSTALL { - cd make-3.82 - ./make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1988-2010 Free Software Foundation, Inc." diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe new file mode 100644 index 000000000..67c416f55 --- /dev/null +++ b/sys-devel/make/make-3.82.recipe @@ -0,0 +1,52 @@ +SUMMARY="Standard tool to compile source trees" +DESCRIPTION=" + Make is a tool which controls the generation of executables and other + non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file called + the makefile, which lists each of the non-source files and how to compute + it from other files. When you write a program, you should write a makefile + for it, so that it is possible to use Make to build and install the + program. + " +HOMEPAGE="http://www.gnu.org/software/make/" +LICENSE="GNU GPL v3" +COPYRIGHT="1988-2010 Free Software Foundation, Inc." +SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" +CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="make-3.82.patch" + +PROVIDES=" + make = $portVersion compat >= 3.82 + cmd:make = $portVersion compat >= 3.82 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + runConfigure ./configure \ + --disable-rpath --with-gnu-ld + ./build.sh +} + +INSTALL() +{ + ./make install +} diff --git a/sys-devel/make/patches/make-3.81.patch b/sys-devel/make/patches/make-3.81.patch deleted file mode 100644 index e8ce9e72a..000000000 --- a/sys-devel/make/patches/make-3.81.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up make-3.81/arscan.c.orig make-3.81/arscan.c ---- make-3.81/arscan.c.orig 2010-04-18 13:33:16.283901952 -0600 -+++ make-3.81/arscan.c 2010-04-18 13:34:10.106168320 -0600 -@@ -231,7 +231,7 @@ ar_scan (char *archive, long int (*funct - #endif - - #ifndef WINDOWS32 --# ifndef __BEOS__ -+# if !defined(__BEOS__) && !defined(__HAIKU__) - # include - # else - /* BeOS 5 doesn't have but has archives in the same format diff --git a/sys-devel/patch/patch-2.6.1.bep b/sys-devel/patch/patch-2.6.1.recipe similarity index 50% rename from sys-devel/patch/patch-2.6.1.bep rename to sys-devel/patch/patch-2.6.1.recipe index 48ca6fba6..869ed1002 100644 --- a/sys-devel/patch/patch-2.6.1.bep +++ b/sys-devel/patch/patch-2.6.1.recipe @@ -5,14 +5,23 @@ CHECKSUM_MD5="0818d1763ae0c4281bcdc63cdac0b2c0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd patch-2.6.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/patch-2.6.1 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/packages/patch \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man make } -INSTALL { +INSTALL() +{ cd patch-2.6.1 make install } diff --git a/sys-devel/patch/patch-2.7.1.bep b/sys-devel/patch/patch-2.7.1.recipe similarity index 95% rename from sys-devel/patch/patch-2.7.1.bep rename to sys-devel/patch/patch-2.7.1.recipe index ce005d780..5be2da908 100644 --- a/sys-devel/patch/patch-2.7.1.bep +++ b/sys-devel/patch/patch-2.7.1.recipe @@ -4,14 +4,16 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/patch/patch-2.7.1.tar.bz2" CHECKSUM_MD5="0881a7c6477862fc395f373ada0ec6b6" STATUS_HAIKU="stable" REVISION="1" -BUILD { +BUILD() +{ cd patch-2.7.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd patch-2.7.1 make install } diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe similarity index 97% rename from sys-fs/e2fsprogs/e2fsprogs-1.43.bep rename to sys-fs/e2fsprogs/e2fsprogs-1.43.recipe index 298212606..9531f3103 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd e2fsprogs-1.43 autoconf libdir=`finddir B_COMMON_LIB_DIRECTORY` @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd e2fsprogs-1.43 make install-libs } diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe similarity index 96% rename from sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep rename to sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe index cc5b02d07..5adffe854 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd e2fsprogs autoconf libdir=`finddir B_COMMON_LIB_DIRECTORY` @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd e2fsprogs make install-libs } diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch new file mode 100644 index 000000000..64306c456 --- /dev/null +++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch @@ -0,0 +1,476 @@ +diff --git a/configure.in b/configure.in +index ac3cd92..296021a 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,8 +96,11 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead])) + dnl + AC_PROG_CC + if test "$GCC" = yes; then +- RDYNAMIC="-rdynamic" +- AC_SUBST(RDYNAMIC) ++ case "$host_os" in ++ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;; ++ *) RDYNAMIC="-rdynamic" ;; ++ esac ++ AC_SUBST(RDYNAMIC) + fi + AC_PROG_CPP + dnl +@@ -1051,6 +1054,7 @@ AC_CHECK_FUNCS(m4_flatten([ + backtrace + blkid_probe_get_topology + chflags ++ daemon + fallocate + fallocate64 + fchown +@@ -1094,9 +1098,10 @@ AC_CHECK_FUNCS(m4_flatten([ + dnl + dnl Check to see if -lsocket is required (solaris) to make something + dnl that uses socket() to compile; this is needed for the UUID library ++dnl Haiku needs -lnetwork to get socket(). + dnl + SOCKET_LIB='' +-AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket]) ++AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket],[AC_CHECK_LIB(network, socket, [SOCKET_LIB=-lnetwork])]) + AC_SUBST(SOCKET_LIB) + dnl + dnl See if optreset exists +@@ -1187,6 +1192,16 @@ linux* | gnu* | k*bsd*-gnu) + fi + fi + ;; ++haiku*) ++ if test "$prefix" = NONE ; then ++ prefix="`finddir B_COMMON_DIRECTORY`"; ++ AC_MSG_RESULT([On $host_os systems, prefix defaults to `finddir B_COMMON_DIRECTORY`]) ++ if test "$sbindir" = '${exec_prefix}/sbin' ; then ++ AC_MSG_RESULT([...and sbindir defaults to `finddir B_COMMON_DIRECTORY`/bin]) ++ mandir="`finddir B_COMMON_DIRECTORY`/bin" ++ fi ++ fi ++;; + esac + if test "$root_prefix" = NONE ; then + if test "$prefix" = NONE ; then +diff --git a/contrib/spd_readdir.c b/contrib/spd_readdir.c +index 8345fa1..b5984e9 100644 +--- a/contrib/spd_readdir.c ++++ b/contrib/spd_readdir.c +@@ -254,7 +254,7 @@ DIR *opendir(const char *name) + dirstruct = alloc_dirstruct(dir); + if (!dirstruct) { + (*real_closedir)(dir); +- errno = -ENOMEM; ++ errno = ENOMEM; + return NULL; + } + +@@ -287,7 +287,7 @@ DIR *fdopendir(int fd) + dirstruct = alloc_dirstruct(dir); + if (!dirstruct) { + (*real_closedir)(dir); +- errno = -ENOMEM; ++ errno = ENOMEM; + return NULL; + } + +diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h +index 09a9d08..6cb3746 100644 +--- a/e2fsck/e2fsck.h ++++ b/e2fsck/e2fsck.h +@@ -67,7 +67,9 @@ + #define E2FSCK_ATTR(x) + #endif + ++#ifdef CONFIG_QUOTA + #include "quota/mkquota.h" ++#endif + + /* + * Exit codes used by fsck-type programs +@@ -320,7 +322,9 @@ struct e2fsck_struct { + /* + * Ext4 quota support + */ ++#ifdef CONFIG_QUOTA + quota_ctx_t qctx; ++#endif + #ifdef RESOURCE_TRACK + /* + * For timing purposes +diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c +index c48b8eb..ec45dd3 100644 +--- a/e2fsck/logfile.c ++++ b/e2fsck/logfile.c +@@ -233,10 +233,14 @@ static FILE *save_output(const char *s0, const char *s1, const char *s2) + } + + if (pid == 0) { ++#ifdef HAVE_DAEMON + if (daemon(0, 0) < 0) { + perror("daemon"); + exit(1); + } ++#else ++#warning daemon() not present ++#endif + /* + * Grab the output from our parent + */ +diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c +index a20b57b..253a681 100644 +--- a/e2fsck/pass1.c ++++ b/e2fsck/pass1.c +@@ -2206,11 +2206,13 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx, + } + } + ++#ifdef CONFIG_QUOTA + if (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super)) { + quota_data_add(ctx->qctx, inode, ino, + pb.num_blocks * fs->blocksize); + quota_data_inodes(ctx->qctx, inode, ino, +1); + } ++#endif + + if (!(fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_HUGE_FILE) || +diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c +index 05cbd10..a4bae9e 100644 +--- a/e2fsck/pass1b.c ++++ b/e2fsck/pass1b.c +@@ -644,8 +644,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + if (ctx->inode_bad_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); + ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode)); ++#ifdef CONFIG_QUOTA + quota_data_sub(ctx->qctx, &inode, ino, pb.dup_blocks * fs->blocksize); + quota_data_inodes(ctx->qctx, &inode, ino, -1); ++#endif + + /* Inode may have changed by block_iterate, so reread it */ + e2fsck_read_inode(ctx, ino, &inode, "delete_file"); +@@ -677,7 +679,9 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + delete_file_block(fs, &blk, + BLOCK_COUNT_EXTATTR, 0, 0, &pb); + ext2fs_file_acl_block_set(fs, &inode, blk); ++#ifdef CONFIG_QUOTA + quota_data_sub(ctx->qctx, &inode, ino, fs->blocksize); ++#endif + } + } + } +diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c +index a379e9b..0d3af58 100644 +--- a/e2fsck/pass3.c ++++ b/e2fsck/pass3.c +@@ -491,8 +491,10 @@ ext2_ino_t e2fsck_get_lost_and_found(e2fsck_t ctx, int fix) + ext2fs_icount_store(ctx->inode_count, ino, 2); + ext2fs_icount_store(ctx->inode_link_info, ino, 2); + ctx->lost_and_found = ino; ++#ifdef CONFIG_QUOTA + quota_data_add(ctx->qctx, &inode, ino, fs->blocksize); + quota_data_inodes(ctx->qctx, &inode, ino, +1); ++#endif + #if 0 + printf("/lost+found created; inode #%lu\n", ino); + #endif +@@ -802,7 +804,9 @@ errcode_t e2fsck_expand_directory(e2fsck_t ctx, ext2_ino_t dir, + + inode.i_size = (es.last_block + 1) * fs->blocksize; + ext2fs_iblk_add_blocks(fs, &inode, es.newblocks); ++#ifdef CONFIG_QUOTA + quota_data_add(ctx->qctx, &inode, dir, es.newblocks * fs->blocksize); ++#endif + + e2fsck_write_inode(ctx, dir, &inode, "expand_directory"); + +diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c +index 2d55180..c5ca971 100644 +--- a/e2fsck/pass4.c ++++ b/e2fsck/pass4.c +@@ -64,7 +64,9 @@ static int disconnect_inode(e2fsck_t ctx, ext2_ino_t i, + e2fsck_read_bitmaps(ctx); + ext2fs_inode_alloc_stats2(fs, i, -1, + LINUX_S_ISDIR(inode->i_mode)); ++#ifdef CONFIG_QUOTA + quota_data_inodes(ctx->qctx, inode, i, -1); ++#endif + return 0; + } + } +diff --git a/e2fsck/quota.c b/e2fsck/quota.c +index 7a1476e..2dc01ff 100644 +--- a/e2fsck/quota.c ++++ b/e2fsck/quota.c +@@ -21,6 +21,7 @@ + static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino, + ext2_ino_t to_ino, int qtype) + { ++#ifdef CONFIG_QUOTA + struct ext2_inode inode; + char qf_name[QUOTA_NAME_LEN]; + +@@ -46,10 +47,12 @@ static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino, + /* Clear out the original inode in the inode-table block. */ + memset(&inode, 0, sizeof(struct ext2_inode)); + ext2fs_write_inode(fs, from_ino, &inode); ++#endif + } + + void e2fsck_hide_quota(e2fsck_t ctx) + { ++#ifdef CONFIG_QUOTA + struct ext2_super_block *sb = ctx->fs->super; + struct problem_context pctx; + ext2_filsys fs = ctx->fs; +@@ -79,4 +82,5 @@ void e2fsck_hide_quota(e2fsck_t ctx) + } + + return; ++#endif + } +diff --git a/e2fsck/unix.c b/e2fsck/unix.c +index 5b705ed..93e270e 100644 +--- a/e2fsck/unix.c ++++ b/e2fsck/unix.c +@@ -1616,6 +1616,7 @@ print_unsupp_features: + journal_size = -1; + + if (sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA) { ++#ifdef CONFIG_QUOTA + /* Quotas were enabled. Do quota accounting during fsck. */ + if ((sb->s_usr_quota_inum && sb->s_grp_quota_inum) || + (!sb->s_usr_quota_inum && !sb->s_grp_quota_inum)) +@@ -1624,6 +1625,11 @@ print_unsupp_features: + qtype = sb->s_usr_quota_inum ? USRQUOTA : GRPQUOTA; + + quota_init_context(&ctx->qctx, ctx->fs, qtype); ++#else ++ log_err(ctx, _("%s: e2fsck not compiled with QUOTA support,\n\t" ++ "but filesystem %s has QUOTA enabled.\n"), ++ ctx->program_name, ctx->device_name); ++#endif + } + + run_result = e2fsck_run(ctx); +@@ -1658,6 +1664,7 @@ print_unsupp_features: + } + no_journal: + ++#ifdef CONFIG_QUOTA + if (ctx->qctx) { + int i, needs_writeout; + for (i = 0; i < MAXQUOTAS; i++) { +@@ -1673,6 +1680,7 @@ no_journal: + } + quota_release_context(&ctx->qctx); + } ++#endif + + if (run_result == E2F_FLAG_RESTART) { + log_out(ctx, _("Restarting e2fsck from the beginning...\n")); +diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c +index a6673c1..c2ea2f7 100644 +--- a/lib/blkid/devname.c ++++ b/lib/blkid/devname.c +@@ -40,6 +40,10 @@ + + #include "blkidP.h" + ++#ifndef makedev ++#define makedev(major,minor) (-1) ++#endif ++ + /* + * Find a dev struct in the cache by device name, if available. + * +diff --git a/lib/ext2fs/bmap64.h b/lib/ext2fs/bmap64.h +index c5384c9..4573fc6 100644 +--- a/lib/ext2fs/bmap64.h ++++ b/lib/ext2fs/bmap64.h +@@ -9,6 +9,8 @@ + * %End-Header% + */ + ++#include ++ + struct ext2_bmap_statistics { + int type; + struct timeval created; +diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c +index ebd544f..f72525b 100644 +--- a/lib/ext2fs/csum.c ++++ b/lib/ext2fs/csum.c +@@ -722,6 +722,7 @@ __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + __u16 crc = 0; + struct ext2_group_desc *desc; + size_t size; ++ size_t offset; + + size = fs->super->s_desc_size; + if (size < EXT2_MIN_DESC_SIZE) +@@ -764,7 +765,7 @@ __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + } + + /* old crc16 code */ +- size_t offset = offsetof(struct ext2_group_desc, bg_checksum); ++ offset = offsetof(struct ext2_group_desc, bg_checksum); + crc = ext2fs_crc16(~0, fs->super->s_uuid, + sizeof(fs->super->s_uuid)); + crc = ext2fs_crc16(crc, &group, sizeof(group)); +diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c +index 3503615..3236c6a 100644 +--- a/lib/ext2fs/dblist.c ++++ b/lib/ext2fs/dblist.c +@@ -365,9 +365,9 @@ int ext2fs_dblist_count(ext2_dblist dblist) + errcode_t ext2fs_dblist_get_last(ext2_dblist dblist, + struct ext2_db_entry **entry) + { +- EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST); + static struct ext2_db_entry ret_entry; + struct ext2_db_entry2 *last; ++ EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST); + + if (dblist->count == 0) + return EXT2_ET_DBLIST_EMPTY; +diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c +index 19be630..d556594 100644 +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -24,6 +24,9 @@ + #include "config.h" + #include + #include ++#if HAVE_STDINT_H ++#include ++#endif + #if HAVE_UNISTD_H + #include + #endif +diff --git a/lib/quota/common.h b/lib/quota/common.h +index 7f3f4b9..fee81b1 100644 +--- a/lib/quota/common.h ++++ b/lib/quota/common.h +@@ -13,9 +13,15 @@ + # endif + #endif + ++# if !defined __GNUC__ || __GNUC__ > 2 + #define log_err(format, arg ...) \ + fprintf(stderr, "[ERROR] %s:%d:%s:: " format "\n", \ + __FILE__, __LINE__, __func__, ## arg) ++#else ++#define log_err(format, arg...) \ ++ fprintf(stderr, "[ERROR] %s:%d:%s:: " format "\n", \ ++ __FILE__, __LINE__, __func__ , ## arg) ++#endif + + #ifdef DEBUG_QUOTA + # define log_debug(format, arg ...) \ +diff --git a/lib/quota/quotaio_tree.h b/lib/quota/quotaio_tree.h +index 6ee54c9..4c22c21 100644 +--- a/lib/quota/quotaio_tree.h ++++ b/lib/quota/quotaio_tree.h +@@ -6,6 +6,7 @@ + #define _LINUX_QUOTA_TREE_H + + #include ++#include + + typedef u_int32_t qid_t; /* Type in which we store ids in memory */ + +diff --git a/misc/mke2fs.c b/misc/mke2fs.c +index bbf477a..40ae31c 100644 +--- a/misc/mke2fs.c ++++ b/misc/mke2fs.c +@@ -2334,6 +2334,7 @@ static void fix_cluster_bg_counts(ext2_filsys fs) + ext2fs_free_blocks_count_set(fs->super, EXT2FS_C2B(fs, tot_free)); + } + ++#ifdef CONFIG_QUOTA + static int create_quota_inodes(ext2_filsys fs) + { + quota_ctx_t qctx; +@@ -2345,6 +2346,7 @@ static int create_quota_inodes(ext2_filsys fs) + + return 0; + } ++#endif + + int main (int argc, char *argv[]) + { +@@ -2729,9 +2731,11 @@ no_journal: + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + fix_cluster_bg_counts(fs); ++#ifdef CONFIG_QUOTA + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_QUOTA)) + create_quota_inodes(fs); ++#endif + + if (!quiet) + printf(_("Writing superblocks and " +diff --git a/misc/tune2fs.c b/misc/tune2fs.c +index c1ecae8..267b672 100644 +--- a/misc/tune2fs.c ++++ b/misc/tune2fs.c +@@ -56,7 +56,9 @@ extern int optind; + #include "jfs_user.h" + #include "util.h" + #include "blkid/blkid.h" ++#ifdef CONFIG_QUOTA + #include "quota/mkquota.h" ++#endif + + #include "../version.h" + #include "nls-enable.h" +@@ -477,6 +479,7 @@ static int rewrite_dir_block(ext2_filsys fs, + dcl->limit = ext2fs_cpu_to_le16(max_entries); + } + } else { ++ int max_entries; + /* If htree block is full then rebuild the dir */ + if (ext2fs_le16_to_cpu(dcl->count) == + ext2fs_le16_to_cpu(dcl->limit)) { +@@ -487,7 +490,7 @@ static int rewrite_dir_block(ext2_filsys fs, + * Ensure dcl->limit is small enough to leave room for + * the checksum tail. + */ +- int max_entries = (fs->blocksize - (dcl_offset + ++ max_entries = (fs->blocksize - (dcl_offset + + sizeof(struct ext2_dx_tail))) / + sizeof(struct ext2_dx_entry); + if (ext2fs_le16_to_cpu(dcl->limit) != max_entries) +@@ -1127,6 +1130,7 @@ err: + return 1; + } + ++#ifdef CONFIG_QUOTA + void handle_quota_options(ext2_filsys fs) + { + quota_ctx_t qctx; +@@ -1176,6 +1180,7 @@ void handle_quota_options(ext2_filsys fs) + + return; + } ++#endif + + void parse_quota_opts(const char *opts) + { +@@ -2547,7 +2552,13 @@ retry_open: + rc = 1; + goto closefs; + } ++#ifdef CONFIG_QUOTA + handle_quota_options(fs); ++#else ++ fputs(_("The quota feature is disabled.\n"), stderr); ++ rc = 1; ++ goto closefs; ++#endif + } + + if (U_flag) { diff --git a/sys-fs/fatsort/fatsort-0.9.17.269.bep b/sys-fs/fatsort/fatsort-0.9.17.269.recipe similarity index 100% rename from sys-fs/fatsort/fatsort-0.9.17.269.bep rename to sys-fs/fatsort/fatsort-0.9.17.269.recipe diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe new file mode 100644 index 000000000..85569360c --- /dev/null +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -0,0 +1,67 @@ +SUMMARY="OpenGL Utility Library" +DESCRIPTION="OpenGL Utility Library" +HOMEPAGE="http://freedesktop.org" +COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." +LICENSE="MIT" +SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" +CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + glu$secondaryArchSuffix = $portVersion + lib:libGLU$secondaryArchSuffix = 1.3.1 compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + devel:libglapi$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +BUILD() +{ + # The Haiku build system builds libGL.so from libglapi and libglu. Since the + # glu build system requires libGL.so (since the shared libglu.so is linked + # against it), we build a dummy libGL.so from libglapi.a. + gcc -o libGL.so -shared -Xlinker --whole-archive -lglapi + libglLinkFlags="-L$(pwd)" + + LDFLAGS="$libglLinkFlags" \ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libGLU + fixPkgconfig + + # Remove the additional LDFLAGS from libGLU.la + sed -i "s,^dependency_libs=.*,dependency_libs=' -lGL'," \ + $developLibDir/libGLU.la + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + glu${secondaryArchSuffix}_devel = $portVersion + devel:libGLU$secondaryArchSuffix = 1.3.1 compat >= 1 + " +REQUIRES_devel=" + glu$secondaryArchSuffix == $portVersion base + " diff --git a/sys-libs/glu/glu-9.0.bep b/sys-libs/glu/glu-9.0.bep deleted file mode 100644 index 1f6601b29..000000000 --- a/sys-libs/glu/glu-9.0.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="glu" -HOMEPAGE="http://freedesktop.org" -SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" -CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd glu-9.0.0 - ./configure --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ - --includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY`/os/opengl \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd glu-9.0.0 - make install DESTDIR="${DESTDIR}" -} - -LICENSE="MIT" -COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." diff --git a/sys-libs/mesa/mesa-7.8.2.bep b/sys-libs/mesa/mesa-7.8.2.bep deleted file mode 100644 index 47499d4e5..000000000 --- a/sys-libs/mesa/mesa-7.8.2.bep +++ /dev/null @@ -1,25 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" -MESSAGE="This port only builds with gcc2. Not for general use." -BUILD { - export DEBUG=0 - cd Mesa-7.8.2 - make haiku - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe new file mode 100644 index 000000000..121b45e59 --- /dev/null +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -0,0 +1,87 @@ +# NOTE: This recipe doesn't generate packages for general use: +# * mesa_devel: Is a service package for the Haiku build system. It contains the +# Mesa libraries and headers, which are built into the Haiku system package. +# * mesa: Is an empty package which we keep as a dependency for the Haiku system +# package, mainly to keep the copyright info. + +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. + +A variety of device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs. + +Mesa ties into several other open-source projects: the Direct Rendering Infrastructure and X.org to provide OpenGL support to users of X on Linux, FreeBSD and other operating systems." +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." +LICENSE="MIT" +SRC_URI="ftp://freedesktop.org/pub/mesa/older-versions/7.x/7.8.2/MesaLib-7.8.2.tar.bz2" +CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" +REVISION="3" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PATCHES="mesa-7.8.2.patch" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +SOURCE_DIR="Mesa-$portVersion" + +BUILD() +{ + DEBUG=0 make $jobArgs haiku +} + +INSTALL() +{ + # "make install" seems to be broken, so we copy the headers and libraries + # manually. + + mkdir -p $includeDir + cp -r include/* $includeDir + + mkdir -p $developLibDir + cp lib/libglu.a src/mesa/*.a src/glsl/*/*.a $developLibDir + + mesaPrivateHeaders=$includeDir/mesa_private + for header in $(find src -name '*\.h' | sed "s,^src/,,"); do + mkdir -p $mesaPrivateHeaders/$(dirname $header) + cp src/$header $mesaPrivateHeaders/$header + done + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libglapi$secondaryArchSuffix = $portVersion + devel:libglslcl$secondaryArchSuffix = $portVersion + devel:libglslpp$secondaryArchSuffix = $portVersion + devel:libglu$secondaryArchSuffix = $portVersion + devel:libmesa$secondaryArchSuffix = $portVersion + devel:libmesagallium$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + mesa$secondaryArchSuffix == $portVersion base + " diff --git a/sys-libs/mesa/mesa-9.0.1.bep b/sys-libs/mesa/mesa-9.0.1.bep deleted file mode 100644 index d03000d46..000000000 --- a/sys-libs/mesa/mesa-9.0.1.bep +++ /dev/null @@ -1,25 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.1/MesaLib-9.0.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="scons" -CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { - export DEBUG=0 - cd Mesa-9.0.1 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.1 ./Mesa-9.0.1 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.2.bep b/sys-libs/mesa/mesa-9.0.2.bep deleted file mode 100644 index 6bc915411..000000000 --- a/sys-libs/mesa/mesa-9.0.2.bep +++ /dev/null @@ -1,28 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.2/MesaLib-9.0.2.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="scons, llvm >= 3.2" -CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { - export DEBUG=0 - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - echo "This generates a Mesa3D build package for Haiku... not for general use" - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - cd Mesa-9.0.2 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.2 ./Mesa-9.0.2 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.bep b/sys-libs/mesa/mesa-9.0.bep deleted file mode 100644 index 768707c1e..000000000 --- a/sys-libs/mesa/mesa-9.0.bep +++ /dev/null @@ -1,25 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.0/MesaLib-9.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="scons" -CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { - export DEBUG=0 - cd Mesa-9.0 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0 ./Mesa-9.0 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.1.0.bep b/sys-libs/mesa/mesa-9.1.0.bep deleted file mode 100644 index e35967ffc..000000000 --- a/sys-libs/mesa/mesa-9.1.0.bep +++ /dev/null @@ -1,28 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.1/MesaLib-9.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="scons, llvm >= 3.2" -CHECKSUM_MD5="d3891e02215422e120271d976ff1947e" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { - export DEBUG=0 - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - echo "This generates a Mesa3D build package for Haiku... not for general use" - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - cd Mesa-9.1 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.0 ./Mesa-9.1 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.1.1.bep b/sys-libs/mesa/mesa-9.1.1.bep deleted file mode 100644 index 411a60acc..000000000 --- a/sys-libs/mesa/mesa-9.1.1.bep +++ /dev/null @@ -1,28 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="scons, llvm >= 3.2" -CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { - export DEBUG=0 - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - echo "This generates a Mesa3D build package for Haiku... not for general use" - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - cd Mesa-9.1.1 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.1 ./Mesa-9.1.1 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe new file mode 100644 index 000000000..aea69935d --- /dev/null +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -0,0 +1,105 @@ +# NOTE: This recipe doesn't generate packages for general use: +# * mesa_devel: Is a service package for the Haiku build system. It contains the +# Mesa libraries and headers, which are built into the Haiku system package. +# * mesa: Is an empty package which we keep as a dependency for the Haiku system +# package, mainly to keep the copyright info. + +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. + +A variety of device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs. + +Mesa ties into several other open-source projects: the Direct Rendering Infrastructure and X.org to provide OpenGL support to users of X on Linux, FreeBSD and other operating systems." +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." +LICENSE="MIT" +SRC_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2" +CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PATCHES="mesa-9.1.1.patch" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + libxml2_python + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:scons + cmd:sed + " +# TODO: Add LLVM, so llvmpipe can be built! + +SOURCE_DIR="Mesa-$portVersion" + +BUILD() +{ + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + scons $jobArgs build=release +} + +INSTALL() +{ + mesaBuildDir=build/haiku-$effectiveTargetArchitecture + + mkdir -p $includeDir + cp -r include/* $includeDir + + mkdir -p $developLibDir + cp $(find $mesaBuildDir -name '*\.a') $developLibDir + strip --strip-debug $developLibDir/* + + mesaPrivateHeaders=$includeDir/mesa_private + for header in $(find src -name '*\.h' | sed "s,^src/,,"); do + mkdir -p $mesaPrivateHeaders/$(dirname $header) + cp src/$header $mesaPrivateHeaders/$header + done + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libgalahad$secondaryArchSuffix = $portVersion + devel:libgallium$secondaryArchSuffix = $portVersion + devel:libglapi$secondaryArchSuffix = $portVersion + devel:libglsl$secondaryArchSuffix = $portVersion + devel:libi915$secondaryArchSuffix = $portVersion + devel:libi915sw$secondaryArchSuffix = $portVersion + devel:libidentity$secondaryArchSuffix = $portVersion + devel:libmesa$secondaryArchSuffix = $portVersion + devel:librbug$secondaryArchSuffix = $portVersion + devel:libsoftpipe$secondaryArchSuffix = $portVersion + devel:libst_vega$secondaryArchSuffix = $portVersion + devel:libsvga$secondaryArchSuffix = $portVersion + devel:libtrace$secondaryArchSuffix = $portVersion + devel:libws_null$secondaryArchSuffix = $portVersion + devel:libws_wrapper$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + mesa$secondaryArchSuffix == $portVersion base + " diff --git a/sys-libs/mesa/mesa-9.3.recipe b/sys-libs/mesa/mesa-9.3.recipe new file mode 100644 index 000000000..480e35fa3 --- /dev/null +++ b/sys-libs/mesa/mesa-9.3.recipe @@ -0,0 +1,96 @@ +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. + +Mesa fills the role of the Haiku OpenGL kit. +" + +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." +LICENSE="MIT" +SRC_URI="git://anongit.freedesktop.org/mesa/mesa" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion compat >= 9.3 + lib:libGL$secondaryArchSuffix = $portVersion compat >= 9.3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + libxml2_python + llvm >= 3.2 + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:scons + cmd:sed + " + +SOURCE_DIR="Mesa-$portVersion" + +BUILD() +{ + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + scons $jobArgs build=release + #scons $jobArgs build=debug +} + +INSTALL() +{ + mesaBuildDir=build/haiku-$effectiveTargetArchitecture + + mkdir -p $includeDir/GL + cp include/GL/gl.h $includeDir/GL/ + cp include/GL/gl_mangle.h $includeDir/GL/ + cp include/GL/glext.h $includeDir/GL/ + + # libGL.so makes up the core of our OpenGL kit + mkdir -p $libDir + cp $(find $mesaBuildDir -name 'libGL.so') $libDir + + # Our rendering add-ons + mkdir -p $addOnsDir/opengl + cp $(find $mesaBuildDir -name 'libswpipe.so') $addOnsDir/opengl/Softpipe + + # devel package + packageEntries devel \ + $developDir + # swpipe renderer package + packageEntries swpipe \ + $addOnsDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + " + +REQUIRES_devel=" + mesa$secondaryArchSuffix == $portVersion base + " + +# ----- swpipe package ------------------------------------------------------- + +PROVIDES_swpipe=" + mesa${secondaryArchSuffix}_swpipe = $portVersion + " + +REQUIRED_swpipe=" + mesa$secondaryArchSuffix == $portVersion base + " diff --git a/sys-libs/ncurses/ncurses-5.6.bep b/sys-libs/ncurses/ncurses-5.6.bep deleted file mode 100644 index 69ec76766..000000000 --- a/sys-libs/ncurses/ncurses-5.6.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.6.tar.gz" -CHECKSUM_MD5="b6593abe1089d6aab1551c105c9300e3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ncurses-5.6 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd ncurses-5.6 - make install -} -LICENSE="MIT" -COPYRIGHT="1998-2008 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.7.bep b/sys-libs/ncurses/ncurses-5.7.bep deleted file mode 100644 index 06d53abd4..000000000 --- a/sys-libs/ncurses/ncurses-5.7.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.7.tar.gz" -CHECKSUM_MD5="cce05daf61a64501ef6cd8da1f727ec6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ncurses-5.7 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-libtool - make -} - -INSTALL { - cd ncurses-5.7 - ./misc/shlib make install DESTDIR="${DESTDIR}" -} -LICENSE="MIT" -COPYRIGHT="1998-2008 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.8.bep b/sys-libs/ncurses/ncurses-5.8.bep deleted file mode 100644 index 8679d2720..000000000 --- a/sys-libs/ncurses/ncurses-5.8.bep +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.8.tar.gz" -CHECKSUM_MD5="20ed3fa7599937f0ca268d9088837a64" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ncurses-5.8 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-libtool - make -} - -INSTALL { - cd ncurses-5.8 - ./misc/shlib make install DESTDIR="${DESTDIR}" -} - -LICENSE="MIT" -COPYRIGHT="1998-2011 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.9.bep b/sys-libs/ncurses/ncurses-5.9.bep deleted file mode 100644 index 392f126e2..000000000 --- a/sys-libs/ncurses/ncurses-5.9.bep +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" -CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ncurses-5.9 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-libtool \ - --enable-termcap - make -} - -INSTALL { - cd ncurses-5.9 - ./misc/shlib make install DESTDIR="${DESTDIR}" -} - -LICENSE="MIT" -COPYRIGHT="1998-2011 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe new file mode 100644 index 000000000..677256cdf --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -0,0 +1,194 @@ +SUMMARY="New curses library" +HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" +SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" +CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" +LICENSE="MIT" +COPYRIGHT="1998-2011 Free Software Foundation, Inc." +REVISION="10" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="ncurses-5.9.patchset" + +PROVIDES=" + ncurses$secondaryArchSuffix = $portVersion compat >= 5 + lib:libform$secondaryArchSuffix = $portVersion compat >= 5 + lib:libformw$secondaryArchSuffix = $portVersion compat >= 5 + lib:libmenu$secondaryArchSuffix = $portVersion compat >= 5 + lib:libmenuw$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncurses$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncursesw$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncurses++$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncurses++w$secondaryArchSuffix = $portVersion compat >= 5 + lib:libpanel$secondaryArchSuffix = $portVersion compat >= 5 + lib:libpanelw$secondaryArchSuffix = $portVersion compat >= 5 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:captoinfo = $portVersion compat >= 5 + cmd:clear = $portVersion compat >= 5 + cmd:infocmp = $portVersion compat >= 5 + cmd:infotocap = $portVersion compat >= 5 + cmd:reset = $portVersion compat >= 5 + cmd:tabs = $portVersion compat >= 5 + cmd:tic = $portVersion compat >= 5 + cmd:toe = $portVersion compat >= 5 + cmd:tput = $portVersion compat >= 5 + cmd:tset = $portVersion compat >= 5 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +if [ -n "$secondaryArchSuffix" ]; then + REQUIRES="$REQUIRES + ncurses == $portVersion base + " +fi + +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:grep + cmd:ld$secondaryArchSuffix + cmd:libtool + cmd:make + cmd:sed + " + +doBuild() +{ + if [ $# -lt 1 ]; then + echo >&2 "Usage: doBuild [ ... ]" + exit 1 + fi + + targetDir=$(pwd)/$1 + shift 1 + + # Parse additional arguments. "--libs-only" means we only want the + # libraries, nothing else. "--without-progs" means no programs and no + # terminfo DB (requires tic). + local noData + local libsOnly + local configureArgs + local arg + for arg in $@; do + case "$arg" in + --libs-only) + noData=1 + libsOnly=1 + arg="--without-progs" + ;; + --without-progs) + noData=1 + ;; + esac + configureArgs="$configureArgs $arg" + done + + rm -rf $targetDir + mkdir $targetDir + + runConfigure \ + --omit-dirs "dataRootDir docDir" ./configure \ + --with-libtool \ + --enable-termcap \ + --enable-hard-tabs \ + $configureArgs + make $jobArgs + + if [ -z "$noData" ]; then + # We need LIBRARY_PATH to include the library installation directory, + # since the installation process for the terminfo database will run tic + # and the built-in rpath doesn't consider the DESTDIR we're using. + LIBRARY_PATH="$targetDir/$prefix/lib:$LIBRARY_PATH" \ + make install DESTDIR=$targetDir + else + make install.libs DESTDIR=$targetDir + if [ -z "$libsOnly" ]; then + make install.includes DESTDIR=$targetDir + make install.man DESTDIR=$targetDir + fi + fi + + # clean up for the next build + make clean +} + +BUILD() +{ + # Unfortunately building only works in the source directory. So we build + # two times -- once without and once with wide-char support -- installing in + # temporary directories from which we copy to the actual installation + # directory in INSTALL(). + + # For the secondary architecture we don't want the programs nor the + # terminfo DB. The main package will depend on the primary package which + # provides all this. + local withoutProgramArgs + if [ -n "$secondaryArchSuffix" ]; then + withoutProgramArgs="--without-progs" + fi + + doBuild build-nowidec $withoutProgramArgs + doBuild build-widec --enable-widec --libs-only +} + +INSTALL() +{ + cp -ra build-nowidec/$prefix/. $prefix + cp -ra build-widec/$prefix/. $prefix + + # prepare develop/lib + prepareInstalledDevelLibs \ + libform libmenu libncurses libncurses++ libpanel \ + libformw libmenuw libncursesw libncurses++w libpanelw + + # fix ncurses[w]5-config + fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config + + # devel package + packageEntries devel \ + $binDir/ncurses5-config \ + $binDir/ncursesw5-config \ + $developDir \ + $manDir/man3 + + # For the secondary architecture package clean up stuff we don't need, since + # we make it depend on the primary architecture package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +DESCRIPTION="The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses. + +The ncurses code was developed under GNU/Linux. It has been in use for some time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as an external package. It should port easily to any ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp! + +The distribution includes the library and support utilities, including a terminfo compiler tic, a decompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo. Full manual pages are provided for the library and tools." + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + ncurses${secondaryArchSuffix}_devel = $portVersion compat >= 5 + cmd:ncurses5_config${secondaryArchSuffix} = $portVersion compat >= 5 + cmd:ncursesw5_config${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libform${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libformw${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libmenu${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libmenuw${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncurses${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncursesw${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncurses++${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncurses++w${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libpanel${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libpanelw${secondaryArchSuffix} = $portVersion compat >= 5 + " +REQUIRES_devel=" + ncurses${secondaryArchSuffix} == $portVersion base + " diff --git a/sys-libs/ncurses/patches/ncurses-5.6-haiku.diff b/sys-libs/ncurses/patches/ncurses-5.6-haiku.diff deleted file mode 100644 index e9e9b3d8c..000000000 --- a/sys-libs/ncurses/patches/ncurses-5.6-haiku.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur ncurses-5.6/include/curses.h ncurses-5.6-haiku/include/curses.h ---- ncurses-5.6/include/curses.h 2008-06-04 05:57:46.000000000 -0700 -+++ ncurses-5.6-haiku/include/curses.h 2008-06-14 18:12:44.000000000 -0700 -@@ -450,7 +450,7 @@ - */ - #if 1 - #ifdef NCURSES_WGETCH_EVENTS --#if !defined(__BEOS__) /* Fix _nc_timed_wait() on BEOS... */ -+#if !defined(__BEOS__) || defined(__HAIKU__) /* Fix _nc_timed_wait() on BEOS... */ - # define NCURSES_EVENT_VERSION 1 - #endif /* !defined(__BEOS__) */ - -diff -ur ncurses-5.6/ncurses/tty/lib_twait.c ncurses-5.6-haiku/ncurses/tty/lib_twait.c ---- ncurses-5.6/ncurses/tty/lib_twait.c 2006-05-27 14:57:43.000000000 -0700 -+++ ncurses-5.6-haiku/ncurses/tty/lib_twait.c 2008-06-14 18:26:31.000000000 -0700 -@@ -42,6 +42,10 @@ - - #include - -+#if defined __HAIKU__ && defined __BEOS__ -+#undef __BEOS__ -+#endif -+ - #ifdef __BEOS__ - #undef false - #undef true -diff -ur ncurses-5.6/ncurses/tty/tty_update.c ncurses-5.6-haiku/ncurses/tty/tty_update.c ---- ncurses-5.6/ncurses/tty/tty_update.c 2006-11-25 14:33:21.000000000 -0800 -+++ ncurses-5.6-haiku/ncurses/tty/tty_update.c 2008-06-14 18:27:03.000000000 -0700 -@@ -44,6 +44,10 @@ - - #include - -+#if defined __HAIKU__ && defined __BEOS__ -+#undef __BEOS__ -+#endif -+ - #ifdef __BEOS__ - #undef false - #undef true -diff -ur ncurses-5.6/tack/sysdep.c ncurses-5.6-haiku/tack/sysdep.c ---- ncurses-5.6/tack/sysdep.c 2005-09-17 12:49:16.000000000 -0700 -+++ ncurses-5.6-haiku/tack/sysdep.c 2008-06-14 18:26:03.000000000 -0700 -@@ -34,6 +34,10 @@ - #include - #include - -+#if defined __HAIKU__ && defined __BEOS__ -+#undef __BEOS__ -+#endif -+ - #if defined(__BEOS__) - #undef false - #undef true diff --git a/sys-libs/ncurses/patches/ncurses-5.9.patchset b/sys-libs/ncurses/patches/ncurses-5.9.patchset new file mode 100644 index 000000000..5b2d05fd1 --- /dev/null +++ b/sys-libs/ncurses/patches/ncurses-5.9.patchset @@ -0,0 +1,42 @@ +From c10c7316b0be6ee2249ee2eeeeea6bbeb973d4cd Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Mon, 8 Jul 2013 15:51:09 +0200 +Subject: progs/Makefile.in: make sure the right programs are installed + +The Makefile installed the libtool wrapper scripts which are only meant +to be used for the build. + +diff --git a/progs/Makefile.in b/progs/Makefile.in +index bdb8a0f..f3170f1 100644 +--- a/progs/Makefile.in ++++ b/progs/Makefile.in +@@ -188,19 +188,19 @@ transform.h : + echo "#endif /* __TRANSFORM_H */" >>$@ + + install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir) +-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(DESTDIR)$(bindir)/$(actual_tic) +-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(DESTDIR)$(bindir)/$(actual_toe) ++@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tic$x $(DESTDIR)$(bindir)/$(actual_tic) ++@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/toe$x $(DESTDIR)$(bindir)/$(actual_toe) + @MAKE_TERMINFO@ @echo "linking $(actual_infotocap) to $(actual_tic)" + @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) + @MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap)) + @MAKE_TERMINFO@ @echo "linking $(actual_captoinfo) to $(actual_tic)" + @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) + @MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo)) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(DESTDIR)$(bindir)/$(actual_tput) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/clear$x $(DESTDIR)$(bindir)/$(actual_clear) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tput$x $(DESTDIR)$(bindir)/$(actual_tput) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tset$x $(DESTDIR)$(bindir)/$(actual_tset) + @echo "linking $(actual_reset) to $(actual_tset)" + -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) + (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset)) +-- +1.7.10.2 + diff --git a/sys-libs/readline/patches/readline-5.2.patch b/sys-libs/readline/patches/readline-5.2.patch deleted file mode 100644 index 8b8d37343..000000000 --- a/sys-libs/readline/patches/readline-5.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urN readline-5.2/configure.in readline-5.2-haiku/configure.in ---- readline-5.2/configure.in 2006-09-28 16:04:24.000000000 +0000 -+++ readline-5.2-haiku/configure.in 2008-08-22 11:14:49.000000000 +0000 -@@ -87,6 +87,9 @@ - i[[3456]]86-*-beos*) - cross_cache=${srcdir}/cross-build/x86-beos.cache - ;; -+ i[[3456]]86-*-haiku*) -+ cross_cache=${srcdir}/cross-build/x86-haiku.cache -+ ;; - *) echo "configure: cross-compiling for $host is not supported" >&2 - ;; - esac -diff -urN readline-5.2/histfile.c readline-5.2-haiku/histfile.c ---- readline-5.2/histfile.c 2006-03-31 20:48:43.000000000 +0000 -+++ readline-5.2-haiku/histfile.c 2008-08-22 10:45:20.000000000 +0000 -@@ -400,7 +400,7 @@ - { - write (file, bp, chars_read - (bp - buffer)); - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined(__HAIKU__) - /* BeOS ignores O_TRUNC. */ - ftruncate (file, chars_read - (bp - buffer)); - #endif -diff -urN readline-5.2/input.c readline-5.2-haiku/input.c ---- readline-5.2/input.c 2006-08-16 19:15:16.000000000 +0000 -+++ readline-5.2-haiku/input.c 2008-08-22 11:08:52.000000000 +0000 -@@ -471,7 +471,7 @@ - if (result == 0) - return (EOF); - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined(__HAIKU__) - if (errno == EINTR) - continue; - #endif diff --git a/sys-libs/readline/patches/readline-6.0.patch b/sys-libs/readline/patches/readline-6.0.patch deleted file mode 100644 index bf0b96636..000000000 --- a/sys-libs/readline/patches/readline-6.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN readline-6.0/configure.in readline-6.0-haiku/configure.in ---- readline-6.0/configure.in 2009-06-29 10:44:13.000000000 +0000 -+++ readline-6.0-haiku/configure.in 2009-06-29 10:39:19.000000000 +0000 -@@ -85,6 +85,9 @@ - i[[3456]]86-*-beos*) - cross_cache=${srcdir}/cross-build/x86-beos.cache - ;; -+ i[[3456]]86-*-haiku*) -+ cross_cache=${srcdir}/cross-build/x86-haiku.cache -+ ;; - *) echo "configure: cross-compiling for $host is not supported" >&2 - ;; - esac -diff -urN readline-6.0/rltty.c readline-6.0-haiku/rltty.c ---- readline-6.0/rltty.c 2009-06-29 10:44:16.000000000 +0000 -+++ readline-6.0-haiku/rltty.c 2009-06-29 11:21:11.000000000 +0000 -@@ -238,7 +238,12 @@ - TIOTYPE oldtio, *tiop; - { - _rl_echoing_p = (oldtio.sgttyb.sg_flags & ECHO); -+ -+#if defined (ECHOCTL) - _rl_echoctl = (oldtio.sgttyb.sg_flags & ECHOCTL); -+#else -+ _rl_echoctl = (oldtio.sgttyb.sg_flags); -+#endif - - /* Copy the original settings to the structure we're going to use for - our settings. */ -@@ -517,7 +522,11 @@ - TIOTYPE oldtio, *tiop; - { - _rl_echoing_p = (oldtio.c_lflag & ECHO); -+#if defined (ECHOCTL) - _rl_echoctl = (oldtio.c_lflag & ECHOCTL); -+#else -+ _rl_echoctl = (oldtio.c_lflag); -+#endif - - tiop->c_lflag &= ~(ICANON | ECHO); - diff --git a/sys-libs/readline/patches/readline-6.1.patch b/sys-libs/readline/patches/readline-6.1.patch deleted file mode 100644 index f5d75f829..000000000 --- a/sys-libs/readline/patches/readline-6.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN readline-6.1/configure.in readline-6.1-haiku/configure.in ---- readline-6.1/configure.in 2009-10-12 07:12:15.054788096 -0700 -+++ readline-6.1-haiku/configure.in 2010-10-26 10:21:29.204210176 -0700 -@@ -85,6 +85,9 @@ - i[[3456]]86-*-beos*) - cross_cache=${srcdir}/cross-build/x86-beos.cache - ;; -+ i[[3456]]86-*-haiku*) -+ cross_cache=${srcdir}/cross-build/x86-haiku.cache -+ ;; - *) echo "configure: cross-compiling for $host is not supported" >&2 - ;; - esac -diff -urN readline-6.1/rltty.c readline-6.1-haiku/rltty.c ---- readline-6.1/rltty.c 2009-11-19 06:42:02.059768832 -0800 -+++ readline-6.1-haiku/rltty.c 2010-10-26 10:25:50.489160704 -0700 -@@ -238,7 +238,10 @@ - TIOTYPE oldtio, *tiop; - { - _rl_echoing_p = (oldtio.sgttyb.sg_flags & ECHO); -+ -+#if defined (ECHOCTL) - _rl_echoctl = (oldtio.sgttyb.sg_flags & ECHOCTL); -+#endif - - /* Copy the original settings to the structure we're going to use for - our settings. */ diff --git a/sys-libs/readline/patches/readline-6.2.patch b/sys-libs/readline/patches/readline-6.2.patch new file mode 100644 index 000000000..c3f005381 --- /dev/null +++ b/sys-libs/readline/patches/readline-6.2.patch @@ -0,0 +1,24 @@ +diff -ur orig/readline-6.2/support/shlib-install readline-6.2/support/shlib-install +--- orig/readline-6.2/support/shlib-install 2009-10-28 14:30:18.057409536 +0100 ++++ readline-6.2/support/shlib-install 2013-05-03 01:12:28.695468032 +0200 +@@ -117,7 +117,7 @@ + # Create symlinks to the installed library. This section is incomplete. + # + case "$host_os-$host_vendor" in +-*linux*|freebsd*-gentoo) ++*linux*|freebsd*-gentoo|haiku*) + # libname.so.M -> libname.so.M.N + ${echo} ${RM} ${INSTALLDIR}/$LINK2 + if [ -z "$uninstall" ]; then +diff -ur orig/readline-6.2/support/shobj-conf readline-6.2/support/shobj-conf +--- orig/readline-6.2/support/shobj-conf 2009-10-28 14:20:21.057147392 +0100 ++++ readline-6.2/support/shobj-conf 2013-05-03 01:12:38.631242752 +0200 +@@ -109,7 +109,7 @@ + ;; + + # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. +-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) ++linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*) + SHOBJ_CFLAGS=-fPIC + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/sys-libs/readline/readline-5.2.bep b/sys-libs/readline/readline-5.2.bep deleted file mode 100644 index b2fbf3746..000000000 --- a/sys-libs/readline/readline-5.2.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.cwru.edu/pub/bash/readline-5.2.tar.gz" -CHECKSUM_MD5="e39331f32ad14009b9ff49cc10c5e751" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd readline-5.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd readline-5.2 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep deleted file mode 100644 index 77b1ff870..000000000 --- a/sys-libs/readline/readline-6.0.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.0.tar.gz" -CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd readline-6.0 - libtoolize --force --copy --install - aclocal - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd readline-6.0 - make install DESTDIR="${DESTDIR}" -} -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-6.1.bep b/sys-libs/readline/readline-6.1.bep deleted file mode 100644 index 90bbcff1c..000000000 --- a/sys-libs/readline/readline-6.1.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz" -CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd readline-6.1 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ -# --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL { - cd readline-6.1 - make install DESTDIR="${DESTDIR}" -} -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2010 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-6.2.bep b/sys-libs/readline/readline-6.2.bep deleted file mode 100644 index b1725633f..000000000 --- a/sys-libs/readline/readline-6.2.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" -CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd readline-6.2 - libtoolize --force --copy --install - aclocal - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL { - cd readline-6.2 - make install DESTDIR="${DESTDIR}" -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2011 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe new file mode 100644 index 000000000..a261402a2 --- /dev/null +++ b/sys-libs/readline/readline-6.2.recipe @@ -0,0 +1,72 @@ +SUMMARY="The GNU Readline library" +DESCRIPTION="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands. + +The history facilites are also placed into a separate library, the History library, as part of the build process. The History library may be used without Readline in applications which desire its capabilities." +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +COPYRIGHT="1989-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" +CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="readline-6.2.patch" + +PROVIDES=" + readline = $portVersion compat >= 6 + lib:libhistory = $portVersion compat >= 6 + lib:libreadline = $portVersion compat >= 6 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libncurses + " +BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + runConfigure ./configure \ + --with-curses + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libhistory libreadline + rmdir $binDir + + # devel package + packageEntries devel \ + $dataDir \ + $developDir \ + $documentationDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + readline_devel = $portVersion + devel:libhistory = $portVersion compat >= 6 + devel:libreadline = $portVersion compat >= 6 + " +REQUIRES_devel=" + readline == $portVersion base + " diff --git a/sys-libs/slang/slang-2.2.2.bep b/sys-libs/slang/slang-2.2.2.recipe similarity index 96% rename from sys-libs/slang/slang-2.2.2.bep rename to sys-libs/slang/slang-2.2.2.recipe index 2f452ce71..c65383837 100644 --- a/sys-libs/slang/slang-2.2.2.bep +++ b/sys-libs/slang/slang-2.2.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e7183d0acab9cc35fae12849f8b848e2" -BUILD { +BUILD() +{ cd slang-2.2.2/autoconf libtoolize --force --copy --install cp autoconf/config.guess config.guess @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd slang-2.2.2 make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/zlib/zlib-1.2.3.bep b/sys-libs/zlib/zlib-1.2.3.bep deleted file mode 100644 index d74407c3d..000000000 --- a/sys-libs/zlib/zlib-1.2.3.bep +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="zlib" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://www.zlib.net/zlib-1.2.3.tar.bz2" -CHECKSUM_MD5="dee233bf288ee795ac96a98cc2e369b6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd zlib-1.2.3 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL { - cd zlib-1.2.3 - make install -} -LICENSE="Zlib" -COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.5.bep b/sys-libs/zlib/zlib-1.2.5.bep deleted file mode 100644 index 03f91d8b2..000000000 --- a/sys-libs/zlib/zlib-1.2.5.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="zlib" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://www.zlib.net/zlib-1.2.5.tar.bz2" -CHECKSUM_MD5="be1e89810e66150f5b0327984d8625a0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd zlib-1.2.5 - sed -i 's/share\/man/documentation\/man/' CMakeLists.txt - cmake . - make -} - -INSTALL { - cd zlib-1.2.5 - make install -} -LICENSE="Zlib" -COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.7.bep b/sys-libs/zlib/zlib-1.2.7.bep deleted file mode 100644 index 6210e8655..000000000 --- a/sys-libs/zlib/zlib-1.2.7.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="zlib" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://zlib.net/zlib-1.2.7.tar.gz" -CHECKSUM_MD5="60df6a37c56e7c1366cca812414f7b85" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd zlib-1.2.7 - sed -i 's/share\/man/documentation\/man/' CMakeLists.txt - sed -i 's/share\/pkgconfig/lib\/pkgconfig/' CMakeLists.txt - cmake . - make -} - -INSTALL { - cd zlib-1.2.7 - make install -} -LICENSE="Zlib" -COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe new file mode 100644 index 000000000..140c26b76 --- /dev/null +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -0,0 +1,73 @@ +SUMMARY="A Massively Spiffy Yet Delicately Unobtrusive Compression Library" +DESCRIPTION="zlib is designed to be a free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system. The zlib data format is itself portable across platforms. Unlike the LZW compression method used in Unix compress(1) and in the GIF image format, the compression method currently used in zlib essentially never expands the data. (LZW can double or triple the file size in extreme cases.) zlib's memory footprint is also independent of the input data and can be reduced, if necessary, at some cost in compression." +HOMEPAGE="http://www.zlib.net/" +COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" +LICENSE="Zlib" +SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz" +CHECKSUM_MD5="44d667c142d7cda120332623eab69f40" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + zlib$secondaryArchSuffix = $portVersion compat >= 1 + lib:libz$secondaryArchSuffix = $portVersion compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:grep + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/lib',$libDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/share/man',$manDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/share/pkgconfig',$developLibDir/pkgconfig, \ + CMakeLists.txt +} + +BUILD() +{ + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + prepareInstalledDevelLibs libz + + # devel package + packageEntries devel \ + $developDir \ + $documentationDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The zlib development files" +PROVIDES_devel=" + zlib${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libz${secondaryArchSuffix} = $portVersion compat >= 1 + " +REQUIRES_devel=" + zlib${secondaryArchSuffix} == $portVersion base + " diff --git a/sys-libs/zopfli/zopfli-999.bep b/sys-libs/zopfli/zopfli-999.recipe similarity index 96% rename from sys-libs/zopfli/zopfli-999.bep rename to sys-libs/zopfli/zopfli-999.recipe index 9efa227a0..5679ad437 100644 --- a/sys-libs/zopfli/zopfli-999.bep +++ b/sys-libs/zopfli/zopfli-999.recipe @@ -7,13 +7,15 @@ STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd zopfli-999 sed -i 's/\-lm//' makefile make } -INSTALL { +INSTALL() +{ cd zopfli-999 BINDIR=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${BINDIR} diff --git a/sys-process/htop/htop-1.0.2.bep b/sys-process/htop/htop-1.0.2.recipe similarity index 96% rename from sys-process/htop/htop-1.0.2.bep rename to sys-process/htop/htop-1.0.2.recipe index 5b4c800ed..9ba195434 100644 --- a/sys-process/htop/htop-1.0.2.bep +++ b/sys-process/htop/htop-1.0.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="0d01cca8df3349c74569cefebbd9919e" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd htop-1.0.2 ./configure --disable-unicode --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd htop-1.0.2 make install } diff --git a/www-client/links/links-2.3pre2.bep b/www-client/links/links-2.3pre2.recipe similarity index 96% rename from www-client/links/links-2.3pre2.bep rename to www-client/links/links-2.3pre2.recipe index 15bb7a6f7..c2882b221 100644 --- a/www-client/links/links-2.3pre2.bep +++ b/www-client/links/links-2.3pre2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c" -BUILD { +BUILD() +{ cd links-2.3pre2 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -19,7 +20,8 @@ BUILD { mimeset links } -INSTALL { +INSTALL() +{ cd links-2.3pre2 make install DESTDIR=${DESTDIR} } diff --git a/www-client/mozilla-firefox/TinnyTim.sh b/www-client/mozilla_firefox/TinnyTim.sh similarity index 100% rename from www-client/mozilla-firefox/TinnyTim.sh rename to www-client/mozilla_firefox/TinnyTim.sh diff --git a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff b/www-client/mozilla_firefox/bezilla-patches-2009-07-07.diff similarity index 100% rename from www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff rename to www-client/mozilla_firefox/bezilla-patches-2009-07-07.diff diff --git a/www-client/mozilla-firefox/bookmarks.html b/www-client/mozilla_firefox/bookmarks.html similarity index 100% rename from www-client/mozilla-firefox/bookmarks.html rename to www-client/mozilla_firefox/bookmarks.html diff --git a/www-client/mozilla-firefox/classic.jar b/www-client/mozilla_firefox/classic.jar similarity index 100% rename from www-client/mozilla-firefox/classic.jar rename to www-client/mozilla_firefox/classic.jar diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-l similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-l rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-l diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-r diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews b/www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews rename to www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews-r diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-l similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-l rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-l diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-r diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-l similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-l rename to www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-l diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-r diff --git a/www-client/mozilla-firefox/hvif-icons/bezilla-1 copy b/www-client/mozilla_firefox/hvif-icons/bezilla-1 copy similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/bezilla-1 copy rename to www-client/mozilla_firefox/hvif-icons/bezilla-1 copy diff --git a/www-client/mozilla-firefox/hvif-icons/icon_copyright/copyleft.txt b/www-client/mozilla_firefox/hvif-icons/icon_copyright/copyleft.txt similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/icon_copyright/copyleft.txt rename to www-client/mozilla_firefox/hvif-icons/icon_copyright/copyleft.txt diff --git a/www-client/mozilla-firefox/hvif-icons/icon_copyright/copyright_info.txt b/www-client/mozilla_firefox/hvif-icons/icon_copyright/copyright_info.txt similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/icon_copyright/copyright_info.txt rename to www-client/mozilla_firefox/hvif-icons/icon_copyright/copyright_info.txt diff --git a/www-client/mozilla-firefox/old-patches/allO1.patch b/www-client/mozilla_firefox/old-patches/allO1.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/allO1.patch rename to www-client/mozilla_firefox/old-patches/allO1.patch diff --git a/www-client/mozilla-firefox/old-patches/allO3.patch b/www-client/mozilla_firefox/old-patches/allO3.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/allO3.patch rename to www-client/mozilla_firefox/old-patches/allO3.patch diff --git a/www-client/mozilla-firefox/old-patches/configure-sunbird-nspr-reorder.diff b/www-client/mozilla_firefox/old-patches/configure-sunbird-nspr-reorder.diff similarity index 100% rename from www-client/mozilla-firefox/old-patches/configure-sunbird-nspr-reorder.diff rename to www-client/mozilla_firefox/old-patches/configure-sunbird-nspr-reorder.diff diff --git a/www-client/mozilla-firefox/old-patches/firstrun-default-page.diff b/www-client/mozilla_firefox/old-patches/firstrun-default-page.diff similarity index 100% rename from www-client/mozilla-firefox/old-patches/firstrun-default-page.diff rename to www-client/mozilla_firefox/old-patches/firstrun-default-page.diff diff --git a/www-client/mozilla-firefox/old-patches/forReorderPatches-browser.zip b/www-client/mozilla_firefox/old-patches/forReorderPatches-browser.zip similarity index 100% rename from www-client/mozilla-firefox/old-patches/forReorderPatches-browser.zip rename to www-client/mozilla_firefox/old-patches/forReorderPatches-browser.zip diff --git a/www-client/mozilla-firefox/old-patches/greyMenuSelection.patch b/www-client/mozilla_firefox/old-patches/greyMenuSelection.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/greyMenuSelection.patch rename to www-client/mozilla_firefox/old-patches/greyMenuSelection.patch diff --git a/www-client/mozilla-firefox/old-patches/launch-kill-dowhile.patch b/www-client/mozilla_firefox/old-patches/launch-kill-dowhile.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/launch-kill-dowhile.patch rename to www-client/mozilla_firefox/old-patches/launch-kill-dowhile.patch diff --git a/www-client/mozilla-firefox/old-patches/mozilla-rdefs.zip b/www-client/mozilla_firefox/old-patches/mozilla-rdefs.zip similarity index 100% rename from www-client/mozilla-firefox/old-patches/mozilla-rdefs.zip rename to www-client/mozilla_firefox/old-patches/mozilla-rdefs.zip diff --git a/www-client/mozilla-firefox/old-patches/nsAppRunner.patch b/www-client/mozilla_firefox/old-patches/nsAppRunner.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/nsAppRunner.patch rename to www-client/mozilla_firefox/old-patches/nsAppRunner.patch diff --git a/www-client/mozilla-firefox/old-patches/prpolevt-fix.patch b/www-client/mozilla_firefox/old-patches/prpolevt-fix.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/prpolevt-fix.patch rename to www-client/mozilla_firefox/old-patches/prpolevt-fix.patch diff --git a/www-client/mozilla-firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip b/www-client/mozilla_firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip similarity index 100% rename from www-client/mozilla-firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip rename to www-client/mozilla_firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip diff --git a/www-client/mozilla-firefox/patches/2009-09-27/bezilla.step-by-step.txt b/www-client/mozilla_firefox/patches/2009-09-27/bezilla.step-by-step.txt similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/bezilla.step-by-step.txt rename to www-client/mozilla_firefox/patches/2009-09-27/bezilla.step-by-step.txt diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch b/www-client/mozilla_firefox/patches/2009-09-27/r01-config-star.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r01-config-star.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r03a-makefile-in.patch b/www-client/mozilla_firefox/patches/2009-09-27/r03a-makefile-in.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r03a-makefile-in.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r03a-makefile-in.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch b/www-client/mozilla_firefox/patches/2009-09-27/r03b-starmk.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r03b-starmk.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.README b/www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.README similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.README rename to www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.README diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.patch b/www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r06-nss-gcc4.patch b/www-client/mozilla_firefox/patches/2009-09-27/r06-nss-gcc4.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r06-nss-gcc4.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r06-nss-gcc4.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch b/www-client/mozilla_firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch b/www-client/mozilla_firefox/patches/2009-09-27/r08-misc.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r08-misc.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r09-sunbird-options-fix.patch b/www-client/mozilla_firefox/patches/2009-09-27/r09-sunbird-options-fix.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r09-sunbird-options-fix.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r09-sunbird-options-fix.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r10-grey-menu-color.patch b/www-client/mozilla_firefox/patches/2009-09-27/r10-grey-menu-color.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r10-grey-menu-color.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r10-grey-menu-color.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r11-bookmarks-v2.patch b/www-client/mozilla_firefox/patches/2009-09-27/r11-bookmarks-v2.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r11-bookmarks-v2.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r11-bookmarks-v2.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r12-releasenotes.patch b/www-client/mozilla_firefox/patches/2009-09-27/r12-releasenotes.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r12-releasenotes.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r12-releasenotes.patch diff --git a/www-client/mozilla-firefox/persdict.dat b/www-client/mozilla_firefox/persdict.dat similarity index 100% rename from www-client/mozilla-firefox/persdict.dat rename to www-client/mozilla_firefox/persdict.dat diff --git a/www-client/mozilla-firefox/select-a-mozconfig/browser-debug.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/browser-debug.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/browser-debug.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/browser-debug.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/browser.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/browser.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/browser.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/browser.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/calendar.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/calendar.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/calendar.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/calendar.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/mailnews.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/mailnews.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/mailnews.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/mailnews.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite-debug.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite-debug.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/suite-debug.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/suite-debug.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite-just-browser.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite-just-browser.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/suite-just-browser.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/suite-just-browser.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/suite.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/suite.mozconfig diff --git a/www-client/netsurf/netsurf-10380.bep b/www-client/netsurf/netsurf-10380.recipe similarity index 97% rename from www-client/netsurf/netsurf-10380.bep rename to www-client/netsurf/netsurf-10380.recipe index 53a10d09f..1d850b1a9 100644 --- a/www-client/netsurf/netsurf-10380.bep +++ b/www-client/netsurf/netsurf-10380.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-util/gperf >= 3.0.4 media-libs/libpng >= 1.4.1" #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" -BUILD { +BUILD() +{ export GCCVER=2 cp ../scanner.c netsurf-10380/netsurf/css/scanner.c cd netsurf-10380 @@ -29,7 +30,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf-10380 make install } diff --git a/www-client/netsurf/netsurf-2.1.bep b/www-client/netsurf/netsurf-2.1.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.1.bep rename to www-client/netsurf/netsurf-2.1.recipe index f1fd077b1..9005480f2 100644 --- a/www-client/netsurf/netsurf-2.1.bep +++ b/www-client/netsurf/netsurf-2.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f0a34fd076b492c1a13b45432e8d7e49" -BUILD { +BUILD() +{ cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet @@ -45,7 +46,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-2.6.bep b/www-client/netsurf/netsurf-2.6.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.6.bep rename to www-client/netsurf/netsurf-2.6.recipe index 8285bec06..a4d406fc4 100644 --- a/www-client/netsurf/netsurf-2.6.bep +++ b/www-client/netsurf/netsurf-2.6.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8653789d2ede6dbbfe79882afc7538fc" -BUILD { +BUILD() +{ cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet @@ -45,7 +46,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-2.7.bep b/www-client/netsurf/netsurf-2.7.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.7.bep rename to www-client/netsurf/netsurf-2.7.recipe index 8394fd42d..12ac7f385 100644 --- a/www-client/netsurf/netsurf-2.7.bep +++ b/www-client/netsurf/netsurf-2.7.recipe @@ -9,7 +9,8 @@ DEPEND="dev-util/gperf >= 3.0.4 net-misc/curl >= 7.21.6" CHECKSUM_MD5="52939f2e2319269d7d758ec665f6cb8e" -BUILD { +BUILD() +{ cd netsurf sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp svn co svn://svn.netsurf-browser.org/trunk/libparserutils -r12456 @@ -49,7 +50,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-2.7-svn.bep b/www-client/netsurf/netsurf-2.7_svn.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.7-svn.bep rename to www-client/netsurf/netsurf-2.7_svn.recipe index fd2d8c123..9b8719291 100644 --- a/www-client/netsurf/netsurf-2.7-svn.bep +++ b/www-client/netsurf/netsurf-2.7_svn.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/gperf >= 3.0.4 media-libs/libmng > 1.0.10 dev-libs/pkgconfig >= 0.25 net-misc/curl >= 7.21.6" -BUILD { +BUILD() +{ cd netsurf-2.7-svn sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp @@ -49,7 +50,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf-2.7-svn make install } diff --git a/www-client/netsurf/netsurf-2.9.bep b/www-client/netsurf/netsurf-2.9.recipe similarity index 96% rename from www-client/netsurf/netsurf-2.9.bep rename to www-client/netsurf/netsurf-2.9.recipe index 95d70633f..4d6d9ed8e 100644 --- a/www-client/netsurf/netsurf-2.9.bep +++ b/www-client/netsurf/netsurf-2.9.recipe @@ -13,12 +13,14 @@ DEPEND="dev-util/gperf >= 3.0.4 media-libs/lcms >= 2.1" CHECKSUM_MD5="cfc2789997b356f2ea9d9f7694c4c909" -BUILD { +BUILD() +{ cd netsurf-2.9 make } -INSTALL { +INSTALL() +{ cd netsurf-2.9 make install } diff --git a/www-client/netsurf/netsurf-2.HEAD.recipe b/www-client/netsurf/netsurf-2.HEAD.recipe new file mode 100644 index 000000000..fc3f5ef8c --- /dev/null +++ b/www-client/netsurf/netsurf-2.HEAD.recipe @@ -0,0 +1,36 @@ +DESCRIPTION="NetSurf is a multi-platform web browser" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="git://git.netsurf-browser.org/netsurf.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/gperf >= 3.0.4 + media-libs/libmng > 1.0.10 + dev-libs/pkgconfig >= 0.25 + net-misc/curl >= 7.21.6 + media-libs/libpng >= 1.5.7 + media-libs/jpeg >= 8d + media-libs/libwebp >= 0.1.3 + media-libs/lcms >= 2.1 + media-libs/libsvgtiny >= 0.HEAD + media-libs/libnsbmp >= 0.0.3 + media-libs/libnsgif >= 0.0.3 + dev-libs/libcss >= 0.1.2 + dev-libs/libwapcaplet >= 0.1.1-HEAD + net-libs/libdom >= 0 + " + +BUILD() +{ + cd netsurf-2.HEAD + make +} + +INSTALL() +{ + cd netsurf-2.HEAD + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/www-client/netsurf/netsurf-3.1-HEAD.bep b/www-client/netsurf/netsurf-3.1_HEAD.recipe similarity index 100% rename from www-client/netsurf/netsurf-3.1-HEAD.bep rename to www-client/netsurf/netsurf-3.1_HEAD.recipe diff --git a/www-client/netsurf/netsurf-9799.bep b/www-client/netsurf/netsurf-9799.recipe similarity index 98% rename from www-client/netsurf/netsurf-9799.bep rename to www-client/netsurf/netsurf-9799.recipe index 5870ed123..b988044f0 100644 --- a/www-client/netsurf/netsurf-9799.bep +++ b/www-client/netsurf/netsurf-9799.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-util/gperf >= 3.0.4 media-libs/libpng >= 1.4.1" CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" -BUILD { +BUILD() +{ cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet @@ -46,7 +47,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-9872.bep b/www-client/netsurf/netsurf-9872.recipe similarity index 97% rename from www-client/netsurf/netsurf-9872.bep rename to www-client/netsurf/netsurf-9872.recipe index 7f61719e1..e7f033c11 100644 --- a/www-client/netsurf/netsurf-9872.bep +++ b/www-client/netsurf/netsurf-9872.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-util/gperf >= 3.0.4 media-libs/libpng >= 1.4.1" #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" -BUILD { +BUILD() +{ export GCCVER=2 cp ../scanner.c netsurf-9872/netsurf/css/scanner.c cd netsurf-9872 @@ -29,7 +30,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf-9872 make install } diff --git a/www-client/w3m/w3m-0.5.3.bep b/www-client/w3m/w3m-0.5.3.recipe similarity index 97% rename from www-client/w3m/w3m-0.5.3.bep rename to www-client/w3m/w3m-0.5.3.recipe index fc8b1b292..8742a33a6 100644 --- a/www-client/w3m/w3m-0.5.3.bep +++ b/www-client/w3m/w3m-0.5.3.recipe @@ -8,7 +8,8 @@ DEPEND="dev-libs/boehm-gc >= 7.2_alpha6 dev-libs/openssl >= 0.9.8l sys-devel/gettext >= 0.17" CHECKSUM_MD5="1b845a983a50b8dec0169ac48479eacc" -BUILD { +BUILD() +{ cd w3m-0.5.3 libtoolize -fci autoconf @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd w3m-0.5.3 make install } diff --git a/www-servers/apache/apache-2.2.17.bep b/www-servers/apache/apache-2.2.17.recipe similarity index 95% rename from www-servers/apache/apache-2.2.17.bep rename to www-servers/apache/apache-2.2.17.recipe index 201911275..03f0586e4 100644 --- a/www-servers/apache/apache-2.2.17.bep +++ b/www-servers/apache/apache-2.2.17.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.4 2 dev-libs/apr-utils >= 1.3.9" CHECKSUM_MD5="66d8e107f85acc039fd5e624e85728a9" -BUILD { +BUILD() +{ cd httpd-2.2.17 libtoolize --force --copy --install aclocal @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd httpd-2.2.17 make install } -TEST { +TEST() +{ cd httpd-2.2.17 make test } diff --git a/www-servers/apache/apache-2.2.22.bep b/www-servers/apache/apache-2.2.22.recipe similarity index 95% rename from www-servers/apache/apache-2.2.22.bep rename to www-servers/apache/apache-2.2.22.recipe index 66ac4713a..24d867e0e 100644 --- a/www-servers/apache/apache-2.2.22.bep +++ b/www-servers/apache/apache-2.2.22.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.4 2 dev-libs/apr-utils >= 1.3.9" CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1" -BUILD { +BUILD() +{ cd httpd-2.2.22 libtoolize --force --copy --install aclocal @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd httpd-2.2.22 make install } -TEST { +TEST() +{ cd httpd-2.2.22 make test } diff --git a/www-servers/apache/apache-2.4.3.bep b/www-servers/apache/apache-2.4.3.recipe similarity index 96% rename from www-servers/apache/apache-2.4.3.bep rename to www-servers/apache/apache-2.4.3.recipe index 10bc209c9..58bceb591 100644 --- a/www-servers/apache/apache-2.4.3.bep +++ b/www-servers/apache/apache-2.4.3.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.4 2 dev-libs/apr-util >= 1.3.9" CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417" -BUILD { +BUILD() +{ cd httpd-2.4.3 libtoolize --force --copy --install aclocal @@ -19,12 +20,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd httpd-2.4.3 make install } -TEST { +TEST() +{ cd httpd-2.4.3 make test } diff --git a/www-servers/cherokee/cherokee-1.2.101.bep b/www-servers/cherokee/cherokee-1.2.101.recipe similarity index 95% rename from www-servers/cherokee/cherokee-1.2.101.bep rename to www-servers/cherokee/cherokee-1.2.101.recipe index 468b11357..82a05810a 100644 --- a/www-servers/cherokee/cherokee-1.2.101.bep +++ b/www-servers/cherokee/cherokee-1.2.101.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="ef47003355a2e368e4d9596cd070ef23" -BUILD { +BUILD() +{ cd cherokee-1.2.101 libtoolize --force --copy --install aclocal -I m4 @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cherokee-1.2.101 make install } -TEST { +TEST() +{ cd cherokee-1.2.101 # make test # make check diff --git a/www-servers/haproxy/haproxy-1.4.22.bep b/www-servers/haproxy/haproxy-1.4.22.recipe similarity index 97% rename from www-servers/haproxy/haproxy-1.4.22.bep rename to www-servers/haproxy/haproxy-1.4.22.recipe index fa1d3ce35..854d047dc 100644 --- a/www-servers/haproxy/haproxy-1.4.22.bep +++ b/www-servers/haproxy/haproxy-1.4.22.recipe @@ -4,14 +4,16 @@ SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz" CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c" STATUS_HAIKU="stable" REVISION="1" -BUILD { +BUILD() +{ cd haproxy-1.4.22 make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` } -INSTALL { +INSTALL() +{ cd haproxy-1.4.22 make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ diff --git a/x11-libs/agg/agg-2.5.bep b/x11-libs/agg/agg-2.5.recipe similarity index 96% rename from x11-libs/agg/agg-2.5.bep rename to x11-libs/agg/agg-2.5.recipe index 6d243794d..e5d686489 100644 --- a/x11-libs/agg/agg-2.5.bep +++ b/x11-libs/agg/agg-2.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" -BUILD { +BUILD() +{ cd agg-2.5 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd agg-2.5 make install DESTDIR=${DESTDIR} } diff --git a/x11-libs/cairo/cairo-1.10.0.bep b/x11-libs/cairo/cairo-1.10.0.recipe similarity index 97% rename from x11-libs/cairo/cairo-1.10.0.bep rename to x11-libs/cairo/cairo-1.10.0.recipe index b23acc8b0..776d8bdfb 100644 --- a/x11-libs/cairo/cairo-1.10.0.bep +++ b/x11-libs/cairo/cairo-1.10.0.recipe @@ -7,7 +7,8 @@ DEPEND="freetype >= 2.3.11 fontconfig >= 2.8.0 pixman >= 0.18.4" CHECKSUM_MD5="70a2ece66cf473d976e2db0f75bf199e" -BUILD { +BUILD() +{ cd cairo-1.10.0 libtoolize --force --copy --install aclocal -I build @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cairo-1.10.0 make install } diff --git a/x11-libs/cairo/cairo-1.8.10.bep b/x11-libs/cairo/cairo-1.8.10.recipe similarity index 97% rename from x11-libs/cairo/cairo-1.8.10.bep rename to x11-libs/cairo/cairo-1.8.10.recipe index 69bfa28fd..571c35752 100644 --- a/x11-libs/cairo/cairo-1.8.10.bep +++ b/x11-libs/cairo/cairo-1.8.10.recipe @@ -7,7 +7,8 @@ DEPEND="freetype >= 2.3.11 fontconfig >= 2.8.0 pixman >= 0.17.2" CHECKSUM_MD5="b60a82f405f9400bbfdcf850b1728d25" -BUILD { +BUILD() +{ cd cairo-1.8.10 libtoolize --force --copy --install aclocal -I build @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cairo-1.8.10 make install } diff --git a/x11-libs/libX11/libX11-1.3.3.bep b/x11-libs/libX11/libX11-1.3.3.recipe similarity index 97% rename from x11-libs/libX11/libX11-1.3.3.bep rename to x11-libs/libX11/libX11-1.3.3.recipe index d5d0199d2..2616a1939 100644 --- a/x11-libs/libX11/libX11-1.3.3.bep +++ b/x11-libs/libX11/libX11-1.3.3.recipe @@ -15,7 +15,8 @@ DEPEND="x11-misc/util-macros >= 1.7.0 x11-libs/libxcb >= 1.6 x11-libs/libXau >= 1.0.5 x11-proto/xextproto >= 7.1.1" -BUILD { +BUILD() +{ cd libX11-1.3.3 libtoolize --force --copy --install autoreconf -i @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libX11-1.3.3 make install } diff --git a/x11-libs/libX11/libX11.OptionalPackageDescription b/x11-libs/libX11/libX11.OptionalPackageDescription deleted file mode 100644 index 0c9217176..000000000 --- a/x11-libs/libX11/libX11.OptionalPackageDescription +++ /dev/null @@ -1,65 +0,0 @@ -Package: libx11 -Version: 1.3.3 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://www.x.org/releases/individual/lib/ - -Package: util-macros -Version: 1.7.0 -Copyright: 2005-2006 Sun Microsystems, Inc. 2009 X.Org Foundation. -License: MIT -URL: http://www.x.org/releases/individual/util/ - -Package: xproto -Version: 7.0.16 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/proto/ - -Package: inputproto -Version: 2.0 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/proto/ - -Package: kbproto -Version: 1.0.4 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/proto/ - -Package: xtrans -Version: 1.2.5 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/lib/ - -Package: libxcb -Version: 1.6 -Copyright: 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. -License: MIT -URL: http://xcb.freedesktop.org - -Package: xcb-proto -Version: 1.6 -Copyright: 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. -License: MIT -URL: http://xcb.freedesktop.org - -Package: libxslt -Version: 1.1.24 -Copyright: 2001-2002 Daniel Veillard. -License: MIT -URL: http://xmlsoft.org/XSLT/ - -Package: libptread-stubs -Version: 0.3 -Copyright: 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. -License: MIT -URL: http://xcb.freedesktop.org - -Package: libxau -Version: 1.0.5 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/lib/ diff --git a/x11-libs/libXau/libXau-1.0.5.bep b/x11-libs/libXau/libXau-1.0.5.recipe similarity index 95% rename from x11-libs/libXau/libXau-1.0.5.bep rename to x11-libs/libXau/libXau-1.0.5.recipe index fd8eee947..262bf426b 100644 --- a/x11-libs/libXau/libXau-1.0.5.bep +++ b/x11-libs/libXau/libXau-1.0.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23 x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd libXau-1.0.5 libtoolize --force --copy --install autoreconf -i @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libXau-1.0.5 make install } diff --git a/x11-libs/libxcb/libxcb-1.6.bep b/x11-libs/libxcb/libxcb-1.6.recipe similarity index 96% rename from x11-libs/libxcb/libxcb-1.6.bep rename to x11-libs/libxcb/libxcb-1.6.recipe index 4ecfc01c2..8d316acf2 100644 --- a/x11-libs/libxcb/libxcb-1.6.bep +++ b/x11-libs/libxcb/libxcb-1.6.recipe @@ -10,14 +10,16 @@ DEPEND="pkgconfig >= 0.23 x11-proto/xcb-proto >= 1.6 x11-libs/libXau >= 1.0.5" -BUILD { +BUILD() +{ cd libxcb-1.6 libtoolize --force --copy --install ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd libxcb-1.6 make install } diff --git a/x11-libs/pango/pango-1.28.1.bep b/x11-libs/pango/pango-1.28.1.recipe similarity index 96% rename from x11-libs/pango/pango-1.28.1.bep rename to x11-libs/pango/pango-1.28.1.recipe index 0f68809d9..a783d46ad 100644 --- a/x11-libs/pango/pango-1.28.1.bep +++ b/x11-libs/pango/pango-1.28.1.recipe @@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23 media-libs/fontconfig >= 2.8.0 x11-libs/cairo >= 1.8.10" -BUILD { +BUILD() +{ cd pango-1.28.1 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd pango-1.28.1 make install } diff --git a/x11-libs/pixman/patches/pixman-0.19-master.patch b/x11-libs/pixman/patches/pixman-0.19_master.patch similarity index 100% rename from x11-libs/pixman/patches/pixman-0.19-master.patch rename to x11-libs/pixman/patches/pixman-0.19_master.patch diff --git a/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff b/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff deleted file mode 100644 index a40ebecad..000000000 --- a/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/autogen.sh b/autogen.sh -index 904cd67..354f254 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -9,4 +9,4 @@ cd $srcdir - autoreconf -v --install || exit 1 - cd $ORIGDIR || exit $? - --$srcdir/configure --enable-maintainer-mode "$@" -+$srcdir/configure "$@" diff --git a/x11-libs/pixman/pixman-0.17.2.bep b/x11-libs/pixman/pixman-0.17.2.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.17.2.bep rename to x11-libs/pixman/pixman-0.17.2.recipe index db949ba89..e4d9efc2d 100644 --- a/x11-libs/pixman/pixman-0.17.2.bep +++ b/x11-libs/pixman/pixman-0.17.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="006c74f1450e5ed2e1bdaf88e9806faa" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.17.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.17.2 make install } diff --git a/x11-libs/pixman/pixman-0.18.2.bep b/x11-libs/pixman/pixman-0.18.2.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.18.2.bep rename to x11-libs/pixman/pixman-0.18.2.recipe index 0141d1aef..3207fc846 100644 --- a/x11-libs/pixman/pixman-0.18.2.bep +++ b/x11-libs/pixman/pixman-0.18.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5d1378fa61610dd5d3c7e0111b2c5253" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.18.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.18.2 make install } diff --git a/x11-libs/pixman/pixman-0.18.4.bep b/x11-libs/pixman/pixman-0.18.4.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.18.4.bep rename to x11-libs/pixman/pixman-0.18.4.recipe index 8a8d9f5f1..c2fd8770b 100644 --- a/x11-libs/pixman/pixman-0.18.4.bep +++ b/x11-libs/pixman/pixman-0.18.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="532db4194e18c108d0b7dd85f20d39b8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.18.4 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.18.4 make install } diff --git a/x11-libs/pixman/pixman-0.19.4.bep b/x11-libs/pixman/pixman-0.19.4.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.19.4.bep rename to x11-libs/pixman/pixman-0.19.4.recipe index c97b06ae6..d40a8126f 100644 --- a/x11-libs/pixman/pixman-0.19.4.bep +++ b/x11-libs/pixman/pixman-0.19.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="100a2d23f1d5683fdaa5d7ca71a0182b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.19.4 libtoolize --force --copy --install ./autogen.sh @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.19.4 make install } -TEST { +TEST() +{ cd pixman-0.19.4 make check } diff --git a/x11-libs/pixman/pixman-0.19-master.bep b/x11-libs/pixman/pixman-0.19_master.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.19-master.bep rename to x11-libs/pixman/pixman-0.19_master.recipe index 620b4c6ef..e0af5913a 100644 --- a/x11-libs/pixman/pixman-0.19-master.bep +++ b/x11-libs/pixman/pixman-0.19_master.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c53466dc2e6145afdb80b5a74491a2de" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-master libtoolize --force --copy --install ./autogen.sh @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-master make install } -TEST { +TEST() +{ cd pixman-master make check } diff --git a/x11-libs/pixman/pixman-0.20.0.bep b/x11-libs/pixman/pixman-0.20.0.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.20.0.bep rename to x11-libs/pixman/pixman-0.20.0.recipe index d93ac2db0..ffa1be8dd 100644 --- a/x11-libs/pixman/pixman-0.20.0.bep +++ b/x11-libs/pixman/pixman-0.20.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.20.0 libtoolize --force --copy --install aclocal @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.20.0 make install } -TEST { +TEST() +{ cd pixman-0.20.0 make check } diff --git a/x11-libs/xtrans/xtrans-1.2.5.bep b/x11-libs/xtrans/xtrans-1.2.5.recipe similarity index 96% rename from x11-libs/xtrans/xtrans-1.2.5.bep rename to x11-libs/xtrans/xtrans-1.2.5.recipe index dabe29737..fb109065a 100644 --- a/x11-libs/xtrans/xtrans-1.2.5.bep +++ b/x11-libs/xtrans/xtrans-1.2.5.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23 x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xtrans-1.2.5 libtoolize --force --copy --install autoreconf -i @@ -15,7 +16,8 @@ BUILD { --datadir=`finddir B_COMMON_DATA_DIRECTORY` } -INSTALL { +INSTALL() +{ cd xtrans-1.2.5 make install } diff --git a/x11-misc/makedepend/makedepend-1.0.2.bep b/x11-misc/makedepend/makedepend-1.0.2.recipe similarity index 96% rename from x11-misc/makedepend/makedepend-1.0.2.bep rename to x11-misc/makedepend/makedepend-1.0.2.recipe index 58fb5b71b..b6319037a 100644 --- a/x11-misc/makedepend/makedepend-1.0.2.bep +++ b/x11-misc/makedepend/makedepend-1.0.2.recipe @@ -7,14 +7,16 @@ STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.9 x11-misc/util-macros >= 1.7.0 x11-proto/xproto >= 7.0.16" -BUILD { +BUILD() +{ cd makedepend-1.0.2 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd makedepend-1.0.2 make install } diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep b/x11-misc/shared_mime_info/shared_mime_info-1.0.recipe similarity index 96% rename from x11-misc/shared-mime-info/shared-mime-info-1.0.bep rename to x11-misc/shared_mime_info/shared_mime_info-1.0.recipe index 0c61c66ad..ac8adccf1 100644 --- a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep +++ b/x11-misc/shared_mime_info/shared_mime_info-1.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="intltool, glib" -BUILD { +BUILD() +{ cd shared-mime-info-1.0 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd shared-mime-info-1.0 make install } diff --git a/x11-misc/util-macros/util-macros-1.17.0-git.bep b/x11-misc/util_macros/util_macros-1.17.0_git.recipe similarity index 95% rename from x11-misc/util-macros/util-macros-1.17.0-git.bep rename to x11-misc/util_macros/util_macros-1.17.0_git.recipe index ea93fa92c..8f7f416d5 100644 --- a/x11-misc/util-macros/util-macros-1.17.0-git.bep +++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe @@ -9,7 +9,8 @@ SRC_URI="git://anongit.freedesktop.org/xorg/util/macros" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd util-macros-1.17.0-git ./autogen.sh -V ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd util-macros-1.17.0-git make install } diff --git a/x11-misc/util-macros/util-macros-1.7.0.bep b/x11-misc/util_macros/util_macros-1.7.0.recipe similarity index 95% rename from x11-misc/util-macros/util-macros-1.7.0.bep rename to x11-misc/util_macros/util_macros-1.7.0.recipe index 13a30101a..6144a32f7 100644 --- a/x11-misc/util-macros/util-macros-1.7.0.bep +++ b/x11-misc/util_macros/util_macros-1.7.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="8a8d208f24672e7a37d1aa4d2ffcef8e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd util-macros-1.7.0 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd util-macros-1.7.0 make install } diff --git a/x11-proto/inputproto/inputproto-2.0.bep b/x11-proto/inputproto/inputproto-2.0.recipe similarity index 95% rename from x11-proto/inputproto/inputproto-2.0.bep rename to x11-proto/inputproto/inputproto-2.0.recipe index 8428ac375..6d461f68d 100644 --- a/x11-proto/inputproto/inputproto-2.0.bep +++ b/x11-proto/inputproto/inputproto-2.0.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd inputproto-2.0 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd inputproto-2.0 make install } diff --git a/x11-proto/kbproto/kbproto-1.0.4.bep b/x11-proto/kbproto/kbproto-1.0.4.recipe similarity index 95% rename from x11-proto/kbproto/kbproto-1.0.4.bep rename to x11-proto/kbproto/kbproto-1.0.4.recipe index aa6a56080..970e88e87 100644 --- a/x11-proto/kbproto/kbproto-1.0.4.bep +++ b/x11-proto/kbproto/kbproto-1.0.4.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd kbproto-1.0.4 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd kbproto-1.0.4 make install } diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.bep b/x11-proto/xcb_proto/xcb_proto-1.6.recipe similarity index 94% rename from x11-proto/xcb-proto/xcb-proto-1.6.bep rename to x11-proto/xcb_proto/xcb_proto-1.6.recipe index ab77c5e0e..6573458f7 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.6.bep +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xcb-proto-1.6 libtoolize --force --copy --install autoreconf -i @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xcb-proto-1.6 make install } diff --git a/x11-proto/xextproto/xextproto-7.1.1.bep b/x11-proto/xextproto/xextproto-7.1.1.recipe similarity index 95% rename from x11-proto/xextproto/xextproto-7.1.1.bep rename to x11-proto/xextproto/xextproto-7.1.1.recipe index 79bbbd807..224d93786 100644 --- a/x11-proto/xextproto/xextproto-7.1.1.bep +++ b/x11-proto/xextproto/xextproto-7.1.1.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xextproto-7.1.1 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd xextproto-7.1.1 make install } diff --git a/x11-proto/xproto/patches/xproto-7.0.23_git.patch b/x11-proto/xproto/patches/xproto-7.0.23_git.patch new file mode 100644 index 000000000..04ba8ad82 --- /dev/null +++ b/x11-proto/xproto/patches/xproto-7.0.23_git.patch @@ -0,0 +1,48 @@ +diff --git a/Xos_r.h xproto-7.0.23-git/Xos_r.h +index f963b64..f8b727b 100644 +--- a/Xos_r.h ++++ xproto-7.0.23-git/Xos_r.h +@@ -88,6 +88,10 @@ in this Software without prior written authorization from The Open Group. + # endif + #endif /* _XOS_R_H */ + ++#ifdef __HAIKU__ ++#define _POSIX_THREAD_SAFE_FUNCTIONS ++#endif ++ + #ifndef WIN32 + + #ifdef __cplusplus +diff --git a/configure.ac xproto-7.0.23-git/configure.ac +index c4acf24..b3c82aa 100644 +--- a/configure.ac ++++ xproto-7.0.23-git/configure.ac +@@ -99,6 +99,28 @@ if test "x$fds_bits_found" = xfalse ; then + fi + + if test "x$fds_bits_found" = xfalse ; then ++AC_CHECK_MEMBER(fd_set.bits, ++ [ ++ fds_bits_found=plain_simple ++ USE_FDS_BITS="bits" ++ ],, ++ [ ++ #ifdef HAVE_SYS_PARAM_H ++ #include ++ #endif ++ #ifdef HAVE_SYS_TYPES_H ++ #include ++ #endif ++ #ifdef HAVE_SYS_TIME_H ++ #include ++ #endif ++ #ifdef HAVE_SYS_SELECT_H ++ #include ++ #endif ++ ]) ++fi ++ ++if test "x$fds_bits_found" = xfalse ; then + AC_MSG_ERROR([Could not determine how to access the fds_bits or equivalent + structure in fd_set on your platform.]) + fi diff --git a/x11-proto/xproto/xproto-7.0.16.bep b/x11-proto/xproto/xproto-7.0.16.recipe similarity index 95% rename from x11-proto/xproto/xproto-7.0.16.bep rename to x11-proto/xproto/xproto-7.0.16.recipe index d3ab77900..cd13a63fb 100644 --- a/x11-proto/xproto/xproto-7.0.16.bep +++ b/x11-proto/xproto/xproto-7.0.16.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="6e6b6510ccd568f82093ebd7ae58700b" REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xproto-7.0.16 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd xproto-7.0.16 make install } diff --git a/x11-proto/xproto/xproto-7.0.23-git.bep b/x11-proto/xproto/xproto-7.0.23_git.recipe similarity index 97% rename from x11-proto/xproto/xproto-7.0.23-git.bep rename to x11-proto/xproto/xproto-7.0.23_git.recipe index 643668b5a..1d808c8c7 100644 --- a/x11-proto/xproto/xproto-7.0.23-git.bep +++ b/x11-proto/xproto/xproto-7.0.23_git.recipe @@ -13,7 +13,8 @@ SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd xproto-7.0.23-git ./autogen.sh -V ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xproto-7.0.23-git make install }