Merge now stable devel version into crossm68k and remove the devel

version.  Also update the maintainer's Email address.

Submitted by:	maintainer

9 files changed, 46 insertions, 225 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 9b8a29253775..f7370b810c7b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.141 1998/11/16 03:10:52 jkoshy Exp $
+# $Id: Makefile,v 1.142 1998/11/19 07:05:52 flathill Exp $
 #
 
     SUBDIR += ElectricFence
@@ -20,7 +20,6 @@
     SUBDIR += crossgo32-djgpp2
     SUBDIR += crossgo32-djgpp2-pdcurses
     SUBDIR += crossm68k
-    SUBDIR += crossm68k-devel
     SUBDIR += crosssco
     SUBDIR += cs
     SUBDIR += cutils
diff --git a/devel/binutils-m68k/Makefile b/devel/binutils-m68k/Makefile
index caf02d1fe468..ef324f5629ed 100644
--- a/devel/binutils-m68k/Makefile
+++ b/devel/binutils-m68k/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1998
 # Whom:			Jerry Hicks <jhicks@glenatl.glenayre.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/09 01:29:10 steve Exp $
+# $Id: Makefile,v 1.2 1998/08/17 00:21:04 steve Exp $
 #
 
 DISTNAME=	binutils-2.9.1
@@ -11,7 +11,7 @@ PKGNAME=	m68kbinutils-2.9.1
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU}
 
-MAINTAINER=	jhicks@glenatl.glenayre.com
+MAINTAINER=	Jerry.Hicks@Glenayre.com
 
 NO_PACKAGE=	limited audience
 USE_GMAKE=	yes
diff --git a/devel/crossm68k/Makefile b/devel/crossm68k/Makefile
index 273cfaf3332e..d7d92093253e 100644
--- a/devel/crossm68k/Makefile
+++ b/devel/crossm68k/Makefile
@@ -1,44 +1,27 @@
-# New ports collection makefile for:    crossm68k
-# Version required:     1.4
-# Date created:         26 Mar 96
-# Whom:                 Pedro Giffuni <giffunip@asme.org>
+# New ports collection makefile for:	crossm68k
+# Version required:    2.0
+# Date created:        7 July 1997
+# Whom:                Jerry Hicks <jhicks@glenatl.glenayre.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/16 03:45:00 steve Exp $
 #
 
-DISTNAME=	gcc-2.7.2.2
-PKGNAME=	crossm68k-1.4
+DISTNAME=	crossm68k-2.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cygnus.com/pub/newlib/	\
-		${MASTER_SITE_GNU}
-DISTFILES=	binutils-2.8.1.tar.gz	\
-		${DISTNAME}.tar.gz	\
-		newlib-1.8.0.tar.gz
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
-PATCH_SITES=	ftp://sunsite.unc.edu/pub/gnu/    \
-		ftp://ftp.informatik.hu-berlin.de/pub/gnu/gcc/  \
-		${MASTER_SITE_GNU}
-PATCHFILES=	crossgcc-${DISTNAME}.patch	\
-		gcc-2.7.2.2-2.7.2.3.diff.gz
-PATCH_DIST_STRIP=-p1 --directory=${WRKSRC}/gcc
+MAINTAINER=	Jerry.Hicks@Glenayre.com
 
-MAINTAINER=	jhicks@atlanta.glenayre.com
+# this dependency will cause m68kbinutils and m68kgcc to be built as well
+BUILD_DEPENDS=	${PREFIX}/m68k-coff/lib/crt0.o:${PORTSDIR}/devel/m68knewlib
+RUN_DEPENDS=	m68k-coff-gdb:${PORTSDIR}/devel/m68kgdb
 
-NO_PACKAGE=	please compile locally
-WRKSRC=		${WRKDIR}/src
-USE_GMAKE=	yes
-GNU_CONFIGURE=  yes
+NO_PACKAGE=	limited audience
+EXTRACT_ONLY=	# empty
+NO_BUILD=	yes
+NO_CHECKSUM=	yes
 
