Upgrade to version 1.2.1

PR:		16675
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

8 files changed, 99 insertions, 78 deletions

diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index 4e91df735d8d..5c3911b15f31 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -1,38 +1,41 @@
 # ex:ts=8
-# New ports collection makefile for:    Sather
-# Version required:     1.0.5
-# Date created:         Mon Oct 31 22:04:12 PST 1994
-# Whom:                 hsu
+# Ports collection makefile for:  Sather
+# Version required:		  1.2.1
+# Date created:			  Mon Oct 31 22:04:12 PST 1994
+# Whom:				  hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       Sather-1.0.5
-PKGNAME=        sather-1.0.5
+DISTNAME=	sather-1.2.1
 CATEGORIES=	lang
-MASTER_SITES=   ftp://ftp.icsi.berkeley.edu/pub/sather/  \
-		ftp://ftp.sterling.com/programming/languages/sather/  \
-		ftp://ftp.uni-muenster.de/pub/languages/sather/  \
-		ftp://ftp.nis.co.jp/pub/lang/sather/  \
-		ftp://ftp.th-darmstadt.de/pub/programming/languages/sather/  \
-		ftp://ftp.sra.co.jp/pub/lang/sather/  \
-		ftp://ftp.infomagic.com/pub/mirrors/.mirror14/languages/sather/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	sather
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN_ELF=	gcc: ../../System/GC/gc.a: No such file or directory
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 
-WRKSRC=		${WRKDIR}/Sather
-ALL_TARGET=	testall
-MAN1=		cs.1
+USE_GMAKE=	yes
+ALL_TARGET=	full
+MAN1=		sacomp.1
+
+pre-configure:
+	@${PERL} -pi.in \
+		-e 's:%%CC%%:${CC}:g' \
+	        's:%%CFLAGS%%:${CFLAGS}:g' \
+	        's:%%LOCALBASE%%:${LOCALBASE}:g' \
+	        's:%%GMAKE%%:${GMAKE}:g' \
+		${WRKSRC}/System/Common/CONFIG.proto
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Compiler/cs ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/cs.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/doc/sather
+	${INSTALL_PROGRAM} ${WRKSRC}/Bin/sacomp ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/share/doc/sather
 	${INSTALL_DATA} ${WRKSRC}/Doc/License ${PREFIX}/share/doc/sather
 .if !defined(NOPORTDOCS)
