From 89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df Mon Sep 17 00:00:00 2001 From: Steve Price 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 --- irc/olirc/Makefile | 8 ++++++-- irc/olirc/files/patch-ab | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'irc/olirc') diff --git a/irc/olirc/Makefile b/irc/olirc/Makefile index d72f7cb1b982..91070b9465d4 100644 --- a/irc/olirc/Makefile +++ b/irc/olirc/Makefile @@ -14,10 +14,14 @@ MAINTAINER= nox@jelal.kn-bremen.de LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_BZIP2= yes -GNU_CONFIGURE= yes USE_X_PREFIX= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config +GNU_CONFIGURE= yes +CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ + GTK_CONFIG="${GTK_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/olirc ${PREFIX}/bin diff --git a/irc/olirc/files/patch-ab b/irc/olirc/files/patch-ab index 24cd66471e9b..ab58fbcaf55f 100644 --- a/irc/olirc/files/patch-ab +++ b/irc/olirc/files/patch-ab @@ -1,10 +1,20 @@ -Index: configure +--- configure.orig Mon Oct 11 16:00:00 1999 ++++ configure Sat Jul 1 17:06:30 2000 @@ -1714,7 +1714,7 @@ if test "$gtk_config_major_version" = "1" -a "$gtk_config_minor_version" = 0 ; then GTK_OBJS_STATIC="$GTK_PREFIX/lib/libgtk.a $GTK_PREFIX/lib/libgdk.a $GTK_PREFIX/lib/libglib.a" else - GLIB_PREFIX=`glib-config --prefix 2> /dev/null` -+ GLIB_PREFIX=`glib12-config --prefix 2> /dev/null` ++ GLIB_PREFIX=`$GLIB_CONFIG --prefix 2> /dev/null` GTK_OBJS_STATIC="$GTK_PREFIX/lib/libgtk.a $GTK_PREFIX/lib/libgdk.a $GLIB_PREFIX/lib/libglib.a $GLIB_PREFIX/lib/libgmodule.a" fi +@@ -2393,7 +2393,7 @@ + echo "Configuration complete." + echo "" + +-echo "Ol-Irc will use GTK+ version : `gtk-config --version`" ++echo "Ol-Irc will use GTK+ version : `$GTK_CONFIG --version`" + + echo "" + -- cgit v1.2.3