4 files changed, 34 insertions, 137 deletions

diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 758b7afc601d..38693fd1aeca 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -6,22 +6,16 @@
 #
 
 PORTNAME=	dylan
-PORTVERSION=	2.3.11
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	lang
-MASTER_SITES=	http://ftp.gwydiondylan.org/downloads/src/tar/         \
-		ftp://ftp.gwydiondylan.org/pub/gd/src/                 \
-		ftp://ftp.gwydiondylan.org/pub/gd/FreeBSD/             \
-		ftp://folk.federated.com/pub/gd/src/                   \
-		ftp://folk.federated.com/pub/gd/FreeBSD/               \
-		ftp://ftp.ntua.gr/pub/lang/gwydion/src/                \
-		ftp://ftp.ntua.gr/pub/lang/gwydion/FreeBSD/            \
-		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/ \
-		ftp://ftp.kddlabs.co.jp/lang/dylan/gwydion/src/	       \
-		ftp://ftp.kddlabs.co.jp/lang/dylan/gwydion/FreeBSD/
+MASTER_SITES=	http://www.gwydiondylan.org/downloads/src/tar/         \
+		http://www.gwydiondylan.org/downloads/binaries/FreeBSD/x86/ \
+		ftp://ftp.gwydiondylan.org/downloads/src/tar/         \
+		ftp://ftp.gwydiondylan.org/downloads/binaries/FreeBSD/x86/ \
+		ftp://ftp.ntua.gr/pub/lang/gwydion/src/tar/            \
+		ftp://ftp.ntua.gr/pub/lang/gwydion/binaries/FreeBSD/x86/ \
+		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/tar/   \
+		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/binaries/FreeBSD/x86/
 DISTNAME=	gwydion-dylan-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} d2c-${PORTVERSION}-FreeBSD.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -33,8 +27,8 @@ LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--srcdir=$(WRKSRC) --with-gc-prefix=$(PREFIX)
-CONFIGURE_ENV=	D2C="$(WRKDIR)/d2c -p$(WRKSRC)/d2c/compiler/platforms.descr"
+CONFIGURE_ARGS=	--srcdir=${WRKSRC} --with-gc-prefix=${PREFIX}
+CONFIGURE_ENV=	D2C="${WRKDIR}/d2c -p${WRKSRC}/d2c/compiler/platforms.descr"
 
 GCCVER!=	gcc -dumpversion
 PLIST_SUB=	DYLANVER="${PORTVERSION}"
@@ -51,36 +45,24 @@ ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	default
-WANT_GNOME=	yes
 
 MAN1=		d2c.1 dybug.1 make-dylan-app.1 melange.1 mindy.1 mindycomp.1 \
 		mindyexec.1 parsergen.1 gobject-tool.1
 MAN5=		platforms.descr.5
 MAN7=		dylan.7 gwydion.7
 
-.include <bsd.port.pre.mk>
-
 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
-.endif
 
 post-extract:
-	$(GUNZIP_CMD) -c $(DISTDIR)/d2c-$(PORTVERSION)-FreeBSD.gz >$(WRKDIR)/d2c
-	${CHMOD} ugo+x $(WRKDIR)/d2c
+	${GUNZIP_CMD} -c ${DISTDIR}/d2c-${PORTVERSION}-FreeBSD.gz >${WRKDIR}/d2c
+	${CHMOD} ugo+x ${WRKDIR}/d2c
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|' \
-		${WRKSRC}/platform/gtk+/gtk+/gtk.lid
 	${REINPLACE_CMD} -e 's|libtool$$|${LIBTOOL_LIBEXECDIR}/libtool|' \
 		${WRKSRC}/d2c/compiler/platforms.descr
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/dylan/distinfo b/lang/dylan/distinfo
index 228954307506..ca8728708f82 100644
--- a/lang/dylan/distinfo
+++ b/lang/dylan/distinfo
@@ -1,4 +1,4 @@
-MD5 (gwydion-dylan-2.3.11.tar.gz) = 0be55ce757671efb415ec6616b6277c4
-SIZE (gwydion-dylan-2.3.11.tar.gz) = 3091501
-MD5 (d2c-2.3.11-FreeBSD.gz) = edbb43719eda90efa7c77be3b6c77605
-SIZE (d2c-2.3.11-FreeBSD.gz) = 2005636
+MD5 (gwydion-dylan-2.4.0.tar.gz) = 7ed180bf4ef11e8e8da3bd78b45477a8
+SIZE (gwydion-dylan-2.4.0.tar.gz) = 3623651
+MD5 (d2c-2.4.0-FreeBSD.gz) = 4d020eb0bb84516adfdfc05f2475bffb
+SIZE (d2c-2.4.0-FreeBSD.gz) = 3060993
diff --git a/lang/dylan/files/patch-platforms.descr b/lang/dylan/files/patch-platforms.descr
new file mode 100644
index 000000000000..baf9c954a8f3
--- /dev/null
+++ b/lang/dylan/files/patch-platforms.descr
@@ -0,0 +1,15 @@
+--- d2c/compiler/platforms.descr	Sun Oct 17 21:17:02 2004
++++ d2c/compiler/platforms.descr	Sat Mar 19 05:32:42 2005
+@@ -622,7 +622,11 @@
+ // FreeBSD 3.x and above
+ platform-name:			x86-freebsd-elf-gcc
+ inherit-from:			gcc freebsd x86
+-link-shared-library-command:    $(LIBTOOL) --mode=link gcc -o %s %s -rpath %s
++link-shared-library-command:    $(LIBTOOL) --tag=CC --mode=link gcc -o %s %s -rpath %s
++link-executable-command: 	$(LIBTOOL) --tag=CC --mode=link gcc -o %s %s %s
++link-shared-executable-command: $(LIBTOOL) --tag=CC --mode=link gcc -o %s %s %s
++compile-c-for-shared-command:   $(LIBTOOL) --tag=CC --mode=compile gcc $(CCFLAGS) -c %s -o %s
++
+ 
+ platform-name:			x86-freebsd-elf-gcc32
+ inherit-from:			freebsd x86-gcc32
diff --git a/lang/dylan/pkg-plist b/lang/dylan/pkg-plist
index f6219192dc93..ca1729ccd660 100644
--- a/lang/dylan/pkg-plist
+++ b/lang/dylan/pkg-plist
@@ -193,106 +193,6 @@ lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so.0
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.so
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.la
 lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libc-parser-dylan.a
-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%%/libtestworks-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-test-suite.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-test-suite-dylan.a
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/testworks-specs.lib.du
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.so.0
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.so
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.la
-lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libtestworks-specs-dylan.a
-%%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%%/gdk.lib.du
-%%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%%/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%%/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%%/gtk.lib.du
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/duim-layouts.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%%/commands.lib.du
-%%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%%/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
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libglib-dylan.a
-%%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%%/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.so
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.la
-%%GTK_ONLY%%lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/libduim-dylan.a
 @exec mkdir %D/lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan-user
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/dylan-user
 @dirrm lib/dylan/%%DYLANVER%%/%%DYLANARCH%%/elisp