diff -uNr --exclude=CVS /usr/ports/print/htmldoc/Makefile htmldoc/Makefile
--- /usr/ports/print/htmldoc/Makefile	Mon Feb 21 21:24:52 2005
+++ htmldoc/Makefile	Fri Feb  3 10:38:59 2006
@@ -4,10 +4,13 @@
 
 V=			1.8.23
 DISTNAME=		htmldoc-${V}
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=     	print www
 
 HOMEPAGE=		http://www.easysw.com/htmldoc
 
+MAINTAINER=		Antoine Jacoutot <ajacoutot@lphp.org>
+
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -24,7 +27,7 @@
 
 LIB_DEPENDS=		fltk.1,fltk_images.1::x11/fltk
 
-CONFIGURE_STYLE=	gnu dest
+CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV= 		LDFLAGS="-L${LOCALBASE}/lib" \
 			CXXFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			CPPFLAGS="-I${LOCALBASE}/include"
diff -uNr --exclude=CVS /usr/ports/print/htmldoc/patches/patch-data_Makefile htmldoc/patches/patch-data_Makefile
--- /usr/ports/print/htmldoc/patches/patch-data_Makefile	Thu Jan  1 01:00:00 1970
+++ htmldoc/patches/patch-data_Makefile	Fri Feb  3 09:50:45 2006
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- data/Makefile.orig	Fri Feb  3 09:36:21 2006
++++ data/Makefile	Fri Feb  3 09:36:54 2006
+@@ -53,11 +53,11 @@ all:
+ #
+ 
+ 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 -uNr --exclude=CVS /usr/ports/print/htmldoc/patches/patch-doc_Makefile htmldoc/patches/patch-doc_Makefile
--- /usr/ports/print/htmldoc/patches/patch-doc_Makefile	Thu Jan  1 01:00:00 1970
+++ htmldoc/patches/patch-doc_Makefile	Fri Feb  3 09:50:45 2006
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- doc/Makefile.orig	Wed Jul 31 21:14:54 2002
++++ doc/Makefile	Fri Feb  3 09:42:23 2006
+@@ -56,16 +56,16 @@ all: $(DOCUMENTS)
+ #
+ 
+ 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 -uNr --exclude=CVS /usr/ports/print/htmldoc/patches/patch-fonts_Makefile htmldoc/patches/patch-fonts_Makefile
--- /usr/ports/print/htmldoc/patches/patch-fonts_Makefile	Thu Jan  1 01:00:00 1970
+++ htmldoc/patches/patch-fonts_Makefile	Fri Feb  3 09:50:45 2006
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- fonts/Makefile.orig	Fri Feb  3 09:34:38 2006
++++ fonts/Makefile	Fri Feb  3 09:35:13 2006
+@@ -62,14 +62,14 @@ all:
+ 
+ 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 -uNr --exclude=CVS /usr/ports/print/htmldoc/patches/patch-htmldoc_Makefile htmldoc/patches/patch-htmldoc_Makefile
--- /usr/ports/print/htmldoc/patches/patch-htmldoc_Makefile	Thu Jan  1 01:00:00 1970
+++ htmldoc/patches/patch-htmldoc_Makefile	Fri Feb  3 09:50:45 2006
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- htmldoc/Makefile.orig	Fri Feb  3 09:45:21 2006
++++ htmldoc/Makefile	Fri Feb  3 09:46:23 2006
+@@ -49,11 +49,11 @@ all:	htmldoc$(EXEEXT)
+ #
+ 
+ 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 -uNr --exclude=CVS /usr/ports/print/htmldoc/pkg/MESSAGE htmldoc/pkg/MESSAGE
--- /usr/ports/print/htmldoc/pkg/MESSAGE	Wed Oct 13 20:59:32 2004
+++ htmldoc/pkg/MESSAGE	Fri Feb  3 09:49:16 2006
@@ -1,8 +1,3 @@
-You will have to specify the datadir manually
-every time you use htmldoc.  Try:
-
-  htmldoc --datadir ${PREFIX}/share/htmldoc
-
 The full set of documentation is available online:
 
   ${HOMEPAGE}/htmldoc.html