diff options
| author | edwin <edwin@FreeBSD.org> | 2004-12-25 20:36:54 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2004-12-25 20:36:54 +0800 |
| commit | 6536fe0f82b5e67fb0c712ec3eac16b7664073d9 (patch) | |
| tree | c9d544e1fb33e3ef33c4bf5bb5f7ced52c6af0ff /sysutils | |
| parent | 52625eb91ddfc6a426adf5f0a3e0cba5f6d9bc0d (diff) | |
| download | freebsd-ports-gnome-6536fe0f82b5e67fb0c712ec3eac16b7664073d9.tar.gz freebsd-ports-gnome-6536fe0f82b5e67fb0c712ec3eac16b7664073d9.tar.zst freebsd-ports-gnome-6536fe0f82b5e67fb0c712ec3eac16b7664073d9.zip | |
Properly 'determine' gtkrell2
Properly use X11BASE now
Noticed by: pointyhat
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gkrelltop/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/gkrelltop/files/patch-Makefile | 28 | ||||
| -rw-r--r-- | sysutils/gkrelltop/files/patch-makefile | 11 |
3 files changed, 29 insertions, 13 deletions
diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile index e714e7e75850..cd1a764892b0 100644 --- a/sysutils/gkrelltop/Makefile +++ b/sysutils/gkrelltop/Makefile @@ -7,11 +7,10 @@ PORTNAME= gkrelltop PORTVERSION= 2.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://psychology.rutgers.edu/~zaimi/html/gkrelltop/ DISTNAME= ${PORTNAME}_2.2-6 -#EXTRACT_SUFX= .tgz MAINTAINER= david@pinko.net COMMENT= Plugin for gkrellm 2.x shows top three processes, requires procfs diff --git a/sysutils/gkrelltop/files/patch-Makefile b/sysutils/gkrelltop/files/patch-Makefile new file mode 100644 index 000000000000..1347c3498fb1 --- /dev/null +++ b/sysutils/gkrelltop/files/patch-Makefile @@ -0,0 +1,28 @@ +--- Makefile.orig Sat Dec 11 12:50:39 2004 ++++ Makefile Sat Dec 25 23:35:53 2004 +@@ -28,9 +28,9 @@ + OSFLAG = `uname | tr '[:lower:]' '[:upper:]'` + SHELL=/bin/sh + +-GKRELL1FLAG=1 ++GKRELL1FLAG=0 + #find out if we have gkrellm 2 or 1 (from the gtk+ version) +-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0') ++#GKRELL1FLAG=$(shell sh -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0') + GKRELLTOP= gkrelltop.so + OBJ = top_three.o gkrelltop.o + EXTRA = krell_panel1.xpm +@@ -61,11 +61,11 @@ + endif + + ifeq ($(WANT_GLIB12),yes) +-CFLAGSD = -I/usr/X11R6/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags` ++CFLAGSD = -I${X11BASE}/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags` + LIBSD = `glib-config --libs` + CONFIGURE_ARGS += --with-glib12 + else +-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags` ++CFLAGSD = -D$(OSFLAG) -I${X11BASE}/include -fPIC -Wall `pkg-config glib-2.0 --cflags` + LIBSD = `pkg-config glib-2.0 --libs` + endif + INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd diff --git a/sysutils/gkrelltop/files/patch-makefile b/sysutils/gkrelltop/files/patch-makefile deleted file mode 100644 index 9403be69ebb4..000000000000 --- a/sysutils/gkrelltop/files/patch-makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Sun Dec 19 14:25:10 2004 -+++ Makefile Sun Dec 19 14:02:12 2004 -@@ -65,7 +65,7 @@ - LIBSD = `glib-config --libs` - CONFIGURE_ARGS += --with-glib12 - else --CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags` -+CFLAGSD = -D$(OSFLAG) -I/usr/X11R6/include -fPIC -Wall `pkg-config glib-2.0 --cflags` - LIBSD = `pkg-config glib-2.0 --libs` - endif - INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd |