Date: Fri, 31 May 2013 22:30:57 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319546 - in head/devel: subversion subversion16 Message-ID: <201305312230.r4VMUvES095308@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Fri May 31 22:30:57 2013 New Revision: 319546 URL: http://svnweb.freebsd.org/changeset/ports/319546 Log: - fix distinfo for svn docs (lost in last commit) - adjust CONFLICTS add upcomming 1.8 Approved by: lev (implicit) Modified: head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion/distinfo head/devel/subversion16/Makefile head/devel/subversion16/Makefile.common head/devel/subversion16/distinfo Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Fri May 31 22:16:52 2013 (r319545) +++ head/devel/subversion/Makefile Fri May 31 22:30:57 2013 (r319546) @@ -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 Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Fri May 31 22:16:52 2013 (r319545) +++ head/devel/subversion/Makefile.common Fri May 31 22:30:57 2013 (r319546) @@ -19,7 +19,7 @@ USE_KDE4= # Used below if KWallet suppor 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 Modified: head/devel/subversion/distinfo ============================================================================== --- head/devel/subversion/distinfo Fri May 31 22:16:52 2013 (r319545) +++ head/devel/subversion/distinfo Fri May 31 22:30:57 2013 (r319546) @@ -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 Modified: head/devel/subversion16/Makefile ============================================================================== --- head/devel/subversion16/Makefile Fri May 31 22:16:52 2013 (r319545) +++ head/devel/subversion16/Makefile Fri May 31 22:30:57 2013 (r319546) @@ -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.[7|8].[0-9]* USE_RC_SUBR= svnserve Modified: head/devel/subversion16/Makefile.common ============================================================================== --- head/devel/subversion16/Makefile.common Fri May 31 22:16:52 2013 (r319545) +++ head/devel/subversion16/Makefile.common Fri May 31 22:30:57 2013 (r319546) @@ -18,7 +18,7 @@ USE_KDE4= # Used below if KWallet suppor LICENSE= AL2 -CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.7.[0-9]* +CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[7|8].[0-9]* LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX} LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ @@ -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.7.[0-9]* +CONFLICTS_BUILD+= ${PORTNAME}-1.[7|8].[0-9]* LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion16 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}16/options OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included Modified: head/devel/subversion16/distinfo ============================================================================== --- head/devel/subversion16/distinfo Fri May 31 22:16:52 2013 (r319545) +++ head/devel/subversion16/distinfo Fri May 31 22:30:57 2013 (r319546) @@ -1,2 +1,6 @@ SHA256 (subversion/subversion-1.6.23.tar.bz2) = 214abc6b9359ea3a5fda2dee87dad110d1b33dcf888c1f8e361d69fbfa053943 SIZE (subversion/subversion-1.6.23.tar.bz2) = 5566442 +SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb +SIZE (subversion/svn-book-html.tar.bz2) = 406484 +SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225 +SIZE (subversion/svn-book.pdf) = 1671317
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305312230.r4VMUvES095308>