From nobody@FreeBSD.org  Tue Mar 30 13:50:06 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53A0A1065674
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 13:50:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 2738F8FC1E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 13:50:06 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UDo51I027931
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 13:50:05 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o2UDo5p9027930;
	Tue, 30 Mar 2010 13:50:05 GMT
	(envelope-from nobody)
Message-Id: <201003301350.o2UDo5p9027930@www.freebsd.org>
Date: Tue, 30 Mar 2010 13:50:05 GMT
From: Kevin Kobb <kkobb@skylinecorp.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] net/cvsup: Causes errors during 'make index' on amd64
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         145202
>Category:       ports
>Synopsis:       [PATCH] net/cvsup: Causes errors during 'make index' on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 30 14:00:16 UTC 2010
>Closed-Date:    Wed Mar 31 14:34:16 UTC 2010
>Last-Modified:  Wed Mar 31 14:40:07 UTC 2010
>Originator:     Kevin Kobb
>Release:        FreeBSD 7.3-RELEASE amd64
>Organization:
>Environment:
FreeBSD mail.skylinecorp.com 7.3-RELEASE FreeBSD 7.3-RELEASE #0: Mon Mar 22 15:15:36 EDT 2010     root@mail.skylinecorp.com:/usr/obj/usr/src/sys/VMWARE  amd64

>Description:
If you try to try to create and INDEX file by running 'make index' or using portsdb on an amd64 system, you will always get an 'Duplicate INDEX entry: cvsup-without-gui-16.1h_4' warning message. The make process detects you are on amd64 and creates an entry for cvsup-without-gui from the net/cvsup directory and the net/cvsup-without-gui directory. You wind up with the duplicate index message for cvsup-without-gui, and no index entry at all for net/cvsup.
>How-To-Repeat:
Run make index or portsdb -U on an amd64 system.
>Fix:
Patch attached. Not sure if this the best way to do it, but it does get rid of the duplicate index errors, and the port seems to build and work OK. I don't actually use the port, but it would be nice not to get the index errors. 

Patch attached with submission follows:

--- Makefile.orig	2008-05-17 19:32:13.000000000 -0400
+++ Makefile	2010-03-30 08:56:14.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsup
 PORTVERSION=	16.1h
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=development/CVSup/snapshots
@@ -44,7 +44,7 @@
 TARGET=		FBSD_SPARC64
 .endif
 
-.if defined(WITHOUT_X11) || ${ARCH} == "amd64"
+.if defined(WITHOUT_X11)
 M3FLAGS+=	-DNOGUI
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
 PKGNAMESUFFIX=	-without-gui
@@ -69,8 +69,11 @@
 .if !defined(WITHOUT_X11) && ${ARCH} == "amd64"
 	@${ECHO_MSG} "*****************************************************"
 	@${ECHO_MSG} "* CVSup with X11 is not yet supported on amd64.     *"
-	@${ECHO_MSG} "* I will build cvsup without X11 support now.       *"
+	@${ECHO_MSG} "* Please install net/cvsup-without-gui instead,     *"
+	@${ECHO_MSG} "* or do a 'make rmconfig' and then 'make config'    *"
+	@${ECHO_MSG} "* and uncheck the 'Build with X11 support' option.  *"
 	@${ECHO_MSG} "*****************************************************"
+	@exit 1;
 .endif
 
 pre-patch:


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Wed Mar 31 12:22:06 UTC 2010 
State-Changed-Why:  
This is not a correct patch - there is no X11 support on amd64, so the port 
must be forced to no-X11 on amd64. With your change, this no longer happens. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Mar 31 12:22:06 UTC 2010 
Responsible-Changed-Why:  
This is not a correct patch - there is no X11 support on amd64, so the port 
must be forced to no-X11 on amd64. With your change, this no longer happens. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145202 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Wed Mar 31 14:33:43 UTC 2010 
State-Changed-Why:  
Ok, I think (I hope) it will stop producing this warning now 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145202 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/145202: commit references a PR
Date: Wed, 31 Mar 2010 14:34:07 +0000 (UTC)

 pav         2010-03-31 14:33:52 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/cvsup            Makefile 
   Log:
   - Mark IGNORE on amd64 unless WITHOUT_X11 is selected, instead of faking that
     option
   
   PR:             ports/145202 (inspired by)
   
   Revision  Changes    Path
   1.71      +5 -4      ports/net/cvsup/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
