From 42675af37cb5ce735452311734cc5b88a66d6d9d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 14 Feb 2010 00:38:14 +0100
Subject: complete allmodconfig build on NetBSD

---
 package/hdparm/Makefile               |  2 +-
 package/hdparm/patches/patch-Makefile | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'package/hdparm')

diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index ab2e42d6a..bf8ff399f 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -20,6 +20,6 @@ CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HDPARM}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/hdparm ${IDIR_HDPARM}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/sbin/hdparm ${IDIR_HDPARM}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile
index 26a759821..03c74f509 100644
--- a/package/hdparm/patches/patch-Makefile
+++ b/package/hdparm/patches/patch-Makefile
@@ -1,19 +1,32 @@
 --- hdparm-9.15.orig/Makefile	2008-12-10 01:14:28.000000000 +0100
-+++ hdparm-9.15/Makefile	2010-02-05 22:40:21.943083430 +0100
++++ hdparm-9.15/Makefile	2010-02-13 12:24:25.000000000 +0100
 @@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man
  CC ?= gcc
  STRIP ?= strip
- 
+
 -CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
 +CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
- 
+
  #LDFLAGS = -s -static
  LDFLAGS = -s
 @@ -28,7 +28,6 @@ all: hdparm
- 
+
  hdparm: hdparm.h sgio.h $(OBJS)
  	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
 -	$(STRIP) hdparm
- 
+
  hdparm.o:	hdparm.h sgio.h
- 
+
+@@ -46,9 +45,9 @@ install: all hdparm.8
+	if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
+	if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+	elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+-	$(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm
+-	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+-	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
++	$(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm
++	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
++	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+
+ clean:
+	-rm -f hdparm $(OBJS) core 2>/dev/null
-- 
cgit v1.2.3