3 files changed, 241 insertions, 88 deletions

diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index c738454ba478..270b56aae797 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dylan
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.8
 CATEGORIES=	lang
 MASTER_SITES=	ftp://berlin.ccc.de/pub/gd/src/                        \
 		ftp://berlin.ccc.de/pub/gd/FreeBSD/                    \
@@ -17,8 +17,10 @@ MASTER_SITES=	ftp://berlin.ccc.de/pub/gd/src/                        \
 		ftp://ftp.infodrom.north.de/pub/unix/language/dylan/gwydion/src/ \
 		ftp://ftp.infodrom.north.de/pub/unix/language/dylan/gwydion/FreeBSD/ \
 		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/   \
-		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/FreeBSD/
-DISTNAME=	gd-${PORTVERSION}
+		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/FreeBSD/ \
+		ftp://ftp.kddlabs.co.jp/lang/dylan/gwydion/src/	       \
+		ftp://ftp.kddlabs.co.jp/lang/dylan/gwydion/FreeBSD/
+DISTNAME=	gwydion-dylan-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} d2c-${PORTVERSION}-FreeBSD.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -26,10 +28,8 @@ MAINTAINER=	housel@acm.org
 
 RUN_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
-WRKSRC=		${WRKDIR}/gd-${PORTVERSION}
-
 USE_GMAKE=	yes
-CONFIGURE_ARGS= --srcdir=$(WRKSRC)
+CONFIGURE_ARGS=	--srcdir=$(WRKSRC)
 CONFIGURE_ENV=	D2C="$(WRKDIR)/d2c -p$(WRKSRC)/d2c/compiler/platforms.descr"
 
 PLIST_SUB=	DYLANVER="${PORTVERSION}" DYLANARCH="x86-freebsd-elf-gcc"
@@ -40,13 +40,30 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	default
+WANT_GTK=	yes
 
 MAN1=		d2c.1 make-dylan-app.1 melange.1 mindy.1 mindycomp.1
 MAN5=		platforms.descr.5
 MAN7=		dylan.7 gwydion.7
 
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK=	yes
+PLIST_SUB+=	GTK_ONLY=""
+.else
+PLIST_SUB+=	GTK_ONLY="@comment "
+.endif
+
 post-extract:
 	$(GUNZIP_CMD) -c $(DISTDIR)/d2c-$(PORTVERSION)-FreeBSD.gz >$(WRKDIR)/d2c
 	${CHMOD} ugo+x $(WRKDIR)/d2c
 
-.include <bsd.port.mk>
+pre-patch:
+	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG}|' \
+		${WRKSRC}/platform/gtk+/gtk+/gtk.lid
+
+patch-libtool:
+	@${DO_NADA}
+
+.include <bsd.port.post.mk>
diff --git a/lang/dylan/distinfo b/lang/dylan/distinfo
index 006f35908a21..395ab11f3faf 100644
--- a/lang/dylan/distinfo
+++ b/lang/dylan/distinfo
@@ -1,2 +1,2 @@
-MD5 (gd-2.3.4.tar.gz) = bd3935845aab5342af050bb2a110f892
-MD5 (d2c-2.3.4-FreeBSD.gz) = 362aae2edd82c970ccb63521775d4d55
+MD5 (gwydion-dylan-2.3.8.tar.gz) = 5e2c436fbe45b740469e661d5409ef0f
+MD5 (d2c-2.3.8-FreeBSD.gz) = 78b7716bc2440ffc020f10b2f2a7596d
diff --git a/lang/dylan/pkg-plist b/lang/dylan/pkg-plist
index 724a7e416bdb..04115ff24591 100644
--- a/lang/dylan/pkg-plist
+++ b/lang/dylan/pkg-plist
@@ -1,17 +1,16 @@
-bin/mindy
-bin/mindycomp
-bin/mindyexec
 bin/d2c
 bin/dybug
-bin/parsergen
-bin/melange
 bin/gen-makefile
-bin/mk-build-tree
 bin/line-count
 bin/make-dylan-app
 bin/make-dylan-lib
-bin/mk-rcs-links
-etc/platforms.descr
+bin/melange
+bin/mindy
+bin/mindycomp
+bin/mindyexec
+bin/mk-build-tree
+bin/parsergen
+share/dylan/platforms.descr
 include/runtime.h
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/elisp/dylan-mode.el
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/elisp/fill-comment.el
@@ -27,120 +26,257 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/text-inspector-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/x-inspector-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libruntime.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgc.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdylan-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/melange-support.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmelange-support-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/garbage-collection.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgarbage-collection-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/streams.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/time.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstreams-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/streams-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/standard-io.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstandard-io-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/standard-io-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/print.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libprint-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/print-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/format.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/format-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/collection-extensions.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcollection-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/collection-extensions-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/table-extensions.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtable-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/table-extensions-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/string-extensions.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstring-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/string-extensions-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/regular-expressions.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libregular-expressions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/regular-expressions-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/format-out.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libformat-out-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/format-out-lib.dbc
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libmatrix-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/matrix-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtime-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/time-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/stream-extensions.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libstream-extensions-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/stream-extensions-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/transcendental.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtranscendental-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/transcendental-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parse-arguments.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parse-arguments-lib.dbc
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparse-arguments-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/base-file-system.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libbase-file-system-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/base-file-system-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/common-extensions.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/common-dylan.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/io.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-extensions-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/common-dylan.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommon-dylan-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libio-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/io-lib.dbc
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/file-system.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libfile-system-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/date.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdate-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdate-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdate-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libdate-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/system.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libsystem-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/random.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/librandom-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/parser-utilities.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libparser-utilities-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/ansi-c.lib.du
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.so.0
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.so
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.la
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libansi-c-dylan.a
+lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/c-parser.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-geometry.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-geometry-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-geometry-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-geometry-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-geometry-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-dcs.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dcs-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dcs-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dcs-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dcs-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-sheets.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/glib.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-utilities.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-utilities-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-sheets-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-graphics.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-graphics-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-graphics-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-graphics-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-graphics-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-extended-geometry.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-extended-geometry-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-layouts.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/commands.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-layouts-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libcommands-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-gadgets.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadgets-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadgets-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadgets-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadgets-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-frames.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-frames-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-frames-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-frames-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-frames-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-core.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-core-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-core-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-core-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-core-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-gadget-panes.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadget-panes-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadget-panes-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadget-panes-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-gadget-panes-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gdk.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgdk-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gtk.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/gtk-duim.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-duim-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-duim-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-duim-dylan.la
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libgtk-duim-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim.lib.du
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.so.0
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.a
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.so
+%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.la
 @exec mkdir %D/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan-user
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan-user
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/elisp
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%
 @dirrm lib/dylan/%%DYLANVER%%
 @dirrm lib/dylan
+@dirrm share/dylan