Please welcome Qt3/KDE3 to our ports tree. This includes work since the

original versions of these ports, so some PORTREVISIONs were bumped.  See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.

bsd.kde.mk has already been updated a few days ago to work with these.

Some patches applied to fix a few bugs were:

deskutils/kdepim3:
        [1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
        [2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
        [3] Fix compile problem with kvoctrain.
x11/kdebase3:
        [4] Fix KDM CPU usage and login bug.

Some caveats:
        * All PLISTs are broken for deinstall due to script bug that I
          didn't notice until very recently.  This will be fixed when I
          commit an update tomorrow.  These ports should still install
          perfectly fine though.  They should also deinstall without
          giving errors, but will leave directories behind.
        * You can't install this with any other version of QT or KDE
          already installed.  I am not sure the checks are 100% working,
          but fixes for these will be forthcoming.  This is mainly due
          to a policy decision made by kde@ to make QT/KDE ports install
          the way the rest of the world expects it to while also still
          conforming to FreeBSD's hier(7).  For reference on this decision,
          please consult the KDE/FreeBSD mailing list archives.  This
          decision fixes 2-year-old bug reports relating to how we handled
          this for KDE2 vs KDE1.

Submitted by:   [1] Adrian de Groot <adridg@cs.kun.nl>,
                [2] David Faure <faure@kde.org>,
                    Andy Fawcett <andy@athame.co.uk>
                    Lauri Watts <lauri@kde.org>
                [3] Lauri Watts <lauri@kde.org>
                [4] Alan Eldridge <alane@geeksrus.net>
                    Oswald Buddenhagen <ossi@kde.org>
Reviewed by:    kde

1 files changed, 16 insertions, 34 deletions

diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 1b3db3e55286..0052ef8d855a 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,54 +7,36 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.1.1
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-kde3
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_KDELIBS_VER=2
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_KDELIBS_VER=3
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 USE_GMAKE=	yes
 
-_NO_KDE_OBJPRELINK=	yes
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-post-patch:
-	@${PERL} -pi -e "s@Icon=killustrator@Icon=kontour@g" \
-		${WRKSRC}/templates/Illustration.desktop
-	@${PERL} -pi -e "s@KIllustrator@Kontour@g" \
-		${WRKSRC}/templates/Illustration.desktop
-
 pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@LIBPYTHON =@LIBPYTHON= ${PTHREAD_LIBS}@g"
-	${PERL} -pi -e "s@la_LIBADD =@la_LIBADD= ${PTHREAD_LIBS}@g" \
-		${WRKSRC}/kivio/plugins/*/Makefile.in
-	${PERL} -pi -e "s@Exec=kivio@Exec=env LD_PRELOAD=/usr/lib/libc_r.so kivio@g" \
-		${WRKSRC}/kivio/kiviopart/kivio.desktop
-
-post-install:
-	${MV} ${PREFIX}/bin/kivio ${PREFIX}/bin/kivio.real
-	${INSTALL_SCRIPT} ${FILESDIR}/kivio.sh ${PREFIX}/bin/kivio
+	cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
 
 .include <bsd.port.mk>