All of lore.kernel.org
 help / color / mirror / Atom feed
* htmldoc 1.8.27
@ 2008-11-05 23:40 Vitus Jensen
  2008-11-06  2:33 ` Chris Larson
  0 siblings, 1 reply; 5+ messages in thread
From: Vitus Jensen @ 2008-11-05 23:40 UTC (permalink / raw)
  To: Openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

Hej!

I need htmldoc for ARM and as this isn't available in OpenEmbedded I cooked 
up my own receipt.  But htmldoc has some specialities:

- it does build it's own documentation by using the generated excutable
- it contains an optional GUI component
- there are defines in config.h.in not duplicated in configure.in

I guess the complete solution would be several receipts 
(-native, -doc, -console, -gui), right?  But as I want it for a NAS would 
the attached console-type receipt be enough?  Also, is moving defines from 
config.h.in to configure.in by a patch correct?  It looks wrong (if one 
thinks of using the same receipt for a newer version).

Please comment.
   Vitus

-- 
Vitus Jensen, Hannover, Germany, Earth, Milkyway, Universe (current)

[-- Attachment #2: htmldoc.patch --]
[-- Type: text/x-diff, Size: 3858 bytes --]

commit c1faac87839a6bf1885ce0bdaf67d7a28223d608
Author: Vitus Jensen <vjensen@gmx.de>
Date:   Tue Nov 4 00:50:51 2008 +0100

    htmldoc 1.8.27: new recipe
    
    HTMLDOC converts HTML input files into indexed HTML, postscript or PDF
    files.  This receipe builds the non-gui components of htmldoc.

diff --git a/packages/htmldoc/files/limits.patch b/packages/htmldoc/files/limits.patch
new file mode 100644
index 0000000..3a205ce
--- /dev/null
+++ b/packages/htmldoc/files/limits.patch
@@ -0,0 +1,46 @@
+diff -Naur htmldoc-1.8.27.org/configure.in htmldoc-1.8.27.mod/configure.in
+--- htmldoc-1.8.27.org/configure.in	2006-08-02 21:36:53.000000000 +0200
++++ htmldoc-1.8.27.mod/configure.in	2008-11-03 10:47:24.000000000 +0100
+@@ -31,7 +31,18 @@
+ NVERSION=10802600
+ AC_SUBST(SVERSION)
+ AC_SUBST(NVERSION)
+-AC_DEFINE_UNQUOTED(SVERSION, "$SVERSION")
++AC_DEFINE_UNQUOTED(SVERSION, "$SVERSION", "program version")
++
++dnl Define progra limits...
++AC_DEFINE(MAX_CHAPTERS, 1000, "Maximum number of chapters or files")
++AC_DEFINE(MAX_COLUMNS, 200, "Maximum number of columns in a table")
++AC_DEFINE(MAX_HF_IMAGES, 10, "Maximum number of header/footer images")
++AC_DEFINE(ALLOC_FILES, 10, "Temporary/image files")
++AC_DEFINE(ALLOC_HEADINGS, 50, "Headings")
++AC_DEFINE(ALLOC_LINKS, 100, "Web links")
++AC_DEFINE(ALLOC_OBJECTS, 100, "PDF objects")
++AC_DEFINE(ALLOC_PAGES, 10, "PS/PDF pages")
++AC_DEFINE(ALLOC_ROWS, 20, "Table rows")
+ 
+ dnl Get the operating system and version number...
+ 
+@@ -145,6 +156,11 @@
+ 
+ if test $ac_cv_c_long_long = yes; then
+ 	AC_DEFINE(HAVE_LONG_LONG)
++	AC_DEFINE(HTMLDOC_LLFMT, "%lld", "printf_longlong")
++	AC_DEFINE(HTMLDOC_LLCAST, (long long), "cast_longlong")
++else
++	AC_DEFINE(HTMLDOC_LLFMT, "%ld", "printf_longlong")
++	AC_DEFINE(HTMLDOC_LLCAST, (long), "cast_longlong")
+ fi
+ 
+ AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
+@@ -316,8 +332,8 @@
+     bindir="$exec_prefix/bin"
+ fi
+ 
+-AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc")
+-AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc")
++AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc", "Locations of files...")
++AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc", "Locations of files...")
+ 
+ dnl Update compiler options...
+ if test -n "$GXX"; then
diff --git a/packages/htmldoc/htmldoc_1.8.27.bb b/packages/htmldoc/htmldoc_1.8.27.bb
new file mode 100644
index 0000000..72168fc
--- /dev/null
+++ b/packages/htmldoc/htmldoc_1.8.27.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "HTMLDOC converts HTML input files into indexed HTML, postscript or PDF files"
+HOMEPAGE = "http://www.htmldoc.org/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl libpng jpeg zlib"
+#	GUI: fltk
+PR = "r1"
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
+	file://limits.patch;patch=1"
+
+
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+# if something isn't collected from staging:
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+FILES_${PN} += "${datadir}/doc/htmldoc"
+
+do_compile() {
+	cd htmldoc && oe_runmake all ; cd ${S}
+}
+
+do_install() {
+	install -d ${D}${datadir}/htmldoc/fonts
+	install -m 0644 ${S}/fonts/*.afm ${D}${datadir}/htmldoc/fonts/
+	install -m 0644 ${S}/fonts/*.pfa ${D}${datadir}/htmldoc/fonts/
+
+	install -d ${D}${datadir}/htmldoc/data
+	install -m 0644 ${S}/data/* ${D}${datadir}/htmldoc/data/
+
+	install -d ${D}${mandir}/man1
+	install -m 0644 ${S}/doc/htmldoc.man ${D}${mandir}/man1/
+
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/htmldoc/htmldoc ${D}${bindir}/
+}

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: htmldoc 1.8.27
  2008-11-05 23:40 htmldoc 1.8.27 Vitus Jensen
@ 2008-11-06  2:33 ` Chris Larson
  2008-11-07 10:18   ` Vitus Jensen
  0 siblings, 1 reply; 5+ messages in thread
From: Chris Larson @ 2008-11-06  2:33 UTC (permalink / raw)
  To: openembedded-devel

On Wed, Nov 5, 2008 at 4:40 PM, Vitus Jensen <vjensen@gmx.de> wrote:
> I need htmldoc for ARM and as this isn't available in OpenEmbedded I cooked
> up my own receipt.  But htmldoc has some specialities:
>
> - it does build it's own documentation by using the generated excutable

Build a -native and use that to build the main package.

> - it contains an optional GUI component
> - there are defines in config.h.in not duplicated in configure.in

configure.in does not replace config.h.in.  config.h.in is either
hardcoded, as in old buildsystems, or is generated by autoheader.
Then the configure script, as generated from the configure.{in,ac}
does its substitutions to generate config.h from config.h.in.

> I guess the complete solution would be several receipts
> (-native, -doc, -console, -gui), right?  But as I want it for a NAS would
> the attached console-type receipt be enough?

Two recipes, one with gui and one without, is probably best, to avoid
building any gui deps for distros that don't need it.
-- 
Chris Larson
clarson at kergoth dot com
clarson at mvista dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Software Engineer
MontaVista Software, Inc.



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: htmldoc 1.8.27
  2008-11-06  2:33 ` Chris Larson
