Date: Tue, 30 Mar 2010 13:50:05 GMT From: Kevin Kobb <kkobb@skylinecorp.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/145202: [PATCH] net/cvsup: Causes errors during 'make index' on amd64 Message-ID: <201003301350.o2UDo5p9027930@www.freebsd.org> Resent-Message-ID: <201003301400.o2UE0GYp085030@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145202
>Category: ports
>Synopsis: [PATCH] net/cvsup: Causes errors during 'make index' on amd64
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 30 14:00:16 UTC 2010
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003301350.o2UDo5p9027930>