diff options
Diffstat (limited to 'devel/qmake/files')
| -rw-r--r-- | devel/qmake/files/Makefile.bsd | 41 | ||||
| -rw-r--r-- | devel/qmake/files/patch-generators_c++17 | 62 | ||||
| -rw-r--r-- | devel/qmake/files/qconfig.cpp | 14 |
3 files changed, 0 insertions, 117 deletions
diff --git a/devel/qmake/files/Makefile.bsd b/devel/qmake/files/Makefile.bsd deleted file mode 100644 index 1bac5b45f11d..000000000000 --- a/devel/qmake/files/Makefile.bsd +++ /dev/null @@ -1,41 +0,0 @@ -_OBJS!= ${MAKE} -f Makefile.unix -V OBJS -V QOBJS -# We'd like to avoid using qconfig.cpp, but can't -- see the comment -# next to -DHAVE_CONFIG_CPP below: -#_OBJS:= ${_OBJS:S/qconfig.o//} -SRCS:= ${_OBJS:.o=.cpp} -MAN= - -.PATH: ${.CURDIR} ${.CURDIR:H}/src/tools -CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++ - -.for s in tools kernel codecs -CXXFLAGS+=-I${.CURDIR:H}/src/$s -.endfor - -.for g in /. /unix /win32 /mac -.PATH: ${.CURDIR}/generators$g -CXXFLAGS+=-I${.CURDIR}/generators$g -.endfor - -CXXFLAGS+=-I. -I"${FILESDIR}" -Dregister= - -CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ - -DQT_NO_STL -DQT_NO_COMPRESS -DQT_INSTALL_DATA="\"${SHAREDIR}\"" - -# I guess, qconfig.cpp used to be optional, but no longer is -- due to -# bit-rot in Qt sources. So we still have to compile it, but, by not -# adding the following define, we reduce the seemingly needless usage of -# it: -# -DHAVE_QCONFIG_CPP - -PROG_CXX= qmake -BINDIR= ${PREFIX}/bin -SHAREDIR= ${PREFIX}/share/qt - -${DESTDIR}${SHAREDIR}: - mkdir -p "$@" - -beforeinstall: ${DESTDIR}${SHAREDIR} - cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR} - -.include <bsd.prog.mk> diff --git a/devel/qmake/files/patch-generators_c++17 b/devel/qmake/files/patch-generators_c++17 deleted file mode 100644 index 5499fbce65a6..000000000000 --- a/devel/qmake/files/patch-generators_c++17 +++ /dev/null @@ -1,62 +0,0 @@ -Insert the spaces between literals to satisfy clang with c++17 (or -even c++11) standard. - - -mi - ---- generators/win32/borland_bmake.cpp 2007-02-02 14:01:28 UTC -+++ generators/win32/borland_bmake.cpp -@@ -383,7 +383,7 @@ BorlandMakefileGenerator::init() - if(project->isEmpty("QMAKE_INSTALL_DIR")) - project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - -- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX); -+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qtmt" QTDLL_POSTFIX); - QStringList &configs = project->variables()["CONFIG"]; - if (project->isActiveConfig("shared")) - project->variables()["DEFINES"].append("QT_DLL"); ---- generators/win32/mingw_make.cpp 2007-02-02 14:01:28 UTC -+++ generators/win32/mingw_make.cpp -@@ -394,7 +394,7 @@ MingwMakefileGenerator::init() - if(project->isEmpty("QMAKE_INSTALL_DIR")) - project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - -- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); -+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); - project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; - - // LIBS defined in Profile comes first for gcc ---- generators/win32/msvc_dsp.cpp 2007-02-02 14:01:27 UTC -+++ generators/win32/msvc_dsp.cpp -@@ -620,7 +620,7 @@ DspMakefileGenerator::init() - if ( project->variables()["QMAKESPEC"].isEmpty() ) - project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); - -- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); -+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); - project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; - - QStringList &configs = project->variables()["CONFIG"]; ---- generators/win32/msvc_nmake.cpp 2007-02-02 14:01:28 UTC -+++ generators/win32/msvc_nmake.cpp -@@ -479,7 +479,7 @@ NmakeMakefileGenerator::init() - if(project->isEmpty("QMAKE_INSTALL_DIR")) - project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - -- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); -+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); - project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; - - QString targetfilename = project->variables()["TARGET"].first(); ---- generators/win32/msvc_vcproj.cpp 2007-02-02 14:01:28 UTC -+++ generators/win32/msvc_vcproj.cpp -@@ -1094,8 +1094,8 @@ void VcprojGenerator::initOld() - project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); - - bool is_qt = -- ( project->first("TARGET") == "qt"QTDLL_POSTFIX || -- project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); -+ ( project->first("TARGET") == "qt" QTDLL_POSTFIX || -+ project->first("TARGET") == "qt-mt" QTDLL_POSTFIX ); - - QStringList &configs = project->variables()["CONFIG"]; - diff --git a/devel/qmake/files/qconfig.cpp b/devel/qmake/files/qconfig.cpp deleted file mode 100644 index 54dcd6e349e1..000000000000 --- a/devel/qmake/files/qconfig.cpp +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Hand-crafted... - * The default prefix (/ usr / local) is dynamicly replaced - * at configure time. - */ -const char *qInstallPath() { return "/usr/local"; } -const char *qInstallPathDocs() { return "/usr/local/share/doc/qt"; } -const char *qInstallPathHeaders() { return "/usr/local/include"; } -const char *qInstallPathLibs() { return "/usr/local/lib"; } -const char *qInstallPathBins() { return "/usr/local/bin"; } -const char *qInstallPathPlugins() { return "/usr/local/plugins"; } -const char *qInstallPathData() { return "/usr/local/share/qt"; } -const char *qInstallPathTranslations() { return "/usr/local/translations"; } -const char *qInstallPathSysconf() { return "/usr/local/etc"; } |