summaryrefslogtreecommitdiff
path: root/x11/gyroscope/files/patch-aa
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2000-07-07 19:59:26 +0000
committerSteve Price <steve@FreeBSD.org>2000-07-07 19:59:26 +0000
commit89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df (patch)
treedab293772a4c12d5e7f6c0f30c1e8ae09e1cfe4d /x11/gyroscope/files/patch-aa
parentLocation on MASTER_SITE has changed. (diff)
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly PR: 19623 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes: svn path=/head/; revision=30342
Diffstat (limited to '')
-rw-r--r--x11/gyroscope/files/patch-aa26
1 files changed, 18 insertions, 8 deletions
diff --git a/x11/gyroscope/files/patch-aa b/x11/gyroscope/files/patch-aa
index 92509755913c..82cb04fefa7c 100644
--- a/x11/gyroscope/files/patch-aa
+++ b/x11/gyroscope/files/patch-aa
@@ -1,19 +1,29 @@
---- Makefile.orig Sun Jan 31 03:30:22 1999
-+++ Makefile Sat Jul 31 16:27:41 1999
-@@ -1,8 +1,8 @@
+--- Makefile.orig Sun Jan 31 01:30:22 1999
++++ Makefile Sat Jul 1 17:49:53 2000
+@@ -1,20 +1,20 @@
-CC = gcc
+CC ?= gcc
BINARYNAME = gyroscope
-BIN_DIR = /usr/local/bin/
-GTKINC = `gtk-config --cflags` -Wall -O2
-GTKLIB = `gtk-config --libs`
-+BIN_DIR = ${X11BASE}/bin
-+GTKINC = `gtk12-config --cflags` -Wall -O2
-+GTKLIB = `gtk12-config --libs`
++BIN_DIR = ${PREFIX}/bin
++GTKINC = `$(GTK_CONFIG) --cflags`
++GTKLIB = `$(GTK_CONFIG) --libs`
$(BINARYNAME): main.o gtkcolorsel.o
- $(CC) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
-@@ -17,4 +17,4 @@
+- $(CC) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
++ $(CC) $(CFLAGS) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
+
+ gtkcolorsel.o:gtkcolorsel.c gtkcolorsel.h
+- $(CC) gtkcolorsel.c -c $(GTKINC)
++ $(CC) $(CFLAGS) gtkcolorsel.c -c $(GTKINC)
+
+ main.o: main.c
+- $(CC) main.c -c $(GTKINC)
++ $(CC) $(CFLAGS) main.c -c $(GTKINC)
+
+ clean:
-@ rm core -f *.o ./$(BINARYNAME)
install: