summaryrefslogtreecommitdiff
path: root/wm/wmii/patches
diff options
context:
space:
mode:
authorobache <obache>2006-10-12 13:16:02 +0000
committerobache <obache>2006-10-12 13:16:02 +0000
commit43c7128f5ae46af8952450fc0e57b6c10c348af1 (patch)
tree1bf2c28b779bc991886315bde5a6703e237cc687 /wm/wmii/patches
parent7b9a49f1dceec868e14203d2470f843503080ed6 (diff)
downloadpkgsrc-43c7128f5ae46af8952450fc0e57b6c10c348af1.tar.gz
Update wmii to 2.5.2. Patch provided by PR 33285.
This is release version, previous was snapshot version.
Diffstat (limited to 'wm/wmii/patches')
-rw-r--r--wm/wmii/patches/patch-aa43
-rw-r--r--wm/wmii/patches/patch-ab46
2 files changed, 0 insertions, 89 deletions
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa
deleted file mode 100644
index cc3bea02937..00000000000
--- a/wm/wmii/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/06 18:55:32 rillig Exp $
-
---- config.mk.orig 2005-11-14 10:28:57.000000000 +0000
-+++ config.mk
-@@ -1,15 +1,15 @@
- # Customize to fit your system
-
- # paths
--PREFIX = /usr/local
--CONFPREFIX = ${PREFIX}/etc
--MANPREFIX = ${PREFIX}/share/man
--9PREFIX = ${PREFIX}/9
-+#PREFIX = /usr/local
-+CONFPREFIX = ${PREFIX}/share/examples
-+MANPREFIX = ${PREFIX}/${PKGMANDIR}
-+9PREFIX = ${PREFIX}
-
- INCDIR = ${PREFIX}/include
- LIBDIR = ${PREFIX}/lib
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = ${X11BASE}/include
-+X11LIB = ${X11BASE}/lib
-
- # includes and libs
- INCLUDES = -I. -I${INCDIR} -I/usr/include -I${X11INC}
-@@ -17,12 +17,12 @@ LIBS = -L${LIBDIR} -L/usr/lib -lc -lm -L
- VERSION = 20051114
-
- # flags
--CFLAGS = -O0 -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
--LDFLAGS = -g ${LIBS}
-+CFLAGS += ${INCLUDES} -DVERSION=\"${VERSION}\"
-+LDFLAGS += ${LIBS}
-
- # compiler
- # Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
--MAKE = make
-+#MAKE = make
- AR = ar cr
--CC = cc
-+#CC = cc
- RANLIB = ranlib
diff --git a/wm/wmii/patches/patch-ab b/wm/wmii/patches/patch-ab
deleted file mode 100644
index b36eaea7218..00000000000
--- a/wm/wmii/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/06 18:55:32 rillig Exp $
-
---- Makefile.orig 2005-11-14 10:28:57.000000000 +0000
-+++ Makefile
-@@ -5,7 +5,7 @@ include config.mk
-
- SUBDIRS = libcext liblitz libixp libixp2 libwmii cmd
-
--BIN = cmd/wm/wmii cmd/wm/wmiiwm cmd/wmibar cmd/wmifs \
-+BIN = cmd/wm/wmiiwm cmd/wmibar cmd/wmifs \
- cmd/wmikeys cmd/wmimenu cmd/wmiplumb cmd/wmir cmd/wmiwarp
-
- MAN1 = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmibar.1 cmd/wmifs.1 \
-@@ -38,25 +38,15 @@ clean:
- rm -rf wmii-${VERSION}*
-
- install: all
-- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
-- @sed 's|CONFPREFIX|${CONFPREFIX}|; s|9PREFIX|${9PREFIX}|' <cmd/wm/wmii >${DESTDIR}${PREFIX}/bin/wmii
-- @for i in ${BIN}; do \
-- chmod 755 ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
-- done
-+ @${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+ @${BSD_INSTALL_PROGRAM} ${BIN} ${DESTDIR}${PREFIX}/bin
-+ @${BSD_INSTALL_SCRIPT} cmd/wm/wmii ${DESTDIR}${PREFIX}/bin
- @echo installed executable files to ${DESTDIR}${PREFIX}/bin
-- @mkdir -p ${DESTDIR}${CONFPREFIX}/wmii-3
-- @cd rc; for i in *; do \
-- sed 's|9PREFIX|${9PREFIX}|' <$$i >${DESTDIR}${CONFPREFIX}/wmii-3/$$i; \
-- chmod 755 ${DESTDIR}${CONFPREFIX}/wmii-3/$$i; \
-- done
-+ @${BSD_INSTALL_SCRIPT_DIR} ${DESTDIR}${CONFPREFIX}/wmii-3
-+ @${BSD_INSTALL_SCRIPT} rc/* ${DESTDIR}${CONFPREFIX}/wmii-3
- @echo installed rc scripts to ${DESTDIR}${CONFPREFIX}/wmii-3
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-- @cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
-- @sed 's|CONFPREFIX|${CONFPREFIX}|' <cmd/wm/wmii.1 >${DESTDIR}${MANPREFIX}/man1/wmii.1
-- @for i in ${MAN1}; do \
-- chmod 444 ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
-- done
-+ @${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+ @${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${MANPREFIX}/man1
- @echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
-
- uninstall: