summaryrefslogtreecommitdiff
path: root/package/subversion
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
commit6daa792eab1488d013fefc5eb7e4d01f40f38687 (patch)
tree6391cc46bb9fc8b859d99175ea317e5fa7b37959 /package/subversion
parentadcaca72539b2ff4a5f4deee00d5f0251378ac9b (diff)
change defaults for CONFIG/BUILD/INSTALL styles
All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used.
Diffstat (limited to 'package/subversion')
-rw-r--r--package/subversion/Makefile18
1 files changed, 5 insertions, 13 deletions
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 9203f9510..10e6b6d3e 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -6,25 +6,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= subversion
PKG_VERSION:= 1.6.6
PKG_RELEASE:= 1
-PKG_BUILDDEP+= apr-util expat apr zlib libiconv
-ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
-PKG_BUILDDEP+= neon
-endif
PKG_MD5SUM:= 0ab0f26f6eb056add1b9d3059a3f4247
PKG_DESCR:= revision control program
PKG_SECTION:= net
PKG_DEPENDS:= zlib apr apr-util libiconv libexpat
+PKG_BUILDDEP+= apr-util expat apr zlib libiconv
+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}))
-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
@@ -36,7 +32,6 @@ CONFIGURE_ARGS+= --without-jikes
CONFIGURE_ARGS+= --without-jdk
CONFIGURE_ARGS+= --disable-javahl
CONFIGURE_ARGS+= --without-berkeley-db
-
LIBS= -lsqlite3 -laprutil-0 -lapr-0 -lexpat -liconv
ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
@@ -51,9 +46,6 @@ LIBS+= -pthread
endif
CONFIGURE_ENV+= LIBS='${LIBS}'
-
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
INSTALL_TARGET:= external-install local-install
post-install: