Date: Sunday, June 8, 2014 @ 18:40:00
Author: anatolik
Revision: 112822
archrelease: copy trunk to community-i686, community-x86_64
Added:
perl-libapreq2/repos/community-i686/PKGBUILD
(from rev 112821, perl-libapreq2/trunk/PKGBUILD)
perl-libapreq2/repos/community-i686/link-in-apr-shared-objects.patch
(from rev 112821, perl-libapreq2/trunk/link-in-apr-shared-objects.patch)
perl-libapreq2/repos/community-x86_64/PKGBUILD
(from rev 112821, perl-libapreq2/trunk/PKGBUILD)
perl-libapreq2/repos/community-x86_64/link-in-apr-shared-objects.patch
(from rev 112821, perl-libapreq2/trunk/link-in-apr-shared-objects.patch)
Deleted:
perl-libapreq2/repos/community-i686/PKGBUILD
perl-libapreq2/repos/community-x86_64/PKGBUILD
---------------------------------------------------+
/PKGBUILD | 78 ++++++++++++++++++++
community-i686/PKGBUILD | 31 -------
community-i686/link-in-apr-shared-objects.patch | 28 +++++++
community-x86_64/PKGBUILD | 31 -------
community-x86_64/link-in-apr-shared-objects.patch | 28 +++++++
5 files changed, 134 insertions(+), 62 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-06-08 16:38:43 UTC (rev 112821)
+++ community-i686/PKGBUILD 2014-06-08 16:40:00 UTC (rev 112822)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Tom K <t...@runbox.com>
-
-pkgname=perl-libapreq2
-pkgver=2.13
-pkgrel=6
-pkgdesc="A safe, standards-compliant, high-performance library used for
parsing HTTP cookies, query-strings and POST data."
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/libapreq2";
-depends=('mod_perl' 'apr-util')
-makedepends=('perl-extutils-xsbuilder')
-license=("GPL")
-source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz)
-md5sums=('c11fb0861aa84dcc6cd0f0798b045eee')
-
-build() {
- cd $srcdir/libapreq2-$pkgver
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs
- find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
- sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
- make
-}
-
-package(){
- cd $srcdir/libapreq2-$pkgver
- make install DESTDIR=$pkgdir
- sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config
- find $pkgdir -name '.packlist' -delete
- find $pkgdir -name '*.pod' -delete
-}
Copied: perl-libapreq2/repos/community-i686/PKGBUILD (from rev 112821,
perl-libapreq2/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-06-08 16:40:00 UTC (rev 112822)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Tom K <t...@runbox.com>
+
+pkgname=perl-libapreq2
+pkgver=2.13
+pkgrel=7
+pkgdesc="A safe, standards-compliant, high-performance library used for
parsing HTTP cookies, query-strings and POST data."
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/libapreq2";
+options=('!emptydirs')
+depends=('mod_perl' 'apr-util')
+makedepends=('perl-extutils-xsbuilder')
+license=("GPL")
+source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz
+ link-in-apr-shared-objects.patch)
+md5sums=('c11fb0861aa84dcc6cd0f0798b045eee'
+ '4cee6d940e95aeb47dd503b8e8a1c7dd')
+
+prepare() {
+ cd $srcdir/libapreq2-$pkgver
+ patch -p1 < ../link-in-apr-shared-objects.patch
+}
+
+build() {
+ cd $srcdir/libapreq2-$pkgver
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/bin/apxs
--with-mm-opts="INSTALLDIRS=vendor"
+ find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
+ sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
+ make LD_RUN_PATH="/usr/lib" # build sets RPATH to non-sanitized path, force
correct rpath
+}
+
+package(){
+ cd $srcdir/libapreq2-$pkgver
+ make install DESTDIR=$pkgdir
+ sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config
+ find $pkgdir -name '.packlist' -delete
+ find $pkgdir -name '*.pod' -delete
+}
Copied: perl-libapreq2/repos/community-i686/link-in-apr-shared-objects.patch
(from rev 112821, perl-libapreq2/trunk/link-in-apr-shared-objects.patch)
===================================================================
--- community-i686/link-in-apr-shared-objects.patch
(rev 0)
+++ community-i686/link-in-apr-shared-objects.patch 2014-06-08 16:40:00 UTC
(rev 112822)
@@ -0,0 +1,28 @@
+Don't try to regenerate Makefiles at installation time, as this will forget
+to link against the internal copy of libapreq2-dev, which will cause problems
+when trying to load the module outside Apache.
+
+Index: libapreq2-2.12/glue/Makefile.am
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.am
++++ libapreq2-2.12/glue/Makefile.am
+@@ -15,7 +15,6 @@ perl_test: perl/Makefile
+ cd perl; $(MAKE) test
+
+ perl_install:
+- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@
@MM_OPTS@
+ cd perl; $(MAKE) install
+
+ perl_clean:
+Index: libapreq2-2.12/glue/Makefile.in
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.in
++++ libapreq2-2.12/glue/Makefile.in
+@@ -265,7 +265,6 @@ perl_test: perl/Makefile
+ cd perl; $(MAKE) test
+
+ perl_install:
+- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@
@MM_OPTS@
+ cd perl; $(MAKE) install
+
+ perl_clean:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-06-08 16:38:43 UTC (rev 112821)
+++ community-x86_64/PKGBUILD 2014-06-08 16:40:00 UTC (rev 112822)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Tom K <t...@runbox.com>
-
-pkgname=perl-libapreq2
-pkgver=2.13
-pkgrel=6
-pkgdesc="A safe, standards-compliant, high-performance library used for
parsing HTTP cookies, query-strings and POST data."
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/libapreq2";
-depends=('mod_perl' 'apr-util')
-makedepends=('perl-extutils-xsbuilder')
-license=("GPL")
-source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz)
-md5sums=('c11fb0861aa84dcc6cd0f0798b045eee')
-
-build() {
- cd $srcdir/libapreq2-$pkgver
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs
- find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
- sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
- make
-}
-
-package(){
- cd $srcdir/libapreq2-$pkgver
- make install DESTDIR=$pkgdir
- sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config
- find $pkgdir -name '.packlist' -delete
- find $pkgdir -name '*.pod' -delete
-}
Copied: perl-libapreq2/repos/community-x86_64/PKGBUILD (from rev 112821,
perl-libapreq2/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-06-08 16:40:00 UTC (rev 112822)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Tom K <t...@runbox.com>
+
+pkgname=perl-libapreq2
+pkgver=2.13
+pkgrel=7
+pkgdesc="A safe, standards-compliant, high-performance library used for
parsing HTTP cookies, query-strings and POST data."
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/libapreq2";
+options=('!emptydirs')
+depends=('mod_perl' 'apr-util')
+makedepends=('perl-extutils-xsbuilder')
+license=("GPL")
+source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz
+ link-in-apr-shared-objects.patch)
+md5sums=('c11fb0861aa84dcc6cd0f0798b045eee'
+ '4cee6d940e95aeb47dd503b8e8a1c7dd')
+
+prepare() {
+ cd $srcdir/libapreq2-$pkgver
+ patch -p1 < ../link-in-apr-shared-objects.patch
+}
+
+build() {
+ cd $srcdir/libapreq2-$pkgver
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/bin/apxs
--with-mm-opts="INSTALLDIRS=vendor"
+ find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
+ sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
+ make LD_RUN_PATH="/usr/lib" # build sets RPATH to non-sanitized path, force
correct rpath
+}
+
+package(){
+ cd $srcdir/libapreq2-$pkgver
+ make install DESTDIR=$pkgdir
+ sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config
+ find $pkgdir -name '.packlist' -delete
+ find $pkgdir -name '*.pod' -delete
+}
Copied: perl-libapreq2/repos/community-x86_64/link-in-apr-shared-objects.patch
(from rev 112821, perl-libapreq2/trunk/link-in-apr-shared-objects.patch)
===================================================================
--- community-x86_64/link-in-apr-shared-objects.patch
(rev 0)
+++ community-x86_64/link-in-apr-shared-objects.patch 2014-06-08 16:40:00 UTC
(rev 112822)
@@ -0,0 +1,28 @@
+Don't try to regenerate Makefiles at installation time, as this will forget
+to link against the internal copy of libapreq2-dev, which will cause problems
+when trying to load the module outside Apache.
+
+Index: libapreq2-2.12/glue/Makefile.am
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.am
++++ libapreq2-2.12/glue/Makefile.am
+@@ -15,7 +15,6 @@ perl_test: perl/Makefile
+ cd perl; $(MAKE) test
+
+ perl_install:
+- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@
@MM_OPTS@
+ cd perl; $(MAKE) install
+
+ perl_clean:
+Index: libapreq2-2.12/glue/Makefile.in
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.in
++++ libapreq2-2.12/glue/Makefile.in
+@@ -265,7 +265,6 @@ perl_test: perl/Makefile
+ cd perl; $(MAKE) test
+
+ perl_install:
+- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@
@MM_OPTS@
+ cd perl; $(MAKE) install
+
+ perl_clean:
