Fixed compile error wrt xorg-x11 header path change; bug #103007.

Package-Manager: portage-2.0.52-r1

6 files changed, 13 insertions, 160 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 3e4c9228cadf..53d3f558e60e 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2005/05/06 04:35:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.19 2005/09/29 08:30:40 usata Exp $
+
+  29 Sep 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/magicpoint-1.10a-r1-gentoo.diff, -magicpoint-1.10a-r1.ebuild,
+  magicpoint-1.11b.ebuild:
+  Fixed compile error wrt xorg-x11 header path change; bug #103007.
 
   06 May 2005; Mamoru KOMACHI <usata@gentoo.org>
   +files/magicpoint-1.11b-mng_optional.patch, magicpoint-1.11b.ebuild:
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index 2bce1cbf3eb0..71cf133b6b00 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2b59dbc871015da13d3287ebed072bfd magicpoint-1.11b.ebuild 2668
-MD5 9814e14a89852e1c2cd3d0b0f197f437 magicpoint-1.10a-r1.ebuild 2022
-MD5 a7bb4a4b21e8157fd39766f0f77a0ba7 ChangeLog 5464
+MD5 573654ef9de75c1540561e8bce48858b ChangeLog 5680
+MD5 5d3d26a4ffdc4a76caefc88561b4e202 magicpoint-1.11b.ebuild 2705
 MD5 cca347d4b0e88766d322951ccf1e97e7 metadata.xml 570
-MD5 fb8540abfe6224103b5d68b722e78119 files/magicpoint-1.11b-gentoo.diff 1412
-MD5 02b686f1f35a47738d8938fb0151d3d0 files/digest-magicpoint-1.11b 68
-MD5 6ac7b3bc9c394f597bf182a0509154fc files/digest-magicpoint-1.10a-r1 68
-MD5 3948d3f1ee43af2138ad361b1bcab87b files/magicpoint-1.10a-r1-gentoo.diff 1833
 MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
 MD5 b274f550ccb53c3e1057c561dcfaa2a7 files/magicpoint-1.11b-mng_optional.patch 1670
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCevSQ1u6irqznjogRApSzAJ427E39PwYMLcoJ7TC2SsS0C7+SiQCeN5kN
-mQnqZa2GB4I0090jKwx1gcY=
-=1tYe
------END PGP SIGNATURE-----
+MD5 02b686f1f35a47738d8938fb0151d3d0 files/digest-magicpoint-1.11b 68
+MD5 fb8540abfe6224103b5d68b722e78119 files/magicpoint-1.11b-gentoo.diff 1412
diff --git a/app-office/magicpoint/files/digest-magicpoint-1.10a-r1 b/app-office/magicpoint/files/digest-magicpoint-1.10a-r1
deleted file mode 100644
index 1af775f78bc4..000000000000
--- a/app-office/magicpoint/files/digest-magicpoint-1.10a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a5d91b2b3bdabea704ee3cb6505d772 magicpoint-1.10a.tar.gz 843657
diff --git a/app-office/magicpoint/files/magicpoint-1.10a-r1-gentoo.diff b/app-office/magicpoint/files/magicpoint-1.10a-r1-gentoo.diff
deleted file mode 100644
index 981726ac11e9..000000000000
--- a/app-office/magicpoint/files/magicpoint-1.10a-r1-gentoo.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-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-office/magicpoint/magicpoint-1.10a-r1.ebuild b/app-office/magicpoint/magicpoint-1.10a-r1.ebuild
deleted file mode 100644
index 9f80a86c86c6..000000000000
--- a/app-office/magicpoint/magicpoint-1.10a-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.10a-r1.ebuild,v 1.10 2005/03/18 14:04:17 usata Exp $
-
-inherit elisp-common eutils
-
-DESCRIPTION="an X11 based presentation tool"
-SRC_URI="ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
-HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 alpha ~sparc ppc ~amd64"
-IUSE="cjk emacs truetype gif nls imlib"
-
-DEPEND="virtual/x11
-	gif? ( >=media-libs/libungif-4.0.1 )
-	imlib? ( media-libs/imlib )
-	truetype? ( virtual/xft )
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	truetype? ( cjk? ( media-fonts/kochi-substitute ) )"
-
-SITELISP=/usr/share/emacs/site-lisp
-SITEFILE=50mgp-mode-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	# bug #85720
-	sed -i -e "s/ungif/gif/g" configure* || die
-
-	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/${PF} \
-		MANPATH=/usr/share/man \
-		MANSUFFIX=1 \
-		install.man || die
-
-	exeinto /usr/bin
-	doexe contrib/{mgp2html.pl,mgp2latex.pl}
-
-	if 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*
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-office/magicpoint/magicpoint-1.11b.ebuild b/app-office/magicpoint/magicpoint-1.11b.ebuild
index 77b801ed21ec..b52905e40289 100644
--- a/app-office/magicpoint/magicpoint-1.11b.ebuild
+++ b/app-office/magicpoint/magicpoint-1.11b.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2005/05/06 04:35:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.10 2005/09/29 08:30:40 usata Exp $
 
 inherit elisp-common eutils fixheadtails
 
@@ -60,7 +60,8 @@ src_compile() {
 		$(use_with m17n-lib) \
 		--disable-vflib \
 		--disable-freetype \
-		--x-libraries=/usr/X11R6/lib || die
+		--x-libraries=/usr/X11R6/lib \
+		--x-includes=/usr/X11R6/include || die
 
 	xmkmf || die
 	make Makefiles || die