svn commit: r360799 - head/graphics/gimageview/files

[John Marino]

On 7/5/2014 22:30, Tijl Coosemans wrote:
> On Sat, 05 Jul 2014 22:06:09 +0200 John Marino wrote:
>> On 7/5/2014 21:37, Tijl Coosemans wrote:
>>> On Sat, 5 Jul 2014 18:58:00 +0000 (UTC) John Marino wrote:
>>>> Author: marino
>>>> Date: Sat Jul  5 18:58:00 2014
>>>> New Revision: 360799
>>>> URL: http://svnweb.freebsd.org/changeset/ports/360799
>>>> QAT: https://qat.redports.org/buildarchive/r360799/
>>>>
>>>> Log:
>>>>   graphics/gimageview: Bring in dports patch to support DragonFly
>>>>
>>>> Added:
>>>>   head/graphics/gimageview/files/patch-configure   (contents, props changed)
>>>>
>>>> Added: head/graphics/gimageview/files/patch-configure
>>>> ==============================================================================
>>>> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
>>>> +++ head/graphics/gimageview/files/patch-configure	Sat Jul  5 18:58:00 2014	(r360799)
>>>> @@ -0,0 +1,36 @@
>>>> +--- configure.orig	2014-05-30 20:23:28.832450000 +0000
>>>> ++++ configure
>>>> +@@ -4723,13 +4723,13 @@ darwin* | rhapsody*)
>>>> +   esac
>>>> +   ;;
>>>> + 
>>>> +-freebsd*)
>>>> ++dragonfly*|freebsd*)
>>>> +   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>>>> +     case $host_cpu in
>>>> +     i*86 )
>>>> +       # Not sure whether the presence of OpenBSD here was a mistake.
>>>> +       # Let's accept both of them until this is cleared up.
>>>> +-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
>>>> ++      lt_cv_deplibs_check_method='file_magic (FreeBSD|DragonFly|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
>>>> +       lt_cv_file_magic_cmd=/usr/bin/file
>>>> +       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>>>> +       ;;
>>>> +@@ -6990,7 +6990,7 @@ else
>>>> +     ;;
>>>> + 
>>>> +   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>>>> +-  freebsd*)
>>>> ++  dragonfly*|freebsd*)
>>>> +     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>>>> +     hardcode_libdir_flag_spec='-R$libdir'
>>>> +     hardcode_direct=yes
>>>> +@@ -7421,7 +7421,7 @@ freebsd1*)
>>>> +   dynamic_linker=no
>>>> +   ;;
>>>> + 
>>>> +-freebsd*)
>>>> ++dragonfly*|freebsd*)
>>>> +   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>>>> +   version_type=freebsd-$objformat
>>>> +   case $version_type in
>>>
>>> This should also work without patch because of USES=libtool
>>
>> I've seen lots of ancient configure scripts similar to this one.  Are
>> you saying if USES+=libtool is added to the port makefile it will
>> magically be fixed?  Most of those ports don't have libtool specified.
> 
> Yes, you added that to libtool.mk in
> http://svnweb.freebsd.org/ports?view=revision&revision=345519
> 

yes, but I wasn't going to just add libtool to fix configure scripts.  I
assumed there could be side effects, or in other words: Don't specify
libtool if you don't need libtool.   So I thought it was just luck if a
port with an old configure script also happened to need libtool.