@ 2008-11-07 10:18   ` Vitus Jensen
  2008-11-18  9:03     ` Vitus Jensen
  0 siblings, 1 reply; 5+ messages in thread
From: Vitus Jensen @ 2008-11-07 10:18 UTC (permalink / raw)
  To: openembedded-devel

Am Wed, 05 Nov 2008 19:33:01 -0700 schrieb Chris Larson:

> On Wed, Nov 5, 2008 at 4:40 PM, Vitus Jensen <vjensen@gmx.de> wrote:
>> I need htmldoc for ARM and as this isn't available in OpenEmbedded I
>> cooked up my own receipt.  But htmldoc has some specialities:
>>
>> - it does build it's own documentation by using the generated excutable
> 
> Build a -native and use that to build the main package.

Just to build the documentation as HTML, PDF and PS?  I seriously doubt 
that anyone wants to install this big thing to his device but you're 
probably right, one never knows.


>> - it contains an optional GUI component
>> - there are defines in config.h.in not duplicated
>>   in configure.in
> 
> configure.in does not replace config.h.in.  config.h.in is either
> hardcoded, as in old buildsystems, or is generated by autoheader.

Thank you for your hint.  I have now found 
EXTRA_AUTORECONF += "--exclude=autoheader"

to disable autoheader.  The ugly patch is gone.


>> I guess the complete solution would be several receipts (-native, -doc,
>> -console, -gui), right?  But as I want it for a NAS would the attached
>> console-type receipt be enough?
> 
> Two recipes, one with gui and one without, is probably best, to avoid
> building any gui deps for distros that don't need it.

