update to 3.1 official release

1 files changed, 48 insertions, 38 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index c6ea8bbd4bec..d7460f39a5b1 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -1,80 +1,90 @@
-# New ports collection makefile for:	kdebase3
-# Date created:				Fri Apr 14 2000 15:05:00 EDT
-# Whom:					will
+# -*-mode: makefile-*-
+# New ports collection makefile for:	kdebase3.1
+# Date created:				29 November 2002
+# Whom:					kde@freebsd.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.5
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
-CATEGORIES?=	x11 kde
+CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
-MAINTAINER?=	kde@FreeBSD.org
-
-BUILD_DEPENDS+=	xgettext:${PORTSDIR}/devel/gettext \
-		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\
-		${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=3
-USE_XPM=	yes
+PREFIX=		${KDE_PREFIX}
+KDE_BUILD_PLIST=yes
+
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+USE_XPM=	yes
+USE_REINPLACE=	yes
+
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no
-CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
-		--without-ldap --disable-closure
-USE_GMAKE=	yes
+CONFIGURE_ARGS+=--disable-ltdl-install		\
+		--without-ldap			\
+		--disable-closure		\
+		${XINERAMA}			\
+		--with-qt-dir=${X11BASE}	\
+		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
 .if exists(${X11BASE}/bin/mkfontdir)
-PLIST_SUB+=	MKFONTDIR=""
-.else
-PLIST_SUB+=	MKFONTDIR="@comment "
-.endif
+PLIST_APPEND+=	plist.mkfontdir
+.endif # exists(${X11BASE}/bin/mkfontdir)
 
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
-.endif
+.endif # exists(${X11BASE}/include/Xm/Xm.h)
 
-.if defined(WITH_MOTIF) && ${WITH_MOTIF} == yes
+.if defined(WITH_MOTIF)
 USE_MOTIF=	yes
-PLIST_SUB+=	MOTIF=""
+PLIST_APPEND+=	plist.motif
 .else
-PLIST_SUB+=	MOTIF="@comment "
-pre-everything::
+pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you want to compile with Motif support,"
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_MOTIF=yes\""
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Motif is used for Netscape plugin compatibility."
 	@${ECHO_MSG}
-.endif
+.endif # defined(WITH_MOTIF)
+
+.if defined(WITH_XINERAMA)
+XINERAMA=	-with-xinerama
+PKGNAMESUFFIX=	-xinerama
+.else
+XINERAMA=	-without-xinerama
+pre-extract::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG}
+.endif # defined(WITH_XINERAMA)
 
 post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
-post-patch:
-	@${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \
-		${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop
-
-pre-configure:
-.if ${MACHINE_ARCH} == "alpha"
-	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
-.endif
-	cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs
-
 post-configure:
-	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
+	${REINPLACE_CMD} -e "s@genkdmconf --in@genkdmconf --no-old --in@" \
+		${WRKSRC}/kdm/kfrontend/Makefile
+	${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \
+		${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop
 
 post-install:
+	${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop
 	${CHMOD} u+s ${PREFIX}/bin/kcheckpass
 	${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
 		${CHMOD} g+s ${PREFIX}/bin/ksysguardd