5 files changed, 47 insertions, 50 deletions

diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile
index cbdcd5015bb1..a9832d74142a 100644
--- a/net/gkrellmqst/Makefile
+++ b/net/gkrellmqst/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gkrellmqst
-PORTVERSION=	0.3.p5
+PORTVERSION=	0.3
 CATEGORIES=	net games
 MASTER_SITES=	http://tadpol.org/unxware/
 DISTNAME=	gkrellm_qst-${PORTVERSION:S/.p/pre_/}
@@ -25,12 +25,5 @@ USE_IMLIB=	yes
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 ALL_TARGET=	qst.so
-EXTRA_PATCHES=	${WRKDIR}/patch-qst.c
-
-pre-patch:
-	@${SED} -e "s!%%LOCALBASE%%!${LOCALBASE}!" \
-		-e "s!%%X11BASE%%!${X11BASE}!" \
-		${FILESDIR}/template-patch-qst.c > \
-		${WRKDIR}/patch-qst.c
 
 .include <bsd.port.mk>
diff --git a/net/gkrellmqst/distinfo b/net/gkrellmqst/distinfo
index febb05f3cb1f..b6e3f6226dca 100644
--- a/net/gkrellmqst/distinfo
+++ b/net/gkrellmqst/distinfo
@@ -1 +1 @@
-MD5 (gkrellm_qst-0.3pre_5.tar.gz) = f4fcca5a1101ab778b854f7fb8fe2543
+MD5 (gkrellm_qst-0.3.tar.gz) = c8ea91395b4ef33a2b63b80c569f8313
diff --git a/net/gkrellmqst/files/patch-Makefile b/net/gkrellmqst/files/patch-Makefile
index 139f9a4a76d0..d1d68f48fb2e 100644
--- a/net/gkrellmqst/files/patch-Makefile
+++ b/net/gkrellmqst/files/patch-Makefile
@@ -1,34 +1,42 @@
---- Makefile.orig	Wed Jun 13 15:44:09 2001
-+++ Makefile	Tue Jul  3 01:40:53 2001
-@@ -1,17 +1,16 @@
--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`
--THREAD_LIB = -lpthread
--INSTALLDIR = $(HOME)/.gkrellm/plugins
-+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
-+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
-+INSTALLDIR = $(PREFIX)/libexec/gkrellm/plugins
+--- Makefile.orig	Thu Jul  5 14:33:45 2001
++++ Makefile	Thu Aug  9 15:36:12 2001
+@@ -1,14 +1,10 @@
+-GTK_CONFIG ?= gtk-config
+-IMLIB_CONFIG ?= imlib-config
+-
+ GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
+ GTK_LIB = `$(GTK_CONFIG) --libs`
  
+ IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
+ IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
+-PTHREAD_LIBS ?= -lpthread
  
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
--LIBS = $(GTK_LIB) $(IMLIB_LIB) $(THREAD_LIB)
-+FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) ${PTHREAD_CFLAGS}
-+LIBS = $(GTK_LIB) $(IMLIB_LIB) ${PTHREAD_LIBS}
+-FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(PTHREAD_CLFAGS)
++FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(PTHREAD_CFLAGS)
+ LIBS = $(GTK_LIB) $(IMLIB_LIB) $(PTHREAD_LIBS) 
  LFLAGS = -shared
  
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC += $(CFLAGS) $(FLAGS)
+@@ -16,11 +12,10 @@
+ INSTALLFLAGS = -c -s -m 644
+ PLUGINDIR ?= usr/share/gkrellm/plugins
+ DESTDIR ?= $(PREFIX)
+-INSTALLDIR = $(DESTDIR)/$(PLUGINDIR)
++INSTALLDIR = $(PREFIX)/libexec/gkrellm/plugins
+ 
+ VERSION=0.3
  
- OBJS = qst.o
+-CC ?= gcc
+ CFLAGS += $(FLAGS) -DVERSION=\"$(VERSION)\"
  
-@@ -26,4 +25,4 @@
- # %.o: %.c
+ TARBALL=gkrellm_qst-$(VERSION).tar
+@@ -41,9 +36,7 @@
+ 	$(INSTALL) qst.so $(HOME)/.gkrellm/plugins
  
  install: qst.so
--	install -c -s -m 644 qst.so $(INSTALLDIR)
-+	$(BSD_INSTALL_DATA) qst.so $(INSTALLDIR)
+-	@[ "`whoami`" != "root" ] && echo "Not root. Try make install_home" && exit 1
+-	$(INSTALL) -d $(INSTALLDIR)
+-	$(INSTALL) qst.so $(INSTALLDIR)
++	@$(BSD_INSTALL_DATA) qst.so $(INSTALLDIR)
+ 
+ tarball:
+ 	(cd ..; tar cf $(TARBALL) gkrellm_qst ; gzip $(TARBALL) )
diff --git a/net/gkrellmqst/files/patch-qst.c b/net/gkrellmqst/files/patch-qst.c
new file mode 100644
index 000000000000..e51ba1b3914e
--- /dev/null
+++ b/net/gkrellmqst/files/patch-qst.c
@@ -0,0 +1,11 @@
+--- qst.c.orig	Thu Aug  9 15:43:44 2001
++++ qst.c	Thu Aug  9 15:45:58 2001
+@@ -36,7 +36,7 @@
+ #define QSTATCMD "qstat"
+ #define GAMETYPE "-q3s"
+ #define GAMEBIN  "quake3"
+-#define SERVERLOC "quake" /* server:port */
++#define SERVERLOC "server:port" /* less confuse people */
+ #define AWK      "awk"
+ #define XTERM    "xterm"
+ #define StatusChgCmd "echo \"We've got Quake!\""
diff --git a/net/gkrellmqst/files/template-patch-qst.c b/net/gkrellmqst/files/template-patch-qst.c
deleted file mode 100644
index cc4ea5935bc7..000000000000
--- a/net/gkrellmqst/files/template-patch-qst.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- qst.c.orig	Mon Jul  2 16:19:55 2001
-+++ qst.c	Mon Jul  2 16:23:26 2001
-@@ -25,9 +25,9 @@
- /* some defines*/
- #define MAX_MAP_NAME_LEN 64
- #define NEW_MAP "Have not talked with quake server yet"
--#define QCMD "/usr/bin/quakestat -q3s quake | awk '/^quake/ {print $2 $3;}'"
--#define SCMD "xterm -e quake3 +connect quake &"
--#define TTCMD "/usr/bin/quakestat -P -q3s quake | awk '/frags/'"
-+#define QCMD "%%LOCALBASE%%/bin/quakestat -q3s quake | awk '/^quake/ {print $2 $3;}'"
-+#define SCMD "%%X11BASE%%/bin/xterm -e quake3 +connect quake &"
-+#define TTCMD "%%LOCALBASE%%/bin/quakestat -P -q3s quake | awk '/frags/'"
- #define CHCMD "ps ax|grep flxwm|grep -v grep>/dev/null && echo \"We've got quake!\""
- 
- static Panel   *panel;