Version bump with re-worked implicit declerations patch. bug #220563

(Portage version: 2.2_rc1/cvs/Linux 2.6.22-gentoo-r2 i686)

3 files changed, 141 insertions, 2 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index b0ab5788ac28..bfec317fe5bb 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/magicpoint
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.37 2007/12/25 16:51:56 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.38 2008/06/29 16:57:33 darkside Exp $
+
+*magicpoint-1.13a (29 Jun 2008)
+
+  29 Jun 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/magicpoint-1.13a-implicit-declaration.patch,
+  +magicpoint-1.13a.ebuild:
+  Version bump with re-worked implicit declerations patch. bug #220563
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/app-office/magicpoint/files/magicpoint-1.13a-implicit-declaration.patch b/app-office/magicpoint/files/magicpoint-1.13a-implicit-declaration.patch
new file mode 100644
index 000000000000..c38aa876bb7a
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a-implicit-declaration.patch
@@ -0,0 +1,10 @@
+--- magicpoint-1.12a/ctlwords.c	1999-02-14 18:02:25.000000000 -0500
++++ ctlwords.c	2007-10-26 15:41:16.000000000 -0400
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ main(int argc, char *argv[])
+ {
diff --git a/app-office/magicpoint/magicpoint-1.13a.ebuild b/app-office/magicpoint/magicpoint-1.13a.ebuild
new file mode 100644
index 000000000000..5fc4e6895a40
--- /dev/null
+++ b/app-office/magicpoint/magicpoint-1.13a.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.13a.ebuild,v 1.1 2008/06/29 16:57:33 darkside Exp $
+
+inherit autotools elisp-common eutils fixheadtails
+
+DESCRIPTION="An X11 based presentation tool"
+SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/${P}.tar.gz
+	ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
+HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="cjk doc emacs examples gif imlib m17n-lib mng nls truetype"
+
+MY_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXrender
+	x11-libs/libXmu
+	gif? ( >=media-libs/giflib-4.0.1 )
+	imlib? ( media-libs/imlib )
+	truetype? ( virtual/xft )
+	emacs? ( virtual/emacs )
+	m17n-lib? ( dev-libs/m17n-lib )
+	mng? ( media-libs/libmng )"
+DEPEND="${MY_DEPEND}
+	sys-devel/autoconf
+	x11-proto/xextproto
+	x11-libs/libxkbfile
+	app-text/rman
+	x11-misc/imake"
+RDEPEND="${MY_DEPEND}
+	nls? ( sys-devel/gettext )
+	truetype? ( cjk? ( media-fonts/sazanami ) )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.11b-gentoo.diff"
+	epatch "${FILESDIR}/${P}-implicit-declaration.patch"
+
+	# bug #85720
+	sed -i -e "s/ungif/gif/g" configure.in || die "sed failed"
+	ht_fix_file configure.in
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable gif) \
+		$(use_enable imlib) \
+		$(use_enable nls locale) \
+		$(use_enable truetype xft2) \
+		$(use_with m17n-lib) \
+		--disable-vflib \
+		--disable-freetype \
+		--x-libraries=/usr/lib/X11 \
+		--x-includes=/usr/include/X11 || die "econf failed"
+
+	xmkmf || die "xmkmf failed"
+	# no parallel build possibly, anywhere
+	emake -j1 Makefiles || die "emake Makefiles failed"
+	emake -j1 clean || die "emake clean failed"
+	emake -j1 BINDIR=/usr/bin LIBDIR=/etc/X11 || die "emake failed"
+	if use emacs; then
+	   cd contrib/
+	   elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		install || die "emake install failed"
+
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCHTMLDIR=/usr/share/doc/${PF} \
+		MANPATH=/usr/share/man \
+		MANSUFFIX=1 \
+		install.man || die "emake install.man failed"
+
+	dobin contrib/{mgp2html.pl,mgp2latex.pl}
+
+	if use emacs ; then
+		cd contrib/
+		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		cd -
+	fi
+
+	use doc && dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE*
+
+	if use examples; then
+		cd sample
+		insinto /usr/share/${PF}/sample
+		doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
+			mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
+			multilingual.mgp sample*.mgp sendmail6*.mgp \
+			tutorial*.mgp v6*.mgp v6header.* || \
+			die "example installation failed"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "If you enabled xft2 support (default) you may specify xfont directive by"
+	elog "font name and font registry."
+	elog "e.g.)"
+	elog '%deffont "standard" xfont "sazanami mincho" "jisx0208.1983"'
+	elog
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}