diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/syslog-ng | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/syslog-ng')
| -rw-r--r-- | package/syslog-ng/Makefile | 14 | ||||
| -rw-r--r-- | package/syslog-ng/files/syslog-ng.conffiles (renamed from package/syslog-ng/ipkg/syslog-ng.conffiles) | 0 | ||||
| -rw-r--r-- | package/syslog-ng/files/syslog-ng.init | 4 | ||||
| -rw-r--r-- | package/syslog-ng/files/syslog-ng.postinst (renamed from package/syslog-ng/ipkg/syslog-ng.postinst) | 0 | ||||
| -rw-r--r-- | package/syslog-ng/ipkg/syslog-ng.control | 5 |
5 files changed, 10 insertions, 13 deletions
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index f7dee9f29..92f52814d 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= syslog-ng PKG_VERSION:= 1.6.12 PKG_RELEASE:= 1 PKG_MD5SUM:= a3cbfdb6e1e5beea181a7349749719f3 -MASTER_SITES:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/ +PKG_DESCR:= A powerful syslog daemon +PKG_SECTION:= admin +PKG_DEPENDS:= libol libwrap +PKG_URL:= http://www.balabit.com +PKG_SITES:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SYSLOG_NG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-full-dynamic \ @@ -23,12 +27,8 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin + ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin ${IDIR_SYSLOG_NG}/etc/syslog-ng ${INSTALL_BIN} ${WRKINST}/usr/sbin/syslog-ng ${IDIR_SYSLOG_NG}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/etc/init.d - ${INSTALL_BIN} ./files/syslog-ng.init \ - ${IDIR_SYSLOG_NG}/etc/init.d/${PKG_NAME} - ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/etc/syslog-ng ${INSTALL_DATA} ./files/syslog-ng.conf ${IDIR_SYSLOG_NG}/etc/syslog-ng/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/syslog-ng/ipkg/syslog-ng.conffiles b/package/syslog-ng/files/syslog-ng.conffiles index 453ebbe66..453ebbe66 100644 --- a/package/syslog-ng/ipkg/syslog-ng.conffiles +++ b/package/syslog-ng/files/syslog-ng.conffiles diff --git a/package/syslog-ng/files/syslog-ng.init b/package/syslog-ng/files/syslog-ng.init index bdfa0c96e..a613e8e9b 100644 --- a/package/syslog-ng/files/syslog-ng.init +++ b/package/syslog-ng/files/syslog-ng.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 05 +#PKG syslog-ng +#INIT 05 + . /etc/rc.conf case $1 in diff --git a/package/syslog-ng/ipkg/syslog-ng.postinst b/package/syslog-ng/files/syslog-ng.postinst index 254f67872..254f67872 100644 --- a/package/syslog-ng/ipkg/syslog-ng.postinst +++ b/package/syslog-ng/files/syslog-ng.postinst diff --git a/package/syslog-ng/ipkg/syslog-ng.control b/package/syslog-ng/ipkg/syslog-ng.control deleted file mode 100644 index 93f193d6c..000000000 --- a/package/syslog-ng/ipkg/syslog-ng.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: syslog-ng -Priority: optional -Section: admin -Depends: libol libwrap -Description: A powerful syslog daemon |