- Fix documentation installation and support NOPORTDOCS flag

Reported by:	QAT

4 files changed, 46 insertions, 27 deletions

diff --git a/deskutils/alexandria/Makefile b/deskutils/alexandria/Makefile
index 64fc339307d8..25eefd58703c 100644
--- a/deskutils/alexandria/Makefile
+++ b/deskutils/alexandria/Makefile
@@ -34,7 +34,16 @@ MAN1=		alexandria.1
 
 OPTIONS=	IMAGESIZE "Cover images optimization" off
 
-DOCS=		NEWS README TODO
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README NEWS INSTALL TODO AUTHORS BUGS FAQ \
+		cuecat_support.rdoc
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Rakefile-fixpaths
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Rakefile-fixpaths \
+		${FILESDIR}/extra-patch-Rakefile-noportdocs
+PORTDOCS=
+.endif
+
 GCONF_SCHEMAS=	alexandria.schemas
 
 RUBY_REQUIRE=	Ruby > 180
@@ -55,13 +64,8 @@ RUN_DEPENDS+=${RUBY_SITELIBDIR}/image_size.rb:${PORTSDIR}/graphics/ruby-image_si
 .endif
 
 pre-build:
-	${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|' \
+	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|' \
 		${USR2FIX:S|^|${WRKSRC}/|}
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e \
-		's/default_groups.push(\*documentation_installation)//' \
-		${WRKSRC}/tasks.rb
-.endif
 
 do-build:
 	@cd ${WRKSRC} && rake PREFIX=${PREFIX} build
@@ -69,12 +73,4 @@ do-build:
 do-install:
 	@cd ${WRKSRC} && rake PREFIX=${PREFIX} install
 
-post-install:
-#.if !defined(NOPORTDOCS)
-#	@${MKDIR} ${RUBY_MODDOCDIR}
-#.for f in ${DOCS}
-#	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-#.endfor
-#.endif
-
 .include <bsd.port.post.mk>
diff --git a/deskutils/alexandria/files/patch-Rakefile b/deskutils/alexandria/files/extra-patch-Rakefile-fixpaths
index 61a2b1cc1e85..3fda1b9627eb 100644
--- a/deskutils/alexandria/files/patch-Rakefile
+++ b/deskutils/alexandria/files/extra-patch-Rakefile-fixpaths
@@ -1,5 +1,5 @@
---- Rakefile	2010-06-17 21:28:36.000000000 +0400
-+++ Rakefile	2010-06-26 20:56:17.000000000 +0400
+--- ./Rakefile.orig	2010-06-17 13:28:36.000000000 -0400
++++ ./Rakefile	2010-07-30 13:57:06.000000000 -0400
 @@ -103,9 +103,9 @@
    install_task.install_icons(icon_files, "#{SHARE}/icons")
    install_task.install('data/app-icon/32x32', 'data/app-icon/32x32/*.xpm', "#{SHARE}/pixmaps")
@@ -12,3 +12,12 @@
  
  end
  
+@@ -119,7 +119,7 @@
+ packageinstall = FileInstallTask.new(:package) do |j|
+   install_common(j)
+ 
+-  docs = ['README', 'NEWS', 'INSTALL', 'COPYING', 'TODO']
++  docs = ['README', 'NEWS', 'INSTALL', 'TODO']
+   devel_docs = ['doc/AUTHORS', 'doc/BUGS', 'doc/FAQ', 
+                 'doc/cuecat_support.rdoc']
+   j.install('', docs, "#{SHARE}/doc/#{PROJECT}") 
diff --git a/deskutils/alexandria/files/extra-patch-Rakefile-noportdocs b/deskutils/alexandria/files/extra-patch-Rakefile-noportdocs
new file mode 100644
index 000000000000..88976c724ce1
--- /dev/null
+++ b/deskutils/alexandria/files/extra-patch-Rakefile-noportdocs
@@ -0,0 +1,24 @@
+--- Rakefile.orig	2010-07-30 13:58:02.000000000 -0400
++++ Rakefile	2010-07-30 13:58:21.000000000 -0400
+@@ -119,12 +119,6 @@
+ packageinstall = FileInstallTask.new(:package) do |j|
+   install_common(j)
+ 
+-  docs = ['README', 'NEWS', 'INSTALL', 'TODO']
+-  devel_docs = ['doc/AUTHORS', 'doc/BUGS', 'doc/FAQ', 
+-                'doc/cuecat_support.rdoc']
+-  j.install('', docs, "#{SHARE}/doc/#{PROJECT}") 
+-  j.install('doc', devel_docs, "#{SHARE}/doc/#{PROJECT}")
+-
+   j.uninstall_empty_dirs(["#{SHARE}/**/#{PROJECT}/",
+                           "#{j.rubylib}/#{PROJECT}/"
+                          ])
+@@ -308,7 +302,7 @@
+                           "TODO", "alexandria.desktop",
+                           "alexandria.desktop.in",
+                           "bin/**/*", "data/**/*", "misc/**/*",
+-                          "doc/**/*", "lib/**/*", "po/**/*",
++                          "lib/**/*", "po/**/*",
+                           "schemas/**/*", "spec/**/*", "tests/**/*")
+ end
+ 
diff --git a/deskutils/alexandria/pkg-plist b/deskutils/alexandria/pkg-plist
index 2b14d63cf3e5..594052d07590 100644
--- a/deskutils/alexandria/pkg-plist
+++ b/deskutils/alexandria/pkg-plist
@@ -103,15 +103,6 @@ bin/alexandria
 %%DATADIR%%/web-themes/list/list.css
 %%DATADIR%%/web-themes/list/preview.jpg
 share/applications/alexandria.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/cuecat_support.rdoc
 share/gnome/help/alexandria/C/about.xml
 share/gnome/help/alexandria/C/adding-books.xml
 share/gnome/help/alexandria/C/alexandria.xml
@@ -216,7 +207,6 @@ share/pixmaps/alexandria.xpm
 share/sounds/alexandria/bad_scan.wav
 share/sounds/alexandria/good_scan.wav
 share/sounds/alexandria/scanning.wav
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/sounds/alexandria
 @dirrm share/omf/alexandria
 @dirrmtry share/icons/hicolor/scalable/apps