cleanups; location fixes; info page fixes; etc

7 files changed, 215 insertions, 1 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index d52db367bf12..9c8855f0aa7c 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/groff
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.3 2002/07/24 09:03:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.4 2002/07/29 16:23:23 azarah Exp $
+
+*groff-1.18-r1 (29 Jul 2002)
+*groff-1.17.2-r2 (29 Jul 2002)
+
+  29 Jul 2002; Martin Schlemmer <azarah@gentoo.org> groff-1.18-r1, groff-1.17.2-r2 :
+  Some build Cleanups.  Enable build of xditview if "X" in USE,
+  and X is actually installed.  We cannot make it depend on X, as
+  X depends on perl, which in turn depend on groff and will cause
+  circular depends.  Enable the install of info pages, and also
+  fix thier extension to .info, else they do not get gzipped.
+  Also fixed 0.18 to install its docs/examples in the right place.
 
 *groff-1.18 (24 Jul 2002)
 
diff --git a/sys-apps/groff/files/digest-groff-1.17.2-r2 b/sys-apps/groff/files/digest-groff-1.17.2-r2
new file mode 100644
index 000000000000..47b83c6bcb30
--- /dev/null
+++ b/sys-apps/groff/files/digest-groff-1.17.2-r2
@@ -0,0 +1 @@
+MD5 9564e58e553e7a8d4c6e73a782f296ce groff-1.17.2.tar.gz 1503169
diff --git a/sys-apps/groff/files/digest-groff-1.18-r1 b/sys-apps/groff/files/digest-groff-1.18-r1
new file mode 100644
index 000000000000..7163abdda273
--- /dev/null
+++ b/sys-apps/groff/files/digest-groff-1.18-r1
@@ -0,0 +1 @@
+MD5 31474119d1ef2ded0bd0692132d50d05 groff-1.18.tar.gz 2199488
diff --git a/sys-apps/groff/files/groff-1.17.2-infoext.patch b/sys-apps/groff/files/groff-1.17.2-infoext.patch
new file mode 100644
index 000000000000..a7f0359af657
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.17.2-infoext.patch
@@ -0,0 +1,22 @@
+--- groff-1.17.2/doc/Makefile.orig	Mon Jul 29 17:41:44 2002
++++ groff-1.17.2/doc/Makefile	Mon Jul 29 17:42:06 2002
+@@ -65,7 +65,7 @@
+ .texinfo.dvi:
+ 	texi2dvi -e $<
+ 
+-groff: groff.texinfo
++groff.info: groff.texinfo
+ 	makeinfo groff.texinfo
+ 
+ install:
+--- groff-1.17.2/doc/groff.texinfo.orig	Mon Jul 29 17:41:24 2002
++++ groff-1.17.2/doc/groff.texinfo	Mon Jul 29 17:41:37 2002
+@@ -6,7 +6,7 @@
+ @c
+ 
+ @c %**start of header (This is for running Texinfo on a region.)
+-@setfilename  groff
++@setfilename  groff.info
+ @settitle The GNU Troff Manual
+ @setchapternewpage odd
+ @footnotestyle separate
diff --git a/sys-apps/groff/files/groff-1.18-infoext.patch b/sys-apps/groff/files/groff-1.18-infoext.patch
new file mode 100644
index 000000000000..ee8bc9793fab
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.18-infoext.patch
@@ -0,0 +1,22 @@
+--- groff-1.18/doc/Makefile.in.orig	Mon Jul 29 12:50:04 2002
++++ groff-1.18/doc/Makefile.in	Mon Jul 29 12:54:49 2002
+@@ -104,7 +104,7 @@
+ prepare_examples: grnexmpl.g
+ 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
+ 
+-groff: groff.texinfo
++groff.info: groff.texinfo
+ 	$(MAKEINFO) -I$(srcdir) $(srcdir)/groff.texinfo
+ 
+ gnu.eps: gnu.xpm
+--- groff-1.18/doc/groff.texinfo.orig	Mon Jul 29 12:48:56 2002
++++ groff-1.18/doc/groff.texinfo	Mon Jul 29 12:49:07 2002
+@@ -8,7 +8,7 @@
+ @c
+ 
+ @c %**start of header (This is for running Texinfo on a region.)
+-@setfilename groff
++@setfilename groff.info
+ @settitle The GNU Troff Manual
+ @setchapternewpage odd
+ @footnotestyle separate
diff --git a/sys-apps/groff/groff-1.17.2-r2.ebuild b/sys-apps/groff/groff-1.17.2-r2.ebuild
new file mode 100644
index 000000000000..30ec8fbda48d
--- /dev/null
+++ b/sys-apps/groff/groff-1.17.2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.17.2-r2.ebuild,v 1.1 2002/07/29 16:23:23 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Text formatter used for man pages"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
+
+KEYWORDS="x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+    # Fix the info pages to have .info extensions,
+	# else they do not get gzipped.
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-infoext.patch || die
+}
+
+src_compile() {
+	# Fix problems with not finding g++
+	[ -z "${CC}" ] && export CC="gcc"
+	[ -z "${CXX}" ] && export CXX="g++"
+	
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man || die
+		
+	# emake doesn't work
+	make || die
+	
+	# do the info pages.  this is only needed for 1.17*,
+	# as 1.18 do install its info pages
+	cd ${S}/doc
+	make groff.info || die
+
+	# Only build X stuff if we have X installed, but do
+	# not depend on it, else we get circular deps.
+	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
+	then
+		cd ${S}/src/xditview
+		xmkmf || die
+		make depend all || die
+	fi
+}
+
+src_install() {
+	dodir /usr /usr/share/doc/${PF}/{examples,html}
+	make prefix=${D}/usr \
+		manroot=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc/${PF} \
+		install || die
+
+	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
+	then
+		cd ${S}/src/xditview
+		make DESTDIR=${D} \
+			BINDIR=/usr/bin \
+			MANPATH=/usr/share/man \
+			install \
+			install.man || die
+	fi
+	
+	# the following links are required for xman
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+	dosym soelim /usr/bin/zsoelim
+
+	# this is only needed for 1.17*, as 1.18
+	# do install its info pages
+	cd ${S}/doc
+	doinfo groff.info*
+
+	cd ${S}
+	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
+		PROBLEMS PROJECTS README REVISION TODO VERSION
+}
+
diff --git a/sys-apps/groff/groff-1.18-r1.ebuild b/sys-apps/groff/groff-1.18-r1.ebuild
new file mode 100644
index 000000000000..d754117923af
--- /dev/null
+++ b/sys-apps/groff/groff-1.18-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18-r1.ebuild,v 1.1 2002/07/29 16:23:23 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Text formatter used for man pages"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
+
+KEYWORDS="x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	media-libs/netpbm"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix the info pages to have .info extensions,
+	# else they do not get gzipped.
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-infoext.patch || die
+}
+
+src_compile() {
+	# Fix problems with not finding g++
+	[ -z "${CC}" ] && export CC="gcc"
+	[ -z "${CXX}" ] && export CXX="g++"
+	
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man || die
+		
+	# emake doesn't work
+	make || die
+
+	# Only build X stuff if we have X installed, but do
+	# not depend on it, else we get circular deps.
+	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
+	then
+		cd ${S}/src/xditview
+		xmkmf || die
+		make depend all || die
+	fi
+}
+
+src_install() {
+	dodir /usr /usr/share/doc/${PF}/{examples,html}
+	make prefix=${D}/usr \
+		manroot=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc/${PF} \
+		install || die
+
+	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
+	then
+		cd ${S}/src/xditview
+		make DESTDIR=${D} \
+			BINDIR=/usr/bin \
+			MANPATH=/usr/share/man \
+			install \
+			install.man || die
+	fi
+	
+	#the following links are required for xman
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+	dosym soelim /usr/bin/zsoelim
+
+	cd ${S}
+	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
+		PROBLEMS PROJECTS README REVISION TODO VERSION
+}
+