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/ntpclient | |
| 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/ntpclient')
| -rw-r--r-- | package/ntpclient/Makefile | 8 | ||||
| -rw-r--r-- | package/ntpclient/ipkg/ntpclient.control | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile index 4de911b0c..781ef44b0 100644 --- a/package/ntpclient/Makefile +++ b/package/ntpclient/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= ntpclient PKG_VERSION:= 2007_365 PKG_RELEASE:= 1 PKG_MD5SUM:= cb98711f11769cdd22fc592844cef414 -MASTER_SITES:= http://doolittle.icarus.com/ntpclient/ +PKG_DESCR:= NTP client for setting system time from NTP servers +PKG_SECTION:= net +PKG_URL:) http://doolittle.icarus.com/ntpclient +PKG_SITES:= http://doolittle.icarus.com/ntpclient/ + DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}-2007 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' diff --git a/package/ntpclient/ipkg/ntpclient.control b/package/ntpclient/ipkg/ntpclient.control deleted file mode 100644 index 4194e617b..000000000 --- a/package/ntpclient/ipkg/ntpclient.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ntpclient -Priority: optional -Section: net -Description: NTP client for setting system time from NTP servers. |