summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaming4JC <g4jc@openmailbox.org>2016-11-24 14:25:10 -0500
committerGaming4JC <g4jc@openmailbox.org>2016-11-24 14:25:10 -0500
commita585ddd30fff78dedb75d649a1b350904751ed48 (patch)
treeaa97126cdf86bbf419bf622ca260dbb46cb293a0
parenta4b98200d55bf9fd39a86585f5cc46dbe846c865 (diff)
parentd00489c5023f511e763cc594f395fa20f4bacf23 (diff)
downloadabslibre-a585ddd30fff78dedb75d649a1b350904751ed48.tar.gz
abslibre-a585ddd30fff78dedb75d649a1b350904751ed48.tar.bz2
abslibre-a585ddd30fff78dedb75d649a1b350904751ed48.zip
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
Merging iceweasel and icedove updates
-rw-r--r--libre/acpi_call/PKGBUILD4
-rw-r--r--libre/bbswitch/PKGBUILD4
-rw-r--r--libre/cowsay/PKGBUILD32
-rw-r--r--libre/cowsay/cowsay.patch11
-rw-r--r--libre/tp_smapi/PKGBUILD4
-rw-r--r--libre/vhba-module/PKGBUILD2
6 files changed, 50 insertions, 7 deletions
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index e755915a3..4e49c5d7c 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -5,11 +5,11 @@
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: Márcio Silva <coadde@parabola.nu>
-_kernelname=-lts
+_kernelname=
if [[ ${_kernelname} == "" ]]; then
_basekernel=4.8
- _archrel=50
+ _archrel=51
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.4
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 6e18c1141..a05397da5 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -5,11 +5,11 @@
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: Márcio Silva <coadde@parabola.nu>
-_kernelname=-lts
+_kernelname=
if [[ ${_kernelname} == "" ]]; then
_basekernel=4.8
- _archrel=54
+ _archrel=55
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.4
diff --git a/libre/cowsay/PKGBUILD b/libre/cowsay/PKGBUILD
new file mode 100644
index 000000000..f92680b2a
--- /dev/null
+++ b/libre/cowsay/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor (Arch): Eric Belanger <eric@archlinux.org>
+# Contributor (Arch): Sarah Hay <sarahhay@mb.sympatico.ca>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgname=cowsay
+pkgver=3.03
+pkgrel=9.parabola1
+pkgdesc='Configurable talking cow (and a few other creatures), without nonfree cows'
+arch=('any')
+url='http://www.nog.net/~tony/warez/'
+license=('PerlArtistic' 'GPL')
+depends=('perl')
+#http://www.nog.net/~tony/warez/${pkgname}-${pkgver}.tar.gz
+source=(http://http.debian.net/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}+dfsg1.orig.tar.gz
+ cowsay.patch)
+sha256sums=('10bae895d9afb2d720d2211db58f396352b00fe1386c369ca3608cbf6497b839'
+ 'aa88442a31f01ffe5884b3ae974ed1ced23d860859d7f2234cdcd3ac437fc17f')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}+dfsg1
+ patch -p1 -i $srcdir/cowsay.patch
+ sed -i 's|/man/|/share/man/|' install.sh
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}+dfsg1
+ echo "${pkgdir}/usr" | ./install.sh
+ # This one is not a valid '.cow' file
+ rm ${pkgdir}/usr/share/cows/mech-and-cow
+}
diff --git a/libre/cowsay/cowsay.patch b/libre/cowsay/cowsay.patch
new file mode 100644
index 000000000..299d52895
--- /dev/null
+++ b/libre/cowsay/cowsay.patch
@@ -0,0 +1,11 @@
+--- cowsay-3.03/install.sh 1999-11-01 21:19:21.000000000 +0100
++++ cowsay-3.03-new/install.sh 2003-08-15 17:14:23.000000000 +0200
+@@ -67,7 +67,7 @@
+ echo Okay, time to install this puppy.
+
+ echo s,%BANGPERL%,!$usethisperl,\; > install.pl
+-echo s,%PREFIX%,$PREFIX,\; >> install.pl
++echo s,%PREFIX%,/usr,\; >> install.pl
+ set -x
+ mkdir -p $PREFIX/bin || (mkdir $PREFIX; mkdir $PREFIX/bin)
+ $usethisperl -p install.pl cowsay > $PREFIX/bin/cowsay
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 9c4dcc346..9b9794f91 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -10,11 +10,11 @@
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: Márcio Silva <coadde@parabola.nu>
-_kernelname=-lts
+_kernelname=
if [[ ${_kernelname} == "" ]]; then
_basekernel=4.8
- _archrel=4
+ _archrel=5
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.4
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index 0c0a9395d..909730e09 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -9,7 +9,7 @@ _kernelname=
if [[ ${_kernelname} == "" ]]; then
_basekernel=4.8
- _archrel=1
+ _archrel=2
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.4