ports/169970: [patch] /usr/ports/Makefile: get feedback from SVN and sync with /usr/src/Makefile

Alberto Villa avilla at FreeBSD.org
Wed Jul 18 13:10:02 UTC 2012


>Number:         169970
>Category:       ports
>Synopsis:       [patch] /usr/ports/Makefile: get feedback from SVN and sync with /usr/src/Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 18 13:10:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Alberto Villa
>Release:        
>Organization:
>Environment:
>Description:
Currently, when running `make update` in /usr/ports with a Subversion repository, there is no output from Subversion, and it looks like nothing is happening.
>How-To-Repeat:

>Fix:
The attached patch removes the "-q" from the `svn` command line, which makes it behave like in /usr/src. While here, I also replaced an "else if" with an "elif", and synced CVS and Subversion update messages with the ones in /usr/src.

beat@ suggested to test the changes with an exp-run.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 301095)
+++ Makefile	(working copy)
@@ -168,15 +168,14 @@
 	@${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
 .elif defined(CVS_UPDATE)
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
+	@echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${CVS} -R -q update -A -P -d -I!
-.else
-.if exists(${.CURDIR}/.svn)
+.elif exists(${.CURDIR}/.svn)
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Updating ${.CURDIR} from svn repository"
+	@echo ">>> Updating ${.CURDIR} using Subversion"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${SVN} -q update
+	cd ${.CURDIR}; ${SVN} update
 .else
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${PORTSNAP}"
@@ -193,4 +192,3 @@
 .endif
 .endif
 .endif
-.endif


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



More information about the freebsd-ports-bugs mailing list