Re: [update] ctwm-4.0.2

timo.myyra@wickedbsd.net (Timo Myyrä) writes:

> Hi,
>
> I was checking old ports in portroach and noticed that ctwm port hasn't been
> updated in a while.
>
> Here's an diff to bring it up to date. I'm not ctwm user but seems to basics
> seems to work on amd64.
>
> Timo
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/ctwm/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile 17 Aug 2017 17:05:03 -0000 1.25
> +++ Makefile 6 Sep 2017 18:26:54 -0000
> @@ -1,23 +1,25 @@
> # $OpenBSD: Makefile,v 1.25 2017/08/17 17:05:03 fcambus Exp $
>
> -COMMENT= twm, plus support for multiple virtual screens, etc
> +COMMENT = twm, plus support for multiple virtual screens, etc
>
> -DISTNAME= ctwm-3.6
> -REVISION= 2
> +DISTNAME = ctwm-4.0.1
>
> -CATEGORIES= x11
> +CATEGORIES = x11
>
> -HOMEPAGE= https://www.ctwm.org/
> +HOMEPAGE = https://www.ctwm.org/
>
> # BSD-like/badly worded
> -PERMIT_PACKAGE_CDROM= Yes
> +PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB= ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c
> +WANTLIB += ICE SM X11 Xext Xmu Xpm Xt c jpeg
>
> -MASTER_SITES= ${HOMEPAGE}dist/
> +MASTER_SITES = ${HOMEPAGE}dist/
>
> -CONFIGURE_STYLE= imake
> +MODULES = devel/cmake
>
> -NO_TEST= Yes
> +LIB_DEPENDS = graphics/jpeg
> +
> +post-install:
> + gunzip ${PREFIX}/man/man1/*.1.gz
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/ctwm/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 18 Jan 2015 03:15:52 -0000 1.5
> +++ distinfo 6 Sep 2017 18:26:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ctwm-3.6.tar.gz) = 2r4rF5ZD3bEAscc68gOME+3qcCFLS4RP0Sl+8nb/uzE=
> -SIZE (ctwm-3.6.tar.gz) = 370563
> +SHA256 (ctwm-4.0.1.tar.gz) = ONLbvHc+PcnTGYP0zkzB5F5dnDWjh+F+kWRNNOKEgvw=
> +SIZE (ctwm-4.0.1.tar.gz) = 897148
> Index: patches/patch-Imakefile
> ===================================================================
> RCS file: patches/patch-Imakefile
> diff -N patches/patch-Imakefile
> --- patches/patch-Imakefile 17 Sep 2012 10:25:11 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,26 +0,0 @@
> ---- Imakefile.orig Tue Dec 11 16:38:52 2001
> -+++ Imakefile Sun Sep 2 19:01:07 2012
> -@@ -11,7 +11,7 @@ XCOMM
> - #undef USE_SOUND
> - #define XPM
> - #define USEM4
> --#undef X11R6
> -+#define X11R6
> - #undef I18N
> -
> - YFLAGS = -d
> -@@ -145,14 +145,6 @@ depend:: lex.c gram.c deftwmrc.c
> - NormalLibraryTarget(ctwm, libctwm.o)
> - ComplexProgramTarget(ctwm)
> - InstallNonExecFile(system.ctwmrc,$(TWMDIR))
> --#ifdef XPM
> --install:: xpm
> -- MakeDir($(DESTDIR)$(TWMDIR)/images)
> -- @case '${MFLAGS}' in *[i]*) set +e;; esac; \
> -- for i in xpm/?* ; do \
> -- (set -x; $(INSTALL) -c $(INSTLIBFLAGS) $$i $(DESTDIR)$(TWMDIR)/images); \
> -- done
> --