From kaoru@rave.kaoru.trans-nt.com  Wed Sep 13 05:55:25 2006
Return-Path: <kaoru@rave.kaoru.trans-nt.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2124D16A416
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Sep 2006 05:55:25 +0000 (UTC)
	(envelope-from kaoru@rave.kaoru.trans-nt.com)
Received: from mpb1.plala.or.jp (mpb1.plala.or.jp [58.93.253.30])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4524143D45
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Sep 2006 05:55:23 +0000 (GMT)
	(envelope-from kaoru@rave.kaoru.trans-nt.com)
Received: from rave.kaoru.trans-nt.com ([220.221.61.149])
          by mpb1.plala.or.jp with ESMTP
          id <20060913055522.BZNF1555.mpb1.plala.or.jp@rave.kaoru.trans-nt.com>;
          Wed, 13 Sep 2006 14:55:22 +0900
Received: by rave.kaoru.trans-nt.com (Postfix, from userid 10666)
	id 7E55255D37; Wed, 13 Sep 2006 14:55:22 +0900 (JST)
Message-Id: <20060913055522.7E55255D37@rave.kaoru.trans-nt.com>
Date: Wed, 13 Sep 2006 14:55:22 +0900 (JST)
From: TAKAHASHI Kaoru <kaoru@kaisei.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kaoru@kaisei.org
Subject: devel/subversion: make -DWITH_SVNSERVE_WRAPPER patch failed
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         103210
>Category:       ports
>Synopsis:       devel/subversion: make -DWITH_SVNSERVE_WRAPPER patch failed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lev
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 13 06:00:34 GMT 2006
>Closed-Date:    Wed Sep 13 18:49:21 GMT 2006
>Last-Modified:  Wed Sep 13 18:49:21 GMT 2006
>Originator:     TAKAHASHI Kaoru
>Release:        FreeBSD 5.4-RELEASE-p14 i386
>Organization:
>Environment:
System: FreeBSD rave.kaoru.trans-nt.com 5.4-RELEASE-p14 FreeBSD 5.4-RELEASE-p14 #0: Mon Apr 24 13:57:18 JST 2006 root@rave.kaoru.trans-nt.com:/usr/obj/usr/src/sys/IPSEC i386


	
>Description:
ports/devel/subversion make patch failed with -DWITH_SVNSERVE_WRAPPER.
Please update files/build-outputs.mk.patch for subversion 1.4.0.

>How-To-Repeat:
% cd /usr/ports/devel/subversion
% sudo make -DWITH_SVNSERVE_WRAPPER clean patch
[snip]
===>  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.
*** Error code 1

Stop in /usr/ports/devel/subversion.


>Fix:
Fix files/build-outputs.mk.patch.

diff -rcN /usr/ports/devel/subversion/files/build-outputs.mk.patch /tmp/subversion/files/build-outputs.mk.patch
*** /usr/ports/devel/subversion/files/build-outputs.mk.patch	Sat Nov  6 00:42:05 2004
--- /tmp/subversion/files/build-outputs.mk.patch	Wed Sep 13 14:44:12 2006
***************
*** 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/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)
   
-  install-contrib: contrib/client-side/svn-push/svn-push$(EXEEXT) install-lib install-fsmod-lib
--- 1,11 ----
! --- build-outputs.mk.orig	Fri Sep  8 08:22:07 2006
! +++ build-outputs.mk	Wed Sep 13 14:41:07 2006
! @@ -670,7 +670,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)
   
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lev 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Sep 13 06:00:44 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103210 
State-Changed-From-To: open->closed 
State-Changed-By: lev 
State-Changed-When: Wed Sep 13 18:48:50 UTC 2006 
State-Changed-Why:  

Fixed as ports/103213 


http://www.freebsd.org/cgi/query-pr.cgi?pr=103210 
>Unformatted:
