From f780a2cd894ca714bb9e79e4e06ad7faab23b831 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Mon, 28 Oct 2002 07:21:51 +0000 Subject: [PATCH] change versions to reflect real version --- x11-misc/ttmkfdir/ChangeLog | 6 +++- .../ttmkfdir/files/digest-ttmkfdir-0.0-r1 | 1 - x11-misc/ttmkfdir/files/digest-ttmkfdir-1.0 | 2 +- x11-misc/ttmkfdir/files/digest-ttmkfdir-2.0 | 1 + ...0-gentoo.diff => ttmkfdir-1.0-gentoo.diff} | 0 ...gentoo.patch => ttmkfdir-2.0-gentoo.patch} | 0 x11-misc/ttmkfdir/ttmkfdir-0.0-r1.ebuild | 30 ---------------- x11-misc/ttmkfdir/ttmkfdir-1.0.ebuild | 28 ++++++--------- x11-misc/ttmkfdir/ttmkfdir-2.0.ebuild | 36 +++++++++++++++++++ 9 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 x11-misc/ttmkfdir/files/digest-ttmkfdir-0.0-r1 create mode 100644 x11-misc/ttmkfdir/files/digest-ttmkfdir-2.0 rename x11-misc/ttmkfdir/files/{ttmkfdir-0.0-gentoo.diff => ttmkfdir-1.0-gentoo.diff} (100%) rename x11-misc/ttmkfdir/files/{ttmkfdir-1.0-gentoo.patch => ttmkfdir-2.0-gentoo.patch} (100%) delete mode 100644 x11-misc/ttmkfdir/ttmkfdir-0.0-r1.ebuild create mode 100644 x11-misc/ttmkfdir/ttmkfdir-2.0.ebuild diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog index 62ec687faadf..402eefda761e 100644 --- a/x11-misc/ttmkfdir/ChangeLog +++ b/x11-misc/ttmkfdir/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/ttmkfdir # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.3 2002/10/20 07:33:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.4 2002/10/28 07:21:51 azarah Exp $ + + 28 Oct 2002; Martin Schlemmer : + + Change all the ebuild to reflect the "true" versions (1.0 and 2.0). *ttmkfdir-1.0 (20 Oct 2002) diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-0.0-r1 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-0.0-r1 deleted file mode 100644 index bfd0e8615ba3..000000000000 --- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-0.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 dcf6aa4d28f5c52acf2bb57f49f53089 ttmkfdir.tar.gz 61487 diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-1.0 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-1.0 index 0ba4ef3c4b91..bfd0e8615ba3 100644 --- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-1.0 +++ b/x11-misc/ttmkfdir/files/digest-ttmkfdir-1.0 @@ -1 +1 @@ -MD5 61efb004b19befdb5335ef058323002c ttmkfdir2-1.0.tar.bz2 16650 +MD5 dcf6aa4d28f5c52acf2bb57f49f53089 ttmkfdir.tar.gz 61487 diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-2.0 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-2.0 new file mode 100644 index 000000000000..0ba4ef3c4b91 --- /dev/null +++ b/x11-misc/ttmkfdir/files/digest-ttmkfdir-2.0 @@ -0,0 +1 @@ +MD5 61efb004b19befdb5335ef058323002c ttmkfdir2-1.0.tar.bz2 16650 diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-0.0-gentoo.diff b/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff similarity index 100% rename from x11-misc/ttmkfdir/files/ttmkfdir-0.0-gentoo.diff rename to x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.patch b/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch similarity index 100% rename from x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.patch rename to x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch diff --git a/x11-misc/ttmkfdir/ttmkfdir-0.0-r1.ebuild b/x11-misc/ttmkfdir/ttmkfdir-0.0-r1.ebuild deleted file mode 100644 index 426338a8332f..000000000000 --- a/x11-misc/ttmkfdir/ttmkfdir-0.0-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-0.0-r1.ebuild,v 1.8 2002/10/19 22:49:07 cselkirk Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts" -SRC_URI="http://www.joerg-pommnitz.de/TrueType/ttmkfdir.tar.gz" -HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html" -LICENSE="as-is" -SLOT="0" -KEYWORDS="x86 sparc sparc64 ppc" - -DEPEND=" ${S}/Makefile + patch -p1 < ${FILESDIR}/${P}-gentoo.diff } src_compile() { + make clean || die make OPT="${CFLAGS}" || die } -src_install() { - exeinto /usr/X11R6/bin - doexe ${S}/ttmkfdir +src_install () { + make DESTDIR=${D} install || die + dodoc README } - diff --git a/x11-misc/ttmkfdir/ttmkfdir-2.0.ebuild b/x11-misc/ttmkfdir/ttmkfdir-2.0.ebuild new file mode 100644 index 000000000000..9e1c9f4c1bcd --- /dev/null +++ b/x11-misc/ttmkfdir/ttmkfdir-2.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-2.0.ebuild,v 1.1 2002/10/28 07:21:51 azarah Exp $ + +S="${WORKDIR}/${PN}2" +DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts" +SRC_URI="mirror://gentoo/ttmkfdir2-1.0.tar.bz2" +HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="x86 sparc sparc64 ppc" + +DEPEND=">=media-libs/freetype-2.0.8 + >=sys-devel/flex-2.5.4a-r5 + sys-devel/libtool" + +src_unpack() { + unpack ${A} + + cd ${S}; patch -p1 < ${FILESDIR}/${P}-gentoo.patch || die + + cp ${S}/Makefile ${S}/Makefile.orig + sed -e "s:CXXFLAGS=-Wall:CXXFLAGS=${CFLAGS} -Wall:" \ + ${S}/Makefile.orig > ${S}/Makefile +} + +src_compile() { + make OPT="${CFLAGS}" || die +} + +src_install() { + exeinto /usr/X11R6/bin + doexe ${S}/ttmkfdir +} + -- 2.26.2