- Move all files into DATADIR

- Create script in PREFIX/bin as workaround for bug.

PR:		ports/110990
Submitted by:	Carlos Rocha <carlos.rocha@gmail.com>

3 files changed, 138 insertions, 2 deletions

diff --git a/devel/naturaldocs/Makefile b/devel/naturaldocs/Makefile
index 5320316c50db..8a0508c4789a 100644
--- a/devel/naturaldocs/Makefile
+++ b/devel/naturaldocs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	naturaldocs
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,10 +23,13 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/NaturalDocs
-PLIST_FILES=	bin/NaturalDocs
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/NaturalDocs ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/NaturalDocs ${DATADIR}/NaturalDocs
+	@cd ${WRKSRC} && \
+	${FIND} * -type d ! -name Help -exec ${MKDIR} ${DATADIR}/{} \; && \
+	${FIND} * -type f ! -name Help ! -name NaturalDocs -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
 	@${MKDIR} ${SITE_PERL}/NaturalDocs
 	@cd ${WRKSRC}/Modules/NaturalDocs && \
 		${FIND} * -type d -exec ${MKDIR} ${SITE_PERL}/NaturalDocs/{} \; && \
@@ -34,6 +38,8 @@ do-install:
 		${SED} -e "s,^${PREFIX}/,," >> ${TMPPLIST}
 	@${FIND} ${SITE_PERL}/NaturalDocs -type d | ${SORT} -r | \
 		${SED} -e "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	@${INSTALL_SCRIPT} ${FILESDIR}/NaturalDocs ${PREFIX}/bin && \
+	${SED} -i '' -e "s,%%DATADIR%%,${DATADIR}," ${PREFIX}/bin/NaturalDocs	
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/Help && \
diff --git a/devel/naturaldocs/files/NaturalDocs b/devel/naturaldocs/files/NaturalDocs
new file mode 100644
index 000000000000..d3e10c2237b9
--- /dev/null
+++ b/devel/naturaldocs/files/NaturalDocs
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+%%DATADIR%%/NaturalDocs $@
diff --git a/devel/naturaldocs/pkg-plist b/devel/naturaldocs/pkg-plist
new file mode 100644
index 000000000000..d5eeefac9358
--- /dev/null
+++ b/devel/naturaldocs/pkg-plist
@@ -0,0 +1,127 @@
+bin/NaturalDocs
+%%DATADIR%%/NaturalDocs
+%%DATADIR%%/License-GPL.txt
+%%DATADIR%%/NaturalDocs.bat
+%%DATADIR%%/Config/Languages.txt
+%%DATADIR%%/Config/Topics.txt
+%%PORTDOCS%%%%DATADIR%%/Help/example/Default.css
+%%PORTDOCS%%%%DATADIR%%/Help/example/NaturalDocs.js
+%%PORTDOCS%%%%DATADIR%%/Help/example/Roman.css
+%%PORTDOCS%%%%DATADIR%%/Help/example/showstyle.html
+%%PORTDOCS%%%%DATADIR%%/Help/example/Small.css
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/background.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/leftside.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/logo.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/overbody.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/overbodybg.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/overleftmargin.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/overmenu.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/overmenubg.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/header/rightside.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/about.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/background.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/bottomleft.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/bottomright.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/community.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/customizing.png
+%%PORTDOCS%%%%DATADIR%%/Help/images/menu/using.png
+%%PORTDOCS%%%%DATADIR%%/Help/javascript/BrowserStyles.js
+%%PORTDOCS%%%%DATADIR%%/Help/javascript/PNGHandling.js
+%%PORTDOCS%%%%DATADIR%%/Help/bugs.html
+%%PORTDOCS%%%%DATADIR%%/Help/customizinglanguages.html
+%%PORTDOCS%%%%DATADIR%%/Help/customizingtopics.html
+%%PORTDOCS%%%%DATADIR%%/Help/documenting.html
+%%PORTDOCS%%%%DATADIR%%/Help/examples.css
+%%PORTDOCS%%%%DATADIR%%/Help/favicon.ico
+%%PORTDOCS%%%%DATADIR%%/Help/index.html
+%%PORTDOCS%%%%DATADIR%%/Help/keywords.html
+%%PORTDOCS%%%%DATADIR%%/Help/languages.html
+%%PORTDOCS%%%%DATADIR%%/Help/menu.html
+%%PORTDOCS%%%%DATADIR%%/Help/messageboards.html
+%%PORTDOCS%%%%DATADIR%%/Help/output.html
+%%PORTDOCS%%%%DATADIR%%/Help/running.html
+%%PORTDOCS%%%%DATADIR%%/Help/styles.css
+%%PORTDOCS%%%%DATADIR%%/Help/styles.html
+%%PORTDOCS%%%%DATADIR%%/Help/troubleshooting.html
+%%DATADIR%%/Info/CSSGuide.txt
+%%DATADIR%%/Info/Languages.txt
+%%DATADIR%%/Info/NDMarkup.txt
+%%DATADIR%%/JavaScript/NaturalDocs.js
+%%DATADIR%%/Modules/NaturalDocs/Builder/Base.pm
+%%DATADIR%%/Modules/NaturalDocs/Builder/FramedHTML.pm
+%%DATADIR%%/Modules/NaturalDocs/Builder/HTML.pm
+%%DATADIR%%/Modules/NaturalDocs/Builder/HTMLBase.pm
+%%DATADIR%%/Modules/NaturalDocs/ClassHierarchy/Class.pm
+%%DATADIR%%/Modules/NaturalDocs/ClassHierarchy/File.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Advanced/Scope.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Advanced/ScopeChange.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Prototype/Parameter.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/ActionScript.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Ada.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Advanced.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Base.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/CSharp.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Pascal.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Perl.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/PLSQL.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Prototype.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Simple.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages/Tcl.pm
+%%DATADIR%%/Modules/NaturalDocs/Menu/Entry.pm
+%%DATADIR%%/Modules/NaturalDocs/Parser/Native.pm
+%%DATADIR%%/Modules/NaturalDocs/Parser/ParsedTopic.pm
+%%DATADIR%%/Modules/NaturalDocs/Project/File.pm
+%%DATADIR%%/Modules/NaturalDocs/Settings/BuildTarget.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable/File.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable/IndexElement.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable/Reference.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable/ReferenceTarget.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable/Symbol.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable/SymbolDefinition.pm
+%%DATADIR%%/Modules/NaturalDocs/Topics/Type.pm
+%%DATADIR%%/Modules/NaturalDocs/Builder.pm
+%%DATADIR%%/Modules/NaturalDocs/ClassHierarchy.pm
+%%DATADIR%%/Modules/NaturalDocs/ConfigFile.pm
+%%DATADIR%%/Modules/NaturalDocs/Constants.pm
+%%DATADIR%%/Modules/NaturalDocs/DefineMembers.pm
+%%DATADIR%%/Modules/NaturalDocs/Error.pm
+%%DATADIR%%/Modules/NaturalDocs/File.pm
+%%DATADIR%%/Modules/NaturalDocs/Languages.pm
+%%DATADIR%%/Modules/NaturalDocs/Menu.pm
+%%DATADIR%%/Modules/NaturalDocs/NDMarkup.pm
+%%DATADIR%%/Modules/NaturalDocs/Parser.pm
+%%DATADIR%%/Modules/NaturalDocs/Project.pm
+%%DATADIR%%/Modules/NaturalDocs/ReferenceString.pm
+%%DATADIR%%/Modules/NaturalDocs/Settings.pm
+%%DATADIR%%/Modules/NaturalDocs/StatusMessage.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolString.pm
+%%DATADIR%%/Modules/NaturalDocs/SymbolTable.pm
+%%DATADIR%%/Modules/NaturalDocs/Topics.pm
+%%DATADIR%%/Modules/NaturalDocs/Version.pm
+%%DATADIR%%/Styles/Default.css
+%%DATADIR%%/Styles/Roman.css
+%%DATADIR%%/Styles/Small.css
+@dirrm %%DATADIR%%/Config
+%%PORTDOCS%%@dirrm %%DATADIR%%/Help/example
+%%PORTDOCS%%@dirrm %%DATADIR%%/Help/images/header
+%%PORTDOCS%%@dirrm %%DATADIR%%/Help/images/menu
+%%PORTDOCS%%@dirrm %%DATADIR%%/Help/images
+%%PORTDOCS%%@dirrm %%DATADIR%%/Help/javascript
+%%PORTDOCS%%@dirrm %%DATADIR%%/Help
+@dirrm %%DATADIR%%/Info
+@dirrm %%DATADIR%%/JavaScript
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Builder
+@dirrm %%DATADIR%%/Modules/NaturalDocs/ClassHierarchy
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Languages/Advanced
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Languages/Prototype
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Languages
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Menu
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Parser
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Project
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Settings
+@dirrm %%DATADIR%%/Modules/NaturalDocs/SymbolTable
+@dirrm %%DATADIR%%/Modules/NaturalDocs/Topics
+@dirrm %%DATADIR%%/Modules/NaturalDocs
+@dirrm %%DATADIR%%/Modules
+@dirrm %%DATADIR%%/Styles
+@dirrm %%DATADIR%%