From nobody@FreeBSD.ORG  Fri Nov 17 23:52:30 2000
Return-Path: <nobody@FreeBSD.ORG>
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 64A1437B479; Fri, 17 Nov 2000 23:52:30 -0800 (PST)
Message-Id: <20001118075230.64A1437B479@hub.freebsd.org>
Date: Fri, 17 Nov 2000 23:52:30 -0800 (PST)
From: efurbish@rice.edu
Sender: nobody@FreeBSD.ORG
To: freebsd-gnats-submit@FreeBSD.org
Subject: new cad/magic and cad/irsim versions (patches included)
X-Send-Pr-Version: www-1.0

>Number:         22935
>Category:       ports
>Synopsis:       new cad/magic and cad/irsim versions (patches included)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 18 00:00:01 PST 2000
>Closed-Date:    Tue Feb 13 05:30:23 PST 2001
>Last-Modified:  Tue Feb 13 05:31:06 PST 2001
>Originator:     Eric Furbish
>Release:        4.1.1-STABLE
>Organization:
>Environment:
FreeBSD local1 4.1.1-STABLE FreeBSD 4.1.1-STABLE #0: Mon Oct 23 18:29:57 CDT 2000     root@local1:/usr/obj/usr/src/sys/asdf  i386

>Description:
The ports cad/magic and cad/irsim have changed versions.  Magic is now
version 6.5.1 and irsim is version 9.5.  The "homepage" and master sites
have also changed.
>How-To-Repeat:

>Fix:
magic directory patch:
diff -rc ./Makefile ../magic_new/Makefile
*** ./Makefile  Wed Jun  7 03:00:18 2000
--- ../magic_new/Makefile       Thu Nov 16 17:44:15 2000
***************
*** 6,15 ****
  #
  
  PORTNAME=     magic
! PORTVERSION=  6.5
  CATEGORIES=   cad
! MASTER_SITES= ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
! DISTFILES=    magic-6_5_tar.Z
  
  MAINTAINER=   swallace@FreeBSD.org
  
--- 6,15 ----
  #
  
  PORTNAME=     magic
! PORTVERSION=  6.5.1
  CATEGORIES=   cad
! MASTER_SITES= http://mos.stanford.edu/group/magic/
! DISTFILES=    magic-6.5.1.tar.Z
  
  MAINTAINER=   swallace@FreeBSD.org
  
diff -rc ./distinfo ../magic_new/distinfo
*** ./distinfo  Fri Dec  6 02:18:51 1996
--- ../magic_new/distinfo       Thu Nov 16 17:36:33 2000
***************
*** 1 ****
! MD5 (magic-6_5_tar.Z) = de3bc6b38e8c3be97700bcf59ec29af3
--- 1 ----
! MD5 (magic-6.5.1.tar.Z) = 02e700f4b719e01dcea010a3a3c10045
diff -rc ./files/patch-aa ../magic_new/files/patch-aa
*** ./files/patch-aa    Sat Nov 29 15:43:09 1997
--- ../magic_new/files/patch-aa Thu Nov 16 17:41:49 2000
***************
*** 4,12 ****
                  :status Makefile READ_ME
   DIRS         = include cadlib
   CMD          = echo Need to define your command via 'make cmd CMD=command'
! -CADDIR               = `:findcad`
  -CADDIR_SUB   = `../:findcad`
! +CADDIR               = `/bin/csh :findcad`
  +CADDIR_SUB   = `/bin/csh ../:findcad`
   
   everything: ${MODULES} .config
--- 4,12 ----
                  :status Makefile READ_ME
   DIRS         = include cadlib
   CMD          = echo Need to define your command via 'make cmd CMD=command'
! -CADDIR               = `./:findcad`
  -CADDIR_SUB   = `../:findcad`
! +CADDIR               = `/bin/csh ./:findcad`
  +CADDIR_SUB   = `/bin/csh ../:findcad`
   
   everything: ${MODULES} .config
***************
*** 15,44 ****
   
   
   directories:
! -     :mkdir ${CADDIR}/bin
! -     :mkdir ${CADDIR}/lib
! -     :mkdir ${CADDIR}/lib/magic
! -     :mkdir ${CADDIR}/lib/magic/sys
! -     :mkdir ${CADDIR}/man
! +     /bin/csh :mkdir ${CADDIR}/bin
! +     /bin/csh :mkdir ${CADDIR}/lib
! +     /bin/csh :mkdir ${CADDIR}/lib/magic
! +     /bin/csh :mkdir ${CADDIR}/lib/magic/sys
! +     /bin/csh :mkdir ${CADDIR}/man
   
   # Remakes the binary in 'lib', if needed.  Used for recompiling on 
   # a remote machine.
- @@ -145,10 +145,12 @@
-       cd magic; make magicp
-  
-  wc:  ${MODULES}
- -     :countlines ${MODULES}
- +     /bin/csh :countlines ${MODULES}
-  
-  moduleNames:
-       echo ${MODULES}
-  
-  forceit:
-       
- +all:  everything
- +all:  everything
--- 15,30 ----
   
   
   directories:
