UCIfied Polipo (patch by "SnapShot_")

[openwrt/svn-archive/archive.git] / net / ntpd / Makefile

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 3f693ff76577200acd6f119292630c7edec5ee03..1c1b01b0ccb6c95f742fbf2ece7062cd4c20e3ab 100644 (file)
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
 PKG_VERSION:=4.2.4p4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
@@ -37,7 +37,6 @@ endef
 
 define Package/ntpd
   $(call Package/ntpd/Default)
-  DEPENDS:=+ntpdate
   TITLE+= server
 endef
 
@@ -71,10 +70,24 @@ define Package/ntpd/conffiles
 /etc/ntp.conf
 endef
 
-define Package/ntpd/postinst
+define Package/ntpd/Default/postinst
 #!/bin/sh
-echo "ntp             123/udp     # Network Time Protocol
-ntp             123/tcp     # Network Time Protocol" >> $${IPKG_INSTROOT}/etc/services
+grep -q '^ntp[[:space:]]*123/udp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
+[ $$? -ne 0 ] && echo "ntp            123/udp     # Network Time Protocol" >>$${IPKG_INSTROOT}/etc/services || exit 0
+grep -q '^ntp[[:space:]]*123/tcp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
+[ $$? -ne 0 ] && echo "ntp            123/tcp     # Network Time Protocol" >>$${IPKG_INSTROOT}/etc/services || exit 0
+endef
+
+define Package/ntpdate/postinst
+  $(call Package/ntpd/Default/postinst)
+endef
+
+define Package/ntpd/postinst
+  $(call Package/ntpd/Default/postinst)
+endef
+
+define Package/ntp-utils/postinst
+  $(call Package/ntpd/Default/postinst)
 endef
 
 TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libelf
@@ -109,6 +122,8 @@ endef
 define Package/ntpdate/install
        $(INSTALL_DIR) $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpdate/ntpdate $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/ntpdate.init $(1)/etc/init.d/ntpdate
 endef
 
 define Package/ntp-utils/install