Removed VFlib2 DEPEND. Enabled Xft2 support by default.

5 files changed, 144 insertions, 3 deletions

diff --git a/app-misc/magicpoint/ChangeLog b/app-misc/magicpoint/ChangeLog
index 0b9eeb5f5183..cd409284148d 100644
--- a/app-misc/magicpoint/ChangeLog
+++ b/app-misc/magicpoint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/magicpoint
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/ChangeLog,v 1.10 2003/09/01 18:09:22 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/ChangeLog,v 1.11 2003/09/01 20:54:06 usata Exp $
+
+*magicpoint-1.10a-r1 (02 Sep 2003)
+
+  02 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> magicpoint-1.10a-r1.ebuild,
+  files/magicpoint-1.10a-r1-gentoo.diff:
+  Defaults to Xft2 instead of VFlib2.
 
 *magicpoint-1.10a (06 Aug 2003)
 
diff --git a/app-misc/magicpoint/Manifest b/app-misc/magicpoint/Manifest
index d063de74c00b..0299c1b6f2e1 100644
--- a/app-misc/magicpoint/Manifest
+++ b/app-misc/magicpoint/Manifest
@@ -1,7 +1,7 @@
-MD5 4db4ef8230b6024480ff817fe60c964f ChangeLog 2824
+MD5 1099703581958eed644f05aed8beef3d ChangeLog 2824
 MD5 c97cf1582ccf4469f483eda3f32fe6d8 magicpoint-1.09a-r1.ebuild 1566
 MD5 822f3d699b1a7ea06907a9e24e07d7fb magicpoint-1.10a.ebuild 2113
-MD5 55351e2c1a648e885f6c2589a6a86f85 magicpoint-1.10a-r1.ebuild 1923
+MD5 960185a3a44f664039afd1b3f849db4c magicpoint-1.10a-r1.ebuild 1926
 MD5 67c776708a4de3107f171f72100bd27e files/digest-magicpoint-1.09a-r1 68
 MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
 MD5 21ae8d72d1c351d19bc611f80ec31b63 files/magicpoint-1.10a-gentoo.diff 1668
