Date: Sat, 30 Jan 1999 20:42:00 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9804: Port fix: imlib Message-ID: <199901301842.UAA74639@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 9804
>Category: ports
>Synopsis: Port fix: imlib
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 30 10:50:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 3.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports collection
>Description:
Add back patch-ae to support 4.0-CURRENT. Don't remove tests for
ImageMagik from configure, sure the programs are found if installed.
>How-To-Repeat:
>Fix:
diff -urN imlib.old/patches/patch-aa imlib/patches/patch-aa
--- imlib.old/patches/patch-aa Thu Jan 21 22:00:49 1999
+++ imlib/patches/patch-aa Fri Jan 22 00:25:39 1999
@@ -22,147 +22,6 @@
echo "$ac_t""yes" 1>&6
-@@ -2248,140 +2248,6 @@
- DYNAMIC_MODULES_WORK_TRUE='#'
- DYNAMIC_MODULES_WORK_FALSE=
- fi
--# Extract the first word of "djpeg", so it can be a program name with args.
--set dummy djpeg; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2255: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$DJPEG_PROG" in
-- /*)
-- ac_cv_path_DJPEG_PROG="$DJPEG_PROG" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_DJPEG_PROG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac
--fi
--DJPEG_PROG="$ac_cv_path_DJPEG_PROG"
--if test -n "$DJPEG_PROG"; then
-- echo "$ac_t""$DJPEG_PROG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--# Extract the first word of "cjpeg", so it can be a program name with args.
--set dummy cjpeg; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2286: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$CJPEG_PROG" in
-- /*)
-- ac_cv_path_CJPEG_PROG="$CJPEG_PROG" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_CJPEG_PROG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac
--fi
--CJPEG_PROG="$ac_cv_path_CJPEG_PROG"
--if test -n "$CJPEG_PROG"; then
-- echo "$ac_t""$CJPEG_PROG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--
--# Extract the first word of "convert", so it can be a program name with args.
--set dummy convert; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2318: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$CONVERT_PROG" in
-- /*)
-- ac_cv_path_CONVERT_PROG="$CONVERT_PROG" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_CONVERT_PROG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac
--fi
--CONVERT_PROG="$ac_cv_path_CONVERT_PROG"
--if test -n "$CONVERT_PROG"; then
-- echo "$ac_t""$CONVERT_PROG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--echo "CONVERT_PROG is $CONVERT_PROG"
--CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'`
--echo "CONVERT_PATH is $CONVERT_PATH"
--
--
--# Extract the first word of "giftopnm", so it can be a program name with args.
--set dummy giftopnm; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2354: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$GIFTOPNM_PROG" in
-- /*)
-- ac_cv_path_GIFTOPNM_PROG="$GIFTOPNM_PROG" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_GIFTOPNM_PROG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac
--fi
--GIFTOPNM_PROG="$ac_cv_path_GIFTOPNM_PROG"
--if test -n "$GIFTOPNM_PROG"; then
-- echo "$ac_t""$GIFTOPNM_PROG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--echo "GIFTOPNM_PROG is $GIFTOPNM_PROG"
--NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
--echo "NETPBM_PATH is $NETPBM_PATH"
--
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:2388: checking how to run the C preprocessor" >&5
@@ -3987,7 +3853,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
diff -urN imlib.old/patches/patch-ae imlib/patches/patch-ae
--- imlib.old/patches/patch-ae Thu Jan 1 02:00:00 1970
+++ imlib/patches/patch-ae Sat Jan 30 20:26:39 1999
@@ -0,0 +1,20 @@
+--- ltconfig.orig Sat Jan 30 20:26:08 1999
++++ ltconfig Sat Jan 30 20:26:25 1999
+@@ -1201,7 +1201,7 @@
+ ;;
+
+ # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+- freebsd3*)
++ freebsd3* | freebsd4*)
+ archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+@@ -1606,7 +1606,7 @@
+ shlibpath_var=PATH
+ ;;
+
+-freebsd2* | freebsd3*)
++freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901301842.UAA74639>