8 files changed, 114 insertions, 10 deletions

diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile
index 34980eb729e4..ec058cd2086a 100644
--- a/ports-mgmt/kports-qt4/Makefile
+++ b/ports-mgmt/kports-qt4/Makefile
@@ -7,29 +7,55 @@
 
 PORTNAME=	kports
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	hannes.hauswedell@gmail.com
-COMMENT=	Powerful KDE-Frontend to the Ports
+MAINTAINER=	kports@soulrebel.in-berlin.de
+COMMENT=	KDE3-Version of your favorite frontend to the Ports
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
-PREFIX=		${KDE_PREFIX}
 
 RUN_DEPENDS+=	portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
 RUN_DEPENDS+=	kdehier>=0:${PORTSDIR}/misc/kdehier
 
-OPTIONS=	PORTAUDIT "Require Portaudit" on
+OPTIONS=	PORTAUDIT "Require Portaudit" on \
+		KDESU "With KDE3 kdesu" on \
+		KDESU4 "With KDE4 kdesu" off \
+		GKSU "With gksu" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_KDESU) && defined(WITHOUT_KDESU4) && defined(WITHOUT_GKSU)
+PKGMESSAGE=	${FILESDIR}/pkg-message.nosu
+.endif
+
 .if !defined(WITHOUT_PORTAUDIT)
 RUN_DEPENDS+=	portaudit:${PORTSDIR}/ports-mgmt/portaudit
 .endif
 
+.if defined(WITH_KDESU)
+RUN_DEPENDS+=	${LOCALBASE}/bin/kdesu:${PORTSDIR}/x11/kdebase3
+.endif
+
+.if defined(WITH_KDESU4)
+RUN_DEPENDS+=	${LOCALBASE}/kde4/lib/kde4/libexec/kdesu:${PORTSDIR}/x11/kdebase4-runtime
+.endif
+
+.if defined(WITH_GKSU)
+RUN_DEPENDS+=	${LOCALBASE}/bin/gksu:${PORTSDIR}/sysutils/gksu
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/src/kports.desktop
+
+post-install:
+.if defined(WITHOUT_KDESU) && defined(WITHOUT_KDESU4) && defined(WITHOUT_GKSU)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/kports-qt4/files/patch-src-kports.desktop b/ports-mgmt/kports-qt4/files/patch-src-kports.desktop
new file mode 100644
index 000000000000..c86151c6f53b
--- /dev/null
+++ b/ports-mgmt/kports-qt4/files/patch-src-kports.desktop
@@ -0,0 +1,15 @@
+--- src/kports.desktop.old	2009-01-21 20:13:06.000000000 +0100
++++ src/kports.desktop	2009-01-21 20:13:27.000000000 +0100
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KPorts
+-Exec=kdesu -c 'kports %i %m -caption "%c"'
++Exec=/bin/sh -c 'if [ -x /usr/local/bin/kdesu ]; then /usr/local/bin/kdesu kports; elif [ -x /usr/local/kde4/lib/kde4/libexec/kdesu ]; then /usr/local/kde4/lib/kde4/libexec/kdesu kports; elif [ -x /usr/local/bin/gksu ]; then /usr/local/bin/gksu kports; else kports; fi'
+ Icon=kports
+ Type=Application
+-DocPath=kports/index.html
+ Comment=A tool for managing Software in FreeBSD
+ Comment[de]=Ein Programm zur Softwareverwaltung unter FreeBSD
+ Terminal=0
++Categories=Qt;KDE;System;
diff --git a/ports-mgmt/kports-qt4/files/pkg-message.nosu b/ports-mgmt/kports-qt4/files/pkg-message.nosu
new file mode 100644
index 000000000000..400249898e62
--- /dev/null
+++ b/ports-mgmt/kports-qt4/files/pkg-message.nosu
@@ -0,0 +1,5 @@
+You have selected neither kdesu nor gksu during make config, but
+KPorts needs to be started as root for it to be useful.
+
+You can still install a package providing kdesu or gksu, or use
+another program to start KPorts as root, e.g. sudo or ssh -X.
diff --git a/ports-mgmt/kports-qt4/pkg-descr b/ports-mgmt/kports-qt4/pkg-descr
index f99677b37f4c..b4534c1f3f28 100644
--- a/ports-mgmt/kports-qt4/pkg-descr
+++ b/ports-mgmt/kports-qt4/pkg-descr
@@ -7,4 +7,10 @@ complete list, check the Homepage or the Changelog.
 Functionality is KPorts' main goal, not simplification by reducing
 options; however KPorts should be rather easy to use.
 
+A new version of KPorts based on completely new code and Qt4 is 
+available @ /usr/ports/ports-mgmt/kports-qt4
+NOTE that the new version cannot yet compete with this version
+feature-wise.
+
+
 WWW: http://kports.sf.net
diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile
index 34980eb729e4..ec058cd2086a 100644
--- a/ports-mgmt/kports/Makefile
+++ b/ports-mgmt/kports/Makefile
@@ -7,29 +7,55 @@
 
 PORTNAME=	kports
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	hannes.hauswedell@gmail.com
-COMMENT=	Powerful KDE-Frontend to the Ports
+MAINTAINER=	kports@soulrebel.in-berlin.de
+COMMENT=	KDE3-Version of your favorite frontend to the Ports
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
-PREFIX=		${KDE_PREFIX}
 
 RUN_DEPENDS+=	portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
 RUN_DEPENDS+=	kdehier>=0:${PORTSDIR}/misc/kdehier
 
-OPTIONS=	PORTAUDIT "Require Portaudit" on
+OPTIONS=	PORTAUDIT "Require Portaudit" on \
+		KDESU "With KDE3 kdesu" on \
+		KDESU4 "With KDE4 kdesu" off \
+		GKSU "With gksu" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_KDESU) && defined(WITHOUT_KDESU4) && defined(WITHOUT_GKSU)
+PKGMESSAGE=	${FILESDIR}/pkg-message.nosu
+.endif
+
 .if !defined(WITHOUT_PORTAUDIT)
 RUN_DEPENDS+=	portaudit:${PORTSDIR}/ports-mgmt/portaudit
 .endif
 
+.if defined(WITH_KDESU)
+RUN_DEPENDS+=	${LOCALBASE}/bin/kdesu:${PORTSDIR}/x11/kdebase3
+.endif
+
+.if defined(WITH_KDESU4)
+RUN_DEPENDS+=	${LOCALBASE}/kde4/lib/kde4/libexec/kdesu:${PORTSDIR}/x11/kdebase4-runtime
+.endif
+
+.if defined(WITH_GKSU)
+RUN_DEPENDS+=	${LOCALBASE}/bin/gksu:${PORTSDIR}/sysutils/gksu
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/src/kports.desktop
+
+post-install:
+.if defined(WITHOUT_KDESU) && defined(WITHOUT_KDESU4) && defined(WITHOUT_GKSU)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/kports/files/patch-src-kports.desktop b/ports-mgmt/kports/files/patch-src-kports.desktop
new file mode 100644
index 000000000000..c86151c6f53b
--- /dev/null
+++ b/ports-mgmt/kports/files/patch-src-kports.desktop
@@ -0,0 +1,15 @@
+--- src/kports.desktop.old	2009-01-21 20:13:06.000000000 +0100
++++ src/kports.desktop	2009-01-21 20:13:27.000000000 +0100
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KPorts
+-Exec=kdesu -c 'kports %i %m -caption "%c"'
++Exec=/bin/sh -c 'if [ -x /usr/local/bin/kdesu ]; then /usr/local/bin/kdesu kports; elif [ -x /usr/local/kde4/lib/kde4/libexec/kdesu ]; then /usr/local/kde4/lib/kde4/libexec/kdesu kports; elif [ -x /usr/local/bin/gksu ]; then /usr/local/bin/gksu kports; else kports; fi'
+ Icon=kports
+ Type=Application
+-DocPath=kports/index.html
+ Comment=A tool for managing Software in FreeBSD
+ Comment[de]=Ein Programm zur Softwareverwaltung unter FreeBSD
+ Terminal=0
++Categories=Qt;KDE;System;
diff --git a/ports-mgmt/kports/files/pkg-message.nosu b/ports-mgmt/kports/files/pkg-message.nosu
new file mode 100644
index 000000000000..400249898e62
--- /dev/null
+++ b/ports-mgmt/kports/files/pkg-message.nosu
@@ -0,0 +1,5 @@
+You have selected neither kdesu nor gksu during make config, but
+KPorts needs to be started as root for it to be useful.
+
+You can still install a package providing kdesu or gksu, or use
+another program to start KPorts as root, e.g. sudo or ssh -X.
diff --git a/ports-mgmt/kports/pkg-descr b/ports-mgmt/kports/pkg-descr
index f99677b37f4c..b4534c1f3f28 100644
--- a/ports-mgmt/kports/pkg-descr
+++ b/ports-mgmt/kports/pkg-descr
@@ -7,4 +7,10 @@ complete list, check the Homepage or the Changelog.
 Functionality is KPorts' main goal, not simplification by reducing
 options; however KPorts should be rather easy to use.
 
+A new version of KPorts based on completely new code and Qt4 is 
+available @ /usr/ports/ports-mgmt/kports-qt4
+NOTE that the new version cannot yet compete with this version
+feature-wise.
+
+
 WWW: http://kports.sf.net