8 files changed, 41 insertions, 56 deletions

diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 5d9c653902a8..32ba0d4f6033 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmmenu
-PORTVERSION=	0.9
+PORTVERSION=	1.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
 
@@ -23,18 +23,17 @@ USE_GMAKE=	yes
 MAN1=		wmmenu.1
 
 post-patch:
-	@ ${MV} ${WRKSRC}/example/defaults ${WRKSRC}/example/defaults.presed
-	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults.presed \
+	@${MV} ${WRKSRC}/example/defaults ${WRKSRC}/example/defaults.presed
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults.presed \
 	> ${WRKSRC}/example/defaults
 
 post-install:
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/wmmenu
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmmenu
-	${MKDIR} ${PREFIX}/share/doc/wmmenu/example
-	${INSTALL_DATA} ${WRKSRC}/example/apps ${PREFIX}/share/doc/wmmenu/example
-	${INSTALL_DATA} ${WRKSRC}/example/defaults ${PREFIX}/share/doc/wmmenu/example
+	${INSTALL_DATA} ${WRKSRC}/example/apps ${PREFIX}/share/doc/wmmenu/apps.sample
+	${INSTALL_DATA} ${WRKSRC}/example/defaults ${PREFIX}/share/doc/wmmenu/defaults.sample
 .endif
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE}
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE} | ${SED} -e 's#%%PORTNAME%%#${PORTNAME}#g'
 
 .include <bsd.port.mk>
diff --git a/x11/wmmenu/distinfo b/x11/wmmenu/distinfo
index 3461391f719e..48a0bb41bac6 100644
--- a/x11/wmmenu/distinfo
+++ b/x11/wmmenu/distinfo
@@ -1 +1 @@
-MD5 (wmmenu-0.9.tar.gz) = cc1314f6a33547aee4dad832bbdf5cd8
+MD5 (wmmenu-1.2.tar.gz) = 0cc8970ff54182a08fe848d65546f70f
diff --git a/x11/wmmenu/files/patch-aa b/x11/wmmenu/files/patch-aa
index 7b0743152c6f..a13d5a43a897 100644
--- a/x11/wmmenu/files/patch-aa
+++ b/x11/wmmenu/files/patch-aa
@@ -1,11 +1,11 @@
---- options.c.BACKUP	Thu Nov 16 21:11:16 2000
-+++ options.c	Thu Nov 16 21:11:25 2000
-@@ -4,7 +4,7 @@
- #include <string.h>
- #include <assert.h>
- /* POSIX */
--#include <getopt.h>
-+#include <unistd.h>
+--- example/apps.Dist	Sat Aug  5 00:40:31 2000
++++ example/apps	Sun Nov 19 18:32:02 2000
+@@ -4,8 +4,6 @@
+ 
+ "GNUstep.xpm"		Menu title
+ "linuxterm.xpm"		xterm -T Terminal -name terminal -geometry 80x50 &
+-"HomeNeighborOpen.xpm"	xterm -T "Login terminal" -name loginxterm -e bin/rloginsession &
+-"FileManager.xpm"	xterm -T "Midnight Commander" -name mc -geometry 100x50 -sl 1000 -e mc -c &
+ "mixer.xpm"		gaumix &
+ "HP-16C-48.xpm"		kcalc &
  
- #include "options.h"
- #include "version.h"
diff --git a/x11/wmmenu/files/patch-ab b/x11/wmmenu/files/patch-ab
index a13d5a43a897..0c675beff9cc 100644
--- a/x11/wmmenu/files/patch-ab
+++ b/x11/wmmenu/files/patch-ab
@@ -1,11 +1,13 @@
---- example/apps.Dist	Sat Aug  5 00:40:31 2000
-+++ example/apps	Sun Nov 19 18:32:02 2000
-@@ -4,8 +4,6 @@
- 
- "GNUstep.xpm"		Menu title
- "linuxterm.xpm"		xterm -T Terminal -name terminal -geometry 80x50 &
--"HomeNeighborOpen.xpm"	xterm -T "Login terminal" -name loginxterm -e bin/rloginsession &
--"FileManager.xpm"	xterm -T "Midnight Commander" -name mc -geometry 100x50 -sl 1000 -e mc -c &
- "mixer.xpm"		gaumix &
- "HP-16C-48.xpm"		kcalc &
+--- example/defaults.Dist	Sat Aug  5 00:40:06 2000
++++ example/defaults	Sun Nov 19 18:28:53 2000
+@@ -12,4 +12,10 @@
  
