Remove gperf, as this is now shipped separately (pkg to follow shortly).

4 files changed, 6 insertions, 23 deletions

diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index a3232689021..fc023905be0 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/05/09 00:14:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/05/18 14:05:44 tv Exp $
 #
 
 BROKEN=		"Designed for NetBSD 1.4 - 1.3(.x) comes with this in-tree"
@@ -15,8 +15,7 @@ LIB_DEPENDS=	stdc++.1.:	# only from NetBSD's source tree
 MAKE_ENV+=	GXXVERSION="${GXXVERSION}"
 PLIST_SRC=	${WRKSRC}/.PLIST
 
-MAN1=		gperf.1
-INFO_FILES=	gperf.info libg++.info
+INFO_FILES=	libg++.info
 
 do-configure:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
@@ -26,9 +25,7 @@ pre-install:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/genclass ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/gperf ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/gperf.info ${WRKSRC}/libg++.info ${PREFIX}/info/
-	${INSTALL_DATA} ${WRKSRC}/libg++/gperf/gperf.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} ${WRKSRC}/libg++.info ${PREFIX}/info/
 	@(${CAT} ${PKGDIR}/PLIST.pre; cd ${PREFIX}; \
 		/bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \
 		>${PLIST_SRC}
diff --git a/devel/libg++/files/Makefile b/devel/libg++/files/Makefile
index 1dcc244489b..fc79af3c93c 100644
--- a/devel/libg++/files/Makefile
+++ b/devel/libg++/files/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 1998/04/09 13:58:52 tv Exp $
+#	$NetBSD: Makefile,v 1.2 1998/05/18 14:05:44 tv Exp $
 # Makefile for libg++ add-on for NetBSD.  Requires libstdc++ shlib v1.x.
 
 LIB=g++
@@ -69,15 +69,9 @@ genclass: libg++/genclass/genclass.sh
 libg++.info: libg++/libg++.texi
 	makeinfo --no-split -I libg++/texinfo -o libg++.info libg++/libg++.texi
 
-gperf:
-	@cd libg++/gperf/src && ${MAKE} -f Makefile.in CFLAGS="${CFLAGS} -I../../src" LIBS="-L../../.. -lg++" TARGETPROG="../../../gperf"
-
-gperf.info: libg++/gperf/gperf.texi
-	makeinfo --no-split -I libg++/texinfo -o gperf.info libg++/gperf/gperf.texi
-
 .PATH: libg++/src librx
 
 .include <bsd.lib.mk>
 
-all: genclass libg++.info gperf gperf.info
+all: genclass libg++.info
 install: includes
diff --git a/devel/libg++/pkg/DESCR b/devel/libg++/pkg/DESCR
index 568f4714890..22f58d4cac1 100644
--- a/devel/libg++/pkg/DESCR
+++ b/devel/libg++/pkg/DESCR
@@ -4,6 +4,3 @@ It includes regular expressions, dynamically linked lists, and more.  This
 library requires the libstdc++ available in NetBSD 1.4, and will not work
 on earlier releases (earlier releases shipped with a libg++ appropriate
 for that release).
-
-The libg++ package also includes gperf, a "perfect hash function
-generator" program, which uses libg++ as its base class library. 
diff --git a/devel/libg++/pkg/PLIST.pre b/devel/libg++/pkg/PLIST.pre
index 79f137bed5e..28035b69c13 100644
--- a/devel/libg++/pkg/PLIST.pre
+++ b/devel/libg++/pkg/PLIST.pre
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST.pre,v 1.1 1998/04/09 13:58:52 tv Exp $
+@comment $NetBSD: PLIST.pre,v 1.2 1998/05/18 14:05:45 tv Exp $
 bin/genclass
-bin/gperf
 include/g++/gen/AVLMap.hP
 include/g++/gen/AVLSet.hP
 include/g++/gen/AVec.hP
@@ -173,11 +172,7 @@ include/g++/sysent.h
 include/g++/typemacros.h
 @dirrm include/g++/gen
 @dirrm include/g++
-@unexec %D/bin/install-info --delete %D/info/gperf.info %D/info/dir
 @unexec %D/bin/install-info --delete %D/info/libg++.info %D/info/dir
-info/gperf.info
 info/libg++.info
-@exec %D/bin/install-info %D/info/gperf.info %D/info/dir
 @exec %D/bin/install-info %D/info/libg++.info %D/info/dir
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-man/man1/gperf.1.gz