update to latest upstream

3 files changed, 27 insertions, 30 deletions

diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index 3a64b566d..a51790985 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -1,27 +1,25 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		htpdate
-PKG_VERSION:=		1.0.5
+PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
-PKG_HASH:=		f465059495eae91437eb5eec7af92f1374eb3836f50926e8e5718818abf91e9a
+PKG_HASH:=		0d75f91cb61f8869c8298d198fa52b9a139ae505b366e9d4d331af8bc1c04880
 PKG_DESCR:=		hypertext time protocol implementation
 PKG_SECTION:=		net/ntp
 PKG_URL:=		http://www.vervest.org/htp/
 PKG_SITES:=		http://www.vervest.org/htp/archive/c/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+include $(ADK_TOPDIR)/mk/package.mk
 
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HTPDATE,htpdate,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 CONFIG_STYLE:=		manual
 
 htpdate-install:
-	${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_HTPDATE)/usr/sbin
+	$(INSTALL_BIN) $(WRKBUILD)/htpdate $(IDIR_HTPDATE)/usr/sbin/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile
index 9afe7bc70..b7b80f427 100644
--- a/package/htpdate/patches/patch-Makefile
+++ b/package/htpdate/patches/patch-Makefile
@@ -1,35 +1,34 @@
---- htpdate-1.0.4.orig/Makefile	2008-10-13 21:04:08.000000000 +0200
-+++ htpdate-1.0.4/Makefile	2010-02-05 22:49:58.954334284 +0100
-@@ -2,8 +2,8 @@ prefix = /usr
+--- htpdate-1.1.1.orig/Makefile	2014-02-07 09:55:26.000000000 +0100
++++ htpdate-1.1.1/Makefile	2015-02-03 06:09:46.000000000 +0100
+@@ -2,12 +2,10 @@ prefix = $(DESTDIR)/usr
  bindir = ${prefix}/bin
  mandir = ${prefix}/share/man
  
 -CC = gcc
 -CFLAGS += -Wall -O2
+-#CFLAGS += -Wall -pedantic -ansi -O2
 +CC ?= gcc
-+CFLAGS ?= -Wall -O2
- #CFLAGS += -Wall -pedantic -ansi -O2
++CFLAGS ?=
  
  INSTALL = /usr/bin/install -c
-@@ -15,15 +15,14 @@ htpdate: htpdate.c
- 	$(CC) $(CFLAGS) -o htpdate htpdate.c
+-STRIP = /usr/bin/strip -s
+ 
+ all: htpdate
+ 
+@@ -15,16 +13,11 @@ htpdate: htpdate.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o htpdate htpdate.c
  
  install: all
 -	$(STRIP) htpdate
--	mkdir -p $(bindir)
--	$(INSTALL) -m 755 htpdate $(bindir)/htpdate
+ 	mkdir -p $(bindir)
+ 	$(INSTALL) -m 755 htpdate $(bindir)/htpdate
 -	mkdir -p $(mandir)/man8
--	$(INSTALL) -m 644 htpdate.8.gz $(mandir)/man8/htpdate.8.gz
-+	mkdir -p $(DESTDIR)$(bindir)
-+	$(INSTALL) -m 755 htpdate $(DESTDIR)$(bindir)/htpdate
-+	mkdir -p $(DESTDIR)$(mandir)/man8
-+	$(INSTALL) -m 644 htpdate.8.gz $(DESTDIR)$(mandir)/man8/htpdate.8.gz
+-	$(INSTALL) -m 644 htpdate.8 $(mandir)/man8/htpdate.8
+-	gzip -f -9 $(mandir)/man8/htpdate.8
  
  clean:
  	rm -rf htpdate
  
  uninstall:
--	rm -rf $(bindir)/htpdate
+ 	rm -rf $(bindir)/htpdate
 -	rm -rf $(mandir)/man8/htpdate.8.gz
-+	rm -rf $(DESTDIR)$(bindir)/htpdate
-+	rm -rf $(DESTDIR)$(mandir)/man8/htpdate.8.gz
diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c
index c8294b11c..ce7ad41c3 100644
--- a/package/htpdate/patches/patch-htpdate_c
+++ b/package/htpdate/patches/patch-htpdate_c
@@ -1,5 +1,5 @@
---- htpdate-1.0.4.orig/htpdate.c	2008-10-13 21:04:08.000000000 +0200
-+++ htpdate-1.0.4/htpdate.c	2010-02-05 22:48:28.624323989 +0100
+--- htpdate-1.1.1.orig/htpdate.c	2014-10-28 21:29:36.000000000 +0100
++++ htpdate-1.1.1/htpdate.c	2015-02-03 06:07:38.000000000 +0100
 @@ -353,6 +353,7 @@ static int setclock( double timedelta, i
  }
  
@@ -17,7 +17,7 @@
  
  static void showhelp() {
  	puts("htpdate version "VERSION"\n\
-@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
+@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid
    -s    set time\n\
    -t    turn off sanity time check\n\
    -u    run daemon as user\n\