And the documentation in HTML, PS and PDF would go to a -doc.ipk by means 
of some FILES_xxx variable?

I will do this for 1.9.x-r1571.

BTW: htmldoc.org uses a mirror select mechanismen for downloads (http://
www.htmldoc.org/software.php?VERSION=1.9.x-r1586&FILE=htmldoc/snapshots/
htmldoc-1.9.x-r1586.tar.bz2), I have hardcoded one mirror in my receipt.  
Is there a better way?

By[t]e,
   Vitus

-- 
Vitus Jensen, Hannover, Germany, Earth, Milky Way, Universe (current)




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: htmldoc 1.8.27
  2008-11-07 10:18   ` Vitus Jensen
@ 2008-11-18  9:03     ` Vitus Jensen
  2009-03-23 23:56       ` [PATCH] htmldoc: new recipes Vitus Jensen
  0 siblings, 1 reply; 5+ messages in thread
From: Vitus Jensen @ 2008-11-18  9:03 UTC (permalink / raw)
  To: openembedded-devel

Am Fri, 07 Nov 2008 10:18:45 +0000 schrieb Vitus Jensen:

> Am Wed, 05 Nov 2008 19:33:01 -0700 schrieb Chris Larson:
> 
>> On Wed, Nov 5, 2008 at 4:40 PM, Vitus Jensen <vjensen@gmx.de> wrote:
>>> I need htmldoc for ARM and as this isn't available in OpenEmbedded I
>>> cooked up my own receipt.  But htmldoc has some specialities:
...
>>> I guess the complete solution would be several receipts (-native,
>>> -doc, -console, -gui), right?  But as I want it for a NAS would the
>>> attached console-type receipt be enough?
>> 
>> Two recipes, one with gui and one without, is probably best, to avoid
>> building any gui deps for distros that don't need it.
> 
> And the documentation in HTML, PS and PDF would go to a -doc.ipk by
> means of some FILES_xxx variable?
> 
> I will do this for 1.9.x-r1571.
...

See below for receipes to build htmldoc 1.9.x-r1571 as gui
and non-gui versions.  Documentation as PDF is included in -doc packages.

Enjoy!
   Vitus

---
diff --git a/packages/htmldoc/files/paths.patch b/packages/htmldoc/files/paths.patch
new file mode 100644
index 0000000..f05e405
--- /dev/null
+++ b/packages/htmldoc/files/paths.patch
@@ -0,0 +1,109 @@
+diff -Naur a/data/Makefile b/data/Makefile
+--- a/data/Makefile	2008-01-06 02:55:59.000000000 +0100
++++ b/data/Makefile	2008-11-16 20:02:56.000000000 +0100
+@@ -51,11 +51,11 @@
+ #
+ 
+ install:
+-	if [ ! -d $(datadir)/htmldoc/data ]; then\
+-		$(MKDIR) $(datadir)/htmldoc/data;\
++	if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
+ 	fi
+-	$(CP) $(FILES) $(datadir)/htmldoc/data
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/data/*
++	$(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
+ 
+ 
+ #
+diff -Naur a/doc/Makefile b/doc/Makefile
+--- a/doc/Makefile	2008-01-06 02:55:59.000000000 +0100
++++ b/doc/Makefile	2008-11-16 20:04:06.000000000 +0100
+@@ -57,7 +57,7 @@
+ DOCUMENTS =	htmldoc.html htmldoc.pdf htmldoc.ps
+ DOCFILES =	htmldoc.pdf
+ 
+-HTMLDOC	=	HTMLDOC_DATA=".." ../htmldoc/htmldoc$(EXEEXT) --strict --verbose
++HTMLDOC	=	HTMLDOC_DATA=".." htmldoc$(EXEEXT) --strict --verbose
+ 
+ 
+ #
+@@ -72,16 +72,16 @@
+ #
+ 
+ install: $(DOCUMENTS)
+-	if [ ! -d $(datadir)/doc/htmldoc ]; then\
+-		$(MKDIR) $(datadir)/doc/htmldoc;\
++	if [ ! -d $(DESTDIR)$(datadir)/doc/htmldoc ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\
+ 	fi
+-	$(CP) $(DOCFILES) $(datadir)/doc/htmldoc
+-	$(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
+-	if [ ! -d $(mandir)/man1 ]; then\
+-		$(MKDIR) $(mandir)/man1;\
++	$(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/*
++	if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\
++		$(MKDIR) $(DESTDIR)$(mandir)/man1;\
+ 	fi
+-	$(CP) htmldoc.man $(mandir)/man1/htmldoc.1
+-	$(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
++	$(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1
++	$(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1
+ 
+ 
+ #
+diff -Naur a/fonts/Makefile b/fonts/Makefile
+--- a/fonts/Makefile	2008-01-06 02:55:59.000000000 +0100
++++ b/fonts/Makefile	2008-11-16 20:04:08.000000000 +0100
+@@ -73,14 +73,14 @@
+ 
+ install:
+ 	echo "Installing font files in $(datadir)/htmldoc/fonts..."
+-	if test ! -d $(datadir)/htmldoc/fonts; then\
+-		$(MKDIR) $(datadir)/htmldoc/fonts;\
++	if test ! -d $(DESTDIR)$(datadir)/htmldoc/fonts; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\
+ 	fi
+ 	for font in $(FONTS); do \
+-		$(CP) $$font.afm $(datadir)/htmldoc/fonts; \
+-		$(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
++		$(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \
++		$(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \
+ 	done
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/*
+ 
+ 
+ #
+diff -Naur a/htmldoc/Makefile b/htmldoc/Makefile
+--- a/htmldoc/Makefile	2008-03-01 19:18:52.000000000 +0100
++++ b/htmldoc/Makefile	2008-11-16 20:05:12.000000000 +0100
+@@ -104,11 +104,11 @@
+ #
+ 
+ install:	all
+-	if [ ! -d $(bindir) ]; then\
+-		$(MKDIR) $(bindir);\
++	if [ ! -d $(DESTDIR)$(bindir) ]; then\
++		$(MKDIR) $(DESTDIR)$(bindir);\
+ 	fi
+-	cp htmldoc$(EXEEXT) $(bindir)
+-	chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
++	cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir)
++	chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT)
+ 
+ 
+ #
+diff -Naur a/Makedefs.in b/Makedefs.in
+--- a/Makedefs.in	2008-03-01 19:18:52.000000000 +0100
++++ b/Makedefs.in	2008-11-16 20:00:34.000000000 +0100
+@@ -45,6 +45,7 @@
+ #
+ # Directories...
+ #
++DESTDIR = @DESTDIR@
+ 
+ bindir		=	@bindir@
+ datadir		=	@datadir@
diff --git a/packages/htmldoc/htmldoc-native_1.9.x-r1571.bb b/packages/htmldoc/htmldoc-native_1.9.x-r1571.bb
new file mode 100644
index 0000000..842af79
--- /dev/null
+++ b/packages/htmldoc/htmldoc-native_1.9.x-r1571.bb
@@ -0,0 +1,29 @@
+require htmldoc.inc
+PR = "r1"
+
+inherit autotools native
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+
+do_compile() {
+	cd htmldoc && oe_runmake all ; cd ${S}
+}
+
+
+do_stage () {
+	install -d ${STAGING_DATADIR}/htmldoc/fonts
+	install -m 0644 ${S}/fonts/*.afm ${STAGING_DATADIR}/htmldoc/fonts/
+	install -m 0644 ${S}/fonts/*.pfa ${STAGING_DATADIR}/htmldoc/fonts/
+
+	install -d ${STAGING_DATADIR}/htmldoc/data
+	install -m 0644 ${S}/data/* ${STAGING_DATADIR}/htmldoc/data/
+
+	install -d ${STAGING_DIR_HOST}${layout_mandir}/man1
+	install -m 0644 ${S}/doc/htmldoc.man ${STAGING_DIR_HOST}${layout_mandir}/man1/
+
+	install -d ${STAGING_BINDIR}
+	install -m 0755 ${S}/htmldoc/htmldoc ${STAGING_BINDIR}/
+}
diff --git a/packages/htmldoc/htmldoc.inc b/packages/htmldoc/htmldoc.inc
new file mode 100644
index 0000000..b0da406
--- /dev/null
+++ b/packages/htmldoc/htmldoc.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "HTMLDOC converts HTML input files into indexed HTML, postscript or PDF files"
+HOMEPAGE = "http://www.htmldoc.org/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl libpng jpeg zlib"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
+file://paths.patch;patch=1"
diff --git a/packages/htmldoc/htmldoc_1.9.x-r1571.bb b/packages/htmldoc/htmldoc_1.9.x-r1571.bb
new file mode 100644
index 0000000..ce781d3
--- /dev/null
+++ b/packages/htmldoc/htmldoc_1.9.x-r1571.bb
@@ -0,0 +1,18 @@
+require htmldoc.inc
+DEPENDS += "htmldoc-native"
+PR = "r1"
+
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}



-- 
Vitus Jensen, Hannover, Germany, Earth, Milky Way, Universe (current)




^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH] htmldoc: new recipes
  2008-11-18  9:03     ` Vitus Jensen
