On 2009/10/13 11:24, Federico G. Schwindt wrote:
> On Tue, Oct 13, 2009 at 11:01:57AM +0100, Stuart Henderson wrote:
> > On 2009/10/12 22:35, Marco Peereboom wrote:
> > > Ok this port works well for me. 0.9.14 contains important bug fixes so
> > > it needs to get in quickish.
> > >
> > > ok?
> >
> > not really, the @sample line from PLIST should stay there.
> > this is better, but someone who uses it regularly should test.
>
> i thought the man pages for other languages should be moved too?!
i was going to wait for that to be fixed in the scrotwm release, but
it's no problem to do that here.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/scrotwm/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 30 Sep 2009 00:54:06 -0000 1.10
+++ Makefile 13 Oct 2009 10:46:49 -0000
@@ -4,7 +4,7 @@ COMMENT= small tiling window manager
SHARED_LIBS= swmhack 0.0
-DISTNAME= scrotwm-0.9.8
+DISTNAME= scrotwm-0.9.14
EXTRACT_SUFX= .tgz
CATEGORIES= x11
@@ -33,10 +33,14 @@ pre-configure:
@${SUBST_CMD} ${WRKSRC}/scrotwm.conf ${WRKSRC}/scrotwm.c
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/scrotwm
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scrotwm
- ${INSTALL_SCRIPT} ${WRKSRC}/baraction.sh ${PREFIX}/share/scrotwm
- ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${PREFIX}/share/scrotwm
+ ${INSTALL_SCRIPT} ${WRKSRC}/baraction.sh
${PREFIX}/share/examples/scrotwm
+ ${INSTALL_SCRIPT} ${WRKSRC}/initscreen.sh
${PREFIX}/share/examples/scrotwm
+ ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh
${PREFIX}/share/examples/scrotwm
${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/share/examples/scrotwm
+.for i in es it
+ ${INSTALL_DATA_DIR} ${PREFIX}/man/$i/cat1
+ mv ${PREFIX}/man/cat1/scrotwm_$i.0 ${PREFIX}/man/$i/cat1/scrotwm.0
+.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/scrotwm/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 30 Sep 2009 00:54:06 -0000 1.8
+++ distinfo 13 Oct 2009 10:46:49 -0000
@@ -1,5 +1,5 @@
-MD5 (scrotwm-0.9.8.tgz) = YGhKg1vwJRZLFyeg2QXdpg==
-RMD160 (scrotwm-0.9.8.tgz) = N/de4GcK6TUb+JlIsyW8j1L9QP8=
-SHA1 (scrotwm-0.9.8.tgz) = dVH++mSLCHXnY128QwNvJYnttTg=
-SHA256 (scrotwm-0.9.8.tgz) = uLI4CktyhZMvKdsdQ+VZ/bpwS+6Eb4bgri+y2od5IEw=
-SIZE (scrotwm-0.9.8.tgz) = 38863
+MD5 (scrotwm-0.9.14.tgz) = MK8dmLLK3G0O8nnfE6b66g==
+RMD160 (scrotwm-0.9.14.tgz) = 1VOaqcCxoYAhIqQHNU/qd82DbZo=
+SHA1 (scrotwm-0.9.14.tgz) = 5dO92AfnCIrb+4j+kXpKiNhHlTQ=
+SHA256 (scrotwm-0.9.14.tgz) = Iw4Pjvg+iaX7/lTTyMHFIrFg1tExVyN/iVvXKJEkIlw=
+SIZE (scrotwm-0.9.14.tgz) = 47942
Index: patches/patch-scrotwm_c
===================================================================
RCS file: /cvs/ports/x11/scrotwm/patches/patch-scrotwm_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-scrotwm_c
--- patches/patch-scrotwm_c 30 Sep 2009 00:54:06 -0000 1.7
+++ patches/patch-scrotwm_c 13 Oct 2009 10:46:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-scrotwm_c,v 1.7 2009/09/30 00:54:06 sthen Exp $
--- scrotwm.c.orig Wed Sep 23 06:04:09 2009
+++ scrotwm.c Fri Sep 25 17:28:03 2009
-@@ -146,7 +146,7 @@ u_int32_t swm_debug = 0
+@@ -150,7 +150,7 @@ u_int32_t swm_debug = 0
#define SWM_MAX_FONT_STEPS (3)
#ifndef SWM_LIB
Index: patches/patch-scrotwm_conf
===================================================================
RCS file: /cvs/ports/x11/scrotwm/patches/patch-scrotwm_conf,v
retrieving revision 1.4
diff -u -p -r1.4 patch-scrotwm_conf
--- patches/patch-scrotwm_conf 25 Sep 2009 19:26:30 -0000 1.4
+++ patches/patch-scrotwm_conf 13 Oct 2009 10:46:49 -0000
@@ -1,6 +1,5 @@
-$OpenBSD: patch-scrotwm_conf,v 1.4 2009/09/25 19:26:30 sthen Exp $
---- scrotwm.conf.orig Wed Sep 23 06:04:09 2009
-+++ scrotwm.conf Fri Sep 25 17:29:15 2009
+--- scrotwm.conf.orig Wed Oct 7 10:15:33 2009
++++ scrotwm.conf Wed Oct 7 10:17:10 2009
@@ -10,7 +10,7 @@ bar_border[1] = rgb:00/80/80
bar_color[1] = black
bar_font_color[1] = rgb:a0/a0/a0
@@ -8,9 +7,9 @@ $OpenBSD: patch-scrotwm_conf,v 1.4 2009/
-#bar_action = baraction.sh
+#bar_action = ${PREFIX}/share/scrotwm/baraction.sh
#bar_delay = 1
+ stack_enabled = 1
clock_enabled = 1
- title_name_enabled = 0
-@@ -18,8 +18,8 @@ title_class_enabled = 0
+@@ -19,10 +19,10 @@ title_class_enabled = 0
# spawn app
# program[term] = xterm
@@ -19,5 +18,8 @@ $OpenBSD: patch-scrotwm_conf,v 1.4 2009/
+# program[screenshot_all] = ${PREFIX}/share/scrotwm/screenshot.sh full
+# program[screenshot_wind] = ${PREFIX}/share/scrotwm/screenshot.sh window
# program[lock] = xlock
- # program[initscr] = initscreen.sh
+-# program[initscr] = initscreen.sh
++# program[initscr] = ${PREFIX}/share/scrotwm/initscreen.sh
# program[menu] = dmenu_run -fn $bar_font -nb $bar_color -nf
$bar_font_color -sb $bar_border -sf $bar_color
+ spawn_term = xterm
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/scrotwm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 28 Jan 2009 13:20:23 -0000 1.1.1.1
+++ pkg/PLIST 13 Oct 2009 10:46:49 -0000
@@ -2,9 +2,19 @@
%%SHARED%%
@bin bin/scrotwm
@man man/cat1/scrotwm.0
+man/es/
+man/es/cat1/
+...@man man/es/cat1/scrotwm.0
+man/it/
+man/it/cat1/
+...@man man/it/cat1/scrotwm.0
share/examples/scrotwm/
+...@sample share/scrotwm/
+share/examples/scrotwm/baraction.sh
+...@sample share/scrotwm/baraction.sh
+share/examples/scrotwm/initscreen.sh
+...@sample share/scrotwm/initscreen.sh
+share/examples/scrotwm/screenshot.sh
+...@sample share/scrotwm/screenshot.sh
share/examples/scrotwm/scrotwm.conf
@sample ${SYSCONFDIR}/scrotwm.conf
-share/scrotwm/
-share/scrotwm/baraction.sh
-share/scrotwm/screenshot.sh
