3 files changed, 10 insertions, 74 deletions

diff --git a/devel/kdebindings4/Makefile b/devel/kdebindings4/Makefile
index d916e69416c5..0d750f10005b 100644
--- a/devel/kdebindings4/Makefile
+++ b/devel/kdebindings4/Makefile
@@ -15,35 +15,24 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE bindings meta port
 
 USE_KDE4=	kdeprefix
+USE_PYTHON=	yes
+PYTHON_NO_DEPENDS=	yes
+USE_RUBY=	yes
+RUBY_NO_BUILD_DEPENDS=	yes
+RUBY_NO_RUN_DEPENDS=	yes
 NO_BUILD=	yes
-# NO_INSTALL=	yes
 
-# OPTIONS+=	CSHARP "C# bindings" on
-# OPTIONS+=	JAVA "Java bindings" on
-# OPTIONS+=	PHP "PHP bindings" on
-OPTIONS+=	PYTHON "Python bindings" on
-OPTIONS+=	RUBY "Ruby bindings" on
+OPTIONS=	PYTHON "Python bindings" on \
+		RUBY "Ruby bindings" on
 
 .include <bsd.port.options.mk>
 
-# .if !defined(WITHOUT_CSHARP)
-# RUN_DEPENDS+=	kdebindings-csharp>=4.1.0:${PORTSDIR}/devel/kdebindings4-csharp
-# .endif
-#
-# .if !defined(WITHOUT_JAVA)
-# RUN_DEPENDS+=	kdebindings-java>=4.1.0:${PORTSDIR}/devel/kdebindings4-java
-# .endif
-#
-# .if !defined(WITHOUT_PHP)
-# RUN_DEPENDS+=	kdebindings-php>=4.1.0:${PORTSDIR}/devel/kdebindings4-php
-# .endif
-
 .if !defined(WITHOUT_PYTHON)
-RUN_DEPENDS+=	kdebindings-python>=4.1.0:${PORTSDIR}/devel/kdebindings4-python
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}kdebindings>=4.1.0:${PORTSDIR}/devel/kdebindings4-python
 .endif
 
 .if !defined(WITHOUT_RUBY)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/krubyapplication:${PORTSDIR}/devel/kdebindings4-ruby
+RUN_DEPENDS+=	${RUBY_PKGNAMEPREFIX}kdebindings>=4.7.0:${PORTSDIR}/devel/kdebindings4-ruby
 .endif
 
 do-install:
diff --git a/devel/kdebindings4/files/Makefile.kdebindings b/devel/kdebindings4/files/Makefile.kdebindings
deleted file mode 100644
index 861317362b1c..000000000000
--- a/devel/kdebindings4/files/Makefile.kdebindings
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	kdebindings4
-# Date created:		2008-08-19
-# Whom:			Max Brazhnikov <makc@issp.ac.ru>
-#
-# $FreeBSD$
-#
-
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-PKGNAMEPREFIX?=	${${BINDLANG}_PKGNAMEPREFIX}
-PKGNAMESUFFIX?=	${${BINDLANG}_PKGNAMESUFFIX}
-DIST_SUBDIR=	KDE
-UNIQUENAME?=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
-COMMENT?=	${${BINDLANG}_COMMENT}
-
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4+=	kdelibs automoc4 kdehier kdeprefix
-USE_QT_VER=	4
-QT_COMPONENTS+=	corelib qmake_build moc_build uic_build rcc_build
-
-BUILD_WRKSRC?=	${WRKSRC}/${BINDLANG}/${BINDMODULE}
-INSTALL_WRKSRC?=${BUILD_WRKSRC}
-
-# Available languages
-_BINDLANG_ALL=	csharp java perl php python ruby smoke
-
-# csharp_COMMENT=	C\# bindings for Qt/KDE: ${BINDMODULE} module
-# java_COMMENT=	Java bindings for Qt/KDE: ${BINDMODULE} module
-# perl_COMMENT=	Perl bindings for Qt/KDE: ${BINDMODULE} module
-# php_COMMENT=	PHP bindings for Qt/KDE: ${BINDMODULE} module
-python_COMMENT=	Python bindings for Qt/KDE: ${BINDMODULE} module
-ruby_COMMENT=	Ruby bindings for Qt/KDE: ${BINDMODULE} module
-smoke_COMMENT=	SMOKE bindings for Qt/KDE: ${BINDMODULE} module
-
-python_PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-ruby_PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-
-python_PKGNAMESUFFIX=	-${BINDMODULE}
-# ruby_PKGNAMESUFFIX=	-${BINDMODULE}
-smoke_PKGNAMESUFFIX=	-${BINDLANG}
-
-# Don't extract unnecessary stuff
-DO_NOT_EXTRACT?=${_BINDLANG_ALL:S/${BINDLANG}//}
-
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
-.for dne in ${DO_NOT_EXTRACT}
-EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
-.endfor
-
-#keep syncing this with devel/py-sip
-SIPDIR_REL=	share/py-sip
diff --git a/devel/kdebindings4/pkg-descr b/devel/kdebindings4/pkg-descr
index 6f3f76a0a82d..4f1d94643d35 100644
--- a/devel/kdebindings4/pkg-descr
+++ b/devel/kdebindings4/pkg-descr
@@ -1,3 +1,3 @@
-This is a meta port of KDE bindings for C#, Java, PHP, Python and Ruby.
+This is a meta port of KDE bindings for Python and Ruby.
 
 WWW:	http://www.kde.org/