[pkgsrc/trunk]: pkgsrc Updated wm/windowlab to 1.32.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Updated wm/windowlab to 1.32.
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:14:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/eba7d715b657
branches:  trunk
changeset: 498838:eba7d715b657
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sun Sep 04 06:05:20 2005 +0000

description:
Updated wm/windowlab to 1.32.

Lots of changes and bugs were fixed, see changelog for more info.

diffstat:

 doc/CHANGES                   |   3 +-
 doc/TODO                      |   3 +-
 wm/windowlab/Makefile         |  19 +++++++++------
 wm/windowlab/PLIST            |   4 +-
 wm/windowlab/distinfo         |  11 ++++----
 wm/windowlab/patches/patch-aa |  52 ++++++++++++++++++++++--------------------
 wm/windowlab/patches/patch-ab |  20 ++++++++++++++++
 7 files changed, 69 insertions(+), 43 deletions(-)

diffs (211 lines):

diff -r fae9aa063a18 -r eba7d715b657 doc/CHANGES
--- a/doc/CHANGES       Sun Sep 04 05:20:05 2005 +0000
+++ b/doc/CHANGES       Sun Sep 04 06:05:20 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11016 2005/09/04 05:07:49 taca Exp $
+$NetBSD: CHANGES,v 1.11017 2005/09/04 06:05:20 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -3892,3 +3892,4 @@
        Updated devel/apache-ant to 1.6.5 [tonio 2005-09-03]
        Added wm/cwm version 3 [xtraeme 2005-09-04]
        Updated www/squid to 2.5.10nb2 [taca 2005-09-04]
+       Updated wm/windowlab to 1.32 [xtraeme 2005-09-04]
diff -r fae9aa063a18 -r eba7d715b657 doc/TODO
--- a/doc/TODO  Sun Sep 04 05:20:05 2005 +0000
+++ b/doc/TODO  Sun Sep 04 06:05:20 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.3840 2005/09/04 05:10:43 taca Exp $
+$NetBSD: TODO,v 1.3841 2005/09/04 06:05:20 xtraeme Exp $
 
 Suggested new packages
 ======================
@@ -1064,7 +1064,6 @@
        o weechat-0.1.1
        o weewm-0.01
        o winbind-3.0.13
-       o windowlab-1.32
        o wmbiff-0.4.26
        o wmctrl-1.07
        o wmweather-2.4.3
diff -r fae9aa063a18 -r eba7d715b657 wm/windowlab/Makefile
--- a/wm/windowlab/Makefile     Sun Sep 04 05:20:05 2005 +0000
+++ b/wm/windowlab/Makefile     Sun Sep 04 06:05:20 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/09/04 06:05:20 xtraeme Exp $
 #
 
-DISTNAME=      windowlab-1.12
-PKGREVISION=   1
+DISTNAME=      windowlab-1.32
 CATEGORIES=    wm
 MASTER_SITES=  http://www.nickgravgaard.com/windowlab/
 EXTRACT_SUFX=  .tar
@@ -11,18 +10,22 @@
 HOMEPAGE=      http://www.nickgravgaard.com/windowlab/
 COMMENT=       Small and simple window manager
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 USE_PKGINSTALL=        YES
 USE_TOOLS+=    gmake pkg-config
 
-PKG_SYSCONFSUBDIR=     windowlab
+EGDIR=         ${PREFIX}/share/examples/windowlab
+CONF_FILES=    ${EGDIR}/windowlab.menurc ${PKG_SYSCONFDIR}/windowlab.menurc
 
-EGDIR=         ${PREFIX}/share/examples/windowlab
-CONF_FILES=    ${EGDIR}/menurc.default ${PKG_SYSCONFDIR}/menurc
+INSTALLATION_DIRS=     share/examples/windowlab
+
+post-extract:
+       @${CHMOD} -R +x ${WRKSRC}
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/menurc.sample ${EGDIR}/menurc.default
+       ${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR}
 
 .include "../../fonts/Xft2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r fae9aa063a18 -r eba7d715b657 wm/windowlab/PLIST
--- a/wm/windowlab/PLIST        Sun Sep 04 05:20:05 2005 +0000
+++ b/wm/windowlab/PLIST        Sun Sep 04 06:05:20 2005 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/09/04 06:05:20 xtraeme Exp $
 bin/windowlab
 man/man1/windowlab.1
-share/examples/windowlab/menurc.default
+share/examples/windowlab/windowlab.menurc
 @dirrm share/examples/windowlab
diff -r fae9aa063a18 -r eba7d715b657 wm/windowlab/distinfo
--- a/wm/windowlab/distinfo     Sun Sep 04 05:20:05 2005 +0000
+++ b/wm/windowlab/distinfo     Sun Sep 04 06:05:20 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/09/04 06:05:20 xtraeme Exp $
 
-SHA1 (windowlab-1.12.tar) = d42a249d1d51ed316a41f6cb74bc94a279d06abb
-RMD160 (windowlab-1.12.tar) = a1e88dbbf53b722c56decff632c3ab64f248d14d
-Size (windowlab-1.12.tar) = 143360 bytes
-SHA1 (patch-aa) = 4170cdb47715139e4f84ce90ae132bcaf52c91e1
+SHA1 (windowlab-1.32.tar) = 3927f214a0411d725aa14afc4f881d9bbda9ed81
+RMD160 (windowlab-1.32.tar) = ad192bf1a7ceddaf6ac078cebfafaeb582248923
+Size (windowlab-1.32.tar) = 163840 bytes
+SHA1 (patch-aa) = 028b6297d880e293845e01a20ee58d6a4db808f1
+SHA1 (patch-ab) = 3a631fadc8a9a15a1175c41bf0d6ce394578b9fd
diff -r fae9aa063a18 -r eba7d715b657 wm/windowlab/patches/patch-aa
--- a/wm/windowlab/patches/patch-aa     Sun Sep 04 05:20:05 2005 +0000
+++ b/wm/windowlab/patches/patch-aa     Sun Sep 04 06:05:20 2005 +0000
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $
 
