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/davfs2 | |
| 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/davfs2')
| -rw-r--r-- | package/davfs2/Makefile | 24 | ||||
| -rw-r--r-- | package/davfs2/files/davfs2.conffiles (renamed from package/davfs2/ipkg/davfs2.conffiles) | 0 | ||||
| -rw-r--r-- | package/davfs2/files/davfs2.postinst (renamed from package/davfs2/ipkg/davfs2.postinst) | 0 | ||||
| -rw-r--r-- | package/davfs2/ipkg/davfs2.control | 4 |
4 files changed, 13 insertions, 15 deletions
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 4e90b1a05..d84ae0f1b 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -9,11 +9,22 @@ PKG_NAME= davfs2 PKG_VERSION= 1.3.3 PKG_RELEASE= 1 PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} +PKG_DESCR:= WebDAV filesystem +PKG_SECTION:= admin +PKG_URL:= http://savannah.nongnu.org/projects/davfs2 +PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) +PKG_DEPENDS:= fuse-utils, kmod-fuse, libfuse, libiconv, neon +else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) +PKG_DEPENDS:= kmod-fs-coda, libiconv, neon +else +PKG_DEPENDS:= kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon +endif + +$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-neon @@ -21,14 +32,6 @@ CONFIGURE_ENV+= LIBS=-liconv BUILD_STYLE= auto INSTALL_STYLE= auto -ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) -DEPS= fuse-utils, kmod-fuse, libfuse, libiconv, neon -else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) -DEPS= kmod-fs-coda, libiconv, neon -else -DEPS= kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon -endif - post-install: ${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2 ${INSTALL_DIR} ${IDIR_DAVFS2}/usr/sbin @@ -38,6 +41,5 @@ post-install: ${IDIR_DAVFS2}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/umount.davfs \ ${IDIR_DAVFS2}/usr/sbin - echo 'Depends: ${DEPS}' >>${IDIR_DAVFS2}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/davfs2/ipkg/davfs2.conffiles b/package/davfs2/files/davfs2.conffiles index c831d9d59..c831d9d59 100644 --- a/package/davfs2/ipkg/davfs2.conffiles +++ b/package/davfs2/files/davfs2.conffiles diff --git a/package/davfs2/ipkg/davfs2.postinst b/package/davfs2/files/davfs2.postinst index 1d333c4a6..1d333c4a6 100644 --- a/package/davfs2/ipkg/davfs2.postinst +++ b/package/davfs2/files/davfs2.postinst diff --git a/package/davfs2/ipkg/davfs2.control b/package/davfs2/ipkg/davfs2.control deleted file mode 100644 index 87d85e9df..000000000 --- a/package/davfs2/ipkg/davfs2.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: davfs2 -Priority: optional -Section: admin -Description: WebDAV filesystem |