summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-08-20 13:13:19 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-20 13:13:19 +0000
commit1ccf12b551219556327415947262e3c32fe4e06b (patch)
treef1ece8a43e8d97b3cebf6c6d69846a471e670ee6
parentd9500f762a4c986fe5cfac8c69eb7fd8eb4e34c2 (diff)
downloadaports-fcolista-1ccf12b551219556327415947262e3c32fe4e06b.tar.bz2
aports-fcolista-1ccf12b551219556327415947262e3c32fe4e06b.tar.xz
testing/dmidecode: remove unneeded patch
-rw-r--r--testing/dmidecode/10-Makefile.patch13
-rw-r--r--testing/dmidecode/APKBUILD10
2 files changed, 4 insertions, 19 deletions
diff --git a/testing/dmidecode/10-Makefile.patch b/testing/dmidecode/10-Makefile.patch
deleted file mode 100644
index a964ec6dbb..0000000000
--- a/testing/dmidecode/10-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.orig
-+++ src/Makefile
-@@ -21,8 +21,8 @@
- # Pass linker flags here
- LDFLAGS =
-
--DESTDIR =
--prefix = /usr/local
-+DESTDIR = $(pkgdir)
-+prefix = /usr
- sbindir = $(prefix)/sbin
- mandir = $(prefix)/share/man
- man8dir = $(mandir)/man8
diff --git a/testing/dmidecode/APKBUILD b/testing/dmidecode/APKBUILD
index 742becd3c7..7cfb192794 100644
--- a/testing/dmidecode/APKBUILD
+++ b/testing/dmidecode/APKBUILD
@@ -8,8 +8,7 @@ license="GPL"
depends=
makedepends=
subpackages="$pkgname-doc"
-source="http://mirror.its.uidaho.edu/pub/savannah/dmidecode/dmidecode-${pkgver}.tar.gz
- 10-Makefile.patch"
+source="http://mirror.its.uidaho.edu/pub/savannah/dmidecode/dmidecode-${pkgver}.tar.gz"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -25,13 +24,12 @@ prepare() {
build() {
cd "$_builddir"
- make || return 1
+ make prefix=/usr || return 1
}
package() {
cd "$_builddir"
- make pkgdir=${pkgdir} install
+ make prefix=/usr DESTDIR="${pkgdir}" install
}
-md5sums="1f804692168178c19a8ec86d147fbc77 dmidecode-2.9.tar.gz
-8b928ec97c7c387db425a8176f9ee65c 10-Makefile.patch"
+md5sums="1f804692168178c19a8ec86d147fbc77 dmidecode-2.9.tar.gz"