Move the configuration stage from a separate script into the package

Makefile, using the standard target.

Add the required Makefile and Makefile.inc in a more standard way.

Get rid of the now unnecessary configure script.

5 files changed, 42 insertions, 56 deletions

diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index e1400fe6619..e97c2ba84db 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 14:38:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/25 20:40:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/18 11:22:35 asami Exp
 #
 
@@ -13,4 +13,14 @@ NOT_FOR_PLATFORM=	*-*-alpha	# Severe LP64 problems
 
 MANCOMPRESSED_IF_MANZ=	yes
 
+do-configure:
+	${RM} -f ${WRKSRC}/as/typeconv.o
+	${MV} ${WRKSRC}/bcc ${WRKSRC}/bcc-cc1
+	${MKDIR} ${WRKSRC}/bcc
+	${CP} -p ${FILESDIR}/Makefile.bcc ${WRKSRC}/bcc/Makefile
+	${CP} -p ${FILESDIR}/ld86.1 ${WRKSRC}/ld/
+	${CP} -p ${FILESDIR}/as86.1 ${WRKSRC}/as/
+	${CP} -p ${FILESDIR}/bcc.1 ${WRKSRC}/bcc/
+	${CP} -p ${FILESDIR}/bcc-cc1.1 ${WRKSRC}/bcc-cc1/
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bcc/distinfo b/devel/bcc/distinfo
index 1f013cb78ef..86244ec96d5 100644
--- a/devel/bcc/distinfo
+++ b/devel/bcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/05/28 12:40:26 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/10/25 20:40:07 agc Exp $
 
 SHA1 (bcc.tar.gz) = 6a5c47bde0a6ddf82b65569883a5a490deb7e9b2
 Size (bcc.tar.gz) = 214834 bytes
@@ -16,3 +16,5 @@ SHA1 (patch-ak) = aed840bfd49ae8865a04f1e6850a557fb2c7e4b3
 SHA1 (patch-al) = b71e260973104d65a22592f6c3e32f2850863d14
 SHA1 (patch-am) = 5c96cda6a4698baade1aa87ac34c26bd4f2d75b2
 SHA1 (patch-an) = 63ba807561654368a54c7222e15153d1860c86fd
+SHA1 (patch-ao) = 04b7ee321cbba8fac7248de74d48be1a8acfdfeb
+SHA1 (patch-ap) = 8f7017c1a2f479eaccb3d2ed3adc6a4ae5043c66
diff --git a/devel/bcc/patches/patch-ao b/devel/bcc/patches/patch-ao
new file mode 100644
index 00000000000..d3a99667576
--- /dev/null
+++ b/devel/bcc/patches/patch-ao
@@ -0,0 +1,9 @@
+$NetBSD: patch-ao,v 1.1 2001/10/25 20:40:07 agc Exp $
+
+--- /dev/null	Thu Oct 25 21:25:38 2001
++++ Makefile	Thu Oct 25 21:25:39 2001
+@@ -0,0 +1,4 @@
++
++SUBDIR = ld as bcc-cc1 bcc
++
++.include <bsd.subdir.mk>
diff --git a/devel/bcc/patches/patch-ap b/devel/bcc/patches/patch-ap
new file mode 100644
index 00000000000..1b56907a294
--- /dev/null
+++ b/devel/bcc/patches/patch-ap
@@ -0,0 +1,19 @@
+$NetBSD: patch-ap,v 1.1 2001/10/25 20:40:07 agc Exp $
+
+--- /dev/null	Thu Oct 25 21:25:38 2001
++++ Makefile.inc	Thu Oct 25 21:25:39 2001
+@@ -0,0 +1,14 @@
++#
++# Makefile.inc
++#
++# This file has been created by the "configure" script; DO NOT EDIT.
++#
++# Edit the port's Makefile ${PREFIX} variable should you wish to
++# override this, and reconfigure.
++#
++
++LOCALPREFIX = /usr/pkg
++
++# Make sure we always install man- and catpages to have a consistent PLIST
++
++MANINSTALL= catinstall maninstall
diff --git a/devel/bcc/scripts/configure b/devel/bcc/scripts/configure
deleted file mode 100755
index 445dbb1ffa7..00000000000
--- a/devel/bcc/scripts/configure
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: configure,v 1.2 1998/07/20 13:09:24 frueauf Exp $
-# FreeBSD Id: configure,v 1.1.1.1 1995/03/26 18:08:54 joerg Exp
-#
-# Author:		Jörg Wunsch <joerg@FreeBSD.org>
-# Date of creation:	Mar 26, 1995
-#
-
-# we don't need Bruce's symlink, since bmake knows about .PATH
-
-rm -f ${WRKSRC}/as/typeconv.o
-
-# since we like the ease of BSD's fancy .include <> files, we wish to
-# have an own directory for the compiler driver
-
-mv ${WRKSRC}/bcc ${WRKSRC}/bcc-cc1
-mkdir ${WRKSRC}/bcc
-cp -p ${FILESDIR}/Makefile.bcc ${WRKSRC}/bcc/Makefile
-
-# i wrote some man pages after Bruce's bcc.doc
-cp -p ${FILESDIR}/ld86.1 ${WRKSRC}/ld/
-cp -p ${FILESDIR}/as86.1 ${WRKSRC}/as/
-cp -p ${FILESDIR}/bcc.1 ${WRKSRC}/bcc/
-cp -p ${FILESDIR}/bcc-cc1.1 ${WRKSRC}/bcc-cc1/
-
-# create a Makefile.inc to pass the local prefix down to
-# the build stage:
-
-cat > ${WRKSRC}/Makefile.inc <<*EOF*
-#
-# Makefile.inc
-#
-# This file has been created by the "configure" script; DO NOT EDIT.
-#
-# Edit the port's Makefile \${PREFIX} variable should you wish to
-# override this, and reconfigure.
-#
-
-LOCALPREFIX = ${PREFIX}
-
-# Make sure we always install man- and catpages to have a consistent PLIST
-
-MANINSTALL= catinstall maninstall
-*EOF*
-
-# a simple Makefile to make all the subdirs
-
-cat > ${WRKSRC}/Makefile <<*EOF*
-
-SUBDIR = ld as bcc-cc1 bcc
-
-.include <bsd.subdir.mk>
-*EOF*