@ 2009-03-23 23:56       ` Vitus Jensen
  0 siblings, 0 replies; 5+ messages in thread
From: Vitus Jensen @ 2009-03-23 23:56 UTC (permalink / raw)
  To: openembedded-devel

HTMLDOC converts HTML input files into indexed HTML, postscript
or PDF files.  These recipes build version 1.8.27 and 1.9.x-r1571
of htmldoc.

Updated version creating -doc and -gui packages for 1.8.27, too.

Signed-off-by: Vitus Jensen <vjensen@gmx.de>
---
 conf/checksums.ini                            |    8 ++
 recipes/htmldoc/files/paths_1.8.27.patch      |  109 +++++++++++++++++++++++++
 recipes/htmldoc/files/paths_1.9.x.patch       |  109 +++++++++++++++++++++++++
 recipes/htmldoc/htmldoc-gui_1.8.27.bb         |   24 ++++++
 recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb    |   24 ++++++
 recipes/htmldoc/htmldoc-native_1.8.27.bb      |   34 ++++++++
 recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb |   34 ++++++++
 recipes/htmldoc/htmldoc.inc                   |    6 ++
 recipes/htmldoc/htmldoc_1.8.27.bb             |   22 +++++
 recipes/htmldoc/htmldoc_1.9.x-r1571.bb        |   22 +++++
 10 files changed, 392 insertions(+), 0 deletions(-)
 create mode 100644 recipes/htmldoc/files/paths_1.8.27.patch
 create mode 100644 recipes/htmldoc/files/paths_1.9.x.patch
 create mode 100644 recipes/htmldoc/htmldoc-gui_1.8.27.bb
 create mode 100644 recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
 create mode 100644 recipes/htmldoc/htmldoc-native_1.8.27.bb
 create mode 100644 recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
 create mode 100644 recipes/htmldoc/htmldoc.inc
 create mode 100644 recipes/htmldoc/htmldoc_1.8.27.bb
 create mode 100644 recipes/htmldoc/htmldoc_1.9.x-r1571.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9142329..81651b4 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -10126,6 +10126,14 @@ sha256=acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586
 md5=1713d9a4941120235cb0721ceba6493b
 sha256=acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586

+[http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2]
+md5=35589e7b8fe9c54e11be87cd5aec4dcc
+sha256=89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613
+
+[http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-1.9.x-r1571.tar.bz2]
+md5=eda75ba1abe14ed8e71c6f40438def85
+sha256=b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e
+
 [http://downloads.sourceforge.net/htop/htop-0.7.tar.gz]
 md5=4afc961fa709167e1b434682897991f9
 sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
diff --git a/recipes/htmldoc/files/paths_1.8.27.patch b/recipes/htmldoc/files/paths_1.8.27.patch
new file mode 100644
index 0000000..96cfde6
--- /dev/null
+++ b/recipes/htmldoc/files/paths_1.8.27.patch
@@ -0,0 +1,109 @@
+diff -Naur a/Makedefs.in b/Makedefs.in
+--- a/Makedefs.in	2005-10-28 22:32:59.000000000 +0200
++++ b/Makedefs.in	2009-03-23 23:40:35.928865178 +0100
+@@ -46,6 +46,7 @@
+ #
+ # Directories...
+ #
++DESTDIR = @DESTDIR@
+ 
+ bindir		=	@bindir@
+ datadir		=	@datadir@
+diff -Naur a/data/Makefile b/data/Makefile
+--- a/data/Makefile	2004-05-10 03:14:53.000000000 +0200
++++ b/data/Makefile	2009-03-23 23:35:27.850856359 +0100
+@@ -53,11 +53,11 @@
+ #
+ 
+ install:
+-	if [ ! -d $(datadir)/htmldoc/data ]; then\
+-		$(MKDIR) $(datadir)/htmldoc/data;\
++	if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
+ 	fi
+-	$(CP) $(FILES) $(datadir)/htmldoc/data
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/data/*
++	$(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
+ 
+ 
+ #
+diff -Naur a/doc/Makefile b/doc/Makefile
+--- a/doc/Makefile	2005-10-28 22:32:59.000000000 +0200
++++ b/doc/Makefile	2009-03-23 23:38:19.478865122 +0100
+@@ -42,7 +42,7 @@
+ DOCUMENTS =	htmldoc.html htmldoc.pdf htmldoc.ps
+ DOCFILES =	help.html htmldoc.pdf
+ 
+-HTMLDOC	=	../htmldoc/htmldoc$(EXEEXT) --datadir .. --strict --verbose
++HTMLDOC	=	htmldoc$(EXEEXT) --datadir .. --strict --verbose
+ 
+ 
+ #
+@@ -57,16 +57,16 @@
+ #
+ 
+ install: $(DOCUMENTS)
+-	if [ ! -d $(datadir)/doc/htmldoc ]; then\
+-		$(MKDIR) $(datadir)/doc/htmldoc;\
++	if [ ! -d $(DESTDIR)$(datadir)/doc/htmldoc ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\
+ 	fi
+-	$(CP) $(DOCFILES) $(datadir)/doc/htmldoc
+-	$(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
+-	if [ ! -d $(mandir)/man1 ]; then\
+-		$(MKDIR) $(mandir)/man1;\
++	$(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/*
++	if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\
++		$(MKDIR) $(DESTDIR)$(mandir)/man1;\
+ 	fi
+-	$(CP) htmldoc.man $(mandir)/man1/htmldoc.1
+-	$(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
++	$(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1
++	$(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1
+ 
+ 
+ #
+diff -Naur a/fonts/Makefile b/fonts/Makefile
+--- a/fonts/Makefile	2005-10-28 22:32:59.000000000 +0200
++++ b/fonts/Makefile	2009-03-23 23:39:07.608863524 +0100
+@@ -75,14 +75,14 @@
+ 
+ install:
+ 	echo "Installing font files in $(datadir)/htmldoc/fonts..."
+-	if [ ! -d $(datadir)/htmldoc/fonts ]; then\
+-		$(MKDIR) $(datadir)/htmldoc/fonts;\
++	if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\
+ 	fi
+ 	for font in $(FONTS); do \
+-		$(CP) $$font.afm $(datadir)/htmldoc/fonts; \
+-		$(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
++		$(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \
++		$(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \
+ 	done
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/*
+ 
+ 
+ #
+diff -Naur a/htmldoc/Makefile b/htmldoc/Makefile
+--- a/htmldoc/Makefile	2005-10-28 22:32:59.000000000 +0200
++++ b/htmldoc/Makefile	2009-03-23 23:40:02.078914179 +0100
+@@ -50,11 +50,11 @@
+ #
+ 
+ install:	all
+-	if [ ! -d $(bindir) ]; then\
+-		$(MKDIR) $(bindir);\
++	if [ ! -d $(DESTDIR)$(bindir) ]; then\
++		$(MKDIR) $(DESTDIR)$(bindir);\
+ 	fi
+-	cp htmldoc$(EXEEXT) $(bindir)
+-	chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
++	cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir)
++	chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT)
+ 
+ 
+ #
diff --git a/recipes/htmldoc/files/paths_1.9.x.patch b/recipes/htmldoc/files/paths_1.9.x.patch
new file mode 100644
index 0000000..f05e405
--- /dev/null
+++ b/recipes/htmldoc/files/paths_1.9.x.patch
@@ -0,0 +1,109 @@
+diff -Naur a/data/Makefile b/data/Makefile
+--- a/data/Makefile	2008-01-06 02:55:59.000000000 +0100
++++ b/data/Makefile	2008-11-16 20:02:56.000000000 +0100
+@@ -51,11 +51,11 @@
+ #
+ 
+ install:
+-	if [ ! -d $(datadir)/htmldoc/data ]; then\
+-		$(MKDIR) $(datadir)/htmldoc/data;\
++	if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
+ 	fi
+-	$(CP) $(FILES) $(datadir)/htmldoc/data
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/data/*
++	$(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
+ 
+ 
+ #
+diff -Naur a/doc/Makefile b/doc/Makefile
+--- a/doc/Makefile	2008-01-06 02:55:59.000000000 +0100
++++ b/doc/Makefile	2008-11-16 20:04:06.000000000 +0100
+@@ -57,7 +57,7 @@
+ DOCUMENTS =	htmldoc.html htmldoc.pdf htmldoc.ps
+ DOCFILES =	htmldoc.pdf
+ 
+-HTMLDOC	=	HTMLDOC_DATA=".." ../htmldoc/htmldoc$(EXEEXT) --strict --verbose
++HTMLDOC	=	HTMLDOC_DATA=".." htmldoc$(EXEEXT) --strict --verbose
+ 
+ 
+ #
+@@ -72,16 +72,16 @@
+ #
+ 
+ install: $(DOCUMENTS)
+-	if [ ! -d $(datadir)/doc/htmldoc ]; then\
+-		$(MKDIR) $(datadir)/doc/htmldoc;\
++	if [ ! -d $(DESTDIR)$(datadir)/doc/htmldoc ]; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\
+ 	fi
+-	$(CP) $(DOCFILES) $(datadir)/doc/htmldoc
+-	$(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
+-	if [ ! -d $(mandir)/man1 ]; then\
+-		$(MKDIR) $(mandir)/man1;\
++	$(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/*
++	if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\
++		$(MKDIR) $(DESTDIR)$(mandir)/man1;\
+ 	fi
+-	$(CP) htmldoc.man $(mandir)/man1/htmldoc.1
+-	$(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
++	$(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1
++	$(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1
+ 
+ 
+ #
+diff -Naur a/fonts/Makefile b/fonts/Makefile
+--- a/fonts/Makefile	2008-01-06 02:55:59.000000000 +0100
++++ b/fonts/Makefile	2008-11-16 20:04:08.000000000 +0100
+@@ -73,14 +73,14 @@
+ 
+ install:
+ 	echo "Installing font files in $(datadir)/htmldoc/fonts..."
+-	if test ! -d $(datadir)/htmldoc/fonts; then\
+-		$(MKDIR) $(datadir)/htmldoc/fonts;\
++	if test ! -d $(DESTDIR)$(datadir)/htmldoc/fonts; then\
++		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\
+ 	fi
+ 	for font in $(FONTS); do \
+-		$(CP) $$font.afm $(datadir)/htmldoc/fonts; \
+-		$(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
++		$(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \
++		$(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \
+ 	done
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
++	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/*
+ 
+ 
+ #
+diff -Naur a/htmldoc/Makefile b/htmldoc/Makefile
+--- a/htmldoc/Makefile	2008-03-01 19:18:52.000000000 +0100
++++ b/htmldoc/Makefile	2008-11-16 20:05:12.000000000 +0100
+@@ -104,11 +104,11 @@
+ #
+ 
+ install:	all
+-	if [ ! -d $(bindir) ]; then\
+-		$(MKDIR) $(bindir);\
++	if [ ! -d $(DESTDIR)$(bindir) ]; then\
++		$(MKDIR) $(DESTDIR)$(bindir);\
+ 	fi
+-	cp htmldoc$(EXEEXT) $(bindir)
+-	chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
++	cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir)
++	chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT)
+ 
+ 
+ #
+diff -Naur a/Makedefs.in b/Makedefs.in
+--- a/Makedefs.in	2008-03-01 19:18:52.000000000 +0100
++++ b/Makedefs.in	2008-11-16 20:00:34.000000000 +0100
+@@ -45,6 +45,7 @@
+ #
+ # Directories...
+ #
++DESTDIR = @DESTDIR@
+ 
+ bindir		=	@bindir@
+ datadir		=	@datadir@
diff --git a/recipes/htmldoc/htmldoc-gui_1.8.27.bb b/recipes/htmldoc/htmldoc-gui_1.8.27.bb
new file mode 100644
index 0000000..339c484
--- /dev/null
+++ b/recipes/htmldoc/htmldoc-gui_1.8.27.bb
@@ -0,0 +1,24 @@
+require htmldoc.inc
+DEPENDS += "htmldoc-native fltk"
+PR = "r2"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
+file://paths_1.8.27.patch;patch=1"
+
+
+S = "${WORKDIR}/htmldoc-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=yes"
+
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
new file mode 100644
index 0000000..f2315c5
--- /dev/null
+++ b/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
@@ -0,0 +1,24 @@
+require htmldoc.inc
+DEPENDS += "htmldoc-native fltk"
+PR = "r2"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
+file://paths_1.9.x.patch;patch=1"
+
+
+S = "${WORKDIR}/htmldoc-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=yes"
+
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/recipes/htmldoc/htmldoc-native_1.8.27.bb b/recipes/htmldoc/htmldoc-native_1.8.27.bb
new file mode 100644
index 0000000..b1cd62f
--- /dev/null
+++ b/recipes/htmldoc/htmldoc-native_1.8.27.bb
@@ -0,0 +1,34 @@
+require htmldoc.inc
+PR = "r2"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
+file://paths_1.8.27.patch;patch=1"
+
+
+inherit autotools native
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+
+do_compile() {
+	cd htmldoc && oe_runmake all ; cd ${S}
+}
+
+
+do_stage () {
+	install -d ${STAGING_DATADIR}/htmldoc/fonts
+	install -m 0644 ${S}/fonts/*.afm ${STAGING_DATADIR}/htmldoc/fonts/
+	install -m 0644 ${S}/fonts/*.pfa ${STAGING_DATADIR}/htmldoc/fonts/
+
+	install -d ${STAGING_DATADIR}/htmldoc/data
+	install -m 0644 ${S}/data/* ${STAGING_DATADIR}/htmldoc/data/
+
+	install -d ${STAGING_DIR_HOST}${layout_mandir}/man1
+	install -m 0644 ${S}/doc/htmldoc.man ${STAGING_DIR_HOST}${layout_mandir}/man1/
+
+	install -d ${STAGING_BINDIR}
+	install -m 0755 ${S}/htmldoc/htmldoc ${STAGING_BINDIR}/
+}
diff --git a/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
new file mode 100644
index 0000000..ee2ffd9
--- /dev/null
+++ b/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
@@ -0,0 +1,34 @@
+require htmldoc.inc
+PR = "r2"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
+file://paths_1.9.x.patch;patch=1"
+
+
+inherit autotools native
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+
+do_compile() {
+	cd htmldoc && oe_runmake all ; cd ${S}
+}
+
+
+do_stage () {
+	install -d ${STAGING_DATADIR}/htmldoc/fonts
+	install -m 0644 ${S}/fonts/*.afm ${STAGING_DATADIR}/htmldoc/fonts/
+	install -m 0644 ${S}/fonts/*.pfa ${STAGING_DATADIR}/htmldoc/fonts/
+
+	install -d ${STAGING_DATADIR}/htmldoc/data
+	install -m 0644 ${S}/data/* ${STAGING_DATADIR}/htmldoc/data/
+
+	install -d ${STAGING_DIR_HOST}${layout_mandir}/man1
+	install -m 0644 ${S}/doc/htmldoc.man ${STAGING_DIR_HOST}${layout_mandir}/man1/
+
+	install -d ${STAGING_BINDIR}
+	install -m 0755 ${S}/htmldoc/htmldoc ${STAGING_BINDIR}/
+}
diff --git a/recipes/htmldoc/htmldoc.inc b/recipes/htmldoc/htmldoc.inc
new file mode 100644
index 0000000..0a9a540
--- /dev/null
+++ b/recipes/htmldoc/htmldoc.inc
@@ -0,0 +1,6 @@
+DESCRIPTION = "HTMLDOC converts HTML input files into indexed HTML, postscript or PDF files"
+HOMEPAGE = "http://www.htmldoc.org/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl libpng jpeg zlib"
diff --git a/recipes/htmldoc/htmldoc_1.8.27.bb b/recipes/htmldoc/htmldoc_1.8.27.bb
new file mode 100644
index 0000000..d211c76
--- /dev/null
+++ b/recipes/htmldoc/htmldoc_1.8.27.bb
@@ -0,0 +1,22 @@
+require htmldoc.inc
+DEPENDS += "htmldoc-native"
+PR = "r2"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
+file://paths_1.8.27.patch;patch=1"
+
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/recipes/htmldoc/htmldoc_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
new file mode 100644
index 0000000..fe78fb4
--- /dev/null
+++ b/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
@@ -0,0 +1,22 @@
+require htmldoc.inc
+DEPENDS += "htmldoc-native"
+PR = "r2"
+
+
+SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
+file://paths_1.9.x.patch;patch=1"
+
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+		--with-gui=no"
+
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
-- 
1.6.0.6


-- 
Vitus Jensen, Hannover, Germany, Universe (current)
pgp public key available from keyservers



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-03-23 23:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-05 23:40 htmldoc 1.8.27 Vitus Jensen
2008-11-06  2:33 ` Chris Larson
2008-11-07 10:18   ` Vitus Jensen
2008-11-18  9:03     ` Vitus Jensen
2009-03-23 23:56       ` [PATCH] htmldoc: new recipes Vitus Jensen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.