From 7c520cd3ad42f5d94a9888bb9b3db7c79b6fd94f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 2 Jun 2009 22:09:53 +0200
Subject: fix regressions for allconfig alix1c glibc target

---
 package/digitemp/Makefile                    |  7 ++++---
 package/digitemp/patches/001-Makefile.patch  | 29 ----------------------------
 package/digitemp/patches/patch-Makefile      | 14 ++++++++++++++
 package/digitemp/patches/patch-Makefile.orig | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 package/digitemp/patches/001-Makefile.patch
 create mode 100644 package/digitemp/patches/patch-Makefile
 create mode 100644 package/digitemp/patches/patch-Makefile.orig

(limited to 'package/digitemp')

diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index ea99684be..8df9304e8 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -6,11 +6,11 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		digitemp
-PKG_VERSION:=		3.3.2
+PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0b6cfb36d198767836de54d9fb11bbdb
+PKG_MD5SUM:=		9be2e48db37920f21925ae6e88f83b84
 PKG_DESCR:=		simple to use program for reading values from 1-wire devices
-PKG_SECTION:=		app
+PKG_SECTION:=		misc
 PKG_DEPENDS:=		libusb
 PKG_URL:=		http://www.digitemp.com/software/linux
 PKG_SITES:=		http://www.digitemp.com/software/linux/
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-I./src -I./userial
 ALL_TARGET=		ds2490
 BUILD_STYLE=		auto
 
diff --git a/package/digitemp/patches/001-Makefile.patch b/package/digitemp/patches/001-Makefile.patch
deleted file mode 100644
index a08164b86..000000000
--- a/package/digitemp/patches/001-Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- digitemp-3.3.2.orig/Makefile	2004-02-04 15:17:10.000000000 +0100
-+++ digitemp-3.3.2/Makefile	2006-08-16 20:17:27.000000000 +0200
-@@ -15,8 +15,6 @@
- 
- VERSION = 3.3.2
- 
--
--CC	= gcc
- CFLAGS	= -I./src -I./userial -O2 # -g -Wall
- LIBS	= -lm
- 
-@@ -57,7 +55,7 @@
-   CFLAGS += -DLINUX
- 
-   # Set LOCK to yes for serial port locking support
--  LOCK = yes
-+  #LOCK = yes
- 
- endif
- 
-@@ -123,7 +121,7 @@
- 		$(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS)
- 
- ds2490:		$(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS2490OBJS)
--		$(CC) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS)
-+		$(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS)
- 
- 
- # Clean up the object files and the sub-directory for distributions
diff --git a/package/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile
new file mode 100644
index 000000000..10ac0c97f
--- /dev/null
+++ b/package/digitemp/patches/patch-Makefile
@@ -0,0 +1,14 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- digitemp-3.6.0.orig/Makefile	2008-08-28 23:37:00.000000000 +0200
++++ digitemp-3.6.0/Makefile	2009-06-01 20:04:20.000000000 +0200
+@@ -11,8 +11,8 @@
+ 
+ VERSION = 3.6.0
+ 
+-CC	= gcc
+-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
++CC	?= gcc
++CFLAGS	?= -I./src -I./userial 
+ 
+ OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
+ HDRS		= 	src/digitemp.h src/device_name.h
diff --git a/package/digitemp/patches/patch-Makefile.orig b/package/digitemp/patches/patch-Makefile.orig
new file mode 100644
index 000000000..b42427f23
--- /dev/null
+++ b/package/digitemp/patches/patch-Makefile.orig
@@ -0,0 +1,14 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- digitemp-3.6.0.orig/Makefile	2008-08-28 23:37:00.000000000 +0200
++++ digitemp-3.6.0/Makefile	2009-06-01 20:03:24.000000000 +0200
+@@ -11,8 +11,8 @@
+ 
+ VERSION = 3.6.0
+ 
+-CC	= gcc
+-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
++CC	?= gcc
++CFLAGS	= -I./src -I./userial 
+ 
+ OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
+ HDRS		= 	src/digitemp.h src/device_name.h
-- 
cgit v1.2.3