diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/subversion/Makefile | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/subversion/Makefile')
| -rw-r--r-- | package/subversion/Makefile | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/package/subversion/Makefile b/package/subversion/Makefile index d83753ea0..3af2bc6da 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -4,23 +4,23 @@ include ${TOPDIR}/rules.mk PKG_NAME:= subversion -PKG_VERSION:= 1.6.4 +PKG_VERSION:= 1.6.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9649be6c47b7d915dce75a1198900c25 +PKG_MD5SUM:= facaa0ee78c8f24b9af12c74662bbd24 PKG_DESCR:= revision control program -PKG_SECTION:= net -PKG_DEPENDS:= zlib apr apr-util libiconv libexpat +PKG_SECTION:= scm +PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite +PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite +ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),) +PKG_DEPENDS+= neon +PKG_BUILDDEP+= neon +endif PKG_SITES:= http://subversion.tigris.org/downloads/ include ${TOPDIR}/mk/package.mk -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})) +$(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 CONFIGURE_ARGS+= --with-apr-util=${STAGING_DIR}/usr/bin/apr-config CONFIGURE_ARGS+= --disable-mod-activation @@ -32,8 +32,7 @@ CONFIGURE_ARGS+= --without-jikes CONFIGURE_ARGS+= --without-jdk CONFIGURE_ARGS+= --disable-javahl CONFIGURE_ARGS+= --without-berkeley-db - -LIBS= -laprutil-0 -lapr-0 -lexpat -liconv -lsqlite3 +LIBS= -lsqlite3 -laprutil-0 -lapr-0 -lexpat -liconv ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y) CONFIGURE_ARGS+= -disable-neon-version-check @@ -47,14 +46,11 @@ LIBS+= -pthread endif CONFIGURE_ENV+= LIBS='${LIBS}' - -BUILD_STYLE:= auto -INSTALL_STYLE:= auto INSTALL_TARGET:= external-install local-install post-install: ${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib} - ${CP} ${WRKINST}/usr/bin/* ${IDIR_SUBVERSION}/usr/bin - ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_SUBVERSION}/usr/lib + ${INSTALL_BIN} ${WRKINST}/usr/bin/svn ${IDIR_SUBVERSION}/usr/bin + ${CP} ${WRKINST}/usr/lib/libsvn*.so* ${IDIR_SUBVERSION}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |