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/subversion/Makefile | |
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/subversion/Makefile')
-rw-r--r-- | package/subversion/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 85807565f..88bd980cb 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -9,12 +9,18 @@ PKG_NAME:= subversion PKG_VERSION:= 1.6.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 93f128306b11e1a1c64ff51338777952 -PKG_DEPENDS:= zlib, apr, apr-util, libiconv, libexpat -MASTER_SITES:= http://subversion.tigris.org/downloads/ +PKG_DESCR:= revision control program +PKG_SECTION:= net +PKG_DEPENDS:= zlib apr apr-util libiconv libexpat +PKG_SITES:= http://subversion.tigris.org/downloads/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y) +PKG_DEPENDS+= neon +endif + +$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr/bin/apr-config @@ -34,7 +40,6 @@ LIBS= -laprutil-0 -lapr-0 -lexpat -liconv ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y) CONFIGURE_ARGS+= -disable-neon-version-check LIBS+= -lneon -PKG_DEPENDS:= ${PKG_DEPENDS}, neon else CONFIGURE_ARGS+= --without-neon endif @@ -50,12 +55,8 @@ INSTALL_STYLE:= auto INSTALL_TARGET:= external-install local-install post-install: - ${INSTALL_DIR} ${IDIR_SUBVERSION}/etc/init.d - ${INSTALL_SCRIPT} files/svnserve.init \ - ${IDIR_SUBVERSION}/etc/init.d/svnserve ${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib} ${CP} ${WRKINST}/usr/bin/* ${IDIR_SUBVERSION}/usr/bin ${CP} ${WRKINST}/usr/lib/* ${IDIR_SUBVERSION}/usr/lib - echo 'Depends: ${PKG_DEPENDS}' >> ${IDIR_SUBVERSION}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk |