aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2003-10-17 06:09:39 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2003-10-17 06:09:39 +0000
commit803e4048dc6d15dbbbad172b79257ae00975272f (patch)
tree35ce84dbb52c7c6ae12bc9903b22d72c752ba382 /devel
parent92494ea56aec98c288e010267582061501393362 (diff)
downloadports-803e4048dc6d15dbbbad172b79257ae00975272f.tar.gz
ports-803e4048dc6d15dbbbad172b79257ae00975272f.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/kdevelop/Makefile5
-rw-r--r--devel/kdevelop/pkg-plist1
-rw-r--r--devel/qt-designer/Makefile26
3 files changed, 18 insertions, 14 deletions
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 86468da53f60..e97e8b88ae71 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -16,14 +16,14 @@ DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
COMMENT= Powerful IDE for developing KDE/Qt-based apps
-RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
+RUN_DEPENDS= extractrc:${PORTSDIR}/devel/kdesdk3 \
+ gmake:${PORTSDIR}/devel/gmake
.if defined(WITH_OPTIONAL_DEPENDS)
RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \
automake:${PORTSDIR}/devel/automake \
kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
ark:${PORTSDIR}/misc/kdeutils3 \
glimpse:${PORTSDIR}/textproc/glimpse \
- kbabel:${PORTSDIR}/devel/kdesdk3 \
a2ps:${PORTSDIR}/print/a2ps-letter
.endif
@@ -47,6 +47,7 @@ pre-everything::
.endif
pre-configure:
+ ${REINPLACE_CMD} -e 's@extractrc@@g' ${WRKSRC}/kdevelop/Makefile.in
${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index e24856ae51ad..7cc9e6b2730a 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -1,4 +1,3 @@
-bin/extractrc
bin/kdevdlg2ui
bin/kdevelop
bin/one2two
diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile
index 3fe4a9280d6d..0b0a4685791e 100644
--- a/devel/qt-designer/Makefile
+++ b/devel/qt-designer/Makefile
@@ -5,12 +5,24 @@
# $FreeBSD$
#
-MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt23
-COMMENT= GUI C++ IDE based on QT
-
PORTNAME= qt-designer
CATEGORIES= devel
+MAINTAINER= kde@freebsd.org
+COMMENT= GUI C++ IDE based on QT
+
+LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
+
+MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt23
+
+CONFLICTS= qt-3.*
+
+WRKSRC= ${WRKDIR}/qt-${PORTVERSION}
+PATCH_WRKSRC= ${WRKSRC}
+PKGDIR= ${.CURDIR}
+MAKE_ENV= QTDIR=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib PREFIX=${PREFIX}
+ALL_TARGET= sub-tools
+
post-patch:
${PERL} -pi -e "s@-fno-exceptions@-fno-exceptions -I${X11BASE}/include/qt2@g" ${CONFIG}
@@ -30,14 +42,6 @@ qt-pre-configure:
.include "${MASTERDIR}/Makefile"
-LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
-
-WRKSRC= ${WRKDIR}/qt-${PORTVERSION}
-PATCH_WRKSRC= ${WRKSRC}
-PKGDIR= ${.CURDIR}
-MAKE_ENV= QTDIR=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib PREFIX=${PREFIX}
-ALL_TARGET= sub-tools
-
do-install:
${MKDIR} ${PREFIX}/share/qt2/designer/templates \
${PREFIX}/share/doc/qt2/html/designer/arrows \