aboutsummaryrefslogtreecommitdiff
path: root/irc
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 /irc
parent65b63032bfb3a3f1c8ac4ee660ac83927b43c92a (diff)
downloadports-89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df.tar.gz
ports-89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df.zip
Notes
Diffstat (limited to 'irc')
-rw-r--r--irc/olirc/Makefile8
-rw-r--r--irc/olirc/files/patch-ab14
2 files changed, 18 insertions, 4 deletions
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 ""
+