ports/61003: [MAINTAINER] devel/ace+tao: distfile with versions numbers

[Sergey Matveychuk]

>Number:         61003
>Category:       ports
>Synopsis:       [MAINTAINER] devel/ace+tao: distfile with versions numbers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 06 19:20:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Fri Nov 21 07:47:47 MSK 2003
>Description:
[DESCRIBE CHANGES]
found distfile with versions numbers
change CONFLICTS= with CONFLICTS?= for slave port
remove WWW: from second URL in pkg-descr

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- ace+tao-5.3.6+1.3.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/ace+tao.orig/Makefile /usr/ports/devel/ace+tao/Makefile
--- /usr/ports/devel/ace+tao.orig/Makefile	Wed Jan  7 03:34:30 2004
+++ /usr/ports/devel/ace+tao/Makefile	Wed Jan  7 03:41:57 2004
@@ -8,15 +8,14 @@
 PORTNAME?=	ace+tao
 PORTVERSION?=	${ACE_VERSION}+${TAO_VERSION}
 CATEGORIES=	devel
-# The distfile does not have version numbers, so try my mirror first
-MASTER_SITES=	http://deuce.doc.wustl.edu/ \
-		http://www.navicon.dk/mirrors/ace/deuce.doc.wustl.edu/
-DISTNAME?=	${PORTNAME:U}
+MASTER_SITES=	http://deuce.doc.wustl.edu/old_distribution/ \
+		http://www.navicon.dk/mirrors/ace/deuce.doc.wustl.edu/old_distribution/
+DISTNAME?=	ACE-${ACE_VERSION}+TAO-${TAO_VERSION}
 
 MAINTAINER=	sem at ciam.ru
 COMMENT?=	The Adaptive Communication Environment (ACE) with The ACE ORB (TAO)
 
-CONFLICTS=	ace-*
+CONFLICTS?=	ace-*
 
 ACE_VERSION=	5.3.6
 TAO_VERSION=	1.3.6
diff -ruN --exclude=CVS /usr/ports/devel/ace+tao.orig/distinfo /usr/ports/devel/ace+tao/distinfo
--- /usr/ports/devel/ace+tao.orig/distinfo	Wed Jan  7 03:34:30 2004
+++ /usr/ports/devel/ace+tao/distinfo	Wed Jan  7 05:34:08 2004
@@ -1 +1 @@
-MD5 (ACE+TAO.tar.bz2) = d57ccf34fb5185f25518bea531dace08
+MD5 (ACE-5.3.6+TAO-1.3.6.tar.bz2) = d57ccf34fb5185f25518bea531dace08
diff -ruN --exclude=CVS /usr/ports/devel/ace+tao.orig/pkg-descr /usr/ports/devel/ace+tao/pkg-descr
--- /usr/ports/devel/ace+tao.orig/pkg-descr	Wed Jan  7 03:34:30 2004
+++ /usr/ports/devel/ace+tao/pkg-descr	Wed Jan  7 06:09:35 2004
@@ -8,4 +8,4 @@
 CORBA 2.x-compliant ORB that supports real-time extensions.
 
 WWW: http://www.cs.wustl.edu/~schmidt/ACE.html
-WWW: http://www.cs.wustl.edu/~schmidt/TAO.html
+     http://www.cs.wustl.edu/~schmidt/TAO.html
--- ace+tao-5.3.6+1.3.6.patch ends here ---

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