Re: [UPDATE] ctwm-4.0.1
On Sun, 25 Feb 2018, Stuart Henderson wrote: > On 2018/02/25 22:31, Klemens Nanni wrote: > > On Fri, Oct 27, 2017 at 11:01:57PM +0200, Markus Hennecke wrote: > > > I got some input from Matthew Fuller regarding the dependencies and it > > > looks like we could get rid of all build depends by setting > > > -DFORCE_PREGEN_FILE=TRUE in CONFIGURE_ARGS (see attached diff) disabling > > > the man page build altogether and using the pre generated files. > > > The post-install target from the last diff can be left out as well. > > > Comments? > > I do not use ctwm but this update looks good to me portwise, OK kn. > > > > > --- pkg/PLIST 11 Oct 2013 20:39:49 - 1.5 > > > +++ pkg/PLIST 27 Oct 2017 20:43:31 - > > > @@ -1,5 +1,91 @@ > > > -@comment $OpenBSD: PLIST,v 1.5 2013/10/11 20:39:49 naddy Exp $ > > > +@comment $OpenBSD$ > > That one probably snuck in while recreating the file or so, watch out :) > > > > That is ok, cvs will regenerate it anyway. So any chance getting this commited? Kind regards Markus
Re: [UPDATE] ctwm-4.0.1
On 2018/02/25 22:31, Klemens Nanni wrote: > On Fri, Oct 27, 2017 at 11:01:57PM +0200, Markus Hennecke wrote: > > I got some input from Matthew Fuller regarding the dependencies and it > > looks like we could get rid of all build depends by setting > > -DFORCE_PREGEN_FILE=TRUE in CONFIGURE_ARGS (see attached diff) disabling > > the man page build altogether and using the pre generated files. > > The post-install target from the last diff can be left out as well. > > Comments? > I do not use ctwm but this update looks good to me portwise, OK kn. > > > --- pkg/PLIST 11 Oct 2013 20:39:49 - 1.5 > > +++ pkg/PLIST 27 Oct 2017 20:43:31 - > > @@ -1,5 +1,91 @@ > > -@comment $OpenBSD: PLIST,v 1.5 2013/10/11 20:39:49 naddy Exp $ > > +@comment $OpenBSD$ > That one probably snuck in while recreating the file or so, watch out :) > That is ok, cvs will regenerate it anyway.
Re: [UPDATE] ctwm-4.0.1
On Fri, Oct 27, 2017 at 11:01:57PM +0200, Markus Hennecke wrote: > I got some input from Matthew Fuller regarding the dependencies and it > looks like we could get rid of all build depends by setting > -DFORCE_PREGEN_FILE=TRUE in CONFIGURE_ARGS (see attached diff) disabling > the man page build altogether and using the pre generated files. > The post-install target from the last diff can be left out as well. > Comments? I do not use ctwm but this update looks good to me portwise, OK kn. > --- pkg/PLIST 11 Oct 2013 20:39:49 - 1.5 > +++ pkg/PLIST 27 Oct 2017 20:43:31 - > @@ -1,5 +1,91 @@ > -@comment $OpenBSD: PLIST,v 1.5 2013/10/11 20:39:49 naddy Exp $ > +@comment $OpenBSD$ That one probably snuck in while recreating the file or so, watch out :)
Re: [UPDATE] ctwm-4.0.1
On Fri, 27 Oct 2017, Markus Hennecke wrote: > I got some input from Matthew Fuller regarding the dependencies and it > looks like we could get rid of all build depends by setting > -DFORCE_PREGEN_FILE=TRUE in CONFIGURE_ARGS (see attached diff) disabling > the man page build altogether and using the pre generated files. > The post-install target from the last diff can be left out as well. > Comments? Ping.
Re: [UPDATE] ctwm-4.0.1
I got some input from Matthew Fuller regarding the dependencies and it
looks like we could get rid of all build depends by setting
-DFORCE_PREGEN_FILE=TRUE in CONFIGURE_ARGS (see attached diff) disabling
the man page build altogether and using the pre generated files.
The post-install target from the last diff can be left out as well.
Comments?
Index: Makefile
===
RCS file: /cvs/ports/x11/ctwm/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile17 Aug 2017 17:05:03 - 1.25
+++ Makefile27 Oct 2017 20:43:31 -
@@ -2,8 +2,7 @@
COMMENT= twm, plus support for multiple virtual screens, etc
-DISTNAME= ctwm-3.6
-REVISION= 2
+DISTNAME= ctwm-4.0.1
CATEGORIES=x11
@@ -12,11 +11,17 @@ HOMEPAGE= https://www.ctwm.org/
# BSD-like/badly worded
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= https://www.ctwm.org/dist/
-CONFIGURE_STYLE= imake
+MODULES= devel/cmake
+
+LIB_DEPENDS= graphics/jpeg
+
+CONFIGURE_ARGS+= -DETCDIR=${SYSCONFDIR} \
+ -DNOMANCOMPRESS=TRUE \
+ -DFORCE_PREGEN_FILES=TRUE
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/ctwm/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo18 Jan 2015 03:15:52 - 1.5
+++ distinfo27 Oct 2017 20:43:31 -
@@ -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 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
--#endif
-
- gram.h gram.c: gram.y
- $(YACC) $(YFLAGS) gram.y
Index: patches/patch-gram.y
===
RCS file: patches/patch-gram.y
diff -N patches/patch-gram.y
--- patches/patch-gram.y17 Sep 2012 10:25:49 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,56 +0,0 @@
gram.y.origTue Dec 11 16:38:52 2001
-+++ gram.y Sun Sep 2 18:59:56 2012
-@@ -419,7 +419,6 @@ stmt : error
- | WINDOW_RING { list = >WindowRingL; }
- win_list
- | WINDOW_RING { Scr->WindowRingAll = TRUE; }
-- ;
- | WINDOW_RING_EXCLUDE{ if (!Scr->WindowRingL)
- Scr->WindowRingAll = TRUE;
- list = >WindowRingExcludeL; }
-@@ -427,6 +426,7 @@ stmt : error
-
- | WINDOW_GEOMETRIES { }
- wingeom_list
-+ ;
-
- noarg : KEYWORD { if (!do_single_keyword ($1)) {
- twmrc_error_prefix();
-@@ -683,10 +683,10 @@ wingeom_entries : /* Empty */
- | wingeom_entries wingeom_entry
- ;
-
--wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2) }
-+wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2); }
-+ ;
-
-
--
- squeeze : SQUEEZE_TITLE {
- if (HasShape) Scr->SqueezeTitle = TRUE;
- }
-@@ -834,6 +834,7 @@ occupy_workspc_entries : /* Empty */
- occupy_workspc_entry : string {
- AddToClientsList ($1, client);
- }
-+ ;
-
- occupy_window_list: LB occupy_window_entries RB {}
- ;
-@@ -845,6 +846,7 @@ occupy_window_entries : /* Empty */
- occupy_window_entry : string {
- AddToClientsList (workspace, $1);
- }
-+ ;
-
- icon_list : LB
Re: [UPDATE] ctwm-4.0.1
Revised diff fixing the issues quoted below attached...
On Thu, 26 Oct 2017, Rafael Sadowski wrote:
> Thanks for the diff, Comments below.
>
> On Thu Oct 26, 2017 at 09:04:34PM +0200, Markus Hennecke wrote:
> > Update ctwm to latest release.
> > The build is switched to cmake and I think we can get rid of all the
> > patches. This is a huge improvement compared to the ancient version
> > currently in ports.
> >
> > Regards
> > Markus
>
> > MASTER_SITES= ${HOMEPAGE}dist/
>
> Please use https://www.ctwm.org/ instead of HOMEPAGE.
> [...]
> > -lib/X11/twm/system.ctwmrc
> > -@man man/man1/ctwm.1
> > +@man man/man1/ctwm.1.gz
>
> Extracts the manpage.
>
Index: Makefile
===
RCS file: /cvs/ports/x11/ctwm/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile17 Aug 2017 17:05:03 - 1.25
+++ Makefile26 Oct 2017 19:28:16 -
@@ -2,8 +2,7 @@
COMMENT= twm, plus support for multiple virtual screens, etc
-DISTNAME= ctwm-3.6
-REVISION= 2
+DISTNAME= ctwm-4.0.1
CATEGORIES=x11
@@ -12,12 +11,24 @@ HOMEPAGE= https://www.ctwm.org/
# BSD-like/badly worded
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= https://www.ctwm.org/dist/
-CONFIGURE_STYLE= imake
+MODULES= devel/cmake
+
+BUILD_DEPENDS= devel/bison \
+ textproc/asciidoc \
+ textproc/xmlto
+
+LIB_DEPENDS= graphics/jpeg
+
+CONFIGURE_ARGS+= -DETCDIR=${SYSCONFDIR} \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE
NO_TEST= Yes
+
+post-install:
+ gunzip ${PREFIX}/man/man1/ctwm.1.gz
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/ctwm/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo18 Jan 2015 03:15:52 - 1.5
+++ distinfo26 Oct 2017 19:28:16 -
@@ -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 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
--#endif
-
- gram.h gram.c: gram.y
- $(YACC) $(YFLAGS) gram.y
Index: patches/patch-gram.y
===
RCS file: patches/patch-gram.y
diff -N patches/patch-gram.y
--- patches/patch-gram.y17 Sep 2012 10:25:49 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,56 +0,0 @@
gram.y.origTue Dec 11 16:38:52 2001
-+++ gram.y Sun Sep 2 18:59:56 2012
-@@ -419,7 +419,6 @@ stmt : error
- | WINDOW_RING { list = >WindowRingL; }
- win_list
- | WINDOW_RING { Scr->WindowRingAll = TRUE; }
-- ;
- | WINDOW_RING_EXCLUDE{ if (!Scr->WindowRingL)
- Scr->WindowRingAll = TRUE;
- list = >WindowRingExcludeL; }
-@@ -427,6 +426,7 @@ stmt : error
-
- | WINDOW_GEOMETRIES { }
- wingeom_list
-+ ;
-
- noarg : KEYWORD { if (!do_single_keyword ($1)) {
- twmrc_error_prefix();
-@@ -683,10 +683,10 @@ wingeom_entries : /* Empty */
- | wingeom_entries wingeom_entry
- ;
-
--wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2) }
-+wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2); }
-+ ;
-
-
--
- squeeze : SQUEEZE_TITLE {
- if (HasShape) Scr->SqueezeTitle = TRUE;
- }
-@@ -834,6 +834,7 @@ occupy_workspc_entries : /* Empty */
- occupy_workspc_entry :
Re: [UPDATE] ctwm-4.0.1
Thanks for the diff, Comments below.
On Thu Oct 26, 2017 at 09:04:34PM +0200, Markus Hennecke wrote:
> Update ctwm to latest release.
> The build is switched to cmake and I think we can get rid of all the
> patches. This is a huge improvement compared to the ancient version
> currently in ports.
>
> Regards
> Markus
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/ctwm/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -r1.25 Makefile
> --- Makefile 17 Aug 2017 17:05:03 - 1.25
> +++ Makefile 26 Oct 2017 18:49:24 -
> @@ -2,8 +2,7 @@
>
> COMMENT= twm, plus support for multiple virtual screens, etc
>
> -DISTNAME=ctwm-3.6
> -REVISION=2
> +DISTNAME=ctwm-4.0.1
>
> CATEGORIES= x11
>
> @@ -12,11 +11,20 @@ HOMEPAGE= https://www.ctwm.org/
> # BSD-like/badly worded
> 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/
Please use https://www.ctwm.org/ instead of HOMEPAGE.
>
> -CONFIGURE_STYLE= imake
> +MODULES= devel/cmake
> +
> +BUILD_DEPENDS= devel/bison \
> + textproc/asciidoc \
> + textproc/xmlto
> +
> +LIB_DEPENDS= graphics/jpeg
This requires a WANTLIB update. `make port-lib-depends-check`
> +
> +CONFIGURE_ARGS+= -DETCDIR=${SYSCONFDIR} \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE
>
> NO_TEST= Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/ctwm/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 distinfo
> --- distinfo 18 Jan 2015 03:15:52 - 1.5
> +++ distinfo 26 Oct 2017 18:49:24 -
> @@ -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 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,26 +0,0 @@
> Imakefile.orig Tue Dec 11 16:38:52 2001
> -+++ ImakefileSun 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
> --#endif
> -
> - gram.h gram.c: gram.y
> - $(YACC) $(YFLAGS) gram.y
> Index: patches/patch-gram.y
> ===
> RCS file: patches/patch-gram.y
> diff -N patches/patch-gram.y
> --- patches/patch-gram.y 17 Sep 2012 10:25:49 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,56 +0,0 @@
> gram.y.orig Tue Dec 11 16:38:52 2001
> -+++ gram.y Sun Sep 2 18:59:56 2012
> -@@ -419,7 +419,6 @@ stmt : error
> - | WINDOW_RING { list = >WindowRingL; }
> - win_list
> - | WINDOW_RING { Scr->WindowRingAll = TRUE; }
> --;
> - | WINDOW_RING_EXCLUDE{ if (!Scr->WindowRingL)
> - Scr->WindowRingAll = TRUE;
> - list = >WindowRingExcludeL; }
> -@@ -427,6 +426,7 @@ stmt : error
> -
> - | WINDOW_GEOMETRIES { }
> - wingeom_list
> -+;
> -
> - noarg : KEYWORD { if (!do_single_keyword ($1)) {
> - twmrc_error_prefix();
> -@@ -683,10 +683,10 @@ wingeom_entries: /* Empty */
> - | wingeom_entries wingeom_entry
> - ;
> -
> --wingeom_entry : string string { AddToList (>WindowGeometries,
> $1, $2) }
> -+wingeom_entry : string string { AddToList (>WindowGeometries,
> $1, $2); }
> -+;
> -
> -
> --
> - squeeze : SQUEEZE_TITLE {
> - if (HasShape) Scr->SqueezeTitle = TRUE;
> - }
> -@@ -834,6 +834,7 @@ occupy_workspc_entries : /* Empty */
> - occupy_workspc_entry: string {
> - AddToClientsList ($1, client);
> - }
> -+;
> -
> -
[UPDATE] ctwm-4.0.1
Update ctwm to latest release.
The build is switched to cmake and I think we can get rid of all the
patches. This is a huge improvement compared to the ancient version
currently in ports.
Regards
MarkusIndex: Makefile
===
RCS file: /cvs/ports/x11/ctwm/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile17 Aug 2017 17:05:03 - 1.25
+++ Makefile26 Oct 2017 18:49:24 -
@@ -2,8 +2,7 @@
COMMENT= twm, plus support for multiple virtual screens, etc
-DISTNAME= ctwm-3.6
-REVISION= 2
+DISTNAME= ctwm-4.0.1
CATEGORIES=x11
@@ -12,11 +11,20 @@ HOMEPAGE= https://www.ctwm.org/
# BSD-like/badly worded
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/
-CONFIGURE_STYLE= imake
+MODULES= devel/cmake
+
+BUILD_DEPENDS= devel/bison \
+ textproc/asciidoc \
+ textproc/xmlto
+
+LIB_DEPENDS= graphics/jpeg
+
+CONFIGURE_ARGS+= -DETCDIR=${SYSCONFDIR} \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/ctwm/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo18 Jan 2015 03:15:52 - 1.5
+++ distinfo26 Oct 2017 18:49:24 -
@@ -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 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
--#endif
-
- gram.h gram.c: gram.y
- $(YACC) $(YFLAGS) gram.y
Index: patches/patch-gram.y
===
RCS file: patches/patch-gram.y
diff -N patches/patch-gram.y
--- patches/patch-gram.y17 Sep 2012 10:25:49 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,56 +0,0 @@
gram.y.origTue Dec 11 16:38:52 2001
-+++ gram.y Sun Sep 2 18:59:56 2012
-@@ -419,7 +419,6 @@ stmt : error
- | WINDOW_RING { list = >WindowRingL; }
- win_list
- | WINDOW_RING { Scr->WindowRingAll = TRUE; }
-- ;
- | WINDOW_RING_EXCLUDE{ if (!Scr->WindowRingL)
- Scr->WindowRingAll = TRUE;
- list = >WindowRingExcludeL; }
-@@ -427,6 +426,7 @@ stmt : error
-
- | WINDOW_GEOMETRIES { }
- wingeom_list
-+ ;
-
- noarg : KEYWORD { if (!do_single_keyword ($1)) {
- twmrc_error_prefix();
-@@ -683,10 +683,10 @@ wingeom_entries : /* Empty */
- | wingeom_entries wingeom_entry
- ;
-
--wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2) }
-+wingeom_entry : string string { AddToList (>WindowGeometries, $1, $2); }
-+ ;
-
-
--
- squeeze : SQUEEZE_TITLE {
- if (HasShape) Scr->SqueezeTitle = TRUE;
- }
-@@ -834,6 +834,7 @@ occupy_workspc_entries : /* Empty */
- occupy_workspc_entry : string {
- AddToClientsList ($1, client);
- }
-+ ;
-
- occupy_window_list: LB occupy_window_entries RB {}
- ;
-@@ -845,6 +846,7 @@ occupy_window_entries : /* Empty */
- occupy_window_entry : string {
- AddToClientsList (workspace, $1);
- }
-+ ;
-
- icon_list : LB icon_entries RB {}
- ;
-@@ -962,6 +964,8 @@ string : STRING{ ptr = (char
