multilib is correct now

diff --git a/bashs/shell scrips/keyboardlayoutswitcher.sh b/bashs/shell scrips/keyboardlayoutswitcher.sh
index ff3101c52ed391ccec438142442dca5a669b3b1b..838b0130e263777707e8e3683dad3bf6df6677d8 100755 (executable)
--- a/bashs/shell scrips/keyboardlayoutswitcher.sh
+++ b/bashs/shell scrips/keyboardlayoutswitcher.sh
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+#!/bin/bash
 
 numberofparameter=$#                                                # Gets the number of parameter passed
 currentlayout=$(setxkbmap -query | grep layout | awk '{print $2}')  # Gets the current layout

diff --git a/bashs/shell scrips/keyboardlayoutswitcher.sh~ b/bashs/shell scrips/keyboardlayoutswitcher.sh~
index d3a5df4f12d8c7c0a7d06962549855f2c6e455ca..ff3101c52ed391ccec438142442dca5a669b3b1b 100755 (executable)
--- a/bashs/shell scrips/keyboardlayoutswitcher.sh~
+++ b/bashs/shell scrips/keyboardlayoutswitcher.sh~
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/local/bin/bash
 
 numberofparameter=$#                                                # Gets the number of parameter passed
 currentlayout=$(setxkbmap -query | grep layout | awk '{print $2}')  # Gets the current layout

diff --git a/bashs/shell scrips/multilib-install-current b/bashs/shell scrips/multilib-install-current
index 9ef28b915edf58d0c1bed06eb53339873717f10c..d7d6bce9ea4654f26e38a2503d1db168df97570c 100755 (executable)
--- a/bashs/shell scrips/multilib-install-current
+++ b/bashs/shell scrips/multilib-install-current
@@ -3,6 +3,6 @@ cd /tmp
 mkdir multilib
 cd multilib
 wget -r -np -nd -l1 --accept=*.t?z http://www.slackware.com/~alien/multilib/current/
