3 files changed, 16 insertions, 54 deletions

diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 04adfbf8ffae..90cd7b92ea38 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gkleds2
-PORTVERSION=	0.8.1
-PORTREVISION=	5
+PORTVERSION=	0.8.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://heim.ifi.uio.no/~oyvinha/files/files/
 DISTNAME=	gkleds-${PORTVERSION}
@@ -19,10 +18,20 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 USE_X_PREFIX=	yes
+USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-MAKE_ENV+=	PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \
-		INSTALL_PROG="${INSTALL_PROGRAM}"
 PLIST_FILES=	libexec/gkrellm2/plugins/gkleds.so
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2||g ; \
+		 s|GK_LDFLAGS|GKM_LDFLAGS|g' ${WRKSRC}/src/Makefile.in
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/src/.libs/gkleds.so \
+		${PREFIX}/libexec/gkrellm2/plugins
+
 .include <bsd.port.mk>
diff --git a/sysutils/gkleds2/distinfo b/sysutils/gkleds2/distinfo
index a01c169bb7ff..07a354a59d12 100644
--- a/sysutils/gkleds2/distinfo
+++ b/sysutils/gkleds2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gkleds-0.8.1.tar.gz) = 8329bc219c55f5b83c4dc5f097990d74
-SHA256 (gkleds-0.8.1.tar.gz) = 682b7dc9389030908714b6b8a4de2819a564d92fc0ef0f149d25b6afa1faa421
-SIZE (gkleds-0.8.1.tar.gz) = 44904
+MD5 (gkleds-0.8.2.tar.gz) = 140719ffcba3ff84b9b9c7c57b24fbff
+SHA256 (gkleds-0.8.2.tar.gz) = 521d97f4e036b49913bb5deeb541ed815e6944fa45003f2c451caacc5c86bea8
+SIZE (gkleds-0.8.2.tar.gz) = 322409
diff --git a/sysutils/gkleds2/files/patch-Makefile b/sysutils/gkleds2/files/patch-Makefile
deleted file mode 100644
index 1833cfb3e18e..000000000000
--- a/sysutils/gkleds2/files/patch-Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-$FreeBSD$
-
---- Makefile.orig	Tue Jan 28 17:14:08 2003
-+++ Makefile	Sun Jun  1 08:47:34 2003
-@@ -11,16 +11,14 @@
- DEGUG = -DGKLEDS_DEBUG
- LIBFLAGS = -shared
- INCS = $(GTK_INCLUDES) -DGKLEDS_SELFCOMPILE
--COMPFLAGS = -Wall -O2 -fPIC
--CC = gcc
-+COMPFLAGS = -Wall -fPIC ${CFLAGS}
-+CC ?= gcc
- 
- SRCS = src/gkleds.c src/gkleds_ind.c src/gkleds_conf.c src/gkrellm2/win32-plugin.c
- HDRS = src/gkleds.h src/gkleds_ind.c src/gkleds_conf.c src/gkrellm2/win32-plugin.h
- WIN32_OBJS = gkleds.o gkleds_ind.o gkleds_conf.o win32-plugin.o
- UNIX_OBJS = gkleds.o gkleds_ind.o gkleds_conf.o
- 
--INSTALL_PROG = install
--
- .PHONY : clean
- .PHONY : install
- .PHONY : uninstall
-@@ -29,7 +27,7 @@
- #=======================================================================
- #=======================================================================
- 
--unix : $(UNIX_OBJS)
-+all : $(UNIX_OBJS)
- 	$(CC) $(LIBFLAGS) $(UNIX_LIBS) -o gkleds.so $^
- 
- win32 : $(WIN32_OBJS)
-@@ -59,13 +57,4 @@
- 	rm -rf src/gkrellm2/*~ src/gkrellm2/\#*
- 
- install : gkleds.so
--	@ if [ $$UID -ne 0 ]; \
--		then PLUGIN_DIR=$$HOME/.gkrellm2/plugins; \
--	elif [ -e /usr/bin/gkrellm ]; \
--		then PLUGIN_DIR=/usr/lib/gkrellm2/plugins; \
--	else \
--		PLUGIN_DIR=/usr/local/lib/gkrellm2/plugins; \
--	fi; \
--	$(INSTALL_PROG) -d $$PLUGIN_DIR; \
--	$(INSTALL_PROG) -s gkleds.so $$PLUGIN_DIR; \
--	printf "\ngkleds installed in $$PLUGIN_DIR\n"
-+	$(INSTALL_PROG) gkleds.so $(PLUGIN_DIR);