-TARGET=		m68k-coff
-CONFIGURE_ARGS= --with-gnu-as --target=${TARGET}
-
-MAN1=	${TARGET}-ar.1	${TARGET}-nm.1 ${TARGET}-objdump.1		\
-	${TARGET}-ranlib.1 ${TARGET}-size.1 ${TARGET}-strings.1		\
-	${TARGET}-strip.1 ${TARGET}-objcopy.1 ${TARGET}-nlmconv.1	\
-	${TARGET}-c++filt.1 configure.1 ${TARGET}-as.1 ${TARGET}-ld.1	\
-	${TARGET}-g++.1 ${TARGET}-gcc.1 cccp.1
-
-post-extract:
-	(cd $(WRKDIR); sh ${SCRIPTDIR}/one-tree-1.4.sh)
+do-install:	# empty
 
 .include <bsd.port.mk>
diff --git a/devel/crossm68k/pkg-comment b/devel/crossm68k/pkg-comment
index 4702b0e93855..7cdf60c8c1f4 100644
--- a/devel/crossm68k/pkg-comment
+++ b/devel/crossm68k/pkg-comment
@@ -1 +1 @@
-Motorola 68K Cross Development Environment
+Cross development for Motorola 68xxx and Coldfire family.
diff --git a/devel/crossm68k/pkg-descr b/devel/crossm68k/pkg-descr
index dd4c8bf2203e..01227bf25274 100644
--- a/devel/crossm68k/pkg-descr
+++ b/devel/crossm68k/pkg-descr
@@ -1,16 +1,22 @@
-This package permits the creation of Motorola 68000 COFF executables for
-embedded systems development under FreeBSD.
+This port is a shell for building the m68kgdb, m68kbinutils, m68kgcc and
+m68knewlib ports in the proper sequence. Compilers for C and C++ are 
+generated; Objective-C is not currently supported.
 
+The previous port used Cygnus's crosstree script and patches.  This version
+does not, since they have not released these items for more recent versions
+of the binutils, gcc, and newlib releases.  The compiler, debugger, and 
+binutils are stock GNU items, with newlib from Cygnus. 
 
-The package is composed of the following utilities:
+The new versions provide many desirable features and add support for other
+processors as well, which we needed for our own work.  It has been tested
+with production code on one project, written in C.  The C++ compiler has
+been lightly tested on one trivial program. Feedback please!
 
-The GNU's C Compiler			gcc-2.7.2.3 + crosspatch
-GNU's misc. utilities			binutils-2.8.1
-Cygnus's embedded libraries		newlib-1.8.0
+The release versions installed are:
+	 gdb-4.17, binutils-2.9.2, gcc-2.8.1, newlib-1.8.1
 
