From ade@lovett.com Wed Oct 13 19:00:00 1999
Return-Path: <ade@lovett.com>
Received: from anaconda.lovett.com (anaconda.lovett.com [216.60.121.168])
	by hub.freebsd.org (Postfix) with ESMTP id 03F691536D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Oct 1999 18:59:56 -0700 (PDT)
	(envelope-from ade@lovett.com)
Received: from ade by anaconda.lovett.com with local (Exim 3.03 #1)
	id 11baBL-0006nf-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 13 Oct 1999 20:59:51 -0500
Message-Id: <E11baBL-0006nf-00@anaconda.lovett.com>
Date: Wed, 13 Oct 1999 20:59:51 -0500
From: Ade Lovett <ade@lovett.com>
Reply-To: ade@lovett.com
To: FreeBSD-gnats-submit@freebsd.org,ade@lovett.com
Subject: Fix for devel/ORBit
X-Send-Pr-Version: 3.2

>Number:         14315
>Category:       ports
>Synopsis:       Fix for devel/ORBit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nakai
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 13 19:00:01 PDT 1999
>Closed-Date:    Thu Oct 14 04:17:23 PDT 1999
>Last-Modified:  Thu Oct 14 04:17:43 PDT 1999
>Originator:     Ade Lovett
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
Lovett Network Consultancy
>Environment:

	Up-to-date ports tree.

>Description:

	Whilst trying to build mozilla M10 with IDL support, I noticed
	an error from libIDL-config (installed by this port) saying
	it couldn't find glib-config (part of devel/glib12).  We use
	glib12-config to differentiate between versions.


>How-To-Repeat:

	With devel/ORBit installed, run:

		/usr/local/bin/libIDL-config --cflags

	you'll see something like:

	anaconda 43# libIDL-config --cflags
	glib-config: not found
	-I/usr/local/include

>Fix:
	
	patches/patch-ad needs to be modified to work on both
	orbit-config.in and libIDL/libIDL-config.in

	Take the opportunity to use @GLIB_CONFIG@ (from configure)
	so that when GLIB_CONFIG changes, we don't get bitten again.

	This issue (of using GLIB_CONFIG and GTK_CONFIG, but
	substituting their actual values 'glib12-config' and 'gtk12-config')
	may be affecting other ports.

	Assuming the port uses GNU configure, these can be fixed with
	a similar use of @GLIB_CONFIG@ and @GTK_CONFIG@ in the *.in file.
	If I find any, I'll submit the PRs.


cvs diff: Diffing .
cvs diff: Diffing files
cvs diff: Diffing patches
Index: patches/patch-ad
===================================================================
RCS file: /home/ncvs/ports/devel/ORBit/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- patch-ad	1999/03/09 01:08:51	1.2
+++ patch-ad	1999/10/14 01:50:20
@@ -6,8 +6,8 @@
  
 -    client		(calls glib-config)
 -    server		(calls glib-config)
-+    client		(calls glib12-config)
-+    server		(calls glib12-config)
++    client		(calls @GLIB_CONFIG@)
++    server		(calls @GLIB_CONFIG@)
  EOF
  
      exit $1
@@ -17,8 +17,23 @@
      client|server)
 -	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
 -	the_flags="$the_flags `glib-config --cflags` -I@includedir@"
-+	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm"
-+	the_flags="$the_flags `glib12-config --cflags` -I@includedir@"
++	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ -lm"
++	the_flags="$the_flags `@GLIB_CONFIG@ --cflags` -I@includedir@"
  	;;
  
     --use-service=*)
+--- libIDL/libIDL-config.in.orig	Fri Apr 16 09:52:20 1999
++++ libIDL/libIDL-config.in	Wed Oct 13 20:49:40 1999
+@@ -74,10 +74,10 @@
+ 	echo $exec_prefix
+ fi
+ if test "$echo_cflags" = "yes"; then
+-	all_flags="$all_flags $includes $cflags `glib-config --cflags`"
++	all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@ --cflags`"
+ fi
+ if test "$echo_libs" = "yes"; then
+-	all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`"
++	all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@ --libs`"
+ fi
+ 
+ # Straight out any possible duplicates, but be careful to
cvs diff: Diffing pkg

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->nakai 
Responsible-Changed-By: nakai 
Responsible-Changed-When: Thu Oct 14 04:05:04 PDT 1999 
Responsible-Changed-Why:  
I'll take this.. 
State-Changed-From-To: open->closed 
State-Changed-By: nakai 
State-Changed-When: Thu Oct 14 04:17:23 PDT 1999 
State-Changed-Why:  
Applied, Thanks! 
>Unformatted:
