5 files changed, 43 insertions, 122 deletions
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index c266d03a71e..a00ce3ab79f 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/12 13:16:02 obache Exp $
 #
 
-DISTNAME=	wmii-20051114
-PKGREVISION=	1
+DISTNAME=	wmii-2.5.2
 CATEGORIES=	wm x11
-MASTER_SITES=	http://wmii.de/snaps/
+MASTER_SITES=	http://wmii.de/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wmii.de/
@@ -16,12 +15,22 @@ NO_CONFIGURE=		yes
 
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
-SUBST_CLASSES+=		vars
+SUBST_CLASSES+=		vars pfx
 SUBST_STAGE.vars=	post-patch
 SUBST_FILES.vars=	cmd/wm/wmii rc/* cmd/wm/wmii.1
 SUBST_SED.vars=		-e 's|CONFPREFIX|${PREFIX}/share/examples|g'
 SUBST_SED.vars+=	-e 's|9PREFIX|${PREFIX}|g'
 
+SUBST_STAGE.pfx = post-patch
+SUBST_FILES.pfx = config.mk
+SUBST_SED.pfx = -e s,/usr/local,${PREFIX},g
+SUBST_SED.pfx+= -e 's|/usr/X11R6|${X11BASE}|g'
+SUBST_SED.pfx+= -e 's|/usr/X11R6|${X11BASE}|g'
+SUBST_SED.pfx+= -e 's|CFLAGS = -O0 -g -Wall|CFLAGS+=|g'
+SUBST_SED.pfx+= -e 's|-g||g'
+SUBST_SED.pfx+= -e 's|/9||g'
+SUBST_SED.pfx+= -e 's|cc|${CC}|g'
+
 PKG_SYSCONFSUBDIR=	wmii-3
 EGDIR=			${PREFIX}/share/examples/wmii-3
 EGFILES=		extern kmode quit status welcome wmirc
diff --git a/wm/wmii/PLIST b/wm/wmii/PLIST
index 47476bda636..9c641fc2c5d 100644
--- a/wm/wmii/PLIST
+++ b/wm/wmii/PLIST
@@ -1,24 +1,27 @@
-@comment $NetBSD: PLIST,v 1.3 2005/12/06 18:55:32 rillig Exp $
-bin/wmibar
-bin/wmifs
+@comment $NetBSD: PLIST,v 1.4 2006/10/12 13:16:02 obache Exp $
 bin/wmii
+bin/wmiibar
+bin/wmiifs
+bin/wmiikeys
+bin/wmiimenu
+bin/wmiiplumb
+bin/wmiir
+bin/wmiiwarp
 bin/wmiiwm
-bin/wmikeys
-bin/wmimenu
-bin/wmiplumb
-bin/wmir
-bin/wmiwarp
-man/man1/wmibar.1
-man/man1/wmifs.1
-man/man1/wmii.1
-man/man1/wmiiwm.1
-man/man1/wmikeys.1
-man/man1/wmimenu.1
-man/man1/wmir.1
-share/examples/wmii-3/extern
-share/examples/wmii-3/kmode
-share/examples/wmii-3/quit
-share/examples/wmii-3/status
-share/examples/wmii-3/welcome
-share/examples/wmii-3/wmirc
-@dirrm share/examples/wmii-3
+etc/wmii-2.5/extern
+etc/wmii-2.5/kmode
+etc/wmii-2.5/quit
+etc/wmii-2.5/status
+etc/wmii-2.5/welcome
+etc/wmii-2.5/wmiirc
+share/man/man1/wmii.1
+share/man/man1/wmiibar.1
+share/man/man1/wmiifs.1
+share/man/man1/wmiikeys.1
+share/man/man1/wmiimenu.1
+share/man/man1/wmiir.1
+share/man/man1/wmiiwm.1
+@dirrm share/man/man1
+@exec ${MKDIR} %D/etc/wmii-3
+@dirrm etc/wmii-3
+@dirrm etc/wmii-2.5
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index 62de90ffa03..832892d3d4a 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/12/06 18:55:32 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/10/12 13:16:02 obache Exp $
 
-SHA1 (wmii-20051114.tar.gz) = 15c3020f900726f5017b364d277ade399e096faa
-RMD160 (wmii-20051114.tar.gz) = caf1e5f52e51e1381911c993b8b14b9ede02cfb1
-Size (wmii-20051114.tar.gz) = 84336 bytes
-SHA1 (patch-aa) = 18f4d4cb3cbfdf7ab4811478337bc32b0296d1db
-SHA1 (patch-ab) = af9761bf50e07c9c3c95eac8bee06b43b56372d3
+SHA1 (wmii-2.5.2.tar.gz) = 39cc2fb372fbf2e4a9f95dd948a4cd0190c7c2e6
+RMD160 (wmii-2.5.2.tar.gz) = c9c80e69b03f6c1b15de09ef57db7b85ca821698
+Size (wmii-2.5.2.tar.gz) = 71101 bytes
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: