On Wed, May 22, 2019 at 03:01:39AM +0200, Charlene Wendling wrote:
>
> Here is an update for Compress::LZO, and a much needed modernisation of
> the port [0].
>
> What's new upstream [1]:
>
> - move to lzo-2.x, and make the module build with it
> - bunch of new tests
>
> What's new in the port:
>
> - use the cpan MODULE for distfiles and homepage, it also avoids
> the PKG/DISTNAME dance and thus zap CONFIGURE_STYLE
> - drop redundant 'perl5' from CATEGORIES
> - use modern licence marker
> - regen WANTLIB and LIB_DEPENDS due to the lzo2 move
> - enable tests, release tests cannot be enabled because we miss
> several modules
> - make use of SUBST_CMD instead of sed(1)
> - refresh the patch due to tooling modernisation, -L${LOCALBASE}/lib
> is needed twice in the final invocation, otherwise the configure
> step fails to find the lzo2 lib.
> - rewrote DESCR, mention the module real name
>
> Testing:
>
> - 'make test' passes on amd64 and macppc
> - there are no consumers
>
>
> Comments/feedback are welcome!
OK afresh1@
>
> Charlène.
>
>
> [0]
> https://github.com/openbsd/ports/blame/master/archivers/p5-Compress-LZO/Makefile
> [1] https://metacpan.org/source/PEPL/Compress-LZO-1.09/Changes
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/archivers/p5-Compress-LZO/Makefile,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 Makefile
> --- Makefile 20 Mar 2016 16:36:33 -0000 1.35
> +++ Makefile 22 May 2019 00:56:13 -0000
> @@ -1,26 +1,26 @@
> # $OpenBSD: Makefile,v 1.35 2016/03/20 16:36:33 naddy Exp $
>
> -COMMENT= interface to lzo compression library
> +COMMENT= interface to the LZO compression library
>
> -DISTNAME= perl-lzo-1.08
> -PKGNAME= p5-Compress-LZO-1.08
> -REVISION = 6
> -CATEGORIES= archivers perl5
> -MASTER_SITES= http://www.oberhumer.com/opensource/lzo/download/
> +DISTNAME= Compress-LZO-1.09
> +CATEGORIES= archivers
>
> -HOMEPAGE= http://www.oberhumer.com/opensource/lzo/
> +# GPLv2
> +PERMIT_PACKAGE_CDROM= Yes
>
> -LIB_DEPENDS = archivers/lzo
> -WANTLIB = c lzo>=1 perl
> +WANTLIB+= c lzo2 perl
>
> -# GPL
> -PERMIT_PACKAGE_CDROM= Yes
> +MODULES= cpan
> +
> +BUILD_DEPENDS= devel/p5-Devel-CheckLib>=0.9
>
> -CONFIGURE_STYLE= perl
> +LIB_DEPENDS= archivers/lzo2
>
> -WRKDIST= ${WRKDIR}/Compress-LZO-1.08
> +# We can't enable RELEASE_TESTING due to several depends missing
> +# in the ports tree
> +MAKE_ENV+= TEST_POD=Yes AUTHOR_TESTING=Yes RELEASE_TESTING=
>
> pre-configure:
> - @sed -i "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/Makefile.PL
> + ${SUBST_CMD} ${WRKSRC}/Makefile.PL
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/archivers/p5-Compress-LZO/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 4 Apr 2013 16:03:56 -0000 1.5
> +++ distinfo 22 May 2019 00:56:13 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (perl-lzo-1.08.tar.gz) = yr9SNJwS5wRBiXWAk6j3pWuuhYUMHnctl3p2lQcPTAY=
> -SIZE (perl-lzo-1.08.tar.gz) = 12480
> +SHA256 (Compress-LZO-1.09.tar.gz) = FdvLWuS+LaCVRbiRxmB32ltF5IQvK5mRnSmXP/a+T0c=
> +SIZE (Compress-LZO-1.09.tar.gz) = 22825
> Index: patches/patch-Makefile_PL
> ===================================================================
> RCS file: /cvs/ports/archivers/p5-Compress-LZO/patches/patch-Makefile_PL,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-Makefile_PL
> --- patches/patch-Makefile_PL 16 Jul 2005 16:27:25 -0000 1.3
> +++ patches/patch-Makefile_PL 22 May 2019 00:56:13 -0000
> @@ -1,20 +1,13 @@
> $OpenBSD: patch-Makefile_PL,v 1.3 2005/07/16 16:27:25 alek Exp $
> ---- Makefile.PL.orig Sun Aug 23 12:14:41 1998
> -+++ Makefile.PL Sun Aug 29 09:52:03 2004
> -@@ -6,14 +6,14 @@ use Config;
> - # <lzoconf.h> and <lzo1x.h> can be found.
> +Index: Makefile.PL
> +--- Makefile.PL.orig
> ++++ Makefile.PL
> +@@ -46,7 +46,7 @@ my %WriteMakefileArgs = (
>
> - #$LZO_INCLUDE = '-I/usr/include/lzo';
> --#$LZO_INCLUDE = '-I/usr/local/include';
> -+$LZO_INCLUDE = '-I!!LOCALBASE!!/include';
> - #$LZO_INCLUDE = '-I/usr/local/include/lzo';
> + %WriteMakefileArgs = (
> + %WriteMakefileArgs,
> +- LIBS => [ '-llzo2' ],
> ++ LIBS => [ '-L${LOCALBASE}/lib -llzo2' ],
> + );
>
> - # If liblzo is not installed in some place obvious, uncomment the next
> - # line and change the path to point to the directory where liblzo is
> - # installed.
> -
> --#$LZO_LIB = '-L/usr/local/lib';
> -+$LZO_LIB = '-L!!LOCALBASE!!/lib';
> -
> -
> - # It shouldn't be necessary to change anything from here on.
> + my %FallbackPrereqs = (
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/archivers/p5-Compress-LZO/pkg/DESCR,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 DESCR
> --- pkg/DESCR 12 Jul 2004 11:56:51 -0000 1.4
> +++ pkg/DESCR 22 May 2019 00:56:13 -0000
> @@ -1,3 +1,2 @@
> -Perl-LZO provides LZO bindings for Perl5. I.e. you can access the LZO
> -library from your Perl scripts thereby compressing ordinary Perl
> -strings.
> +The Compress::LZO module provides a Perl interface to the LZO compression
> +library.
>
--
andrew - http://afresh1.com
Adding manpower to a late software project makes it later.
No comments:
Post a Comment