Remove most expired ports:

2011-04-17 cad/tclspice: has been broken for more than a year 2011-04-17 comms/hcfmdm: does not compile on 7.X or higher 2011-04-17 databases/mysqlcc: has been broken for almost a year 2011-04-17 devel/ruby-rjudy: does not compile on FreeBSD 7.x or newer 2011-04-17 devel/xfc: does not compile on FreeBSD 7.x or newer 2011-04-17 devel/lamson: has been broken for a half year 2011-04-17 devel/cocktail: does not build on FreeBSD 7.x or newer 2011-04-17 devel/djgpp-gcc: has been broken for half a year 2011-04-17 devel/gauche-sdl: has been broken for a year 2011-04-17 devel/gdb53-act: does not compile on FreeBSD 7.x and up 2011-04-17 editors/zed: does not compile on FreeBSD 7.x or newer 2011-04-17 games/aqbubble: does not compile on FreeBSD 7.x or newer 2011-04-17 graphics/libvisual-plugins: has been broken for 3 years 2011-04-17 japanese/roundcube: has been broken for almost a year 2011-04-17 japanese/tkstep80: does not compile on FreeBSD 7.x or newer 2011-04-17 lang/u++: has been broken for over a half year 2011-04-17 lang/pugs: has been broken for over a year 2011-04-17 lang/mozart: does not compile on FreeBSD 7.x or newer 2011-04-17 math/linalg: does not build on FreeBSD 7.x or newer 2011-04-17 math/R-cran-igraph: has been broken for over a half year 2011-04-17 misc/ftree: has been broken for over a half year 2011-04-17 multimedia/katchtv: has been broken for a half year 2011-04-17 multimedia/libomxil-bellagio: has been broken for almost a year 2011-04-17 multimedia/banshee-mirage: has been broken for over a half year 2011-04-17 net-p2p/trackerbt: has been broken for a half year 2011-04-17 net/cap: does not compile on FreeBSD 7.x or newer 2011-04-17 net/ggsd: does not compile on FreeBSD 7.x or newer 2011-04-17 net/b2bua: does not compile on FreeBSD 7.x or newer 2011-04-17 net/penguintv: has been broken for a half year 2011-04-17 news/openftd: has been broken for almost a year 2011-04-17 palm/romeo: does not compile on FreeBSD 7.x or newer 2011-04-17 science/pcp: does not compile on FreeBSD 7.x or newer 2011-04-17 science/elmer-fem: has been broken for over a year 2011-04-17 security/newpki-lib: does not compile on FreeBSD 7.x or newer 2011-04-17 security/newpki-server: does not compile on FreeBSD 7.x or newer 2011-04-17 security/xmlsec: does not compile on FreeBSD 7.x or newer 2011-04-17 security/f-protd: has been broken for over a year 2011-04-17 sysutils/xwlans: does not compile on FreeBSD 7.x or newer 2011-04-17 www/bk_edit: does not compile on FreeBSD 7.x and newer 2011-04-17 www/bricolage: has been broken for a half year 2011-04-17 x11-toolkits/gauche-gtk: has been broken for a year 2011-04-17 x11-toolkits/gambas2-gb-qt: has been broken for over a year 2011-04-17 x11-toolkits/php-gtk2: has been broken for over a half year 2011-04-17 x11-toolkits/p5-Tcl-Tk: has been broken for 2 year 2011-04-17 x11/metisse: has been broken for over a half year
svn path=/head/; revision=272897
2024-12-29 05:38:00 +00:00 · 2011-04-18 22:25:41 +00:00 · 2011-04-18 22:25:41 +00:00 · 48f1d8c469 · 2021-03-31 03:12:20 +00:00
commit 48f1d8c469
parent 1042e1bbe9
499 changed files with 45 additions and 28437 deletions
--- a/5
+++ b/5
@ -79,7 +79,6 @@ bzip-*			archivers/bzip		Some algorithms used may
 						Opinions differ.  Commercial
 						use could render you liable
 						to unfriendly legal action
