summaryrefslogtreecommitdiff
path: root/devel/ORBit2/files/patch-ad
diff options
context:
space:
mode:
authorYukihiro Nakai <nakai@FreeBSD.org>1999-10-14 11:16:50 +0000
committerYukihiro Nakai <nakai@FreeBSD.org>1999-10-14 11:16:50 +0000
commitfe9ac2742f3bbef5afc63bac3f3e64f491e3c7d7 (patch)
treea9251c8fd0b9d3ae5dad61ce0d0013fa8ef1a533 /devel/ORBit2/files/patch-ad
parentFixed installation problem to work well (diff)
PR: ports/14303
Submitted by:Ade Lovett<ade@lovett.com> Fixed for the libIDL-config command.
Notes
Notes: svn path=/head/; revision=22446
Diffstat (limited to '')
-rw-r--r--devel/ORBit2/files/patch-ad23
1 files changed, 19 insertions, 4 deletions
diff --git a/devel/ORBit2/files/patch-ad b/devel/ORBit2/files/patch-ad
index bc0a5f58b9c9..fe48898dce42 100644
--- a/devel/ORBit2/files/patch-ad
+++ b/devel/ORBit2/files/patch-ad
@@ -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