diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-04-03 08:14:43 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-04-03 08:14:43 +0000 |
| commit | dbba8af6447e625aae93ec45e619acbecb4ab189 (patch) | |
| tree | d696a8c2d3e835a743132aa1f6a5cc0557d1c435 /devel/qt-designer | |
| parent | Update to the actual release version of 9.1.1. If you're using (diff) | |
Overhaul QT/KDE support:
- bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}*
- Cleanup corresponding ports for bsd.kde.mk update.
- Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom,
introduce QT_NONSTANDARD variable for nonstandard configure setup.
- Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the
proxy authentication that was broken for 2.1.1. Remove old patches.
- Potentially fix kdelibs build for alpha.
- Fix qt-designer 2.3.0 build.
- Ruby stuff left alone since it looks like black magic to me. Should
still work w/ compat shims for older USE_QT[,2] style. Some others
were also left alone for the same reason.
Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk)
Submitted by: David Faure <faure@kde.org> (proxy auth patches)
Alex Zepeda <garbanzo@kde.org> (old patches removal)
Notes
Notes:
svn path=/head/; revision=40792
Diffstat (limited to 'devel/qt-designer')
| -rw-r--r-- | devel/qt-designer/Makefile | 6 | ||||
| -rw-r--r-- | devel/qt-designer/files/patch-aa | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile index cee1a28b0250..0ca0b97b5d70 100644 --- a/devel/qt-designer/Makefile +++ b/devel/qt-designer/Makefile @@ -10,6 +10,12 @@ MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt23 PORTNAME= qt-designer CATEGORIES= devel +post-patch: + ${PERL} -pi -e "s@-fno-exceptions@-fno-exceptions -I${X11BASE}/include/qt2@g" ${CONFIG} + +do-build: + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + .include "${MASTERDIR}/Makefile" LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 diff --git a/devel/qt-designer/files/patch-aa b/devel/qt-designer/files/patch-aa index 119251bcb772..695099386459 100644 --- a/devel/qt-designer/files/patch-aa +++ b/devel/qt-designer/files/patch-aa @@ -5,7 +5,7 @@ # Compiling with support libraries SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include -I/usr/X11R6/include/qt2 $(SYSCONF_CXXFLAGS_THREAD) ++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include # Compiling YACC output @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) |