Attached is a patch to fix the devel/svnmerge port. This patch follows the direction of devel/svn_load_dirs and depends on the older subversion16 port to provide its dist files. Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->scheidell I'll take it.
State Changed From-To: open->feedback
State Changed From-To: feedback->closed Committed. Thanks!
scheidell 2012-02-08 02:08:34 UTC FreeBSD ports repository Modified files: devel/svnmerge Makefile Log: - Fix broken port PR: ports/164854 Submitted by: Tom Judge<tom@tomjudge.com> (maintainer) Approved by: gabor (mentor) Revision Changes Path 1.3 +2 -4 ports/devel/svnmerge/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Tom: I mentioned that I would be working with maintainer of ../subversion16 to try to eliminate the != ${MAKE} -V PORTVERSION call (as you know, !='s spawn extra shells, and slow down INDEX building, and us committers have been asked to eliminate these if possible) I am testing a patch to ../subversion16 that adds a ../Makefile.inc to it, and a patch to svnmerge that includes that Makefile also. maintainer of subversion16 has given me permission, and will keep Makefile.inc up to date. (any time the PORTVERSION of ../subversion16 changes, so will svnmerge) ill let you know when testing is complete. Index: subversion16/Makefile.common =================================================================== RCS file: /home/pcvs/ports/devel/subversion16/Makefile.common,v retrieving revision 1.52 diff -u -r1.52 Makefile.common --- subversion16/Makefile.common 9 Jan 2012 15:40:57 -0000 1.52 +++ subversion16/Makefile.common 14 Feb 2012 22:20:07 -0000 @@ -5,7 +5,7 @@ # $FreeBSD: ports/devel/subversion16/Makefile.common,v 1.52 2012/01/09 15:40:57 tabthorpe Exp $ PORTNAME= subversion -PORTVERSION= 1.6.17 +PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync. PORTREVISION?= 4 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ @@ -41,6 +41,7 @@ .endif .include <bsd.port.options.mk> +.include "Makefile.inc" # Default is "on" .if !defined(WITHOUT_NEON) Index: subversion16/Makefile.inc =================================================================== RCS file: subversion16/Makefile.inc diff -N subversion16/Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ subversion16/Makefile.inc 14 Feb 2012 22:20:07 -0000 @@ -0,0 +1,4 @@ +# $FreeBSD$ +# this keeps subversion16 and ../svnmerge in sync + +PORTVERSION= 1.6.17 cvs diff: Diffing subversion16/files cvs diff: Diffing svnmerge Index: svnmerge/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/svnmerge/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- svnmerge/Makefile 8 Feb 2012 13:53:23 -0000 1.4 +++ svnmerge/Makefile 14 Feb 2012 22:20:07 -0000 @@ -5,7 +5,7 @@ # $FreeBSD: ports/devel/svnmerge/Makefile,v 1.4 2012/02/08 13:53:23 scheidell Exp $ PORTNAME= svnmerge -PORTVERSION= ${SVN_PORTVERSION} +PORTVERSION= # See ../subversion16/Makefile.inc PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= # none @@ -30,7 +30,7 @@ .include <bsd.port.pre.mk> SVN_PORTDIR= ${PORTSDIR}/devel/subversion16 -SVN_PORTVERSION!= cd ${SVN_PORTDIR} && ${MAKE} -V PORTVERSION +.include "${SVN_PORTDIR}/Makefile.inc" do-extract: ${MKDIR} ${WRKDIR} -- Michael Scheidell, CTO o: 561-999-5000 d: 561-948-2259 >*| *SECNAP Network Security Corporation * Best Mobile Solutions Product of 2011 * Best Intrusion Prevention Product * Hot Company Finalist 2011 * Best Email Security Product * Certified SNORT Integrator
scheidell 2012-02-14 22:34:29 UTC FreeBSD ports repository Modified files: devel/svnmerge Makefile Log: - Remove != expansion by including Makefile.inc from ../subversion16 - This is in the ongoinf effort to eliminate != expansion so that INDEX builds are faster PR: ports/164854 Submitted by: scheidell (me) Approved by: Tom Judge <tom@tomjudge.com> (maintainer, implicit), gabor (mentor, implicit) Revision Changes Path 1.5 +3 -3 ports/devel/svnmerge/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Hi Michael, Sounds great, you may also want to look at devel/svn_load_dirs as that is what was used as the template for this port (as it is also in the contrib bundle). WRT future releases of subversion16, this may cause the same issue that required this port to be moved back to using subversion16 over devel/subversion. That is that due to the project take over by Apache the contrib dir is no longer included in the subversion tarballs, if this change propagates to the olver branch also we will need to find alternative versioning and hosting for both svnmerge and svn_load_dirs. Regards Tom On Tue, Feb 14, 2012 at 5:22 PM, Michael Scheidell <scheidell@freebsd.org>wrote: > ** > Tom: > > I mentioned that I would be working with maintainer of ../subversion16 to > try to eliminate the != ${MAKE} -V PORTVERSION call (as you know, !='s > spawn extra shells, and slow down INDEX building, and us committers have > been asked to eliminate these if possible) > > I am testing a patch to ../subversion16 that adds a ../Makefile.inc to it, > and a patch to svnmerge that includes that Makefile also. > maintainer of subversion16 has given me permission, and will keep > Makefile.inc up to date. > (any time the PORTVERSION of ../subversion16 changes, so will svnmerge) > > ill let you know when testing is complete. > Index: subversion16/Makefile.common > =================================================================== > RCS file: /home/pcvs/ports/devel/subversion16/Makefile.common,v > retrieving revision 1.52 > diff -u -r1.52 Makefile.common > --- subversion16/Makefile.common 9 Jan 2012 15:40:57 -0000 1.52 > +++ subversion16/Makefile.common 14 Feb 2012 22:20:07 -0000 > @@ -5,7 +5,7 @@ > # $FreeBSD: ports/devel/subversion16/Makefile.common,v 1.52 2012/01/09 > 15:40:57 tabthorpe Exp $ > > PORTNAME= subversion > -PORTVERSION= 1.6.17 > +PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge > can stay in sync. > PORTREVISION?= 4 > CATEGORIES+= devel > MASTER_SITES= http://subversion.tigris.org/downloads/:main \ > @@ -41,6 +41,7 @@ > .endif > > .include <bsd.port.options.mk> > +.include "Makefile.inc" > > # Default is "on" > .if !defined(WITHOUT_NEON) > Index: subversion16/Makefile.inc > =================================================================== > RCS file: subversion16/Makefile.inc > diff -N subversion16/Makefile.inc > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ subversion16/Makefile.inc 14 Feb 2012 22:20:07 -0000 > @@ -0,0 +1,4 @@ > +# $FreeBSD$ > +# this keeps subversion16 and ../svnmerge in sync > + > +PORTVERSION= 1.6.17 > cvs diff: Diffing subversion16/files > cvs diff: Diffing svnmerge > Index: svnmerge/Makefile > =================================================================== > RCS file: /home/pcvs/ports/devel/svnmerge/Makefile,v > retrieving revision 1.4 > diff -u -r1.4 Makefile > --- svnmerge/Makefile 8 Feb 2012 13:53:23 -0000 1.4 > +++ svnmerge/Makefile 14 Feb 2012 22:20:07 -0000 > @@ -5,7 +5,7 @@ > # $FreeBSD: ports/devel/svnmerge/Makefile,v 1.4 2012/02/08 13:53:23 > scheidell Exp $ > > PORTNAME= svnmerge > -PORTVERSION= ${SVN_PORTVERSION} > +PORTVERSION= # See ../subversion16/Makefile.inc > PORTEPOCH= 1 > CATEGORIES= devel > MASTER_SITES= # none > @@ -30,7 +30,7 @@ > .include <bsd.port.pre.mk> > > SVN_PORTDIR= ${PORTSDIR}/devel/subversion16 > -SVN_PORTVERSION!= cd ${SVN_PORTDIR} && ${MAKE} -V PORTVERSION > +.include "${SVN_PORTDIR}/Makefile.inc" > > do-extract: > ${MKDIR} ${WRKDIR} > > -- > Michael Scheidell, CTO > o: 561-999-5000 > d: 561-948-2259 > > *| *SECNAP Network Security Corporation > > - Best Mobile Solutions Product of 2011 > - Best Intrusion Prevention Product > - Hot Company Finalist 2011 > - Best Email Security Product > - Certified SNORT Integrator > >
scheidell 2012-02-14 22:50:59 UTC FreeBSD ports repository Modified files: devel/subversion16 Makefile.common Makefile.inc Log: - force commit to note corrected pr number PR: ports/164854 Approved by: gabor (mentor, implicit) Revision Changes Path 1.54 +1 -1 ports/devel/subversion16/Makefile.common 1.2 +1 -1 ports/devel/subversion16/Makefile.inc _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"