diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-08-03 22:00:18 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-08-03 22:00:18 -0500 |
| commit | 45a215984ca0194e4702e6d1baa911eb77a27f31 (patch) | |
| tree | 2d64794512fae48ec0515e2bf4085ece5df33758 /libre | |
| parent | c351aec159dafd6372162e1ee88b2f2fe207df85 (diff) | |
| parent | 0cf7620f9358a934c91603a180df705906f69b61 (diff) | |
Merge branch 'master' of vparabola:~/projects/abslibre
Conflicts:
libre/libretools/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/libretools/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/rp-pppoe-libre/PKGBUILD | 10 |
2 files changed, 9 insertions, 12 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 19335c39e..fd3ea4063 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -59,6 +59,7 @@ package_libretools() { install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/mipsrelease ${pkgdir}/usr/bin install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ install -m755 ${_gitname}/toru ${pkgdir}/usr/bin install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin @@ -72,11 +73,11 @@ package_libretools() { package_libretools-pr() { install -d ${pkgdir}/etc/libretools.d - install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d + install -m644 ${_gitname}/prtools.conf ${pkgdir}/etc/libretools.d install -d ${pkgdir}/usr/bin - install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin + install -m755 ${_gitname}/prfullpkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/prmipsrelease ${pkgdir}/usr/bin } package_libretools-mips64el() { @@ -86,8 +87,4 @@ package_libretools-mips64el() { install -d ${pkgdir}/usr/bin install -m755 ${_gitname}/mips64el/mips-add ${pkgdir}/usr/bin install -m755 ${_gitname}/mips64el/mipsrelease ${pkgdir}/usr/bin -<<<<<<< HEAD:libre/libretools/PKGBUILD } -======= -} ->>>>>>> f8f8c2edc0a58f29e716f32453ee296980faef03:libre/libretools/PKGBUILD diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index 9607756d8..a360e113e 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -4,12 +4,12 @@ pkgname=rp-pppoe-libre pkgver=3.10 -pkgrel=6 +pkgrel=7 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed." arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') -depends=('ppp>=2.4.5' 'sh') +depends=('ppp>=2.4.5' 'sh' 'net-tools') options=('!makeflags') backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl @@ -37,13 +37,13 @@ mksource() { build() { cd $srcdir/$pkgname-$pkgver/src ./configure --prefix=/usr --enable-plugin - make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1 + make PLUGIN_DIR="/usr/lib/rp-pppoe" } package() { cd $srcdir/$pkgname-$pkgver/src make DESTDIR=$pkgdir install - + #moving .so files to /usr/lib according to FS#13876 mkdir -p ${pkgdir}/usr/lib/rp-pppoe mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/ @@ -51,7 +51,7 @@ package() { rm -rf ${pkgdir}/etc/ppp/plugins #changing config to the new path #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf - + install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl } md5sums=('2c4a678fa684269ff4579bb639674198' |