6 files changed, 40 insertions, 50 deletions

diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 2bb6fe8b5897..c487933305a0 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		superkaramba
-PORTVERSION=		0.36
-PORTREVISION=		3
+PORTVERSION=		0.37
 CATEGORIES=		deskutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netdragon
@@ -14,8 +13,7 @@ MASTER_SITE_SUBDIR=	netdragon
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		KDE tool that allows interactive eye-candy on the desktop
 
-EXTRA_PATCHES=		${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
-
+WRKSRC=			${WRKDIR}/${PORTNAME}
 USE_KDEBASE_VER=	3
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
@@ -41,6 +39,5 @@ RUN_DEPENDS+=	mbmon:${PORTSDIR}/sysutils/xmbmon
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2 ||g;' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${TOUCH} ${WRKSRC}/config.h.in
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/superkaramba/distinfo b/deskutils/superkaramba/distinfo
index 779655453b32..dd8ad1904497 100644
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba/distinfo
@@ -1,2 +1,3 @@
-MD5 (superkaramba-0.36.tar.gz) = b26f7da9e0ae1901cba5b555d77ce788
-SIZE (superkaramba-0.36.tar.gz) = 1501848
+MD5 (superkaramba-0.37.tar.gz) = 9ec6df580651d40b5681a91ee1582ad1
+SHA256 (superkaramba-0.37.tar.gz) = c7f34f80a3bdf69c51a8d9157876eaf2306326166c38842e41715084d6da29aa
+SIZE (superkaramba-0.37.tar.gz) = 1023812
diff --git a/deskutils/superkaramba/files/patch-memsensor.cpp b/deskutils/superkaramba/files/patch-memsensor.cpp
new file mode 100644
index 000000000000..3ef06ebbb3e2
--- /dev/null
+++ b/deskutils/superkaramba/files/patch-memsensor.cpp
@@ -0,0 +1,11 @@
+--- superkaramba/src/memsensor.cpp.orig	Sun Dec 11 02:34:49 2005
++++ superkaramba/src/memsensor.cpp	Sun Dec 11 02:35:08 2005
+@@ -99,7 +99,7 @@
+ 
+ int MemSensor::getMemTotal()
+ {
+-#if defined __FreeBSD || defined(Q_OS_NETBSD)
++#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
+     static int mem = 0;
+     size_t size = sizeof(mem);
+ 
diff --git a/deskutils/superkaramba/files/patch-misc_python.cpp b/deskutils/superkaramba/files/patch-misc_python.cpp
deleted file mode 100644
index 53aaf624bc71..000000000000
--- a/deskutils/superkaramba/files/patch-misc_python.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/misc_python.cpp.orig	Wed Apr 20 00:55:42 2005
-+++ src/misc_python.cpp	Wed May 11 00:05:48 2005
-@@ -385,6 +385,9 @@
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <arpa/inet.h>
-+#ifdef __FreeBSD__
-+#include <netinet/in.h>
-+#endif
- 
- /* now a method we need to expose to Python */
- QString getIp(char *device_name)
-@@ -435,7 +438,7 @@
-     /* devptr points into an array of ifreq structs. */
-     devptr = &ifc_conf.ifc_req[i];
- 
--    if (devptr->ifr_addr.sa_family != AF_INET)
-+    if (ioctl(sd, SIOCGIFADDR, devptr) < 0 || devptr->ifr_addr.sa_family != AF_INET)
-     continue;
- 
-     if (ioctl(sd,SIOCGIFFLAGS,devptr) < 0)
diff --git a/deskutils/superkaramba/files/patch-src::Makefile.in b/deskutils/superkaramba/files/patch-src::Makefile.in
deleted file mode 100644
index 3ca79e8a75f5..000000000000
--- a/deskutils/superkaramba/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue Jul 13 20:27:44 2004
-+++ src/Makefile.in	Tue Jul 13 20:28:01 2004
-@@ -262,7 +262,7 @@
- # the application source, library search path, and link libraries
- superkaramba_SOURCES = main.cpp karamba.cpp meter.h meter.cpp bar.h bar.cpp sensor.h sensor.cpp datesensor.h datesensor.cpp textlabel.h textlabel.cpp memsensor.h memsensor.cpp uptimesensor.h uptimesensor.cpp cpusensor.h cpusensor.cpp networksensor.h networksensor.cpp imagelabel.h imagelabel.cpp graph.h graph.cpp xmmssensor.h xmmssensor.cpp programsensor.h programsensor.cpp disksensor.h disksensor.cpp sensorparams.h sensorparams.cpp sensorsensor.h sensorsensor.cpp textfilesensor.h textfilesensor.cpp clickarea.h clickarea.cpp noatunsensor.h noatunsensor.cpp karambarootpixmap.h karambarootpixmap.cpp clickmap.h clickmap.cpp rsssensor.h rsssensor.cpp textfield.h textfield.cpp taskmanager.h taskmanager.cpp showdesktop.h showdesktop.cpp richtextlabel.h richtextlabel.cpp karambasessionmanaged.h karambasessionmanaged.cpp welcomeform.h welcomeform.cpp systemtray.h systemtray.cpp bar_python.cpp bar_python.h meter_python.cpp meter_python.h textlabel_python.cpp textlabel_python.h richtextlabel_python.cpp richtextlabel_python.h imagelabel_python.cpp imagelabel_python.h config_python.cpp config_python.h misc_python.cpp misc_python.h systray_python.cpp systray_python.h task_python.cpp task_python.h widget_python.cpp widget_python.h menu_python.cpp menu_python.h themelistwindow.cpp themelistwindow.h karambalistboxitem.h karambalistboxitem.cpp
- superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB)  
--superkaramba_LDADD = -lkio -lXpm $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON)
-+superkaramba_LDADD = -lkio -lXpm $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) -lkvm
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/deskutils/superkaramba/pkg-plist b/deskutils/superkaramba/pkg-plist
index 027217e6d889..d76a1ca006b6 100644
--- a/deskutils/superkaramba/pkg-plist
+++ b/deskutils/superkaramba/pkg-plist
@@ -1,13 +1,26 @@
 bin/superkaramba
-share/applnk/Utilities/karamba.desktop
-share/apps/superkaramba/karambaui.rc
-share/doc/HTML/en/karamba/common
-share/doc/HTML/en/karamba/index.cache.bz2
-share/doc/HTML/en/karamba/index.docbook
-@dirrm share/doc/HTML/en/karamba
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+share/applnk/Utilities/superkaramba.desktop
+share/apps/superkaramba/superkarambaui.rc
+share/doc/HTML/en/superkaramba/common
+share/doc/HTML/en/superkaramba/index.cache.bz2
+share/doc/HTML/en/superkaramba/index.docbook
+share/icons/crystalsvg/128x128/apps/superkaramba.png
+share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/16x16/apps/superkaramba.png
+share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/22x22/apps/superkaramba.png
+share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/32x32/apps/superkaramba.png
+share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/48x48/apps/superkaramba.png
+share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/64x64/apps/superkaramba.png
+share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/scalable/apps/superkaramba.svgz
+share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+share/mimelnk/application/x-superkaramba.desktop
+@dirrm share/doc/HTML/en/superkaramba-apidocs/superkaramba/html
+@dirrm share/doc/HTML/en/superkaramba-apidocs/superkaramba
+@dirrm share/doc/HTML/en/superkaramba-apidocs
+@dirrm share/doc/HTML/en/superkaramba
 @dirrm share/apps/superkaramba
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true