diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2004-12-25 12:36:54 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2004-12-25 12:36:54 +0000 |
| commit | d86b5f61da0f4a8e29d8594f6b214bbced1bbff4 (patch) | |
| tree | e96d561669dc85ebd09647216bd196d9a77f39eb /sysutils/gkrelltop/files | |
| parent | 346dc7dfe640663ca5e17629eec5986d708d62e8 (diff) | |
| download | ports-d86b5f61da0f4a8e29d8594f6b214bbced1bbff4.tar.gz ports-d86b5f61da0f4a8e29d8594f6b214bbced1bbff4.zip | |
Notes
Diffstat (limited to 'sysutils/gkrelltop/files')
| -rw-r--r-- | sysutils/gkrelltop/files/patch-Makefile | 28 | ||||
| -rw-r--r-- | sysutils/gkrelltop/files/patch-makefile | 11 |
2 files changed, 28 insertions, 11 deletions
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 |