Fixed mng dep. Thanks to James Rowe <jnrowe@ukfsn.org>; bug #91644.

(Portage version: 2.0.51.19)

3 files changed, 83 insertions, 11 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index ab911d11b8c8..3e4c9228cadf 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/magicpoint
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.17 2005/04/21 19:57:06 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.18 2005/05/06 04:35:58 usata Exp $
+
+  06 May 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/magicpoint-1.11b-mng_optional.patch, magicpoint-1.11b.ebuild:
+  Fixed mng dep. Thanks to James Rowe <jnrowe@ukfsn.org>; bug #91644.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> magicpoint-1.11b.ebuild:
   stable on amd64
diff --git a/app-office/magicpoint/files/magicpoint-1.11b-mng_optional.patch b/app-office/magicpoint/files/magicpoint-1.11b-mng_optional.patch
new file mode 100644
index 000000000000..f7ad9b402830
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.11b-mng_optional.patch
@@ -0,0 +1,61 @@
+Index: magicpoint-1.11b/configure.in
+===================================================================
+--- magicpoint-1.11b/configure.in	{cset b4d3ff90-24b8-4cde-9052-f5859b9ff17a}
++++ magicpoint-1.11b/configure.in	{local clone}
+@@ -292,27 +292,35 @@
+   done
+ fi
+ 
+-for i in /usr/pkg /usr/local /usr; do
+-	if test -f $i/include/libmng.h; then 
+-		if test -f $i/lib/libmng.a ; then
+-			DEPLIBS="$DEPLIBS $i/lib/libmng.a"
+-		elif test -f $i/lib/libmng.so ; then
+-			DEPLIBS="$DEPLIBS $i/lib/libmng.so"
+-		else
+-			break;
+-		fi
+-		LIBS="$LIBS -L$i/lib"
+-		OPTFLAGS="$OPTFLAGS -I$i/include"
+-		AC_CHECK_LIB(mng, mng_initialize, 
+-			[LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
+-			 AC_DEFINE(MNG)], 
+-		[AC_CHECK_LIB(mng, mng_readdisplay,
+-			[LIBS="$LIBS -lmng -ljpeg"
+-			 AC_DEFINE(MNG)],
+-			[], [-ljpeg])])
+-		break
+-	fi
+-done
++AC_MSG_CHECKING(if mng handling is enabled)
++AC_ARG_ENABLE(mng,
++	[  --enable-mng            compile mng support in.],
++	[mgp_mng="$enableval"],
++	[mgp_mng="no"])
++AC_MSG_RESULT($mgp_mng)
++if test $mgp_mng = "yes"; then
++	for i in /usr/pkg /usr/local /usr; do
++		if test -f $i/include/libmng.h; then 
++			if test -f $i/lib/libmng.a ; then
++				DEPLIBS="$DEPLIBS $i/lib/libmng.a"
++			elif test -f $i/lib/libmng.so ; then
++				DEPLIBS="$DEPLIBS $i/lib/libmng.so"
++			else
++				break;
++			fi
++			LIBS="$LIBS -L$i/lib"
++			OPTFLAGS="$OPTFLAGS -I$i/include"
++			AC_CHECK_LIB(mng, mng_initialize, 
++				[LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
++				 AC_DEFINE(MNG)], 
++			[AC_CHECK_LIB(mng, mng_readdisplay,
++				[LIBS="$LIBS -lmng -ljpeg"
++				 AC_DEFINE(MNG)],
++				[], [-ljpeg])])
++			break
++		fi
++	done
++fi
+ 
+ dnl Checks for header files.
+ AC_PATH_X
diff --git a/app-office/magicpoint/magicpoint-1.11b.ebuild b/app-office/magicpoint/magicpoint-1.11b.ebuild
index fe7822d29238..77b801ed21ec 100644
--- a/app-office/magicpoint/magicpoint-1.11b.ebuild
+++ b/app-office/magicpoint/magicpoint-1.11b.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.8 2005/04/21 19:57:06 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.9 2005/05/06 04:35:58 usata Exp $
 
-inherit elisp-common eutils
+inherit elisp-common eutils fixheadtails
 
 DESCRIPTION="an X11 based presentation tool"
 SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/${P}.tar.gz
@@ -12,15 +12,18 @@ HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 alpha sparc ppc amd64"
-IUSE="cjk nls m17n-lib emacs truetype gif imlib"
+IUSE="cjk nls m17n-lib emacs truetype gif imlib mng"
 
-DEPEND="virtual/x11
+MY_DEPEND="virtual/x11
 	gif? ( >=media-libs/giflib-4.0.1 )
 	imlib? ( media-libs/imlib )
 	truetype? ( virtual/xft )
 	emacs? ( virtual/emacs )
-	m17n-lib? ( dev-libs/m17n-lib )"
-RDEPEND="${DEPEND}
+	m17n-lib? ( dev-libs/m17n-lib )
+	mng? ( media-libs/libmng )"
+DEPEND="${MY_DEPEND}
+	sys-devel/autoconf"
+RDEPEND="${MY_DEPEND}
 	nls? ( sys-devel/gettext )
 	truetype? ( cjk? ( media-fonts/sazanami ) )"
 
@@ -38,16 +41,20 @@ has_emacs() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-mng_optional.patch
 
-src_compile() {
 	# bug #85720
-	sed -i -e "s/ungif/gif/g" configure* || die
+	sed -i -e "s/ungif/gif/g" configure.in || die
+	ht_fix_file configure.in
+	autoreconf
+}
 
+src_compile() {
 	econf \
 		$(use_enable gif) \
 		$(use_enable imlib) \
+		$(use_enable mng) \
 		$(use_enable nls locale) \
 		$(use_enable truetype xft2) \
 		$(use_with m17n-lib) \