merge of 5184d5d01f81fcaa198426dc405ef4635ac0099e

     and 75401918dca3876106733c357fd6be43748c9bab

5 files changed, 77 insertions, 3 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index ea126d9032..6b173f2f21 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -58,6 +58,7 @@ ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
 ${PKGDIR}/packages/gphoto2/*.bb \
 ${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/groff/*.bb \
 ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hal/*.bb \
diff --git a/packages/cdstatus/cdstatus-0.96.05.bb b/packages/cdstatus/cdstatus-0.96.05.bb
index 1ae728f836..a2b3a0484a 100644
--- a/packages/cdstatus/cdstatus-0.96.05.bb
+++ b/packages/cdstatus/cdstatus-0.96.05.bb
@@ -1,6 +1,6 @@
 # cdstatus OE build file
 
-PR="r0"
+PR="r1"
 LICENSE="GPL"
 HOMEPAGE = "http://cdstatus.sourceforge.net/"
 FILES_${PN} += ${datadir}/cdstatus.cfg
@@ -12,8 +12,6 @@ S="${WORKDIR}/cdstatus-0.96.05"
 
 inherit autotools
 
-TARGET_LDFLAGS=""
-
 do_install() {
 	install -d 0755 ${D}/${bindir}
 	install -d 0755 ${D}/${datadir}
diff --git a/packages/groff/groff/Makefile.in.patch b/packages/groff/groff/Makefile.in.patch
new file mode 100644
index 0000000000..30aac8cbf0
--- /dev/null
+++ b/packages/groff/groff/Makefile.in.patch
@@ -0,0 +1,31 @@
+*** groff-1.19.2/Makefile.in.orig	Sun Aug  7 10:03:33 2005
+--- groff-1.19.2/Makefile.in	Sat Dec  3 16:44:50 2005
+***************
+*** 242,249 ****
+  
+  # The configure script checks whether all necessary utility programs for
+  # grohtml are available -- only then we can build the HTML documentation.
+! make_html=@make_html@
+! make_install_html=@make_install_html@
+  
+  # The configure script also checks whether all necessary utility programs
+  # for pdfroff are available -- only then we can build PDF documentation.
+--- 242,249 ----
+  
+  # The configure script checks whether all necessary utility programs for
+  # grohtml are available -- only then we can build the HTML documentation.
+! make_html=
+! make_install_html=
+  
+  # The configure script also checks whether all necessary utility programs
+  # for pdfroff are available -- only then we can build PDF documentation.
+***************
+*** 549,555 ****
+    contrib/pic2graph \
+    contrib/eqn2graph \
+    contrib/grap2graph \
+-   contrib/groffer \
+    contrib/mom \
+    contrib/pdfmark \
+    contrib/gdiffmk
+--- 549,554 ----
diff --git a/packages/groff/groff/Makefile.sub.patch b/packages/groff/groff/Makefile.sub.patch
new file mode 100644
index 0000000000..1b5a7dfac5
--- /dev/null
+++ b/packages/groff/groff/Makefile.sub.patch
@@ -0,0 +1,21 @@
+*** groff-1.19.2/src/include/Makefile.sub.orig	Thu Jun 23 13:27:53 2005
+--- groff-1.19.2/src/include/Makefile.sub	Sat Dec  3 18:35:40 2005
+***************
+*** 39,46 ****
+  	"DEVICE=\"$(DEVICE)\"" \
+  	"INSTALLPATH=\"$(prefix)\"" \
+  	"BINPATH=\"$(bindir)\"" \
+! 	"FONTPATH=\"$(fontpath)\"" \
+! 	"MACROPATH=\"$(tmacpath)\"" \
+  	"INDEX_SUFFIX=\"$(indexext)\"" \
+  	"COMMON_WORDS_FILE=\"$(common_words_file)\"" \
+  	"DEFAULT_INDEX_DIR=\"$(indexdir)\"" \
+--- 39,46 ----
+  	"DEVICE=\"$(DEVICE)\"" \
+  	"INSTALLPATH=\"$(prefix)\"" \
+  	"BINPATH=\"$(bindir)\"" \
+! 	"FONTPATH=\"/usr/share/groff/site-font:/usr/share/groff/1.19.2/font:/usr/lib/font\"" \
+! 	"MACROPATH=\"/usr/lib/groff/site-tmac:/usr/share/groff/site-tmac:/usr/share/groff/1.19.2/tmac\"" \
+  	"INDEX_SUFFIX=\"$(indexext)\"" \
+  	"COMMON_WORDS_FILE=\"$(common_words_file)\"" \
+  	"DEFAULT_INDEX_DIR=\"$(indexdir)\"" \
diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb
new file mode 100644
index 0000000000..7381bb3687
--- /dev/null
+++ b/packages/groff/groff_1.19.2.bb
@@ -0,0 +1,23 @@
+LICENSE = "GPL"
+SECTION = "base"
+DESCRIPTION = "GNU roff"
+RDEPENDS="libstdc++6"
+MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>"
+SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
+	           file://Makefile.in.patch;patch=1 \
+	           file://Makefile.sub.patch;patch=1 \
+	           file://groff.patch;patch=1"
+
+# prefix and exec-prefix are broken and the .in file is broken too 
+# and can't be autoreconf'ed, so specify every dir
+EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info"
+inherit autotools
+
+do_configure () {
+	oe_runconf
+}
+
+#do_install() {
+#	oe_runmake 'PREFIX=${D}' install
+#}
+