---- Makefile.orig      2003-04-19 14:19:28.000000000 +0200
-+++ Makefile   2003-05-16 01:55:05.000000000 +0200
+--- Makefile.orig      2005-09-04 07:44:29.000000000 +0200
++++ Makefile   2005-09-04 07:47:12.000000000 +0200
 @@ -6,7 +6,7 @@
  
  # Information about the location of the menurc file
  ifndef MENURC
--MENURC = /etc/X11/windowlab/menurc
-+MENURC = ${PKG_SYSCONFDIR}/menurc
+-MENURC = /etc/X11/windowlab/windowlab.menurc
++MENURC = ${PKG_SYSCONFDIR}/windowlab.menurc
  endif
  DEFINES += -DDEF_MENURC="\"$(MENURC)\""
  
-@@ -15,27 +15,26 @@
+@@ -15,28 +15,28 @@
  
  # Uncomment to add freetype support (requires XFree86 4.0.2 or later)
- # This needs -lXext above, even if you have disabled shape support.
+ # This needs -lXext above, even if you have disabled shape support
 -#DEFINES += -DXFT
 -#EXTRA_INC += `pkg-config --cflags xft`
 -#EXTRA_LIBS += `pkg-config --libs xft`
@@ -25,35 +25,37 @@
  # Uncomment for debugging info (abandon all hope, ye who enter here)
  #DEFINES += -DDEBUG
  
- # This should be set to the location of the X installation you want to
- # compile against.
+ # Set this to the location of the X installation you want to compile against
 -XROOT = /usr/X11R6
 +XROOT = ${PREFIX}
  
  # --------------------------------------------------------------------
  
--CC       = gcc
--CFLAGS   = -g -O2 -Wall
-+#CC       = gcc
-+CFLAGS   += -g -O2 -Wall
+-CC = gcc
++#CC = gcc
+ ifndef CFLAGS
+ CFLAGS = -g -O2 -Wall -W
+ endif
  
- BINDIR   = $(DESTDIR)$(XROOT)/bin
- MANDIR   = $(DESTDIR)$(XROOT)/man/man1
--CFGDIR   = $(DESTDIR)/etc/X11/windowlab
+ BINDIR = $(DESTDIR)$(XROOT)/bin
+ MANDIR = $(DESTDIR)$(XROOT)/man/man1
+-CFGDIR = $(DESTDIR)/etc/X11/windowlab
++#CFGDIR = $(DESTDIR)/etc/X11/windowlab
  INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
--LDPATH   = -L$(XROOT)/lib
-+LDPATH   = ${LDFLAGS}
- LIBS     = -lX11 $(EXTRA_LIBS)
+-LDPATH = -L$(XROOT)/lib
++LDPATH = ${LDFLAGS}
+ LIBS = -lX11 $(EXTRA_LIBS)
  
- PROG     = windowlab
-@@ -52,10 +51,8 @@
+ PROG = windowlab
+@@ -53,9 +53,10 @@
        $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
  
  install: all
--      install -s $(PROG) $(BINDIR)
--      install -m 644 $(MANPAGE) $(MANDIR)
--      gzip -9vf $(MANDIR)/$(MANPAGE)
--      mkdir -p $(CFGDIR) && cp menurc.sample $(CFGDIR)/menurc
+-      mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
+-      mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vf $(MANDIR)/$(MANPAGE)
+-      mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
++      ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR)
++      ${BSD_INSTALL_MAN_DIR} $(MANDIR)
 +      ${BSD_INSTALL_PROGRAM} $(PROG) $(BINDIR)
 +      ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR)/windowlab.1
  
diff -r fae9aa063a18 -r eba7d715b657 wm/windowlab/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/windowlab/patches/patch-ab     Sun Sep 04 06:05:20 2005 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2005/09/04 06:05:20 xtraeme Exp $
+
+--- menufile.c.orig    2005-09-04 07:57:21.000000000 +0200
++++ menufile.c 2005-09-04 07:57:40.000000000 +0200
+@@ -44,6 +44,7 @@
+ #endif
+       if ((menufile = fopen(menurcpath, "r")) == NULL)
+       {
++#ifdef __linux__
+               // get location of the executable
+               if (readlink("/proc/self/exe", menurcpath, PATH_MAX) == -1)
+               {
+@@ -51,6 +52,7 @@
+                       menurcpath[0] = '.';
+                       menurcpath[1] = '\0';
+               }
++#endif
+               *(strrchr(menurcpath, '/')) = '\0';
+               *(strrchr(menurcpath, '/')) = '\0';
+               strncat(menurcpath, "/etc/windowlab.menurc", PATH_MAX);
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Changed the wording of the diag...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/ruby-actionwebservice Update ruby-actionwebservice...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Changed the wording of the diag...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/ruby-actionwebservice Update ruby-actionwebservice...
Indexes:
Home | Main Index | Thread Index | Old Index