diff options
| -rw-r--r-- | main/p7zip/APKBUILD | 29 | ||||
| -rw-r--r-- | main/p7zip/p7zip-cc-cxx.patch | 22 |
2 files changed, 10 insertions, 41 deletions
diff --git a/main/p7zip/APKBUILD b/main/p7zip/APKBUILD index 94156786c9..a011172f75 100644 --- a/main/p7zip/APKBUILD +++ b/main/p7zip/APKBUILD @@ -1,6 +1,7 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=p7zip -pkgver=9.38.1 +pkgver=15.09 pkgrel=0 pkgdesc="A command-line port of the 7zip compression utility" url="http://p7zip.sourceforge.net" @@ -9,32 +10,22 @@ license="LGPL2+" subpackages="$pkgname-doc" depends= makedepends="bash" -#install=p7zip.install -source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${pkgver}_src_all.tar.bz2 - p7zip-cc-cxx.patch" +install= +source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${pkgver}_src_all.tar.bz2" _builddir="$srcdir"/${pkgname}_${pkgver} build() { cd "$_builddir" - patch -p1 -i ../p7zip-cc-cxx.patch || return 1 - sed -i "s|usr/local|usr|g" makefile make all3 OPTFLAGS="${CXXFLAGS}" || return 1 } package() { cd "$_builddir" - make install DEST_HOME="$pkgdir"/usr DEST_MAN="$pkgdir"/usr/share/man \ - DEST_SHARE_DOC="http://www.bugaco.com/7zip" - - sed -i "s|"$pkgdir"/usr|/usr|g" "$pkgdir"/usr/bin/7z - sed -i "s|"$pkgdir"/usr|/usr|g" "$pkgdir"/usr/bin/7za - sed -i "s|"$pkgdir"/usr|/usr|g" "$pkgdir"/usr/bin/7zr -# install -m755 -D contrib/VirtualFileSystemForMidnightCommander/u7z "$pkgdir"/usr/share/mc/extfs/u7z + ./install.sh /usr/bin /usr/libexec/$pkgname /usr/share/man /usr/share/doc "$pkgdir" + cp contrib/gzip-like_CLI_wrapper_for_7z/p7zip "$pkgdir"/usr/bin/ + cp contrib/gzip-like_CLI_wrapper_for_7z/man1/* "$pkgdir"/usr/share/man/man1/ } -md5sums="6cba8402ccab2370d3b70c5e28b3d651 p7zip_9.38.1_src_all.tar.bz2 -57dbabbbf7cafc1322ad7ae354fdabab p7zip-cc-cxx.patch" -sha256sums="fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 p7zip_9.38.1_src_all.tar.bz2 -c19a51d433ba2025953a36a8a86030254c9e33d00aad834a2b33e4426e99979b p7zip-cc-cxx.patch" -sha512sums="f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 p7zip_9.38.1_src_all.tar.bz2 -10fad26c7a044ef9750ce7084a5094fc9c70dfb27a7d75f1e66f716f52293d6274e376b7507c513abcd35ad9103433a6abe0eb304ae96593f90eb846b6aa934e p7zip-cc-cxx.patch" +md5sums="ab69f4f13ba0ec57eca2cf4c9edd9678 p7zip_15.09_src_all.tar.bz2" +sha256sums="8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f p7zip_15.09_src_all.tar.bz2" +sha512sums="4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd p7zip_15.09_src_all.tar.bz2" diff --git a/main/p7zip/p7zip-cc-cxx.patch b/main/p7zip/p7zip-cc-cxx.patch deleted file mode 100644 index 29742cf6f4..0000000000 --- a/main/p7zip/p7zip-cc-cxx.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/makefile.machine.orig -+++ b/makefile.machine -@@ -2,6 +2,8 @@ - # makefile for Linux (x86, PPC, alpha ...) - # - -+CXX ?= g++ -+CC ?= gcc - OPTFLAGS=-O - - ALLFLAGS=${OPTFLAGS} -pipe -s \ -@@ -10,8 +12,8 @@ - -D_7ZIP_LARGE_PAGES \ - $(LOCAL_FLAGS) - --CXX=g++ --CC=gcc -+CXX += $(ALLFLAGS) -+CC += $(ALLFLAGS) - CC_SHARED=-fPIC - LINK_SHARED=-fPIC -shared - |