On Mon, Mar 02, 2020 at 05:39:51PM -0500, Brian Callahan wrote:
> Hi ports --
> 
> After more than 4 years, lookat received a new update.
> The changelog is short, the important items are:
> * utf8 support
> * change in the default color scheme
> * improved error handling
> 
> Port-wise, I removed the do-install routine in favor of letting the Makefile
> do in the installation. I am not sure why I made the do-install routine all
> those years ago.
> 
> Small patch to keep the example color schemes in the same directory as
> before, which I think is a better fit for our directory scheme than what
> upstream does.
> 
> Also take MAINTAINER. I imported this many years ago, so I will maintain
> this again.
> 
> OK?
> 
> ~Brian
> 

ok remi@

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/lookat/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  12 Jul 2019 20:49:46 -0000      1.5
> +++ Makefile  2 Mar 2020 22:32:39 -0000
> @@ -1,32 +1,23 @@
>  # $OpenBSD: Makefile,v 1.5 2019/07/12 20:49:46 sthen Exp $
>  
> -V =          1.4.4
> +V =          2.0.0
>  COMMENT =    user-friendly text pager
>  DISTNAME =   lookat_bekijk-${V}
>  PKGNAME =    lookat-${V}
>  CATEGORIES = sysutils textproc
> -REVISION =   0
>  
>  HOMEPAGE =   http://www.wagemakers.be/english/programs/lookat
> +MAINTAINER = Brian Callahan <bcal...@openbsd.org>
>  
>  # GPLv2+
>  PERMIT_PACKAGE =     Yes
>  
>  WANTLIB += c curses
>  
> -MASTER_SITES =       http://www.wagemakers.be/downloads/lookat/
> +MASTER_SITES =       ${MASTER_SITE_SAVANNAH:=lookat/}
>  
>  CONFIGURE_STYLE =    gnu
>  
> -do-install:
> -     ${INSTALL_PROGRAM} ${WRKSRC}/lookat ${PREFIX}/bin
> -     ${INSTALL_MAN} ${WRKSRC}/lookat.1 ${PREFIX}/man/man1
> -     ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lookat
> -     ${INSTALL_DATA} ${WRKSRC}/lookat.conf.default \
> -             ${PREFIX}/share/examples/lookat
> -     ${INSTALL_DATA} ${WRKSRC}/examples/blue_config.cfg \
> -             ${PREFIX}/share/examples/lookat
> -     ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lookat
> -     ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/lookat
> +FAKE_FLAGS = sysconfdir="${PREFIX}/share/examples/lookat"
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/lookat/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  30 Dec 2015 10:46:47 -0000      1.2
> +++ distinfo  2 Mar 2020 22:32:39 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (lookat_bekijk-1.4.4.tar.gz) = 
> hlE+yQrRPEvEoVEPueF3/Vz1gbPUFBWWTLBzZXHK2cI=
> -SIZE (lookat_bekijk-1.4.4.tar.gz) = 279634
> +SHA256 (lookat_bekijk-2.0.0.tar.gz) = 
> yVFaS6GnjatdTQKOBhzaOVpbRMLRBAWjPkyAOMRScmk=
> +SIZE (lookat_bekijk-2.0.0.tar.gz) = 300881
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile_in 2 Mar 2020 22:32:39 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Put example configs in examples rather than doc.
> +
> +Index: Makefile.in
> +--- Makefile.in.orig
> ++++ Makefile.in
> +@@ -970,9 +970,8 @@ bekijk.o: bekijk.c
> +     $(COMPILE) -D_NED -DCONFIGFILE=\"$(CONFIGFILE)\" 
> -DDOCFILE=\"$(NED_DOCFILE)\" -o bekijk.o -c bekijk.c
> + 
> + install-data-local:
> +-    $(mkinstalldirs) $(DESTDIR)$(docdir)examples
> +-    $(INSTALL_DATA) $(srcdir)/examples/blue_and_black.cfg 
> $(DESTDIR)$(docdir)examples/blue_and_black.cfg
> +-    $(INSTALL_DATA) $(srcdir)/examples/cyan_and_blue.cfg 
> $(DESTDIR)$(docdir)examples/cyan_and_blue.cfg
> ++    $(INSTALL_DATA) $(srcdir)/examples/blue_and_black.cfg 
> $(DESTDIR)$(datadir)/examples/lookat/blue_and_black.cfg
> ++    $(INSTALL_DATA) $(srcdir)/examples/cyan_and_blue.cfg 
> $(DESTDIR)$(datadir)/examples/lookat/cyan_and_blue.cfg
> + 
> +     @if test -f $(DESTDIR)$(CONFIGFILE); then \
> +             echo ;\
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/lookat/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 20 Oct 2014 02:41:04 -0000      1.1.1.1
> +++ pkg/PLIST 2 Mar 2020 22:32:39 -0000
> @@ -1,9 +1,14 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2014/10/20 02:41:04 bcallah Exp $
> +@bin bin/bekijk
>  @bin bin/lookat
> +@man man/man1/bekijk.1
>  @man man/man1/lookat.1
>  share/doc/lookat/
> +share/doc/lookat/LEESMIJ
>  share/doc/lookat/README
>  share/examples/lookat/
> -share/examples/lookat/blue_config.cfg
> +share/examples/lookat/blue_and_black.cfg
> +share/examples/lookat/cyan_and_blue.cfg
> +share/examples/lookat/lookat.conf
>  share/examples/lookat/lookat.conf.default
>  @sample ${SYSCONFDIR}/lookat.conf

Reply via email to