From joelh@thor.piquan.org  Sun Jan 18 14:12:50 2004
Return-Path: <joelh@thor.piquan.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 32BDA16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Jan 2004 14:12:50 -0800 (PST)
Received: from thor.piquan.org (adsl-66-125-235-59.dsl.sntc01.pacbell.net [66.125.235.59])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0795343D58
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Jan 2004 14:12:48 -0800 (PST)
	(envelope-from joelh@thor.piquan.org)
Received: from thor.piquan.org (joelh@localhost [127.0.0.1])
	by thor.piquan.org (8.12.10/8.12.10) with ESMTP id i0IMClHl014262
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Jan 2004 14:12:47 -0800 (PST)
	(envelope-from joelh@thor.piquan.org)
Received: (from joelh@localhost)
	by thor.piquan.org (8.12.10/8.12.10/Submit) id i0IMClBi014261;
	Sun, 18 Jan 2004 14:12:47 -0800 (PST)
	(envelope-from joelh)
Message-Id: <200401182212.i0IMClBi014261@thor.piquan.org>
Date: Sun, 18 Jan 2004 14:12:47 -0800 (PST)
From: Joel Ray Holveck <joelh@piquan.org>
Reply-To: Joel Ray Holveck <joelh@piquan.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Many ports break with VERSION_CONTROL=numbered
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61552
>Category:       ports
>Synopsis:       [PATCH] Many ports break with VERSION_CONTROL=numbered
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 18 14:20:11 PST 2004
>Closed-Date:    Thu Apr 01 23:34:42 PST 2004
>Last-Modified:  Thu Apr 01 23:34:42 PST 2004
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Jan 18 14:21:59 PST 2004 
Responsible-Changed-Why:  
Hmm.  This seems like a problem in the overall ports framework ... 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61552 
State-Changed-From-To: open->analyzed 
State-Changed-By: kris 
State-Changed-When: Sat Mar 20 18:02:23 PST 2004 
State-Changed-Why:  
Will be tested on the next bento 4-exp run 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61552 
State-Changed-From-To: analyzed->closed 
State-Changed-By: kris 
State-Changed-When: Thu Apr 1 23:34:33 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61552 
>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.
 
