ports/61552: [PATCH] Many ports break with VERSION_CONTROL=numbered

[Joel Ray Holveck]

>Number:         61552
>Category:       ports
>Synopsis:       [PATCH] Many ports break with VERSION_CONTROL=numbered
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 18 14:20:11 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Joel Ray Holveck
>Release:        FreeBSD 5.2-RC i386
>Organization:
>Environment:
System: FreeBSD thor.piquan.org 5.2-RC FreeBSD 5.2-RC #21: Sun Dec 14 19:40:38 PST 2003 joelh at thor.piquan.org:/usr/local/src/freebsd/obj/usr/local/src/freebsd/src/sys/THOR i386


	
>Description:
If the VERSION_CONTROL environment variable is set to "numbered", then
many ports (such as databases/phpmyadmin, as a test case) will break.
After patching, they'll try to delete all the .orig files.  But if
VERSION_CONTROL is set to "numbered", then patch leaves .~1~ files
instead of .orig files, and the ports break when they try to delete
the files.

>How-To-Repeat:
# cd /usr/ports/databases/phpmyadmin
# setenv VERSION_CONTROL numbered
# make patch
===>  Extracting for phpMyAdmin-2.5.4
>Fix:

*** bsd.port.mk.~1~
--- bsd.port.mk
***************
*** 1790,1795 ****
--- 1790,1797 ----
  PATCH_DIST_ARGS+=	--batch
  .endif
  
+ PATCH_ARGS+=	-V simple
+ 
  .if defined(PATCH_CHECK_ONLY)
  PATCH_ARGS+=	-C
  PATCH_DIST_ARGS+=	-C

>Release-Note:
>Audit-Trail:
>Unformatted:
 >> Checksum OK for phpMyAdmin-2.5.4-php.tar.bz2.
 ===>  Patching for phpMyAdmin-2.5.4
 ===>  Applying extra patch files/fix-libraries::display_tbl.lib.php
 ===>  Applying extra patch files/fix-tbl_relation.php
 rm: /usr/ports/databases/phpmyadmin/work/phpMyAdmin-2.5.4/*.orig: No such file or directory
 rm: /usr/ports/databases/phpmyadmin/work/phpMyAdmin-2.5.4/libraries/*.orig: No such file or directory
 *** Error code 1
 
 Stop in /usr/ports/databases/phpmyadmin.