Bump radvd to 1.2, cleanup makefile (#4230)

[openwrt/svn-archive/archive.git] / ipv6 / radvd / Makefile

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index 1ec7d711add9fd3d5bce69c493b47b7bc17e91f2..e51b963d58eba5e46da3c3baf1e0963098cf0d39 100644 (file)
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -9,17 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radvd
-PKG_VERSION:=1.0
+PKG_VERSION:=1.2
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \
                http://download.sourcemage.org/mirror
-PKG_MD5SUM:=8bce4a21757cf069f5a69e2f9bee9e5b
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=614876420d76cd2bb5bcb49760c8b9e3
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,47 +24,22 @@ define Package/radvd
   SECTION:=ipv6
   CATEGORY:=IPv6
   TITLE:=IPv6 Routing Advertisement Daemon
-  DESCRIPTION:=IPv6 Routing Advertisement Daemon.
   URL:=http://v6web.litech.org/radvd/
 endef
 
-define Package/radvd/conffiles
-/etc/radvd.conf
+define Package/radvd/description
+IPv6 Routing Advertisement Daemon.
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               ./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) \
-                       --with-configfile=/etc/radvd.conf \
-                       --with-logfile=/var/log/radvd.log \
-                       --with-pidfile=/var/run/radvd.pid \
-       );
+       $(call Build/Configure/Default,\
+               --with-configfile=/etc/radvd.conf \
+               --with-logfile=/var/log/radvd.log \
+               --with-pidfile=/var/run/radvd.pid \
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                radvd_LDADD=""
        $(MAKE) -C $(PKG_BUILD_DIR) \
@@ -75,9 +47,13 @@ define Build/Compile
                install
 endef
 
+define Package/radvd/conffiles
+/etc/config/radvd
+endef
+
 define Package/radvd/install
-       $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_DATA) ./files/radvd.conf $(1)/etc/radvd.conf
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/radvd.config $(1)/etc/config/radvd
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd
        $(INSTALL_DIR) $(1)/usr/sbin