diff options
Diffstat (limited to 'editors/calligra')
| -rw-r--r-- | editors/calligra/Makefile | 28 | ||||
| -rw-r--r-- | editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp | 13 |
2 files changed, 1 insertions, 40 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 651b1caa2d26..e9a8740625c4 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -45,36 +45,10 @@ USE_RUBY= yes USE_PGSQL= yes .include "${.CURDIR}/../../x11/kde3/Makefile.kde" -.include <bsd.port.pre.mk> CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \ --with-pgsqllibdir=${LOCALBASE}/lib \ --with-pqxx-includes=${LOCALBASE}/include \ --with-pqxx-libraries=${LOCALBASE}/lib -.if ${OSVERSION} < 500035 -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp -CONFIGURE_ARGS+=--disable-final -.endif - -post-configure: -.if ${OSVERSION} < 500035 - ${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \ - -e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \ - ${WRKSRC}/filters/krita/tiff/Makefile \ - ${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \ - ${WRKSRC}/kchart/Makefile \ - ${WRKSRC}/kchart/kdchart/Makefile \ - ${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \ - ${WRKSRC}/kexi/migration/pqxx/Makefile - ${REINPLACE_CMD} -e 's|round(|rint(|g' \ - ${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc - ${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \ - ${WRKSRC}/krita/plugins/filters/cimg/Makefile - ${REINPLACE_CMD} -e 's|xor|^|g' \ - ${WRKSRC}/kspread/kspread_style.cc - ${REINPLACE_CMD} -e 's|trunc(|rint(|g' \ - ${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp deleted file mode 100644 index 68068710b7c0..000000000000 --- a/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- kexi/main/keximainwindowimpl.cpp.orig Thu Jun 30 17:28:58 2005 -+++ kexi/main/keximainwindowimpl.cpp Thu Jun 30 17:29:14 2005 -@@ -106,8 +106,8 @@ - //#define PROPEDITOR_VISIBILITY_CHANGES - - //temporary fix to manage layout --#include "ksplitter.h" --#define KDOCKWIDGET_P 1 -+// #include "ksplitter.h" -+// #define KDOCKWIDGET_P 1 - - //#ifndef KEXI_NO_MIGRATION - //#include "migration/importwizard.h" |