--------------------------------------------------------------------------
-Pedro Giffuni S.
-giffunip@asme.org
-
-Modifications by Jerry Hicks
-jhicks@atlanta.glenayre.com
+This port is considered a development version, since some people are still
+using the 2.7.2.3 based crossm68k.
+--------------------------------------------------------------------------
+Jerry Hicks
+jhicks@glenatl.glenayre.com                                   July 8, 1998
diff --git a/devel/crossm68k/pkg-plist b/devel/crossm68k/pkg-plist
index 0b185ec6c30d..44ce5d8e972d 100644
--- a/devel/crossm68k/pkg-plist
+++ b/devel/crossm68k/pkg-plist
@@ -1,168 +1 @@
-bin/m68k-coff-ar
-bin/m68k-coff-as
-bin/m68k-coff-c++
-bin/m68k-coff-c++filt
-bin/m68k-coff-g++
-bin/m68k-coff-gasp
-bin/m68k-coff-gcc
-bin/m68k-coff-ld
-bin/m68k-coff-nm
-bin/m68k-coff-objcopy
-bin/m68k-coff-objdump
-bin/m68k-coff-ranlib
-bin/m68k-coff-size
-bin/m68k-coff-strings
-bin/m68k-coff-strip
-bin/protoize
-bin/unprotoize
-m68k-coff/bin/ar
-m68k-coff/bin/as
-m68k-coff/bin/gcc
-m68k-coff/bin/ld
-m68k-coff/bin/nm
-m68k-coff/bin/ranlib
-m68k-coff/bin/strip
-m68k-coff/include/_ansi.h
-m68k-coff/include/_syslist.h
-m68k-coff/include/ar.h
-m68k-coff/include/assert.h
-m68k-coff/include/ctype.h
-m68k-coff/include/dirent.h
-m68k-coff/include/errno.h
-m68k-coff/include/fastmath.h
-m68k-coff/include/fcntl.h
-m68k-coff/include/grp.h
-m68k-coff/include/ieeefp.h
-m68k-coff/include/locale.h
-m68k-coff/include/machine/fastmath.h
-m68k-coff/include/machine/ieeefp.h
-m68k-coff/include/machine/setjmp-dj.h
-m68k-coff/include/machine/setjmp.h
-m68k-coff/include/machine/types.h
-m68k-coff/include/math.h
-m68k-coff/include/paths.h
-m68k-coff/include/process.h
-m68k-coff/include/pwd.h
-m68k-coff/include/reent.h
-m68k-coff/include/regdef.h
-m68k-coff/include/setjmp.h
-m68k-coff/include/signal.h
-m68k-coff/include/stdio.h
-m68k-coff/include/stdlib.h
-m68k-coff/include/string.h
-m68k-coff/include/sys/_types.h
-m68k-coff/include/sys/config.h
-m68k-coff/include/sys/dirent.h
-m68k-coff/include/sys/errno.h
-m68k-coff/include/sys/fcntl.h
-m68k-coff/include/sys/file.h
-m68k-coff/include/sys/param.h
-m68k-coff/include/sys/reent.h
-m68k-coff/include/sys/resource.h
-m68k-coff/include/sys/setjmp.h
-m68k-coff/include/sys/signal.h
-m68k-coff/include/sys/stat-dj.h
-m68k-coff/include/sys/stat.h
-m68k-coff/include/sys/termio.h
-m68k-coff/include/sys/termios.h
-m68k-coff/include/sys/time.h
-m68k-coff/include/sys/times.h
-m68k-coff/include/sys/types.h
-m68k-coff/include/sys/unistd.h
-m68k-coff/include/sys/utime.h
-m68k-coff/include/sys/utmp.h
-m68k-coff/include/sys/wait.h
-m68k-coff/include/termios.h
-m68k-coff/include/time.h
-m68k-coff/include/unctrl.h
-m68k-coff/include/unistd.h
-m68k-coff/include/utime.h
-m68k-coff/include/utmp.h
-m68k-coff/lib/crt0.o
-m68k-coff/lib/ldscripts/i386coff.x
-m68k-coff/lib/ldscripts/i386coff.xbn
-m68k-coff/lib/ldscripts/i386coff.xn
-m68k-coff/lib/ldscripts/i386coff.xr
-m68k-coff/lib/ldscripts/i386coff.xu
-m68k-coff/lib/libc.a
-m68k-coff/lib/libg.a
-m68k-coff/lib/libiberty.a
-m68k-coff/lib/libm.a
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-@unexec install-info --delete
-info/cpp.info
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
-info/gcc.info
-info/gcc.info-1
-info/gcc.info-10
-info/gcc.info-11
-info/gcc.info-12
-info/gcc.info-13
-info/gcc.info-14
-info/gcc.info-15
-info/gcc.info-16
-info/gcc.info-17
-info/gcc.info-18
-info/gcc.info-19
-info/gcc.info-2
-info/gcc.info-20
-info/gcc.info-21
-info/gcc.info-22
-info/gcc.info-23
-info/gcc.info-24
-info/gcc.info-25
-info/gcc.info-3
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
-@exec install-info
-lib/gcc-lib/m68k-coff/2.7.2.3/SYSCALLS.c.X
-lib/gcc-lib/m68k-coff/2.7.2.3/cc1
-lib/gcc-lib/m68k-coff/2.7.2.3/cc1obj
-lib/gcc-lib/m68k-coff/2.7.2.3/cc1plus
-lib/gcc-lib/m68k-coff/2.7.2.3/cpp
-lib/gcc-lib/m68k-coff/2.7.2.3/crtbegin.o
-lib/gcc-lib/m68k-coff/2.7.2.3/crtend.o
-lib/gcc-lib/m68k-coff/2.7.2.3/include/README
-lib/gcc-lib/m68k-coff/2.7.2.3/include/float.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/iso646.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/limits.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/NXConstStr.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/Object.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/Protocol.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/encoding.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/hash.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/list.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/objc-api.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/objc.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/sarray.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/objc/typedstream.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/proto.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/stdarg.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/stddef.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/syslimits.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-alpha.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-clipper.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-h8300.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-i860.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-i960.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-m88k.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-mips.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-pa.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-ppc.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-pyr.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-sparc.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/va-spur.h
-lib/gcc-lib/m68k-coff/2.7.2.3/include/varargs.h
-lib/gcc-lib/m68k-coff/2.7.2.3/libgcc.a
-lib/gcc-lib/m68k-coff/2.7.2.3/specs
-lib/libm68k-coff-bfd.a
-lib/libm68k-coff-opcodes.a
-lib/libiberty.a
+@comment no files - this is a 'virtual' port
diff --git a/devel/gcc-m68k/Makefile b/devel/gcc-m68k/Makefile
index 4b449888a2ea..c3a2baabf63f 100644
--- a/devel/gcc-m68k/Makefile
+++ b/devel/gcc-m68k/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1998
 # Whom:			Jerry Hicks <jhicks@glenatl.glenayre.com>
 #
