Use ${DYLAN_VERSION}, instead of a hardcoded 2.3.6, in the Makefile.common,

Makefile and PLIST files, using PLIST_SUBST accordingly.

Also use an ALT_ARCH definition, with PLIST_SUBST, to make the two PLISTS
more generic, and set up ALT_ARCH accordingly.

3 files changed, 50 insertions, 37 deletions

diff --git a/lang/dylan-interpreter/Makefile b/lang/dylan-interpreter/Makefile
index 1913bb76ecb..200210b77aa 100644
--- a/lang/dylan-interpreter/Makefile
+++ b/lang/dylan-interpreter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/15 20:08:43 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/01/16 10:42:49 agc Exp $
 #
 
-PKGNAME=	dylan-interpreter-2.3.6
+PKGNAME=	dylan-interpreter-${DYLAN_VERSION}
 
 AUTOGEN_TARGET=	--disable-d2c
 
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 26ad0b41259..edd9de781e3 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/01/15 20:08:43 agc Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/01/16 10:42:49 agc Exp $
 #
 
-DISTNAME=		gwydion-dylan-2.3.6
+DISTNAME=		gwydion-dylan-${DYLAN_VERSION}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://berlin.ccc.de/pub/gd/src/	\
 			ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/ \
@@ -20,6 +20,8 @@ USE_GMAKE=		yes
 MAKEFILE=		GNUmakefile
 ALL_TARGET=		default
 
+DYLAN_VERSION=		2.3.6
+
 # other architecture changes will be gratefully received
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
@@ -28,6 +30,17 @@ USE_PERL5=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+ALT_ARCH=		x86
+.else
+ALT_ARCH=		${MACHINE_ARCH}
+.endif
+
+PLIST_SUBST+=		ALT_ARCH=${ALT_ARCH}
+PLIST_SUBST+=		DYLAN_VERSION=${DYLAN_VERSION}
+
 post-patch:
 	cd ${WRKSRC};							\
 	for f in tools/melange/netbsd-portability.dylan; do		\
diff --git a/lang/dylan-interpreter/PLIST b/lang/dylan-interpreter/PLIST
index 9afe072316a..54491e2cc28 100644
--- a/lang/dylan-interpreter/PLIST
+++ b/lang/dylan-interpreter/PLIST
@@ -1,34 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/15 20:08:43 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/16 10:42:50 agc Exp $
 bin/mindy
 bin/mindycomp
 bin/mindyexec
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/base-file-system-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/collection-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/format-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/format-out-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/inspector-base-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/matrix-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/parse-arguments-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/print-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/random-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/regular-expressions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/standard-io-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/stream-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/streams-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/string-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/table-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/text-inspector-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/time-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/tk-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/transcendental-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/x-inspector-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp/dylan-mode.el
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp/dylan-params.el
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp/fill-comment.el
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp/goto-def.el
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp/mindy-comp.el
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp/page-cmds.el
+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
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/format-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/format-out-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/inspector-base-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/matrix-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/parse-arguments-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/print-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/random-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/regular-expressions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/standard-io-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/stream-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/streams-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/string-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/table-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/text-inspector-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/time-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/tk-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/transcendental-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/x-inspector-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp/dylan-mode.el
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp/dylan-params.el
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp/fill-comment.el
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp/goto-def.el
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp/mindy-comp.el
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp/page-cmds.el
 man/man1/d2c.1
 man/man1/dybug.1
 man/man1/make-dylan-app.1
@@ -40,9 +40,9 @@ man/man1/parsergen.1
 man/man4/platforms.descr.4
 man/man7/dylan.7
 man/man7/gwydion.7
-@dirrm lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp
-@exec /bin/mkdir -p %D/lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan-user
-@dirrm lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan-user
-@dirrm lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc
-@dirrm lib/dylan/2.3.6
+@dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp
+@exec /bin/mkdir -p %D/lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-user
+@dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-user
+@dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc
+@dirrm lib/dylan/${DYLAN_VERSION}
 @dirrm lib/dylan