diff options
| author | makc <makc@FreeBSD.org> | 2010-01-24 22:58:48 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2010-01-24 22:58:48 +0800 |
| commit | 9b583f702ff2be6a001105d35778d4ead5616846 (patch) | |
| tree | 5f67f8a5252198d619413fcd5cc0b583881bea75 | |
| parent | 2de67fe9b334ea9c4d67423d1440c52975cfa4ce (diff) | |
| download | freebsd-ports-gnome-9b583f702ff2be6a001105d35778d4ead5616846.tar.gz freebsd-ports-gnome-9b583f702ff2be6a001105d35778d4ead5616846.tar.zst freebsd-ports-gnome-9b583f702ff2be6a001105d35778d4ead5616846.zip | |
Use more universal approach instead of patching generated Makefile to fix build on some systems.
Reported by: Pavel Gubin <pg at 2lazy.ru>, Peter Jeremy <peterjeremy at acm.org>
| -rw-r--r-- | textproc/qt4-xml/Makefile | 6 | ||||
| -rw-r--r-- | textproc/qt4-xml/files/extrapatch-src-xml-Makefile | 17 |
2 files changed, 1 insertions, 22 deletions
diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index 2285b6f33a91..d30911022ff3 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -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> diff --git a/textproc/qt4-xml/files/extrapatch-src-xml-Makefile b/textproc/qt4-xml/files/extrapatch-src-xml-Makefile deleted file mode 100644 index f47416234370..000000000000 --- a/textproc/qt4-xml/files/extrapatch-src-xml-Makefile +++ /dev/null @@ -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/ - |