On 03/16/16 02:11, Michael McConville wrote:
> I was trying to port GNU Complexity, but our autogen version is too old.
> Below is an initial patch to update it. I've been planning to run it
> through a bulk build, but my build machine has been giving me issues.
> I'll get to it pretty soon, but if anyone else can once it's ready, I'd
> appreciate it.
>
> For some reason, it picks up guile if available and uses it even if
> guile2 (which is the only one that works here) is installed. I didn't
> see a configure option to force guile2. If only guile2 is installed, it
> works as expected. What's the best way of dealing with this?
>
> Two tests fail, which I haven't had a chance to look into yet. The
> existing port fails one test, but the test suite seems to have changed
> significantly.
>
> None of the patches seemed to be needed anymore.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/autogen/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile 16 Mar 2015 18:07:39 -0000 1.19
> +++ Makefile 16 Mar 2016 02:03:09 -0000
> @@ -3,30 +3,32 @@
> COMMENT= automatic text creation from templates
> CATEGORIES= devel
>
> -V= 5.8.7
> +V= 5.18.7
> DISTNAME= autogen-${V}
> REVISION= 4
Revision should be removed and start again if version changes.
>
> SHARED_LIBS += opts 27.5 # .27.5
> -SHARED_LIBS += guileopts 1.0 # .0.1
>
> HOMEPAGE= http://autogen.sourceforge.net/
> -MASTER_SITES= ${MASTER_SITE_GNU:=autogen/rel${V}/}
> +MASTER_SITES= ${MASTER_SITE_GNU:=autogen/}
> +
> +EXTRACT_SUFX= .tar.xz
>
> # GPLv2
> PERMIT_PACKAGE_CDROM=Yes
>
> -WANTLIB += c gmp guile ltdl lzma m pthread xml2 z
> +WANTLIB += c gmp guile-2.0 ltdl lzma m pthread xml2 z ffi gc unistring
>
> MODULES= devel/gettext
>
> -LIB_DEPENDS= lang/guile \
> +LIB_DEPENDS= lang/guile2 \
> textproc/libxml
> CONFIGURE_STYLE=gnu
> CONFIGURE_ARGS= --without-libregex \
> --includedir=${PREFIX}/include/autogen \
> ${ENABLE_SHARED}
>
> +USE_GMAKE= Yes
> MAKE_FLAGS+= INFO_DEPS=
> USE_GROFF = Yes
> .include <bsd.port.mk>
