Use automake.mk. Adapt PLIST.

5 files changed, 36 insertions, 45 deletions

diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 2b3239b86e6..3af0b6ae0c2 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/01/21 11:20:40 agc Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/10/03 14:25:04 wiz Exp $
 #
 
 DISTNAME=		gwydion-dylan-${DYLAN_VERSION}
@@ -19,13 +19,14 @@ COMMENT=		functional language
 USE_GMAKE=		yes
 MAKEFILE=		GNUmakefile
 ALL_TARGET=		default
+GNU_CONFIGURE=		yes
+AUTOMAKE_REQD=		1.4
 
 DYLAN_VERSION=		2.3.6
 
 # other architecture changes will be gratefully received
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-powerpc
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 USE_PERL5=		yes
 
 USE_LIBTOOL=		yes
@@ -51,8 +52,12 @@ post-patch:
 		${SED} -e 's|@prefix@|${PREFIX}|g' $$f.in > $$f;	\
 	done
 
-post-configure:
-	cd ${WRKSRC}; ./autogen.sh --prefix=${PREFIX} ${AUTOGEN_TARGET}
+pre-configure:
+	cd ${WRKSRC} && ${ACLOCAL}
+	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --force --copy
+	cd ${WRKSRC} && ${AUTOHEADER}
+	cd ${WRKSRC} && ${AUTOCONF}
 
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/dylan-interpreter/PLIST b/lang/dylan-interpreter/PLIST
index 00217741c7e..23cbc6a2761 100644
--- a/lang/dylan-interpreter/PLIST
+++ b/lang/dylan-interpreter/PLIST
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:45 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/10/03 14:25:05 wiz Exp $
+bin/gen-makefile
+bin/line-count
+bin/make-dylan-app
+bin/make-dylan-lib
 bin/mindy
 bin/mindycomp
 bin/mindyexec
+bin/mk-build-tree
 lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/base-file-system-lib.dbc
 lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/collection-extensions-lib.dbc
 lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-lib.dbc
@@ -47,3 +52,5 @@ man/man7/gwydion.7
 @dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc
 @dirrm lib/dylan/${DYLAN_VERSION}
 @dirrm lib/dylan
+@exec ${MKDIR} %D/share/dylan
+@unexec ${RMDIR} %D/share/dylan 2> /dev/null || ${TRUE}
diff --git a/lang/dylan-interpreter/distinfo b/lang/dylan-interpreter/distinfo
index 04e6b0a57e2..c12d5905e7e 100644
--- a/lang/dylan-interpreter/distinfo
+++ b/lang/dylan-interpreter/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/01/16 12:32:34 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/10/03 14:25:05 wiz Exp $
 
 SHA1 (gwydion-dylan-2.3.6.tar.gz) = 1c6ce71b5ab36351ba9471e6b9f53f94c6b3d0d3
 Size (gwydion-dylan-2.3.6.tar.gz) = 3304421 bytes
 SHA1 (patch-aa) = 25b99f2e2418ddb9ac552a2bf7890ac02ff40413
-SHA1 (patch-ab) = 331f6c08fce0ca16a87c93bb3f87feaead1622eb
+SHA1 (patch-ab) = 6a6f277b647b2189d2d40e0eed8ef33bb0c95908
 SHA1 (patch-ac) = 260ab8b277db9b76e808cc8bc330662260eb019b
 SHA1 (patch-ad) = c31c3407c9a238402820bc4769afeffceb6f75d4
 SHA1 (patch-ae) = 0c0643df0e295e8e668369cbddc2011df93a1f35
diff --git a/lang/dylan-interpreter/patches/patch-ab b/lang/dylan-interpreter/patches/patch-ab
index b20f41e1235..a68e9f4c892 100644
--- a/lang/dylan-interpreter/patches/patch-ab
+++ b/lang/dylan-interpreter/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/01/16 11:52:45 agc Exp $
+$NetBSD: patch-ab,v 1.3 2002/10/03 14:25:05 wiz Exp $
 
---- configure.in	2002/01/14 11:35:39	1.1
-+++ configure.in	2002/01/14 11:36:17
-@@ -102,6 +102,9 @@
+--- configure.in.orig	Mon Dec 24 17:29:02 2001
++++ configure.in
+@@ -102,6 +102,9 @@ case $1 in
      sparc*-openbsd*) $2=sparc-openbsd-gcc ;;
      i*86-*-freebsd2.*) $2=x86-freebsd-aout-gcc ;;
      i*86-*-freebsd*) $2=x86-freebsd-elf-gcc ;;
