diff options
| author | steve <steve@FreeBSD.org> | 2000-07-08 03:59:26 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-08 03:59:26 +0800 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /x11 | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.zst freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip | |
- 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>
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gmessage/Makefile | 3 | ||||
| -rw-r--r-- | x11/gmessage/files/patch-aa | 13 | ||||
| -rw-r--r-- | x11/gyroscope/Makefile | 8 | ||||
| -rw-r--r-- | x11/gyroscope/files/patch-aa | 26 |
4 files changed, 32 insertions, 18 deletions
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile index 43de554b7d7a..bc8018a2b9f2 100644 --- a/x11/gmessage/Makefile +++ b/x11/gmessage/Makefile @@ -14,6 +14,9 @@ MAINTAINER= domi@saargate.de LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/x11/gmessage/files/patch-aa b/x11/gmessage/files/patch-aa index 14c2e4b2a6e3..6d6e4d81ffee 100644 --- a/x11/gmessage/files/patch-aa +++ b/x11/gmessage/files/patch-aa @@ -1,11 +1,12 @@ ---- Makefile.orig Sun Jul 18 17:55:35 1999 -+++ Makefile Sun Jul 18 17:57:42 1999 +--- Makefile.orig Thu May 27 19:58:06 1999 ++++ Makefile Sat Jul 1 17:48:44 2000 @@ -1,6 +1,6 @@ - CC = gcc +-CC = gcc -CFLAGS = `gtk-config --cflags` -LDLIBS = `gtk-config --libs` -+CFLAGS = `gtk12-config --cflags` -+LDLIBS = `gtk12-config --libs` ++CC ?= gcc ++CFLAGS += `$(GTK_CONFIG) --cflags` ++LDLIBS = `$(GTK_CONFIG) --libs` all: gmessage @@ -14,7 +15,7 @@ install: gmessage - cp ./gmessage /usr/local/bin -+ install -m 0555 -o root -g wheel -s gmessage /usr/X11R6/bin ++ ${BSD_INSTALL_PROGRAM} gmessage ${PREFIX}/bin clean: $(RM) *.o core gmessage diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile index 14e9b1c03caf..cee2a114a3bb 100644 --- a/x11/gyroscope/Makefile +++ b/x11/gyroscope/Makefile @@ -17,10 +17,10 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -WRKSRC= ${WRKDIR}/gyroscope -USE_X_PREFIX= yes +WRKSRC= ${WRKDIR}/${PORTNAME} -do-build: - @(cd ${WRKSRC} && ${MAKE}) +USE_X_PREFIX= yes +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +ALL_TARGET= # empty .include <bsd.port.mk> 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: |