diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index dc0bb355c1c2..de8edb761f7f 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -4,10 +4,10 @@
 # Date created:			  Tue Jan 28, 1997
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.15 1999/04/27 01:10:32 obrien Exp $
+# $Id: Makefile,v 1.16 1999/05/02 11:28:56 mharo Exp $
 #
 
-DISTNAME=	ddd-3.1.4
+DISTNAME=	ddd-3.1.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ips.cs.tu-bs.de/pub/local/softech/ddd/src/  \
 		ftp://uiarchive.cso.uiuc.edu/pub/packages/ddd/src/  \
@@ -21,11 +21,18 @@ MAINTAINER=     obrien@FreeBSD.org
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-motif-libraries="${MOTIFLIB} -lXt -lXext"
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-motif-libraries="${LIBXMDIR}"
 USE_GMAKE=	yes
 REQUIRES_MOTIF=	yes
 MAN1=		ddd.1
 
+.if defined(MOTIF_STATIC)
+LIBXMDIR!=	${ECHO} ${MOTIFLIB} | sed -e 's/\/libXm\.a//g' | awk '{print $$1}'
+.else
+LIBXMDIR!=	${ECHO} ${MOTIFLIB} | sed -e 's/-L//g' | awk '{print $$1}'
+.endif
+
 post-configure:
 	${ECHO} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile
 
diff --git a/devel/ddd/distinfo b/devel/ddd/distinfo
index 36fc8fc6f6a4..bd0028550146 100644
--- a/devel/ddd/distinfo
+++ b/devel/ddd/distinfo
@@ -1 +1 @@
-MD5 (ddd-3.1.4.tar.gz) = 0f8d626cd98ee31a91787cf1e65b3269
+MD5 (ddd-3.1.5.tar.gz) = 9ecb048f84ffe4de377d90814b1fa57f
diff --git a/devel/ddd/files/patch-02 b/devel/ddd/files/patch-02
deleted file mode 100644
index 4e4909df1a5a..000000000000
--- a/devel/ddd/files/patch-02
+++ /dev/null
@@ -1,11 +0,0 @@
---- ddd/InitImage.C.orig	Sun Mar 14 07:58:12 1999
-+++ ddd/InitImage.C	Sat May  8 17:09:05 1999
-@@ -221,7 +221,7 @@
-     // arguements.  If I simply change the three calls to
-     // XmInstallImage to Xm21InstallImage, the problem is solved.
- 
--#if XmVersion >= 2001
-+#if XmVersion >= 2001 && defined(sun)
-     return Xm21InstallImage(image, image_name);
- #else
-     return XmInstallImage(image, image_name);