summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2003-05-16 08:21:50 +0000
committersalo <salo@pkgsrc.org>2003-05-16 08:21:50 +0000
commitd40b5ed2fcbee34c747935fe3f265c1ce0d2e8b7 (patch)
tree566d6ab840cd00a99f279afc0d90355f8a36d8b9
parentd5400e442714e8cb9e2035e5ff31b8bf7460cd4b (diff)
downloadpkgsrc-d40b5ed2fcbee34c747935fe3f265c1ce0d2e8b7.tar.gz
Updated to version 7.2.10.
Changes: - honour PKG_SYSCONFDIR, fix manpage accordingly - install sample configuration files 7.2.10: ======= - Applied patch from debian bug database that adds a -format option to larsclock. Changed the default format to be 12 hour clock. - Applied patch from Edelhard Becker to fix focus problem with GTK2 applications. 7.2.9: ====== - Changes to default config files to update them for RedHat 9. (Using Mozilla instead of Galeon etc) - Removed some unused code. - When specifying Class~Instance, if you do not include both (using the tilde), your string is compared both to class and instance of the client.
-rw-r--r--wm/larswm/Makefile24
-rw-r--r--wm/larswm/PLIST7
-rw-r--r--wm/larswm/distinfo8
-rw-r--r--wm/larswm/patches/patch-aa13
-rw-r--r--wm/larswm/patches/patch-ab13
5 files changed, 55 insertions, 10 deletions
diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile
index 4c9b5201223..c130c502b13 100644
--- a/wm/larswm/Makefile
+++ b/wm/larswm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/03 03:32:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/16 08:21:50 salo Exp $
#
-DISTNAME= larswm-7.2.8
-PKGREVISION= 1
-CATEGORIES= x11 wm
+DISTNAME= larswm-7.2.10
+CATEGORIES= wm x11
MASTER_SITES= http://www-personal.umich.edu/~larsb/larswm/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
@@ -15,15 +14,28 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
DOCFILES= keyboard_refcard.pdf mouse_refcard.pdf
+USE_PKGINSTALL= YES
USE_IMAKE= YES
-post-build:
- @${RM} -f ${WRKSRC}/*.html
+EGDIR= ${PREFIX}/share/examples/larswm
+CONF_FILES= ${EGDIR}/sample.larswmrc ${PKG_SYSCONFDIR}/larswmrc
+
+CPPFLAGS= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+
+post-patch:
+ @cd ${WRKSRC} && \
+ ( \
+ ${MV} larswm.man larswm.man.orig; \
+ ${SED} ${FILES_SUBST_SED} larswm.man.orig > \
+ larswm.man; \
+ )
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/larswm
.for pdf in ${DOCFILES}
${INSTALL_DATA} ${DISTDIR}/${pdf} ${PREFIX}/share/doc/larswm
.endfor
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sample.* ${EGDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/larswm/PLIST b/wm/larswm/PLIST
index 55d853eadc3..d4f086dcfae 100644
--- a/wm/larswm/PLIST
+++ b/wm/larswm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2003/03/03 03:32:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/16 08:21:50 salo Exp $
bin/larsclock
bin/larsremote
bin/larswm
@@ -7,4 +7,9 @@ ${IMAKE_MAN_DIR}/larswm.${IMAKE_MANNEWSUFFIX}
${IMAKE_MAN_DIR}/larsremote.${IMAKE_MANNEWSUFFIX}
share/doc/larswm/keyboard_refcard.pdf
share/doc/larswm/mouse_refcard.pdf
+share/examples/larswm/sample.barclock
+share/examples/larswm/sample.larswmrc
+share/examples/larswm/sample.xmodmaprc
+share/examples/larswm/sample.xsession
+@dirrm share/examples/larswm
@dirrm share/doc/larswm
diff --git a/wm/larswm/distinfo b/wm/larswm/distinfo
index 11428ce2c32..78e4a4f55c8 100644
--- a/wm/larswm/distinfo
+++ b/wm/larswm/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/15 19:14:09 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/05/16 08:21:50 salo Exp $
-SHA1 (larswm-7.2.8.tar.gz) = da84e020d579caafc83288edf45286add320b894
-Size (larswm-7.2.8.tar.gz) = 73710 bytes
+SHA1 (larswm-7.2.10.tar.gz) = fdeffcc29dafbf8927553922b854bb136bf8e549
+Size (larswm-7.2.10.tar.gz) = 74000 bytes
SHA1 (keyboard_refcard.pdf) = 855f0509cd3ce047c89b88a272fcfebec76bed92
Size (keyboard_refcard.pdf) = 3861 bytes
SHA1 (mouse_refcard.pdf) = df0e4cdad3d320f7395755e23d379cc047075372
Size (mouse_refcard.pdf) = 3332 bytes
+SHA1 (patch-aa) = 8ab134d48754c071688bce9120248214cb3bf989
+SHA1 (patch-ab) = 0f68c460a32b3e015a36663fc5b004909eba2d00
diff --git a/wm/larswm/patches/patch-aa b/wm/larswm/patches/patch-aa
new file mode 100644
index 00000000000..8d89bf76d93
--- /dev/null
+++ b/wm/larswm/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/05/16 08:21:50 salo Exp $
+
+--- dat.h.orig 2003-04-28 15:01:17.000000000 +0200
++++ dat.h 2003-05-16 09:31:47.000000000 +0200
+@@ -21,7 +21,7 @@
+
+ #define DEFSHELL "/bin/sh"
+
+-#define DEFRC "/etc/X11/larswmrc"
++#define DEFRC PKG_SYSCONFDIR"/larswmrc"
+
+ #define MAXSCREENS 4
+ #define MAXDESKTOPS 16
diff --git a/wm/larswm/patches/patch-ab b/wm/larswm/patches/patch-ab
new file mode 100644
index 00000000000..6a7bb5cb66a
--- /dev/null
+++ b/wm/larswm/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/05/16 08:21:50 salo Exp $
+
+--- larswm.man.orig 2003-04-28 15:01:38.000000000 +0200
++++ larswm.man 2003-05-16 10:14:08.000000000 +0200
+@@ -37,7 +37,7 @@
+ prints the current version on standard error, then exits.
+ .SH FILES
+ .TP 18
+-.B $HOME/.larswmrc /etc/X11/larswmrc
++.B $HOME/.larswmrc @PKG_SYSCONFDIR@/larswmrc
+ these two files are looked for in the above order when
+ .I larswm
+ starts up.