-cap60/*			net/cap			Do not sell for profit
 ccc-*.alpha.rpm		lang/compaq-cc		Distribution not allowed
 citrix_ica-*		net/citrix_ica		License prohibits redistribution
 cli_freebsd*		sysutils/arcconf	May not be redistributed
@ -166,8 +165,6 @@ ezmlm-*			mail/ezmlm		No license -- see
 						http://cr.yp.to/softwarelaw.html
 ezmlm-*			mail/ezmlm-idx		No license -- see
 						http://cr.yp.to/softwarelaw.html
-f-protd			security/f-protd	60 days free of trial for
-						everybody
 f6kuzzzz.taz		databases/libudbc	Downloading and redistribution
 						terms are unclear
 faac*			audio/faac		Restrictive copyright (do not
@ -210,7 +207,6 @@ fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data	Only Unreal Voodoo
 						the music
 fsharp/*		lang/fsharp		Microsoft Research Shared Source
 						License Agreement
-ftree-*			misc/ftree		Cannot distribute commercially
 fwtk/*			security/fwtk		No redistribution allowed
 XFrisk-*		games/xfrisk		Copyright/trademark violation?
 gap/*			math/gap		Do not sell for profit
@ -238,7 +234,6 @@ groupoffice-com-*	www/groupoffice		Free for personal use only
 gsview*			print/gsview		Can only be distributed for free
 GTL-*			misc/gtl		Non-commercial use only,
 						license forbids redistribution
-hcfmdm/*		comms/hcfmdm		No redistribution allowed
 himeno/*		benchmarks/himenobench	Uncertain to distribute sources
 						and binaries
 HyperSpec-*		devel/clisp-hyperspec	Commercial redistribution
--- a/45
+++ b/45
@ -1700,3 +1700,48 @@ sysutils/rsyslog5-devel-relp|sysutils/rsyslog5-relp|2011-04-14|5.8.0 is the -sta
 sysutils/rsyslog5-devel-rfc3195|sysutils/rsyslog5-rfc3195|2011-04-14|5.8.0 is the -stable for 5.7.x, and 5.6.x is now deprecated
 sysutils/rsyslog5-devel-snmp|sysutils/rsyslog5-snmp|2011-04-14|5.8.0 is the -stable for 5.7.x, and 5.6.x is now deprecated
 net-im/pickwick|net-im/chattahoochie|2011-04-15|Project renamed
+cad/tclspice||2011-04-18|Has expired: has been broken for more than a year
+comms/hcfmdm||2011-04-18|Has expired: does not compile on 7.X or higher
+databases/mysqlcc||2011-04-18|Has expired: has been broken for almost a year
+devel/ruby-rjudy||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+devel/xfc||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+devel/lamson||2011-04-18|Has expired: has been broken for a half year
+devel/cocktail||2011-04-18|Has expired: does not build on FreeBSD 7.x or newer
+devel/djgpp-gcc||2011-04-18|Has expired: has been broken for half a year
+devel/gauche-sdl||2011-04-18|Has expired: has been broken for a year
+devel/gdb53-act||2011-04-18|Has expired: does not compile on FreeBSD 7.x and up
+editors/zed||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+games/aqbubble||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+graphics/libvisual-plugins||2011-04-18|Has expired: has been broken for 3 years
+japanese/roundcube||2011-04-18|Has expired: has been broken for almost a year
+japanese/tkstep80||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+lang/u++||2011-04-18|Has expired: has been broken for over a half year
+lang/pugs||2011-04-18|Has expired: has been broken for over a year
+lang/mozart||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+math/linalg||2011-04-18|Has expired: does not build on FreeBSD 7.x or newer
+math/R-cran-igraph||2011-04-18|Has expired: has been broken for over a half year
+misc/ftree||2011-04-18|Has expired: has been broken for over a half year
+multimedia/katchtv||2011-04-18|Has expired: has been broken for a half year
+multimedia/libomxil-bellagio||2011-04-18|Has expired: has been broken for almost a year
+multimedia/banshee-mirage||2011-04-18|Has expired: has been broken for over a half year
+net-p2p/trackerbt||2011-04-18|Has expired: has been broken for a half year
+net/cap||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+net/ggsd||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+net/b2bua||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+net/penguintv||2011-04-18|Has expired: has been broken for a half year
+news/openftd||2011-04-18|Has expired: has been broken for almost a year
+palm/romeo||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+science/pcp||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+science/elmer-fem||2011-04-18|Has expired: has been broken for over a year
+security/newpki-lib||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+security/newpki-server||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+security/xmlsec||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+security/f-protd||2011-04-18|Has expired: has been broken for over a year
+sysutils/xwlans||2011-04-18|Has expired: does not compile on FreeBSD 7.x or newer
+www/bk_edit||2011-04-18|Has expired: does not compile on FreeBSD 7.x and newer
+www/bricolage||2011-04-18|Has expired: has been broken for a half year
+x11-toolkits/gauche-gtk||2011-04-18|Has expired: has been broken for a year
+x11-toolkits/gambas2-gb-qt||2011-04-18|Has expired: has been broken for over a year
+x11-toolkits/php-gtk2||2011-04-18|Has expired: has been broken for over a half year
+x11-toolkits/p5-Tcl-Tk||2011-04-18|Has expired: has been broken for 2 year
+x11/metisse||2011-04-18|Has expired: has been broken for over a half year
--- a/cad/Makefile
+++ b/cad/Makefile
@ -95,7 +95,6 @@
    SUBDIR += slffea
    SUBDIR += spice
    SUBDIR += systemc
-    SUBDIR += tclspice
    SUBDIR += tkgate
    SUBDIR += tochnog
    SUBDIR += transcalc
--- a/cad/tclspice/Makefile
+++ b/cad/tclspice/Makefile
@ -1,72 +0,0 @@
-# New ports collection makefile for:	tclspice
-# Date created:		2006-06-24
-# Whom:			Stanislav Sedov <stas@fonon.realnet>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tclspice
-PORTVERSION=	0.2.18
-PORTREVISION=	6
-CATEGORIES=	cad
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
-
-MAINTAINER=	ssedov@mbsd.msk.ru
-COMMENT=	Improved version on SPICE3 suite with TCL scripting features
-
-BUILD_DEPENDS=	bltwish:${PORTSDIR}/x11-toolkits/blt \
-		${LOCALBASE}/lib/libtclreadline.so:${PORTSDIR}/devel/tclreadline
-RUN_DEPENDS=	bltwish:${PORTSDIR}/x11-toolkits/blt \
-		${LOCALBASE}/lib/libtclreadline.so:${PORTSDIR}/devel/tclreadline
-
-BROKEN=		does not compile
-DEPRECATED=	has been broken for more than a year
-EXPIRATION_DATE=2011-04-17
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS=	aclocal automake autoconf libtool
-AUTOMAKE_ARGS=	-c -a
-USE_GMAKE=	yes
-ALL_TARGET=	tcl
-INSTALL_TARGET=	install-tcl
-USE_LDCONFIG=	yes
-
-SUB_FILES=	pkg-message
-
-OPTIONS=	EXPERIMENTAL "Enable experimental features" on \
-		EXAMPLES "Install sample scripts" on
-
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS} -fPIC" \
-		LDFLAGS="-L${LOCALBASE}/lib -ltcl84 -lBLT24"
-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
-
-WISH=		${LOCALBASE}/bin/wish8.4
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_EXPERIMENTAL)
-CONFIGURE_ARGS+=	--enable-experimental
-.endif
-
-.if !defined(WITHOUT_EXAMPLES)
-PLIST_SUB+=	EXAMPLES=""
-.else
-PLIST_SUB+=	EXAMPLES="@comment "
-.endif
-
-post-patch:
-.for FILE in spicewish tcl/plot.tcl tcl/vector_test.tcl
-	@${REINPLACE_CMD} -e 's|%%WISH%%|${WISH}|g' ${WRKSRC}/src/${FILE}
-.endfor
-
-post-install:
-.if !defined(WITHOUT_EXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-.for FILE in README example.cir plot.tcl vector_test.tcl
-	@${INSTALL_DATA} ${WRKSRC}/src/tcl/${FILE} ${EXAMPLESDIR}
-.endfor
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.include <bsd.port.post.mk>
--- a/cad/tclspice/distinfo
+++ b/cad/tclspice/distinfo
@ -1,2 +0,0 @@
-SHA256 (tclspice-0.2.18.tar.gz) = 0393a61b89a56b5dba2444a8914cb85b6212b552f2fbc80f0a822bfe04b74f5e
-SIZE (tclspice-0.2.18.tar.gz) = 2985319
--- a/cad/tclspice/files/patch-src_Makefile.am
+++ b/cad/tclspice/files/patch-src_Makefile.am
@ -1,49 +0,0 @@
--- src/Makefile.am.orig	Fri Jul 23 20:22:10 2004
-+++ src/Makefile.am	Sat Jun 24 03:43:15 2006
-@@ -181,12 +181,12 @@
- 
- pkgIndex.tcl: pkgIndex.tcl.in
- 	rm -f $@
-	sed -e 's;%LIB_DIR%;$(TCL_PKG_PATH);g' $< | \
-+	sed -e 's;%LIB_DIR%;$(libdir);g' $< | \
- 	sed -e 's;%VERSION%;$(TCLSPICE_VERSION);g' > $@
- 
- spicepp.pl: spicepp.pl.in
- 	rm -f $@
-	sed -e 's;%LIB_DIR%;$(TCL_PKG_PATH);g' $< | \
-+	sed -e 's;%LIB_DIR%;$(libdir);g' $< | \
- 	sed -e 's;%VERSION%;$(TCLSPICE_VERSION);g' > $@
- 
- install-tcl: install-tcl-recursive install-tclspice install-data-am
-@@ -199,17 +199,17 @@
- 	done; 
- 
- install-tclspice: $(TCL_FILES)
-	$(mkinstalldirs) $(DESTDIR)$(TCL_PKG_PATH)
-	$(INSTALL_DATA) libspice.so $(DESTDIR)$(TCL_PKG_PATH)
-	$(mkinstalldirs) $(DESTDIR)$(TCL_PKG_PATH)/spice
-	$(INSTALL_PROGRAM) spicepp.pl $(DESTDIR)$(TCL_PKG_PATH)/spice
-	$(INSTALL_PROGRAM) measure_spice.pl $(DESTDIR)$(TCL_PKG_PATH)/spice
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	$(INSTALL_DATA) libspice.so $(DESTDIR)$(libdir)
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/tclspice
-+	$(INSTALL_SCRIPT) spicepp.pl $(DESTDIR)$(libdir)/tclspice
-+	$(INSTALL_SCRIPT) measure_spice.pl $(DESTDIR)$(libdir)/tclspice
- 	@for f in $(TCL_SOURCE) ; do \
-	echo $(INSTALL_DATA) $$f $(DESTDIR)$(TCL_PKG_PATH)/spice; \
-	$(INSTALL_DATA) $$f $(DESTDIR)$(TCL_PKG_PATH)/spice; \
-+	echo $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/tclspice; \
-+	$(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/tclspice; \
- 	done
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) spicewish $(DESTDIR)$(bindir)
-+	$(INSTALL_SCRIPT) spicewish $(DESTDIR)$(bindir)
- 
- tclspice.o: tclspice.c
- 	$(COMPILE) -c -fpic tclspice.c -DTCLSPICE_version="\"$(TCLSPICE_VERSION)\""
-@@ -229,4 +229,4 @@
- 	(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) all) \
- 	|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- 	done;	
-	make $(TCL_FILES)
-+	gmake $(TCL_FILES)
--- a/cad/tclspice/files/patch-src_frontend_aspice.c
+++ b/cad/tclspice/files/patch-src_frontend_aspice.c
@ -1,11 +0,0 @@
--- ./src/frontend/aspice.c.orig	Sat Jun 24 01:39:15 2006
-+++ ./src/frontend/aspice.c	Sat Jun 24 01:39:39 2006
-@@ -176,7 +176,7 @@
-  * whether the exit was normal or not.
-  */
- 
-#if defined(__NetBSD__) || defined(SOLARIS)
-+#if defined(__NetBSD__) || defined(SOLARIS) || defined(__FreeBSD__)
-     pid_t status;
- #else
-     union wait status;
--- a/cad/tclspice/files/patch-src_frontend_parser_complete.c
+++ b/cad/tclspice/files/patch-src_frontend_parser_complete.c
@ -1,45 +0,0 @@
--- ./src/frontend/parser/complete.c.orig	Sat Jun 24 01:40:09 2006
-+++ ./src/frontend/parser/complete.c	Sat Jun 24 01:40:17 2006
-@@ -415,7 +415,7 @@
- #  else
- #    ifdef HAVE_TERMIOS_H
- 
-#      if defined(__NetBSD__) || defined(__APPLE_CC__)
-+#      if defined(__NetBSD__) || defined(__APPLE_CC__) || defined(__FreeBSD__)
- #        define TCGETS
- #        define TCSETS
- #      endif
-@@ -428,7 +428,7 @@
- #    endif
- #  endif
- 
-#  if defined(TERM_GET) || defined(__NetBSD__) || defined(__APPLE_CC__)
-+#  if defined(TERM_GET) || defined(__NetBSD__) || defined(__APPLE_CC__) || defined(__FreeBSD__)
-     static bool ison = FALSE;
- 
-     if (cp_nocc || !cp_interactive || (ison == on))
-@@ -436,7 +436,7 @@
-     ison = on;
- 
-     if (ison == TRUE) {
-#if defined(__NetBSD__) || defined(__APPLE_CC__)
-+#if defined(__NetBSD__) || defined(__APPLE_CC__) || defined(__FreeBSD__)
- 	tcgetattr(fileno(cp_in),&OS_Buf);
- #else
- 	(void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
-@@ -445,13 +445,13 @@
- 	sbuf.c_cc[VEOF] = 0;
- 	sbuf.c_cc[VEOL] = ESCAPE;
- 	sbuf.c_cc[VEOL2] = CNTRL_D;
-#if defined(__NetBSD__) || defined(__APPLE_CC__)
-+#if defined(__NetBSD__) || defined(__APPLE_CC__) || defined(__FreeBSD__)
- 	tcsetattr(fileno(cp_in),TCSANOW,&sbuf);
- #else
- 	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
- #endif
-     } else {
-#if defined(__NetBSD__) || defined(__APPLE_CC__)
-+#if defined(__NetBSD__) || defined(__APPLE_CC__) || defined(__FreeBSD__)
- 	tcsetattr(fileno(cp_in),TCSANOW,&OS_Buf);
- #else
- 	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
--- a/cad/tclspice/files/patch-src_frontend_resource.c
+++ b/cad/tclspice/files/patch-src_frontend_resource.c
@ -1,41 +0,0 @@
--- src/frontend/resource.c.orig	Sat Jun 24 04:53:17 2006
-+++ src/frontend/resource.c	Sat Jun 24 04:55:41 2006
-@@ -311,7 +311,7 @@
- static RETSIGTYPE
- fault(void)
- {
-	signal(SIGSEGV, (SIGNAL_FUNCTION) fault);	/* SysV style */
-+	signal(SIGBUS, (SIGNAL_FUNCTION) fault);	/* SysV style */
- 	siglongjmp(env, 1);
- }
- #if !defined(__MINGW32__) && !defined(__APPLE_CC__)
-@@ -321,7 +321,8 @@
- 	char *low, *high, *at;
- 	/* char *sbrk(int);  */
- 	long x;
-	RETSIGTYPE	(*orig_signal)( );
-+	RETSIGTYPE	(*orig_sigsegv)( );
-+	RETSIGTYPE	(*orig_sigbus)( );
- 
- 	if (getenv("SPICE_NO_DATASEG_CHECK"))
- 		return 0;
-@@ -330,7 +331,8 @@
- 	low = 0;
- 	high = (char *) ((unsigned long) sbrk(0) & ~((1 << LOG2_PAGESIZE) - 1));
- 
-	orig_signal = signal(SIGSEGV, (SIGNAL_FUNCTION) fault);
-+	orig_sigsegv = signal(SIGSEGV, (SIGNAL_FUNCTION) fault);
-+	orig_sigbus = signal(SIGBUS, (SIGNAL_FUNCTION) fault);
- 
- 	do {
- 
-@@ -358,7 +360,8 @@
- 
- 	} while (1);
- 
-	(void) signal(SIGSEGV, (SIGNAL_FUNCTION) orig_signal);
-+	(void) signal(SIGSEGV, (SIGNAL_FUNCTION) orig_sigsegv);
-+	(void) signal(SIGBUS, (SIGNAL_FUNCTION) orig_sigbus);
- 	return (void *) high;
- }
- #endif
--- a/cad/tclspice/files/patch-src_frontend_subckt.c
+++ b/cad/tclspice/files/patch-src_frontend_subckt.c
@ -1,20 +0,0 @@
--- src/frontend/subckt.c.orig	Sat Dec 16 21:03:20 2006
-+++ src/frontend/subckt.c	Sat Dec 16 21:03:58 2006
-@@ -79,7 +79,7 @@
- static int  numdevs(char *s);
- static bool modtranslate(struct line *deck, char *subname);
- static void devmodtranslate(struct line *deck, char *subname);
-static int inp_numnodes(char c);
-+int inp_numnodes(char c);
- 
- /*---------------------------------------------------------------------
-  * table is used in settrans and gettrans -- it holds the netnames used 
-@@ -1860,7 +1860,7 @@
-  * else, but...  Note that we pretend that dependent sources and mutual
-  * inductors have more nodes than they really do...
-  *----------------------------------------------------------------------*/
-static int
-+int
- inp_numnodes(char c)
- {
-     if (isupper(c))
--- a/cad/tclspice/files/patch-src_spicelib_devices_names.c
+++ b/cad/tclspice/files/patch-src_spicelib_devices_names.c
@ -1,10 +0,0 @@
--- ./src/spicelib/devices/names.c.orig	Sat Jun 24 02:01:08 2006
-+++ ./src/spicelib/devices/names.c	Sat Jun 24 02:01:17 2006
-@@ -28,7 +28,6 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <string.h>
-#include <malloc.h>
- 
- #define __NAMES_PRIVATE__
- #include "names.h"
--- a/cad/tclspice/files/patch-src_spicepp.pl.in
+++ b/cad/tclspice/files/patch-src_spicepp.pl.in
@ -1,11 +0,0 @@
--- src/spicepp.pl.in.orig	Sat Jun 24 03:44:04 2006
-+++ src/spicepp.pl.in	Sat Jun 24 03:44:16 2006
-@@ -307,7 +307,7 @@
-       push(@xtra, ".control");
-       push(@xtra, "print time $trig $targ > meas.data");
-       push(@xtra, "echo $_ > meas.ctl");
-      push(@xtra, "shell %LIB_DIR%/spice/measure_spice.pl $name");
-+      push(@xtra, "shell %LIB_DIR%/tclspice/measure_spice.pl $name");
-       push(@xtra, ".endc");
-       splice(@deck,$i,1,@xtra);
-       @xtra=();
--- a/cad/tclspice/files/patch-src_spicewish
+++ b/cad/tclspice/files/patch-src_spicewish
@ -1,11 +0,0 @@
--- src/spicewish.orig	Sat Jun 24 04:21:41 2006
-+++ src/spicewish	Sat Jun 24 04:21:59 2006
-@@ -2,7 +2,7 @@
- # 22/6/04 -ad
- 
- # the next line starts SpiceWish interactively with the given file name  \
-exec wish "$0" "$@"
-+exec %%WISH%% "$0" "$@"
- 
- package require spice
- package require tclreadline
--- a/cad/tclspice/files/patch-src_tcl_plot.tcl
+++ b/cad/tclspice/files/patch-src_tcl_plot.tcl
@ -1,10 +0,0 @@
--- src/tcl/plot.tcl.orig	Sat Jun 24 05:36:11 2006
-+++ src/tcl/plot.tcl	Sat Jun 24 05:36:33 2006
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # WishFix \
-	exec wish -f "$0" ${1+"$@"}
-+	exec %%WISH%% -f "$0" ${1+"$@"}
- ###
- 
- package require spice
--- a/cad/tclspice/files/patch-src_tcl_vector_test.tcl
+++ b/cad/tclspice/files/patch-src_tcl_vector_test.tcl
@ -1,10 +0,0 @@
--- src/tcl/vector_test.tcl.orig	Sat Jun 24 05:37:20 2006
-+++ src/tcl/vector_test.tcl	Sat Jun 24 05:37:14 2006
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # WishFix \
-	exec wish -f "$0" ${1+"$@"}
-+	exec %%WISH%% -f "$0" ${1+"$@"}
- ###
- 
- package require BLT
--- a/cad/tclspice/files/patch-src_xspice_icm_Makefile
+++ b/cad/tclspice/files/patch-src_xspice_icm_Makefile
@ -1,14 +0,0 @@
--- src/xspice/icm/Makefile.orig	Sat Jun 24 05:04:12 2006
-+++ src/xspice/icm/Makefile	Sat Jun 24 05:04:39 2006
-@@ -12,9 +12,9 @@
- -include .deps/cm.P
- -include .deps/dlmain.P
- 
-UPMAKE = make -f $(TOPDIR)../Makefile TOPDIR=$(TOPDIR)../
-+UPMAKE = gmake -f $(TOPDIR)../Makefile TOPDIR=$(TOPDIR)../
- 
-MAKE = make -f $(TOPDIR)Makefile TOPDIR=$(TOPDIR)
-+MAKE = gmake -f $(TOPDIR)Makefile TOPDIR=$(TOPDIR)
- 
- COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
- 
--- a/cad/tclspice/files/pkg-message.in
+++ b/cad/tclspice/files/pkg-message.in
@ -1,7 +0,0 @@
-============================================================================
-
-Example scrips was installed in %%EXAMPLESDIR%%. Take a
-look on %%EXAMPLESDIR%%/README for additional information
-on how to create your own Tcl scrips.
-
-============================================================================
--- a/cad/tclspice/pkg-descr
+++ b/cad/tclspice/pkg-descr
@ -1,19 +0,0 @@
-TclSpice is an improved version of Berkeley Spice designed to be used with
-the Tcl/Tk scripting language. The project is open-source (BSD license)
-and based upon the NG-Spice source code base with many improvements
-
-Features and Improvements
- - Fully Tcl scriptable - installs with 'package require spice' statement
- - Hspice syntax (SpicePP).
- - GUI interfaces, various (Tk).
- - SpiceWish (BLT graph widget)
- - BLT (tcl compatible) vectors for storage, manipulation and arithmetic
-	upon Spice waveforms.
- - Xspice additions (Georgia Tech).
- - Trigger upon waveform events.
- - Spice 'simulator state' save and restore for rapid 'what-if' simulations
-	(no longer need to re-simulate from the beginning each time a
-	device value is changed).
-
-Author:	Stefan Jones <stefan.jones@multigig.com>
-WWW:	http://tclspice.sourceforge.net/
--- a/cad/tclspice/pkg-plist
+++ b/cad/tclspice/pkg-plist
@ -1,28 +0,0 @@
-bin/spicewish
-lib/libspice.so
-lib/tclspice/controls.tcl
-lib/tclspice/engUnits.tcl
-lib/tclspice/gnuplot.tcl
-lib/tclspice/measure.tcl
-lib/tclspice/measure_spice.pl
-lib/tclspice/nodeDialog.tcl
-lib/tclspice/pkgIndex.tcl
-lib/tclspice/readline.tcl
-lib/tclspice/spicepp.pl
-lib/tclspice/spicepp.tcl
-lib/tclspice/spicewish.tcl
-lib/tclspice/viewer.tcl
-%%DATADIR%%/helpdir/ngspice.idx
-%%DATADIR%%/helpdir/ngspice.txt
-%%DATADIR%%/scripts/setplot
-%%DATADIR%%/scripts/spectrum
-%%DATADIR%%/scripts/spinit
-%%EXAMPLES%%share/examples/tclspice/README
-%%EXAMPLES%%share/examples/tclspice/example.cir
-%%EXAMPLES%%share/examples/tclspice/plot.tcl
-%%EXAMPLES%%share/examples/tclspice/vector_test.tcl
-%%EXAMPLES%%@dirrm share/examples/tclspice
-@dirrm lib/tclspice
-@dirrm %%DATADIR%%/helpdir
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%
--- a/comms/Makefile
+++ b/comms/Makefile
@ -50,7 +50,6 @@
    SUBDIR += gsmlib
    SUBDIR += hamfax
    SUBDIR += hamlib
-    SUBDIR += hcfmdm
    SUBDIR += hcidump
    SUBDIR += hf
    SUBDIR += hso-kmod
--- a/comms/hcfmdm/Makefile
+++ b/comms/hcfmdm/Makefile
@ -1,75 +0,0 @@
-# New ports collection makefile for:	hcfmdm
-# Date Created:				Jul 30, 2006
-# Whom:					Alexey Illarionov <littlesavage@rambler.ru>
-#
-# Based on: ltmdm created by Daniel O'Connor <darius@dons.net.au>
-# Based on: $FreeBSD$
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hcfmdm
-PORTVERSION=	0.99.1
-PORTREVISION=	1
-CATEGORIES=	comms kld
-MASTER_SITES=	http://lug.cbx.ru/files/modem/ \
-		http://www.int21.de/conexant/ \
-		${MASTER_SITE_GENTOO} \
-		http://marvin.lirex.com/~maxx/ \
-		http://zoltek7.webpark.pl/ \
-		http://www.linuxant.com/drivers/hsf/free/archive/
-DISTFILES=	hcfmdm-0.99.1.tar.gz \
-		hcfpcimodem-0.99lnxtbeta03042700.tar.gz
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	hcfmdm-0.99.1.tar.gz hcfpcimodem-0.99lnxtbeta03042700.tar.gz
-
-MAINTAINER=	littlesavage@rambler.ru
-COMMENT=	Driver for the Conexant HCF PCI winmodem chipset (Acorp PIM/PIM2)
-
-BROKEN=		does not compile on 7.X or higher
-DEPRECATED=	does not compile on 7.X or higher
-EXPIRATION_DATE=2011-04-17
-
-MODULES_WITH_WORLD?=	yes
-ONLY_FOR_ARCHS=	i386
-SUB_FILES+=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-RESTRICTED=	Redistribution of versions marked lnxtbeta requires explicit written approval from Linuxant
-RESTRICTED_FILES=	hcfpcimodem-0.99lnxtbeta03042700.tar.gz
-NO_CDROM=	No redistribution allowed
-NO_PACKAGE=	${NO_CDROM}
-
-LNXTDOCS=	README FAQ BUGS
-PORTDOCS=	${LNXTDOCS} 100498D_RM_HxF_Released.pdf
-
-.include <bsd.port.pre.mk>
-
-PLIST_SUB+=	KMODDIR=${KMODDIR}
-
-.if !defined(NOPORTDOCS)
-DISTFILES+=	100498D_RM_HxF_Released.pdf
-.endif
-
-pre-fetch:
-.if !exists(/usr/src/sys/Makefile)
-	@${ECHO} "*************************************************"; \
-	${ECHO}  "This port requires the kernel source be available"; \
-	${ECHO}  "*************************************************"; \
-	exit 1
-.endif
-
-do-install:
-	@${MKDIR} ${KMODDIR}
-	@${INSTALL_KLD} ${BUILD_WRKSRC}/hcfmdm.ko ${KMODDIR}/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${LNXTDOCS}
-	@${INSTALL_DATA} ${WRKDIR}/hcfpcimodem-0.99lnxtbeta03042700/${i} ${DOCSDIR}/
-.endfor
-
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/100498D_RM_HxF_Released.pdf ${DOCSDIR}/
-.endif
-
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
--- a/comms/hcfmdm/distinfo
+++ b/comms/hcfmdm/distinfo
@ -1,6 +0,0 @@
-SHA256 (hcfmdm/hcfmdm-0.99.1.tar.gz) = 2c1f2fee7c0c09606e32f3a8af0dc95891cb174288ba607f3638af20c3b919be
-SIZE (hcfmdm/hcfmdm-0.99.1.tar.gz) = 14113
-SHA256 (hcfmdm/hcfpcimodem-0.99lnxtbeta03042700.tar.gz) = f99d40553234cd09353b35ce69104be432e501e541fe3ff5d8984c6e48f7ae24
-SIZE (hcfmdm/hcfpcimodem-0.99lnxtbeta03042700.tar.gz) = 644608
-SHA256 (hcfmdm/100498D_RM_HxF_Released.pdf) = e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
-SIZE (hcfmdm/100498D_RM_HxF_Released.pdf) = 718949
--- a/comms/hcfmdm/files/pkg-message.in
+++ b/comms/hcfmdm/files/pkg-message.in
@ -1,17 +0,0 @@
-*******************************************************************************
-*                                                                             *
-* This port contains a prebuilt kernel module. Due to the ever changing       *
-* nature of FreeBSD it may be necessary to rebuild the module after a kernel  *
-* source update.  To do this reinstall the port.                              *
-*                                                                             *
-*******************************************************************************
-To use these drivers, make sure that you have loaded the hcfmdm kernel
-module, by doing
-
-	# kldload hcfmdm
-
-or adding
-
-	hcfmdm_load="YES"
-
-to your /boot/loader.conf.
--- a/comms/hcfmdm/pkg-descr
+++ b/comms/hcfmdm/pkg-descr
@ -1,7 +0,0 @@
-This port contains a driver for several Winmodems based on the Conexant
-HCF chipset (Acorp PIM/PIM2). It consists of a shim for the Linux binary 
-only object file.
-
-WWW: http://www.linuxant.com/
-
- Alexey Illarionov <littlesavage@rambler.ru>
--- a/comms/hcfmdm/pkg-plist
+++ b/comms/hcfmdm/pkg-plist
@ -1,2 +0,0 @@
-@cwd %%KMODDIR%%
-hcfmdm.ko
--- a/databases/Makefile
+++ b/databases/Makefile
@ -240,7 +240,6 @@
    SUBDIR += mysql_last_value
    SUBDIR += mysqlard
    SUBDIR += mysqlbackup
-    SUBDIR += mysqlcc
    SUBDIR += mysqlcppapi
    SUBDIR += mysqldumper
    SUBDIR += mysqlidxchk
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@ -1,58 +0,0 @@
-# New ports collection makefile for:	mysqlcc
-# Date created:				03 April 2002
-# Whom:					ferruccio.vitale@tin.it
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mysqlcc
-PORTVERSION=	0.9.4
-PORTREVISION=	5
-CATEGORIES=	databases
-MASTER_SITES=	ftp://sunsite.dk/pub/databases/mysql/Downloads/MySQLCC/ \
-		http://mysql.mirrors.pair.com/Downloads/MySQLCC/ \
-		http://mirrors.sunsite.dk/mysql/Downloads/MySQLCC/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER=	ferruccio.vitale@tin.it
-COMMENT=	A platform-independent GUI administration client for the MySQL server
-
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
-BROKEN=		does not compile
-DEPRECATED=	has been broken for almost a year
-EXPIRATION_DATE=2011-04-17
-
-USE_MYSQL=	yes
-IGNORE_WITH_MYSQL=323
-
-GNU_CONFIGURE=	yes
-USE_QT_VER=	3
-CONFIGURE_ARGS+=--with-mysql-include=${LOCALBASE}/include/mysql \
-		--with-mysql-lib=${LOCALBASE}/lib/mysql \
-		--with-qt=${QT_PREFIX}
-
-DOCS=	Changelog.txt README.txt TODO.txt
-SHARE_DATA=	error.wav warning.wav syntax.txt
-
-post-patch:
-	${REINPLACE_CMD} -E -e 's@^(QMAKESPEC=)\$$QTDIR.*@\1${LOCALBASE}/share/qt/mkspecs/freebsd-g++@;s@\$$QTDIR/bin/qmake@${LOCALBASE}/bin/qmake@' ${WRKSRC}/configure
-	${REINPLACE_CMD} -E -e "s@(QString mydir =) QDir.*@\1 \"${DATADIR}/\";@" ${WRKSRC}/src/CApplication.cpp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${PREFIX}/bin/
-	${MKDIR} -m 0755 -p ${DATADIR}/translations
-.for f in ${SHARE_DATA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${DATADIR}/translations/
-	${INSTALL_DATA} ${WRKSRC}/translations/*.ts ${DATADIR}/translations/
-.if !defined(NOPORTDOCS)
-	${MKDIR} -m 0755 -p ${DOCSDIR}/plugins
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.endfor
-	(umask 022; ${TAR} -C ${WRKSRC}/plugins -cpf - . | ${TAR} -C ${DOCSDIR}/plugins -xpf -)
-.endif
-
-.include <bsd.port.mk>
--- a/databases/mysqlcc/distinfo
+++ b/databases/mysqlcc/distinfo
@ -1,2 +0,0 @@
-SHA256 (mysqlcc-0.9.4-src.tar.gz) = bb1c6b2a7c4a4b38d9c93d794e91aabf80f81a9a64739584709da00f228a7b66
-SIZE (mysqlcc-0.9.4-src.tar.gz) = 747244
--- a/databases/mysqlcc/files/patch-shared-src-CMySQL.cpp
+++ b/databases/mysqlcc/files/patch-shared-src-CMySQL.cpp
@ -1,19 +0,0 @@
-
-$FreeBSD$
-
--- shared/src/CMySQL.cpp.orig
-+++ shared/src/CMySQL.cpp
-@@ -450,8 +450,12 @@
-   
-   if (!isConnected())
-     return false;
-  
-+
-+#if  ( MYSQL_VERSION_ID > 40100 ) || ( MYSQL_VERSION_ID == 50001 ) || ( MYSQL_VERSION_ID == 40107 )
-+  if (mysql_shutdown(mysql,SHUTDOWN_DEFAULT) != 0)
-+#else
-   if (mysql_shutdown(mysql) != 0)
-+#endif
-   {
-     if (emiterror)
-       emitError();
--- a/databases/mysqlcc/pkg-descr
+++ b/databases/mysqlcc/pkg-descr
@ -1,5 +0,0 @@
-MySQL Control Center (also known as MySQLCC) is a 
-platform-independent GUI administration client for 
-the MySQL database server.
-
-WWW: http://www.mysql.com/products/mysqlcc/
--- a/databases/mysqlcc/pkg-plist
+++ b/databases/mysqlcc/pkg-plist
@ -1,41 +0,0 @@
-bin/mysqlcc
-%%DATADIR%%/error.wav
-%%DATADIR%%/warning.wav
-%%DATADIR%%/syntax.txt
-%%DATADIR%%/translations/Deutsch.qm
-%%DATADIR%%/translations/Deutsch.ts
-%%DATADIR%%/translations/French.qm
-%%DATADIR%%/translations/French.ts
-%%DATADIR%%/translations/Italian.qm
-%%DATADIR%%/translations/Italian.ts
-%%DATADIR%%/translations/Polish.qm
-%%DATADIR%%/translations/Polish.ts
-%%DATADIR%%/translations/Russian.qm
-%%DATADIR%%/translations/Russian.ts
-%%DATADIR%%/translations/Spanish.qm
-%%DATADIR%%/translations/Spanish.ts
-%%DATADIR%%/translations/Simplified_Chinese.qm
-%%DATADIR%%/translations/Simplified_Chinese.ts
-%%DATADIR%%/translations/Traditional_Chinese.qm
-%%DATADIR%%/translations/Traditional_Chinese.ts
-%%PORTDOCS%%%%DOCSDIR%%/Changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/hello.cpp
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/hello.h
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/hello_plugin.cpp
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/hello_plugin.def
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/hello_plugin.h
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/hello_plugin.pro
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/main.cpp
-%%PORTDOCS%%%%DOCSDIR%%/plugins/hello/moc_hello.cpp
-%%PORTDOCS%%%%DOCSDIR%%/plugins/service/StdAfx.cpp
-%%PORTDOCS%%%%DOCSDIR%%/plugins/service/StdAfx.h
-%%PORTDOCS%%%%DOCSDIR%%/plugins/service/service.cpp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/hello
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/service
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%
--- a/devel/Makefile
+++ b/devel/Makefile
@ -213,7 +213,6 @@
    SUBDIR += cmunge
    SUBDIR += cobf
    SUBDIR += coccinelle
-    SUBDIR += cocktail
    SUBDIR += codeblocks
    SUBDIR += codeworker
    SUBDIR += colorer
@ -315,7 +314,6 @@
    SUBDIR += dits
    SUBDIR += djgpp-binutils
    SUBDIR += djgpp-crx
-    SUBDIR += djgpp-gcc
    SUBDIR += dklibs
    SUBDIR += dmake
    SUBDIR += dmalloc
@ -452,7 +450,6 @@
    SUBDIR += gaphor
    SUBDIR += gauche-gaunit
    SUBDIR += gauche-readline
-    SUBDIR += gauche-sdl
    SUBDIR += gaul
    SUBDIR += gazpacho
    SUBDIR += gccmakedep
@ -464,7 +461,6 @@
    SUBDIR += gconfmm26
    SUBDIR += gcvs
    SUBDIR += gdb
-    SUBDIR += gdb53-act
    SUBDIR += gdb66
    SUBDIR += gdbmods
    SUBDIR += gdcm
@ -725,7 +721,6 @@
    SUBDIR += kscope
    SUBDIR += kxl
    SUBDIR += kyra
-    SUBDIR += lamson
    SUBDIR += lasi
    SUBDIR += lbpp
    SUBDIR += lcov
@ -3161,7 +3156,6 @@
    SUBDIR += ruby-rbprof
    SUBDIR += ruby-rbtree
    SUBDIR += ruby-rcov
-    SUBDIR += ruby-rjudy
    SUBDIR += ruby-robjectteam
    SUBDIR += ruby-rrb
    SUBDIR += ruby-rreadline
@ -3484,7 +3478,6 @@
    SUBDIR += xc3sprog
    SUBDIR += xdg-user-dirs
    SUBDIR += xdg-utils
-    SUBDIR += xfc
    SUBDIR += xfce4-dev-tools
    SUBDIR += xlslib
    SUBDIR += xmake
--- a/devel/cocktail/Makefile
+++ b/devel/cocktail/Makefile
@ -1,30 +0,0 @@
-# New ports collection makefile for:   cocktail
-# Date created:        12 november 2003
-# Whom:                wjw
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cocktail
-PORTVERSION=	9309
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	http://wwwold.first.fraunhofer.de/cocktail/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER=	wjw@withagen.nl
-COMMENT=	Compiler tools with attribute grammars
-
-BROKEN=		Segfault during build on FreeBSD >= 7.0
-DEPRECATED=	does not build on FreeBSD 7.x or newer
-EXPIRATION_DATE=2011-04-17
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAN1=		ag.1 puma.1 mpp.1 lalr.1 ell.1 bnf.1 ast.1 rex.1 mtc.1
-MAN2=		mtc.2
-
-post-extract:
-		${RM} -f ${WRKSRC}/mtc/m2c/SYSTEM_.h
-		${RM} -f ${WRKSRC}/mtc/m2c/SYSTEM_.c
-
-.include <bsd.port.mk>
--- a/devel/cocktail/distinfo
+++ b/devel/cocktail/distinfo
@ -1,3 +0,0 @@
-MD5 (cocktail-9309-src.tar.gz) = 1cb24976780315fcc30776ad4da34226
-SHA256 (cocktail-9309-src.tar.gz) = e551124c6f12532de1a2810db2803974529f0d50aa7729b6bbb63a63391bd876
-SIZE (cocktail-9309-src.tar.gz) = 2357144
--- a/devel/cocktail/files/changedfiles
+++ b/devel/cocktail/files/changedfiles
@ -1,133 +0,0 @@
-./Makefile
-./bnf/m2c/Makefile
-./bnf/src/Makefile
-./cg/hag-c/Makefile
-./cg/hag-m/Makefile
-./cg/m2c/Makefile
-./cg/src/Makefile
-./cg/test-c/Makefile
-./cg/test-m/Makefile
-./common/c/Makefile
-./common/m2c/Makefile
-./common/src/Makefile
-./ell/m2c/Makefile
-./ell/src/Makefile
-./estra/m2c/ArgCheck.c
-./estra/m2c/Makefile
-./estra/src/Makefile
-./front/doc/Makefile
-./front/m2c/Makefile
-./front/src/Makefile
-./l2cg/m2c/Makefile
-./l2cg/src/Makefile
-./l2r/src/Makefile
-./lalr/m2c/Makefile
-./lalr/src/Makefile
-./mpp/src/Makefile
-./mtc/m2c/Makefile
-./mtc/make/Makefile
-./mtc/src/Makefile
-./puma/ffaba-c/Makefile
-./puma/ffaba-m/Makefile
-./puma/m2c/C.c
-./puma/m2c/Makefile
-./puma/src/Makefile
-./r2l/m2c/Makefile
-./r2l/src/Makefile
-./reuse/c/DynArrDrv.c
-./reuse/c/DynArray.c
-./reuse/c/Errors.c
-./reuse/c/Errors.h
-./reuse/c/ErrorsDrv.c
-./reuse/c/General.c
-./reuse/c/General.h
-./reuse/c/Idents.c
-./reuse/c/Idents.h
-./reuse/c/IdentsDrv.c
-./reuse/c/Makefile
-./reuse/c/Positions.c
-./reuse/c/Positions.h
-./reuse/c/Sets.c
-./reuse/c/Sets.h
-./reuse/c/SetsDrv.c
-./reuse/c/Source.c
-./reuse/c/StrMemDrv.c
-./reuse/c/StringMem.c
-./reuse/c/StringMem.h
-./reuse/c/Time.c
-./reuse/c/Time.h
-./reuse/c/rMemory.c
-./reuse/c/rMemory.h
-./reuse/c/rMemoryDrv.c
-./reuse/c/rSystem.c
-./reuse/c/rSystem.h
-./reuse/c/ratc.h
-./reuse/m2c/Arguments.h
-./reuse/m2c/Checks.h
-./reuse/m2c/DynArray.h
-./reuse/m2c/Errors.c
-./reuse/m2c/Errors.h
-./reuse/m2c/ErrorsDrv.c
-./reuse/m2c/General.h
-./reuse/m2c/Heap.h
-./reuse/m2c/IO.c
-./reuse/m2c/IO.h
-./reuse/m2c/Idents.c
-./reuse/m2c/Idents.h
-./reuse/m2c/Layout.h
-./reuse/m2c/Lists.h
-./reuse/m2c/Makefile
-./reuse/m2c/Pack.h
-./reuse/m2c/Positions.h
-./reuse/m2c/Relations.h
-./reuse/m2c/RelatsC.h
-./reuse/m2c/SYSTEM_.c
-./reuse/m2c/SYSTEM_.h
-./reuse/m2c/Sets.c
-./reuse/m2c/Sets.h
-./reuse/m2c/SetsC.h
-./reuse/m2c/SetsDrv.c
-./reuse/m2c/Sort.c
-./reuse/m2c/Sort.h
-./reuse/m2c/Source.c
-./reuse/m2c/Source.h
-./reuse/m2c/StdIO.h
-./reuse/m2c/StringMem.h
-./reuse/m2c/Strings.c
-./reuse/m2c/Strings.h
-./reuse/m2c/Texts.c
-./reuse/m2c/Texts.h
-./reuse/m2c/Times.h
-./reuse/m2c/rMemory.c
-./reuse/m2c/rMemory.h
-./reuse/m2c/rMemoryDrv.c
-./reuse/m2c/rSystem.c
-./reuse/m2c/rSystem.h
-./reuse/src/Makefile
-./rex/lib/Makefile
-./rex/m2c/Makefile
-./rex/m2c/Nfa.c
-./rex/src/Makefile
-./rex/test/Makefile
-./rpp/m2c/Makefile
-./rpp/src/Makefile
-./specs/c/ada/Makefile
-./specs/c/c/Makefile
-./specs/c/cpp/Makefile
-./specs/c/minilax/Makefile
-./specs/c/modula2/Makefile
-./specs/c/modula2.ell/Makefile
-./specs/c/oberon2/Makefile
-./specs/c/occam/Makefile
-./specs/c/sather/Makefile
-./specs/c/sql/Makefile
-./specs/c/wag/Makefile
-./specs/modula/ada/Makefile
-./specs/modula/minilax/Makefile
-./specs/modula/modula2/Makefile
-./specs/modula/modula2.ell/Makefile
-./specs/modula/modula3/Makefile
-./specs/modula/oberon/Makefile
-./specs/modula/pascal/Makefile
-./specs/modula/wag/Makefile
-./y2l/src/Makefile
--- a/devel/cocktail/files/newfiles
+++ b/devel/cocktail/files/newfiles
@ -1,6 +0,0 @@
-./Makefile.inc
-./reuse/m2c/SetsDrv2.c
-./specs/Makefile
-./specs/Makefile.inc
-./specs/c/occam/Makefile.bak
-./tmp
--- a/devel/cocktail/files/patch-Makefile
+++ b/devel/cocktail/files/patch-Makefile
@ -1,268 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./Makefile	Tue Feb 15 14:20:36 1994
-+++ ./Makefile	Fri Sep 10 17:31:02 2004
-@@ -17,58 +17,21 @@
- # *                                                                       *
- # *************************************************************************
- 
-# Choose a suitable C compiler
-# usually cc or gcc will do
-# on HP700 use: CC = c89 -D_HPUX_SOURCE
-CC	= cc
-
-# Choose (optimizer) flags for the C compiler
-OPT	=
-
-# Choose a suitable Modula compiler
-# MC or M2C
-MC	= MC
-
-# BSD needs this
-MAKE	= make
-
-# The place to install shell scripts and binaries
-BIN	= $(HOME)/bin
-
-# The place to install binaries and data files
-LIB	= $(HOME)/lib
-
-# Directory for man pages
-MANDIR	= $(HOME)/lib
-
-# Where to put include files for reuse
-INCDIR	= $(LIB)/include
-
-# The following targets are legal:
-# PCS10
-# PCS20
-# SUN (this is valid for all others)
-TARGET	= SUN
-
-# For PCS10 you must define
-# OPT = "-DPCS10"
-
-# Choose the source language:
-LANGUAGE = c
-# LANGUAGE = modula
-+.include "Makefile.inc"
- 
- # ****************************************************************
- # *	DON'T CHANGE ANYTHING BELOW THIS LINE !
- # ****************************************************************
- 
-MFLAGS	= BIN=$(BIN) LIB=$(LIB) CC=$(CC) OPT=$(OPT) MC=$(MC) HOME=$(HOME)
-+ROOTDIR = $(.CURDIR)
- 
- CTARGETS = \
- 	reuselib \
- 	c_reuse \
- 	c_common \
-	c_rex \
- 	c_front \
-+	c_rex \
-+	installtmp \
- 	c_bnf \
- 	c_ell \
- 	c_lalr \
-@@ -79,7 +42,8 @@
- 	c_rpp \
- 	c_cg \
- 	c_puma \
-	c_estra
-+	c_estra \
-+	mtc
- 
- MTARGETS = \
- 	reuselib \
-@@ -104,12 +68,19 @@
- 
- install:	install$(LANGUAGE)
- 
-reuselib:
-	@echo; echo "Making public reuse library"
-	cd reuse/c && $(MAKE) $(MFLAGS) TARGET=$(TARGET)
-+full: $(LANGUAGE) test
-+
-+diff:	clean
-+	-diff -rwPu -x'*cat' -x'?akefile*' ../cocktail-9309.org . > /tmp/cocktail.code.dif
-+	-diff -rwPu -x'*cat' -x'*h' -x'*c' ../cocktail-9309.org . > /tmp/cocktail.makefiles.dif
- 
- c:	$(CTARGETS)
- 
-+reuselib:
-+	@echo WRKDIR = ${WRKDIR}
-+	@echo; echo "Making public reuse library"
-+	cd reuse/c && $(MAKE) TARGET=$(TARGET) $(MFLAGS)
-+
- c_reuse:
- 	@echo; echo "Making local reuse library"
- 	cd reuse/m2c && $(MAKE) $(MFLAGS)
-@@ -156,18 +127,33 @@
- 	@echo; echo "Making estra"
- 	cd estra/m2c && $(MAKE) $(MFLAGS)
- 
-installc:	c_reuse c_common
-	sh -c "if test ! -d $(BIN); then mkdir -p $(BIN); else true; fi"
-	sh -c "if test ! -d $(LIB); then mkdir -p $(LIB); else true; fi"
-	sh -c "if test ! -d $(MANDIR); then mkdir -p $(MANDIR); else true; fi"
-	sh -c "if test ! -d $(INCDIR); then mkdir -p $(INCDIR); else true; fi"
-	cd reuse/c	&& $(MAKE) install $(MFLAGS) TARGET=$(TARGET) INCDIR=$(INCDIR)
-+mtc:	$(REUSELIB)
-+	@echo; echo "Making mtc"
-+	cd mtc/m2c && $(MAKE) $(MFLAGS)
-+
-+installtmp: c_reuse c_common c_front c_rex c_lalr c_bnf
-+	mkdir -p $(TMPBIN)
-+	mkdir -p $(TMPLIB)
-+	mkdir -p $(TMPINC)
-+	cd reuse/c	&& $(MAKE) install PREFIX=$(TMPDIR)
-+	cd front/m2c	&& $(MAKE) install PREFIX=$(TMPDIR)
-+	cd rex/m2c	&& $(MAKE) install PREFIX=$(TMPDIR)
-+	cd lalr/m2c	&& $(MAKE) install PREFIX=$(TMPDIR)
-+	cd bnf/m2c	&& $(MAKE) install PREFIX=$(TMPDIR)
-+
-+installc:	
-+	sh -c "if test ! -d $(DESTBIN); then mkdir -p $(DESTBIN); else true; fi"
-+	sh -c "if test ! -d $(DESTLIB); then mkdir -p $(DESTLIB); else true; fi"
-+	sh -c "if test ! -d $(DESTMANDIR); then mkdir -p $(DESTMANDIR); else true; fi"
-+	sh -c "if test ! -d $(DESTMANDIR2); then mkdir -p $(DESTMANDIR2); else true; fi"
-+	sh -c "if test ! -d $(DESTINCDIR); then mkdir -p $(DESTINCDIR); else true; fi"
-+	cd reuse/c	&& $(MAKE) install $(MFLAGS) TARGET=$(TARGET) 
- 	cd rex/m2c	&& $(MAKE) install $(MFLAGS)
- 	cd front/m2c	&& $(MAKE) install $(MFLAGS)
-+	cd front/doc	&& $(MAKE) install $(MFLAGS)
- 	cd bnf/m2c	&& $(MAKE) install $(MFLAGS)
- 	cd ell/m2c	&& $(MAKE) install $(MFLAGS)
- 	cd lalr/m2c	&& $(MAKE) install $(MFLAGS)
-	cd front/doc	&& $(MAKE) install $(MFLAGS)
- 	cd l2r/src	&& $(MAKE) install $(MFLAGS)
- 	cd y2l/src	&& $(MAKE) install $(MFLAGS)
- 	cd r2l/m2c	&& $(MAKE) install $(MFLAGS)
-@@ -176,7 +162,10 @@
- 	cd cg/m2c	&& $(MAKE) install $(MFLAGS)
- 	cd puma/m2c	&& $(MAKE) install $(MFLAGS)
- 	cd estra/m2c	&& $(MAKE) install $(MFLAGS)
-	cd man && cp * $(MANDIR) && chmod a+r $(MANDIR)/*.1
-+	cd mtc/m2c	&& $(MAKE) install $(MFLAGS)
-+	cd man && cp * $(DESTMANDIR) && chmod a+r $(DESTMANDIR)/*.1
-+	cp mtc/doc/*.1 $(DESTMANDIR) && chmod a+r $(DESTMANDIR)/*.1
-+	cp mtc/doc/*.2 $(DESTMANDIR2) && chmod a+r $(DESTMANDIR2)/*.2
- 
- 
- modula:	$(MTARGETS)
-@@ -228,52 +217,51 @@
- 	sh -c "if test ! -d $(BIN); then mkdir -p $(BIN); else true; fi"
- 	sh -c "if test ! -d $(LIB); then mkdir -p $(LIB); else true; fi"
- 	sh -c "if test ! -d $(MANDIR); then mkdir -p $(MANDIR); else true; fi"
-+	sh -c "if test ! -d $(MANDIR2); then mkdir -p $(MANDIR2); else true; fi"
- 	sh -c "if test ! -d $(INCDIR); then mkdir -p $(INCDIR); else true; fi"
-	cd reuse/c	&& $(MAKE) install $(MFLAGS) TARGET=$(TARGET) INCDIR=$(INCDIR)
-	cd rex/src	&& $(MAKE) install $(MFLAGS)
-	cd front/src	&& $(MAKE) install $(MFLAGS)
-	cd bnf/src	&& $(MAKE) install $(MFLAGS)
-	cd ell/src	&& $(MAKE) install $(MFLAGS)
-	cd lalr/src	&& $(MAKE) install $(MFLAGS)
-	cd front/doc	&& $(MAKE) install $(MFLAGS)
-	cd l2r/src	&& $(MAKE) install $(MFLAGS)
-	cd y2l/src	&& $(MAKE) install $(MFLAGS)
-	cd r2l/src	&& $(MAKE) install $(MFLAGS)
-	cd l2cg/src	&& $(MAKE) install $(MFLAGS)
-	cd rpp/src	&& $(MAKE) install $(MFLAGS)
-	cd cg/src	&& $(MAKE) install $(MFLAGS)
-	cd puma/src	&& $(MAKE) install $(MFLAGS)
-	cd mpp/src	&& $(MAKE) install $(MFLAGS)
-	cd estra/src	&& $(MAKE) install $(MFLAGS)
-+	cd reuse/c	&& $(MAKE) install  TARGET=$(TARGET) INCDIR=$(INCDIR)
-+	cd rex/src	&& $(MAKE) install 
-+	cd front/src	&& $(MAKE) install 
-+	cd front/doc	&& $(MAKE) install 
-+	cd bnf/src	&& $(MAKE) install 
-+	cd ell/src	&& $(MAKE) install 
-+	cd lalr/src	&& $(MAKE) install 
-+	cd l2r/src	&& $(MAKE) install 
-+	cd y2l/src	&& $(MAKE) install 
-+	cd r2l/src	&& $(MAKE) install 
-+	cd l2cg/src	&& $(MAKE) install 
-+	cd rpp/src	&& $(MAKE) install 
-+	cd cg/src	&& $(MAKE) install 
-+	cd puma/src	&& $(MAKE) install 
-+	cd mpp/src	&& $(MAKE) install 
-+	cd estra/src	&& $(MAKE) install 
- 	cd man && cp * $(MANDIR) && chmod a+r $(MANDIR)/*.1
-+	cp mtc/doc/*.1 $(MANDIR) && chmod a+r $(MANDIR)/*.1
-+	cp mtc/doc/*.2 $(MANDIR2) && chmod a+r $(MANDIR2)/*.2
- 
- test:
-	-cd specs/c/ada			&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/c			&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/cpp			&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/modula2		&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/modula2.ell		&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/sather		&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/sql			&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/oberon2		&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR)
-	-cd specs/c/minilax		&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR) minilax
-	-cd specs/c/wag			&& $(MAKE) -i LIB=$(LIB) INCDIR=$(INCDIR) minilax
-	-cd specs/modula/ada		&& $(MAKE) -i
-	-cd specs/modula/modula2	&& $(MAKE) -i
-	-cd specs/modula/modula2.ell	&& $(MAKE) -i
-	-cd specs/modula/modula3	&& $(MAKE) -i
-	-cd specs/modula/oberon		&& $(MAKE) -i
-	-cd specs/modula/pascal		&& $(MAKE) -i
-	-cd specs/modula/minilax	&& $(MAKE) -i minilax
-	-cd specs/modula/wag		&& $(MAKE) -i minilax
-+	make install PREFIX=$(TMPDIR)
-+	make testc
- 
-clean:
-+testc:
-+	cd specs	&& $(MAKE) testc
-+	cd puma/ffaba-c	&& $(MAKE) test
-+
-+testm:
-+	cd specs	&& $(MAKE) testm
-+	cd puma/ffaba-m	&& $(MAKE) test
-+
-+clean: cleantest cleantools
-+
-+cleantools:
-+	-rm -rf $(TMPDIR)/bin $(TMPDIR)/include $(TMPDIR)/libexec
- 	-cd reuse/c			&& $(MAKE) clean
- 	-cd reuse/src			&& $(MAKE) clean
- 	-cd common/src			&& $(MAKE) clean
- 	-cd rex/src			&& $(MAKE) clean
- 	-cd rex/test			&& $(MAKE) clean
- 	-cd front/src			&& $(MAKE) clean
-+	-cd front/doc			&& $(MAKE) clean
- 	-cd bnf/src			&& $(MAKE) clean
- 	-cd lalr/src			&& $(MAKE) clean
- 	-cd ell/src			&& $(MAKE) clean
-@@ -299,23 +287,10 @@
- 	-cd cg/m2c			&& $(MAKE) clean
- 	-cd puma/m2c			&& $(MAKE) clean
- 	-cd estra/m2c			&& $(MAKE) clean
-+	-cd mtc/m2c			&& $(MAKE) clean
-+
-+cleantest:
-+	-cd specs			&& $(MAKE) clean
-+	-cd puma/ffaba-c		&& $(MAKE) clean
-+	-cd puma/ffaba-m		&& $(MAKE) clean
- 
-cleans:
-	-cd specs/c/ada			&& $(MAKE) clean
-	-cd specs/c/c			&& $(MAKE) clean
-	-cd specs/c/cpp			&& $(MAKE) clean
-	-cd specs/c/modula2		&& $(MAKE) clean
-	-cd specs/c/modula2.ell		&& $(MAKE) clean
-	-cd specs/c/sather		&& $(MAKE) clean
-	-cd specs/c/sql			&& $(MAKE) clean
-	-cd specs/c/oberon2		&& $(MAKE) clean
-	-cd specs/c/minilax		&& $(MAKE) clean
-	-cd specs/c/wag			&& $(MAKE) clean
-	-cd specs/modula/ada		&& $(MAKE) clean
-	-cd specs/modula/modula2	&& $(MAKE) clean
-	-cd specs/modula/modula2.ell	&& $(MAKE) clean
-	-cd specs/modula/modula3	&& $(MAKE) clean
-	-cd specs/modula/oberon		&& $(MAKE) clean
-	-cd specs/modula/pascal		&& $(MAKE) clean
-	-cd specs/modula/minilax	&& $(MAKE) clean
-	-cd specs/modula/wag		&& $(MAKE) clean
--- a/devel/cocktail/files/patch-Makefile.inc
+++ b/devel/cocktail/files/patch-Makefile.inc
@ -1,99 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./Makefile.inc	Sat Sep 11 00:58:46 2004
-+++ ./Makefile.inc	Fri Sep 10 15:46:35 2004
-@@ -0,0 +1,96 @@
-+# Choose a suitable C compiler
-+# usually cc or gcc will do
-+# on HP700 use: CC = c89 -D_HPUX_SOURCE
-+CC     ?= gcc
-+
-+OPT     = -g      	# (optimizer) flags for the C compiler
-+WARNINGS= -W -Wall -ansi  -Wcast-align \
-+        -Wcast-qual -Wchar-subscripts -Winline \
-+	-Wnested-externs -Wpointer-arith \
-+	-Wmissing-prototypes \
-+        -Wredundant-decls \
-+	-Wno-shadow \
-+	-Wno-parentheses \
-+	-Wno-unused 
-+TWARNINGS= 
-+
-+#WARNINGS= -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \
-+#	-Waggregate-return -Wstrict-prototypes \
-+#	-Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline
-+# 	-Wbad-function-cast 
-+#		Gives all those: cast does not match function type
-+#	-Wconversion , not very handy, since it allerts almost all conversions
-+#			als the correct ones
-+#	-Wwrite-strings , a nuicance
-+#	-Wstrict-prototypes \
-+
-+CFLAGS  += $(OPT) $(WARNINGS) -D$(UNIX) -D$(TARGET) $(XFLAGS)
-+#
-+# To compile the tests, since they are tool generated and otherwise generate 
-+# losts warnings
-+TCFLAGS  += $(OPT) $(TWARNINGS) -D$(UNIX) -D$(TARGET) $(XFLAGS)
-+
-+# Choose a suitable Modula compiler
-+# MC or M2C
-+MC      = m2c
-+
-+# BSD needs this
-+MAKE    = make
-+
-+BIN 	= $(ROOTDIR)/bin
-+LIB 	= $(ROOTDIR)/reuse/m2c		# There are 2 different libraries
-+LIBC	= $(ROOTDIR)/reuse/c		# to link against, depending on the 
-+INCDIR 	= $(ROOTDIR)/reuse/m2c		# tool. And they cannot be exchanged
-+INCDIRC	= $(ROOTDIR)/reuse/c
-+REUSE	= libreuse.a
-+REUSELIB   = $(INCDIR)/libreuse.a
-+REUSELIBC  = $(INCDIRC)/libreuse.a
-+COMMONINC  = $(ROOTDIR)/common/m2c
-+COMMONLIB  = $(COMMONINC)/libcommon.a
-+FRONTINC   = $(ROOTDIR)/front/m2c
-+FRONTLIB   = $(FRONTINC)/libfront.a
-+
-+TMPDIR	= ${ROOTDIR}/tmp
-+TMPBIN	= $(TMPDIR)/bin
-+TMPLIB	= $(TMPDIR)/libexec/cocktail
-+TMPINC	= $(TMPDIR)/include/cocktail
-+
-+DEST	= $(PREFIX)
-+DESTBIN = $(DEST)/bin	 		# to install shell scripts and binaries
-+DESTLIB = $(DEST)/libexec/cocktail 	# to install binaries and data files
-+DESTINCDIR  = $(DEST)/include/cocktail 	# Where to put include files for reuse
-+DESTMANDIR  = $(DEST)/man/man1	 	# Directory for man pages
-+DESTMANDIR2  = $(DEST)/man/man2	 	# Directory for man pages
-+
-+# During package build
-+REX	= $(TMPBIN)/rex
-+BNF	= $(TMPBIN)bnf
-+LALR	= $(TMPBIN)/lalr
-+MTC	= $(TMPBIN)/mtc
-+LPP	= $(TMPBIN)/lpp
-+RPP	= $(TMPBIN)/rpp
-+CG	= $(TMPBIN)/cg
-+ELL	= $(TMPBIN)/ell
-+PUMA	= $(TMPBIN)/puma
-+SED	= sed
-+
-+STDCLEAN = *.bak *.orig *.rej *.core *.o
-+
-+# The following targets are legal:
-+# PCS10
-+# PCS20
-+# SUN (this is valid for all others)
-+TARGET  = FREEBSD
-+UNIX	= UNIX
-+
-+# Choose the source language:
-+LANGUAGE = c
-+# LANGUAGE = modula
-+
-+.SUFFIXES: .md .mi .h .c .o
-+
-+.mi.c:
-+	mtc2 $(M2FLAGS) $*.mi;
-+
-+.md.h:
-+	mtc2 $(M2FLAGS) $*.md;
--- a/devel/cocktail/files/patch-bnf-m2c-Makefile
+++ b/devel/cocktail/files/patch-bnf-m2c-Makefile
@ -1,76 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./bnf/m2c/Makefile	Tue Feb 15 14:20:39 1994
-+++ ./bnf/m2c/Makefile	Thu Aug  5 18:48:26 2004
-@@ -1,36 +1,27 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
-+.include "../../Makefile.inc" 
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-
-                # C library (front)
-FRONT	= ../../front/m2c
-
-                # C libraries
-CLIBS	= $(FRONT)/libfront.a $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -I$(FRONT) -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-
-all	: bnf
-
-install:	bnf bnf.sh $(LIB)/lalr
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	install -c -s -m 755 bnf $(LIB)/lalr
-	sed "s;LIB;$(LIB);" < bnf.sh > $(BIN)/bnf
-	chmod a+rx $(BIN)/bnf
-+ROOTDIR = ../..
-+CFLAGS  += -I$(FRONTINC) -I$(INCDIR) 
-+CLIBS   += $(FRONTLIB) $(REUSELIB) 
-+
-+all: 	bnf
-+
-+install:	bnf bnf.sh $(DESTLIB)/lalr
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	install -c -s -m 755 bnf $(DESTLIB)/lalr
-+	sed "s;LIB;$(DESTLIB);" < bnf.sh > $(DESTBIN)/bnf
-+	chmod a+rx $(DESTBIN)/bnf
- 
- # installation directories
- 
-$(LIB)/lalr:	$(LIB)
-	sh -c "if test ! -d $(LIB)/lalr; then mkdir -p $(LIB)/lalr; else true; fi"
-+$(DESTLIB)/lalr:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/lalr; then mkdir -p $(DESTLIB)/lalr; else true; fi"
- 
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o bnf
-+
- # HEAD
- 
- sources	: ArgCheck.h
-@@ -62,18 +53,3 @@
- 	ArgCheck.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-bnf-src-Makefile
+++ b/devel/cocktail/files/patch-bnf-src-Makefile
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./bnf/src/Makefile	Tue Feb 15 14:20:41 1994
-+++ ./bnf/src/Makefile	Thu Aug  5 18:48:26 2004
-@@ -39,7 +39,8 @@
- sources:
- 
- clean:
-	rm -f core *.[dimor] *.def *.mod *.sym ERRORS LISTING _Debug *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.[dimor] *.def *.mod *.sym ERRORS LISTING _Debug *.bak
- 
- .SUFFIXES:	.def .mod .md .mi
- 
--- a/devel/cocktail/files/patch-cg-hag-c-Makefile
+++ b/devel/cocktail/files/patch-cg-hag-c-Makefile
@ -1,22 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/hag-c/Makefile	Tue Feb 15 14:21:25 1994
-+++ ./cg/hag-c/Makefile	Thu Aug  5 18:48:47 2004
-@@ -1,7 +1,3 @@
-LIB	= $(HOME)/lib
-INCDIR	= $(LIB)/include
-CFLAGS	= -I$(INCDIR)
-CC	= cc
- 
- Main:	Main.o Tree.o Eval.o
- 	$(CC) -o Main Main.o Eval.o Tree.o $(LIB)/libreuse.a
-@@ -45,9 +41,6 @@
- 	echo 2 0 | Main
- 
- clean:
-	rm -f TraceTab Main Tree.* Eval.* Main.o yyTree.w
-+	-rm -f TraceTab Main Tree.* Eval.* Main.o yyTree.w
- 
-.SUFFIXES:	.c .o
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
-+.include "../../Makefile.inc" 
--- a/devel/cocktail/files/patch-cg-hag-m-Makefile
+++ b/devel/cocktail/files/patch-cg-hag-m-Makefile
@ -1,9 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/hag-m/Makefile	Tue Feb 15 14:21:25 1994
-+++ ./cg/hag-m/Makefile	Thu Aug  5 18:48:48 2004
-@@ -36,4 +36,5 @@
- 	echo 2 0 | Main
- 
- clean:
-	rm -f TraceTab Main Tree.* Eval.* Main.[dimor]
-+	-rm -f TraceTab Main Tree.* Eval.* Main.[dimor]
-+.include "../../Makefile.inc" 
--- a/devel/cocktail/files/patch-cg-m2c-Makefile
+++ b/devel/cocktail/files/patch-cg-m2c-Makefile
@ -1,95 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/m2c/Makefile	Tue Feb 15 14:21:05 1994
-+++ ./cg/m2c/Makefile	Thu Aug  5 18:48:42 2004
-@@ -1,46 +1,38 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C libraries
-CLIBS	= $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -w -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c -d../../reuse/src
-
-
-all	: cg
-
-install:	cg cg.sh lpp $(LIB)/cg
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed "s;LIB;$(LIB);g" < cg.sh > $(BIN)/cg
-	cp $(BIN)/cg $(BIN)/ag
-	cp $(BIN)/cg $(BIN)/ast
-	chmod a+rx $(BIN)/cg $(BIN)/ast $(BIN)/ag
-	install -c -m 755 gmdcpp $(BIN)
-	install -c -m 755 gmdupd $(BIN)
-	install -c -m 755 gmdrm $(BIN)
-	install -c -s -m 755 cg $(LIB)/cg
-	install -c -m 644 TypeTab.c $(LIB)/cg
-	install -c -m 644 TypeTab.m $(LIB)/cg
-	install -c -s -m 755 lpp $(BIN)
-+ROOTDIR = ../..
-+CFLAGS  += -I$(INCDIR)
-+CLIBS   += $(REUSELIB)
-+
-+all	: cg lpp
-+
-+install:	cg cg.sh lpp $(DESTLIB)/cg
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	$(SED) "s;LIB;$(DESTLIB);g" < cg.sh > $(DESTBIN)/cg
-+	cp $(DESTBIN)/cg $(DESTBIN)/ag
-+	cp $(DESTBIN)/cg $(DESTBIN)/ast
-+	chmod a+rx $(DESTBIN)/cg $(DESTBIN)/ast $(DESTBIN)/ag
-+	install -c -m 755 gmdcpp $(DESTBIN)
-+	install -c -m 755 gmdupd $(DESTBIN)
-+	install -c -m 755 gmdrm $(DESTBIN)
-+	install -c -s -m 755 cg $(DESTLIB)/cg
-+	install -c -m 644 TypeTab.c $(DESTLIB)/cg
-+	install -c -m 644 TypeTab.m $(DESTLIB)/cg
-+	install -c -s -m 755 lpp $(DESTBIN)
- 
- # installation directories
- 
-$(LIB)/cg:	$(LIB)
-	sh -c "if test ! -d $(LIB)/cg; then mkdir -p $(LIB)/cg; else true; fi"
-+$(DESTLIB)/cg:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/cg; then mkdir -p $(DESTLIB)/cg; else true; fi"
- 
-# SYSTEM_	= SYSTEM_.o
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f cg lpp
- 
- lint:
-	lint -I$(REUSE) *.c
-
-+	lint -I$(INCDIR) *.c
- 
- # HEAD
- 
-@@ -431,18 +423,3 @@
- 	Tree.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-cg-src-Makefile
+++ b/devel/cocktail/files/patch-cg-src-Makefile
@ -1,136 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/src/Makefile	Tue Feb 15 14:20:44 1994
-+++ ./cg/src/Makefile	Thu Aug  5 18:48:37 2004
-@@ -43,17 +43,17 @@
- 	echo p cg | mc -d ../../reuse/src
- 
- Scanner.md Scanner.mi:	cg.rex
-	rex -d cg.rex;
-+	$(REX) -d cg.rex;
- 
- Parser.md:	cg.lalr
-	lalr -b -d cg.lalr;
-+	$(LALR) -b -d cg.lalr;
- 
- Parser.mi:	cg.lalr
-	lalr -b -v cg.lalr;
-+	$(LALR) -b -v cg.lalr;
- 
- Errors.mi:	Errors.0 \
- 	/tmp/cg/consts1 /tmp/cg/writes1 /tmp/cg/consts2 /tmp/cg/writes2
-	/lib/cpp -P Errors.0 Errors.mi
-+	$(CPP) -P Errors.0 Errors.mi
- 
- Tree.md:	cg.cg
- 	echo SELECT AstIn Ast Common Cg Ag | cat - cg.cg | cg -diqmR
-@@ -71,65 +71,65 @@
- 	echo SELECT AstIn Ast Common Cg Ag | cat - cg.cg | cg -4
- 
- GramMod.md GramMod.mi:	mod0.puma Tree.TS
-	$(SED) < mod0.puma | puma -dinw;
-+	$(SED) < mod0.puma | $(PUMA) -dinw;
- 
- GramC.md GramC.mi:	c0.puma Tree.TS
-	$(SED) < c0.puma | puma -dinw;
-+	$(SED) < c0.puma | $(PUMA) -dinw;
- 
- GramYacc.md GramYacc.mi:	y0.puma Tree.TS
-	$(SED) < y0.puma | puma -dinw;
-+	$(SED) < y0.puma | $(PUMA) -dinw;
- 
- Semantics.md Semantics.mi /tmp/cg/consts1 /tmp/cg/writes1:	sem.puma Tree.TS /tmp/cg
-	awk -f cg.awk1 < sem.puma > /tmp/cg/sem
-	/lib/cpp -P < /tmp/cg/sem | puma -dinw;
-	sed -f cg.sed2 < /tmp/cg/writes01 > /tmp/cg/writes1
-+	$(AWK) -f cg.awk1 < sem.puma > /tmp/cg/sem
-+	$(CPP) -P < /tmp/cg/sem | $(PUMA) -dinw;
-+	$(SED) -f cg.sed2 < /tmp/cg/writes01 > /tmp/cg/writes1
- 
- Order.md Order.mi /tmp/cg/consts2 /tmp/cg/writes2:	oag.puma Tree.TS /tmp/cg
-	awk -f cg.awk2 < oag.puma > /tmp/cg/oag
-	/lib/cpp -P < /tmp/cg/oag | puma -dinw;
-	sed -f cg.sed2 < /tmp/cg/writes02 > /tmp/cg/writes2
-+	$(AWK) -f cg.awk2 < oag.puma > /tmp/cg/oag
-+	$(CPP) -P < /tmp/cg/oag | $(PUMA) -dinw;
-+	$(SED) -f cg.sed2 < /tmp/cg/writes02 > /tmp/cg/writes2
- 
- Optimize.md Optimize.mi:	opt.puma Tree.TS
-	/lib/cpp -P < opt.puma | puma -dinw;
-+	$(CPP) -P < opt.puma | $(PUMA) -dinw;
- 
- Dialog.mi:	Dialog.sed
- 	$(SED) < Dialog.sed > Dialog.mi
- 
- TreeMod1.md TreeMod1.mi:	mod1.puma Tree.TS
-	$(SED) < mod1.puma | puma -dinw;
-+	$(SED) < mod1.puma | $(PUMA) -dinw;
- 
- TreeMod2.md TreeMod2.mi:	mod2.puma Tree.TS
-	$(SED) < mod2.puma | puma -dinw;
-+	$(SED) < mod2.puma | $(PUMA) -dinw;
- 
- EvalMod.md EvalMod.mi:	mod3.puma Tree.TS
-	$(SED) < mod3.puma | puma -dinw;
-+	$(SED) < mod3.puma | $(PUMA) -dinw;
- 
- EvalMod2.md EvalMod2.mi:	mod4.puma Tree.TS
-	$(SED) < mod4.puma | puma -dinw;
-+	$(SED) < mod4.puma | $(PUMA) -dinw;
- 
- EvalMod3.md EvalMod3.mi:	mod5.puma Tree.TS
-	$(SED) < mod5.puma | puma -dinw;
-+	$(SED) < mod5.puma | $(PUMA) -dinw;
- 
- EvalMod4.md EvalMod4.mi:	mod6.puma Tree.TS
-	$(SED) < mod6.puma | puma -dinw;
-+	$(SED) < mod6.puma | $(PUMA) -dinw;
- 
- TreeC1.md TreeC1.mi:	c1.puma Tree.TS
-	$(SED) < c1.puma | puma -dinw;
-+	$(SED) < c1.puma | $(PUMA) -dinw;
- 
- TreeC2.md TreeC2.mi:	c2.puma Tree.TS
-	$(SED) < c2.puma | puma -dinw;
-+	$(SED) < c2.puma | $(PUMA) -dinw;
- 
- EvalC.md EvalC.mi:	c3.puma Tree.TS
-	$(SED) < c3.puma | puma -dinw;
-+	$(SED) < c3.puma | $(PUMA) -dinw;
- 
- EvalC2.md EvalC2.mi:	c4.puma Tree.TS
-	$(SED) < c4.puma | puma -dinw;
-+	$(SED) < c4.puma | $(PUMA) -dinw;
- 
- EvalC3.md EvalC3.mi:	c5.puma Tree.TS
-	$(SED) < c5.puma | puma -dinw;
-+	$(SED) < c5.puma | $(PUMA) -dinw;
- 
- EvalC4.md EvalC4.mi:	c6.puma Tree.TS
-	$(SED) < c6.puma | puma -dinw;
-+	$(SED) < c6.puma | $(PUMA) -dinw;
- 
- cg.mi:	cg.sed
- 	$(SED) < cg.sed > cg.mi
-@@ -159,7 +159,7 @@
- m2c:
- 	# co RCS/*
- 	make $(SOURCES)
-	rm -f ../m2c/*.[hc]
-+	-rm -f ../m2c/*.[hc]
- 	cp TypeTab.[mc] gmd* ../m2c
- 	ln *.m[id] ../m2c
- 	cd ../m2c; make sources M2FLAGS="-c -d../../reuse/src"
-@@ -184,10 +184,11 @@
- 	sh -c "if test ! -d $(LIB)/Id; then mkdir -p $(LIB)/Id; else true; fi"
- 
- cleanId:
-	rm -f cgId*
-+	-rm -f cgId*
- 
- clean:	cleanId
-	rm -f _Debug core *.[dior] [A-SU-Za-z]*.m *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  _Debug  *.[dior] [A-SU-Za-z]*.m *.bak
- 
- CLEAN:	clean
-	rm -f cg Tree.TS $(SOURCES)
-+	-rm -f cg Tree.TS $(SOURCES)
--- a/devel/cocktail/files/patch-cg-test-c-Makefile
+++ b/devel/cocktail/files/patch-cg-test-c-Makefile
@ -1,30 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/test-c/Makefile	Tue Feb 15 14:21:27 1994
-+++ ./cg/test-c/Makefile	Thu Aug  5 18:48:47 2004
-@@ -1,7 +1,4 @@
-LIB	= $(HOME)/lib
-INCDIR	= $(LIB)/include
-CFLAGS	= -I$(INCDIR)
-CC	= cc
-+.include "../../Makefile.inc" 
- 
- all:
- 	make test clean LIB="$(LIB)" CC="cc"
-@@ -17,15 +14,12 @@
- Main.o:	Tree.h
- 
- Tree.h Tree.c: g.cg
-	cg -ca g.cg;
-+	$(CG) -ca g.cg;
- 
- lint:	Tree.c Main.c
- 	lint $(CFLAGS) -u Main.c Tree.c
- 
- clean:
-	rm -f Main Tree.* Main.o yyTree.w a aa aaa b bb core
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  Main Tree.* Main.o yyTree.w a aa aaa b bb 
- 
-.SUFFIXES:	.c .o
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-cg-test-m-Makefile
+++ b/devel/cocktail/files/patch-cg-test-m-Makefile
@ -1,10 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/test-m/Makefile	Tue Feb 15 14:21:26 1994
-+++ ./cg/test-m/Makefile	Thu Aug  5 18:48:36 2004
-@@ -8,4 +8,6 @@
- 	cg -a g.cg;
- 
- clean:
-	rm -f Main Tree.* Main.[dimor] a aa aaa b bb core *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  Main Tree.* Main.[dimor] a aa aaa b bb  *.bak
-+.include "../../Makefile.inc" 
--- a/devel/cocktail/files/patch-common-c-Makefile
+++ b/devel/cocktail/files/patch-common-c-Makefile
@ -1,8 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./common/c/Makefile	Tue Feb 15 14:21:28 1994
-+++ ./common/c/Makefile	Thu Aug  5 18:48:48 2004
-@@ -1,3 +1,5 @@
- Timer.o:	Timer.c Timer.h		; cc Timer.c 
- libcommon.a:	SysErr.o Timer.o	; ar ruv libcommon.a Timer.o
- clean:					; rm -f Timer.o
-+
-+.include "../../Makefile.inc" 
--- a/devel/cocktail/files/patch-common-m2c-Makefile
+++ b/devel/cocktail/files/patch-common-m2c-Makefile
@ -1,59 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./common/m2c/Makefile	Tue Feb 15 14:21:29 1994
-+++ ./common/m2c/Makefile	Thu Aug  5 18:48:48 2004
-@@ -1,25 +1,21 @@
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C libraries
-CLIBS	= $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-+ROOTDIR = ../..
-+CFLAGS	+= -I$(INCDIR)
- 
- OBJS	= Character.o Checks.o Convert.o Errors.o Listing.o Path.o Queues.o \
- 	  Stack.o SysError.o
- 
-
-libcommon.a	: $(OBJS)
-+libcommon.a: $(OBJS)
- 	ar ruc libcommon.a $(OBJS)
- 	ranlib libcommon.a
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f Main 
-+	-rm -f libcommon.a
-+
- 
- # HEAD
- 
-@@ -115,21 +111,3 @@
- 	Convert.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-CLEAN	: clean
-	rm -f libcommon.a
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-common-src-Makefile
+++ b/devel/cocktail/files/patch-common-src-Makefile
@ -1,16 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./common/src/Makefile	Tue Feb 15 14:21:34 1994
-+++ ./common/src/Makefile	Thu Aug  5 18:48:50 2004
-@@ -1,6 +1,6 @@
- all:
- 	echo p Main | mc -d ../../reuse/src
-	rm -f Main Main.[dimor]
-+	-rm -f Main Main.[dimor]
- 
- m2c:
- 	# co RCS/*
-@@ -9,4 +9,4 @@
- 	cd ../m2c; rm -f *.m[id]
- 
- clean:
-	rm -f *.[dimor]
-+	-rm -f *.[dimor]
--- a/devel/cocktail/files/patch-ell-m2c-Makefile
+++ b/devel/cocktail/files/patch-ell-m2c-Makefile
@ -1,75 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./ell/m2c/Makefile	Tue Feb 15 14:22:40 1994
-+++ ./ell/m2c/Makefile	Thu Aug  5 18:48:53 2004
-@@ -1,37 +1,27 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
-+.include "../../Makefile.inc"
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-
-                # C library (common)
-COMMON	= ../../common/m2c
-
-                # C libraries
-CLIBS	= $(COMMON)/libcommon.a $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -w -I$(COMMON) -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-+ROOTDIR = ../..
-+CFLAGS  += -I$(COMMONINC) -I$(INCDIR)
-+CLIBS   += $(COMMONLIB) $(REUSELIB)
- 
- all	: ell
- 
-install:	ell ell.sh $(LIB)/ell
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed "s;LIB;$(LIB);" < ell.sh > $(BIN)/ell
-	chmod a+rx $(BIN)/ell
-	install -c -s -m 755 ell $(LIB)/ell
-	install -c -m 644 ErrorTab $(LIB)/ell
-+install:	ell ell.sh $(DESTLIB)/ell
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	sed "s;LIB;$(DESTLIB);" < ell.sh > $(DESTBIN)/ell
-+	chmod a+rx $(DESTBIN)/ell
-+	install -c -s -m 755 ell $(DESTLIB)/ell
-+	install -c -m 644 ErrorTab $(DESTLIB)/ell
- 
- # installation directories
- 
-$(LIB)/ell:	$(LIB)
-	sh -c "if test ! -d $(LIB)/ell; then mkdir -p $(LIB)/ell; else true; fi"
-+$(DESTLIB)/ell:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/ell; then mkdir -p $(DESTLIB)/ell; else true; fi"
- 
-# SYSTEM_	= SYSTEM_.o
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f ell
- 
- # HEAD
- 
-@@ -239,18 +229,3 @@
- 	CodeC.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-ell-src-Makefile
+++ b/devel/cocktail/files/patch-ell-src-Makefile
@ -1,42 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./ell/src/Makefile	Tue Feb 15 14:22:52 1994
-+++ ./ell/src/Makefile	Thu Aug  5 18:48:54 2004
-@@ -31,7 +31,7 @@
- ell:	$(GENDEFS) $(GENIMPS) ell_boot
- 
- ell_boot:	$(DEFS) $(IMPS) ell.mi
-	rm -f ell
-+	-rm -f ell
- 	echo p ell | mc -d ../../common/src -d ../../reuse/src
- 
- install:	ell ell.sh ErrorTab $(LIB)/ell
-@@ -48,13 +48,13 @@
- 	sh -c "if test ! -d $(LIB)/ell; then mkdir -p $(LIB)/ell; else true; fi"
- 
- Scanner.mi Scanner.md:	ell.rex
-	rex -d ell.rex;
-+	$(REX) -d ell.rex;
- 
- Parser.mi Parser.md:	ell.ell
-	ell -di ell.ell;
-+	$(ELL) -di ell.ell;
- 
- Tree.mi Tree.md:	ell.ast
-	cg -dimR ell.ast;
-+	$(CG) -dimR ell.ast;
- 
- Semantics.md Semantics.mi:	Sem.estra
- 	estra $(ESTRA) Sem.estra;
-@@ -75,10 +75,11 @@
- 	cd ../m2c; rm -f *.m[id]
- 
- clean:
-	rm -f core ERRORS LISTING *.[dimor] ell convert *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   ERRORS LISTING *.[dimor] ell convert *.bak
- 
- CLEAN:	clean
-	rm -f $(SOURCES)
-+	-rm -f $(SOURCES)
- 
- .SUFFIXES:	.MI .mi
- 
--- a/devel/cocktail/files/patch-estra-m2c-ArgCheck.c
+++ b/devel/cocktail/files/patch-estra-m2c-ArgCheck.c
@ -1,22 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./estra/m2c/ArgCheck.c	Tue Feb 15 14:23:04 1994
-+++ ./estra/m2c/ArgCheck.c	Thu Aug  5 18:48:56 2004
-@@ -64,7 +64,7 @@
- BOOLEAN ArgCheck_AUTO;
- BOOLEAN ArgCheck_DEBUG;
- 
-static CHAR NULL [] = "/dev/null";
-+static CHAR DEVNULL [] = "/dev/null";
- struct S_1 {
-     CHAR A[255 + 1];
- };
-@@ -188,8 +188,8 @@
-     ArgCheck_IMP = TRUE;
-   }
-   if (!SourceFileIsOpen) {
-    Listing_SourceFile = IO_ReadOpen(NULL, 9L);
-    Checks_CheckReadOpen(&Listing_SourceFile, NULL, 9L);
-+    Listing_SourceFile = IO_ReadOpen(DEVNULL, 9L);
-+    Checks_CheckReadOpen(&Listing_SourceFile, DEVNULL, 9L);
-   }
-   if (Error) {
-     Errors_CloseErrors();
--- a/devel/cocktail/files/patch-estra-m2c-Makefile
+++ b/devel/cocktail/files/patch-estra-m2c-Makefile
@ -1,74 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./estra/m2c/Makefile	Tue Feb 15 14:23:01 1994
-+++ ./estra/m2c/Makefile	Thu Aug  5 18:48:55 2004
-@@ -1,36 +1,28 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C library (common)
-COMMON	= ../../common/m2c
-
-                # C libraries
-CLIBS	= $(COMMON)/libcommon.a $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -w -I$(COMMON) -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-+ROOTDIR = ../..
-+CFLAGS  += -I$(COMMONINC) -I$(INCDIR)
-+CLIBS   += $(COMMONLIB) $(REUSELIB)
- 
- all	: estra
- 
-install:	estra estra.sh $(LIB)/estra
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed "s;LIB;$(LIB);" < estra.sh > $(BIN)/estra
-	chmod a+rx $(BIN)/estra
-	install -c -s -m 755 estra $(LIB)/estra
-	install -c -m 644 ErrorTab $(LIB)/estra
-+install:	estra estra.sh $(DESTLIB)/estra
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	sed "s;LIB;$(DESTLIB);" < estra.sh > $(DESTBIN)/estra
-+	chmod a+rx $(DESTBIN)/estra
-+	install -c -s -m 755 estra $(DESTLIB)/estra
-+	install -c -m 644 ErrorTab $(DESTLIB)/estra
- 
- # installation directories
- 
-$(LIB)/estra:	$(LIB)
-	sh -c "if test ! -d $(LIB)/estra; then mkdir -p $(LIB)/estra; else true; fi"
-+$(DESTLIB)/estra:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/estra; then mkdir -p $(DESTLIB)/estra; else true; fi"
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f estra
- 
- # HEAD
- 
-@@ -232,18 +224,3 @@
- 	CodeM2.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-estra-src-Makefile
+++ b/devel/cocktail/files/patch-estra-src-Makefile
@ -1,25 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./estra/src/Makefile	Tue Feb 15 14:23:14 1994
-+++ ./estra/src/Makefile	Thu Aug  5 18:48:58 2004
-@@ -21,7 +21,7 @@
- estra:	$(GENDEFS) $(GENIMPS) estra_boot
- 
- estra_boot:	$(DEFS) $(IMPS) estra.mi
-	rm -f estra
-+	-rm -f estra
- 	echo p estra | mc -d ../../common/src -d ../../reuse/src
- 
- Tree.md Tree.mi:	Tree.ast
-@@ -54,10 +54,11 @@
- 	cd ../m2c; rm -f *.m[id]
- 
- clean:
-	rm -f core *.[dimor] ERRORS LISTING _Debug *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.[dimor] ERRORS LISTING _Debug *.bak
- 
- CLEAN:	clean
-	rm -f $(SOURCES) estra
-+	-rm -f $(SOURCES) estra
- 
- .SUFFIXES: .MD .md .MI .mi
- 
--- a/devel/cocktail/files/patch-front-doc-Makefile
+++ b/devel/cocktail/files/patch-front-doc-Makefile
@ -1,36 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./front/doc/Makefile	Tue Feb 15 14:23:21 1994
-+++ ./front/doc/Makefile	Thu Aug  5 18:48:59 2004
-@@ -1,17 +1,18 @@
- # $Id: Makefile,v 2.8 1993/08/24 13:19:11 grosch rel $
- 
-LIB	= $(HOME)/lib
-+.include "../../Makefile.inc" 
-+ROOTDIR=../..
- 
-install:	bnf.cat lalr.cat bnf.syn lalr.syn $(LIB)/lalr
-	install -c -m 644 bnf.cat  $(LIB)/lalr
-	install -c -m 644 lalr.cat $(LIB)/lalr
-	install -c -m 644 bnf.syn  $(LIB)/lalr
-	install -c -m 644 lalr.syn $(LIB)/lalr
-+install:	bnf.cat lalr.cat bnf.syn lalr.syn $(DESTLIB)/lalr
-+	install -c -m 644 bnf.cat  $(DESTLIB)/lalr
-+	install -c -m 644 lalr.cat $(DESTLIB)/lalr
-+	install -c -m 644 bnf.syn  $(DESTLIB)/lalr
-+	install -c -m 644 lalr.syn $(DESTLIB)/lalr
- 
- # installation directories
- 
-$(LIB)/lalr:	$(LIB)
-	sh -c "if test ! -d $(LIB)/lalr; then mkdir -p $(LIB)/lalr; else true; fi"
-+$(DESTLIB)/lalr:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/lalr; then mkdir -p $(DESTLIB)/lalr; else true; fi"
- 
- bnf.cat:	bnf.1
- 	nroff -man < bnf.1 | col > bnf.cat
-@@ -24,4 +25,5 @@
- 	troff -man lalr.1
- 
- clean:
-	rm -f bnf.cat lalr.cat
-+	-rm -f bnf.cat lalr.cat
-+
--- a/devel/cocktail/files/patch-front-m2c-Makefile
+++ b/devel/cocktail/files/patch-front-m2c-Makefile
@ -1,76 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./front/m2c/Makefile	Tue Feb 15 14:23:22 1994
-+++ ./front/m2c/Makefile	Thu Aug  5 18:49:00 2004
-@@ -1,35 +1,33 @@
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C libraries
-CLIBS	= $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -w -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-+ROOTDIR = ../..
-+CFLAGS	+= -I$(INCDIR)
-+CLIBS	+= $(REUSELIB)
- 
- OBJS	= Actions.o Character.o Checks.o Errors.o Limits.o \
-	  Listing.o Oper.o Pars.o Parser.o Path.o Rules.o Scanner.o \
-+	  Listing.o Oper.o Parser.o Path.o Rules.o Scanner.o \
- 	  SysError.o TokenTab.o Tokens.o WriteTok.o
- 
- libfront.a	: $(OBJS)
- 	ar ruc libfront.a $(OBJS)
- 	ranlib libfront.a
- 
-install:	ErrorTab libfront.a $(LIB)/lalr
-	cp ErrorTab $(LIB)/lalr
-	chmod a+r $(LIB)/lalr/ErrorTab
-+install:	ErrorTab libfront.a $(DESTLIB)/lalr
-+	cp ErrorTab $(DESTLIB)/lalr
-+	chmod a+r $(DESTLIB)/lalr/ErrorTab
- 
- # installation directories
- 
-$(LIB)/lalr:	$(LIB)
-	sh -c "if test ! -d $(LIB)/lalr; then mkdir -p $(LIB)/lalr; else true; fi"
-+$(DESTLIB)/lalr:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/lalr; then mkdir -p $(DESTLIB)/lalr; else true; fi"
-+
-+test:	Pars
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f libfront.a Pars
- 
- # HEAD
- 
-@@ -193,21 +191,3 @@
- 	Character.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-CLEAN	:
-	rm -f core *.o libfront.a
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-front-src-Makefile
+++ b/devel/cocktail/files/patch-front-src-Makefile
@ -1,45 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./front/src/Makefile	Tue Feb 15 14:23:34 1994
-+++ ./front/src/Makefile	Thu Aug  5 18:49:03 2004
-@@ -41,10 +41,10 @@
- 	make -f MakefileM2C LIB=$(MLIB)
- 
- Scanner.md Scanner.mi:	input.rex
-	rex -d input.rex;
-+	$(REX) -d input.rex;
- 
- Parser.md Parser.mi:	input.lalr
-	lalr -b -d input.lalr;
-+	$(LALR) -b -d input.lalr;
- 
- install:	ErrorTab $(LIB)/lalr
- 	install -c -m 644 ErrorTab $(LIB)/lalr
-@@ -65,9 +65,9 @@
- 
- lalrId:	input.rex
- 	echo SCANNER lalrId | cat - input.rex | \
-	sed 's/\(RETURN.*Ident\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
-+	$(SED) 's/\(RETURN.*Ident\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
- 	$(BIN).sparc.t/rex -sd;
-	sed 's/@/lalrId/' < ../../front/src/Id.mi > lalrIdDrv.mi
-+	$(SED) 's/@/lalrId/' < ../../front/src/Id.mi > lalrIdDrv.mi
- 	echo p lalrIdDrv | mc -d $(MLIB)
- 	mv lalrIdDrv lalrId
- 
-@@ -80,13 +80,14 @@
- 	sh -c "if test ! -d $(LIB)/Id; then mkdir -p $(LIB)/Id; else true; fi"
- 
- cleanId:
-	rm -f lalrId*
-+	-rm -f lalrId*
- 
- clean:	cleanId
-	rm -f core *.[dimor] *.def *.mod *.sym ERRORS LISTING _Debug Pars *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.[dimor] *.def *.mod *.sym ERRORS LISTING _Debug Pars *.bak
- 
- CLEAN:	clean
-	rm -f Scanner* Parser*
-+	-rm -f Scanner* Parser*
- 
- .SUFFIXES:	.def .mod .md .mi
- 
--- a/devel/cocktail/files/patch-l2cg-m2c-Makefile
+++ b/devel/cocktail/files/patch-l2cg-m2c-Makefile
@ -1,83 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./l2cg/m2c/Makefile	Tue Feb 15 14:23:40 1994
-+++ ./l2cg/m2c/Makefile	Thu Aug  5 18:49:08 2004
-@@ -1,42 +1,32 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C libraries
-CLIBS	= $(REUSE)/libreuse.a
-+ROOTDIR = ../..
-+CFLAGS  += -I$(INCDIR)
-+CLIBS   += $(REUSELIB)
-+
-+all: l2cg
-+
-+install:	l2cg l2cg.sh $(DESTLIB)/l2cg
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	sed 's;LIB;$(DESTLIB);g' < l2cg.sh > $(DESTBIN)/l2cg
-+	chmod a+rx $(DESTBIN)/l2cg
-+	install -c -s -m 755 l2cg $(DESTLIB)/l2cg
- 
-                # options for C compiler
-CFLAGS	= -w -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c -d$(HOME)/reuse/src
-
-
-all	: l2cg
-
-install:	l2cg l2cg.sh $(LIB)/l2cg
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed 's;LIB;$(LIB);g' < l2cg.sh > $(BIN)/l2cg
-	chmod a+rx $(BIN)/l2cg
-	install -c -s -m 755 l2cg $(LIB)/l2cg
-
-# installation directories
-
-$(LIB)/l2cg:	$(LIB)
-	sh -c "if test ! -d $(LIB)/l2cg; then mkdir -p $(LIB)/l2cg; else true; fi"
-
-# SYSTEM_	= SYSTEM_.o
-+$(DESTLIB)/l2cg:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/l2cg; then mkdir -p $(DESTLIB)/l2cg; else true; fi"
- 
- lint:
- 	lint -I$(REUSE) *.c
- 
- l2cg:	ParserDrv
-	mv ParserDrv l2cg
-+	cp ParserDrv l2cg
- 
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o l2cg ParserDrv
-+
- # HEAD
- 
- sources	: Parser.h
-@@ -68,18 +58,3 @@
- 	Scanner.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o l2cg
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-l2cg-src-Makefile
+++ b/devel/cocktail/files/patch-l2cg-src-Makefile
@ -1,34 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./l2cg/src/Makefile	Tue Feb 15 14:23:44 1994
-+++ ./l2cg/src/Makefile	Thu Aug  5 18:49:08 2004
-@@ -14,14 +14,14 @@
- 	mv ParserDrv l2cg
- 
- Scanner.md Scanner.mi:	l2cg.rex
-	rex -d l2cg.rex;
-+	$(REX) -d l2cg.rex;
- 
- Parser.md Parser.mi ParserDrv.mi:	l2cg.lalr
-	lalr -b -d -p l2cg.lalr;
-+	$(LALR) -b -d -p l2cg.lalr;
- 
- install:	l2cg l2cg.sh $(LIB)/l2cg
- 	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed 's;LIB;$(LIB);g' < l2cg.sh > $(BIN)/l2cg
-+	$(SED) 's;LIB;$(LIB);g' < l2cg.sh > $(BIN)/l2cg
- 	chmod a+rx $(BIN)/l2cg
- 	install -c -s -m 755 l2cg $(LIB)/l2cg
- 
-@@ -33,10 +33,11 @@
- m2c:
- 	# co RCS/*
- 	make $(SOURCES)
-	rm -f ../m2c/*.[hc]
-+	-rm -f ../m2c/*.[hc]
- 	ln *.m[id] ../m2c
- 	cd ../m2c; make sources M2FLAGS="-c -d../../reuse/src"
- 	cd ../m2c; rm -f *.m[id]
- 
- clean:
-	rm -f l2cg core *.[dimor] *.bak *.m?
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  l2cg  *.[dimor] *.bak *.m?
--- a/devel/cocktail/files/patch-l2r-src-Makefile
+++ b/devel/cocktail/files/patch-l2r-src-Makefile
@ -1,61 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./l2r/src/Makefile	Tue Feb 15 14:23:48 1994
-+++ ./l2r/src/Makefile	Thu Aug  5 18:49:10 2004
-@@ -1,35 +1,38 @@
-BIN	= $(HOME)/bin
-OPT	= -O
-CC	= cc
-REUSE	= ../../reuse/c
-CFLAGS	= -w -I$(REUSE) $(OPT)
-+
-+.include "../../Makefile.inc"
-+
-+ROOTDIR = ../..
-+CFLAGS  += -I$(INCDIRC)
-+CLIBS   += $(REUSELIBC)
-+
- OBJS	= l2r.o Parser.o Scanner.o Errors.o StringBuf.o
- SOURCES	= Scanner.h Scanner.c Parser.h Parser.c
- 
- # targets
- 
- l2r:	$(OBJS)
-	$(CC) -o l2r $(CFLAGS) $(OBJS) $(REUSE)/libreuse.a
-+	$(CC) -o l2r $(CFLAGS) $(OBJS) $(REUSELIBC)
- 
- sources:	$(SOURCES)
- 
- Scanner.h Scanner.c:	lex.rex
-	rex -cd lex.rex;
-+	$(REX) -cd lex.rex;
- 
- Parser.h Parser.c:	lex.lalr
-	lalr -b -c -d lex.lalr;
-+	$(LALR) -b -c -d lex.lalr;
- 
- install:	l2r
-	install -c -s -m 755 l2r $(BIN)
-+	install -c -s -m 755 l2r $(DESTBIN)
- 
- lint:	l2r.c Parser.c Scanner.c Errors.c StringBuf.c
-	lint -I$(REUSE) -b -u *.c
-+	lint -I$(INCDIRC) -b -u *.c
- 
- clean:
-	rm -f core l2r *.o
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   l2r *.o Scanner.c Scanner.h Parser.h Parser.c
- 
- CLEAN:	clean
-	rm -f $(SOURCES)
-+	-rm -f $(SOURCES)
- 
- # dependencies
- 
-@@ -44,7 +47,4 @@
- man:
- 	nroff -man l2r.1
- 
-.SUFFIXES:	.c .o
- 
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-lalr-m2c-Makefile
+++ b/devel/cocktail/files/patch-lalr-m2c-Makefile
@ -1,79 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./lalr/m2c/Makefile	Tue Feb 15 14:23:56 1994
-+++ ./lalr/m2c/Makefile	Thu Aug  5 18:49:12 2004
-@@ -1,21 +1,9 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C library (front)
-FRONT	= ../../front/m2c
-
-                # C libraries
-CLIBS	= $(FRONT)/libfront.a $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -I$(FRONT) -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-+ROOTDIR = ../..
-+CFLAGS  += -I$(FRONTINC) -I$(INCDIR)
-+CLIBS   += $(FRONTLIB) $(REUSELIB)
- 
- PLIB	= ParserDrv.mi Parser.md Parser.mi Errors.md Errors.mi Scanner.md Scanner.mi \
- 	  ParserDrv.c Parser.c Parser.h Errors.c Errors.h Scanner.c Scanner.h \
-@@ -24,19 +12,22 @@
- 
- all	: lalr
- 
-install:	lalr lalr.sh $(LIB)/lalr
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	install -c -s -m 755 lalr $(LIB)/lalr
-	sed "s;LIB;$(LIB);" < lalr.sh > $(BIN)/lalr
-	chmod a+rx $(BIN)/lalr
-	cd ../lib; cp $(PLIB) $(LIB)/lalr
-	cd $(LIB)/lalr; chmod a+r $(PLIB)
-+install:	lalr lalr.sh $(DESTLIB)/lalr
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	install -c -s -m 755 lalr $(DESTLIB)/lalr
-+	sed "s;LIB;$(DESTLIB);" < lalr.sh > $(DESTBIN)/lalr
-+	chmod a+rx $(DESTBIN)/lalr
-+	cd ../lib; cp $(PLIB) $(DESTLIB)/lalr
-+	cd $(DESTLIB)/lalr; chmod a+r $(PLIB)
- 
- # installation directories
- 
-$(LIB)/lalr:	$(LIB)
-	sh -c "if test ! -d $(LIB)/lalr; then mkdir -p $(LIB)/lalr; else true; fi"
-+$(DESTLIB)/lalr:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/lalr; then mkdir -p $(DESTLIB)/lalr; else true; fi"
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o lalr
- 
- # HEAD
- 
-@@ -200,18 +191,3 @@
- 	Infos.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-lalr-src-Makefile
+++ b/devel/cocktail/files/patch-lalr-src-Makefile
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./lalr/src/Makefile	Tue Feb 15 14:24:10 1994
-+++ ./lalr/src/Makefile	Thu Aug  5 18:49:15 2004
-@@ -58,7 +58,8 @@
- sources:
- 
- clean:
-	rm -f core *.[dimor] *.def *.mod *.sym ERRORS LISTING _Debug *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.[dimor] *.def *.mod *.sym ERRORS LISTING _Debug *.bak
- 
- .SUFFIXES:	.def .mod .md .mi
- 
--- a/devel/cocktail/files/patch-mpp-src-Makefile
+++ b/devel/cocktail/files/patch-mpp-src-Makefile
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./mpp/src/Makefile	Tue Feb 15 14:24:13 1994
-+++ ./mpp/src/Makefile	Thu Aug  5 18:49:16 2004
-@@ -21,7 +21,7 @@
- 	install -c -s -m 755 mpp $(BIN)/mpp
- 
- clean:
-	rm -f *.[dimor] mpp *.bak
-+	-rm -f *.[dimor] mpp *.bak
- 
- CLEAN:	clean
-	rm -f Parser.m[di]
-+	-rm -f Parser.m[di]
--- a/devel/cocktail/files/patch-mtc-m2c-Makefile
+++ b/devel/cocktail/files/patch-mtc-m2c-Makefile
@ -1,109 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./mtc/m2c/Makefile	Tue Feb 15 14:24:29 1994
-+++ ./mtc/m2c/Makefile	Thu Aug  5 18:49:18 2004
-@@ -1,43 +1,37 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc"
- 
-                # C library
-CLIBS	= $(REUSE)/libreuse.a
-+ROOTDIR = ../..
-+CFLAGS  += -I$(INCDIR)
-+CLIBS   += $(REUSELIB)
- 
-                # options for cc
-CFLAGS	= -w -I$(REUSE) $(OPT)
-+RTS	= $(INCDIR)/SYSTEM_.h $(INCDIR)/SYSTEM_.c Arguments.h Arguments.c
- 
-                # options for mtc
-M2FLAGS	= -c
-+all: mtc
- 
-                # "runtime system"
-RTS	= SYSTEM_.h SYSTEM_.c Arguments.h Arguments.c
-
-all	:
-
-install:	mtc $(BIN) $(LIB)/mtc
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	install -c -s -m 755 mtc $(BIN)
-	cp $(RTS) $(LIB)/mtc
-	chmod a+r $(LIB)/mtc/*.[hc]
-+install:	mtc $(DESTBIN) $(DESTLIB)/mtc
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: DESTBIN = DESTLIB; false; else true; fi
-+	install -c -s -m 755 mtc $(DESTBIN)
-+	cp $(RTS) $(DESTLIB)/mtc
-+	chmod a+r $(DESTLIB)/mtc/*.[hc]
- 
- # installation directories
- 
-$(BIN):
-	sh -c "if test ! -d $(BIN); then mkdir -p $(BIN); else true; fi"
-+$(DESTBIN):
-+	sh -c "if test ! -d $(DESTBIN); then mkdir -p $(DESTBIN); else true; fi"
- 
-$(LIB):
-	sh -c "if test ! -d $(LIB); then mkdir -p $(LIB); else true; fi"
-+$(DESTLIB):
-+	sh -c "if test ! -d $(DESTLIB); then mkdir -p $(DESTLIB); else true; fi"
- 
-$(LIB)/mtc:	$(LIB)
-	sh -c "if test ! -d $(LIB)/mtc; then mkdir -p $(LIB)/mtc; else true; fi"
-+$(DESTLIB)/mtc:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/mtc; then mkdir -p $(DESTLIB)/mtc; else true; fi"
- 
- 
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f mtc
-+
- # HEAD
- 
- sources	: AssocTab.h
-@@ -236,9 +230,10 @@
- mtc.o	: Defs.h
- mtc.o	: Code.h
- 
-SYSTEM_.o	: SYSTEM_.c SYSTEM_.h
-+# SYSTEM_.o	: SYSTEM_.c SYSTEM_.h
- 
-mtc	: $(SYSTEM)	\
-+# mtc	: $(SYSTEM)	\
-+mtc	: \
- 	mtc.o	\
- 	Code.o	\
- 	Values.o	\
-@@ -257,7 +252,7 @@
- 	Semantics.o	\
- 	DefMods.o	\
- 	Parser.o	\
-;	$(CC) $(CFLAGS) -o mtc $(SYSTEM)	\
-+;	$(CC) $(CFLAGS) -o mtc \
- 	mtc.o	\
- 	Code.o	\
- 	Values.o	\
-@@ -278,18 +273,3 @@
- 	Parser.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-mtc-make-Makefile
+++ b/devel/cocktail/files/patch-mtc-make-Makefile
@ -1,44 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./mtc/make/Makefile	Tue Feb 15 14:24:53 1994
-+++ ./mtc/make/Makefile	Thu Aug  5 18:49:21 2004
-@@ -26,10 +26,10 @@
- 	sh -c "if test ! -d $(LIB)/makemake; then mkdir -p $(LIB)/makemake; else true; fi"
- 
- Scanner.md Scanner.mi:	modula.rex
-	rex -d modula.rex;
-+	$(REX) -d modula.rex;
- 
- Parser.md Parser.mi:	modula.ell
-	ell -di modula.ell;
-+	$(ELL) -di modula.ell;
- 
- m2c:	$(SRCM) $(GEN)
- 	make sources M2FLAGS="-c -d../../reuse/src" -f MakefileC
-@@ -38,9 +38,9 @@
- 
- modId:	modula.rex
- 	echo SCANNER modId | cat - modula.rex | \
-	sed 's/\(RETURN.*Ident\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
-	$(BIN).t/rex -sd;
-	sed 's/@/modId/' < ../../front/src/Id.mi > modIdDrv.mi
-+	$(SED) 's/\(RETURN.*Ident\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
-+	$(REX) -sd;
-+	$(SED) 's/@/modId/' < ../../front/src/Id.mi > modIdDrv.mi
- 	echo p modIdDrv | mc -d ../../reuse/src
- 	mv modIdDrv modId
- 
-@@ -53,10 +53,12 @@
- 	sh -c "if test ! -d $(LIB)/Id; then mkdir -p $(LIB)/Id; else true; fi"
- 
- cleanId:
-	rm -f modId*
-+	-rm -f modId*
- 
- clean:	cleanId
-	rm -f *.[dimor] core ERRORS LISTING *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  *.[dimor]  ERRORS LISTING *.bak
- 
- CLEAN:	clean
-	rm -f [A-Z]*.[hc] Parser.m? Scanner.m? GetImports
-+	-rm -f [A-Z]*.[hc] Parser.m? Scanner.m? GetImports
-+.include "../../Makefile.inc" 
--- a/devel/cocktail/files/patch-mtc-src-Makefile
+++ b/devel/cocktail/files/patch-mtc-src-Makefile
@ -1,80 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./mtc/src/Makefile	Tue Feb 15 14:25:08 1994
-+++ ./mtc/src/Makefile	Thu Aug  5 18:49:23 2004
-@@ -27,25 +27,25 @@
- 	echo p mtc | $(MC)
- 
- Scanner.md Scanner.mi:	modula.rex
-	rex -di modula.rex;
-+	$(REX) -di modula.rex;
- 
- Parser.md Parser.mi:	modula.ell
-	ell -di modula.ell;
-+	$(ELL) -di modula.ell;
- 
- Tree.md Tree.mi:	modula.cg
-	cg -mRdiDI0 modula.cg;
-+	$(CG) -mRdiDI0 modula.cg;
- 
- Semantics.md Semantics.mi:	modula.cg
-	cg -DI0 modula.cg;
-+	$(CG) -DI0 modula.cg;
- 
- Defs.md Defs.mi:	defs.cg
-	cg -mdi defs.cg;
-+	$(CG) -mdi defs.cg;
- 
- Tree.TS:	modula.cg
- 	echo SELECT Abstract | cat - modula.cg | cg -4
- 
- Code.md Code.mi:	code.puma Tree.TS opp opp.sed
-	opp code.puma | puma -dis
-+	opp code.puma | $(PUMA) -dis
- #	Opp = output pre processor
- 
- install:	mtc $(BIN) $(LIB)/mtc
-@@ -75,35 +75,36 @@
- MTC	= time mtc -tm -d../../reuse/src s.mi
- 
- test:	$(GEN) $(SRCM)
-	cg -IL modula.cg;
-+	$(CG) -IL modula.cg;
- 	mv Semantics.mi s.mi
-	cg -dimRDI0 modula.cg;
-+	$(CG) -dimRDI0 modula.cg;
- 	make mtc
- 	tcsh -c "$(MTC); $(MTC); $(MTC); $(MTC)"
- 	wc Semantics.mi
- 	size Semantics.o mtc
-	cg -dimRDI09 modula.cg;
-+	$(CG) -dimRDI09 modula.cg;
- 	make mtc
- 	$(MTC)
-	cg -dimRDI modula.cg;
-+	$(CG) -dimRDI modula.cg;
- 	make mtc
- 	tcsh -c "$(MTC); $(MTC); $(MTC); $(MTC)"
- 	wc Semantics.mi
- 	size Semantics.o mtc
-	cg -dimRDI9 modula.cg;
-+	$(CG) -dimRDI9 modula.cg;
- 	make mtc
- 	$(MTC)
-	cg -dimRDIL modula.cg;
-+	$(CG) -dimRDIL modula.cg;
- 	make mtc
- 	tcsh -c "$(MTC); $(MTC); $(MTC); $(MTC)"
- 	wc Semantics.mi
- 	size Semantics.o mtc
-	cg -dimRDIL9 modula.cg;
-+	$(CG) -dimRDIL9 modula.cg;
- 	make mtc
- 	$(MTC)
- 
- clean:
-	rm -f *.[dimor] core ERRORS LISTING convert *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  *.[dimor]  ERRORS LISTING convert *.bak
- 
- CLEAN:	clean
-	rm -f mtc $(GEN) Tree.TS
-+	-rm -f mtc $(GEN) Tree.TS
--- a/devel/cocktail/files/patch-puma-ffaba-c-Makefile
+++ b/devel/cocktail/files/patch-puma-ffaba-c-Makefile
@ -1,42 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./puma/ffaba-c/Makefile	Tue Feb 15 14:26:16 1994
-+++ ./puma/ffaba-c/Makefile	Thu Aug  5 18:49:29 2004
-@@ -1,28 +1,28 @@
-LIB	= $(HOME)/lib
-INCDIR	= $(LIB)/include
-CFLAGS	= -I$(INCDIR)
-CC	= cc -O
-+ROOTDIR = ../..
-+.include "../../Makefile.inc"
- 
-all:	main
-+CFLAGS += -I $(TMPINC)
-+
-+test all:	main
- 	time main
- 
- main:	ProTest.o Compiler.o
-	cc -o main Compiler.o ProTest.o $(LIB)/libreuse.a
-+	$(CC) -o main Compiler.o ProTest.o $(TMPLIB)/libreuse.a
- 
- ProTest.o:	ProTest.h
- Compiler.o:	ProTest.h
- 
- ProTest.h ProTest.c ProTest.TS: ffaba.ast
-	cg -cdi4 ffaba.ast
-+	 $(CG) -cdi4 ffaba.ast
- 
- Compiler.h Compiler.c: ffaba.puma ProTest.TS
-	puma -cdip ffaba.puma
-+	$(PUMA) -cdip ffaba.puma
- 
- lint:	ProTest.h ProTest.c Compiler.h Compiler.c
- 	lint $(CFLAGS) *.c
- 
- clean:
-	rm -f core Compiler.* ProTest.* yy*.w main
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   Compiler.* ProTest.* yy*.w main
-+
- 
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c;
--- a/devel/cocktail/files/patch-puma-ffaba-m-Makefile
+++ b/devel/cocktail/files/patch-puma-ffaba-m-Makefile
@ -1,11 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./puma/ffaba-m/Makefile	Tue Feb 15 14:26:15 1994
-+++ ./puma/ffaba-m/Makefile	Thu Aug  5 18:49:29 2004
-@@ -11,4 +11,7 @@
- 	puma -dip ffaba.puma
- 
- clean:
-	rm -f core Compiler.* ProTest.* main.[mor] main
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   Compiler.* ProTest.* main.[mor] main
-+
-+.include "../../Makefile.inc" 
--- a/devel/cocktail/files/patch-puma-m2c-C.c
+++ b/devel/cocktail/files/patch-puma-m2c-C.c
@ -1,20 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./puma/m2c/C.c	Tue Feb 15 14:26:00 1994
-+++ ./puma/m2c/C.c	Thu Aug  5 18:49:27 2004
-@@ -1558,7 +1558,7 @@
-           IO_WriteS(Tree_f, (STRING)"_Exit) () = yyExit;", 19L);
-           IO_WriteNl(Tree_f);
-           IO_WriteNl(Tree_f);
-          IO_WriteS(Tree_f, (STRING)"static FILE * yyf = stdout;", 27L);
-+          IO_WriteS(Tree_f, (STRING)"static FILE * yyf;", 18L);
-           IO_WriteNl(Tree_f);
-           IO_WriteNl(Tree_f);
-           IO_WriteS(Tree_f, (STRING)"static void yyAbort", 19L);
-@@ -1594,6 +1594,8 @@
-           IO_WriteS(Tree_f, (STRING)" ()", 3L);
-           IO_WriteNl(Tree_f);
-           IO_WriteS(Tree_f, (STRING)"{", 1L);
-+          IO_WriteNl(Tree_f);
-+          IO_WriteS(Tree_f, (STRING)"  yyf = stdout;", 15L);
-           IO_WriteNl(Tree_f);
-           WriteLine(W_35->Codes->U_1.V_12.Codes.BeginLine);
-           Texts_WriteText(Tree_f, W_35->Codes->U_1.V_12.Codes.Begin);
--- a/devel/cocktail/files/patch-puma-m2c-Makefile
+++ b/devel/cocktail/files/patch-puma-m2c-Makefile
@ -1,79 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./puma/m2c/Makefile	Tue Feb 15 14:25:55 1994
-+++ ./puma/m2c/Makefile	Thu Aug  5 18:49:29 2004
-@@ -1,39 +1,32 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-
-                # C libraries
-CLIBS	= $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -w -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c -d$(HOME)/reuse/src
-+.include "../../Makefile.inc" 
- 
-+ROOTDIR = ../..
-+CFLAGS  += -I$(INCDIR)
-+CLIBS   += $(REUSELIB)
- 
- all	: puma
- 
-install:	puma puma.sh $(LIB)/puma
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed 's;LIB;$(LIB);g' < puma.sh > $(BIN)/puma
-	chmod a+rx $(BIN)/puma
-	install -c -s -m 755 puma $(LIB)/puma
-	install -c -m 644 TypeTab.c $(LIB)/puma
-	install -c -m 644 TypeTab.m $(LIB)/puma
-+install:	puma puma.sh $(DESTLIB)/puma
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: BIN = LIB; false; else true; fi
-+	sed 's;LIB;$(DESTLIB);g' < puma.sh > $(DESTBIN)/puma
-+	chmod a+rx $(DESTBIN)/puma
-+	install -c -s -m 755 puma $(DESTLIB)/puma
-+	install -c -m 644 TypeTab.c $(DESTLIB)/puma
-+	install -c -m 644 TypeTab.m $(DESTLIB)/puma
- 
- # installation directories
- 
-$(LIB)/puma:	$(LIB)
-	sh -c "if test ! -d $(LIB)/puma; then mkdir -p $(LIB)/puma; else true; fi"
-+$(DESTLIB)/puma:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/puma; then mkdir -p $(DESTLIB)/puma; else true; fi"
- 
-# SYSTEM_	= SYSTEM_.o
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f puma
- 
- lint:
-	lint -I$(REUSE) *.c
-+	lint -I$(INCDIR) *.c
- 
- 
- # HEAD
-@@ -140,18 +133,3 @@
- 	Parser.o	\
- 	$(CLIBS)
- 
-# TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-puma-src-Makefile
+++ b/devel/cocktail/files/patch-puma-src-Makefile
@ -1,103 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./puma/src/Makefile	Tue Feb 15 14:25:38 1994
-+++ ./puma/src/Makefile	Thu Aug  5 18:49:25 2004
-@@ -20,40 +20,40 @@
- 	echo p puma | mc -d ../../reuse/src
- 
- Scanner.rpp Parser.lalr:	puma.pars
-	cg -xzj puma.pars;
-+	$(CG) -xzj puma.pars;
- 
- puma.rex:	puma.scan Scanner.rpp
-	rpp < puma.scan > puma.rex;
-+	$(RPP) < puma.scan > puma.rex;
- 
- Scanner.md Scanner.mi:	puma.rex
-	rex -d puma.rex;
-+	$(REX) -d puma.rex;
- 
- Parser.md:	Parser.lalr
-	lalr -d -v Parser.lalr;
-+	$(LALR) -d -v Parser.lalr;
- 
- Parser.mi:	Parser.lalr
-	lalr -v Parser.lalr;
-+	$(LALR) -v Parser.lalr;
- 
- Tree.md:	puma.cg
-	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | cg -dimRyq
-+	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | $(CG) -dimRyq
- 
- Tree.mi:	puma.cg
-	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | cg -imRyq
-+	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | $(CG) -imRyq
- 
- Tree2.md:	puma.cg
-	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | cg -dig
-+	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | $(CG) -dig
- 
- Tree2.mi:	puma.cg
-	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | cg -ig
-+	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | $(CG) -ig
- 
- Tree.TS:	puma.cg
-	echo SELECT PumaIn Puma | cat - puma.cg | cg -4
-+	echo SELECT PumaIn Puma | cat - puma.cg | $(CG) -4
- 
- Semantics.md Semantics.mi:	sem.puma Tree.TS
-	puma -dinw sem.puma;
-+	$(PUMA) -dinw sem.puma;
- 
- Optimize.md Optimize.mi:	opt.puma Tree.TS
-	puma -diwk opt.puma;
-+	$(PUMA) -diwk opt.puma;
- 
- Mod.md Mod.mi:	mod.puma Tree.TS
- 	$(SED) < mod.puma | puma -dinw;
-@@ -64,9 +64,9 @@
- puma.mi:	puma.sed
- 	$(SED) < puma.sed > puma.mi
- 
-install:	puma puma.sh $(LIB)/puma
-+install:	$(PUMA) puma.sh $(LIB)/puma
- 	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed 's;LIB;$(LIB);g' < puma.sh > $(BIN)/puma
-+	$(SED) 's;LIB;$(LIB);g' < puma.sh > $(BIN)/puma
- 	chmod a+rx $(BIN)/puma
- 	install -c -s -m 755 puma $(LIB)/puma
- 	install -c -m 644 TypeTab.c $(LIB)/puma
-@@ -80,7 +80,7 @@
- m2c:
- 	# co RCS/*
- 	make $(SOURCES)
-	rm -f ../m2c/*.[hc]
-+	-rm -f ../m2c/*.[hc]
- 	cp TypeTab.[mc] ../m2c
- 	ln *.m[id] ../m2c
- 	cd ../m2c; make sources M2FLAGS="-c -d../../reuse/src"
-@@ -90,9 +90,9 @@
- 
- pumaId:	puma.rex
- 	echo SCANNER pumaId | cat - puma.rex | \
-	sed 's/\(RETURN 1	\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
-+	$(SED) 's/\(RETURN 1	\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
- 	$(BIN).t/rex -sd;
-	sed 's/@/pumaId/' < ../../front/src/Id.mi > pumaIdDrv.mi
-+	$(SED) 's/@/pumaId/' < ../../front/src/Id.mi > pumaIdDrv.mi
- 	echo p pumaIdDrv | mc -d ../../reuse/src
- 	mv pumaIdDrv pumaId
- 
-@@ -105,10 +105,11 @@
- 	sh -c "if test ! -d $(LIB)/Id; then mkdir -p $(LIB)/Id; else true; fi"
- 
- cleanId:
-	rm -f pumaId*
-+	-rm -f pumaId*
- 
- clean:	cleanId
-	rm -f _Debug core *.[dior] [A-SU-Za-z]*.m Tree*.m *.bak
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  _Debug  *.[dior] [A-SU-Za-z]*.m Tree*.m *.bak
- 
- CLEAN:	clean
-	rm -f puma $(SOURCES) Tree.TS Scanner.rpp puma.rex Parser.lalr
-+	-rm -f puma $(SOURCES) Tree.TS Scanner.rpp puma.rex Parser.lalr
--- a/devel/cocktail/files/patch-r2l-m2c-Makefile
+++ b/devel/cocktail/files/patch-r2l-m2c-Makefile
@ -1,69 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./r2l/m2c/Makefile	Tue Feb 15 14:26:18 1994
-+++ ./r2l/m2c/Makefile	Thu Aug  5 18:49:31 2004
-@@ -1,33 +1,27 @@
-BIN	= $(HOME)/bin
-LIB	= $(HOME)/lib
-OPT	= -O
-CC	= cc
- 
-                # C library (reuse)
-REUSE	= ../../reuse/m2c
-+.include "../../Makefile.inc" 
- 
-                # C libraries
-CLIBS	= $(REUSE)/libreuse.a
-
-                # options for C compiler
-CFLAGS	= -w -I$(REUSE) $(OPT)
-
-M2FLAGS	= -c
-+ROOTDIR = ../..
-+CFLAGS  += -I$(INCDIR)
-+CLIBS   += $(REUSELIB)
- 
- all:	r2l
- 
-install:	r2l r2l.sh $(LIB)/r2l
-	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed 's;LIB;$(LIB);g' < r2l.sh > $(BIN)/r2l
-	chmod a+rx $(BIN)/r2l
-	install -c -s -m 755 r2l $(LIB)/r2l
-+install:	r2l r2l.sh $(DESTLIB)/r2l
-+	if test $(DESTLIB) = $(DESTBIN); then echo error: BIN = LIB; false; else true; fi
-+	sed 's;LIB;$(DESTLIB);g' < r2l.sh > $(DESTBIN)/r2l
-+	chmod a+rx $(DESTBIN)/r2l
-+	install -c -s -m 755 r2l $(DESTLIB)/r2l
- 
- # installation directories
- 
-$(LIB)/r2l:	$(LIB)
-	sh -c "if test ! -d $(LIB)/r2l; then mkdir -p $(LIB)/r2l; else true; fi"
-+$(DESTLIB)/r2l:	$(DESTLIB)
-+	sh -c "if test ! -d $(DESTLIB)/r2l; then mkdir -p $(DESTLIB)/r2l; else true; fi"
- 
-# SYSTEM_	= SYSTEM_.o
-+clean:
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.o
-+	-rm -f r2l
- 
- # HEAD
- 
-@@ -79,17 +73,3 @@
- 	$(CLIBS)
- 
- # TAIL
-
-clean	:
-	rm -f core *.o
-
-.SUFFIXES: .md .mi .h .c .o
-
-.mi.c:
-	mtc2 $(M2FLAGS) $*.mi;
-
-.md.h:
-	mtc2 $(M2FLAGS) $*.md;
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-r2l-src-Makefile
+++ b/devel/cocktail/files/patch-r2l-src-Makefile
@ -1,37 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./r2l/src/Makefile	Tue Feb 15 14:26:26 1994
-+++ ./r2l/src/Makefile	Thu Aug  5 18:49:31 2004
-@@ -15,14 +15,14 @@
- 	echo p r2l | mc -d ../../reuse/src
- 
- Scanner.mi Scanner.md:	r2l.rex
-	rex -d r2l.rex;
-+	$(REX) -d r2l.rex;
- 
- Parser.mi Parser.md:	r2l.lalr
-	lalr -b -d r2l.lalr;
-+	$(LALR) -b -d r2l.lalr;
- 
- install:	r2l r2l.sh $(LIB)/r2l
- 	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed "s;LIB;$(LIB);g" < r2l.sh > $(BIN)/r2l
-+	$(SED) "s;LIB;$(LIB);g" < r2l.sh > $(BIN)/r2l
- 	chmod a+rx $(BIN)/r2l
- 	install -c -s -m 755 r2l $(LIB)/r2l
- 
-@@ -35,12 +35,13 @@
- 	# co RCS/*
- 	make $(SOURCES)
- 	ln *.m[id] ../m2c
-	rm -f ../m2c/*.[hc]
-+	-rm -f ../m2c/*.[hc]
- 	cd ../m2c; make sources M2FLAGS="-c -d../../reuse/src"
- 	cd ../m2c; rm -f *.m[id]
- 
- clean:
-	rm -f core *.[dimor] ERRORS LISTING _Debug r2l
-+	-rm -f $(STDCLEAN) 
-+	-rm -f   *.[dimor] ERRORS LISTING _Debug r2l
- 
- CLEAN:	clean
-	rm -f $(SOURCES)
-+	-rm -f $(SOURCES)
--- a/devel/cocktail/files/patch-reuse-c-DynArrDrv.c
+++ b/devel/cocktail/files/patch-reuse-c-DynArrDrv.c
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/DynArrDrv.c	Tue Feb 15 14:26:33 1994
-+++ ./reuse/c/DynArrDrv.c	Fri Sep 10 13:35:02 2004
-@@ -23,7 +23,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: DynArrDrv.c,v 1.5 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: DynArrDrv.c,v 1.5 1993/08/18 15:01:05 grosch rel $");
- 
- # include "ratc.h"
- # include "DynArray.h"
--- a/devel/cocktail/files/patch-reuse-c-DynArray.c
+++ b/devel/cocktail/files/patch-reuse-c-DynArray.c
@ -1,22 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/DynArray.c	Tue Feb 15 14:26:34 1994
-+++ ./reuse/c/DynArray.c	Fri Sep 10 13:35:02 2004
-@@ -29,7 +29,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: DynArray.c,v 1.7 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: DynArray.c,v 1.7 1993/08/18 15:01:05 grosch rel $");
- 
- # include "ratc.h"
- # include "DynArray.h"
-@@ -39,8 +40,7 @@
- 
- /* INVARIANT ElmtCount * AlignedSize (ElmtSize) % sizeof (long) == 0 */
- 
-static unsigned long AlignedSize (ElmtSize)
-   unsigned long	ElmtSize;
-+static unsigned long AlignedSize ( unsigned long	ElmtSize)
-    {
-       register unsigned long Align;
- 
--- a/devel/cocktail/files/patch-reuse-c-Errors.c
+++ b/devel/cocktail/files/patch-reuse-c-Errors.c
@ -1,98 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Errors.c	Tue Feb 15 14:26:34 1994
-+++ ./reuse/c/Errors.c	Fri Sep 10 13:35:02 2004
-@@ -14,8 +14,11 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Juli 1992 */
- 
-static char rcsid [] = "$Id: Errors.c,v 1.2 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: Errors.c,v 1.2 1993/08/18 15:01:05 grosch rel $");
- 
-+# include <string.h>
-+# include <stdlib.h>
- # include "Errors.h"
- 
- # ifdef __cplusplus
-@@ -34,9 +37,9 @@
- 
- # define MaxError	100
- 
-static void yyExit () { rExit (1); }
-+static void yyExit (NOARGS) { rExit (1); }
- 
-void (* Errors_Exit) () = yyExit;
-+void (* Errors_Exit) (NOARGS) = yyExit;
- 
- typedef struct {
-    tPosition	Position;
-@@ -63,13 +66,14 @@
- static void WriteInfo	ARGS((int InfoClass, char * Info));
- static void WriteMessage ARGS((bool IsErrorCode, int ErrorCode, int ErrorClass, tPosition Position, int InfoClass, char * Info));
- static void StoreMessage ARGS((bool IsErrorCode, int ErrorCode, int ErrorClass, tPosition Position, int InfoClass, char * Info));
-static int IsLess	ARGS((tError * i, tError * j));
-+static int IsLess	ARGS((const void * i, const void * j));
- 
- static tError	ErrorTable [MaxError + 1];
- static int	MessageCount;
- static bool	IsStore		= false;
- static void (*	HandleMessage) ARGS((bool IsErrorCode, int ErrorCode, int ErrorClass, tPosition Position, int InfoClass, char * Info)) = WriteMessage;
-static FILE *	Out			= stderr;
-+static FILE *	Out = NULL;
-+/*			= stderr; */
- 
- void ErrorMessage
- # if defined __STDC__ | defined __cplusplus
-@@ -122,6 +126,7 @@
-    (Position, ErrorClass) tPosition Position; int ErrorClass;
- # endif
- {
-+   if (Out==NULL) {Out = stderr;}
-    WritePosition (Out, Position);
-    (void) fputs (": ", Out);
-    switch (ErrorClass) {
-@@ -143,6 +148,7 @@
-    (ErrorCode) int ErrorCode;
- # endif
- {
-+   if (Out==NULL) {Out = stderr;}
-    switch (ErrorCode) {
-    case xxNoText	: break;
-    case xxSyntaxError	: (void) fputs ("syntax error"		, Out); break;
-@@ -163,6 +169,7 @@
- {
-    int i;
-    if (InfoClass == xxNone) return;
-+   if (Out==NULL) {Out = stderr;}
-    (void) fputs (": ", Out);
-    switch (InfoClass) {
-    case xxInteger	: (void) fprintf (Out, "%d", * (int *) Info); break;
-@@ -201,10 +208,10 @@
- # endif
- {
-    int i;
-   char * Info;
-+   char * Info = NULL;
-    char s [256];
- 
-   qsort ((char *) & ErrorTable [1], MessageCount, sizeof (tError), IsLess);
-+   qsort ((char *) & ErrorTable [1], MessageCount, sizeof (tError), (&IsLess));
-    Out = File;
-    for (i = 1; i <= MessageCount; i ++) {
-       register tError * With = & ErrorTable [i];
-@@ -273,13 +280,13 @@
- 
- static int IsLess
- # if defined __STDC__ | defined __cplusplus
-   (tError * i, tError * j)
-+   ( const void * i, const void * j)
- # else
-    (i, j) tError * i, * j;
- # endif
- {
-  register int r = Compare (i->Position, j->Position);
-  return r != 0 ? r : i->ErrorNumber - j->ErrorNumber;
-+  register int r = Compare ((tPosition)(((tError*)i)->Position), (tPosition)(((tError*)j)->Position));
-+  return r != 0 ? r : (int)(((tError*)i)->ErrorNumber - ((tError*)j)->ErrorNumber);
- }
- 
- void StoreMessages
--- a/devel/cocktail/files/patch-reuse-c-Errors.h
+++ b/devel/cocktail/files/patch-reuse-c-Errors.h
@ -1,17 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Errors.h	Tue Feb 15 14:26:35 1994
-+++ ./reuse/c/Errors.h	Fri Sep 10 13:35:02 2004
-@@ -44,13 +44,7 @@
- # define xxSet			8
- # define xxIdent		9
- 
-# if defined __STDC__ | defined __cplusplus
-# define ARGS(parameters)	parameters
-# else
-# define ARGS(parameters)	()
-# endif
-
-extern void (* Errors_Exit) ();
-+extern void (* Errors_Exit) (NOARGS);
- 			/* Refers to a procedure that specifies		*/
- 			/* what to do if 'ErrorClass' = Fatal.		*/
- 			/* Default: terminate program execution.	*/
--- a/devel/cocktail/files/patch-reuse-c-ErrorsDrv.c
+++ b/devel/cocktail/files/patch-reuse-c-ErrorsDrv.c
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/ErrorsDrv.c	Tue Feb 15 14:26:35 1994
-+++ ./reuse/c/ErrorsDrv.c	Fri Sep 10 13:35:02 2004
-@@ -8,7 +8,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Aug. 1992 */
- 
-static char rcsid [] = "$Id: ErrorsDrv.c,v 1.0 1992/08/07 14:31:41 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: ErrorsDrv.c,v 1.0 1992/08/07 14:31:41 grosch rel $");
- 
- # include "ratc.h"
- # include <stdio.h>
--- a/devel/cocktail/files/patch-reuse-c-General.c
+++ b/devel/cocktail/files/patch-reuse-c-General.c
@ -1,21 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/General.c	Tue Feb 15 14:26:35 1994
-+++ ./reuse/c/General.c	Fri Sep 10 13:35:02 2004
-@@ -26,7 +26,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: General.c,v 1.6 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: General.c,v 1.6 1993/08/18 15:01:05 grosch rel $");
- 
- # include "ratc.h"
- # include "General.h"
-@@ -66,7 +67,7 @@
-    }
- 
- static struct { char yychar; double yydouble; } yyForAlign;
-short	yyMaxAlign	= sizeof (yyForAlign) - sizeof (double);
-+unsigned long	yyMaxAlign	= sizeof (yyForAlign) - sizeof (double);
- long	yyAlignMasks []	= { 0,
-    0xffffffff, 0xfffffffe, 0xffffffff, 0xfffffffc,
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfffffff8,
--- a/devel/cocktail/files/patch-reuse-c-General.h
+++ b/devel/cocktail/files/patch-reuse-c-General.h
@ -1,22 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/General.h	Tue Feb 15 14:26:36 1994
-+++ ./reuse/c/General.h	Fri Sep 10 13:35:03 2004
-@@ -30,8 +30,10 @@
- 
- # ifdef __STDC__
- # define ARGS(parameters)	parameters
-+# define NOARGS			void
- # else
- # define ARGS(parameters)	()
-+# define NOARGS
- # endif
- 
- # define Min(a,b) ((a <= b) ? a : b)
-@@ -44,7 +46,7 @@
- extern unsigned long	Exp2 ARGS((register cardinal x));
- 			/* Returns 2 to the power of 'x'.		*/
- 
-extern short	yyMaxAlign;
-+extern unsigned long	yyMaxAlign;
- extern long	yyAlignMasks [];
- 
- # endif
--- a/devel/cocktail/files/patch-reuse-c-Idents.c
+++ b/devel/cocktail/files/patch-reuse-c-Idents.c
@ -1,39 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Idents.c	Tue Feb 15 14:26:36 1994
-+++ ./reuse/c/Idents.c	Fri Sep 10 13:35:03 2004
-@@ -44,7 +44,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: Idents.c,v 1.12 1992/05/05 13:19:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: Idents.c,v 1.12 1992/05/05 13:19:05 grosch rel $");
- 
- # include "ratc.h"
- # include "Idents.h"
-@@ -65,7 +66,7 @@
- static	unsigned short	Null		= 0;
- static	IdentTableEntry	Table [InitialTableSize] = {{0, 0, 0}, {& Null, 0, cNoIdent}};
- static	IdentTableEntry	* TablePtr	= Table;
-static	unsigned long	IdentTableSize	= InitialTableSize;
-+static	tIdent	IdentTableSize	= InitialTableSize;
- static	tIdent		IdentCount	= 1;
- 
- static	tIdent		HashTable [HashTableSize] = {
-@@ -105,7 +106,7 @@
- 
- tIdent MakeIdent
- # ifdef __STDC__
-   (register char * string, register cardinal length)
-+   (char * string, cardinal length)
- # else
-    (string, length)
-    register char *	string;
-@@ -129,7 +130,7 @@
-       }
- 
-       if (++ IdentCount == IdentTableSize)	/* not found: enter */
-	 ExtendArray ((char * *) & TablePtr, & IdentTableSize, (long) sizeof (IdentTableEntry));
-+	 ExtendArray ((char * *) & TablePtr, (unsigned long*)&IdentTableSize, (long) sizeof (IdentTableEntry));
-       TablePtrReg = & TablePtr [IdentCount];
-       TablePtrReg->String	= PutString (string, length);
-       TablePtrReg->Length	= length;
--- a/devel/cocktail/files/patch-reuse-c-Idents.h
+++ b/devel/cocktail/files/patch-reuse-c-Idents.h
@ -1,40 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Idents.h	Tue Feb 15 14:26:36 1994
-+++ ./reuse/c/Idents.h	Fri Sep 10 13:35:03 2004
-@@ -39,12 +39,6 @@
- # include "ratc.h"
- # include "StringMem.h"
- 
-# ifdef __STDC__
-# define ARGS(parameters)	parameters
-# else
-# define ARGS(parameters)	()
-# endif
-
- typedef cardinal	tIdent;
- 
- extern	tIdent	NoIdent; /* A default identifer (empty string)		*/
-@@ -60,20 +54,20 @@
- 			/* Returns a reference to the string identified	*/
- 			/* by 'ident'.					*/
- 
-extern	tIdent	MaxIdent	();
-+extern	tIdent	MaxIdent	(NOARGS);
- 			/* Returns the currently maximal identifier.	*/
- 
- extern	void	WriteIdent	ARGS((FILE * file, tIdent ident));
- 			/* The string encoded by the identifier 'ident'	*/
- 			/* is printed on the file.			*/
- 
-extern	void	WriteIdents	();
-+extern	void	WriteIdents	(NOARGS);
- 			/* The contents of the identifier table is	*/
- 			/* printed on the standard output.		*/
- 
-extern	void	InitIdents	();
-+extern	void	InitIdents	(NOARGS);
- 			/* The identifier table is initialized.		*/
- 
-extern	void	WriteHashTable	();
-+extern	void	WriteHashTable	(NOARGS);
- 
- # endif
--- a/devel/cocktail/files/patch-reuse-c-IdentsDrv.c
+++ b/devel/cocktail/files/patch-reuse-c-IdentsDrv.c
@ -1,9 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/IdentsDrv.c	Tue Feb 15 14:26:37 1994
-+++ ./reuse/c/IdentsDrv.c	Fri Sep 10 13:35:03 2004
-@@ -1,4 +1,5 @@
-static char rcsid [] = "$Id: IdentsDrv.c,v 1.4 1992/09/24 13:03:56 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: IdentsDrv.c,v 1.4 1992/09/24 13:03:56 grosch rel $");
- 
- # include <stdio.h>
- # include "Idents.h"
--- a/devel/cocktail/files/patch-reuse-c-Makefile
+++ b/devel/cocktail/files/patch-reuse-c-Makefile
@ -1,64 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Makefile	Tue Feb 15 14:26:37 1994
-+++ ./reuse/c/Makefile	Thu Aug  5 18:49:32 2004
-@@ -1,35 +1,31 @@
-LIB	= $(HOME)/lib
-INCDIR	= $(LIB)/include
-TARGET	= SUN
-REUSE	= libreuse.a
-OPT	= -O
-UNIX	= UNIX
-CFLAGS	= $(OPT) -D$(UNIX) -D$(TARGET)
-CC	= cc
-OBJS	= rSystem.o General.o rMemory.o DynArray.o StringMem.o Idents.o Sets.o Time.o \
-	  Errors.o Positions.o Source.o
- 
-# targets
-+.include "../../Makefile.inc" 
- 
-all:	$(TARGET)
-+OBJS	= rSystem.o General.o rMemory.o DynArray.o StringMem.o Idents.o \
-+	Sets.o Time.o Errors.o Positions.o Source.o
- 
-PCS10 PCS20:	$(REUSE)
-+# targets
- 
-SUN:	$(REUSE)
-	ranlib $(REUSE)
-+all:	$(REUSE)
- 
- $(REUSE):	$(OBJS)
- 	ar ruc $(REUSE) $(OBJS)
- 	-ranlib $(REUSE)
- 
-install:	$(TARGET)
-	install -c -m 664 $(REUSE) $(LIB)
-	-ranlib $(LIB)/$(REUSE)
-	cp *.h $(INCDIR)
-	chmod u+w,a+r $(INCDIR)/*.h
-+install:	$(REUSE)
-+	install -c -m 664 $(REUSE) $(DESTLIB)
-+	-ranlib $(DESTLIB)/$(REUSE)
-+	cp *.h $(DESTINCDIR)
-+	chmod u+w,a+r $(DESTINCDIR)/*.h
-+
-+clean: cleantest
-+	-rm -f $(STDCLEAN) 
-+	-rm -f  *.o *Drv  
-+	-rm -f $(REUSE)
-+
-+cleantest:
-+	-rm -f rMemoryDrv DynArrDrv SetsDrv IdentsDrv StrMemDrv ErrorsDrv
- 
-clean:
-	rm -f *.o *Drv core
- 
- # test programs
- 
-@@ -73,7 +69,3 @@
- ErrorsDrv.o:	Errors.h Positions.h Sets.h Idents.h
- Source.o:	Source.h rSystem.h
- 
-.SUFFIXES:	.c .o
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
--- a/devel/cocktail/files/patch-reuse-c-Positions.c
+++ b/devel/cocktail/files/patch-reuse-c-Positions.c
@ -1,21 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Positions.c	Tue Feb 15 14:26:37 1994
-+++ ./reuse/c/Positions.c	Fri Sep 10 13:35:03 2004
-@@ -17,7 +17,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Juli 1992 */
- 
-static char rcsid [] = "$Id: Positions.c,v 1.3 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: Positions.c,v 1.3 1993/08/18 15:01:05 grosch rel $");
- 
- # include "Positions.h"
- 
-@@ -25,7 +26,7 @@
- 
- int Compare
- # if defined __STDC__ | defined __cplusplus
-   (tPosition Position1, tPosition Position2)
-+   (const tPosition Position1, const tPosition Position2)
- # else
-    (Position1, Position2) tPosition Position1, Position2;
- # endif
--- a/devel/cocktail/files/patch-reuse-c-Positions.h
+++ b/devel/cocktail/files/patch-reuse-c-Positions.h
@ -1,11 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Positions.h	Tue Feb 15 14:26:38 1994
-+++ ./reuse/c/Positions.h	Fri Sep 10 13:35:03 2004
-@@ -27,7 +27,7 @@
- extern tPosition NoPosition;
- 			/* A default position (0, 0).			*/
- 
-extern int  Compare	  ARGS((tPosition Position1, tPosition Position2));
-+extern int  Compare	  ARGS((const tPosition Position1, const tPosition Position2));
- 			/* Returns -1 if Position1 < Position2.		*/
- 			/* Returns  0 if Position1 = Position2.		*/
- 			/* Returns  1 if Position1 > Position2.		*/
--- a/devel/cocktail/files/patch-reuse-c-Sets.c
+++ b/devel/cocktail/files/patch-reuse-c-Sets.c
@ -1,68 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Sets.c	Tue Feb 15 14:26:38 1994
-+++ ./reuse/c/Sets.c	Fri Sep 10 13:35:03 2004
-@@ -44,7 +44,11 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: Sets.c,v 1.12 1993/08/20 08:12:15 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: Sets.c,v 1.12 1993/08/20 08:12:15 grosch rel $");
-+
-+# include <stdlib.h>
-+# include <stdio.h>
- 
- # include "ratc.h"
- # include "Sets.h"
-@@ -306,7 +310,7 @@
-     
- bool Forall (Set, Proc)
-    tSet *	Set	;
-   bool		(* Proc) ();
-+   bool		(* Proc) (cardinal c);
-    {
-       register tSet *	rSet	= Set;
-       register cardinal	i;
-@@ -320,7 +324,7 @@
-     
- bool Exists (Set, Proc)
-    tSet *	Set	;
-   bool		(* Proc) ();
-+   bool		(* Proc) (cardinal c);
-    {
-       register tSet *	rSet	= Set;
-       register cardinal	i;
-@@ -334,7 +338,7 @@
-     
- bool Exists1 (Set, Proc)
-    tSet *	Set	;
-   bool		(* Proc) ();
-+   bool		(* Proc) (cardinal c);
-    {
-       register tSet *	rSet	= Set;
-       register cardinal	i, n;
-@@ -397,7 +401,7 @@
- 
- void ForallDo (Set, Proc)
-    tSet *	Set	;
-   void		(* Proc) ();
-+   void		(* Proc) (cardinal c);
-    {
-       register tSet *	rSet	= Set;
-       register cardinal	i;
-@@ -428,8 +432,7 @@
- 
- static FILE * g;
- 
-void PrintElmt (Elmt)
-   cardinal	Elmt	;
-+static void PrintElmt (cardinal Elmt)
-    {
-       (void) fprintf (g, " %d", Elmt);
-    }
-@@ -447,5 +450,5 @@
- void InitSets ()
-    {
-       if (sizeof (BITSET) != BytesPerBitset)
-	 (void) fprintf (stderr, "Sets: sizeof (BITSET) = %d\n", sizeof (BITSET));
-+	 (void) fprintf (stderr, "Sets: sizeof (BITSET) = %d\n", (int)sizeof (BITSET));
-    }
--- a/devel/cocktail/files/patch-reuse-c-Sets.h
+++ b/devel/cocktail/files/patch-reuse-c-Sets.h
@ -1,42 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Sets.h	Tue Feb 15 14:26:38 1994
-+++ ./reuse/c/Sets.h	Fri Sep 10 13:35:03 2004
-@@ -38,15 +38,9 @@
- # include "ratc.h"
- # include <stdio.h>
- 
-# ifdef __STDC__
-# define ARGS(parameters)	parameters
-# else
-# define ARGS(parameters)	()
-# endif
-
-# define BitsPerBitset		32
-# define LdBitsPerBitset	5
-# define MaskBitsPerBitset	0x0000001f
-+# define BitsPerBitset		(8*sizeof(long))
-+# define LdBitsPerBitset	(BitsPerBitset==32?5:6)
-+# define MaskBitsPerBitset	0x0000003f
- 
- # define IsElement(Elmt, Set)	    ((long) ((Set)->BitsetPtr [(Elmt) >> LdBitsPerBitset] << ((Elmt) & MaskBitsPerBitset)) < 0)
- # define Size(Set)		    ((Set)->MaxElmt)
-@@ -86,15 +80,15 @@
- /* extern bool	IsNotEqual	ARGS((tSet * Set1, tSet * Set2)); */
- /* extern bool	IsElement	ARGS((cardinal Elmt, tSet * Set)); */
- extern bool	IsEmpty		ARGS((tSet * Set));
-extern bool	Forall		ARGS((tSet * Set, bool (* Proc) ()));
-extern bool	Exists		ARGS((tSet * Set, bool (* Proc) ()));
-extern bool	Exists1		ARGS((tSet * Set, bool (* Proc) ()));
-+extern bool	Forall		ARGS((tSet * Set, bool (* Proc) (cardinal c)));
-+extern bool	Exists		ARGS((tSet * Set, bool (* Proc) (cardinal c)));
-+extern bool	Exists1		ARGS((tSet * Set, bool (* Proc) (cardinal c)));
- extern void	Assign		ARGS((tSet * Set1, tSet * Set2));
- extern void	AssignElmt	ARGS((tSet * Set, cardinal Elmt));
- extern void	AssignEmpty	ARGS((tSet * Set));
-extern void	ForallDo	ARGS((tSet * Set, void (* Proc) ()));
-+extern void	ForallDo	ARGS((tSet * Set, void (* Proc) (cardinal c)));
- extern void	ReadSet		ARGS((FILE * File, tSet * Set));
- extern void	WriteSet	ARGS((FILE * File, tSet * Set));
-extern void	InitSets	();
-+extern void	InitSets	(NOARGS);
- 
- # endif
--- a/devel/cocktail/files/patch-reuse-c-SetsDrv.c
+++ b/devel/cocktail/files/patch-reuse-c-SetsDrv.c
@ -1,30 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/SetsDrv.c	Tue Feb 15 14:26:39 1994
-+++ ./reuse/c/SetsDrv.c	Fri Sep 10 13:35:03 2004
-@@ -35,7 +35,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: SetsDrv.c,v 1.9 1993/08/20 08:12:15 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: SetsDrv.c,v 1.9 1993/08/20 08:12:15 grosch rel $");
- 
- # include "ratc.h"
- # include <stdio.h>
-@@ -47,7 +48,7 @@
- static	long		i	;
- static	FILE *		f	;
- 
-main ()
-+int main (void)
- {
-    MakeSet (& s, max);
-    MakeSet (& t, max);
-@@ -99,7 +100,7 @@
- 
-    for (;;) {
-       (void) printf ("\n");
-      (void) scanf ("%d", & i);
-+      (void) scanf ("%ld", & i);
-       if (i == 0) break;
-       MakeSet	(& s, (short) i);
-       ReadSet	(stdin, & s);
--- a/devel/cocktail/files/patch-reuse-c-Source.c
+++ b/devel/cocktail/files/patch-reuse-c-Source.c
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Source.c	Tue Feb 15 14:26:39 1994
-+++ ./reuse/c/Source.c	Fri Sep 10 13:35:03 2004
-@@ -11,7 +11,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Juli 1992 */
- 
-static char rcsid [] = "$Id: Source.c,v 1.1 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: Source.c,v 1.1 1993/08/18 15:01:05 grosch rel $");
- 
- # include "Source.h"
- 
--- a/devel/cocktail/files/patch-reuse-c-StrMemDrv.c
+++ b/devel/cocktail/files/patch-reuse-c-StrMemDrv.c
@ -1,26 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/StrMemDrv.c	Tue Feb 15 14:26:40 1994
-+++ ./reuse/c/StrMemDrv.c	Fri Sep 10 13:35:03 2004
-@@ -1,9 +1,12 @@
-static char rcsid [] = "$Id: StrMemDrv.c,v 1.4 1992/09/24 13:03:56 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: StrMemDrv.c,v 1.4 1992/09/24 13:03:56 grosch rel $");
- 
- # include <stdio.h>
-+# include <string.h>
-+
- # include "StringMem.h"
- 
-static void loop ()
-+static void loop (void)
- {
-    char string [256];
-    tStringRef stringref;
-@@ -19,7 +22,7 @@
-    WriteStringMemory ();
- }
- 
-main ()
-+int main (void)
- {
-    loop ();
-    InitStringMemory ();
--- a/devel/cocktail/files/patch-reuse-c-StringMem.c
+++ b/devel/cocktail/files/patch-reuse-c-StringMem.c
@ -1,30 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/StringMem.c	Tue Feb 15 14:26:40 1994
-+++ ./reuse/c/StringMem.c	Fri Sep 10 13:35:03 2004
-@@ -47,7 +47,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: StringMem.c,v 1.13 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: StringMem.c,v 1.13 1993/08/18 15:01:05 grosch rel $");
- 
- # include "ratc.h"
- # include "StringMem.h"
-@@ -81,7 +82,7 @@
- # endif
-    {
-       register char *	stringReg;
-      register long	NeededSpace	= (length + 3) & 0xfffffffe;
-+      register unsigned long	NeededSpace	= (length + 3) & 0xfffffffe;
-       register tStringRef StartPtr;
- 
-       if (MemorySpaceLeft < NeededSpace) {
-@@ -163,7 +164,7 @@
- 
- 	 while (StringPtr < BlockPtr->Last) {
- 	    long length = LengthSt (StringPtr) + 2;
-	    (void) printf ("%8x ", StringPtr);
-+	    (void) printf ("%p ", (void*) StringPtr);
- 	    WriteString (stdout, StringPtr);
- 	    (void) fputc ('\n', stdout);
- 	    if (length & 1) length ++;
--- a/devel/cocktail/files/patch-reuse-c-StringMem.h
+++ b/devel/cocktail/files/patch-reuse-c-StringMem.h
@ -1,29 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/StringMem.h	Tue Feb 15 14:26:40 1994
-+++ ./reuse/c/StringMem.h	Fri Sep 10 13:35:03 2004
-@@ -32,12 +32,6 @@
- # include <stdio.h>
- # include "ratc.h"
- 
-# ifdef __STDC__
-# define ARGS(parameters)	parameters
-# else
-# define ARGS(parameters)	()
-# endif
-
- typedef unsigned short * tStringRef;
- 
- extern	tStringRef PutString	ARGS((register char * s, register cardinal length));
-@@ -62,11 +56,11 @@
- 			/* The string referenced by 'r' is printed on	*/
- 			/* the file 'f'.				*/
- 
-extern	void	WriteStringMemory ();
-+extern	void	WriteStringMemory (NOARGS);
- 			/* The contents of the string memory is printed	*/
- 			/* on standard output.				*/
- 
-extern	void	InitStringMemory ();
-+extern	void	InitStringMemory (NOARGS);
- 			/* The string memory is initialized.		*/
- 
- # endif
--- a/devel/cocktail/files/patch-reuse-c-Time.c
+++ b/devel/cocktail/files/patch-reuse-c-Time.c
@ -1,18 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Time.c	Tue Feb 15 14:26:41 1994
-+++ ./reuse/c/Time.c	Fri Sep 10 13:35:03 2004
-@@ -1,4 +1,5 @@
-static char rcsid [] = "$Id: Time.c,v 1.6 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: Time.c,v 1.6 1993/08/18 15:01:05 grosch rel $");
- 
- # include "Time.h"
- # include <stdio.h>
-@@ -8,7 +9,7 @@
- 
- long StepTime ()
- {
-   long new = Time ();
-+   long new = rTime ();
-    long result = new - old;
-    old = new;
-    return result;
--- a/devel/cocktail/files/patch-reuse-c-Time.h
+++ b/devel/cocktail/files/patch-reuse-c-Time.h
@ -1,18 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/Time.h	Tue Feb 15 14:26:41 1994
-+++ ./reuse/c/Time.h	Fri Sep 10 13:35:03 2004
-@@ -1,13 +1,9 @@
- # ifndef yyTime
- # define yyTime
- 
-# ifdef __STDC__
-# define ARGS(parameters)	parameters
-# else
-# define ARGS(parameters)	()
-# endif
-+#include "ratc.h"
- 
-extern long	StepTime	();
-+extern long	StepTime	(NOARGS);
- 			/* Returns the sum of user time and system time */
- 			/* since the last call to 'StepTime' in milli-	*/
- 			/* seconds.					*/
--- a/devel/cocktail/files/patch-reuse-c-rMemory.c
+++ b/devel/cocktail/files/patch-reuse-c-rMemory.c
@ -1,91 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/rMemory.c	Tue Feb 15 14:26:42 1994
-+++ ./reuse/c/rMemory.c	Fri Sep 10 13:35:03 2004
-@@ -49,14 +49,16 @@
-  */
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
-
-static char rcsid [] = "$Id: rMemory.c,v 1.14 1993/08/18 15:01:05 grosch rel $";
-+# include <sys/cdefs.h>
-+# include <sys/cdefs.h>
-+__RCSID("$Id: rMemory.c,v 1.14 1993/08/18 15:01:05 grosch rel $");
- 
- # include "ratc.h"
- # include "rMemory.h"
- # include "rSystem.h"
- # include "General.h"
- # include <stdio.h>
-+# include <stdlib.h>
- 
- # define MinSizeSmallBlock	4
- # define MaxSizeSmallBlock	62	/* 64 - 2	*/
-@@ -75,6 +77,7 @@
- typedef cardinal	tSmallBlockRange;
- typedef cardinal	tLargeBlockRange;
- 
-+#ifndef FREEBSD
- static	tBlockPtr	SmallChain [MaxSizeSmallBlock    + 1] = { 0,
-    NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL,
-    NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL,
-@@ -89,16 +92,21 @@
-    NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL,
-    NIL, NIL, NIL, NIL,
- };
-+#endif
- static	char *		PoolFreePtr = 0;
- static	char *		PoolEndPtr  = 0;
- 
- char * Alloc (ByteCount)
-    register unsigned long ByteCount;
-
- /* Returns a pointer to dynamically allocated	*/
- /* space of size 'ByteCount' bytes.		*/
- 
- {
-+# ifdef FREEBSD
-+   /* FreeBSD has an efficient memory allocator */  
-+   /* The cocktail code assumes that allocated space is zeroed */
-+   return (char*) calloc(1UL,ByteCount);
-+#else
-    ByteCount = (ByteCount + yyMaxAlign - 1) & yyAlignMasks [yyMaxAlign];
- 
-    if (ByteCount <= MaxSizeSmallBlock) {	/* handle small block */
-@@ -187,6 +195,7 @@
- 	 return (char *) CurrentBlock;
-       }
-    }
-+#endif /*FREEBSD */
- }
- 
- void Free (ByteCount, a)
-@@ -198,6 +207,9 @@
- /* released.					*/
- 
- {
-+#ifdef FREEBSD
-+   free(a);
-+#else
-    register tBlockPtr		BlockPtr;
-    register tLargeBlockRange	ChainNumber;
- 
-@@ -214,10 +226,12 @@
-       BlockPtr->Size		= ByteCount;
-       LargeChain [ChainNumber]	= BlockPtr;
-    }
-+#endif /*FREEBSD */
- }
- 
- void InitrMemory ()
- {
-+#ifndef FREEBSD
-    register int i;
- 
-    for (i = MinSizeSmallBlock; i <= MaxSizeSmallBlock; i += 2) {
-@@ -226,6 +240,7 @@
-    for (i = MinSizeLargeBlockLog; i <= MaxSizeLargeBlockLog; i ++) {
-       LargeChain [i] = NIL;
-    }
-+#endif
-    MemoryUsed	= 0;
-    PoolFreePtr	= 0;
-    PoolEndPtr	= 0;
--- a/devel/cocktail/files/patch-reuse-c-rMemory.h
+++ b/devel/cocktail/files/patch-reuse-c-rMemory.h
@ -1,21 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/rMemory.h	Tue Feb 15 14:26:42 1994
-+++ ./reuse/c/rMemory.h	Fri Sep 10 13:35:03 2004
-@@ -31,15 +31,17 @@
- 
- # ifdef __STDC__
- # define ARGS(parameters)	parameters
-+# define NOARGS			void
- # else
- # define ARGS(parameters)	()
-+# define NOARGS
- # endif
- 
- extern unsigned long MemoryUsed	;
- 			/* Holds the total amount of memory managed by	*/
- 			/* this module.					*/
- 
-extern void	InitrMemory	();
-+extern void	InitrMemory	(NOARGS);
- 			/* The memory module is initialized.		*/
- 
- extern char *	Alloc		ARGS((register unsigned long ByteCount));
--- a/devel/cocktail/files/patch-reuse-c-rMemoryDrv.c
+++ b/devel/cocktail/files/patch-reuse-c-rMemoryDrv.c
@ -1,12 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/rMemoryDrv.c	Tue Feb 15 14:26:42 1994
-+++ ./reuse/c/rMemoryDrv.c	Fri Sep 10 13:35:03 2004
-@@ -29,7 +29,8 @@
- 
- /* Ich, Doktor Josef Grosch, Informatiker, Sept. 1987 */
- 
-static char rcsid [] = "$Id: rMemoryDrv.c,v 1.7 1993/08/20 08:13:11 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: rMemoryDrv.c,v 1.7 1993/08/20 08:13:11 grosch rel $");
- 
- # include "ratc.h"
- # include "rMemory.h"
--- a/devel/cocktail/files/patch-reuse-c-rSystem.c
+++ b/devel/cocktail/files/patch-reuse-c-rSystem.c
@ -1,100 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/rSystem.c	Tue Feb 15 14:26:43 1994
-+++ ./reuse/c/rSystem.c	Fri Sep 10 13:35:03 2004
-@@ -12,14 +12,15 @@
- /* compilation with the option -DUNIX uses UNIX system calls for IO (efficient),
-    otherwise the C library routines are used for IO (portable).			*/
- 
-static char rcsid [] = "$Id: rSystem.c,v 1.10 1993/08/19 09:53:41 grosch rel $";
-+# include <sys/cdefs.h>
-+__RCSID("$Id: rSystem.c,v 1.10 1993/08/19 09:53:41 grosch rel $");
- 
- # include "rSystem.h"
- 
- # ifdef m68000
-# define hz 50
-+# define HZ 50
- # else
-# define hz 60
-+# define HZ 60
- # endif
- 
- # ifndef UNIX
-@@ -57,6 +58,12 @@
- # include <fcntl.h>
- # include <sys/types.h>
- # include <sys/stat.h>
-+# include <stdlib.h>
-+
-+# ifdef UNIX
-+# include <sys/uio.h>
-+# include <unistd.h>
-+# endif
- 
- bool IsCharacterSpecial (File) tFile File;
- {
-@@ -98,7 +105,7 @@
- # endif
-    return FilePtr == NULL ? -1 : FileToInt (FilePtr);
- # else
-   return creat (FileName, 0666);
-+   return creat (FileName, (mode_t)(0666));
- # endif
- }
- 
-@@ -115,7 +122,7 @@
-    } else
-       return fread (Buffer, 1, Size, IntToFile (File));
- # else
-   return read (File, Buffer, Size);
-+   return read (File, (void*)Buffer, (size_t)Size);
- # endif
- }
- 
-@@ -127,7 +134,7 @@
- # ifndef UNIX
-    return fwrite (Buffer, 1, Size, IntToFile (File));
- # else
-   return write (File, Buffer, Size);
-+   return write (File, Buffer, (size_t)Size);
- # endif
- }
- 
-@@ -143,9 +150,11 @@
- 
- /* calls other than IO */
- 
-/* # include <malloc.h> */
-
-char * rAlloc (ByteCount) long ByteCount; { return (char *) malloc ((unsigned) ByteCount); }
-+char * rAlloc (ByteCount) 
-+    long ByteCount; 
-+{ 
-+    return (char *) calloc (1UL, (size_t) ByteCount); 
-+}
- 
- # include <sys/times.h>
- 
-@@ -156,7 +165,7 @@
- # else
-    struct tms	buffer;
-    (void) times (& buffer);
-   return (buffer.tms_utime + buffer.tms_stime) * 1000 / hz;
-+   return (buffer.tms_utime + buffer.tms_stime) * 1000 / HZ;
- # endif
- }
- 
-@@ -187,12 +196,10 @@
- 
- # include <errno.h>
- 
-int rErrNo () { return errno; }
-+int rErrNo (NOARGS) { return errno; }
- 
- int rSystem (String) char * String; { return system (String); }
- 
-extern void exit ();
-
- void rExit (Status) int Status; { exit (Status); }
- 
-void BEGIN_rSystem () {}
-+void BEGIN_rSystem (NOARGS) {}
--- a/devel/cocktail/files/patch-reuse-c-rSystem.h
+++ b/devel/cocktail/files/patch-reuse-c-rSystem.h
@ -1,44 +0,0 @@
--- /usr/ports/devel/cocktail/work/cocktail-9309//./reuse/c/rSystem.h	Tue Feb 15 14:26:43 1994
-+++ ./reuse/c/rSystem.h	Fri Sep 10 13:35:03 2004
-@@ -10,8 +10,10 @@
- 
- # ifdef __STDC__
- # define ARGS(parameters)	parameters
-+# define NOARGS			void
- # else
- # define ARGS(parameters)	()
-+# define NOARGS	
- # endif
- 
- /* interface for machine dependencies */
-@@ -59,10 +61,10 @@
- 			/* memory space of size 'ByteCount' bytes.	*/
- 			/* Returns NIL if space is exhausted.		*/
- 
-extern long	rTime		();
-+extern long	rTime		(NOARGS);
- 			/* Returns consumed cpu-time in milliseconds.	*/
- 
-extern int	GetArgCount	();
-+extern int	GetArgCount	(NOARGS);
- 			/* Returns number of arguments.			*/
- 
- extern void	GetArgument	ARGS((int ArgNum, char * Argument));
-@@ -73,7 +75,7 @@
- 			/* Dummy procedure that passes the values	*/
- 			/* 'argc' and 'argv' from Modula-2 to C.	*/
- 
-extern int	rErrNo		();
-+extern int	rErrNo		(NOARGS);
- 			/* Returns the current system error code.	*/
- 
- extern int	rSystem		ARGS((char * String));
-@@ -85,7 +87,7 @@
- 			/* Terminates program execution and passes the	*/
- 			/* value 'Status' to the operating system.	*/
- 
-extern void	BEGIN_System	();
-+extern void	BEGIN_rSystem	(NOARGS);
- 			/* Dummy procedure with empty body.		*/
- 
- # endif
--- a/Show More
+++ b/Show More