cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use more universal approach instead of patching generated Makefile to fix build on some systems.

Browse Source 
Reported by:	Pavel Gubin <pg at 2lazy.ru>, Peter Jeremy <peterjeremy at acm.org>
This commit is contained in:
Max Brazhnikov 2010-01-24 14:58:48 +00:00
parent 65d01cabaf
commit 9be8ffd1f2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=248470
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
textproc/qt4-xml/Makefile
View File

@ -45,9 +45,6 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure
EPATCH= extrapatch-src-xml-Makefile
SUB_LIST+= WRKSRC=${WRKSRC:S|//|/|}
pre-configure:
${MKDIR} ${WRKSRC}/mkspecs
@ -62,7 +59,6 @@ post-configure:
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/lib/pkgconfig/QtXml.pc
#disable installation of include/Qt/qxmlstream.h, it handled by qt-corelib package
@${SED} ${_SUB_LIST_TEMP} ${FILESDIR}/${EPATCH} > ${WRKDIR}/${EPATCH}
${PATCH} -d ${WRKSRC} < ${WRKDIR}/${EPATCH}
${REINPLACE_CMD} -e '\,stream/qxmlstream.h.*${QT_INCDIR}/Qt/,d' ${WRKSRC}/src/xml/Makefile
.include <bsd.port.mk>

17
textproc/qt4-xml/files/extrapatch-src-xml-Makefile
View File

@ -1,17 +0,0 @@
--- src/xml/Makefile.orig 2009-12-04 16:04:02.944271152 +1000
+++ 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/
uninstall_flat_headers: FORCE
-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qxml.h
-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qdom.h
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qxmlstream.h
-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/QtXml
-$(DEL_DIR) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/