@@ -12,3 +12,16 @@ $NetBSD: patch-ab,v 1.2 2002/01/16 11:52:45 agc Exp $
      i*86-pc-cygwin*) $2=x86-cygnus-gcc ;;
      i*86-pc-none) $2=x86-win32-vc ;;
      i*86-pc-beos) $2=x86-beos-gcc ;;
+@@ -991,8 +994,10 @@ AC_OUTPUT(Defaults \
+ 	doc/parsergen.1 \
+ 	doc/make-dylan-app.1 \
+ 	doc/platforms.descr.4, [
+-${INSTALL} -m uog+rx $builddir/tools/shared-misc/mk-build-tree ./
+-${INSTALL} -m uog+rx $builddir/tools/shared-misc/gen-makefile ./
++cp $builddir/tools/shared-misc/mk-build-tree ./
++cp $builddir/tools/shared-misc/gen-makefile ./
++chmod uog+rx ./mk-build-tree
++chmod uog+rx ./gen-makefile
+ (PATH=$builddir:$PATH; export PATH; perl mk-build-tree -p$srcdir/d2c/compiler/platforms.descr)
+ touch $builddir/force.timestamp
+ ], [
diff --git a/lang/dylan-interpreter/patches/patch-ac b/lang/dylan-interpreter/patches/patch-ac
deleted file mode 100644
index 16087f661b2..00000000000
--- a/lang/dylan-interpreter/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/01/16 11:52:45 agc Exp $
-
---- configure	2002/01/14 11:36:51	1.1
-+++ configure	2002/01/14 11:37:48
-@@ -973,6 +973,9 @@
-     sparc*-openbsd*) d2c_build=sparc-openbsd-gcc ;;
-     i*86-*-freebsd2.*) d2c_build=x86-freebsd-aout-gcc ;;
-     i*86-*-freebsd*) d2c_build=x86-freebsd-elf-gcc ;;
-+    i*86-*-netbsd*) d2c_build=x86-netbsd-gcc ;;
-+    powerpc-*-netbsd*) d2c_build=ppc-netbsd-gcc ;;
-+    sparc*-*-netbsd*) d2c_build=sparc-netbsd-gcc ;;
-     i*86-pc-cygwin*) d2c_build=x86-cygnus-gcc ;;
-     i*86-pc-none) d2c_build=x86-win32-vc ;;
-     i*86-pc-beos) d2c_build=x86-beos-gcc ;;
-@@ -998,6 +999,9 @@
-     sparc*-openbsd*) d2c_host=sparc-openbsd-gcc ;;
-     i*86-*-freebsd2.*) d2c_host=x86-freebsd-aout-gcc ;;
-     i*86-*-freebsd*) d2c_host=x86-freebsd-elf-gcc ;;
-+    i*86-*-netbsd*) d2c_host=x86-netbsd-gcc ;;
-+    powerpc-*-netbsd*) d2c_host=ppc-netbsd-gcc ;;
-+    sparc*-*-netbsd*) d2c_host=sparc-netbsd-gcc ;;
-     i*86-pc-cygwin*) d2c_host=x86-cygnus-gcc ;;
-     i*86-pc-none) d2c_host=x86-win32-vc ;;
-     i*86-pc-beos) d2c_host=x86-beos-gcc ;;
-@@ -1040,6 +1042,9 @@
-     sparc*-openbsd*) d2c_target=sparc-openbsd-gcc ;;
-     i*86-*-freebsd2.*) d2c_target=x86-freebsd-aout-gcc ;;
-     i*86-*-freebsd*) d2c_target=x86-freebsd-elf-gcc ;;
-+    i*86-*-netbsd*) d2c_target=x86-netbsd-gcc ;;
-+    powerpc-*-netbsd*) d2c_target=ppc-netbsd-gcc ;;
-+    sparc*-*-netbsd*) d2c_target=sparc-netbsd-gcc ;;
-     i*86-pc-cygwin*) d2c_target=x86-cygnus-gcc ;;
-     i*86-pc-none) d2c_target=x86-win32-vc ;;
-     i*86-pc-beos) d2c_target=x86-beos-gcc ;;