3 files changed, 17 insertions, 22 deletions

diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 2bebca42c19a..33cf7e614848 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dylan
-PORTVERSION=	2.3.10
+PORTVERSION=	2.3.11
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.gwydiondylan.org/pub/gd/src/                 \
 		ftp://ftp.gwydiondylan.org/pub/gd/FreeBSD/             \
@@ -27,16 +27,22 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	housel@acm.org
 COMMENT=	CMU Gwydion project interpreter and compiler for the Dylan language
 
-BROKEN=		Does not compile
-
 LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--srcdir=$(WRKSRC) --enable-debug --with-gc-prefix=$(PREFIX)
+CONFIGURE_ARGS=	--srcdir=$(WRKSRC) --with-gc-prefix=$(PREFIX)
 CONFIGURE_ENV=	D2C="$(WRKDIR)/d2c -p$(WRKSRC)/d2c/compiler/platforms.descr"
 
-PLIST_SUB=	DYLANVER="${PORTVERSION}" DYLANARCH="x86-freebsd-elf-gcc"
+GCCVER!=	gcc -dumpversion
+PLIST_SUB=	DYLANVER="${PORTVERSION}"
+.if ${GCCVER:M3.3*}!=""
+PLIST_SUB+=	DYLANARCH="x86-freebsd-elf-gcc33"
+.elif ${GCCVER:M3.2*}!=""
+PLIST_SUB+=	DYLANARCH="x86-freebsd-elf-gcc32"
+.else
+PLIST_SUB+=	DYLANARCH="x86-freebsd-elf-gcc"
+.endif
 
 ONLY_FOR_ARCHS=	i386
 
@@ -59,6 +65,7 @@ USE_REINPLACE=	yes
 .if ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME+=	gtk12
 PLIST_SUB+=	GTK_ONLY=""
+CONFIGURE_ARGS+=--enable-duim=gtk
 .else
 PLIST_SUB+=	GTK_ONLY="@comment "
 CONFIGURE_ARGS+=--without-gtk
@@ -71,8 +78,7 @@ post-extract:
 pre-patch:
 	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|' \
 		${WRKSRC}/platform/gtk+/gtk+/gtk.lid
-
-patch-libtool:
-	@${DO_NADA}
+	${REINPLACE_CMD} -e 's|libtool$$|${LIBTOOL_LIBEXECDIR}/libtool|' \
+		${WRKSRC}/d2c/compiler/platforms.descr
 
 .include <bsd.port.post.mk>
diff --git a/lang/dylan/distinfo b/lang/dylan/distinfo
index c07568852ebe..f7453e438aa5 100644
--- a/lang/dylan/distinfo
+++ b/lang/dylan/distinfo
@@ -1,2 +1,2 @@
-MD5 (gwydion-dylan-2.3.10.tar.gz) = f3495c61764ac01045d53e5ec173f1da
-MD5 (d2c-2.3.10-FreeBSD.gz) = 6eb11e755614e238ee4c704e53b20e3f
+MD5 (gwydion-dylan-2.3.11.tar.gz) = 0be55ce757671efb415ec6616b6277c4
+MD5 (d2c-2.3.11-FreeBSD.gz) = edbb43719eda90efa7c77be3b6c77605
diff --git a/lang/dylan/pkg-plist b/lang/dylan/pkg-plist
index 4fc0e10debd6..f6219192dc93 100644
--- a/lang/dylan/pkg-plist
+++ b/lang/dylan/pkg-plist
@@ -138,17 +138,11 @@ 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%%/threads.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libthreads-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/common-extensions.lib.du
-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%%/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
@@ -184,11 +178,6 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/liblocators-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/network.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libnetwork-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.a
@@ -208,7 +197,6 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/glib.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-dylan.a
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-test-suite.lib.du
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so.0
@@ -282,6 +270,7 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.a
 %%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%%/glib.lib.du
 %%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