From 5ea51163d35110e8abbe583f5ef7bc0dfec216da Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:49:38 +0200 Subject: [PATCH] Rename apr-util-1.4.6.recipe and convert it to an actual recipe --- dev-libs/apr_util/apr-util-1.3.11.recipe | 51 ------------ dev-libs/apr_util/apr-util-1.3.12.recipe | 51 ------------ dev-libs/apr_util/apr-util-1.3.9.recipe | 49 ----------- dev-libs/apr_util/apr-util-1.4.1.recipe | 51 ------------ dev-libs/apr_util/apr_util-1.4.1.recipe | 100 +++++++++++++++++++++++ 5 files changed, 100 insertions(+), 202 deletions(-) delete mode 100644 dev-libs/apr_util/apr-util-1.3.11.recipe delete mode 100644 dev-libs/apr_util/apr-util-1.3.12.recipe delete mode 100644 dev-libs/apr_util/apr-util-1.3.9.recipe delete mode 100644 dev-libs/apr_util/apr-util-1.4.1.recipe create mode 100644 dev-libs/apr_util/apr_util-1.4.1.recipe diff --git a/dev-libs/apr_util/apr-util-1.3.11.recipe b/dev-libs/apr_util/apr-util-1.3.11.recipe deleted file mode 100644 index 8427643e5..000000000 --- a/dev-libs/apr_util/apr-util-1.3.11.recipe +++ /dev/null @@ -1,51 +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.recipe b/dev-libs/apr_util/apr-util-1.3.12.recipe deleted file mode 100644 index 215237a3c..000000000 --- a/dev-libs/apr_util/apr-util-1.3.12.recipe +++ /dev/null @@ -1,51 +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.recipe b/dev-libs/apr_util/apr-util-1.3.9.recipe deleted file mode 100644 index 896323400..000000000 --- a/dev-libs/apr_util/apr-util-1.3.9.recipe +++ /dev/null @@ -1,49 +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.recipe b/dev-libs/apr_util/apr-util-1.4.1.recipe deleted file mode 100644 index c5878e7ef..000000000 --- a/dev-libs/apr_util/apr-util-1.4.1.recipe +++ /dev/null @@ -1,51 +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/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe new file mode 100644 index 000000000..bb4b7243e --- /dev/null +++ b/dev-libs/apr_util/apr_util-1.4.1.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.4.1.tar.gz" +LICENSE="Apache v2" +COPYRIGHT="2011 The Apache Software Foundation." +CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" +REVISION="1" +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.4.6 + expat >= 2.0 + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +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) + "