From 60ff6f684b59c131c3404776020f85d5797b99f4 Mon Sep 17 00:00:00 2001 From: will Date: Sat, 15 Jun 2002 16:16:32 +0000 Subject: Upgrade to KDE 3.0.1. The delay in this upgrade is mainly due to the rigorous testing performed on the part of the KDE/FreeBSD Project over the last three weeks. Thanks to everyone who helped test! General changes: [1] Follow KDE2 style by moving KDE core specific macros and the like to x11/kde3/Makefile.kde. [2] Fix a variety of comments or miscellaneous data to reflect that this is KDE3 and not KDE2. [3] Account for more empty directories in the PLISTs. deskutils/kdepim3: [4] More #include -> #include . audio/arts: [5] Upgrade to 1.0.1. [6] Point at MASTER_SITE_KDE not my own mirror. audio/kdemultimedia3: [7] Account for the removal of the symlink. Simply point all such includes at . editors/koffice-kde3: [8] Get rid of #include preemptively. devel/kdesdk3: [9] Remove cervisia from build if building on -CURRENT due to C++-unsafe sys/wait.h. The header is believed to have been fixed in newer -CURRENT (>= Jun 5) but we have not tested that. devel/kdevelop: [10] Upgrade to 2.1.1 and use KDE 3 version. [11] Remove a number of suggested dependencies that no longer fit. [12] Account for where the docs for Qt went since they got moved to fit in hier(7) better. graphics/kdegraphics3: [13] Turn off kuickshow by default because it depends on imlib, which in turn depends on gtk/glib. This will be revisited when we split up the KDE ports a bit. games/kdegames3: [14] Fix compile error on -CURRENT where kpat/freecell-solver/md5.h tried to define uint32_t after sys/types.h already had. sysutils/kdeadmin3: No particular changes. misc/kdeaddons3: No particular changes. misc/kdeedu3: [15] Re-add the huge number of missing @dirrm's. misc/kdeutils3: No particular changes. misc/kde3-i18n-* and */kde3-i18n: For the most part, no particular changes. A huge number of I18N message updates went into this release, though. french/kde3-i18n: [16] Fix build Makefile error due to tarball builder's env. net/kdenetwork3: No particular changes. x11-clocks/kdetoys3: No particular changes. x11/kdebase3: [17] Account for mkfontdir "soft" build-time dependency. If mkfontdir is available, use it to build fonts.dir where kdebase installs fonts. Otherwise, don't bother. [18] Patch ElectricEyes.desktop to use the name of the program that FreeBSD uses when you install the port for it. [19] Patches for KDM merged into KDE 3.0.1. [20] Properly fix kdm/backend/xdmcp.c string format error. x11/kdelibs3: [21] Support the KDE3 version check to make sure no one tries to install KDE2 then KDE3. The 'kde-version-check' target is centralized in x11/kde3/Makefile.kde. [22] Remove patch for kdeprint/configure.in.in. [23] Add patch to fix critical icon loader bug. x11/kde3: [24] Add Makefile.kde for centralizing KDE core-specific macros that don't belong in bsd.kde.mk. x11-toolkits/qt30: [25] Mark broken on any XFree86 version < 4 due to packing list related problems if we tried to support XFree86 3. [26] Error out if the user has Qt2 installed already. x11-wm/kdeartwork3: [27] Add USE_MESA to explicitly support the 3D screensavers. [28] Re-add a large number of missing @dirrm's. Credits: [1] [4] [5] [6] [7] [9] [10] [14] [16] [21] [22] [24] [26]: will [2] [3] [8] [15] [17] [19] [25] [27] [28]: alane [11] [12] Submitted by: Lauri Watts [13] Found by: mi Removed by: will [18] [23] Submitted by: Andy Fawcett Tested by: [in addition to the above, in no particular order] knu Mattias Douhan Bradley T. Hughes Erik H. Bakke David Johnson JJ Behrens Michael W. Collette Adriaan de Groot Mark Rowlands Mark Stosberg Dave Cantrell Mark Miller Wesley Morgan Arjan van Leeuwen --- x11/kdebase3/Makefile | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'x11/kdebase3/Makefile') diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index a8e728b..786604e 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kdebase2 +# New ports collection makefile for: kdebase3 # Date created: Fri Apr 14 2000 15:05:00 EDT # Whom: will # @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 3.0 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -22,21 +21,21 @@ USE_XPM= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure -.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 +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + .include +.if exists(${X11BASE}/bin/mkfontdir) +PLIST_SUB+= MKFONTDIR="" +.else +PLIST_SUB+= MKFONTDIR="@comment " +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif @@ -59,6 +58,10 @@ 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 + .if ${MACHINE_ARCH} == "alpha" pre-configure: ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in -- cgit v1.1