From 66b3f5f3945262f7fa321888f14fe90a253d8873 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Wed, 22 Oct 2008 17:04:14 +0000
Subject: [PATCH] - Fix dependencies on powerpc, correctly link with
 devel/libelf - Remove a doubled VMEM_WARNING - Use libiconv MODULE - Honor
 CXXFLAGS - Fix licence marker - Update PLIST

ok ajacoutot@
---
 devel/ddd/Makefile  | 22 +++++++++++++++-------
 devel/ddd/pkg/PLIST |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 767b1896ab4..5061a692d0c 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,21 +1,23 @@
-# $OpenBSD: Makefile,v 1.46 2008/01/04 18:38:51 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2008/10/22 17:04:14 landry Exp $
 
 COMMENT=	Data Display Debugger, graphical front-end for GDB, etc
 
 DISTNAME=	ddd-3.3.11
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ddd/}
 
 HOMEPAGE=	http://www.gnu.org/software/ddd/
 
-# GPL
+# GPLv2 / LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=	ICE SM X11 Xaw Xau Xdmcp Xext Xmu Xp Xpm Xt c m z stdc++ \
-		Xft Xrender expat fontconfig freetype iconv ncurses
+		Xft Xrender expat fontconfig freetype ncurses
+
+MODULES=	converters/libiconv
 
 REGRESS_IS_INTERACTIVE=Yes
 # Note - we need ~/.XAuthority, which doesn't exist in
@@ -28,7 +30,15 @@ USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 USE_X11=	Yes
 CONFIGURE_STYLE=gnu autoconf no-autoheader
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		CXXFLAGS="${CXXFLAGS}"
+
+# needed for is_ppc_file() in ddd/filetype.C
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LIB_DEPENDS+=	elf::devel/libelf
+.endif
+
 AUTOCONF_VERSION=2.59
 SEPARATE_BUILD=	simple
 
@@ -36,8 +46,6 @@ CONFIGURE_ARGS=	--with-readline-libraries=/usr/lib
 
 MAKE_FLAGS=	MAINTAINER="'${MAINTAINER}'"
 
-VMEM_WARNING=	Yes
-
 DOCS=	ddd-paper.ps ddd-themes.pdf ddd-themes.ps ddd.pdf ddd.ps html/ddd.html
 
 post-install:
diff --git a/devel/ddd/pkg/PLIST b/devel/ddd/pkg/PLIST
index 5e74f95395c..064fde7b6a2 100644
--- a/devel/ddd/pkg/PLIST
+++ b/devel/ddd/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.11 2005/06/28 19:31:57 aanriot Exp $
-bin/ddd
+@comment $OpenBSD: PLIST,v 1.12 2008/10/22 17:04:14 landry Exp $
+@bin bin/ddd
 @info info/ddd-themes.info
 @info info/ddd.info
 @man man/man1/ddd.1