From 2dd8e59bf05c45316fb05b75d45e6c19a1bfe3e0 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 31 Aug 2010 08:22:04 +0000 Subject: [PATCH] - remove superfluous PKGNAME=${DISTNAME} construct here too --- x11/kde4/accessibility/Makefile | 3 +-- x11/kde4/admin/Makefile | 3 +-- x11/kde4/artwork/Makefile | 3 +-- x11/kde4/base-runtime/Makefile | 3 +-- x11/kde4/base-workspace/Makefile | 3 +-- x11/kde4/base/Makefile | 3 +-- x11/kde4/edu/Makefile | 3 +-- x11/kde4/extragear-plasma/Makefile | 4 ++-- x11/kde4/games/Makefile | 3 +-- x11/kde4/graphics/Makefile | 3 +-- x11/kde4/libs/Makefile | 3 +-- x11/kde4/multimedia/Makefile | 3 +-- x11/kde4/network/Makefile | 3 +-- x11/kde4/oxygen-icons/Makefile | 3 +-- x11/kde4/pim/Makefile | 3 +-- x11/kde4/pimlibs/Makefile | 3 +-- x11/kde4/qimageblitz/Makefile | 3 +-- x11/kde4/sdk/Makefile | 3 +-- x11/kde4/toys/Makefile | 3 +-- x11/kde4/utils/Makefile | 3 +-- x11/kde4/velop/Makefile | 4 ++-- x11/kde4/webdev/Makefile | 3 +-- 22 files changed, 24 insertions(+), 44 deletions(-) diff --git a/x11/kde4/accessibility/Makefile b/x11/kde4/accessibility/Makefile index afe97ab1b1a..d9e7d50a73f 100644 --- a/x11/kde4/accessibility/Makefile +++ b/x11/kde4/accessibility/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/08/31 08:22:04 jasper Exp $ COMMENT = K Desktop Environment, accessibility DISTNAME = kdeaccessibility-${VERSION} -PKGNAME = ${DISTNAME} #SHARED_LIBS += kttsd 3.0 # .4.0 diff --git a/x11/kde4/admin/Makefile b/x11/kde4/admin/Makefile index 9750d020345..4378fdbc0f7 100644 --- a/x11/kde4/admin/Makefile +++ b/x11/kde4/admin/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/08/31 08:22:04 jasper Exp $ COMMENT = K Desktop Environment, admin tools DISTNAME = kdeadmin-${VERSION} -PKGNAME = ${DISTNAME} LIB_DEPENDS += ::x11/kde4/libs \ ::x11/kde4/pimlibs diff --git a/x11/kde4/artwork/Makefile b/x11/kde4/artwork/Makefile index ea7f8a1a95c..e0bc76f77e5 100644 --- a/x11/kde4/artwork/Makefile +++ b/x11/kde4/artwork/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/08/31 08:22:04 jasper Exp $ COMMENT = K Desktop Environment, artwork DISTNAME = kdeartwork-${VERSION} -PKGNAME = ${DISTNAME} LIB_DEPENDS += ::x11/kde4/libs \ ::x11/kde4/base-workspace diff --git a/x11/kde4/base-runtime/Makefile b/x11/kde4/base-runtime/Makefile index 4772a933e83..2aaa4c99ebc 100644 --- a/x11/kde4/base-runtime/Makefile +++ b/x11/kde4/base-runtime/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/08/31 08:22:04 jasper Exp $ COMMENT = K Desktop Environment, base runtime DISTNAME = kdebase-runtime-${VERSION} -PKGNAME = ${DISTNAME} LIB_DEPENDS += ::x11/kde4/libs \ ::multimedia/phonon \ diff --git a/x11/kde4/base-workspace/Makefile b/x11/kde4/base-workspace/Makefile index 53c0f7ba200..af391d1596e 100644 --- a/x11/kde4/base-workspace/Makefile +++ b/x11/kde4/base-workspace/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/08/31 08:22:04 jasper Exp $ COMMENT = K Desktop Environment, base workspace DISTNAME = kdebase-workspace-${VERSION} -PKGNAME = ${DISTNAME} LIB_DEPENDS += ::x11/kde4/libs \ ::x11/gnome/libxklavier \ diff --git a/x11/kde4/base/Makefile b/x11/kde4/base/Makefile index f4664fce0c5..0438537549f 100644 --- a/x11/kde4/base/Makefile +++ b/x11/kde4/base/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.11 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/08/31 08:22:04 jasper Exp $ COMMENT = K Desktop Environment, base DISTNAME = kdebase-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += konq 8.0 # .6.0 SHARED_LIBS += konqsidebarplugin 5.0 # .4.0 diff --git a/x11/kde4/edu/Makefile b/x11/kde4/edu/Makefile index d097d6ae81c..4a7d8302072 100644 --- a/x11/kde4/edu/Makefile +++ b/x11/kde4/edu/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.12 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, edu DISTNAME = kdeedu-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += kdeeduui 5.0 # .4.0 SHARED_LIBS += science 0.0 # .4.0 diff --git a/x11/kde4/extragear-plasma/Makefile b/x11/kde4/extragear-plasma/Makefile index 8ae132a6a40..69dc471239f 100644 --- a/x11/kde4/extragear-plasma/Makefile +++ b/x11/kde4/extragear-plasma/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2010/01/30 19:08:30 jolan Exp $ +# $OpenBSD: Makefile,v 1.7 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, extra plasmoids DISTNAME = extragear-plasma-${VERSION} -PKGNAME = ${DISTNAME}p1 +REVISION = 1 MASTER_SITES = ${MASTER_SITE_KDE:=stable/${VERSION}/src/extragear/} \ http://openbsddistfiles.org/martynas/kde/${VERSION}/extragear/ diff --git a/x11/kde4/games/Makefile b/x11/kde4/games/Makefile index abedf15236d..4973179f596 100644 --- a/x11/kde4/games/Makefile +++ b/x11/kde4/games/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, games DISTNAME = kdegames-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += kdegames 5.0 # .4.0 SHARED_LIBS += kmahjongglib 0.0 # .1.0 diff --git a/x11/kde4/graphics/Makefile b/x11/kde4/graphics/Makefile index 28160a6f733..999d873aff6 100644 --- a/x11/kde4/graphics/Makefile +++ b/x11/kde4/graphics/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.9 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, graphics DISTNAME = kdegraphics-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += gwenviewlib 0.0 # .1.0 SHARED_LIBS += okularcore 0.0 # .1.0 diff --git a/x11/kde4/libs/Makefile b/x11/kde4/libs/Makefile index 6a09cf9424b..781f8e1cc5d 100644 --- a/x11/kde4/libs/Makefile +++ b/x11/kde4/libs/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.15 2010/07/10 16:57:22 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, libraries DISTNAME = kdelibs-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += kde3support 0.0 # .4.0 SHARED_LIBS += kdecore 8.0 # .5.0 diff --git a/x11/kde4/multimedia/Makefile b/x11/kde4/multimedia/Makefile index 9bc5dba6fc2..87fa8372575 100644 --- a/x11/kde4/multimedia/Makefile +++ b/x11/kde4/multimedia/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, multimedia DISTNAME = kdemultimedia-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += audiocdplugins 4.0 # .4.0 SHARED_LIBS += kcddb 4.0 # .4.0 diff --git a/x11/kde4/network/Makefile b/x11/kde4/network/Makefile index f60f3d430a2..0d99e605f5e 100644 --- a/x11/kde4/network/Makefile +++ b/x11/kde4/network/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, network DISTNAME = kdenetwork-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += kgetcore 0.0 # .4.0 SHARED_LIBS += kopete 3.0 # .4.0 diff --git a/x11/kde4/oxygen-icons/Makefile b/x11/kde4/oxygen-icons/Makefile index 87fe5cffe27..1743cd1a451 100644 --- a/x11/kde4/oxygen-icons/Makefile +++ b/x11/kde4/oxygen-icons/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/06/20 16:18:17 espie Exp $ +# $OpenBSD: Makefile,v 1.2 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, default theme DISTNAME = oxygen-icons-${VERSION} -PKGNAME = ${DISTNAME} .include diff --git a/x11/kde4/pim/Makefile b/x11/kde4/pim/Makefile index 1515ea6feb0..ea3b7b70fd5 100644 --- a/x11/kde4/pim/Makefile +++ b/x11/kde4/pim/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/08/31 08:22:05 jasper Exp $ COMMENT= K Desktop Environment, pim DISTNAME= kdepim-${VERSION} -PKGNAME= ${DISTNAME} HOMEPAGE= http://pim.kde.org/ SHARED_LIBS += akonadi-kcal_next 0.0 diff --git a/x11/kde4/pimlibs/Makefile b/x11/kde4/pimlibs/Makefile index b09d2ffec10..f522de22d4e 100644 --- a/x11/kde4/pimlibs/Makefile +++ b/x11/kde4/pimlibs/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.9 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, pimlibs DISTNAME = kdepimlibs-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += kabc 5.0 # .4.0 SHARED_LIBS += kabc_file_core 0.0 # .4.0 diff --git a/x11/kde4/qimageblitz/Makefile b/x11/kde4/qimageblitz/Makefile index a2eba20ec46..c9333a8e640 100644 --- a/x11/kde4/qimageblitz/Makefile +++ b/x11/kde4/qimageblitz/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/08/31 08:22:05 jasper Exp $ VERSION = 0.0.4 COMMENT = image effects for kde DISTNAME = qimageblitz-${VERSION} EXTRACT_SUFX = .tar.bz2 -PKGNAME = ${DISTNAME} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qimageblitz/} SHARED_LIBS += qimageblitz 0.0 # .4.0 diff --git a/x11/kde4/sdk/Makefile b/x11/kde4/sdk/Makefile index b2b7c58e9f0..fa1685b4572 100644 --- a/x11/kde4/sdk/Makefile +++ b/x11/kde4/sdk/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, developer extensions DISTNAME = kdesdk-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += antlr 0.0 # .4.0(version: 4.0) SHARED_LIBS += kateinterfaces 0.0 # .4.0 diff --git a/x11/kde4/toys/Makefile b/x11/kde4/toys/Makefile index 7a0d777cc41..3d8a75ad68b 100644 --- a/x11/kde4/toys/Makefile +++ b/x11/kde4/toys/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, toys DISTNAME = kdetoys-${VERSION} -PKGNAME = ${DISTNAME} LIB_DEPENDS+= ::x11/kde4/libs \ ::x11/kde4/base-workspace diff --git a/x11/kde4/utils/Makefile b/x11/kde4/utils/Makefile index b5e8e7f1465..19b64a082bf 100644 --- a/x11/kde4/utils/Makefile +++ b/x11/kde4/utils/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, utils DISTNAME = kdeutils-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += kerfuffle 0.0 # .4.0 SHARED_LIBS += superkaramba 0.0 # .4.0 diff --git a/x11/kde4/velop/Makefile b/x11/kde4/velop/Makefile index 8cecf169851..224e7eeacb6 100644 --- a/x11/kde4/velop/Makefile +++ b/x11/kde4/velop/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2009/07/20 14:28:54 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2010/08/31 08:22:05 jasper Exp $ COMMENT= K Desktop Environment, development DISTNAME= kdevelop-${VERSION} -PKGNAME= ${DISTNAME}p0 +REVISION= 0 SHARED_LIBS += kdevcmakecommon 0.0 # .1.0 SHARED_LIBS += kdevplatforminterfaces 0.0 # .4.0 diff --git a/x11/kde4/webdev/Makefile b/x11/kde4/webdev/Makefile index 2d2206e791b..a46c639c505 100644 --- a/x11/kde4/webdev/Makefile +++ b/x11/kde4/webdev/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2010/07/10 16:57:23 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/08/31 08:22:05 jasper Exp $ COMMENT = K Desktop Environment, web development DISTNAME = kdewebdev-${VERSION} -PKGNAME = ${DISTNAME} SHARED_LIBS += klinkstatuscommon 0.0 SHARED_LIBS += kommandercore 0.0