upgrade maradns to the latest version (#511)

[openwrt/svn-archive/archive.git] / openwrt / package / maradns / Makefile

diff --git a/openwrt/package/maradns/Makefile b/openwrt/package/maradns/Makefile
index 8ef1d84cbc2d3e480a273220b822c98fad219027..3af8350653285ae9cea89534ef6238a5eb46eccd 100644 (file)
--- a/openwrt/package/maradns/Makefile
+++ b/openwrt/package/maradns/Makefile
@@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=maradns
-PKG_VERSION:=1.0.26
+PKG_VERSION:=1.2.07.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=b3180ad1f250a4e3820613e711ae159b
+PKG_MD5SUM:=dc67f6a496e668127871382a40367733
 
-PKG_SOURCE_URL:=http://www.maradns.org/download
+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
 
@@ -18,33 +18,12 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,MARADNS,maradns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --datadir=/usr/share \
-               --includedir=/usr/include \
-               --infodir=/usr/share/info \
-               --libdir=/usr/lib \
-               --libexecdir=/usr/lib \
-               --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --sbindir=/usr/sbin \
-               --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-                 --enable-shared \
-                 --disable-static \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
@@ -56,8 +35,9 @@ $(PKG_BUILD_DIR)/.built:
        mkdir -p $(PKG_INSTALL_DIR)/usr/man/man{1,5,8}
        $(MAKE) -C $(PKG_BUILD_DIR) \
                PREFIX="$(PKG_INSTALL_DIR)/usr" \
+               RPM_BUILD_ROOT="$(PKG_INSTALL_DIR)" \
                install
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@
 
 $(IPKG_MARADNS):
        install -d -m0755 $(IDIR_MARADNS)/etc
@@ -65,8 +45,8 @@ $(IPKG_MARADNS):
        install -d -m0755 $(IDIR_MARADNS)/etc/init.d
        install -m0755 ./files/maradns.init $(IDIR_MARADNS)/etc/init.d/S60maradns
        install -d -m0755 $(IDIR_MARADNS)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(IDIR_MARADNS)/usr/bin/
        install -d -m0755 $(IDIR_MARADNS)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/
        $(RSTRIP) $(IDIR_MARADNS)
        $(IPKG_BUILD) $(IDIR_MARADNS) $(PACKAGE_DIR)