Re: New: xkbset-0.3

["J.A. Neitzel" <jneitzel_(_at_)_sdf_(_dot_)_lonestar_(_dot_)_org>]

On Tue, Oct 22, 2002 at 12:34:20PM +0200, Sebastian Stark wrote:
> 
> Here is a new port, xkbset-0.3
> 
> It makes use of XKB to set some keyboard and mouse settings that are
> useful for handicapped people and those who care about their health.

> Please test & comment or commit.

I can certainly see how this will be a useful utility once I figure
out how to make best use of it.

Tested on:
OpenBSD.i386
OpenBSD 3.2-current (GENERIC) #0: Tue Oct 22 15:01:27 EST 2002

Report:
The install target makes assumptions.  I do most everything with
a umask of 077.  Granted, during 'make (fake|install)' my umask is
022...

The man page is left as 0600 upon install.
Well, I guess that is not a good thing... ;)

So, here is the diff I made.  I don't know if this is the best way
to do it, but it works.  Perhaps using a 'do-install:' is the better
way..?  Also, I would recommend using NO_REGRESS=Yes .

Jeff
===================================================================
diff -uNr xkbset.orig/Makefile xkbset/Makefile
--- xkbset.orig/Makefile	Wed Oct 23 12:50:27 2002
+++ xkbset/Makefile	Wed Oct 23 10:44:22 2002
@@ -16,4 +16,6 @@
 
 USE_X11=	Yes
 
+NO_REGRESS=	Yes
+
 .include <bsd.port.mk>
diff -uNr xkbset.orig/patches/patch-Makefile xkbset/patches/patch-Makefile
--- xkbset.orig/patches/patch-Makefile	Wed Oct 23 12:50:27 2002
+++ xkbset/patches/patch-Makefile	Wed Oct 23 14:09:15 2002
@@ -1,7 +1,7 @@
 $OpenBSD$
---- Makefile.orig	Tue Oct 22 12:19:48 2002
-+++ Makefile	Tue Oct 22 12:21:03 2002
-@@ -2,29 +2,29 @@
+--- Makefile.orig	Sat May 12 23:09:39 2001
++++ Makefile	Wed Oct 23 14:08:01 2002
+@@ -2,29 +2,31 @@
  INC_PATH=-I/usr/X11R6/include
  LIB_PATH=-L/usr/X11R6/lib
  LIBS=-lX11
@@ -9,8 +9,10 @@
 -INSTALL_BIN=/usr/X11R6/bin
 -INSTALL_MAN1=/usr/X11R6/man/man1
 +CCC=${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -Wall
-+INSTALL_BIN=${PREFIX}/bin
-+INSTALL_MAN1=${PREFIX}/man/man1
++INSTALL_BIN=	${BSD_INSTALL_PROGRAM}
++INSTALL_MAN=	${BSD_INSTALL_MAN}
++BIN_DIR=	${PREFIX}/bin
++MAN1_DIR=	${PREFIX}/man/man1
  
  all: xkbset xkbset.1
  
@@ -40,3 +42,15 @@
  
  getargs.c: create_getargs config_getargs
  	perl create_getargs
+@@ -43,9 +45,8 @@ xkbset.1: xkbset.man
+ 	cp xkbset.man xkbset.1
+ 
+ install: all
+-	install -c -s xkbset ${INSTALL_BIN}
+-	install -c mskacc-gui ${INSTALL_BIN}
+-	cp xkbset.1 ${INSTALL_MAN1}/.
++	${INSTALL_BIN} xkbset ${BIN_DIR}
++	${INSTALL_MAN} xkbset.1 ${MAN1_DIR}
+ 
+ clean:
+ 	rm -f *.o getargs.c print.c usage.c *.core xkbset config_usage xkbset.1