X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fmaradns%2FMakefile;h=2da883fad45d0c62afa9dfaa1cca1165be2c46fc;hb=6d986c906a777fc718161ffde6b68e70b5f17308;hp=79ea02c8be1fd473014dbb85d169cf3d995c2865;hpb=1f75d5501cb34f16404df265874bb341e0daba2e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 79ea02c8be..2da883fad4 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,23 +1,19 @@
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=maradns
-PKG_VERSION:=1.2.07.2
+PKG_VERSION:=1.3.07.09
 PKG_RELEASE:=1
-PKG_MD5SUM:=dc67f6a496e668127871382a40367733
 
-PKG_SOURCE_URL:=http://www.maradns.org/download/1.2/1.2.07.2/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=http://www.maradns.org/download/1.3/$(PKG_VERSION)/
+PKG_MD5SUM:=1d221438fb4d9317263555262b9c652c
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,8 +22,13 @@ define Package/maradns
   CATEGORY:=Network
   DEPENDS:=+libpthread
   TITLE:=Small and secure DNS Server
-  DESCRIPTION:=A small and secure DNS server
   URL:=http://www.maradns.org/
+  SUBMENU:=DNS
+endef
+
+define Package/maradns/description
+	maradns is a DNS server written with security, simplicity, and
+	performance in mind.
 endef
 
 define Package/maradns/conffiles
@@ -35,7 +36,8 @@ define Package/maradns/conffiles
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+	# it's not GNU autoconf stuff
+	(cd $(PKG_BUILD_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
 		./configure \
 	);
@@ -58,14 +60,14 @@ define Build/Compile
 endef
 
 define Package/maradns/install	
-	install -d -m0755 $(1)/etc
-	install -m0644 ./files/mararc $(1)/etc/mararc
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/maradns.init $(1)/etc/init.d/maradns
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/mararc $(1)/etc/mararc
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/maradns.init $(1)/etc/init.d/maradns
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,maradns))