4 files changed, 18 insertions, 54 deletions

diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 001d4120acbf..9483fe0acc77 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -1,35 +1,28 @@
-# New ports collection makefile for:	gkrellmlaunch
-# Date Created:				Tue Nov  6 19:15:45 EST 2001
-# Whom:					Patrick Li <pat@databits.net>
+# New ports collection makefile for:	gkrellmlaunch2
+# Date Created:				23 Aug 2004
+# Whom:					Zach Thompson <hideo@lastamericanempire.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gkrellmlaunch
-PORTVERSION=	0.4
-PORTREVISION=	1
+PORTVERSION=	0.5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+PKGNAMESUFFIX=	2
 
-MAINTAINER=	pat@FreeBSD.org
-COMMENT=	An application launcher plugin for GKrellM
+MAINTAINER= 	hideo@lastamericanempire.com
+COMMENT=	An application launcher plugin for GKrellM2
 
-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
 
-PLIST_FILES=	libexec/gkrellm/plugins/gkrellmlaunch.so
+PLIST_FILES=	libexec/gkrellm2/plugins/gkrellmlaunch.so
 USE_X_PREFIX=	yes
-USE_GNOME=	imlib
 ALL_TARGET=	${PORTNAME}.so
 
-.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-CFLAGS=	-fPIC
-.endif
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.so \
-		${PREFIX}/libexec/gkrellm/plugins
+	${INSTALL_DATA} ${WRKSRC}/gkrellmlaunch.so ${PREFIX}/libexec/gkrellm2/plugins
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/gkrellmlaunch2/distinfo b/misc/gkrellmlaunch2/distinfo
index 0754a3cbdc6d..51ad56bccf0d 100644
--- a/misc/gkrellmlaunch2/distinfo
+++ b/misc/gkrellmlaunch2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gkrellmlaunch-0.4.tar.gz) = d2cdd1685ca67e901713e7d8ef4d34e4
-SIZE (gkrellmlaunch-0.4.tar.gz) = 22310
+MD5 (gkrellmlaunch-0.5.tar.gz) = 110797c344a09daac71f71643b91fc6e
+SIZE (gkrellmlaunch-0.5.tar.gz) = 22035
diff --git a/misc/gkrellmlaunch2/files/patch-Makefile b/misc/gkrellmlaunch2/files/patch-Makefile
deleted file mode 100644
index 1a8f5704e7ee..000000000000
--- a/misc/gkrellmlaunch2/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	Mon Nov  5 13:17:40 2001
-+++ Makefile	Tue Nov  6 19:33:41 2001
-@@ -1,22 +1,20 @@
- # Sample Makefile for a GKrellM plugin
- 
--GTK_INCLUDE = `gtk-config --cflags`
--GTK_LIB = `gtk-config --libs`
-+GTK_INCLUDE = `${GTK_CONFIG} --cflags`
-+GTK_LIB = `${GTK_CONFIG} --libs`
- 
--IMLIB_INCLUDE = `imlib-config --cflags-gdk`
--IMLIB_LIB = `imlib-config --libs-gdk`
-+IMLIB_INCLUDE = `${IMLIB_CONFIG} --cflags-gdk`
-+IMLIB_LIB = `${IMLIB_CONFIG} --libs-gdk`
- 
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-+CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE)
- LIBS = $(GTK_LIB) $(IMLIB_LIB)
- 
- LFLAGS = -shared
- 
--CC = gcc $(CFLAGS) $(FLAGS)
--
- OBJS = gkrellmlaunch.o
- 
- gkrellmlaunch.so: $(OBJS)
--	$(CC) $(OBJS) -o gkrellmlaunch.so $(LFLAGS) $(LIBS)
-+	$(CC) $(OBJS) -o gkrellmlaunch.so $(CFLAGS) $(LFLAGS) $(LIBS)
- 
- clean:
- 	rm -f *.o core *.so* *.bak *~
diff --git a/misc/gkrellmlaunch2/pkg-descr b/misc/gkrellmlaunch2/pkg-descr
index d5bca3423f37..e2c72a71c259 100644
--- a/misc/gkrellmlaunch2/pkg-descr
+++ b/misc/gkrellmlaunch2/pkg-descr
@@ -1,4 +1,6 @@
-GKrellMLaunch plugin which allows one-click access to frequently
-used applications from GKrellM
+An update to  GKrellMLaunch for GKrellM 2+ allowing one-click access
+to frequently used programs.
 
 WWW: http://gkrellmlaunch.sourceforge.net/
+
+Zach Thompson - hideo@lastamericanempire.com