diff --git a/app-misc/magicpoint/files/digest-magicpoint-1.10a-r1 b/app-misc/magicpoint/files/digest-magicpoint-1.10a-r1
new file mode 100644
index 000000000000..1af775f78bc4
--- /dev/null
+++ b/app-misc/magicpoint/files/digest-magicpoint-1.10a-r1
@@ -0,0 +1 @@
+MD5 7a5d91b2b3bdabea704ee3cb6505d772 magicpoint-1.10a.tar.gz 843657
diff --git a/app-misc/magicpoint/files/magicpoint-1.10a-r1-gentoo.diff b/app-misc/magicpoint/files/magicpoint-1.10a-r1-gentoo.diff
new file mode 100644
index 000000000000..981726ac11e9
--- /dev/null
+++ b/app-misc/magicpoint/files/magicpoint-1.10a-r1-gentoo.diff
@@ -0,0 +1,49 @@
+diff -urN magicpoint-1.10a.ORIG/parse.c magicpoint-1.10a/parse.c
+--- magicpoint-1.10a.ORIG/parse.c	2003-06-14 19:22:56.000000000 +0900
++++ magicpoint-1.10a/parse.c	2003-09-02 05:26:12.000000000 +0900
+@@ -848,7 +848,7 @@
+ 	tmpint[2]->cti_value = DEFAULT_VGAP;
+ 	tmpint[3] = ctlalloc1(CTL_QUALITY);
+ 	tmpint[3]->cti_value = DEFAULT_BQUALITY;
+-#ifdef XFT2
++#ifdef USE_XFT2
+ 	tmpint[4] = ctlalloc1(CTL_OPAQUE);
+ 	tmpint[4]->cti_value = DEFAULT_OPAQUE;
+ #endif
+diff -urN magicpoint-1.10a.ORIG/mgp.h magicpoint-1.10a/mgp.h
+--- magicpoint-1.10a.ORIG/mgp.h	2003-06-06 16:18:25.000000000 +0900
++++ magicpoint-1.10a/mgp.h	2003-09-02 04:24:56.000000000 +0900
+@@ -93,7 +93,7 @@
+ #include "freetype.h"
+ 
+ #ifndef FREETYPEFONTDIR
+-#define FREETYPEFONTDIR	"/usr/local/share/fonts/ttf"
++#define FREETYPEFONTDIR	"/usr/X11R6/lib/X11/fonts/truetype"
+ #endif
+ #endif /*FREETYPE*/
+ 
+@@ -130,7 +130,7 @@
+ #define	UUDECODE	"/usr/bin/uudecode"
+ #endif
+ #ifndef GUNZIP
+-#define	GUNZIP		"/usr/contrib/bin/gunzip"
++#define	GUNZIP		"/bin/gunzip"
+ #endif
+ 
+ #define MAXPAGE		512
+diff -urN magicpoint-1.10a.ORIG/sample/default.mgp magicpoint-1.10a/sample/default.mgp
+--- magicpoint-1.10a.ORIG/sample/default.mgp	2001-08-11 01:40:54.000000000 +0900
++++ magicpoint-1.10a/sample/default.mgp	2003-09-02 04:24:56.000000000 +0900
+@@ -12,9 +12,9 @@
+ %% into the "tfdir" directory above:
+ %%	ftp://ftp.mew.org/pub/mgp/ttf-jp.tar.gz
+ %%
+-%deffont "standard"   tfont "standard.ttf",   tmfont "kochi-mincho.ttf"
+-%deffont "thick"      tfont "thick.ttf",      tmfont "goth.ttf"
+-%deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf"
++%deffont "standard"	xfont "times"
++%deffont "thick"	xfont "arial-bold"
++%deffont "typewriter"	xfont "courier"
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %%
+ %% Default settings per each line numbers.
diff --git a/app-misc/magicpoint/magicpoint-1.10a-r1.ebuild b/app-misc/magicpoint/magicpoint-1.10a-r1.ebuild
new file mode 100644
index 000000000000..2d38a6d1b6e0
--- /dev/null
+++ b/app-misc/magicpoint/magicpoint-1.10a-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.10a-r1.ebuild,v 1.1 2003/09/01 20:54:07 usata Exp $
+
+inherit elisp eutils
+
+IUSE="cjk emacs truetype gif nls imlib"
+
+DESCRIPTION="an X11 based presentation tool"
+SRC_URI="ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
+HOMEPAGE="http://www.mew.org/mgp/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc"
+
+E_DEPEND="emacs? ( ${E_DEPEND}  )"
+E_RDEPEND="emacs? ( ${E_RDEPEND} )"
+DEPEND="virtual/x11
+	gif? ( >=media-libs/libungif-4.0.1 )
+	imlib? ( media-libs/imlib )
+	truetype? ( virtual/xft )"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	truetype? ( cjk? ( media-fonts/kochi-substitute ) )"
+
+S=${WORKDIR}/${P}
+SITELISP=/usr/share/emacs/site-lisp
+SITEFILE=50mgp-mode-gentoo.el
+
+src_unpack() {
+
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+ 
+	econf \
+		`use_enable gif` \
+		`use_enable imlib` \
+		`use_enable nls locale` \
+		`use_enable truetype xft2` \
+		--disable-vflib \
+		--disable-freetype || die
+
+	xmkmf || die
+	make Makefiles || die
+	make clean || die
+	make BINDIR=/usr/bin LIBDIR=/etc/X11 || die
+}
+
+src_install() {
+
+	make \
+		DESTDIR=${D} \
+		BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		install || die
+
+	make \
+		DESTDIR=${D} \
+		DOCHTMLDIR=/usr/share/doc/${P} \
+		MANPATH=/usr/share/man \
+		MANSUFFIX=1 \
+		install.man || die
+
+	exeinto /usr/bin
+	doexe contrib/{mgp2html.pl,mgp2latex.pl}
+
+	if [ -n "`use emacs`" ] ; then
+		insinto ${SITELISP}
+		doins contrib/mgp-mode.el ${FILESDIR}/${SITEFILE}
+	fi
+
+	insinto /usr/share/${PF}/sample
+	cd 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
+	cd -
+
+	dodoc COPYRIGHT* FAQ README* RELNOTES SYNTAX TODO* USAGE*
+}