3 files changed, 14 insertions, 115 deletions

diff --git a/misc/documancer/Makefile b/misc/documancer/Makefile
index 60f235fee1dc..d35572d777a1 100644
--- a/misc/documancer/Makefile
+++ b/misc/documancer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	documancer
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,6 +26,12 @@ USE_PYTHON=	2.3
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
-MAKE_ENV=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
+
+PLIST_FILES=	bin/documancer
+
+post-install:
+	@${FIND} ${DATADIR} -type f | ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/misc/documancer/files/patch-Makefile.in b/misc/documancer/files/patch-Makefile.in
index 2346dd551f6e..eee739714d83 100644
--- a/misc/documancer/files/patch-Makefile.in
+++ b/misc/documancer/files/patch-Makefile.in
@@ -1,25 +1,6 @@
---- Makefile.in.orig	Sat Jan 31 03:56:14 2004
-+++ Makefile.in	Mon Feb  2 15:41:16 2004
-@@ -57,34 +57,37 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/data
--	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/gui
-+	$(INSTALL_DIR) $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/gui
- 	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/helpers
- 	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/helpers/man2html
- 	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/helpers/info2html
--	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/providers
--	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/providers/html
--	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/providers/info
--	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/providers/man
--	$(INSTALL_DIR) $(DESTDIR)$(pkglibdir)/providers/pythondoc
-+	$(INSTALL_DIR) $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/providers
-+	$(INSTALL_DIR) $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/providers/html
-+	$(INSTALL_DIR) $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/providers/info
-+	$(INSTALL_DIR) $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/providers/man
-+	$(INSTALL_DIR) $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/providers/pythondoc
- 
+--- Makefile.in.orig	Thu Feb  5 09:16:01 2004
++++ Makefile.in	Thu Feb  5 09:18:04 2004
+@@ -70,18 +70,21 @@
  	# Install man2html:
  	$(INSTALL_PROG) src/helpers/man2html/man2html $(DESTDIR)$(pkglibdir)/helpers/man2html
  	$(INSTALL_PROG) $(srcdir)/src/helpers/man2html/man2html.cgi $(DESTDIR)$(pkglibdir)/helpers/man2html
@@ -35,27 +16,14 @@
  
  	# Install the app:
 -	(cd $(srcdir)/src ; for i in `find -name '*.py'` ; do $(INSTALL_DATA) $$i $(DESTDIR)$(pkglibdir)/`dirname $$i` ; done)
-+	(cd $(srcdir)/src ; for i in `find * -name '*.py'` ; do $(INSTALL_DATA) $$i $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/`dirname $$i` ; done)
++	(cd $(srcdir)/src ; for i in `find * -name '*.py'` ; do $(INSTALL_DATA) $$i $(DESTDIR)$(pkglibdir)/`dirname $$i` ; done)
  
  	# Rewrite python location in documancer.py:
 -	sed -e 's,#!/usr/bin/env python,#!/usr/bin/env $(PYTHON),g' \
 -		$(srcdir)/src/documancer.py >$(DESTDIR)$(pkglibdir)/documancer.py
 +#	sed -e 's,#!/usr/bin/env python,#!/usr/bin/env $(PYTHON),g' \
 +#		$(srcdir)/src/documancer.py >$(DESTDIR)$(pkglibdir)/documancer.py
-+	$(INSTALL_DATA) $(srcdir)/src/documancer.py $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer
- 
- 	
--	chmod +x $(DESTDIR)$(pkglibdir)/documancer.py
-+	chmod +x $(DESTDIR)$(PYTHON_SITELIBDIR)/documancer/documancer.py
++	$(INSTALL_DATA) $(srcdir)/src/documancer.py $(DESTDIR)$(pkglibdir)
  
- 	# Install data files:
- 	$(INSTALL_DATA) $(srcdir)/COPYING $(srcdir)/NEWS $(DESTDIR)$(pkglibdir)/data
-@@ -92,7 +95,7 @@
  	
