X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=admin%2Fsyslog-ng%2FMakefile;h=abd24e7614f4eaa8320c9eadd0dba8669592347e;hp=723c3de5878f39cd2a784d5f827d754f5da864f1;hb=cb379681c41e7c730e43d1c563e019f935957317;hpb=1f75d5501cb34f16404df265874bb341e0daba2e

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 723c3de587..abd24e7614 100644
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -9,17 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
-PKG_VERSION:=1.6.9
+PKG_VERSION:=1.6.12
 PKG_RELEASE:=1
-PKG_MD5SUM:=5280a86b4f5c25b2ba157c8cea302cf0
+PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3
 
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/syslog-ng/stable/src \
-		http://www.balabit.com/downloads/syslog-ng/1.6/src
+PKG_SOURCE_URL:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src \
+		http://www.balabit.com/downloads/files/syslog-ng/stable/src
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,12 +24,15 @@ define Package/syslog-ng
   CATEGORY:=Administration
   DEPENDS:=+libol
   TITLE:=A powerful syslog daemon
-  DESCRIPTION:=syslog-ng reads and logs messages to the  system  console,  log\\\
-	files, other machines and/or users as specified by its\\\
-	configuration file.\\\
   URL:=http://www.balabit.com/products/syslog_ng/
 endef
 
+define Package/syslog-ng/description
+	syslog-ng reads and logs messages to the system console, log
+	files, other machines and/or users as specified by its
+	configuration file.
+endef
+
 define Package/syslog-ng/conffiles
 /etc/syslog-ng/syslog-ng.conf
 endef
@@ -47,17 +46,16 @@ $(call Build/Configure/Default,--disable-dependency-tracking \
 endef
 
 define Build/Compile	
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install)
+$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef
 
 define Package/syslog-ng/install	
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
-	install -d -m0755 $(1)/etc/syslog-ng
-	install -m0644 ./files/syslog-ng.conf $(1)/etc/syslog-ng/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
+	$(INSTALL_DIR) $(1)/etc/syslog-ng
+	$(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc/syslog-ng/
 endef
 
 $(eval $(call BuildPackage,syslog-ng))