ports/143161: textproc/qt4-xml fails to build after augrade to qt-4.6.1: patch error

[Pavel Gubin]

>Number:         143161
>Category:       ports
>Synopsis:       textproc/qt4-xml fails to build after augrade to qt-4.6.1: patch error
>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:   Sun Jan 24 11:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Pavel Gubin
>Release:        8.0-RELEASE
>Organization:
Lazy
>Environment:
FreeBSD hammer.2lazy.ru 8.0-RELEASE FreeBSD 8.0-RELEASE #1: Mon Nov 16 19:50:52 MSK 2009     pg at hammer.2lazy.ru:/usr/obj/usr/src/sys/GnomeKTR  i386

>Description:
/usr/ports/textproc/qt4-xml fails to build after updating ports tree to the point where qt-4.6.1 appeared, with diagnostics:

[...]
/usr/bin/patch -d /var/data/portstmp/usr/ports/textproc/qt4-xml/work/qt-eve
rywhere-opensource-src-4.6.1 < /var/data/portstmp/usr/ports/textproc/qt4-xm
l/work/extrapatch-src-xml-Makefile
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- src/xml/Makefile.orig      2009-12-04 16:04:02.944271152 +1000
|+++ src/xml/Makefile   2009-12-04 16:07:07.986728782 +1000
--------------------------
Patching file src/xml/Makefile using Plan A...
Hunk #1 failed at 533.
1 out of 1 hunks failed--saving rejects to src/xml/Makefile.rej
done
*** Error code 1

This is because of incorrectly specifying $(INSTALL_PROGRAM) instead of $(INSTALL_FILE) in the abovementioned extrapatch-src-xml-Makefile

>How-To-Repeat:
cd /usr/ports/textproc/qt4-xml; make
>Fix:
Apply the following patch to /usr/ports/textproc/qt4-xml/files/extrapatch-src-xml-Makefile



Patch attached with submission follows:

--- extrapatch-src-xml-Makefile.orig	2010-01-22 00:13:20.000000000 +0300
+++ extrapatch-src-xml-Makefile	2010-01-24 14:23:15.000000000 +0300
@@ -2,10 +2,10 @@
 +++ src/xml/Makefile	2009-12-04 16:07:07.986728782 +1000
 @@ -533,14 +533,12 @@
  	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ 
- 	-$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/sax/qxml.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
- 	-$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/dom/qdom.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
--	-$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/stream/qxmlstream.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
- 	-$(INSTALL_PROGRAM) %%WRKSRC%%/include/QtXml/QtXml $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+ 	-$(INSTALL_FILE) %%WRKSRC%%/src/xml/sax/qxml.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+ 	-$(INSTALL_FILE) %%WRKSRC%%/src/xml/dom/qdom.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+-	-$(INSTALL_FILE) %%WRKSRC%%/src/xml/stream/qxmlstream.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+ 	-$(INSTALL_FILE) %%WRKSRC%%/include/QtXml/QtXml $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
  
  
  uninstall_flat_headers:  FORCE


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