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/rdate | |
| 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/rdate')
| -rw-r--r-- | package/rdate/Makefile | 15 | ||||
| -rw-r--r-- | package/rdate/files/rdate.postinst (renamed from package/rdate/ipkg/rdate.postinst) | 0 | ||||
| -rw-r--r-- | package/rdate/ipkg/rdate.control | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 8d16e942a..39d74f6bf 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -9,24 +9,21 @@ PKG_NAME= rdate PKG_VERSION= 20070817 PKG_RELEASE= 2 PKG_MD5SUM= 9a6489d7de4311678a3fab001bb503df -MASTER_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/} +PKG_DESCR:= A small rdate and NTP client +PKG_SECTION:= net +PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/} + WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_FILE= GNUmakefile BUILD_STYLE= auto do-install: -ifeq (${ADK_MANPAGES},y) - mkdir -p ${WRKINST}/man8 - cp ${WRKSRC}/rdate.8 ${WRKINST}/man8/ -endif - ${INSTALL_DIR} ${IDIR_RDATE}/{etc/{init.d,ppp/ip-up.d},usr/sbin} + ${INSTALL_DIR} ${IDIR_RDATE}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/rdate ${IDIR_RDATE}/usr/sbin/ - ${INSTALL_SCRIPT} rdate.ip-up ${IDIR_RDATE}/etc/ppp/ip-up.d/rdate - ${INSTALL_SCRIPT} rdate.init ${IDIR_RDATE}/etc/init.d/rdate include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rdate/ipkg/rdate.postinst b/package/rdate/files/rdate.postinst index e0013bdcc..e0013bdcc 100644 --- a/package/rdate/ipkg/rdate.postinst +++ b/package/rdate/files/rdate.postinst diff --git a/package/rdate/ipkg/rdate.control b/package/rdate/ipkg/rdate.control deleted file mode 100644 index dcd902764..000000000 --- a/package/rdate/ipkg/rdate.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: rdate -Priority: base -Section: base -Description: A small rdate and NTP client |