aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/bidwatcher/Makefile2
-rw-r--r--misc/kde2-i18n/Makefile4
-rw-r--r--misc/kde3-i18n-af/Makefile4
-rw-r--r--misc/kde3-i18n-ar/Makefile4
-rw-r--r--misc/kde3-i18n-az/Makefile4
-rw-r--r--misc/kde3-i18n-bg/Makefile4
-rw-r--r--misc/kde3-i18n-bs/Makefile4
-rw-r--r--misc/kde3-i18n-ca/Makefile4
-rw-r--r--misc/kde3-i18n-cs/Makefile4
-rw-r--r--misc/kde3-i18n-da/Makefile4
-rw-r--r--misc/kde3-i18n-el/Makefile4
-rw-r--r--misc/kde3-i18n-en_GB/Makefile4
-rw-r--r--misc/kde3-i18n-eo/Makefile4
-rw-r--r--misc/kde3-i18n-es/Makefile4
-rw-r--r--misc/kde3-i18n-et/Makefile4
-rw-r--r--misc/kde3-i18n-fi/Makefile4
-rw-r--r--misc/kde3-i18n-he/Makefile4
-rw-r--r--misc/kde3-i18n-hr/Makefile4
-rw-r--r--misc/kde3-i18n-hu/Makefile4
-rw-r--r--misc/kde3-i18n-id/Makefile4
-rw-r--r--misc/kde3-i18n-is/Makefile4
-rw-r--r--misc/kde3-i18n-it/Makefile4
-rw-r--r--misc/kde3-i18n-lt/Makefile4
-rw-r--r--misc/kde3-i18n-lv/Makefile4
-rw-r--r--misc/kde3-i18n-mt/Makefile4
-rw-r--r--misc/kde3-i18n-nb/Makefile4
-rw-r--r--misc/kde3-i18n-nl/Makefile4
-rw-r--r--misc/kde3-i18n-nn/Makefile4
-rw-r--r--misc/kde3-i18n-pl/Makefile4
-rw-r--r--misc/kde3-i18n-pt/Makefile4
-rw-r--r--misc/kde3-i18n-pt_BR/Makefile4
-rw-r--r--misc/kde3-i18n-ro/Makefile4
-rw-r--r--misc/kde3-i18n-sk/Makefile4
-rw-r--r--misc/kde3-i18n-sl/Makefile4
-rw-r--r--misc/kde3-i18n-sr/Makefile4
-rw-r--r--misc/kde3-i18n-sv/Makefile4
-rw-r--r--misc/kde3-i18n-ta/Makefile4
-rw-r--r--misc/kde3-i18n-th/Makefile4
-rw-r--r--misc/kde3-i18n-tr/Makefile4
-rw-r--r--misc/kde3-i18n-ven/Makefile4
-rw-r--r--misc/kde3-i18n-vi/Makefile4
-rw-r--r--misc/kde3-i18n-xh/Makefile4
-rw-r--r--misc/kde3-i18n-zu/Makefile4
-rw-r--r--misc/kde3-i18n/Makefile4
-rw-r--r--misc/kde4-i18n-is/Makefile4
-rw-r--r--misc/kde4-l10n-bg/Makefile4
-rw-r--r--misc/kde4-l10n-ca/Makefile4
-rw-r--r--misc/kde4-l10n-cs/Makefile4
-rw-r--r--misc/kde4-l10n-da/Makefile4
-rw-r--r--misc/kde4-l10n-el/Makefile4
-rw-r--r--misc/kde4-l10n-en_GB/Makefile4
-rw-r--r--misc/kde4-l10n-eo/Makefile4
-rw-r--r--misc/kde4-l10n-es/Makefile4
-rw-r--r--misc/kde4-l10n-et/Makefile4
-rw-r--r--misc/kde4-l10n-fi/Makefile4
-rw-r--r--misc/kde4-l10n-is/Makefile4
-rw-r--r--misc/kde4-l10n-it/Makefile4
-rw-r--r--misc/kde4-l10n-lt/Makefile4
-rw-r--r--misc/kde4-l10n-lv/Makefile4
-rw-r--r--misc/kde4-l10n-nb/Makefile4
-rw-r--r--misc/kde4-l10n-nl/Makefile4
-rw-r--r--misc/kde4-l10n-nn/Makefile4
-rw-r--r--misc/kde4-l10n-ro/Makefile4
-rw-r--r--misc/kde4-l10n-sk/Makefile4
-rw-r--r--misc/kde4-l10n-sl/Makefile4
-rw-r--r--misc/kde4-l10n-sr/Makefile4
-rw-r--r--misc/kde4-l10n-sv/Makefile4
-rw-r--r--misc/kde4-l10n-ta/Makefile4
-rw-r--r--misc/kde4-l10n-th/Makefile4
-rw-r--r--misc/kde4-l10n-tr/Makefile4
-rw-r--r--misc/kde4-l10n/Makefile4
-rw-r--r--misc/kdeutils2/Makefile14
-rw-r--r--misc/kdeutils2/distinfo2
-rw-r--r--misc/kdeutils3/Makefile14
-rw-r--r--misc/kdeutils3/distinfo2
-rw-r--r--misc/kdeutils4/Makefile14
-rw-r--r--misc/kdeutils4/distinfo2
-rw-r--r--misc/kdirstat/Makefile4
-rw-r--r--misc/khotkeys/Makefile19
-rw-r--r--misc/kwatch/Makefile5
-rw-r--r--misc/libh/Makefile6
-rw-r--r--misc/peq/Makefile2
-rw-r--r--misc/qhacc/Makefile2
83 files changed, 159 insertions, 209 deletions
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index f09727545c4e..fc7eacbb2856 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.midwestcs.com/bidwatcher/download/
MAINTAINER= mph@FreeBSD.org
USE_GMAKE= YES
-USE_QT= YES
+USE_QT_VER= 1
MAKE_ENV= QTDIR=${X11BASE}/include/X11/qt \
SYSCONF_LFLAGS_QT=${X11BASE}/lib \
SYSCONF_MOC=${X11BASE}/bin/moc
diff --git a/misc/kde2-i18n/Makefile b/misc/kde2-i18n/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde2-i18n/Makefile
+++ b/misc/kde2-i18n/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-ar/Makefile b/misc/kde3-i18n-ar/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-ar/Makefile
+++ b/misc/kde3-i18n-ar/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-he/Makefile b/misc/kde3-i18n-he/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-he/Makefile
+++ b/misc/kde3-i18n-he/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-hu/Makefile b/misc/kde3-i18n-hu/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-hu/Makefile
+++ b/misc/kde3-i18n-hu/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-pl/Makefile b/misc/kde3-i18n-pl/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-pl/Makefile
+++ b/misc/kde3-i18n-pl/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-pt/Makefile b/misc/kde3-i18n-pt/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-pt/Makefile
+++ b/misc/kde3-i18n-pt/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-pt_BR/Makefile b/misc/kde3-i18n-pt_BR/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-pt_BR/Makefile
+++ b/misc/kde3-i18n-pt_BR/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-vi/Makefile b/misc/kde3-i18n-vi/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-vi/Makefile
+++ b/misc/kde3-i18n-vi/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde3-i18n/Makefile
+++ b/misc/kde3-i18n/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 35d951d5a179..b0bbf2d9f8c5 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+USE_KDELIBS_VER=2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 1833fce21603..5e040d99442a 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -6,27 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2= yes
-MOC?= ${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
- --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
- USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 8151479aa10b..f18435189a7a 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
+MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 1833fce21603..5e040d99442a 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -6,27 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2= yes
-MOC?= ${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
- --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
- USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 8151479aa10b..f18435189a7a 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
+MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 1833fce21603..5e040d99442a 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,27 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2= yes
-MOC?= ${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
- --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
- USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 8151479aa10b..f18435189a7a 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
+MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
diff --git a/misc/kdirstat/Makefile b/misc/kdirstat/Makefile
index ad52933dc237..0c987a42e750 100644
--- a/misc/kdirstat/Makefile
+++ b/misc/kdirstat/Makefile
@@ -15,10 +15,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= andrey@novikov.com
-LIB_DEPENDS= kdeui.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_QT= yes
.include <bsd.port.mk>
diff --git a/misc/khotkeys/Makefile b/misc/khotkeys/Makefile
index f4ec5985b049..83a6b1807ea8 100644
--- a/misc/khotkeys/Makefile
+++ b/misc/khotkeys/Makefile
@@ -12,26 +12,11 @@ MASTER_SITES= http://dforce.sh.cvut.cz/~seli/en/khotkeys/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \
- kdeui.3:${PORTSDIR}/x11/kdelibs11 \
- kfm.3:${PORTSDIR}/x11/kdelibs11 \
- kfile.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS= kcontrol:${PORTSDIR}/x11/kdebase11
-
+USE_KDEBASE_VER=1
NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_NEWGCC= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= "--with-qt-includes=${QTDIR}/include/X11/qt" \
- "--with-extra-includes=${LOCALBASE}/include" \
- "--with-extra-libs=${LOCALBASE}/lib"
-CONFIGURE_ENV= MOC=${X11BASE}/bin/moc QTDIR=${QTDIR}
-
-.if defined(PREFIX)
-QTDIR?= ${PREFIX}
-.else
-QTDIR?= ${X11BASE}
-.endif
+CONFIGURE_ARGS= "--with-extra-includes=${LOCALBASE}/include"
.include <bsd.port.mk>
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 213fba73c7e4..b93f538786d3 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -13,10 +13,7 @@ MASTER_SITE_SUBDIR= system/admin/frontends
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \
- kdeui.3:${PORTSDIR}/x11/kdelibs11
-
-USE_QT= yes
+USE_KDELIBS_VER=1
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/libh/Makefile b/misc/libh/Makefile
index 11d34efb9b88..549ac965ce5c 100644
--- a/misc/libh/Makefile
+++ b/misc/libh/Makefile
@@ -18,9 +18,9 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
tvision.0:${PORTSDIR}/devel/tvision
BUILD_DEPENDS= ${X11BASE}/lib/libqt2.a:${PORTSDIR}/x11-toolkits/qt2-static
-USE_QT2=yes
-IS_INTERACTIVE=yes
-INSTALLS_SHLIB=yes
+USE_QT_VER= 2
+IS_INTERACTIVE= yes
+INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/misc/peq/Makefile b/misc/peq/Makefile
index 84d8dbeb0953..e58990b2abed 100644
--- a/misc/peq/Makefile
+++ b/misc/peq/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://silverstone.fortunecity.com/jaguar/37/ \
MAINTAINER= gvg@uunet.co.za
-USE_QT= yes
+USE_QT_VER= 1
post-install:
strip ${PREFIX}/bin/peq
diff --git a/misc/qhacc/Makefile b/misc/qhacc/Makefile
index e57c2700839f..1fe96dd7ebc5 100644
--- a/misc/qhacc/Makefile
+++ b/misc/qhacc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-USE_QT2= yes
+USE_QT_VER= 2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= QTDIR="${X11BASE}"