A few more cleanups after recent events with bison

* lose the bison175 port, it's not needed for now and will
  only confuse matters
* clean up devel/Makefile, modules, and MOVED appropriately
* take maintainership of the bison* ports

Approved by:	portmgr

12 files changed, 5 insertions, 104 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index cc8787b..7caa11a 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -724,7 +724,6 @@ birthday	ports/misc/birthday
 bison		ports/devel/bison
 bison-devel	ports/devel/bison-devel
 bisongen	ports/devel/bisongen
-bison175	ports/devel/bison175
 bison1875	ports/devel/bison1875
 bitchx		ports/irc/bitchx
 bitedit		ports/editors/bitedit
diff --git a/MOVED b/MOVED
index 78b7d3d..b16fb23 100644
--- a/MOVED
+++ b/MOVED
@@ -1613,4 +1613,3 @@ sysutils/gdesklets-sensor-psi_disk||2005-08-31|removed; broken with recent gdesk
 net/gdesklets-sensor-psi_ping||2005-08-31|removed; broken with recent gdesklets
 mail/gdesklets-sensor-psi_popmail||2005-08-31|removed; broken with recent gdesklets
 deskutils/gdesklets-sensor-psi_variableborder||2005-08-31|removed; broken with recent gdesklets
-devel/bison|devel/bison175|2005-09-02|devel/bison is now at 2.0
diff --git a/devel/Makefile b/devel/Makefile
index 4c49e92..d377e9c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -80,7 +80,6 @@
     SUBDIR += bison
     SUBDIR += bison-devel
     SUBDIR += bisongen
-    SUBDIR += bison175
     SUBDIR += bison1875
     SUBDIR += bitkeeper
     SUBDIR += bnf
diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index 7728176..03c2e47 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	bison-${PORTVERSION}
 
-MAINTAINER=	openoffice@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Alpha version of bison
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index c6462cd..3e1ab00 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
deleted file mode 100644
index 066398c..0000000
--- a/devel/bison175/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Ports collection makefile for:  bison
-# Date created:			  27 Mar 1999
-# Whom:				  Jerry Hicks
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bison
-PORTVERSION=	1.75
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
-
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-
-CONFLICTS=	bison-1.8[0-9]* bison-2.[0-9]*
-
-NO_LATEST_LINK=	yes
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		MAKEINFO="makeinfo --no-split"
-
-MAN1=		bison.1
-INFO=		bison
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
-
-.ifdef USE_BISON
-.error You have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-post-extract:
-	@${RM} -f ${WRKSRC}/doc/bison.info*
-
-.include <bsd.port.mk>
diff --git a/devel/bison175/distinfo b/devel/bison175/distinfo
deleted file mode 100644
index 0dd8a28..0000000
--- a/devel/bison175/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (bison-1.75.tar.bz2) = dd88fe42e35d554c00af430a9342456a
-SIZE (bison-1.75.tar.bz2) = 773106
diff --git a/devel/bison175/pkg-descr b/devel/bison175/pkg-descr
deleted file mode 100644
index c968b05..0000000
--- a/devel/bison175/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Bison is a tool used to write parsers, such as the parser for GNU cc.
-It is similar to Yacc, which is included in the base FreeBSD system.
-
-The main difference between Bison and Yacc that I know of is that
-Bison supports the @N construction, which gives you access to
-the starting and ending line number and character number associated
-with any of the symbols in the current rule.
-
-Also, Bison supports the command `%expect N' which says not to mention
-the conflicts if there are N shift/reduce conflicts and no reduce/reduce
-conflicts.
-
-The differences in the algorithms stem mainly from the horrible
-kludges that Johnson had to perpetrate to make Yacc fit in a PDP-11.
-
-Also, Bison uses a faster but less space-efficient encoding for the
-parse tables (see Corbett's PhD thesis from Berkeley, "Static
-Semantics in Compiler Error Recovery", June 1985, Report No. UCB/CSD
-85/251), and more modern technique for generating the lookahead sets.
-(See "Efficient Construction of LALR(1) Lookahead Sets" by F. DeRemer
-and A. Pennello, in ACM TOPLS Vol 4 No 4, October 1982.  Their
-technique is the standard one now.)
diff --git a/devel/bison175/pkg-plist b/devel/bison175/pkg-plist
deleted file mode 100644
index f1d3f5a..0000000
--- a/devel/bison175/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-bin/bison
-%%DATADIR%%/c.m4
-%%DATADIR%%/glr.c
-%%DATADIR%%/lalr1.cc
-%%DATADIR%%/m4sugar/m4sugar.m4
-%%DATADIR%%/m4sugar/version.m4
-%%DATADIR%%/yacc.c
-%%NLS%%share/locale/de/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/es/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/et/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/id/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/it/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
-@dirrm %%DATADIR%%/m4sugar
-@dirrm %%DATADIR%%
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index 0e98540..6f584af 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	seanc@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index 0e98540..6f584af 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	seanc@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index 0e98540..6f584af 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	seanc@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4