ports/103213: devel/subversion (v1.4.0): files/build-outputs.mk.patch patch failed for WITH_SVNSERVE_WRAPPER=yes

Jeff Hung jeffhung at mail2000.com.tw
Wed Sep 13 07:50:23 UTC 2006


>Number:         103213
>Category:       ports
>Synopsis:       devel/subversion (v1.4.0): files/build-outputs.mk.patch patch failed for WITH_SVNSERVE_WRAPPER=yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 13 07:50:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jeff Hung
>Release:        FreeBSD 5.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD new.lady.idv.tw 5.5-STABLE FreeBSD 5.5-STABLE #2: Sat Sep 9 15:19:36 CST 2006 root at new.lady.idv.tw:/usr/obj/usr/src/sys/GENERIC i386


>Description:

There is a new executable, svnsync, introduced in subversion 1.4.0, which is
also listed in build-outputs.mk file, too.

In files/build-outputs.mk.patch ports will patch svnserve to svnserve.bin for
the WITH_SVNSERVE_WRAPPER option.  But in subversion 1.4.0, the svnsync line
is inserted just after the svnserve line, which make the context of the patch
file failed to patch.

>How-To-Repeat:

SHELL> cd /usr/ports/devel/subversion; make WITH_SVNSERVE_WRAPPER=yes
...
===>  Vulnerability check disabled, database not found
===>  Extracting for subversion-1.4.0
=> MD5 Checksum OK for subversion/subversion-1.4.0.tar.bz2.
=> SHA256 Checksum OK for subversion/subversion-1.4.0.tar.bz2.
===>  Patching for subversion-1.4.0
===>  Applying extra patch /usr/ports/devel/subversion/files/build-outputs.mk.patch
1 out of 1 hunks failed--saving rejects to build-outputs.mk.rej
*** Error code 1

Stop in /usr/ports/devel/subversion.

>Fix:

SHELL> diff -10 -u build-outputs.mk.patch build-outputs.mk.patch.fixed
--- build-outputs.mk.patch      Wed Sep 13 15:41:53 2006
+++ build-outputs.mk.patch.fixed        Wed Sep 13 11:03:23 2006
@@ -1,11 +1,11 @@
 --- build-outputs.mk.orig      2004-10-22 22:13:15.000000000 +0400
 +++ build-outputs.mk   2004-11-05 11:15:30.265625000 +0300
 @@ -500,7 +500,7 @@
        cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT)
        cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT)
        cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(EXEEXT)
 -      cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve$(EXEEXT)
 +      cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve.bin$(EXEEXT)
+       cd subversion/svnsync ; $(INSTALL_BIN) svnsync$(EXEEXT) $(DESTDIR)$(bindir)/svnsync$(EXEEXT)
        cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)

- install-contrib: contrib/client-side/svn-push/svn-push$(EXEEXT) install-lib install-fsmod-lib



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list