summaryrefslogtreecommitdiff
path: root/x11/gmessage
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/gmessage
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 'x11/gmessage')
-rw-r--r--x11/gmessage/Makefile3
-rw-r--r--x11/gmessage/files/patch-aa13
2 files changed, 10 insertions, 6 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