diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2013-05-31 22:30:57 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-05-31 22:30:57 +0000 |
| commit | 48583f31762f34db270aa037c0fdbc4a11678bc7 (patch) | |
| tree | a642abc9cbe987717ef164ac11cbadf508d304b5 /devel/subversion | |
| parent | 976ab3f6232d7cd4518983cbb4bc412cfc4bd668 (diff) | |
| download | ports-48583f31762f34db270aa037c0fdbc4a11678bc7.tar.gz ports-48583f31762f34db270aa037c0fdbc4a11678bc7.zip | |
Notes
Diffstat (limited to 'devel/subversion')
| -rw-r--r-- | devel/subversion/Makefile | 2 | ||||
| -rw-r--r-- | devel/subversion/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/subversion/distinfo | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 2df935d3f3f0..5cdb9c525645 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -4,7 +4,7 @@ MAINTAINER= lev@FreeBSD.org COMMENT= Version control system -CONFLICTS_INSTALL= subversion-devel-[0-9]* subversion-freebsd-[0-9]* +CONFLICTS_INSTALL= subversion-1.[6|8].[0-9]* USE_RC_SUBR= svnserve diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index e39d59e297cb..fab2b55e23c5 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -19,7 +19,7 @@ USE_KDE4= # Used below if KWallet support is enabled LICENSE= AL2 -CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.6.[0-9]* +CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]* LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ expat:${PORTSDIR}/textproc/expat2 @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --with-ssl \ --with-expat=/usr/local/include:/usr/local/lib:expat .if defined(SVN_BUILD_BINDINGS) -CONFLICTS_BUILD+= ${PORTNAME}-1.6.[0-9]* +CONFLICTS_BUILD+= ${PORTNAME}-1.[6|8].[0-9]* LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index acfa9c49a6ce..4a4f7e6747a7 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,2 +1,6 @@ SHA256 (subversion17/subversion-1.7.10.tar.bz2) = c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7 SIZE (subversion17/subversion-1.7.10.tar.bz2) = 5952121 +SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14 +SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806 +SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2 +SIZE (subversion17/svn-book-r4304.pdf) = 1921443 |