+ xpmpath	/usr/local/share/WindowMaker/Icons
+ xpmpath /usr/local/share/pixmaps
++
++xpmpath %%PREFIX%%/share/WindowMaker/Backgrounds
++xpmpath %%PREFIX%%/share/WindowMaker/Icons
++xpmpath %%PREFIX%%/share/WindowMaker/Pixmaps
++xpmpath %%PREFIX%%/include/X11/pixmaps
++
+ tile	tile2.xpm
diff --git a/x11/wmmenu/files/patch-ac b/x11/wmmenu/files/patch-ac
index 0c675beff9cc..9dcbd06f4d5d 100644
--- a/x11/wmmenu/files/patch-ac
+++ b/x11/wmmenu/files/patch-ac
@@ -1,13 +1,9 @@
---- example/defaults.Dist	Sat Aug  5 00:40:06 2000
-+++ example/defaults	Sun Nov 19 18:28:53 2000
-@@ -12,4 +12,10 @@
- 
- xpmpath	/usr/local/share/WindowMaker/Icons
- xpmpath /usr/local/share/pixmaps
-+
-+xpmpath %%PREFIX%%/share/WindowMaker/Backgrounds
-+xpmpath %%PREFIX%%/share/WindowMaker/Icons
-+xpmpath %%PREFIX%%/share/WindowMaker/Pixmaps
-+xpmpath %%PREFIX%%/include/X11/pixmaps
-+
- tile	tile2.xpm
+--- Makefile.orig	Sun Dec  2 21:01:18 2001
++++ Makefile	Sun Dec  2 21:01:49 2001
+@@ -1,4 +1,5 @@
+-prefix = /usr/local
++PREFIX ?= /usr/local
++prefix = $(PREFIX)
+ BINDIR = $(prefix)/bin
+ MANDIR = $(prefix)/man
+ ETCDIR = $(prefix)/etc
diff --git a/x11/wmmenu/files/patch-ad b/x11/wmmenu/files/patch-ad
index 9dcbd06f4d5d..e69de29bb2d1 100644
--- a/x11/wmmenu/files/patch-ad
+++ b/x11/wmmenu/files/patch-ad
@@ -1,9 +0,0 @@
---- Makefile.orig	Sun Dec  2 21:01:18 2001
-+++ Makefile	Sun Dec  2 21:01:49 2001
-@@ -1,4 +1,5 @@
--prefix = /usr/local
-+PREFIX ?= /usr/local
-+prefix = $(PREFIX)
- BINDIR = $(prefix)/bin
- MANDIR = $(prefix)/man
- ETCDIR = $(prefix)/etc
diff --git a/x11/wmmenu/pkg-message b/x11/wmmenu/pkg-message
index f81f08d0e691..84fbe4fef4df 100644
--- a/x11/wmmenu/pkg-message
+++ b/x11/wmmenu/pkg-message
@@ -1,3 +1 @@
-Read man page on "wmmenu" and see examples in
-%%PREFIX%%/share/doc/wmmenu
-for info on configuring this dockapp.
+Read man page on "%%PORTNAME%%" and see samples in %%PREFIX%%/share/doc/wmmenu for info on configuring this dockapp.
diff --git a/x11/wmmenu/pkg-plist b/x11/wmmenu/pkg-plist
index 80944b8330c7..82cc55867e39 100644
--- a/x11/wmmenu/pkg-plist
+++ b/x11/wmmenu/pkg-plist
@@ -1,6 +1,5 @@
 bin/wmmenu
-%%PORTDOCS%%share/doc/wmmenu/example/apps
-%%PORTDOCS%%share/doc/wmmenu/example/defaults
+%%PORTDOCS%%share/doc/wmmenu/apps.sample
+%%PORTDOCS%%share/doc/wmmenu/defaults.sample
 %%PORTDOCS%%share/doc/wmmenu/README
-%%PORTDOCS%%@dirrm share/doc/wmmenu/example
 %%PORTDOCS%%@dirrm share/doc/wmmenu