-.for file in Bugs Changes Contributing FAQ README manual.ps
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sather
+.for file in Bugs Changes Contributing FAQ programmer-manual.ps
 	${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${PREFIX}/share/doc/sather
 .endfor
 .endif
diff --git a/lang/Sather/distinfo b/lang/Sather/distinfo
index 4f52790dea94..f987d7afd790 100644
--- a/lang/Sather/distinfo
+++ b/lang/Sather/distinfo
@@ -1 +1 @@
-MD5 (Sather-1.0.5.tar.gz) = 4070ca2864c515270255decfaf29062c
+MD5 (sather-1.2.1.tar.gz) = 1064827b117f6c930ad15fdb49b89e01
diff --git a/lang/Sather/files/patch-02 b/lang/Sather/files/patch-02
index fa9ad16a99f5..63e6bd84fc44 100644
--- a/lang/Sather/files/patch-02
+++ b/lang/Sather/files/patch-02
@@ -1,19 +1,29 @@
-*** System/CONFIG.proto.0	Mon Oct 31 03:55:23 1994
---- System/CONFIG.proto	Mon Oct 31 03:57:59 1994
-***************
-*** 13,19 ****
-  "#/System/base.a #/System/GC/gc.a -lm"
-  
-  -- extra args to pass to C compile if optimization turned on
-! "-O"
-  
-  -- extra args to pass to C compile if debugging turned on
-  "-g"
---- 13,19 ----
-  "#/System/base.a #/System/GC/gc.a -lm"
-  
-  -- extra args to pass to C compile if optimization turned on
-! "-O2"
-  
-  -- extra args to pass to C compile if debugging turned on
-  "-g"
+--- System/Common/CONFIG.proto.orig	Thu Nov  4 03:48:17 1999
++++ System/Common/CONFIG.proto	Wed Feb  2 20:25:35 2000
+@@ -23,12 +23,12 @@
+ ZONES:			false;
+ TRACE:			false;
+ LIBRARY:		"SATHER_LIBRARY","Library/Library.module";
+-VERSION:		"1.2b";
+-C_COMPILER:		"gcc ";
+-CC_OPTIONS:		"";
+-GC_LINK:		"-lgc";
++VERSION:		"1.2.1";
++C_COMPILER:		"%%CC%% ";
++CC_OPTIONS:		"-I$%%LOCALBASE%%/include";
++GC_LINK:		"-lgc -L%%LOCALBASE%%/lib";
+ LINK_OPTIONS:		"-lm";
+-MAKE_COMMAND:		"make";
++MAKE_COMMAND:		"%%GMAKE%%";
+ OBJECT_EXT:		".o";
+ LIB_EXT:		".a";
+ C_EXT:			".c";
+@@ -38,7 +38,7 @@
+ SEPARATE_POINTERS:	false;
+ PSATHER_FLAG:		"","";
+ CC_DEBUG_FLAG:		"","-g";
+-CC_OPTIMIZE_FLAG:	"","-O2";
++CC_OPTIMIZE_FLAG:	"","%%CFLAGS%%";
+ CC_PROLIX_FLAG:		"",""; -- passed to the C compiler (prolix implies verbose)
+ MAKE_VERBOSE_FLAG:	"-s","-s"; -- passed to make
+ 
diff --git a/lang/Sather/files/patch-03 b/lang/Sather/files/patch-03
new file mode 100644
index 000000000000..55b1fa904336
--- /dev/null
+++ b/lang/Sather/files/patch-03
@@ -0,0 +1,14 @@
+--- Boot/sacomp.code/Makefile.orig	Thu Nov  4 17:04:49 1999
++++ Boot/sacomp.code/Makefile	Wed Feb  2 21:02:52 2000
+@@ -1,8 +1,8 @@
+ SHOME  =../..
+-CFLAGS = -I.  -O2  -I../System/Common
+-CC     =gcc 
++CFLAGS += -I. -I../System/Common -I${LOCALBASE}/include
++CC     ?=gcc 
+ HDR    =sather.h tags.h
+-LIBS   = -lgc -lm
++LIBS   = -lgc -lm -L${LOCALBASE}/lib
+ CS     =sacomp
+ OBJ    = a_stackA_STACK2014955575.o am_outAM_OUT1363671444.o am_outAM_OUT1363671444x.o arefFSETAM_ROU1518004496.o arefFSETIMMUTA2116029667.o arefFSETTUPSIG268064465.o arrayARRAYAM_I1084914261.o arrayARRAYTUPI1927875024.o as_outAS_OUT1429002792.o as_outAS_OUT1429002792x.o cgenCGEN1354269066.o cgenCGEN1354269066x.o cgenCGEN1354269066xx.o cgenCGEN1354269066xxx.o cgenCGEN1354269066xxxx.o cgenCGEN1354269066xxxxx.o cgenCGEN1354269066xxxxxx.o cgenCGEN1354269066xxxxxxx.o cgenCGEN1354269066xxxxxxxx.o cgenCGEN1354269066xxxxxxxxx.o cgenCGEN1354269066xxxxxxxxxx.o code_fileCODE_372141741.o configCONFIG_R422014871.o cs_optionsCS_O301318552.o cs_optionsCS_O301318552x.o cursorAM_CURSO1314676474.o cursorAM_CURSO1314676474x.o cursorAM_CURSO1314676474xx.o cursorAM_CURSO1314676474xxx.o dispatch.o eltELT742463773.o elt_algELT_ALG1548486913.o elt_algELT_ALG241706736.o elt_algELT_ALG433952755.o elt_algELT_ALG656599769.o elt_algELT_ALG987448979.o flistFLISTAM_C1171004157.o flistFLISTTUPA253333040.o fmapFMAPAM_ROU1000508936.o fmapFMAPSTRFSE258056667.o fmapFMAPdTPCOD1051074108.o generate_amGEN60284023.o get_optionsCOD183550016.o globals.o get_optionsCOD183550016x.o implIMPL_CREAT99472218.o inlineINLINE_I1557365391.o intiINTI1462257232.o layoutCLASS_LA1330944056.o mangleMANGLE1705139666.o mangleNAMESPAC760510184.o o_localOPT_LOC907909712.o o_localOPT_LOC907909712x.o optimizeOPT_CO1177876774.o optimizeOPT_IT1193060919.o parsePARSER311504339.o parsePARSER311504339x.o parsePARSER311504339xx.o parsePARSER311504339xxx.o parsePARSER311504339xxxx.o progPROG_AS_TB824135997.o scanSCANNER1990933774.o side_effectSE_411721069.o strings.o stringsx.o stringsxx.o system.o stmtAM_FORK_ST1674905658.o tpTP_BUILTIN1142074570.o tpTP_ITER145455607.o transTRANS2123847391.o transTRANS2123847391x.o transTRANS2123847391xx.o transTRANS2123847391xxx.o transTRANS2123847391xxxx.o tupTUPAM_CURSO1313579705.o unbox.o unixUNIX1766692.o runtime.o
+ OTHER  =
diff --git a/lang/Sather/files/patch-04 b/lang/Sather/files/patch-04
new file mode 100644
index 000000000000..69c0786ca55b
--- /dev/null
+++ b/lang/Sather/files/patch-04
@@ -0,0 +1,14 @@
+--- System/Platforms/unix/header.h.orig	Sat Sep 11 23:33:03 1999
++++ System/Platforms/unix/header.h	Wed Feb  2 20:57:51 2000
+@@ -15,7 +15,11 @@
+ #define _HEADER_H_
+ 
+ #ifndef ZONES
++#  ifdef __FreeBSD__
++#  include <gc.h>
++#  else
+ #  include <gc/gc.h>
++#  endif
+ #endif
+ 
+ #include "../../Common/c_header.h"
diff --git a/lang/Sather/files/patch-ab b/lang/Sather/files/patch-ab
index 2157181aa7b8..1adc6c67faa1 100644
--- a/lang/Sather/files/patch-ab
+++ b/lang/Sather/files/patch-ab
@@ -1,35 +1,13 @@
-*** Makefile.0	Thu Feb 16 07:44:53 1995
---- Makefile	Sat Feb 25 01:12:57 1995
-***************
-*** 23,37 ****
-  #
-  # Don't forget to edit (or at least inspect) the file System/CONFIG.proto.
-  
-! CPP= /lib/cpp -C -P
-  RANLIB= ranlib
-  CC= gcc 
-! CFLAGS= -O
-  GC_CC= ${CC}
-  MV= mv
-  CMP= cmp
-  CS= cs
-! SHOME= /u/davids/Sather/Working
-  AR= ar
-  RM= rm -f
-  TEST= test
---- 23,37 ----
-  #
-  # Don't forget to edit (or at least inspect) the file System/CONFIG.proto.
-  
-! CPP= /usr/bin/cpp -C -P
-  RANLIB= ranlib
-  CC= gcc 
-! CFLAGS= -O2
-  GC_CC= ${CC}
-  MV= mv
-  CMP= cmp
-  CS= cs
-! SHOME= ..
-  AR= ar
-  RM= rm -f
-  TEST= test
+--- Makefile.orig	Thu Nov  4 17:04:28 1999
++++ Makefile	Wed Feb  2 19:46:11 2000
+@@ -30,8 +30,8 @@
+ LN=ln -s
+ CP=cp
+ 
+-CPP=/lib/cpp -C -P
+-CC=gcc
++CPP=/usr/bin/cpp -C -P
++CC?=gcc
+ EXEC_SUFFIX=
+ # CC is only used for bootstrapping, check System/Common/CONFIG.proto if
+ # you want to change it for all Sather compilations
diff --git a/lang/Sather/pkg-descr b/lang/Sather/pkg-descr
index 90d675f8a28a..99628bf165e3 100644
--- a/lang/Sather/pkg-descr
+++ b/lang/Sather/pkg-descr
@@ -15,3 +15,5 @@ parameterized classes, dynamic dispatch, iteration abstraction,
 higher-order routines and iters, exception handling, assertions,
 preconditions, postconditions, and class invariants.  Sather code can
 be compiled into C code and can efficiently link with C object files.
+
+WWW:  http://www.gnu.org/software/sather/
diff --git a/lang/Sather/pkg-plist b/lang/Sather/pkg-plist
index 60c0ac699b22..a9d71714c253 100644
--- a/lang/Sather/pkg-plist
+++ b/lang/Sather/pkg-plist
@@ -1,8 +1,8 @@
-bin/cs
+bin/sacomp
 share/doc/sather/Bugs
 share/doc/sather/Changes
 share/doc/sather/Contributing
 share/doc/sather/FAQ
 share/doc/sather/License
 share/doc/sather/README
-share/doc/sather/manual.ps
+share/doc/sather/programmer-manual.ps