cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove conflicts... somedays I hate cvs. Thanks marc@ !

Browse Source
This commit is contained in:
espie 1999-03-09 20:27:51 +00:00
parent 3fec43c70e
commit ee8eebfd2f
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lang/egcs-stable/Makefile
View File

@ -1,14 +1,4 @@
<<<<<<< Makefile
# $OpenBSD: Makefile,v 1.16 1999/03/09 17:22:51 espie Exp $
=======
# OpenBSD makefile for: egcs
# Version required: release 1.1.1, preparing for 1.1.2
# Date created: 25 sep 98
# Whom: Marc Espie
#
# $OpenBSD: Makefile,v 1.16 1999/03/09 17:22:51 espie Exp $
#
>>>>>>> 1.12
# $OpenBSD: Makefile,v 1.17 1999/03/09 20:27:51 espie Exp $
# This is a configuration file for egcs, stable release.
@ -22,13 +12,9 @@ BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
CATEGORIES= lang
MAINTAINER= Marc.Espie@openbsd.org
<<<<<<< Makefile
NEED_VERSION= 1.67
=======
# These are the only archs that don't exhibit problems right out of the
# box right now. see egcs-snapshot for credits
# If you use another platform, go to egcs-snapshot instead
>>>>>>> 1.12
ONLY_FOR_ARCHS = i386 sparc m68k alpha

16
lang/egcs/stable/Makefile
View File

@ -1,14 +1,4 @@
<<<<<<< Makefile
# $OpenBSD: Makefile,v 1.16 1999/03/09 17:22:51 espie Exp $
=======
# OpenBSD makefile for: egcs
# Version required: release 1.1.1, preparing for 1.1.2
# Date created: 25 sep 98
# Whom: Marc Espie
#
# $OpenBSD: Makefile,v 1.16 1999/03/09 17:22:51 espie Exp $
#
>>>>>>> 1.12
# $OpenBSD: Makefile,v 1.17 1999/03/09 20:27:51 espie Exp $
# This is a configuration file for egcs, stable release.
@ -22,13 +12,9 @@ BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
CATEGORIES= lang
MAINTAINER= Marc.Espie@openbsd.org
<<<<<<< Makefile
NEED_VERSION= 1.67
=======
# These are the only archs that don't exhibit problems right out of the
# box right now. see egcs-snapshot for credits
# If you use another platform, go to egcs-snapshot instead
>>>>>>> 1.12
ONLY_FOR_ARCHS = i386 sparc m68k alpha