-lftp -c 'open http://slackware.com/~alien/multilib/ ; mirror -c -e 15.0'
+lftp -c 'open http://slackware.com/~alien/multilib/ ; mirror -c -e current'
 upgradepkg --reinstall --install-new *.t?z
 upgradepkg --reinstall --install-new slackware64-compat32/*-compat32/*.t?z

diff --git a/bashs/shell scrips/multilib-install-current~ b/bashs/shell scrips/multilib-install-current~
new file mode 100755 (executable)
index 0000000..9ef28b9
--- /dev/null
+++ b/bashs/shell scrips/multilib-install-current~
@@ -0,0 +1,8 @@
+#!/bin/bash
+cd /tmp
+mkdir multilib
+cd multilib
+wget -r -np -nd -l1 --accept=*.t?z http://www.slackware.com/~alien/multilib/current/
+lftp -c 'open http://slackware.com/~alien/multilib/ ; mirror -c -e 15.0'
+upgradepkg --reinstall --install-new *.t?z
+upgradepkg --reinstall --install-new slackware64-compat32/*-compat32/*.t?z

diff --git a/bdmenu-based/.config.mk.un~ b/bdmenu-based/.config.mk.un~
new file mode 100755 (executable)
index 0000000..04ba808
Binary files /dev/null and b/bdmenu-based/.config.mk.un~ differ

diff --git a/bdmenu-based/config.mk b/bdmenu-based/config.mk
index 57afe4d72071da9cda2a69a733a60016e786a3c5..ebd8e9678daac527291227e9f9248a20d3510007 100755 (executable)
--- a/bdmenu-based/config.mk
+++ b/bdmenu-based/config.mk
@@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
-FREETYPEINC = $(X11INC)/freetype2
+#FREETYPEINC = $(X11INC)/freetype2
 
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)

diff --git a/bdmenu-based/config.mk~ b/bdmenu-based/config.mk~
new file mode 100755 (executable)
index 0000000..57afe4d
--- /dev/null
+++ b/bdmenu-based/config.mk~
@@ -0,0 +1,31 @@
+# dmenu version
+VERSION = 5.1
+
+# paths
+PREFIX = /usr/local
+MANPREFIX = $(PREFIX)/share/man
+
+X11INC = /usr/X11R6/include
+X11LIB = /usr/X11R6/lib
+
+# Xinerama, comment if you don't want it
+XINERAMALIBS  = -lXinerama  -lXrender
+XINERAMAFLAGS = -DXINERAMA
+
+# freetype
+FREETYPELIBS = -lfontconfig -lXft
+FREETYPEINC = /usr/include/freetype2
+# OpenBSD (uncomment)
+FREETYPEINC = $(X11INC)/freetype2
+
+# includes and libs
+INCS = -I$(X11INC) -I$(FREETYPEINC)
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+
+# flags
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+LDFLAGS  = $(LIBS)
+
+# compiler and linker
+CC = cc

diff --git a/bdmenu-based/dmenu b/bdmenu-based/dmenu
index 86a0d6b2da400d81f3e3c92c2951ea3e56601dd0..c7912f22cf8a69e01c5f73d22437a6b8b4b776d0 100755 (executable)
Binary files a/bdmenu-based/dmenu and b/bdmenu-based/dmenu differ

diff --git a/bdmenu-based/dmenu.o b/bdmenu-based/dmenu.o
index 8e83e6c7fddb253303f13411455482c07b4978ec..665f1b23588b5fad3760767a5ee27395effcdbbe 100644 (file)
Binary files a/bdmenu-based/dmenu.o and b/bdmenu-based/dmenu.o differ

diff --git a/bdmenu-based/drw.o b/bdmenu-based/drw.o
index 0619a4b1980f548c7e69d12ed0ee3d56e9416b68..8c38889eb00d4843bb5246c561963f0af919804a 100644 (file)
Binary files a/bdmenu-based/drw.o and b/bdmenu-based/drw.o differ

diff --git a/bdmenu-based/stest b/bdmenu-based/stest
index 43bca648b12f10bff24d813d1d7d4f6bff779f2e..b9ec0e93ee28edb3d3bc61f2e291489daeb998e7 100755 (executable)
Binary files a/bdmenu-based/stest and b/bdmenu-based/stest differ

diff --git a/bdmenu-based/stest.o b/bdmenu-based/stest.o
index 77ae22abb14aaa5b86f2d1f2d374ce193402cb85..52846641bccd089c24170f5b5106a6481c3dea7f 100644 (file)
Binary files a/bdmenu-based/stest.o and b/bdmenu-based/stest.o differ

diff --git a/bdmenu-based/util.o b/bdmenu-based/util.o
index 1189f7059fc4ca9a8cc0ccacd2697e2443349947..91daf385835d8a0e7bd38572c61dbe3644cf5e7e 100644 (file)
Binary files a/bdmenu-based/util.o and b/bdmenu-based/util.o differ

diff --git a/bdwm/.config.mk.un~ b/bdwm/.config.mk.un~
new file mode 100755 (executable)
index 0000000..c1cf073
Binary files /dev/null and b/bdwm/.config.mk.un~ differ

diff --git a/bdwm/config.mk b/bdwm/config.mk
index 287ee86ad4ef217e6461f5ee126695f14c876395..81c493ef4aff77ba6f00f7a94ae496b904da7ee0 100755 (executable)
--- a/bdwm/config.mk
+++ b/bdwm/config.mk
@@ -18,8 +18,8 @@ XINERAMAFLAGS = -DXINERAMA
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
-FREETYPEINC = ${X11INC}/freetype2
-MANPREFIX = ${PREFIX}/man
+#FREETYPEINC = ${X11INC}/freetype2
+#MANPREFIX = ${PREFIX}/man
 
 # includes and libs
 INCS = -I${X11INC} -I${FREETYPEINC}

diff --git a/bdwm/config.mk~ b/bdwm/config.mk~
new file mode 100755 (executable)
index 0000000..287ee86
--- /dev/null
+++ b/bdwm/config.mk~
@@ -0,0 +1,39 @@
+# dwm version
+VERSION = 6.3
+
+# Customize below to fit your system
+
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/share/man
+
+X11INC = /usr/X11R6/include
+X11LIB = /usr/X11R6/lib
+
+# Xinerama, comment if you don't want it
+XINERAMALIBS  = -lXinerama
+XINERAMAFLAGS = -DXINERAMA
+
+# freetype
+FREETYPELIBS = -lfontconfig -lXft
+FREETYPEINC = /usr/include/freetype2
+# OpenBSD (uncomment)
+FREETYPEINC = ${X11INC}/freetype2
+MANPREFIX = ${PREFIX}/man
+
+# includes and libs
+INCS = -I${X11INC} -I${FREETYPEINC}
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+
+# flags
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+#CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
+LDFLAGS  = ${LIBS}
+
+# Solaris
+#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}
+
+# compiler and linker
+CC = cc

diff --git a/bdwm/drw.o b/bdwm/drw.o
index d5e47079d8611b1f9059403cc774d6ee111c813c..fab4ab2b752c705807e010451edf1d5667c7f328 100644 (file)
Binary files a/bdwm/drw.o and b/bdwm/drw.o differ

diff --git a/bdwm/dwm b/bdwm/dwm
index c5ed19bc0deed6cfd771bec8c7f512794afb9732..6cb1be04e26d5df546dd87e25ebe7c77ff2e8097 100755 (executable)
Binary files a/bdwm/dwm and b/bdwm/dwm differ

diff --git a/bdwm/dwm.o b/bdwm/dwm.o
index 581c099dcd5a52fa6cbbf99b0741b92d9672d77b..c42f83c987d4596c645631ebc390ab69e909287f 100644 (file)
Binary files a/bdwm/dwm.o and b/bdwm/dwm.o differ

diff --git a/bdwm/util.o b/bdwm/util.o
index 6cc164b3947cf20c860b69f4c622d0f9f287ffb3..91daf385835d8a0e7bd38572c61dbe3644cf5e7e 100644 (file)
Binary files a/bdwm/util.o and b/bdwm/util.o differ