aboutsummaryrefslogtreecommitdiff
path: root/x11/kdebase4
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdebase4')
-rw-r--r--x11/kdebase4/Makefile33
-rw-r--r--x11/kdebase4/distinfo2
-rw-r--r--x11/kdebase4/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kdebase4/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kdebase4/files/plist.base13
-rw-r--r--x11/kdebase4/files/plist.base.rm2
-rw-r--r--x11/kdebase4/files/plist.mkfontdir2
-rw-r--r--x11/kdebase4/files/plist.motif1
8 files changed, 22 insertions, 70 deletions
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kdebase4/files/patch-ksysguard-CPU.c b/x11/kdebase4/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kdebase4/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kdebase4/files/patch-ksysguard-ProcessList.c b/x11/kdebase4/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kdebase4/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kdebase4/files/plist.base
+++ b/x11/kdebase4/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kdebase4/files/plist.base.rm b/x11/kdebase4/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kdebase4/files/plist.base.rm
+++ b/x11/kdebase4/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kdebase4/files/plist.mkfontdir b/x11/kdebase4/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kdebase4/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kdebase4/files/plist.motif b/x11/kdebase4/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kdebase4/files/plist.motif
+++ b/x11/kdebase4/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 15:53:14 +0000