diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-10-11 00:00:00 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-10-11 00:00:00 +0000 |
| commit | 53fa9783e9a36e1385b109375a5f5d255cd0c090 (patch) | |
| tree | 866f45a209c6a99782830f7c0f2666f48d150f19 /x11 | |
| parent | 69a4c09708c54e4569a468304d051a3c19368317 (diff) | |
| download | ports-53fa9783e9a36e1385b109375a5f5d255cd0c090.tar.gz ports-53fa9783e9a36e1385b109375a5f5d255cd0c090.zip | |
Notes
Diffstat (limited to 'x11')
52 files changed, 930 insertions, 154 deletions
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index 5020bbbdda47..3f3f537967e1 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -31,29 +31,6 @@ USE_KDEBASE_VER=3 NO_BUILD= yes -.if !defined(NO_QT_WARNING) -SLEEP?=/bin/sleep -pre-everything:: - @if test -e ${LOCALBASE}/bin/dcop; then \ - ${ECHO_MSG};\ - ${ECHO_MSG} \ - "============================================================";\ - ${ECHO_MSG} "===> " \ - "WARNING!!!";\ - ${ECHO_MSG} "===> " \ - "If you are upgrading Qt from 3.0.4 or an earlier 3.0.x";\ - ${ECHO_MSG} "===> " \ - "version, or have just done so, you MUST remove kdelibs";\ - ${ECHO_MSG} "===> " \ - "using 'pkg_delete -f kdelibs' before making this port.";\ - ${ECHO_MSG} \ - "============================================================";\ - ${ECHO_MSG}; ${SLEEP} 10;\ - else \ - ${TRUE};\ - fi -.endif - do-install: # empty ${DO_NADA} diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kde4-baseapps/files/keramik-patch-kwin-Makefile.am b/x11/kde4-baseapps/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kde4-baseapps/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kde4-baseapps/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kde4-baseapps/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kde4-baseapps/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kde4-runtime/files/keramik-patch-kwin-Makefile.am b/x11/kde4-runtime/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kde4-runtime/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kde4-runtime/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kde4-runtime/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kde4-runtime/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kde4-workspace/files/keramik-patch-kwin-Makefile.am b/x11/kde4-workspace/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kde4-workspace/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kde4-workspace/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kde4-workspace/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kde4-workspace/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 5020bbbdda47..3f3f537967e1 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -31,29 +31,6 @@ USE_KDEBASE_VER=3 NO_BUILD= yes -.if !defined(NO_QT_WARNING) -SLEEP?=/bin/sleep -pre-everything:: - @if test -e ${LOCALBASE}/bin/dcop; then \ - ${ECHO_MSG};\ - ${ECHO_MSG} \ - "============================================================";\ - ${ECHO_MSG} "===> " \ - "WARNING!!!";\ - ${ECHO_MSG} "===> " \ - "If you are upgrading Qt from 3.0.4 or an earlier 3.0.x";\ - ${ECHO_MSG} "===> " \ - "version, or have just done so, you MUST remove kdelibs";\ - ${ECHO_MSG} "===> " \ - "using 'pkg_delete -f kdelibs' before making this port.";\ - ${ECHO_MSG} \ - "============================================================";\ - ${ECHO_MSG}; ${SLEEP} 10;\ - else \ - ${TRUE};\ - fi -.endif - do-install: # empty ${DO_NADA} diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kdebase3/files/keramik-patch-kwin-Makefile.am b/x11/kdebase3/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kdebase3/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kdebase3/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kdebase3/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kdebase3/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kdebase4-runtime/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4-runtime/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kdebase4-runtime/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kdebase4-runtime/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kdebase4-runtime/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kdebase4-workspace/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4-workspace/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kdebase4-workspace/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kdebase4-workspace/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kdebase4-workspace/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 9898a07be82e..9b379205ee6b 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -6,11 +6,16 @@ # PORTNAME= kdebase -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} +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 @@ -25,6 +30,9 @@ 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" @@ -58,14 +66,30 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 -.if ${MACHINE_ARCH} == "alpha" pre-configure: +.if ${MACHINE_ARCH} == "alpha" ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in .endif + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-configure: ${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile @@ -74,5 +98,9 @@ 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 1138f727bd67..1bc7764e027b 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdebase-3.0.3.tar.bz2) = a1c6cb06468608318c5e59e362773360 +MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668 +MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502 diff --git a/x11/kdebase4/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4/files/keramik-patch-kwin-Makefile.am new file mode 100644 index 000000000000..7a14cf7edc7c --- /dev/null +++ b/x11/kdebase4/files/keramik-patch-kwin-Makefile.am @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..bf09b2f0355a --- /dev/null +++ b/x11/kdebase4/files/keramik-patch-kwin-client.h @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..d63afd653f14 --- /dev/null +++ b/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am @@ -0,0 +1,6 @@ +--- 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/pkg-plist b/x11/kdebase4/pkg-plist index 32438099cca3..c7a262f0496e 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -1,3 +1,4 @@ +@comment Generated 20021007 on wwweasel.geeksrus.net by AlanE@FreeBSD.org. bin/appletproxy bin/chooser bin/conttest @@ -106,6 +107,8 @@ 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 @@ -301,6 +304,10 @@ 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 @@ -1326,6 +1333,7 @@ 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 @@ -2543,12 +2551,9 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override @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 @dirrm share/wallpapers @dirrm share/templates/.source/emptydir @dirrm share/templates/.source @@ -2556,7 +2561,10 @@ share/wallpapers/triplegears.jpg @dirrm share/sounds @dirrm share/services/useragentstrings @dirrm share/services/searchproviders +@dirrm share/services/kded @dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ye @dirrm share/locale/l10n/vn @@ -2659,10 +2667,23 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices @dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor @dirrm share/fonts/override -@dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @dirrm share/doc/HTML/en/ksysguard @dirrm share/doc/HTML/en/kpager @@ -2686,6 +2707,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML @dirrm share/config/kdm @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2787,9 +2810,11 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprintfax @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2818,6 +2843,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kate/icons/hicolor/16x16 @dirrm share/apps/kate/icons/hicolor @dirrm share/apps/kate/icons +@dirrm share/apps/kate @dirrm share/apps/kappfinder/apps/WordProcessing @dirrm share/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/apps/kappfinder/apps/Utilities @@ -2887,6 +2913,6 @@ share/wallpapers/triplegears.jpg @dirrm share/applnk/Development @dirrm share/applnk/Applications @dirrm share/applnk/.hidden -@dirrm share/applnk @dirrm include/kwin @dirrm include/ksgrd +@dirrm include/kate diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index eeff9216e65c..d68c757361d7 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -7,10 +7,15 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} 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 @@ -23,13 +28,11 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ pcre.0:${PORTSDIR}/devel/pcre \ cups.2:${PORTSDIR}/print/cups-base \ xslt.1:${PORTSDIR}/textproc/libxslt -RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ - ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif - -KDE_DIST_VERSION=3.0.3a +RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ + ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings USE_OPENSSL= yes USE_QT_VER= 3 @@ -42,6 +45,9 @@ 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" @@ -67,11 +73,32 @@ pre-fetch: kde-version-check @${ECHO} .endif +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-install: - ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh - ${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh + ${MKDIR} ${DESTDIR}${PREFIX}/etc/rc.d + ${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 5c850676d8e0..610ed43e6ec3 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdelibs-3.0.3a.tar.bz2) = 02627f595af113f7d544561a7ff6ec85 +MD5 (KDE/kdelibs-3.0.4.tar.bz2) = 0b81f457a78c07978d2c973e0d7d7d49 +MD5 (KDE/kdelibs-keramik-20021008.1942.tar.bz2) = 84c90553ec2bf52e399cc394c297ca83 diff --git a/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am b/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am new file mode 100644 index 000000000000..99b013949fa1 --- /dev/null +++ b/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am @@ -0,0 +1,5 @@ +--- 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-plist b/x11/kdelibs3/pkg-plist index 69225d77652e..ec200a6a7205 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -563,6 +563,8 @@ 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 @@ -3187,10 +3189,8 @@ share/servicetypes/ktexteditoreditor.desktop share/servicetypes/kurifilterplugin.desktop share/servicetypes/renamedlgplugin.desktop share/servicetypes/scriptinterface.desktop -@comment empty directories @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde -@comment remove directories @dirrm share/servicetypes @dirrm share/services/kded @dirrm share/services @@ -3368,7 +3368,6 @@ share/servicetypes/scriptinterface.desktop @dirrm lib/kde3/plugins/styles @dirrm lib/kde3/plugins/designer @dirrm lib/kde3/plugins -@dirrm lib/kde3 @dirrm include/libkmid @dirrm include/ktexteditor @dirrm include/kparts @@ -3379,3 +3378,4 @@ share/servicetypes/scriptinterface.desktop @dirrm include/kate @dirrm include/kabc @dirrm include/dom +@dirrm include/arts diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index eeff9216e65c..d68c757361d7 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -7,10 +7,15 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_DIST_VERSION} +PORTREVISION= 0 CATEGORIES?= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL_keramik} 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 @@ -23,13 +28,11 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ pcre.0:${PORTSDIR}/devel/pcre \ cups.2:${PORTSDIR}/print/cups-base \ xslt.1:${PORTSDIR}/textproc/libxslt -RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ - ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif - -KDE_DIST_VERSION=3.0.3a +RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ + ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings USE_OPENSSL= yes USE_QT_VER= 3 @@ -42,6 +45,9 @@ 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" @@ -67,11 +73,32 @@ pre-fetch: kde-version-check @${ECHO} .endif +.if !defined(WITHOUT_KERAMIK) +WITH_KERAMIK= yes +.endif # !defined(WITHOUT_KERAMIK) + +.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 + cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs post-install: - ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh - ${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh + ${MKDIR} ${DESTDIR}${PREFIX}/etc/rc.d + ${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 5c850676d8e0..610ed43e6ec3 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdelibs-3.0.3a.tar.bz2) = 02627f595af113f7d544561a7ff6ec85 +MD5 (KDE/kdelibs-3.0.4.tar.bz2) = 0b81f457a78c07978d2c973e0d7d7d49 +MD5 (KDE/kdelibs-keramik-20021008.1942.tar.bz2) = 84c90553ec2bf52e399cc394c297ca83 diff --git a/x11/kdelibs4/files/keramik-patch-kstyles-Makefile.am b/x11/kdelibs4/files/keramik-patch-kstyles-Makefile.am new file mode 100644 index 000000000000..99b013949fa1 --- /dev/null +++ b/x11/kdelibs4/files/keramik-patch-kstyles-Makefile.am @@ -0,0 +1,5 @@ +--- 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-plist b/x11/kdelibs4/pkg-plist index 69225d77652e..ec200a6a7205 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -563,6 +563,8 @@ 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 @@ -3187,10 +3189,8 @@ share/servicetypes/ktexteditoreditor.desktop share/servicetypes/kurifilterplugin.desktop share/servicetypes/renamedlgplugin.desktop share/servicetypes/scriptinterface.desktop -@comment empty directories @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde -@comment remove directories @dirrm share/servicetypes @dirrm share/services/kded @dirrm share/services @@ -3368,7 +3368,6 @@ share/servicetypes/scriptinterface.desktop @dirrm lib/kde3/plugins/styles @dirrm lib/kde3/plugins/designer @dirrm lib/kde3/plugins -@dirrm lib/kde3 @dirrm include/libkmid @dirrm include/ktexteditor @dirrm include/kparts @@ -3379,3 +3378,4 @@ share/servicetypes/scriptinterface.desktop @dirrm include/kate @dirrm include/kabc @dirrm include/dom +@dirrm include/arts |