aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorSean Summers <seansummers@gmail.com>2015-01-02 22:45:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-01-06 16:01:49 +0000
commit9ad13b61b5b2adf7706662a6c3e33c24376d3f9f (patch)
treef349c4757bc8870d21bf0c9b6a96c89551f5817a /testing
parent10662ff6cfe5fd9bd07d1730829d893a9957fec3 (diff)
downloadaports-9ad13b61b5b2adf7706662a6c3e33c24376d3f9f.tar.bz2
aports-9ad13b61b5b2adf7706662a6c3e33c24376d3f9f.tar.xz
testing/tomcat-native: various fixes
- removed depends that are autodetected - fix _builddir - replace pre/post scripts with custom dev() - remove unneded pre/post scripts - removed .so link out of -dev, so it is owned by the parent - cleaned up package()
Diffstat (limited to 'testing')
-rw-r--r--testing/tomcat-native/APKBUILD31
-rw-r--r--testing/tomcat-native/tomcat-native.post-install2
-rw-r--r--testing/tomcat-native/tomcat-native.pre-deinstall2
3 files changed, 15 insertions, 20 deletions
diff --git a/testing/tomcat-native/APKBUILD b/testing/tomcat-native/APKBUILD
index 6f121b7109..5d092927b9 100644
--- a/testing/tomcat-native/APKBUILD
+++ b/testing/tomcat-native/APKBUILD
@@ -7,18 +7,18 @@ pkgdesc="native resources optional component for Apache Tomcat"
url="http://tomcat.apache.org/native-doc/"
arch="all"
license="ASL 2.0"
-depends="apr openssl openjdk7-jre-base"
+depends="openjdk7-jre-base"
depends_dev="apr-dev openssl-dev openjdk7"
makedepends="${depends_dev}"
-install="${pkgname}.post-install ${pkgname}.pre-deinstall"
+install=""
subpackages="${pkgname}-dev"
source="http://mirrors.gigenet.com/apache/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz
${install}
"
-_builddir=${pkgname}-${pkgver}-src/jni/native
+_builddir="${srcdir}/${pkgname}-${pkgver}-src/jni/native"
build() {
- cd "$_builddir"
+ cd "${_builddir}"
./configure --with-apr=/usr/bin/apr-1-config \
--with-java-home=/usr/lib/jvm/default-jvm \
--prefix="/usr" || return 1
@@ -26,18 +26,17 @@ build() {
}
package() {
- cd "src/${_builddir}"
+ cd "${_builddir}"
make DESTDIR="${pkgdir}" install || return 1
- rm -f ${pkgdir}/usr/lib/*.la || true
- rmdir ${pkgdir}/usr/* 2>/dev/null || true
+ rm -f "${pkgdir}/usr/lib/libtcnative-1.la" || return 1
+ rmdir "${pkgdir}/usr/bin" || return 1
}
-md5sums="90b4f55d9e3f3614c7b780500268570b tomcat-native-1.1.32-src.tar.gz
-da9daeac90300e192a592c0d96ae769c tomcat-native.post-install
-4493951173ec5d3ac0b99a9d406163ef tomcat-native.pre-deinstall"
-sha256sums="26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584 tomcat-native-1.1.32-src.tar.gz
-68455f73bbe7777fea1c2267313f96209fadd1436c6f7a8090bccbcf8bcc3b10 tomcat-native.post-install
-71a0f80a9b947600cb9fd3fcdb1f1a58dd127fdb5355ac0a53a738b717d42fec tomcat-native.pre-deinstall"
-sha512sums="695f710f91cf720b3115f9933f5dab56e7465ee0fcf6508b53d1de172ba59165b08f27b3cdfef741b60dbf0b3da97ae3ea87c5a0ef9f1d879a9820259197dcba tomcat-native-1.1.32-src.tar.gz
-b92eb1da2c104f7314c446783c04ca3a0efc5d6126b7f2cc9bab5f9d987bee7057c57aa6ce8620dd411bbda556d9301b40bed0e0df4e64c981a458ba26457f2c tomcat-native.post-install
-4a6474bc8ad16f3c5a0239daf8ffa671c341d9fad3f9fafd253398003e3da2fb9d63f3dcf4fc5565ad4e4868ed75698e6ae8b6699baa43aef55ec48b2bfc7292 tomcat-native.pre-deinstall"
+dev() {
+ default_dev
+ mv "${subpkgdir}/usr/lib/libtcnative-1.so" "${pkgdir}/usr/lib/" || return 1
+}
+
+md5sums="90b4f55d9e3f3614c7b780500268570b tomcat-native-1.1.32-src.tar.gz"
+sha256sums="26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584 tomcat-native-1.1.32-src.tar.gz"
+sha512sums="695f710f91cf720b3115f9933f5dab56e7465ee0fcf6508b53d1de172ba59165b08f27b3cdfef741b60dbf0b3da97ae3ea87c5a0ef9f1d879a9820259197dcba tomcat-native-1.1.32-src.tar.gz"
diff --git a/testing/tomcat-native/tomcat-native.post-install b/testing/tomcat-native/tomcat-native.post-install
deleted file mode 100644
index 1774a04b26..0000000000
--- a/testing/tomcat-native/tomcat-native.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ln -s libtcnative-1.so.0 /usr/lib/libtcnative-1.so
diff --git a/testing/tomcat-native/tomcat-native.pre-deinstall b/testing/tomcat-native/tomcat-native.pre-deinstall
deleted file mode 100644
index 8541f8bc98..0000000000
--- a/testing/tomcat-native/tomcat-native.pre-deinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rm /usr/lib/libtcnative-1.so