5 files changed, 18 insertions, 45 deletions

diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile
index c02ac14e3faf..5b36a462692e 100644
--- a/misc/gkrellmbgchg2/Makefile
+++ b/misc/gkrellmbgchg2/Makefile
@@ -5,20 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gkrellmbgchg
-PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTNAME=	gkrellmbgchg2
+PORTVERSION=	0.1.2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.bender-suhl.de/stefan/comp/sources/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A plugin for GKrellM, which changes the desktop's background image
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
-WRKSRC=		${WRKDIR}/gkrellmbgchg-${PORTVERSION}
 USE_X_PREFIX=	yes
-USE_GNOME=	imlib
+USE_GNOME=	gtk20
+USE_REINPLACE=	yes
+
+PLIST_FILES=	libexec/gkrellm2/plugins/gkrellmbgchg.so
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/Makefile
+
+do-install:
+	@${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins
+	${INSTALL_DATA} ${WRKSRC}/gkrellmbgchg.so \
+		${PREFIX}/libexec/gkrellm2/plugins
 
 .include <bsd.port.mk>
diff --git a/misc/gkrellmbgchg2/distinfo b/misc/gkrellmbgchg2/distinfo
index 647abf7a4e46..e2ba4044170e 100644
--- a/misc/gkrellmbgchg2/distinfo
+++ b/misc/gkrellmbgchg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gkrellmbgchg-0.0.4.tar.gz) = 472215ba356168ebd068fd83f216365b
-SIZE (gkrellmbgchg-0.0.4.tar.gz) = 6525
+MD5 (gkrellmbgchg2-0.1.2.tar.gz) = 915a9e9c238ca7d74945c4f3a75acbf8
+SIZE (gkrellmbgchg2-0.1.2.tar.gz) = 11431
diff --git a/misc/gkrellmbgchg2/files/patch-Makefile b/misc/gkrellmbgchg2/files/patch-Makefile
deleted file mode 100644
index 2144202f290a..000000000000
--- a/misc/gkrellmbgchg2/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Thu Aug  8 01:30:52 2002
-+++ Makefile	Thu Aug  8 01:37:36 2002
-@@ -19,16 +19,13 @@
- 
- OBJS = gkrellmbgchg.o
- 
--all: gkrellmbgchg.so
--
- gkrellmbgchg.so: $(OBJS)
- 	$(CC) $(CFLAGS) $(OBJS) -o gkrellmbgchg.so $(LFLAGS) $(LIBS)
- 
- clean:
- 	rm -f *.o core *.so* *.bak *~
--install: gkrellmbgchg.so
--	$(INSTALL) -d $(HOME)/.gkrellm/plugins
--	$(INSTALL) gkrellmbgchg.so $(HOME)/.gkrellm/plugins
--
--gkrellmbgchg.c.o: gkrellmbgchg.c
--
-+install:
-+	install -c -s gkrellmbgchg.so ${PREFIX}/libexec/gkrellm/plugins
-+uninstall:
-+	rm -rf $(PLUGIN_DIR)/gkrellmbgchg.so
-+all:	gkrellmbgchg.so
diff --git a/misc/gkrellmbgchg2/files/patch-gkrellmbgchg.h b/misc/gkrellmbgchg2/files/patch-gkrellmbgchg.h
deleted file mode 100644
index c600184427f2..000000000000
--- a/misc/gkrellmbgchg2/files/patch-gkrellmbgchg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gkrellmbgchg.h.orig	Tue Jan 21 22:27:41 2003
-+++ gkrellmbgchg.h	Tue Jan 21 22:27:56 2003
-@@ -6,7 +6,7 @@
- #define CONFIG_NAME "Background Changer"
- #define CONFIG_KEYWORD "bgchg"
- #define STYLE_NAME "bgchg"
--#define GKRELLMBGCHG_VERSION "0.0.3"
-+#define GKRELLMBGCHG_VERSION "0.0.4"
- 
- #ifdef GRAVITY
- #define PLACEMENT (MON_UPTIME | GRAVITY(12))
diff --git a/misc/gkrellmbgchg2/pkg-plist b/misc/gkrellmbgchg2/pkg-plist
deleted file mode 100644
index f5a590a55bd7..000000000000
--- a/misc/gkrellmbgchg2/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-libexec/gkrellm/plugins/gkrellmbgchg.so