[backfire/packages] batman-adv: revert r28473, r28477 - version mismatch

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

diff --git a/net/leafnode/Makefile b/net/leafnode/Makefile
index 24c9456b2dbc268653b10806f71dd09583a4afc2..aaae163a43a99eebdd96edc78ec4de86ad9ad609 100644 (file)
--- a/net/leafnode/Makefile
+++ b/net/leafnode/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2009 OpenWrt.org
+#
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,30 +8,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=leafnode
-PKG_VERSION:=1.11.6
+PKG_VERSION:=1.11.8
 PKG_RELEASE:=1
-PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.dt.e-technik.uni-dortmund.de/~ma/leafnode/
-PKG_MD5SUM:=5a083968dbacc3d6f6d1013241c23e39
+PKG_SOURCE_URL:=@SF/leafnode
+PKG_MD5SUM:=a3edafeb854efaa3fbb0f7951d02160f
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_ARGS+=--sysconfdir=/etc/leafnode
 CONFIGURE_VARS+=LIBS=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
 
 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
-define Package/leafnode
+define Package/leafnode/Default
   SUBMENU:=NNTP
   SECTION:=net
   CATEGORY:=Network
+  URL:=http://leafnode.sourceforge.net
+endef
+
+define Package/leafnode
+  $(call Package/leafnode/Default)
   DEPENDS:=+libpcre +xinetd
   TITLE:=Leafnode store-and-forward NNTP proxy
-  URL:=http://leafnode.sourceforge.net
 endef
 
 define Package/leafnode/description
@@ -41,12 +46,9 @@ define Package/leafnode/description
 endef
 
 define Package/leafnode-extra
-  SUBMENU:=NNTP
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/leafnode/Default)
   DEPENDS:=leafnode
-  TITLE:=Leafnode extra programs 
-  URL:=http://leafnode.sourceforge.net
+  TITLE:=Leafnode extra programs
 endef
 
 define Package/leafnode-extra/description
@@ -63,30 +65,29 @@ endef
 
 define Package/leafnode/postinst
 #!/bin/sh
-grep -q '^nntp[[:space:]]*119/tcp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
-[ $$? -ne 0 ] && echo "nntp 119/tcp  # USENET News Transfer Protocol" >>$${IPKG_INSTROOT}/etc/services || exit 0
-grep -q '^news:' $${IPKG_INSTROOT}/etc/services 2>/dev/null
-[ $$? -ne 0 ] && echo "news:*:31:31:news:/var/spool/news:/bin/true"  >>$${IPKG_INSTROOT}/etc/passwd || echo "news:x:31:" >>$${IPKG_INSTROOT}/etc/group || exit 0
+grep -q '^news:' $${IPKG_INSTROOT}/etc/passwd 2>/dev/null
+[ $$? -ne 0 ] && echo "news:*:31:31:news:/var/spool/news:/bin/true" >>$${IPKG_INSTROOT}/etc/passwd && echo "news:x:31:" >>$${IPKG_INSTROOT}/etc/group || exit 0
 endef
 
 define Package/leafnode/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/leafnode $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/fetchnews $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/texpire $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/leafnode $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fetchnews $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/texpire $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/leafnode
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/config.example $(1)/etc/leafnode
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/leafnode/config.example $(1)/etc/leafnode/
        $(INSTALL_DIR) $(1)/etc/xinetd.d
-       $(INSTALL_DATA) ./files/nntp $(1)/etc/xinetd.d
+       $(INSTALL_DATA) ./files/nntp $(1)/etc/xinetd.d/
        $(INSTALL_DIR) $(1)/etc/crontabs
-       $(INSTALL_DATA) ./files/news $(1)/etc/crontabs
+       $(INSTALL_DATA) ./files/news $(1)/etc/crontabs/
 endef
 
 define Package/leafnode-extra/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/checkgroups $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applyfilter $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/leafnode-version $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/checkgroups $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/applyfilter $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/leafnode-version $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,leafnode))