diff options
| author | Max Rees <maxcrees@me.com> | 2018-08-08 12:35:44 -0400 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2018-08-08 12:35:44 -0400 |
| commit | 8ffd78026c9bcee056738d417c176df6e36b32e8 (patch) | |
| tree | c5bcf8719af526051ccb5aee4cedbd1600d738d5 | |
| parent | a2d6e9030847a3c5bb0c6a70ce074de45c92e257 (diff) | |
| download | packages-8ffd78026c9bcee056738d417c176df6e36b32e8.tar.gz packages-8ffd78026c9bcee056738d417c176df6e36b32e8.tar.bz2 packages-8ffd78026c9bcee056738d417c176df6e36b32e8.tar.xz packages-8ffd78026c9bcee056738d417c176df6e36b32e8.zip | |
user/clucene: modernize, fix license
| -rw-r--r-- | user/clucene/APKBUILD | 25 | ||||
| -rw-r--r-- | user/clucene/install_contribs_lib.patch (renamed from user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch) | 0 | ||||
| -rw-r--r-- | user/clucene/pkgconfig.patch (renamed from user/clucene/clucene-core-2.3.3.4-pkgconfig.patch) | 0 | ||||
| -rw-r--r-- | user/clucene/usleep.patch (renamed from user/clucene/clucene-core-2.3.3.4-usleep.patch) | 0 |
4 files changed, 13 insertions, 12 deletions
diff --git a/user/clucene/APKBUILD b/user/clucene/APKBUILD index 784f52586..90f7a8eb7 100644 --- a/user/clucene/APKBUILD +++ b/user/clucene/APKBUILD @@ -1,3 +1,4 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=clucene pkgver=2.3.3.4 @@ -5,24 +6,24 @@ pkgrel=5 pkgdesc="A C++ port of Lucene" url="http://www.sourceforge.net/projects/clucene" arch="all" -license="LGPLv2+ or ASL 2.0" +license="(LGPL-2.1+ OR Apache-2.0) AND RSA-MD AND (LGPL-2.0+ OR Apache-2.0) AND Zlib AND Apache-2.0" depends="" depends_dev="zlib-dev boost-dev" makedepends="cmake $depends_dev" subpackages="$pkgname-dev $pkgname-contribs" source="http://downloads.sourceforge.net/clucene/clucene-core-$pkgver.tar.gz - clucene-core-2.3.3.4-pkgconfig.patch - clucene-core-2.3.3.4-install_contribs_lib.patch - clucene-core-2.3.3.4-usleep.patch - disable-threading.patch" -builddir="$srcdir/clucene-core-$pkgver" -options="" + pkgconfig.patch + install_contribs_lib.patch + usleep.patch + disable-threading.patch +" +builddir="$srcdir/$pkgname-core-$pkgver" prepare() { default_prepare cd "$builddir" - sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' \ - CMakeLists.txt + # Do not use bundled zlib or boost + sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' CMakeLists.txt rm -rf src/ext } @@ -64,7 +65,7 @@ dev() { } sha512sums="1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 clucene-core-2.3.3.4.tar.gz -b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55 clucene-core-2.3.3.4-pkgconfig.patch -0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 clucene-core-2.3.3.4-install_contribs_lib.patch -5de49cb5eba1f9033f28281e0e5ff0e29fe6842ea3e1cb246c12649dc12dedad15e1811b45ccc989a1b743657eb0eeb4937616aa19ec5ee482cd323f54431b99 clucene-core-2.3.3.4-usleep.patch +b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55 pkgconfig.patch +0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 install_contribs_lib.patch +5de49cb5eba1f9033f28281e0e5ff0e29fe6842ea3e1cb246c12649dc12dedad15e1811b45ccc989a1b743657eb0eeb4937616aa19ec5ee482cd323f54431b99 usleep.patch 3ded79aed693f6de35389377eddea0b4b0bb0cafd016f6f766986297c35912b18c1e90cedb1fb1d256765abdaab05ca2999aec2fe7ae309fa75231ac94c519a9 disable-threading.patch" diff --git a/user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch b/user/clucene/install_contribs_lib.patch index 8fbb3c716..8fbb3c716 100644 --- a/user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch +++ b/user/clucene/install_contribs_lib.patch diff --git a/user/clucene/clucene-core-2.3.3.4-pkgconfig.patch b/user/clucene/pkgconfig.patch index aff20d7b4..aff20d7b4 100644 --- a/user/clucene/clucene-core-2.3.3.4-pkgconfig.patch +++ b/user/clucene/pkgconfig.patch diff --git a/user/clucene/clucene-core-2.3.3.4-usleep.patch b/user/clucene/usleep.patch index d6cbac360..d6cbac360 100644 --- a/user/clucene/clucene-core-2.3.3.4-usleep.patch +++ b/user/clucene/usleep.patch |