diff options
| author | alane <alane@FreeBSD.org> | 2002-11-16 22:39:52 +0800 |
|---|---|---|
| committer | alane <alane@FreeBSD.org> | 2002-11-16 22:39:52 +0800 |
| commit | 2aef1292aa0e5cb0adef6eaf033d36cf0d039725 (patch) | |
| tree | 02349978bb6d8b9a16efd9e7bd9a3c5e836816e4 | |
| parent | abc4fdcdbd1ac2bc64b8e140e3baca51b4912699 (diff) | |
| download | freebsd-ports-gnome-2aef1292aa0e5cb0adef6eaf033d36cf0d039725.tar.gz freebsd-ports-gnome-2aef1292aa0e5cb0adef6eaf033d36cf0d039725.tar.zst freebsd-ports-gnome-2aef1292aa0e5cb0adef6eaf033d36cf0d039725.zip | |
Update these ports to 3.0.5 per KDE security advisory. Fix missing deps
in kdebase (I didn't whack those intentionally, I don't think...).
72 files changed, 152 insertions, 918 deletions
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 0bcf66e71310..01174749342d 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdenetwork -PORTVERSION= ${KDE_VERSION} +PORTVERSION= 3.0.5 CATEGORIES?= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 0f8fa50dd8dd..6f17568abc5f 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdenetwork-3.0.4.tar.bz2) = 9f64e76cc6b922e1bf105099e3bf8205 +MD5 (KDE/kdenetwork-3.0.5.tar.bz2) = 504032bceeef0dfa9ff02aed0faf795d diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist index 79086459d68d..de94fd38bdef 100644 --- a/net/kdenetwork3/pkg-plist +++ b/net/kdenetwork3/pkg-plist @@ -306,6 +306,8 @@ share/apps/kppp/Provider/Taiwan/HiNet share/apps/kppp/Provider/Taiwan/SeedNet share/apps/kppp/Provider/Ukraine/.directory share/apps/kppp/Provider/Ukraine/Adamant +share/apps/kppp/Provider/Ukraine/IPTelecom +share/apps/kppp/Provider/Ukraine/NuVse share/apps/kppp/Provider/United_Kingdom/.directory share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666 share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666 @@ -586,6 +588,8 @@ share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst share/apps/kppp/Rules/TEMPLATE share/apps/kppp/Rules/Turkey/Turk_Telekom_Internet.rst +share/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst +share/apps/kppp/Rules/Ukraine/NuVse_hourly.rst share/apps/kppp/Rules/Ukraine/TEMPLATE.uk share/apps/kppp/Rules/Ukraine/Utel_Unet.rst share/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst @@ -806,6 +810,20 @@ share/services/kxmlrpcd.desktop share/services/lan.protocol share/services/rlan.protocol %%KTALKD%%share/sounds/ktalkd.wav +@unexec /bin/rmdir %D/share/sounds 2>/dev/null || true +@unexec /bin/rmdir %D/share/applnk/Settings/Networks 2>/dev/null || true +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/doc/HTML/en/lisa @dirrm share/doc/HTML/en/ktalkd @dirrm share/doc/HTML/en/ksirc @@ -817,6 +835,8 @@ share/services/rlan.protocol @dirrm share/doc/HTML/en/kmail @dirrm share/doc/HTML/en/kit @dirrm share/doc/HTML/en/kdict +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/apps/lisa @dirrm share/apps/ksirc/pics/emoticons @dirrm share/apps/ksirc/pics @@ -890,6 +910,7 @@ share/services/rlan.protocol @dirrm share/apps/kppp @dirrm share/apps/konqueror/dirtree/remote @dirrm share/apps/konqueror/dirtree +@dirrm share/apps/konqueror @dirrm share/apps/knode/pics @dirrm share/apps/knode/icons/hicolor/32x32/actions @dirrm share/apps/knode/icons/hicolor/32x32 @@ -910,6 +931,8 @@ share/services/rlan.protocol @dirrm share/apps/kit/icons/hicolor @dirrm share/apps/kit/icons @dirrm share/apps/kit +@dirrm share/apps/kicker/applets +@dirrm share/apps/kicker @dirrm share/apps/kdict/icons/hicolor/32x32/actions @dirrm share/apps/kdict/icons/hicolor/32x32 @dirrm share/apps/kdict/icons/hicolor/22x22/actions @@ -919,4 +942,11 @@ share/services/rlan.protocol @dirrm share/apps/kdict/icons/hicolor @dirrm share/apps/kdict/icons @dirrm share/apps/kdict +@dirrm share/apps/kconf_update +@dirrm share/applnk/Utilities +@dirrm share/applnk/Settings/System +@dirrm share/applnk/Settings/Personalization +@dirrm share/applnk/Settings +@dirrm share/applnk/Internet +@dirrm share/applnk/.hidden @dirrm include/mimelib diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 0bcf66e71310..01174749342d 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdenetwork -PORTVERSION= ${KDE_VERSION} +PORTVERSION= 3.0.5 CATEGORIES?= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 0f8fa50dd8dd..6f17568abc5f 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdenetwork-3.0.4.tar.bz2) = 9f64e76cc6b922e1bf105099e3bf8205 +MD5 (KDE/kdenetwork-3.0.5.tar.bz2) = 504032bceeef0dfa9ff02aed0faf795d diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist index 79086459d68d..de94fd38bdef 100644 --- a/net/kdenetwork4/pkg-plist +++ b/net/kdenetwork4/pkg-plist @@ -306,6 +306,8 @@ share/apps/kppp/Provider/Taiwan/HiNet share/apps/kppp/Provider/Taiwan/SeedNet share/apps/kppp/Provider/Ukraine/.directory share/apps/kppp/Provider/Ukraine/Adamant +share/apps/kppp/Provider/Ukraine/IPTelecom +share/apps/kppp/Provider/Ukraine/NuVse share/apps/kppp/Provider/United_Kingdom/.directory share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666 share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666 @@ -586,6 +588,8 @@ share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst share/apps/kppp/Rules/TEMPLATE share/apps/kppp/Rules/Turkey/Turk_Telekom_Internet.rst +share/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst +share/apps/kppp/Rules/Ukraine/NuVse_hourly.rst share/apps/kppp/Rules/Ukraine/TEMPLATE.uk share/apps/kppp/Rules/Ukraine/Utel_Unet.rst share/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst @@ -806,6 +810,20 @@ share/services/kxmlrpcd.desktop share/services/lan.protocol share/services/rlan.protocol %%KTALKD%%share/sounds/ktalkd.wav +@unexec /bin/rmdir %D/share/sounds 2>/dev/null || true +@unexec /bin/rmdir %D/share/applnk/Settings/Networks 2>/dev/null || true +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/doc/HTML/en/lisa @dirrm share/doc/HTML/en/ktalkd @dirrm share/doc/HTML/en/ksirc @@ -817,6 +835,8 @@ share/services/rlan.protocol @dirrm share/doc/HTML/en/kmail @dirrm share/doc/HTML/en/kit @dirrm share/doc/HTML/en/kdict +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/apps/lisa @dirrm share/apps/ksirc/pics/emoticons @dirrm share/apps/ksirc/pics @@ -890,6 +910,7 @@ share/services/rlan.protocol @dirrm share/apps/kppp @dirrm share/apps/konqueror/dirtree/remote @dirrm share/apps/konqueror/dirtree +@dirrm share/apps/konqueror @dirrm share/apps/knode/pics @dirrm share/apps/knode/icons/hicolor/32x32/actions @dirrm share/apps/knode/icons/hicolor/32x32 @@ -910,6 +931,8 @@ share/services/rlan.protocol @dirrm share/apps/kit/icons/hicolor @dirrm share/apps/kit/icons @dirrm share/apps/kit +@dirrm share/apps/kicker/applets +@dirrm share/apps/kicker @dirrm share/apps/kdict/icons/hicolor/32x32/actions @dirrm share/apps/kdict/icons/hicolor/32x32 @dirrm share/apps/kdict/icons/hicolor/22x22/actions @@ -919,4 +942,11 @@ share/services/rlan.protocol @dirrm share/apps/kdict/icons/hicolor @dirrm share/apps/kdict/icons @dirrm share/apps/kdict +@dirrm share/apps/kconf_update +@dirrm share/applnk/Utilities +@dirrm share/applnk/Settings/System +@dirrm share/applnk/Settings/Personalization +@dirrm share/applnk/Settings +@dirrm share/applnk/Internet +@dirrm share/applnk/.hidden @dirrm include/mimelib diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kde4-baseapps/files/keramik-patch-kwin-Makefile.am b/x11/kde4-baseapps/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kde4-baseapps/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kde4-baseapps/files/keramik-patch-kwin-client.h b/x11/kde4-baseapps/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kde4-baseapps/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kde4-baseapps/files/keramik-patch-kwin-clients-Makefile.am b/x11/kde4-baseapps/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kde4-baseapps/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kde4-baseapps/pkg-message b/x11/kde4-baseapps/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kde4-baseapps/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kde4-runtime/files/keramik-patch-kwin-Makefile.am b/x11/kde4-runtime/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kde4-runtime/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kde4-runtime/files/keramik-patch-kwin-client.h b/x11/kde4-runtime/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kde4-runtime/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kde4-runtime/files/keramik-patch-kwin-clients-Makefile.am b/x11/kde4-runtime/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kde4-runtime/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kde4-runtime/pkg-message b/x11/kde4-runtime/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kde4-runtime/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kde4-workspace/files/keramik-patch-kwin-Makefile.am b/x11/kde4-workspace/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kde4-workspace/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kde4-workspace/files/keramik-patch-kwin-client.h b/x11/kde4-workspace/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kde4-workspace/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kde4-workspace/files/keramik-patch-kwin-clients-Makefile.am b/x11/kde4-workspace/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kde4-workspace/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kde4-workspace/pkg-message b/x11/kde4-workspace/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kde4-workspace/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kdebase3/files/keramik-patch-kwin-Makefile.am b/x11/kdebase3/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kdebase3/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kdebase3/files/keramik-patch-kwin-client.h b/x11/kdebase3/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kdebase3/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kdebase3/files/keramik-patch-kwin-clients-Makefile.am b/x11/kdebase3/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kdebase3/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kdebase3/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kdebase3/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kdebase3/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kdebase3/pkg-message b/x11/kdebase3/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kdebase3/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kdebase4-runtime/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4-runtime/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kdebase4-runtime/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kdebase4-runtime/files/keramik-patch-kwin-client.h b/x11/kdebase4-runtime/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kdebase4-runtime/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kdebase4-runtime/files/keramik-patch-kwin-clients-Makefile.am b/x11/kdebase4-runtime/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kdebase4-runtime/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kdebase4-runtime/pkg-message b/x11/kdebase4-runtime/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kdebase4-runtime/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kdebase4-workspace/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4-workspace/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kdebase4-workspace/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kdebase4-workspace/files/keramik-patch-kwin-client.h b/x11/kdebase4-workspace/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kdebase4-workspace/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kdebase4-workspace/files/keramik-patch-kwin-clients-Makefile.am b/x11/kdebase4-workspace/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kdebase4-workspace/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kdebase4-workspace/pkg-message b/x11/kdebase4-workspace/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kdebase4-workspace/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index b369c9f56a52..4372c9747e0c 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -6,20 +6,18 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext +BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext \ + ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake USE_KDELIBS_VER=3 USE_XPM= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -66,17 +61,6 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # !defined(WITH_KERAMIK) - post-patch: @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop @@ -94,9 +78,5 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 1bc7764e027b..e22e00242db2 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 -MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 +MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 diff --git a/x11/kdebase4/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4/files/keramik-patch-kwin-Makefile.am deleted file mode 100644 index 7a14cf7edc7c..000000000000 --- a/x11/kdebase4/files/keramik-patch-kwin-Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/Makefile.am.orig Fri Mar 8 15:49:39 2002 -+++ kwin/Makefile.am Sun Oct 6 16:33:31 2002 -@@ -8,14 +8,15 @@ - # workspace.cpp has to be first in order not to break --enable-final - kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ -- killwindow.cpp kwinbutton.cpp -+ killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp - kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) - kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - - kwinincludedir = $(includedir)/kwin --kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h -+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \ -+ placement.h popupinfo.h - - kwin_SOURCES = kwin_main.cpp - kwin_LDADD = kwin.la diff --git a/x11/kdebase4/files/keramik-patch-kwin-client.h b/x11/kdebase4/files/keramik-patch-kwin-client.h deleted file mode 100644 index bf09b2f0355a..000000000000 --- a/x11/kdebase4/files/keramik-patch-kwin-client.h +++ /dev/null @@ -1,27 +0,0 @@ ---- kwin/client.h.orig Sun Oct 6 16:00:30 2002 -+++ kwin/client.h Sun Oct 6 14:49:21 2002 -@@ -161,6 +161,7 @@ - bool isTool() const; // KDE4 remove me - bool isToolbar() const; - bool isTopMenu() const; -+ bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org> - bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient' - bool isDialog() const; - -@@ -505,6 +506,16 @@ - { - return cmap; - } -+ -+/* -+ compat. for 3.0.x <alane@freebsd.org> -+*/ -+ -+inline bool Client::isMenu() const -+{ -+ return isTopMenu(); -+} -+ - - class NoBorderClient : public Client - { diff --git a/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am b/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am deleted file mode 100644 index d63afd653f14..000000000000 --- a/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ ---- kwin/clients/Makefile.am.orig Sat Jan 26 11:06:53 2002 -+++ kwin/clients/Makefile.am Mon Oct 7 03:51:41 2002 -@@ -1,2 +1,2 @@ - SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \ -- modernsystem laptop system kwmtheme kstep -+ modernsystem laptop system kwmtheme kstep keramik diff --git a/x11/kdebase4/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kdebase4/files/patch-ksysguard-ksysguardd-FBSD-netdev.c deleted file mode 100644 index 33eaede03c2d..000000000000 --- a/x11/kdebase4/files/patch-ksysguard-ksysguardd-FBSD-netdev.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Fri Oct 11 18:06:41 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Fri Oct 11 18:06:58 2002 -@@ -20,6 +20,7 @@ - */ - - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> -@@ -27,7 +28,6 @@ - #include <string.h> - #include <sys/sysctl.h> - #include <sys/time.h> --#include <sys/types.h> - #include <unistd.h> - - diff --git a/x11/kdebase4/pkg-message b/x11/kdebase4/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kdebase4/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 806a0450c141..e7e05da9e53a 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h -%%KERAMIK%%include/kwin/placement.h -%%KERAMIK%%include/kwin/popupinfo.h include/kwin/workspace.h lib/appletproxy.la lib/appletproxy.so @@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -%%KERAMIK%%lib/kde3/kwin_keramik.la -%%KERAMIK%%lib/kde3/kwin_keramik.so -%%KERAMIK%%lib/kde3/kwin_keramik_config.la -%%KERAMIK%%lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm share/apps/kwin/icewm-themes/titleIT.xpm share/apps/kwin/icewm.desktop share/apps/kwin/kde1.desktop -%%KERAMIK%%share/apps/kwin/keramik.desktop share/apps/kwin/kstep.desktop share/apps/kwin/laptop.desktop share/apps/kwin/modernsystem.desktop @@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg @exec /bin/mkdir -p %D/share/apps/kscreensaver @exec /bin/mkdir -p %D/share/fonts/override @exec /bin/mkdir -p %D/share/templates/.source/emptydir +@unexec /bin/rmdir %D/share/templates/.source/emptydir || true +@unexec /bin/rmdir %D/share/fonts/override || true +@unexec /bin/rmdir %D/share/apps/kscreensaver || true @dirrm share/wallpapers -@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds @@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/fonts/override @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/ksplash @dirrm share/apps/ksmserver/pics @dirrm share/apps/ksmserver -@dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer @dirrm share/apps/konsole diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 56a4db31f61a..69fa51bcb9ce 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -6,21 +6,17 @@ # PORTNAME= kdelibs -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf \ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ qtmcop.1:${PORTSDIR}/audio/arts \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ @@ -45,9 +41,6 @@ PREFIX?= ${KDE_PREFIX} CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install FONTSCALE= ${X11BASE}/lib/X11/fonts/PEX/Roman.phont FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../kde3/Makefile.kde" @@ -73,17 +66,6 @@ pre-fetch: kde-version-check @${ECHO} .endif -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # defined(WITH_KERAMIK) - pre-configure: cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs @@ -92,9 +74,5 @@ post-install: ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > \ ${DESTDIR}${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/etc/rc.d/kdelibs.sh -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 610ed43e6ec3..d6c3d97eb64f 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdelibs-3.0.4.tar.bz2) = 0b81f457a78c07978d2c973e0d7d7d49 -MD5 (KDE/kdelibs-keramik-20021008.1942.tar.bz2) = 84c90553ec2bf52e399cc394c297ca83 +MD5 (KDE/kdelibs-3.0.5.tar.bz2) = ff22bd58b91ac34e476c308d345421aa diff --git a/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am b/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am deleted file mode 100644 index 99b013949fa1..000000000000 --- a/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ ---- kstyles/Makefile.am.orig Sun Jan 20 21:45:25 2002 -+++ kstyles/Makefile.am Fri Oct 4 22:40:56 2002 -@@ -1 +1 @@ --SUBDIRS = highcolor themes light kthemestyle pics riscos utils -+SUBDIRS = highcolor themes light kthemestyle pics riscos keramik utils diff --git a/x11/kdelibs3/pkg-message b/x11/kdelibs3/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kdelibs3/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index ec200a6a7205..6383bac85692 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -563,8 +563,6 @@ lib/kde3/plugins/designer/kdewidgets.la lib/kde3/plugins/designer/kdewidgets.so lib/kde3/plugins/styles/highcolor.la lib/kde3/plugins/styles/highcolor.so -%%KERAMIK%%lib/kde3/plugins/styles/keramik.la -%%KERAMIK%%lib/kde3/plugins/styles/keramik.so lib/kde3/plugins/styles/kthemestyle.la lib/kde3/plugins/styles/kthemestyle.so lib/kde3/plugins/styles/light.la @@ -3191,9 +3189,9 @@ share/servicetypes/renamedlgplugin.desktop share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde -@dirrm share/servicetypes +@unexec /bin/rmdir %D/share/icons/hicolor/32x32/actions/kde || true +@unexec /bin/rmdir %D/share/icons/hicolor/22x22/actions/kde || true @dirrm share/services/kded -@dirrm share/services @dirrm share/mimelnk/video @dirrm share/mimelnk/text @dirrm share/mimelnk/multipart @@ -3215,10 +3213,8 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/hicolor/32x32/mimetypes @dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/devices -@dirrm share/icons/hicolor/32x32/actions/kde @dirrm share/icons/hicolor/32x32/actions @dirrm share/icons/hicolor/32x32 -@dirrm share/icons/hicolor/22x22/actions/kde @dirrm share/icons/hicolor/22x22/actions @dirrm share/icons/hicolor/22x22 @dirrm share/icons/hicolor/16x16/mimetypes @@ -3228,15 +3224,12 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/icons @dirrm share/doc/HTML/en/kspell @dirrm share/doc/HTML/en/common @dirrm share/doc/HTML/en @dirrm share/doc/HTML @dirrm share/config/ui @dirrm share/config/colors -@dirrm share/config -@dirrm share/autostart @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps/riscos @dirrm share/apps/kstyle/pixmaps @@ -3364,7 +3357,6 @@ share/servicetypes/scriptinterface.desktop @dirrm share/apps/kate/syntax @dirrm share/apps/kate @dirrm share/apps/LICENSES -@dirrm share/apps @dirrm lib/kde3/plugins/styles @dirrm lib/kde3/plugins/designer @dirrm lib/kde3/plugins @@ -3379,3 +3371,4 @@ share/servicetypes/scriptinterface.desktop @dirrm include/kabc @dirrm include/dom @dirrm include/arts +@dirrm etc/rc.d diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 56a4db31f61a..69fa51bcb9ce 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -6,21 +6,17 @@ # PORTNAME= kdelibs -PORTVERSION= ${KDE_DIST_VERSION} -PORTREVISION= 1 +PORTVERSION= 3.0.5 +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE_kde} \ - ${MASTER_SITE_LOCAL_keramik} +MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:kde \ - ${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik DIST_SUBDIR= KDE -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2 MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf \ + ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ qtmcop.1:${PORTSDIR}/audio/arts \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ @@ -45,9 +41,6 @@ PREFIX?= ${KDE_PREFIX} CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install FONTSCALE= ${X11BASE}/lib/X11/fonts/PEX/Roman.phont FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc -KERAMIK_DATE= 20021008.1942 - -MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g} .include "${.CURDIR}/../kde3/Makefile.kde" @@ -73,17 +66,6 @@ pre-fetch: kde-version-check @${ECHO} .endif -.if defined(WITH_KERAMIK) -PLIST_SUB+= KERAMIK="" -KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2 -pre-patch: - @cd ${WRKSRC};\ - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\ - ${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS} -.else -PLIST_SUB+= KERAMIK="@comment " -.endif # defined(WITH_KERAMIK) - pre-configure: cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs @@ -92,9 +74,5 @@ post-install: ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > \ ${DESTDIR}${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/etc/rc.d/kdelibs.sh -.if defined(WITH_KERAMIK) - @if test -f ${PKGMESSAGE}; then \ - ${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi -.endif # defined(WITH_KERAMIK) .include <bsd.port.post.mk> diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 610ed43e6ec3..d6c3d97eb64f 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1 @@ -MD5 (KDE/kdelibs-3.0.4.tar.bz2) = 0b81f457a78c07978d2c973e0d7d7d49 -MD5 (KDE/kdelibs-keramik-20021008.1942.tar.bz2) = 84c90553ec2bf52e399cc394c297ca83 +MD5 (KDE/kdelibs-3.0.5.tar.bz2) = ff22bd58b91ac34e476c308d345421aa diff --git a/x11/kdelibs4/files/keramik-patch-kstyles-Makefile.am b/x11/kdelibs4/files/keramik-patch-kstyles-Makefile.am deleted file mode 100644 index 99b013949fa1..000000000000 --- a/x11/kdelibs4/files/keramik-patch-kstyles-Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ ---- kstyles/Makefile.am.orig Sun Jan 20 21:45:25 2002 -+++ kstyles/Makefile.am Fri Oct 4 22:40:56 2002 -@@ -1 +1 @@ --SUBDIRS = highcolor themes light kthemestyle pics riscos utils -+SUBDIRS = highcolor themes light kthemestyle pics riscos keramik utils diff --git a/x11/kdelibs4/pkg-message b/x11/kdelibs4/pkg-message deleted file mode 100644 index bcfb87dc3a8a..000000000000 --- a/x11/kdelibs4/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -********************************************************************** -********************************************************************** -NOTE: The "Keramik" style is experimental. It was brought in from -KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks -you get to keep all the pieces. -********************************************************************** -********************************************************************** diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index ec200a6a7205..6383bac85692 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -563,8 +563,6 @@ lib/kde3/plugins/designer/kdewidgets.la lib/kde3/plugins/designer/kdewidgets.so lib/kde3/plugins/styles/highcolor.la lib/kde3/plugins/styles/highcolor.so -%%KERAMIK%%lib/kde3/plugins/styles/keramik.la -%%KERAMIK%%lib/kde3/plugins/styles/keramik.so lib/kde3/plugins/styles/kthemestyle.la lib/kde3/plugins/styles/kthemestyle.so lib/kde3/plugins/styles/light.la @@ -3191,9 +3189,9 @@ share/servicetypes/renamedlgplugin.desktop share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde -@dirrm share/servicetypes +@unexec /bin/rmdir %D/share/icons/hicolor/32x32/actions/kde || true +@unexec /bin/rmdir %D/share/icons/hicolor/22x22/actions/kde || true @dirrm share/services/kded -@dirrm share/services @dirrm share/mimelnk/video @dirrm share/mimelnk/text @dirrm share/mimelnk/multipart @@ -3215,10 +3213,8 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/hicolor/32x32/mimetypes @dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/devices -@dirrm share/icons/hicolor/32x32/actions/kde @dirrm share/icons/hicolor/32x32/actions @dirrm share/icons/hicolor/32x32 -@dirrm share/icons/hicolor/22x22/actions/kde @dirrm share/icons/hicolor/22x22/actions @dirrm share/icons/hicolor/22x22 @dirrm share/icons/hicolor/16x16/mimetypes @@ -3228,15 +3224,12 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/icons @dirrm share/doc/HTML/en/kspell @dirrm share/doc/HTML/en/common @dirrm share/doc/HTML/en @dirrm share/doc/HTML @dirrm share/config/ui @dirrm share/config/colors -@dirrm share/config -@dirrm share/autostart @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps/riscos @dirrm share/apps/kstyle/pixmaps @@ -3364,7 +3357,6 @@ share/servicetypes/scriptinterface.desktop @dirrm share/apps/kate/syntax @dirrm share/apps/kate @dirrm share/apps/LICENSES -@dirrm share/apps @dirrm lib/kde3/plugins/styles @dirrm lib/kde3/plugins/designer @dirrm lib/kde3/plugins @@ -3379,3 +3371,4 @@ share/servicetypes/scriptinterface.desktop @dirrm include/kabc @dirrm include/dom @dirrm include/arts +@dirrm etc/rc.d |