-# $Id: Makefile,v 1.3 1998/08/13 03:34:33 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/17 00:21:43 steve Exp $
 #
 
 DISTNAME=	gcc-2.8.1
@@ -11,7 +11,7 @@ PKGNAME=	m68kgcc-2.8.1
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU}
 
-MAINTAINER=	jhicks@glenatl.glenayre.com
+MAINTAINER=	Jerry.Hicks@Glenayre.com
 
 BUILD_DEPENDS=	m68k-coff-as:${PORTSDIR}/devel/m68kbinutils \
 		m68k-coff-ld:${PORTSDIR}/devel/m68kbinutils
diff --git a/devel/gdb-m68k/Makefile b/devel/gdb-m68k/Makefile
index 5b76e6017d82..0b7cdb324f47 100644
--- a/devel/gdb-m68k/Makefile
+++ b/devel/gdb-m68k/Makefile
@@ -3,7 +3,7 @@
 # Date created:         7 Jul 98
 # Whom:                 Jerry Hicks <jhicks@glenatl.glenayre.com>
 #
-# $Id: Makefile,v 1.3 1998/08/09 01:33:32 steve Exp $
+# $Id: Makefile,v 1.4 1998/08/17 00:22:25 steve Exp $
 #
 
 DISTNAME=	gdb-4.17
@@ -11,7 +11,7 @@ PKGNAME=	m68kgdb-4.17
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-MAINTAINER=	jhicks@glenatl.glenayre.com
+MAINTAINER=	Jerry.Hicks@Glenayre.com
 
 NO_PACKAGE=	limited audience
 GNU_CONFIGURE=	yes
diff --git a/devel/newlib-m68k/Makefile b/devel/newlib-m68k/Makefile
index cc3187f92ba7..5460d428df55 100644
--- a/devel/newlib-m68k/Makefile
+++ b/devel/newlib-m68k/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1998
 # Whom:			Jerry Hicks <jhicks@glenatl.glenayre.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/09 01:39:04 steve Exp $
+# $Id: Makefile,v 1.2 1998/08/17 00:23:06 steve Exp $
 #
 
 DISTNAME=	newlib-1.8.1
@@ -11,7 +11,7 @@ PKGNAME=	m68knewlib-1.8.1
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.cygnus.com/pub/newlib/
 
-MAINTAINER=	jhicks@glenatl.glenayre.com
+MAINTAINER=	Jerry.Hicks@Glenayre.com
 
 BUILD_DEPENDS=	m68k-coff-gcc:${PORTSDIR}/devel/m68kgcc