diff options
| author | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-01-29 09:25:41 +0000 |
|---|---|---|
| committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-01-29 09:25:41 +0000 |
| commit | 9698c8bfbdb4ab2ba45c236ecf482aae38e3fe70 (patch) | |
| tree | 4dc7ecb4aad3520792956e2bf9683e0f3d56b484 | |
| parent | Upgrade to 2.05. (diff) | |
Respect CFLAGS, CC, CXX, etc.
Notes
Notes:
svn path=/head/; revision=74199
| -rw-r--r-- | x11-toolkits/qt31/Makefile | 15 | ||||
| -rw-r--r-- | x11-toolkits/qt32/Makefile | 15 | ||||
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 15 |
3 files changed, 42 insertions, 3 deletions
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index ece381d8040d..db810923bbe8 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -26,6 +26,7 @@ LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \ USE_BZIP2= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_X_PREFIX= yes HAS_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -34,7 +35,7 @@ CONFIGURE_ARGS= -system-libpng -system-libjpeg -system-libmng \ -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \ -system-zlib -no-nas-sound -sm -qt-gif -thread \ -no-fast ${XINERAMA} -no-g++-exceptions -no-stl \ - ${CUPS} -shared -prefix ${PREFIX} + ${CUPS} -shared -prefix ${PREFIX} .if defined(DEBUG) CONFIGURE_ARGS+= -debug @@ -76,6 +77,18 @@ BROKEN= "You have QT2 headers installed! Installing this port" BROKEN+="will result in conflicts between QT3 and QT2!" .endif +post-patch: + @${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,gcc,${CC},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,g++,${CXX},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + post-build: .for tool in makeqpf mergetr msg2qm qembed qvfb cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE} diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index ece381d8040d..db810923bbe8 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -26,6 +26,7 @@ LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \ USE_BZIP2= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_X_PREFIX= yes HAS_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -34,7 +35,7 @@ CONFIGURE_ARGS= -system-libpng -system-libjpeg -system-libmng \ -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \ -system-zlib -no-nas-sound -sm -qt-gif -thread \ -no-fast ${XINERAMA} -no-g++-exceptions -no-stl \ - ${CUPS} -shared -prefix ${PREFIX} + ${CUPS} -shared -prefix ${PREFIX} .if defined(DEBUG) CONFIGURE_ARGS+= -debug @@ -76,6 +77,18 @@ BROKEN= "You have QT2 headers installed! Installing this port" BROKEN+="will result in conflicts between QT3 and QT2!" .endif +post-patch: + @${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,gcc,${CC},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,g++,${CXX},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + post-build: .for tool in makeqpf mergetr msg2qm qembed qvfb cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE} diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index ece381d8040d..db810923bbe8 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -26,6 +26,7 @@ LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \ USE_BZIP2= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_X_PREFIX= yes HAS_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -34,7 +35,7 @@ CONFIGURE_ARGS= -system-libpng -system-libjpeg -system-libmng \ -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \ -system-zlib -no-nas-sound -sm -qt-gif -thread \ -no-fast ${XINERAMA} -no-g++-exceptions -no-stl \ - ${CUPS} -shared -prefix ${PREFIX} + ${CUPS} -shared -prefix ${PREFIX} .if defined(DEBUG) CONFIGURE_ARGS+= -debug @@ -76,6 +77,18 @@ BROKEN= "You have QT2 headers installed! Installing this port" BROKEN+="will result in conflicts between QT3 and QT2!" .endif +post-patch: + @${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,gcc,${CC},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,g++,${CXX},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + post-build: .for tool in makeqpf mergetr msg2qm qembed qvfb cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE} |