From owner-freebsd-ports Mon Feb 1 05:00:08 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id FAA16762 for freebsd-ports-outgoing; Mon, 1 Feb 1999 05:00:08 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id FAA16685 for ; Mon, 1 Feb 1999 05:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id FAA21978; Mon, 1 Feb 1999 05:00:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from rebel.net.au (rebel.rebel.net.au [203.20.69.66]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA16289 for ; Mon, 1 Feb 1999 04:57:26 -0800 (PST) (envelope-from kkenn@rebel.net.au) Received: from 203.20.69.76 (dialup-6.rebel.net.au [203.20.69.76]) by rebel.net.au (8.8.5/8.8.4) with ESMTP id XAA25677 for ; Mon, 1 Feb 1999 23:26:54 +1030 Received: (qmail 80600 invoked by uid 0); 1 Feb 1999 12:57:40 -0000 Message-Id: <19990201125740.80599.qmail@morden.rebel.net.au> Date: 1 Feb 1999 12:57:40 -0000 From: kkenn@rebel.net.au Reply-To: kkennawa@physics.adelaide.edu.au To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9855: Unbreak x11-toolkits/gtkgl Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9855 >Category: ports >Synopsis: Unbreak x11-toolkits/gtkgl >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 1 05:00:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Kris Kennaway >Release: FreeBSD-4.0 >Organization: FreeBSD >Environment: 4.0-CURRENT >Description: The attached patches unbreak this port, which was a combination of: * libGL requiring an explicit -lXext in the post-ELF world * libtool breakage for 4.0-CURRENT Instead of patching the supplied copy of libtool, I've added a BUILD_DEPENDS on devel/libtool and patched configure to look there (much more maintainable in the long run). >How-To-Repeat: >Fix: diff -ruN gtkgl/Makefile gtkgl~/Makefile --- gtkgl/Makefile Wed Dec 30 04:52:59 1998 +++ gtkgl~/Makefile Mon Feb 1 23:19:57 1999 @@ -15,11 +15,11 @@ LIB_DEPENDS= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \ MesaGL.14:${PORTSDIR}/graphics/Mesa3 - -BROKEN_ELF= configure +BUILD_DEPENDS= ${LOCALBASE}/share/libtool/ltconfig:${PORTSDIR}/devel/libtool/ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-Mesa=yes +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} pre-install: @if [ ! -f ${PREFIX}/info/dir ]; then \ diff -ruN gtkgl/patches/patch-aa gtkgl~/patches/patch-aa --- gtkgl/patches/patch-aa Mon Sep 21 06:55:15 1998 +++ gtkgl~/patches/patch-aa Mon Feb 1 23:05:46 1999 @@ -1,25 +1,94 @@ ---- configure.orig Tue Sep 15 00:43:41 1998 -+++ configure Tue Sep 15 00:44:06 1998 -@@ -1397,18 +1397,18 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config - fi - fi - -- # Extract the first word of "gtk-config", so it can be a program name with args. --set dummy gtk-config; ac_word=$2 -+ # Extract the first word of "gtk11-config", so it can be a program name with args. -+set dummy gtk11-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1414: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then +*** configure.orig Sat Apr 18 13:25:08 1998 +--- configure Mon Feb 1 22:56:18 1999 +*************** +*** 1330,1337 **** + # Actually configure libtool. ac_aux_dir is where install-sh is found. + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +! ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ +! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + +--- 1330,1337 ---- + # Actually configure libtool. ac_aux_dir is where install-sh is found. + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +! ${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig \ +! $libtool_flags --no-verify ${LOCALBASE}/share/libtool//ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + +*************** +*** 1397,1414 **** + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then +! GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then +! GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + +! # Extract the first word of "gtk-config", so it can be a program name with args. +! set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:1414: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then +--- 1397,1414 ---- + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then +! GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then +! GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config + fi + fi + +! # Extract the first word of "gtk11-config", so it can be a program name with args. +! set dummy gtk11-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:1414: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then +*************** +*** 2456,2462 **** + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +! LIBS="-lGL ${last_LDFLAGS} $LIBS" + cat > conftest.$ac_ext <&6 + else + ac_save_LIBS="$LIBS" +! LIBS="-lGL -lXext ${last_LDFLAGS} $LIBS" + cat > conftest.$ac_ext <&6 + else + ac_save_LIBS="$LIBS" +! LIBS="-lGLU ${last_LDFLAGS} $LIBS" + cat > conftest.$ac_ext <&6 + else + ac_save_LIBS="$LIBS" +! LIBS="-lGLU -lXext -lGL ${last_LDFLAGS} $LIBS" + cat > conftest.$ac_ext <Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message