From 636fd85cd8297728eda8461c4719c18df6ef5f6f Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 21 Mar 2021 22:59:17 +0100
Subject: [PATCH] - move more autotools-packages to package dir

---
 make/target-tools.mk | 32 --------------------------------
 package/ntp/ntp.mk   | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 package/ntp/ntp.mk

diff --git a/make/target-tools.mk b/make/target-tools.mk
index 8da58ac4..43b30e17 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -442,38 +442,6 @@ hd-idle: $(DL_DIR)/$(HD_IDLE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-NTP_VERSION = 4.2.8p15
-NTP_DIR = ntp-$(NTP_VERSION)
-NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
-NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP_VERSION))
-
-$(DL_DIR)/$(NTP_SOURCE):
-	$(download) $(NTP_SITE)/$(NTP_SOURCE)
-
-NTP_DEPENDENCIES = openssl
-
-NTP_CONF_OPTS = \
-	--docdir=$(REMOVE_docdir) \
-	--disable-debugging \
-	--with-shared \
-	--with-crypto \
-	--with-yielding-select=yes \
-	--without-ntpsnmpd
-
-ntp: $(NTP_DEPENDENCIES) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(CHDIR)/$(PKG_DIR); \
-		$(APPLY_PATCHES); \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)/ntp
-	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/ntpdate.init $(TARGET_sysconfdir)/init.d/ntpdate
-	#$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 DJMOUNT_VERSION = 0.71
 DJMOUNT_DIR = djmount-$(DJMOUNT_VERSION)
 DJMOUNT_SOURCE = djmount-$(DJMOUNT_VERSION).tar.gz
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
new file mode 100644
index 00000000..3811fbcb
--- /dev/null
+++ b/package/ntp/ntp.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# ntp
+#
+################################################################################
+
+NTP_VERSION = 4.2.8p15
+NTP_DIR = ntp-$(NTP_VERSION)
+NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
+NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP_VERSION))
+
+NTP_DEPENDENCIES = openssl
+
+NTP_CONF_OPTS = \
+	--bindir=$(REMOVE_bindir) \
+	--datadir=$(REMOVE_datadir) \
+	--libexecdir=$(REMOVE_libexecdir) \
+	--docdir=$(REMOVE_docdir) \
+	--disable-debugging \
+	--with-shared \
+	--with-crypto \
+	--with-yielding-select=yes \
+	--without-ntpsnmpd
+
+define NTP_TARGET_CLEANUP
+	$(TARGET_RM) $(addprefix $(TARGET_sbindir)/,calc_tickadj ntp-keygen ntp-wait ntpd ntptime tickadj update-leap)
+endef
+NTP_TARGET_FINALIZE_HOOKS += NTP_TARGET_CLEANUP
+
+define NTP_INSTALL_NTPDATE_INIT
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/ntpdate.init $(TARGET_sysconfdir)/init.d/ntpdate
+endef
+NTP_TARGET_FINALIZE_HOOKS += NTP_INSTALL_NTPDATE_INIT
+
+ntp: | $(TARGET_DIR)
+	$(call autotools-package)