From dbader@ece.unm.edu  Thu Dec 16 12:46:55 2004
Return-Path: <dbader@ece.unm.edu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CAC0716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Dec 2004 12:46:55 +0000 (GMT)
Received: from tularosa.eece.unm.edu (tularosa.eece.unm.edu [129.24.24.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3DD8E43D60
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Dec 2004 12:46:53 +0000 (GMT)
	(envelope-from dbader@ece.unm.edu)
Received: from 162-124.dsl.osogrande.com ([207.188.162.124] helo=[127.0.0.1])
	by tularosa.eece.unm.edu with asmtp (Exim 4.30; FreeBSD)
	id 1Cev1v-0006BD-Tn; Thu, 16 Dec 2004 05:46:52 -0700
Message-Id: <41C183BA.9020902@ece.unm.edu>
Date: Thu, 16 Dec 2004 05:46:50 -0700
From: "David A. Bader" <dbader@ece.unm.edu>
To: Ulrich Spoerlein <q@uni.de>
Cc: FreeBSD-gnats-submit@freebsd.org
In-Reply-To: <200412161137.iBGBbfXx023554@roadrunner.q.local>
Subject: Re: [PATCH] math/concorde: update to 20031219
References: <200412161137.iBGBbfXx023554@roadrunner.q.local>

>Number:         75149
>Category:       ports
>Synopsis:       Re: [PATCH] math/concorde: update to 20031219
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    linimon
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 16 12:50:23 GMT 2004
>Closed-Date:    Thu Dec 16 19:52:55 GMT 2004
>Last-Modified:  Thu Dec 16 19:52:55 GMT 2004
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 Thanks!
  -david
 
 Ulrich Spoerlein wrote:
 
 >>Submitter-Id:	current-users
 >>Originator:	Ulrich Spoerlein
 >>Organization:	
 >>Confidential:	no 
 >>Synopsis:	[PATCH] math/concorde: update to 20031219
 >>Severity:	non-critical
 >>Priority:	low
 >>Category:	ports 
 >>Class:		update
 >>Release:	FreeBSD 5.3-STABLE i386
 >>Environment:
 >>    
 >>
 >System: FreeBSD roadrunner 5.3-STABLE FreeBSD 5.3-STABLE #8: Tue Dec 14 19:33:14 CET 2004
 >  
 >
 >>Description:
 >>    
 >>
 >- Update to 20031219
 >- Build all binaries (they are very useful!)
 >- Install them to ${PREFIX}/bin/concorde/ to avoid name collision
 >- Update pkg-descr to reflect Homepage
 >
 >Added file(s):
 >- files/patch-killgrun.c
 >
 >Removed file(s):
 >- files/patch-UTIL_urandom.c
 >
 >Port maintainer (dbader@eece.unm.edu) is cc'd.
 >
 >Generated with FreeBSD Port Tools 0.63
 >  
 >
 >>How-To-Repeat:
 >>Fix:
 >>    
 >>
 >
 >--- concorde-20031219.patch begins here ---
 >Index: Makefile
 >===================================================================
 >RCS file: /home/ncvs/ports/math/concorde/Makefile,v
 >retrieving revision 1.6
 >diff -u -u -r1.6 Makefile
 >--- Makefile	24 Apr 2003 01:56:27 -0000	1.6
 >+++ Makefile	16 Dec 2004 11:18:28 -0000
 >@@ -6,12 +6,11 @@
 > #
 > 
 > PORTNAME=	concorde
 >-PORTVERSION=	1.0
 >-PORTREVISION=	1
 >+PORTVERSION=	20031219
 > CATEGORIES=	math parallel
 >-MASTER_SITES=	http://www.math.princeton.edu/tsp/concorde/ \
 >-		ftp://ftp.caam.rice.edu/pub/software/keck/
 >-DISTNAME=	co991215
 >+MASTER_SITES=	http://www.tsp.gatech.edu/concorde/ \
 >+		http://www.math.princeton.edu/tsp/concorde/
 >+DISTNAME=	co031219
 > EXTRACT_SUFX=	.tgz
 > 
 > MAINTAINER=	dbader@eece.unm.edu
 >@@ -19,14 +18,24 @@
 > 
 > WRKSRC=		${WRKDIR}/concorde
 > 
 >-GNU_CONFIGURE=  yes
 >+GNU_CONFIGURE=	yes
 >+ALL_TARGET=	everything
 > 
 > INCFILES=	bigguy.h combs.h config.h consec1.h cut.h cuttree.h \
 > 		delaunay.h edgegen.h fmatch.h heldkarp.h kdtree.h \
 > 		linkern.h localcut.h lp.h machdefs.h macrorus.h mlinkern.h \
 >-		necklace.h pq.h pqsets.h profdata.h profrus.h tinytsp.h \
 >+		necklace.h pq.h pqsets.h tinytsp.h \
 > 		tsp.h util.h verify.h
 > 
 >+BINFILES=	BIGGUY/bg_test COMBS/combtest CUT/lin_all CUT/mincut \
 >+		EDGEGEN/edgegen FMATCH/fmatch HELDKARP/heldkarp KDTREE/kdtree \
 >+		LINKERN/linkern LOCALCUT/checker LOCALCUT/first \
 >+		LOCALCUT/localcut LOCALCUT/peeler LOCALCUT/peeler2 PQ/pqtest \
 >+		TINY/tinytsp TOOLS/edg2len TOOLS/edgunion TOOLS/fconvert \
 >+		TOOLS/killgrun TOOLS/prob2tsp TOOLS/showres TOOLS/tourchk \
 >+		TOOLS/tourlen TSP/bosstell TSP/concorde TSP/cutserv \
 >+		TSP/poolcat TSP/probserv TSP/test_tsp VERIFY/verify
 >+
 > do-install:
 > 	${INSTALL_DATA} ${WRKSRC}/concorde.a ${PREFIX}/lib/libconcorde.a
 > 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 ${PREFIX}/include/concorde
 >@@ -34,5 +43,10 @@
 > .for f in ${INCFILES}
 > 	${INSTALL_DATA} ${WRKSRC}/INCLUDE/${f} ${PREFIX}/include/concorde
 > .endfor
 >+	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 ${PREFIX}/bin/concorde
 >+.for f in ${BINFILES}
 >+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/concorde
 >+.endfor
 >+	${INSTALL_SCRIPT} ${WRKSRC}/TINY/randtsp.awk ${PREFIX}/bin/concorde
 > 
 > .include <bsd.port.mk>
 >Index: distinfo
 >===================================================================
 >RCS file: /home/ncvs/ports/math/concorde/distinfo,v
 >retrieving revision 1.2
 >diff -u -u -r1.2 distinfo
 >--- distinfo	31 Mar 2004 03:09:27 -0000	1.2
 >+++ distinfo	16 Dec 2004 11:18:28 -0000
 >@@ -1,2 +1,2 @@
 >-MD5 (co991215.tgz) = 30c7dcccbde91a03d66e3e715f656650
 >-SIZE (co991215.tgz) = 732109
 >+MD5 (co031219.tgz) = 3476e01ae89b591bf7b329b2f5aa0353
 >+SIZE (co031219.tgz) = 698592
 >Index: pkg-descr
 >===================================================================
 >RCS file: /home/ncvs/ports/math/concorde/pkg-descr,v
 >retrieving revision 1.2
 >diff -u -u -r1.2 pkg-descr
 >--- pkg-descr	24 Apr 2003 01:56:27 -0000	1.2
 >+++ pkg-descr	16 Dec 2004 11:18:28 -0000
 >@@ -1,20 +1,16 @@
 >-Concorde (99.12.15 release) This is the initial full release of Concorde.
 >-More data about Concorde is available from the Concorde page at
 >-http://www.math.princeton.edu/tsp/concorde.html.
 >-
 > Concorde is a computer code for the traveling salesman problem (TSP)
 > and some related network optimization problems.  The code is written
 > in the ANSI C programming language and it is available for academic
 >-research use; for other uses, contact concorde@caam.rice.edu for
 >+research use; for other uses, contact bico@isye.gatech.edu for
 > licensing options.
 > 
 > Concorde's TSP solver has been used to obtain the optimal solutions to
 >-all TSPLIB instances having up to 13,509 cities.
 >+106 of the 110 TSPLIB instances; the largest having 15,112 cities.
 > 
 > The Concorde callable library includes over 700 functions permitting
 > users to create specialized codes for TSP-like problems.  All Concorde
 >-functions are thread-safe for prgramming in shared-memory parallel
 >+functions are thread-safe for programming in shared-memory parallel
 > environments; the main TSP solver includes code for running over
 > networks of unix workstations.
 > 
 >-WWW: http://www.math.princeton.edu/tsp/concorde.html
 >+WWW: http://www.tsp.gatech.edu/concorde.html
 >Index: pkg-plist
 >===================================================================
 >RCS file: /home/ncvs/ports/math/concorde/pkg-plist,v
 >retrieving revision 1.2
 >diff -u -u -r1.2 pkg-plist
 >--- pkg-plist	1 Jul 2001 02:25:37 -0000	1.2
 >+++ pkg-plist	16 Dec 2004 11:18:28 -0000
 >@@ -1,3 +1,35 @@
 >+bin/concorde/bg_test
 >+bin/concorde/bosstell
 >+bin/concorde/checker
 >+bin/concorde/combtest
 >+bin/concorde/concorde
 >+bin/concorde/cutserv
 >+bin/concorde/edg2len
 >+bin/concorde/edgegen
 >+bin/concorde/edgunion
 >+bin/concorde/fconvert
 >+bin/concorde/first
 >+bin/concorde/fmatch
 >+bin/concorde/heldkarp
 >+bin/concorde/kdtree
 >+bin/concorde/killgrun
 >+bin/concorde/lin_all
 >+bin/concorde/linkern
 >+bin/concorde/localcut
 >+bin/concorde/mincut
 >+bin/concorde/peeler
 >+bin/concorde/peeler2
 >+bin/concorde/poolcat
 >+bin/concorde/pqtest
 >+bin/concorde/prob2tsp
 >+bin/concorde/probserv
 >+bin/concorde/randtsp.awk
 >+bin/concorde/showres
 >+bin/concorde/test_tsp
 >+bin/concorde/tinytsp
 >+bin/concorde/tourchk
 >+bin/concorde/tourlen
 >+bin/concorde/verify
 > lib/libconcorde.a
 > include/concorde/bigguy.h
 > include/concorde/combs.h
 >@@ -20,10 +52,9 @@
 > include/concorde/necklace.h
 > include/concorde/pq.h
 > include/concorde/pqsets.h
 >-include/concorde/profdata.h
 >-include/concorde/profrus.h
 > include/concorde/tinytsp.h
 > include/concorde/tsp.h
 > include/concorde/util.h
 > include/concorde/verify.h
 >+@dirrm bin/concorde
 > @dirrm include/concorde
 >Index: files/patch-UTIL_urandom.c
 >===================================================================
 >RCS file: files/patch-UTIL_urandom.c
 >diff -N files/patch-UTIL_urandom.c
 >--- files/patch-UTIL_urandom.c	12 Nov 2002 16:19:08 -0000	1.1
 >+++ /dev/null	1 Jan 1970 00:00:00 -0000
 >@@ -1,24 +0,0 @@
 >-
 >-$FreeBSD: ports/math/concorde/files/patch-UTIL_urandom.c,v 1.1 2002/11/12 16:19:08 naddy Exp $
 >-
 >---- UTIL/urandom.c.orig	Thu Dec 16 19:39:06 1999
 >-+++ UTIL/urandom.c	Tue Nov 12 17:10:02 2002
 >-@@ -22,7 +22,7 @@
 >- /*                                                                          */
 >- /*  Written by:  DIMACS  (modified for TSP)                                 */
 >- /*  Date: February 7, 1995  (cofeb16)                                       */
 >--/*                                                                          */
 >-+/*        September 18, 2001  (billenium fix)                               */
 >- /*                                                                          */
 >- /*    EXPORTED FUNCTIONS:                                                   */
 >- /*                                                                          */
 >-@@ -66,6 +66,9 @@
 >-     int i, ii;
 >-     int last, next;
 >-     int *arr = r->arr;
 >-+
 >-+    seed %= CC_PRANDMAX;
 >-+    if (seed < 0) seed += CC_PRANDMAX;
 >- 
 >-     arr[0] = last = seed;
 >-     next = 1;
 >Index: files/patch-killgrun.c
 >===================================================================
 >RCS file: files/patch-killgrun.c
 >diff -N files/patch-killgrun.c
 >--- /dev/null	1 Jan 1970 00:00:00 -0000
 >+++ files/patch-killgrun.c	16 Dec 2004 11:18:28 -0000
 >@@ -0,0 +1,18 @@
 >+--- TOOLS/killgrun.c.orig	Thu Dec 16 11:26:57 2004
 >++++ TOOLS/killgrun.c	Thu Dec 16 11:27:06 2004
 >+@@ -75,13 +75,13 @@
 >+         if (rval) {
 >+             perror ("kill");
 >+             fprintf (stderr, "Unable to kill process %d\n", process);
 >+-/*
 >++#if 0
 >+             if (errno == ESRCH) {   /* Does not work on Red Hat 8 */
 >+                 fprintf (stderr, "Process does not exist, telling boss anyway\n");
 >+             } else {
 >+                 goto CLEANUP;
 >+             }
 >+-*/
 >++#endif
 >+             fprintf (stderr, "Process does not exist, telling boss anyway\n");
 >+         }
 >+     }
 >--- concorde-20031219.patch ends here ---
 >
 >  
 >
 
 -- 
 David A. Bader                                  Office: 505-277-6724
 Associate Professor and Regents' Lecturer       FAX:    505-277-1439
 Electrical and Computer Engineering Department
 University of New Mexico                          dbader@ece.unm.edu
 Albuquerque, NM  87131                http://www.ece.unm.edu/~dbader
 
 
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Thu Dec 16 19:51:49 GMT 2004 
State-Changed-Why:  
Misfiled followup to ports/75148.  (I take it that this PR I'm closing 
is basically just a maintainer approval?) 


Responsible-Changed-From-To: gnats-admin->linimon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Dec 16 19:51:49 GMT 2004 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=75149 
>Unformatted:
