CVS commit: src/external/mit/ctwm/libexec

2021-03-01 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Mon Mar  1 15:40:40 UTC 2021

Modified Files:
src/external/mit/ctwm/libexec: ctwm_app_menu

Log Message:
Make this work with a non-standard LOCALBASE.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/ctwm/libexec/ctwm_app_menu

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/ctwm/libexec/ctwm_app_menu
diff -u src/external/mit/ctwm/libexec/ctwm_app_menu:1.2 src/external/mit/ctwm/libexec/ctwm_app_menu:1.3
--- src/external/mit/ctwm/libexec/ctwm_app_menu:1.2	Mon Oct 12 11:07:24 2020
+++ src/external/mit/ctwm/libexec/ctwm_app_menu	Mon Mar  1 15:40:40 2021
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: ctwm_app_menu,v 1.2 2020/10/12 11:07:24 nia Exp $
+#	$NetBSD: ctwm_app_menu,v 1.3 2021/03/01 15:40:40 nia Exp $
 #
 # Copyright (c) 2020 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -28,13 +28,14 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
+LOCALBASE=$(pkg_info -Q LOCALBASE pkg_install 2>/dev/null || echo /usr/pkg)
 OFS=$IFS
 IFS='
 '
 printf 'menu "appmenu"\n'
 printf '{\n'
 printf '\t"Applications"\tf.title\n'
-for app in $(find /usr/pkg/share/applications -name '*.desktop');
+for app in $(find $LOCALBASE/share/applications -name '*.desktop');
 do
 	name=""
 	exec=""



CVS commit: src/external/mit/ctwm/libexec

2020-10-13 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Tue Oct 13 09:10:38 UTC 2020

Modified Files:
src/external/mit/ctwm/libexec: Makefile

Log Message:
Fix previous; do not override SCRIPTS so that ctwm_app_menu gets installed.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/ctwm/libexec/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/ctwm/libexec/Makefile
diff -u src/external/mit/ctwm/libexec/Makefile:1.2 src/external/mit/ctwm/libexec/Makefile:1.3
--- src/external/mit/ctwm/libexec/Makefile:1.2	Mon Oct 12 11:07:24 2020
+++ src/external/mit/ctwm/libexec/Makefile	Tue Oct 13 09:10:38 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2020/10/12 11:07:24 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/10/13 09:10:38 rin Exp $
 
 .include 
 
 SCRIPTS=	ctwm_app_menu
-SCRIPTS=	ctwm_font_size
+SCRIPTS+=	ctwm_font_size
 
 SCRIPTSDIR=	${X11ROOTDIR}/libexec