Index: head/lang/smalltalk/Makefile
===================================================================
--- head/lang/smalltalk/Makefile	(revision 516794)
+++ head/lang/smalltalk/Makefile	(revision 516795)
@@ -1,72 +1,76 @@
 # Created by: gpalmer
 # $FreeBSD$
 
 PORTNAME=	smalltalk
 PORTVERSION=	3.2.5
 PORTREVISION=	14
 CATEGORIES=	lang
 MASTER_SITES=	GNU
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU Smalltalk
 
 BROKEN_aarch64=		Fails to link: undefined reference to sbrk
 BROKEN_powerpc64=	Fails to build: gst-package: did not understand #~
 BROKEN_sparc64=		Fails to install
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		gawk:lang/gawk
 LIB_DEPENDS=	libgdbm.so:databases/gdbm \
-		libcairo.so:graphics/cairo
+		libffi.so:devel/libffi \
+		libltdl.so:devel/libltdl \
+		libcairo.so:graphics/cairo \
+		libexpat.so:textproc/expat2
 
-OPTIONS_DEFINE=	PGSQL SDL
-OPTIONS_DEFAULT=PGSQL SDL
-OPTIONS_SUB=	yes
-PGSQL_USES=	pgsql
-SDL_USE=	SDL=image,mixer,sdl,sound,ttf
-
-USES=		gmake iconv libtool localbase makeinfo pathfix pkgconfig \
-		shebangfix sqlite tar:xz
+USES=		gl gmake gnome iconv libtool makeinfo pathfix pkgconfig \
+		readline shebangfix sqlite tar:xz xorg
+USE_GL=		gl glu glut
 USE_GNOME=	pango
-USE_XORG=	ice xi xmu
-USE_GL=		gl glut
+USE_XORG=	ice sm x11 xi xmu
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_EMACS=no ac_cv_prog_AWK=gawk
 CONFIGURE_ARGS=	--enable-generational-gc=no \
 		--enable-gtk=no \
 		--localstatedir="${PREFIX}/var" \
 		--with-emacs=no \
 		--with-gmp=no
 USE_LDCONFIG=	yes
 SHEBANG_LANG=	sed
 sed_OLD_CMD=	/bin/sed
 sed_CMD=	${SED}
 SHEBANG_FILES=	packages/vfs/deb packages/vfs/mailfs \
 		examples/pepe.sed examples/xml.sed
 PLIST_SUB=	VERSION="${PORTVERSION}"
 PORTDATA=	*
 
 INFO=		gst gst-base gst-libs
+
+OPTIONS_DEFINE=	PGSQL SDL
+OPTIONS_DEFAULT=	PGSQL SDL
+OPTIONS_SUB=	yes
+
+PGSQL_USES=	pgsql
+SDL_USE=	SDL=image,mixer,sdl,sound,ttf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ia64-\*-\* /&|amd64-*-* /' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's/lrintl (truncl/lroundl (truncl/' \
 		${WRKSRC}/libgst/prims.def \
 		${WRKSRC}/libgst/prims.inl
 	@${REINPLACE_CMD} -e '/^ac_include/s/\\$$/#include <wctype.h> \\/' \
 		${WRKSRC}/snprintfv/configure
 
 post-build:
 	@${SED} -e 's|@bindir@|${PREFIX}/bin|g' \
 		${WRKSRC}/gst-mode.el.in > ${WRKSRC}/gst-mode.el
 
 post-install:
 	@${LN} -sf gst-load.1 ${STAGEDIR}${MANPREFIX}/man/man1/gst-reload.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}/gtk
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 	@${LS} -1 ${STAGEDIR}${PREFIX}/bin/gst* |grep -v config|${XARGS} ${STRIP_CMD}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/smalltalk/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst.so
 
 .include <bsd.port.mk>
Index: head/lang/smalltalk/pkg-plist
===================================================================
--- head/lang/smalltalk/pkg-plist	(revision 516794)
+++ head/lang/smalltalk/pkg-plist	(revision 516795)
@@ -1,76 +1,76 @@
 bin/gst
 bin/gst-blox
 bin/gst-browser
 bin/gst-config
 bin/gst-convert
 bin/gst-doc
 bin/gst-load
 bin/gst-package
 bin/gst-profile
 bin/gst-reload
 bin/gst-remote
 bin/gst-sunit
 include/gst.h
 include/gstpub.h
 lib/libgst.a
 lib/libgst.so
 lib/libgst.so.7
 lib/libgst.so.7.1.3
 lib/smalltalk/dbd-sqlite3-%%VERSION%%.so
 lib/smalltalk/dbd-sqlite3.a
 lib/smalltalk/dbd-sqlite3.so
 lib/smalltalk/digest-%%VERSION%%.so
 lib/smalltalk/digest.a
 lib/smalltalk/digest.so
 lib/smalltalk/expat-%%VERSION%%.so
 lib/smalltalk/expat.a
 lib/smalltalk/expat.so
 lib/smalltalk/gdbm-%%VERSION%%.so
 lib/smalltalk/gdbm.a
 lib/smalltalk/gdbm.so
 lib/smalltalk/gstglut-%%VERSION%%.so
 lib/smalltalk/gstglut.a
 lib/smalltalk/gstglut.so
 lib/smalltalk/gstopengl-%%VERSION%%.so
 lib/smalltalk/gstopengl.a
 lib/smalltalk/gstopengl.so
 lib/smalltalk/i18n-%%VERSION%%.so
 lib/smalltalk/i18n.a
 lib/smalltalk/i18n.so
 lib/smalltalk/iconv-%%VERSION%%.so
 lib/smalltalk/iconv.a
 lib/smalltalk/iconv.so
-lib/smalltalk/sdl-%%VERSION%%.so
-lib/smalltalk/sdl.a
-lib/smalltalk/sdl.so
+%%SDL%%lib/smalltalk/sdl-%%VERSION%%.so
+%%SDL%%lib/smalltalk/sdl.a
+%%SDL%%lib/smalltalk/sdl.so
 lib/smalltalk/zlib-%%VERSION%%.so
 lib/smalltalk/zlib.a
 lib/smalltalk/zlib.so
 libdata/pkgconfig/gnu-smalltalk.pc
 libexec/smalltalk/gnutls-wrapper
 libexec/smalltalk/vfs/deb
 libexec/smalltalk/vfs/lslR
 libexec/smalltalk/vfs/mailfs
 libexec/smalltalk/vfs/patchfs
 libexec/smalltalk/vfs/uar
 libexec/smalltalk/vfs/urar
 libexec/smalltalk/vfs/uzoo
 libexec/smalltalk/vfs/ulha
 libexec/smalltalk/vfs/ucpio
 libexec/smalltalk/vfs/utar
 libexec/smalltalk/vfs/uzip
 man/man1/gst-config.1.gz
 man/man1/gst-convert.1.gz
 man/man1/gst-doc.1.gz
 man/man1/gst-load.1.gz
 man/man1/gst-package.1.gz
 man/man1/gst-profile.1.gz
 man/man1/gst-reload.1.gz
 man/man1/gst-sunit.1.gz
 man/man1/gst.1.gz
 var/lib/smalltalk/gst.im
 share/aclocal/gst.m4
 share/aclocal/gst-package.m4
 share/emacs/site-lisp/gst-mode.el
 share/emacs/site-lisp/smalltalk-mode.el
 @dir %%DATADIR%%/gtk