On May 12, 2018 4:01:47 PM GMT+02:00, Solene Rapenne <sol...@perso.pw> wrote:
>
>Jeremie Courreges-Anglas writes:
>
>> On Fri, May 11 2018, Stuart Henderson <s...@spacehopper.org> wrote:
>>
>> Also ok jca@
>>
>>> but please could you fix CONFIGURE_STYLE while you're
>>> there? It's wrong for this port - it's not autoconf so should just
>be
>>> "simple", and to cope with the CONFIGURE_STYLE change it will also
>need
>>> TEST_TARGET=check.
>>
>> CONFIGURE_STYLE=simple would also mess with the PLIST (and break
>> packaging). If a change is due here, it would make sense to address
>it
>> separately.
>>
>> --- pkg/PLIST.orig Sun Oct 4 02:12:42 2009
>> +++ pkg/PLIST Fri May 11 13:35:45 2018
>> @@ -1,6 +1,10 @@
>> @comment $OpenBSD: PLIST,v 1.2 2009/10/04 00:12:42 william Exp $
>> @bin bin/ocrad
>> -@info info/ocrad.info
>> @man man/man1/ocrad.1
>> share/doc/ocrad/
>> share/doc/ocrad/README
>> +@info share/info/
>> +@info share/info/ocrad.info
>> +@mandir share/man/
>> +share/man/man1/
>> +@man share/man/man1/ocrad.1
>
>Version bump committed.
>
>Here are diff to change CONFIGURE_STYLE from gnu to simple, and a patch
>to fix the dest paths for info and man pages. I think the patch is the
>easiest way to deal with it, not sure though.
>
>Index: Makefile
>===================================================================
>RCS file: /cvs/ports/graphics/ocrad/Makefile,v
>retrieving revision 1.15
>diff -u -p -r1.15 Makefile
>--- Makefile 12 May 2018 13:47:14 -0000 1.15
>+++ Makefile 12 May 2018 14:01:03 -0000
>@@ -14,7 +14,7 @@ WANTLIB= c m ${COMPILER_LIBCXX}
>
> MASTER_SITES= ${MASTER_SITE_GNU:=ocrad/}
>
>-CONFIGURE_STYLE=gnu
>+CONFIGURE_STYLE=simple
>
> MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
>
>cvs server: Diffing patches
>Index: patches/patch-configure
>===================================================================
>RCS file: patches/patch-configure
>diff -N patches/patch-configure
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ patches/patch-configure 12 May 2018 14:01:03 -0000
>@@ -0,0 +1,14 @@
>+$OpenBSD$
>+
>+Index: configure
>+--- configure.orig
>++++ configure
>+@@ -18,7 +18,7 @@ srcdir=
>+ prefix=/usr/local
>+ exec_prefix='$(prefix)'
>+ bindir='$(exec_prefix)/bin'
>+-datarootdir='$(prefix)/share'
>++datarootdir='$(prefix)'
>+ includedir='${prefix}/include'
>+ infodir='$(datarootdir)/info'
>+ libdir='${exec_prefix}/lib'
Would FAKE_FLAGS work in this situation?
--
Antoine