! -     ./:mkdir ${CADDIR}/bin
! -     ./:mkdir ${CADDIR}/lib
! -     ./:mkdir ${CADDIR}/lib/magic
! -     ./:mkdir ${CADDIR}/lib/magic/sys
! -     ./:mkdir ${CADDIR}/man
! +     /bin/csh ./:mkdir ${CADDIR}/bin
! +     /bin/csh ./:mkdir ${CADDIR}/lib
! +     /bin/csh ./:mkdir ${CADDIR}/lib/magic
! +     /bin/csh ./:mkdir ${CADDIR}/lib/magic/sys
! +     /bin/csh ./:mkdir ${CADDIR}/man
   
   # Remakes the binary in 'lib', if needed.  Used for recompiling on 
   # a remote machine.


irsim directory patch:
diff -rc ./Makefile ../irsim_new/Makefile
*** ./Makefile  Sat Apr  8 18:19:59 2000
--- ../irsim_new/Makefile       Thu Nov 16 17:44:59 2000
***************
*** 6,14 ****
  #
  
  PORTNAME=     irsim
! PORTVERSION=  9.4.1
  CATEGORIES=   cad
! MASTER_SITES= ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
  EXTRACT_SUFX= .tar.Z
  
  MAINTAINER=   swallace@FreeBSD.org
--- 6,14 ----
  #
  
  PORTNAME=     irsim
! PORTVERSION=  9.5
  CATEGORIES=   cad
! MASTER_SITES= http://mos.stanford.edu/group/magic/
  EXTRACT_SUFX= .tar.Z
  
  MAINTAINER=   swallace@FreeBSD.org

diff -rc ./distinfo ../irsim_new/distinfo
*** ./distinfo  Fri Dec  6 02:19:58 1996
--- ../irsim_new/distinfo       Thu Nov 16 17:23:13 2000
***************
*** 1 ****
! MD5 (irsim-9.4.1.tar.Z) = 1a890eae0ee1608949eccb1cccc88c26
--- 1 ----
! MD5 (irsim-9.5.tar.Z) = 5b77e05ed5c2f3a6d92554609107b2f2
diff -rc ./files/patch-aa ../irsim_new/files/patch-aa
*** ./files/patch-aa    Sat Nov 29 10:07:42 1997
--- ../irsim_new/files/patch-aa Thu Nov 16 17:30:12 2000
***************
*** 7,16 ****
  -     @echo ' -gentbl' >> MAKEFILE
  +     @echo ' -./gentbl' >> MAKEFILE
        @echo 'gentbl : gentbl.c' >> MAKEFILE
!       @echo ' $(CC) $$(CFLAGS) -o gentbl gentbl.c' >> MAKEFILE
        @echo 'spiketbl.c : genspktbl' >> MAKEFILE
  -     @echo ' genspktbl spiketbl.c' >> MAKEFILE
  +     @echo ' ./genspktbl spiketbl.c' >> MAKEFILE
        @echo 'genspktbl : genspktbl.c' >> MAKEFILE
!       @echo ' $(CC) -o genspktbl genspktbl.c -lm' >> MAKEFILE
        @/bin/csh ../utils/CO $(SRCS)
--- 7,16 ----
  -     @echo ' -gentbl' >> MAKEFILE
  +     @echo ' -./gentbl' >> MAKEFILE
        @echo 'gentbl : gentbl.c' >> MAKEFILE
!       @echo ' $$(CC) $$(CFLAGS) -o gentbl gentbl.c' >> MAKEFILE
        @echo 'spiketbl.c : genspktbl' >> MAKEFILE
  -     @echo ' genspktbl spiketbl.c' >> MAKEFILE
  +     @echo ' ./genspktbl spiketbl.c' >> MAKEFILE
        @echo 'genspktbl : genspktbl.c' >> MAKEFILE
!       @echo ' $$(CC) -o genspktbl genspktbl.c -lm' >> MAKEFILE
        @/bin/csh ../utils/CO $(SRCS)


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->swallace 
Responsible-Changed-By: steve 
Responsible-Changed-When: Sun Dec 10 17:44:41 PST 2000 
Responsible-Changed-Why:  
Over to port's maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22935 
Responsible-Changed-From-To: swallace->freebsd-ports 
Responsible-Changed-By: will 
Responsible-Changed-When: Fri Jan 26 21:46:48 PST 2001 
Responsible-Changed-Why:  
Return responsibility to general ports team. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22935 
State-Changed-From-To: open->closed 
State-Changed-By: jeh 
State-Changed-When: Tue Feb 13 05:30:23 PST 2001 
State-Changed-Why:  
Do not cut and paste patches.  It loses TABs and the patches have to be 
applied by hand. 

Commited. 

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