summaryrefslogtreecommitdiff
path: root/sysutils/gkrellm
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-23 19:21:11 +0000
committerjlam <jlam>2001-08-23 19:21:11 +0000
commit060d53aee90ae9cc6107988bca01970c060c595d (patch)
tree1055bc7b26a9f56df96417ce3b145c9ff04bc9a6 /sysutils/gkrellm
parent453266c1dde06f908e102b5e758d5b03d1653ea7 (diff)
downloadpkgsrc-060d53aee90ae9cc6107988bca01970c060c595d.tar.gz
Use config script wrappers for proper buildlinking.
Diffstat (limited to 'sysutils/gkrellm')
-rw-r--r--sysutils/gkrellm/distinfo6
-rw-r--r--sysutils/gkrellm/patches/patch-aa23
-rw-r--r--sysutils/gkrellm/patches/patch-ab23
3 files changed, 38 insertions, 14 deletions
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index a528d688ba3..429b7d3dcbc 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/08/06 14:27:39 wiz Exp $
+$NetBSD: distinfo,v 1.5 2001/08/23 19:21:11 jlam Exp $
SHA1 (gkrellm-1.2.1.tar.gz) = 7fee49e1d9b7429567110dcb137d999687c2e560
Size (gkrellm-1.2.1.tar.gz) = 470603 bytes
-SHA1 (patch-aa) = a3ee2aa106e63d70cb50527710fe3564c30e2128
-SHA1 (patch-ab) = 2c8fe74b7071159a50e03c5c873717706341f672
+SHA1 (patch-aa) = 53ccdb2fe72770909e6d6bc0abf512da8da54bc4
+SHA1 (patch-ab) = 22d96b92282316da36db8070e385b3a815386dc3
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index 93f0a85eb16..c5f7623cab3 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,13 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2001/06/11 19:44:30 zuntum Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/23 19:21:11 jlam Exp $
---- Makefile.top.orig Sun Feb 4 16:10:13 2001
-+++ Makefile.top Sun Feb 4 16:13:25 2001
-@@ -111,7 +111,7 @@
+--- Makefile.top.orig Sun Jun 17 12:28:19 2001
++++ Makefile.top
+@@ -30,7 +30,7 @@
+ #
+ # Default
+ #--------
+-GTK_CONFIG = gtk-config
++#GTK_CONFIG = gtk-config
+ BINMODE = 755
+
+ # FreeBSD 2.X
+@@ -127,8 +127,8 @@
+
netbsd:
(cd locale && ${MAKE} all)
- (cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \
+- (cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \
- PTHREAD_INC=-I/usr/local/include SYS_LIBS="-lkvm" gkrellm )
-+ PTHREAD_INC=-I$(LOCALBASE)/include SYS_LIBS="-lkvm" gkrellm )
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
++ PTHREAD_INC=-I$(BUILDLINK_DIR)/include SYS_LIBS="-lkvm" gkrellm )
openbsd:
(cd locale && ${MAKE} all)
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index edb10edc543..790953ee4a8 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,10 +1,23 @@
-$NetBSD: patch-ab,v 1.2 2001/08/06 14:27:39 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/23 19:21:11 jlam Exp $
---- src/Makefile.src~ Sat Jul 21 21:59:58 2001
-+++ src/Makefile.src Mon Aug 6 00:05:25 2001
-@@ -17,7 +17,7 @@
+--- src/Makefile.src.orig Sat Jul 21 15:59:58 2001
++++ src/Makefile.src
+@@ -1,4 +1,4 @@
+-GTK_CONFIG ?= gtk-config
++#GTK_CONFIG ?= gtk-config
+ BINMODE ?= 755
+ INSTALLDIR ?= /usr/local/bin
+ INCLUDEDIR ?= /usr/local/include
+@@ -12,12 +12,12 @@
+ GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
+
+ GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
+-IMLIB_INCLUDE = `imlib-config --cflags-gdk`
++IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
+
GTK_LIB = `$(GTK_CONFIG) --libs gthread`
- IMLIB_LIB = `imlib-config --libs-gdk`
+-IMLIB_LIB = `imlib-config --libs-gdk`
++IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
-FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)