Upgrade to version 9.1

4 files changed, 17 insertions, 106 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 9fca8b4e3dbc..97957b1d367d 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,26 +1,19 @@
 # New ports collection makefile for:    icon
-# Version required:     9.0
+# Version required:     9.1
 # Date created:         05 April 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.3 1995/07/29 09:54:58 asami Exp $
+# $Id: Makefile,v 1.4 1995/11/22 13:12:50 asami Exp $
 #
 
-DISTNAME=       icon-9.0
-DISTFILES=	unix_tar.gz
+DISTNAME=       icon-9.1
+DISTFILES=	unix.tar.gz
 CATEGORIES+=	lang
-MASTER_SITES=	ftp://cs.arizona.edu/icon/packages/unix/
+MASTER_SITES=	ftp://ftp.cs.arizona.edu/icon/packages/unix/
 
-PATCH_STRIP=	-p1
-NO_WRKSUBDIR=	true
-ALL_TARGET=	Icon
+MAINTAINER=	ports@freebsd.org
 
-# work around a bug in rtt's preprocessor
-#
-do-build:
-	@(ENABLE_STARTUP_LOCALE=; \
-	  unset ENABLE_STARTUP_LOCALE; \
-	  cd ${WRKSRC}; \
-	  ${MAKE} PREFIX=${PREFIX} X11BASE=${X11BASE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+NO_WRKSUBDIR=	true
+ALL_TARGET=	Icon Icon-iconc
 
 .include <bsd.port.mk>
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 527629c613df..c355724754ac 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1 +1 @@
-MD5 (unix_tar.gz) = 2d147ceb96944e5f51b4de3432fafa8a
+MD5 (unix.tar.gz) = ee898b46b22946cf82e79bfd710dd22f
diff --git a/lang/icon/files/patch-ca b/lang/icon/files/patch-ca
index 07960957c74b..abc697877a7d 100644
--- a/lang/icon/files/patch-ca
+++ b/lang/icon/files/patch-ca
@@ -1,5 +1,5 @@
-*** icon.orig/Makefile	Fri Jul 29 21:41:19 1994
---- icon/Makefile	Wed Mar  1 19:34:18 1995
+*** Makefile.orig	Fri Jul 29 21:41:19 1994
+--- Makefile	Wed Mar  1 19:34:18 1995
 ***************
 *** 4,10 ****
   
@@ -39,12 +39,11 @@
 + 	@mkdir -p ${PREFIX}/man/man1
 + 	install -c -g bin -o bin -m 444 docs/icon.1 ${PREFIX}/man/man1/icon.1
 + 	@gzip -9fn ${PREFIX}/man/man1/icon.1
-diff -crP -x bin -x docs -x tests icon.orig/config/unix/Config/Makefile icon/config/unix/Config/Makefile
-*** icon.orig/config/unix/Config/Makefile	Fri Jul 29 21:40:55 1994
---- icon/config/unix/Config/Makefile	Wed Mar  1 14:27:05 1995
+*** config/unix/Config/Makefile.orig	Fri Jul 29 21:40:55 1994
+--- config/unix/Config/Makefile	Wed Mar  1 14:27:05 1995
 ***************
 *** 1,7 ****
-- CC=gcc
+- CC=cc
 - CFLAGS= -DVarTran
 - LDFLAGS=
   SHELL=/bin/sh
@@ -57,20 +56,11 @@ diff -crP -x bin -x docs -x tests icon.orig/config/unix/Config/Makefile icon/con
   MAKE=make
   
   all:
-diff -crP -x bin -x docs -x tests icon.orig/src/h/path.h icon/src/h/path.h
-*** icon.orig/src/h/path.h	Fri Jul 29 21:24:51 1994
---- icon/src/h/path.h	Wed Mar  1 14:27:05 1995
-***************
-*** 1 ****
-! #define BinPath "/usr5/icon/v9/bin/"
---- 1 ----
-! #define BinPath "/usr/local/src/icon/bin/"
-diff -crP -x bin -x docs -x tests icon.orig/src/vtran/Vtmake2 icon/src/vtran/Vtmake2
-*** icon.orig/src/vtran/Vtmake2	Fri Jul 29 21:25:28 1994
---- icon/src/vtran/Vtmake2	Wed Mar  1 14:27:14 1995
+*** src/vtran/Vtmake2.orig	Fri Jul 29 21:25:28 1994
+--- src/vtran/Vtmake2	Wed Mar  1 14:27:14 1995
 ***************
 *** 1,7 ****
-- CC=gcc
+- CC=cc
 - CFLAGS= -DVarTran
 - LDFLAGS=
   SHELL=/bin/sh
@@ -83,73 +73,3 @@ diff -crP -x bin -x docs -x tests icon.orig/src/vtran/Vtmake2 icon/src/vtran/Vtm
   MAKE=make
   
   OBJS=		cat.o tparse.o tlex.o tmem.o trans.o \
-diff -crP -x bin -x docs -x tests icon.orig/config/unix/Config/common.make icon/config/unix/Config/common.make
-*** icon.orig/config/unix/Config/common.make	Fri Jul 29 21:27:01 1994
---- icon/config/unix/Config/common.make	Thu Apr  6 16:48:45 1995
-***************
-*** 9,15 ****
-  		$(CC) $(LDFLAGS) -o patchstr patchstr.o
-  		-./doincl -o ../../bin/rt.h ../h/rt.h
-  		cp patchstr ../../bin
-! 			
-  xpm:
-  		cd ../xpm; $(MAKE) libXpm.a
-  		cp ../xpm/libXpm.a ../../bin
---- 9,15 ----
-  		$(CC) $(LDFLAGS) -o patchstr patchstr.o
-  		-./doincl -o ../../bin/rt.h ../h/rt.h
-  		cp patchstr ../../bin
-! 
-  xpm:
-  		cd ../xpm; $(MAKE) libXpm.a
-  		cp ../xpm/libXpm.a ../../bin
-***************
-*** 39,61 ****
-  #  needed, it is run by changing ../icont/Makefile and/or ../iconc/Makefile;
-  #  see the comments there for details.  icont must be in the search path
-  #  for this section to work.
-!  
-  gfiles:			lextab.h yacctok.h fixgram pscript
-!  
-  lextab.h yacctok.h:	tokens.txt op.txt mktoktab
-  			./mktoktab 
-!  
-  mktoktab:		mktoktab.icn
-  			icont -s mktoktab.icn
-!  
-  fixgram:		fixgram.icn
-  			icont -s fixgram.icn
-!  
-  pscript:		pscript.icn
-  			icont -s pscript.icn
-!  
-!  
-!  
-  #  The following section is commented out because it does not need to be
-  #  performed unless changes are made to typespec.txt. Such changes 
-  #  and are not part of the installation process.  However, if the
---- 39,61 ----
-  #  needed, it is run by changing ../icont/Makefile and/or ../iconc/Makefile;
-  #  see the comments there for details.  icont must be in the search path
-  #  for this section to work.
-! 
-  gfiles:			lextab.h yacctok.h fixgram pscript
-! 
-  lextab.h yacctok.h:	tokens.txt op.txt mktoktab
-  			./mktoktab 
-! 
-  mktoktab:		mktoktab.icn
-  			icont -s mktoktab.icn
-! 
-  fixgram:		fixgram.icn
-  			icont -s fixgram.icn
-! 
-  pscript:		pscript.icn
-  			icont -s pscript.icn
-! 
-! 
-! 
-  #  The following section is commented out because it does not need to be
-  #  performed unless changes are made to typespec.txt. Such changes 
-  #  and are not part of the installation process.  However, if the
-
diff --git a/lang/icon/pkg-descr b/lang/icon/pkg-descr
index d51e17b65aa5..a66e0a4df811 100644
--- a/lang/icon/pkg-descr
+++ b/lang/icon/pkg-descr
@@ -22,6 +22,4 @@ The language is described in R. E. Griswold and M. T. Griswold, The
 Icon Programming Language, Prentice-Hall, Inc., Englewood Cliffs,
 NJ, second edition, 1990.
 
-For further documentation see the docs directory in the
-unpacked source tree (make extract; cd work/docs).