summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-12-05 13:48:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-12-05 13:49:15 +0000
commit5132afd3a2757948bc44c76f53b7d1e3d747af48 (patch)
tree64f2c11eb19c40943eb95559fd629498ea326f41
parent818c813530b73fb30bf1edd81185761aeb03f727 (diff)
downloadaports-5132afd3a2757948bc44c76f53b7d1e3d747af48.tar.bz2
aports-5132afd3a2757948bc44c76f53b7d1e3d747af48.tar.xz
main/ppp: merge ppp-chat-doc and ppp-radius-doc into ppp-doc
keeps things simpler and is more consistent what we do with other packages
-rw-r--r--main/ppp/APKBUILD20
1 files changed, 3 insertions, 17 deletions
diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD
index 1417be5dc..18b4b5ec1 100644
--- a/main/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
@@ -8,10 +8,10 @@ arch="all"
license="custom:GPL/BSD"
depends=
makedepends=
-subpackages="$pkgname-chat $pkgname-chat-doc:chat_doc
- $pkgname-radius $pkgname-radius-doc:radius_doc
+subpackages="$pkgname-doc $pkgname-dev $pkgname-chat $pkgname-radius
$pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind
- $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn $pkgname-doc $pkgname-dev"
+ $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn
+ "
source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
defaultroute-metric.3.patch
musl-fix-headers.patch
@@ -110,11 +110,6 @@ chat() {
_mv usr/sbin/chat 755
}
-chat_doc() {
- arch="noarch"
- _mv usr/share/man/man8/chat.8 644 doc
-}
-
l2tp() {
pkgdesc="pppd plugin to implement PPPoL2TP protocol"
depends="ppp"
@@ -142,17 +137,8 @@ radius() {
sed -i "s:@sbindir@:/usr/sbin:g" "$subpkgdir"/etc/radiusclient/radiusclient.conf
}
-radius_doc() {
- arch="noarch"
- _mv usr/share/man/man8/pppd-radius.8 644 doc
- _mv usr/share/man/man8/pppd-radattr.8 644 doc
-}
-
_mv() {
install -m $2 -D "$pkgdir"/$1 "$subpkgdir"/$1
- if [ "$3" = "doc" ]; then
- gzip -9 "$subpkgdir"/$1
- fi
rm "$pkgdir"/$1
}
md5sums="78818f40e6d33a1d1de68a1551f6595a ppp-2.4.7.tar.gz