- 
- 	# Install symlink into bindir:
--	ln -sf $(pkglibdir)/documancer.py $(DESTDIR)$(bindir)/documancer
-+	ln -sf $(PYTHON_SITELIBDIR)/documancer/documancer.py $(DESTDIR)$(bindir)/documancer
- 
- 
- dist: all
+ 	chmod +x $(DESTDIR)$(pkglibdir)/documancer.py
diff --git a/misc/documancer/pkg-plist b/misc/documancer/pkg-plist
deleted file mode 100644
index 519e323d2a68..000000000000
--- a/misc/documancer/pkg-plist
+++ /dev/null
@@ -1,75 +0,0 @@
-bin/documancer
-%%DATADIR%%/data/COPYING
-%%DATADIR%%/data/NEWS
-%%DATADIR%%/data/aboutbox.html
-%%DATADIR%%/data/add.png
-%%DATADIR%%/data/busy_indexing.png
-%%DATADIR%%/data/documancer-16.png
-%%DATADIR%%/data/documancer-22.png
-%%DATADIR%%/data/documancer-32.png
-%%DATADIR%%/data/documancer.ico
-%%DATADIR%%/data/documancer.png
-%%DATADIR%%/data/fullscreen.png
-%%DATADIR%%/data/go_home.png
-%%DATADIR%%/data/go_left.png
-%%DATADIR%%/data/go_right.png
-%%DATADIR%%/data/info2html_index.png
-%%DATADIR%%/data/info2html_left.png
-%%DATADIR%%/data/info2html_right.png
-%%DATADIR%%/data/info2html_up.png
-%%DATADIR%%/data/mozilla.png
-%%DATADIR%%/data/next_match.png
-%%DATADIR%%/data/osi-certified.png
-%%DATADIR%%/data/powered-by-swish-e.png
-%%DATADIR%%/data/prev_match.png
-%%DATADIR%%/data/properties.png
-%%DATADIR%%/data/remove.png
-%%DATADIR%%/data/search.png
-%%DATADIR%%/data/sourceforge.png
-%%DATADIR%%/data/wxpython.png
-%%DATADIR%%/data/wxwin.png
-%%DATADIR%%/helpers/info2html/info2html
-%%DATADIR%%/helpers/info2html/info2html.conf
-%%DATADIR%%/helpers/info2html/infocat
-%%DATADIR%%/helpers/man2html/index.html
-%%DATADIR%%/helpers/man2html/man2html
-%%DATADIR%%/helpers/man2html/man2html.cgi
-%%DATADIR%%/helpers/man2html/man2html.css
-@dirrm %%DATADIR%%/helpers/man2html
-@dirrm %%DATADIR%%/helpers/info2html
-@dirrm %%DATADIR%%/helpers
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
-%%PYTHON_SITELIBDIR%%/documancer/book.py
-%%PYTHON_SITELIBDIR%%/documancer/documancer.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/AboutBox.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/BooksManagerDialog.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/BusyIndicator.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/HtmlBrowser.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/HtmlBrowser_activex_ie.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/HtmlBrowser_activex_mozilla.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/MainFrame.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/__init__.py
-%%PYTHON_SITELIBDIR%%/documancer/gui/app.py
-%%PYTHON_SITELIBDIR%%/documancer/indexer.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/__init__.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/html/__init__.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/html/confgui.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/html/provider.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/info/__init__.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/info/confgui.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/info/provider.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/man/__init__.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/man/confgui.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/man/provider.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/pythondoc/__init__.py
-%%PYTHON_SITELIBDIR%%/documancer/providers/pythondoc/provider.py
-%%PYTHON_SITELIBDIR%%/documancer/server.py
-%%PYTHON_SITELIBDIR%%/documancer/utils.py
-@dirrm %%PYTHON_SITELIBDIR%%/documancer/providers/pythondoc
-@dirrm %%PYTHON_SITELIBDIR%%/documancer/providers/man
-@dirrm %%PYTHON_SITELIBDIR%%/documancer/providers/info
-@dirrm %%PYTHON_SITELIBDIR%%/documancer/providers/html
-@dirrm %%PYTHON_SITELIBDIR%%/documancer/providers
-@dirrm %%PYTHON_SITELIBDIR%%/documancer/gui
-@dirrm %%PYTHON_SITELIBDIR%%/documancer