diff --git a/x11/kde-shared-data/Makefile b/x11/kde-shared-data/Makefile index 88918829abe..a8f8c911b77 100644 --- a/x11/kde-shared-data/Makefile +++ b/x11/kde-shared-data/Makefile @@ -1,27 +1,19 @@ -# $OpenBSD: Makefile,v 1.9 2020/06/30 07:15:15 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.10 2020/06/30 07:20:27 rsadowski Exp $ -BROKEN = KDE4 deleted, update is coming -COMMENT = common run-time components for KDE3 and KDE4 +COMMENT = common run-time components for KDE3 CATEGORIES = x11 x11/kde3 -PKGNAME = kde-shared-data-${MODKDE4_VERSION} +PKGNAME = kde-shared-data-4.14.3 PKG_ARCH = * -REVISION = 3 - -MODULES = x11/kde4 -MODKDE4_USE = -MODKDE4_NO_QT = Yes -MODKDE4_FIX_GETTEXT = No +REVISION = 4 PERMIT_PACKAGE = Yes KDE3_VERSION = 3.5.10 -DISTFILES = kdebase-${KDE3_VERSION}.tar.bz2 \ - kde-runtime-${MODKDE4_VERSION}.tar.xz:0 +DISTFILES = kdebase-${KDE3_VERSION}.tar.bz2 DIST_SUBDIR = kde MASTER_SITES = ${MASTER_SITE_KDE:=stable/${KDE3_VERSION}/src/} -MASTER_SITES0 = ${MASTER_SITE_KDE:=stable/${MODKDE4_VERSION}/src/} BUILD_DEPENDS = WANTLIB = @@ -42,36 +34,19 @@ do-extract: cd ${WRKDIR}; ${LOCALBASE}/bin/bzcat \ ${FULLDISTDIR}/${DISTFILES:C/:[0-9]$//:M*.bz2} | \ pax -r '*/kde*.directory' - cd ${WRKDIR}; ${LOCALBASE}/bin/xzcat \ - ${FULLDISTDIR}/${DISTFILES:C/:[0-9]$//:M*.xz} | \ - pax -r '*/kde*.directory' '*/hi*.png' '*/hisc*.svgz' do-install: # desktop directory descriptions, ordering matters ${INSTALL_DATA_DIR} ${DESKDIRS} cd ${WRKSRC}/kdebase-${KDE3_VERSION}/applnk; \ ${INSTALL_DATA} kde*.directory ${DESKDIRS} - cd ${WRKSRC}/kde-runtime-${MODKDE4_VERSION}/menu/desktop; \ - ${INSTALL_DATA} kde*.directory ${DESKDIRS} # PNG icons .for _dim in ${ICON_DIMS} ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/${_dim}x${_dim}/apps -. for _app in ${ICON_APPS} - cd ${WRKSRC}/kde-runtime-${MODKDE4_VERSION}; \ - ! test -e ${_app}/hi${_dim}-app-${_app}.png || \ - ${INSTALL_DATA} ${_app}/hi${_dim}-app-${_app}.png \ - ${PREFIX}/share/icons/hicolor/${_dim}x${_dim}/apps -. endfor .endfor # scalable icons ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps -.for _app in ${ICON_APPS} - cd ${WRKSRC}/kde-runtime-${MODKDE4_VERSION}; \ - ! test -e ${_app}/hisc-app-${_app}.svgz || \ - ${INSTALL_DATA} ${_app}/hisc-app-${_app}.svgz \ - ${PREFIX}/share/icons/hicolor/scalable/apps -.endfor .include diff --git a/x11/kde-shared-data/distinfo b/x11/kde-shared-data/distinfo index f5e6aefc776..5a21be0ce63 100644 --- a/x11/kde-shared-data/distinfo +++ b/x11/kde-shared-data/distinfo @@ -1,4 +1,2 @@ -SHA256 (kde/kde-runtime-4.14.3.tar.xz) = eKdOUZtOiX/87hS+mO69e2cq0rtucaSqL+d2grW8hgU= SHA256 (kde/kdebase-3.5.10.tar.bz2) = d6qdjyjFMvLnpRV6f0uo3xAB8A+hy3LLcLOIs9Dha2E= -SIZE (kde/kde-runtime-4.14.3.tar.xz) = 7867308 SIZE (kde/kdebase-3.5.10.tar.bz2) = 24339704 diff --git a/x11/kde-shared-data/pkg/DESCR b/x11/kde-shared-data/pkg/DESCR index 417870c7572..93edeb0caba 100644 --- a/x11/kde-shared-data/pkg/DESCR +++ b/x11/kde-shared-data/pkg/DESCR @@ -1,2 +1 @@ -This package installs common non-compiled run-time components used by -both KDE 3 and KDE 4. This allows to run KDE 3 & 4 apps simultaneously. +This package installs common non-compiled run-time components for KDE3. diff --git a/x11/kde-shared-data/pkg/PLIST b/x11/kde-shared-data/pkg/PLIST index cabae7b7e8e..02a0b0c72a6 100644 --- a/x11/kde-shared-data/pkg/PLIST +++ b/x11/kde-shared-data/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2018/06/29 22:16:26 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2020/06/30 07:20:27 rsadowski Exp $ @conflict kdebase-<3.5.10p32 @conflict kde-runtime-<4.11.4p2 share/desktop-directories/ @@ -6,18 +6,11 @@ share/desktop-directories/kde-development-translation.directory share/desktop-directories/kde-development-webdevelopment.directory share/desktop-directories/kde-development.directory share/desktop-directories/kde-editors.directory -share/desktop-directories/kde-edu-languages.directory -share/desktop-directories/kde-edu-mathematics.directory -share/desktop-directories/kde-edu-miscellaneous.directory -share/desktop-directories/kde-edu-science.directory -share/desktop-directories/kde-edu-tools.directory -share/desktop-directories/kde-education.directory share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory share/desktop-directories/kde-games-kids.directory -share/desktop-directories/kde-games-logic.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -56,11 +49,4 @@ share/desktop-directories/kde-utilities-peripherals.directory share/desktop-directories/kde-utilities-pim.directory share/desktop-directories/kde-utilities-xutils.directory share/desktop-directories/kde-utilities.directory -share/icons/hicolor/128x128/apps/hi128-app-knetattach.png -share/icons/hicolor/16x16/apps/hi16-app-knetattach.png -share/icons/hicolor/22x22/apps/hi22-app-knetattach.png -share/icons/hicolor/32x32/apps/hi32-app-knetattach.png -share/icons/hicolor/48x48/apps/hi48-app-knetattach.png -share/icons/hicolor/64x64/apps/hi64-app-knetattach.png -share/icons/hicolor/scalable/apps/hisc-app-knetattach.svgz @tag gtk-update-icon-cache %D/share/icons/hicolor