From 7879264d29ab2a706345ab21de9f9cd3139efc7a Mon Sep 17 00:00:00 2001 From: steve Date: Fri, 7 Jul 2000 19:59:26 +0000 Subject: - 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 --- x11/gmessage/Makefile | 3 +++ x11/gmessage/files/patch-aa | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'x11/gmessage') diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile index 43de554..bc8018a 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 diff --git a/x11/gmessage/files/patch-aa b/x11/gmessage/files/patch-aa index 14c2e4b..6d6e4d8 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 -- cgit v1.1