ports/129270: graphics/xfig installs pdf file in place of doc directory

[G. Paul Ziemba]

>Number:         129270
>Category:       ports
>Synopsis:       graphics/xfig installs pdf file in place of doc directory
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 29 01:50:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     G. Paul Ziemba
>Release:        7.1-PRERELEASE
>Organization:
>Environment:
FreeBSD hairball.ziemba.us 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Tue Nov 18 13:50:14 PST 2008     root at hairball:/usr/obj/usr/src/sys/GPZ-081118  i386

>Description:
"make install" fails because:

    1. port makefile invokes install.html target,
       which calls install.rhtml target

    2. install.rhtml, install.jhtml targets assume
       existence of $(DESTDIR)$(XFIGDOCDIR)
       (/usr/local/share/doc/xfig) and call, e.g.,
       "install xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR)"
       which causes $(DESTDIR)$(XFIGDOCDIR) to be a copy
       of the file.

    3. subsequent "mkdirhier /usr/local/share/doc/xfig/html"
       exits with error because /usr/local/share/doc/xfig is a file.

# cd /usr/ports/graphics/xfig
# make showconfig
===> The following configuration options are available for xfig-3.2.5_1:
     GHOSTSCRIPT=on "Ghostscript support"
     I18N=off "I18N support and Japanese docs"
===> Use 'make config' to modify these settings
# make install
..
Copying Fig Object Libraries
+ /usr/local/bin/mkdirhier /usr/local/lib/X11/xfig/Libraries
+ set +x
Copying pdf and html files to /usr/local/share/doc/xfig
+ /usr/local/bin/mkdirhier /usr/local/share/doc/xfig/html
mkdir: //usr/local/share/doc/xfig: File exists
mkdir: //usr/local/share/doc/xfig: No such file or directory
*** Error code 1

Stop in /usr/ports/graphics/xfig/work/xfig.3.2.5.
*** Error code 1

>How-To-Repeat:
cd /usr/ports/graphics/xfig
make deinstall
make install
>Fix:
A few changes to Imakefile seems to correct the problem. Since there is already a files/patch-Imakefile, I herewith submit a patch to that patch.

Patch attached with submission follows:

--- patch-Imakefile	2008-11-28 17:13:35.000000000 -0800
+++ patch-Imakefile.orig	2008-11-28 17:16:04.000000000 -0800
@@ -1,5 +1,5 @@
---- Imakefile.orig	2006-10-10 16:19:22.000000000 -0700
-+++ Imakefile	2008-11-28 17:11:28.000000000 -0800
+--- Imakefile.orig	Tue Oct 10 16:19:22 2006
++++ Imakefile
 @@ -30,9 +30,9 @@
  XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
  XCOMM for it relative to the BINDIR variable.
@@ -127,29 +127,8 @@
  
  XCOMM Install program, libraries and documentation with "make install.all"
  install.all::
-@@ -396,11 +397,15 @@
- XCOMM Install the documentation here with "make install.doc"
- install.doc::
- 	@echo Installing man pages to $(MANDIR)
--	@if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
--		else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ; set +x; ); fi
-+	@$(MAKE) install.docdir
- 	@$(MAKE) install.man
- 	@$(MAKE) install.html
- 
-+install.docdir::
-+	@if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
-+		else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ; set +x; ); fi
-+	
-+
- XCOMM Install the HTML documentation here with "make install.html"
- 
- #ifdef I18N
-@@ -413,25 +418,27 @@
- #endif
- 
+@@ -415,13 +416,13 @@
  install.rhtml::
-+	@$(MAKE) install.docdir
  	@(cd Doc ; \
  	echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
 -	$(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
@@ -166,9 +145,7 @@
  	) ;
  
  #ifdef I18N
- install.jhtml::
- 	@echo "Copying japanese html files to $(DESTDIR)$(XFIGDOCDIR)"
-+	@$(MAKE) install.docdir
+@@ -430,8 +431,8 @@
  	@(cd Doc/html/japanese ; \
  	if [ -d $(DESTDIR)$(XFIGDOCDIR)/html/japanese ]; then set +x; \
  	   else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html/japanese ); fi ; \
@@ -179,7 +156,7 @@
  #endif
  
  XCOMM Install the object libraries here with "make install.libs"
-@@ -440,7 +447,7 @@
+@@ -440,7 +441,7 @@
  	@if [ -d $(DESTDIR)$(OBJLIBDIR) ]; then set +x; \
  		else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR) ; set +x; ); fi
  	@if [ -d Libraries ]; then \


>Release-Note:
>Audit-Trail:
>Unformatted: