5 files changed, 339 insertions, 39 deletions

diff --git a/x11-wm/wmconfig/Makefile b/x11-wm/wmconfig/Makefile
index 34dcf11b5450..2e57331feee9 100644
--- a/x11-wm/wmconfig/Makefile
+++ b/x11-wm/wmconfig/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	wmconfig
-PORTVERSION=	1.0
+PORTVERSION=	1.1.8
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pav
+MASTER_SITES=	http://www.arrishq.net/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Menu generation tool for X window managers
@@ -20,21 +19,23 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc --mandir=${LOCALBASE}/man
 
+PORTDOCS=	AUTHORS COPYING NEWS README README.de TODO
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/wmconfig.1x ${PREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/xterm ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/xmms ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/xearth ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/vim ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/sylpheed ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/rxvt ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/pine ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/mozilla ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/lynx ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/gv ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/gimp ${PREFIX}/etc/wmconfig
-	@${INSTALL_DATA} ${WRKSRC}/samples/eterm ${PREFIX}/etc/wmconfig
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wmconfig.1x ${PREFIX}/man/man1
+	${MKDIR} ${PREFIX}/etc/wmconfig
+	${RM} -r ${WRKSRC}/samples/wmconfig/CVS
+	for i in `cd ${WRKSRC}/samples/wmconfig; ${ECHO_CMD} *`; do \
+		${INSTALL_DATA} ${WRKSRC}/samples/wmconfig/$$i ${PREFIX}/etc/wmconfig; \
+	done
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmconfig/distinfo b/x11-wm/wmconfig/distinfo
index a166cc58a57c..2a338b05be0a 100644
--- a/x11-wm/wmconfig/distinfo
+++ b/x11-wm/wmconfig/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmconfig-1.0.tar.gz) = 1b9848578c92bc1451d95f0d663aa8f0
-SIZE (wmconfig-1.0.tar.gz) = 102108
+MD5 (wmconfig-1.1.8.tar.gz) = 9cf887f0b66718696d823a2c85048b20
+SIZE (wmconfig-1.1.8.tar.gz) = 146991
diff --git a/x11-wm/wmconfig/files/patch-wmconfig.h b/x11-wm/wmconfig/files/patch-wmconfig.h
deleted file mode 100644
index 59da4f93fd51..000000000000
--- a/x11-wm/wmconfig/files/patch-wmconfig.h
+++ /dev/null
@@ -1,5 +0,0 @@
---- wmconfig.h.orig	Sat Aug 17 16:42:47 2003
-+++ wmconfig.h		Sun Aug 18 16:59:38 2003
-@@ -30 +30 @@
--#define DEFAULT_SYS_CONFDIR	"/etc/X11/wmconfig"
-+#define DEFAULT_SYS_CONFDIR	"/usr/local/etc/wmconfig"
diff --git a/x11-wm/wmconfig/pkg-descr b/x11-wm/wmconfig/pkg-descr
index e0a91a81eaf8..1b090b4102d7 100644
--- a/x11-wm/wmconfig/pkg-descr
+++ b/x11-wm/wmconfig/pkg-descr
@@ -1,7 +1,7 @@
 Wmconfig is a free menu generation tool for various X window managers.
 It is easy-to-use and uses a simple configuration file layout.
 
-WWW: http://www.arrishq.org
+WWW: http://www.arrishq.net
 
 - Tommy Scheunemann
-net@arrishq.org
+net@arrishq.net
diff --git a/x11-wm/wmconfig/pkg-plist b/x11-wm/wmconfig/pkg-plist
index 423c6b8d43f9..3ae36479bcad 100644
--- a/x11-wm/wmconfig/pkg-plist
+++ b/x11-wm/wmconfig/pkg-plist
@@ -1,15 +1,319 @@
-man/man1/wmconfig.1x
 bin/wmconfig
-etc/wmconfig/xterm
-etc/wmconfig/xmms
-etc/wmconfig/xearth
-etc/wmconfig/vim
-etc/wmconfig/sylpheed
-etc/wmconfig/rxvt
-etc/wmconfig/pine
-etc/wmconfig/mozilla
-etc/wmconfig/lynx
-etc/wmconfig/gv
-etc/wmconfig/gimp
+etc/wmconfig/9term
+etc/wmconfig/AbiWord
+etc/wmconfig/Mosaic
+etc/wmconfig/abclock
+etc/wmconfig/abuse
+etc/wmconfig/althea
+etc/wmconfig/amaya
+etc/wmconfig/arena
+etc/wmconfig/asclock
+etc/wmconfig/asedit
+etc/wmconfig/asfiles
+etc/wmconfig/astime
+etc/wmconfig/aswedit
+etc/wmconfig/aterm
+etc/wmconfig/audacity
+etc/wmconfig/august
+etc/wmconfig/aviplay
+etc/wmconfig/axe
+etc/wmconfig/balsa
+etc/wmconfig/bclock
+etc/wmconfig/beonex
+etc/wmconfig/binder
+etc/wmconfig/blast
+etc/wmconfig/blender
+etc/wmconfig/bluefish
+etc/wmconfig/buttonbox
+etc/wmconfig/cdp
+etc/wmconfig/cfm
+etc/wmconfig/chimera
+etc/wmconfig/d4x
+etc/wmconfig/dclock
+etc/wmconfig/decurs
+etc/wmconfig/dedit
+etc/wmconfig/deskmenu
+etc/wmconfig/dfm
+etc/wmconfig/dgs
+etc/wmconfig/display
+etc/wmconfig/dte
+etc/wmconfig/dynamag
+etc/wmconfig/emacs
+etc/wmconfig/emiclock
+etc/wmconfig/emu
+etc/wmconfig/endeavour
+etc/wmconfig/eog
 etc/wmconfig/eterm
+etc/wmconfig/evolution
+etc/wmconfig/extace
+etc/wmconfig/eyeclock
+etc/wmconfig/file-roller
+etc/wmconfig/filerunner
+etc/wmconfig/fsv
+etc/wmconfig/funktrackergold
+etc/wmconfig/galeon
+etc/wmconfig/gconf-editor
+etc/wmconfig/gedit
+etc/wmconfig/gentoo
+etc/wmconfig/gftp
+etc/wmconfig/ggv
+etc/wmconfig/ghex
+etc/wmconfig/gimp
+etc/wmconfig/gkrellm
+etc/wmconfig/glclock
+etc/wmconfig/gmanedit
+etc/wmconfig/gnome-commander
+etc/wmconfig/gnome-terminal
+etc/wmconfig/gnotepad
+etc/wmconfig/gnucash
+etc/wmconfig/gnumeric
+etc/wmconfig/gpaint
+etc/wmconfig/gpdf
+etc/wmconfig/gphoto
+etc/wmconfig/gplot
+etc/wmconfig/gqmpeg
+etc/wmconfig/gqview
+etc/wmconfig/grip
+etc/wmconfig/gthumb
+etc/wmconfig/gtkfig
+etc/wmconfig/gtksee
+etc/wmconfig/gv
+etc/wmconfig/gview
+etc/wmconfig/gxanim
+etc/wmconfig/gxedit
+etc/wmconfig/gxset
+etc/wmconfig/heretic
+etc/wmconfig/hexedit
+etc/wmconfig/hotjava
+etc/wmconfig/jafm
+etc/wmconfig/jed
+etc/wmconfig/joe
+etc/wmconfig/kaddressbook
+etc/wmconfig/karbon
+etc/wmconfig/kate
+etc/wmconfig/kaudiocreator
+etc/wmconfig/kchart
+etc/wmconfig/kfind
+etc/wmconfig/khelpcenter
+etc/wmconfig/kivio
+etc/wmconfig/kmid
+etc/wmconfig/knotes
+etc/wmconfig/konqueror
+etc/wmconfig/konsole
+etc/wmconfig/kontact
+etc/wmconfig/korganizer
+etc/wmconfig/koshell
+etc/wmconfig/kpresenter
+etc/wmconfig/ksirc
+etc/wmconfig/kspread
+etc/wmconfig/kugar
+etc/wmconfig/kword
+etc/wmconfig/kwrite
+etc/wmconfig/licq
+etc/wmconfig/links
+etc/wmconfig/lynx
+etc/wmconfig/mc
+etc/wmconfig/mlterm
+etc/wmconfig/mouseclock
+etc/wmconfig/mozilla
+etc/wmconfig/mtoolsfm
+etc/wmconfig/multi-gnome-terminal
+etc/wmconfig/mutt
+etc/wmconfig/nano
+etc/wmconfig/nautilus
+etc/wmconfig/nedit
+etc/wmconfig/netscape
+etc/wmconfig/oclock
+etc/wmconfig/oneko
+etc/wmconfig/openoffice
+etc/wmconfig/openuniverse
+etc/wmconfig/opera
+etc/wmconfig/pclock
+etc/wmconfig/peeper
+etc/wmconfig/penguin-command
+etc/wmconfig/phoenix
+etc/wmconfig/pico
+etc/wmconfig/pine
+etc/wmconfig/pingus
+etc/wmconfig/portoseguro
+etc/wmconfig/powershell
+etc/wmconfig/props
+etc/wmconfig/quanta
+etc/wmconfig/rclock
+etc/wmconfig/rocksndiamonds
+etc/wmconfig/rox-filer
+etc/wmconfig/rxvt
+etc/wmconfig/sanduhr
+etc/wmconfig/scite
+etc/wmconfig/sound-recorder
+etc/wmconfig/spruce
+etc/wmconfig/staroffice60
+etc/wmconfig/streamtuner
+etc/wmconfig/sweep
+etc/wmconfig/swisswatch
+etc/wmconfig/sylpheed
+etc/wmconfig/systemg
+etc/wmconfig/ted
+etc/wmconfig/textedit
+etc/wmconfig/thoteditor
+etc/wmconfig/tkdesk
+etc/wmconfig/tkseti
+etc/wmconfig/tuxeyes
+etc/wmconfig/tuxkart
+etc/wmconfig/tuxracer
+etc/wmconfig/vide
+etc/wmconfig/vim
+etc/wmconfig/vmware
+etc/wmconfig/w3m
+etc/wmconfig/worker
+etc/wmconfig/workman
+etc/wmconfig/workplace
+etc/wmconfig/wterm
+etc/wmconfig/x-files
+etc/wmconfig/x11amp
+etc/wmconfig/x3arth
+etc/wmconfig/xalarm
+etc/wmconfig/xaniroc
+etc/wmconfig/xantfarm
+etc/wmconfig/xarchie
+etc/wmconfig/xaric
+etc/wmconfig/xawtv
+etc/wmconfig/xballoon
+etc/wmconfig/xcalc
+etc/wmconfig/xcd
+etc/wmconfig/xcdplayer
+etc/wmconfig/xcdroast
+etc/wmconfig/xchat
+etc/wmconfig/xclock
+etc/wmconfig/xcmd
+etc/wmconfig/xcoloredit
+etc/wmconfig/xcolors
+etc/wmconfig/xcolorsel
+etc/wmconfig/xcoral
+etc/wmconfig/xcruise
+etc/wmconfig/xdaliclock
+etc/wmconfig/xdiskusage
+etc/wmconfig/xdvi
+etc/wmconfig/xearth
+etc/wmconfig/xed
+etc/wmconfig/xemacs
+etc/wmconfig/xenon
+etc/wmconfig/xephem
+etc/wmconfig/xeyes
+etc/wmconfig/xfe
+etc/wmconfig/xfed
+etc/wmconfig/xfig
+etc/wmconfig/xfishtank
+etc/wmconfig/xfm
+etc/wmconfig/xfontsel
+etc/wmconfig/xfractint
+etc/wmconfig/xgalaga
+etc/wmconfig/xgammon
+etc/wmconfig/xgfe
+etc/wmconfig/xglobe
+etc/wmconfig/xgobi
+etc/wmconfig/xgrab
+etc/wmconfig/xgraph
+etc/wmconfig/xhippo
+etc/wmconfig/xicq
+etc/wmconfig/xine
+etc/wmconfig/xkeycaps
+etc/wmconfig/xldlas
+etc/wmconfig/xlogo
+etc/wmconfig/xlupe
+etc/wmconfig/xmag
+etc/wmconfig/xmahjongg
+etc/wmconfig/xmail
+etc/wmconfig/xmandel
+etc/wmconfig/xmbase-grok
+etc/wmconfig/xmbdfed
+etc/wmconfig/xmcd
+etc/wmconfig/xmines
+etc/wmconfig/xmix
+etc/wmconfig/xmixer
+etc/wmconfig/xmmix
+etc/wmconfig/xmms
+etc/wmconfig/xmorph
+etc/wmconfig/xmountains
+etc/wmconfig/xmps
+etc/wmconfig/xmrm
+etc/wmconfig/xmysql
+etc/wmconfig/xmysqladmin
+etc/wmconfig/xnc
+etc/wmconfig/xnibbles
+etc/wmconfig/xnview
+etc/wmconfig/xothello
+etc/wmconfig/xpacman
+etc/wmconfig/xpaint
+etc/wmconfig/xpanex
+etc/wmconfig/xpat2
+etc/wmconfig/xpcd
+etc/wmconfig/xpdf
+etc/wmconfig/xpenguins
+etc/wmconfig/xphoon
+etc/wmconfig/xphotohunter
+etc/wmconfig/xpipeman
+etc/wmconfig/xpired
+etc/wmconfig/xplanet
+etc/wmconfig/xpuyo
+etc/wmconfig/xpuzzletama
+etc/wmconfig/xpyraminx
+etc/wmconfig/xquarto
+etc/wmconfig/xracer
+etc/wmconfig/xrick
+etc/wmconfig/xripple
+etc/wmconfig/xrisk
+etc/wmconfig/xroach
+etc/wmconfig/xroads
+etc/wmconfig/xrobots
+etc/wmconfig/xrot
+etc/wmconfig/xrubik
+etc/wmconfig/xsane
+etc/wmconfig/xsc
+etc/wmconfig/xscavenger
+etc/wmconfig/xscorch
+etc/wmconfig/xscrabble
+etc/wmconfig/xshisen
+etc/wmconfig/xshogi
+etc/wmconfig/xskat
+etc/wmconfig/xskewb
+etc/wmconfig/xskyroot
+etc/wmconfig/xsnow
+etc/wmconfig/xsok
+etc/wmconfig/xsokoban
+etc/wmconfig/xsol
+etc/wmconfig/xsoldier
+etc/wmconfig/xspacewarp
+etc/wmconfig/xspread
+etc/wmconfig/xspringies
+etc/wmconfig/xtar
+etc/wmconfig/xteddy
+etc/wmconfig/xterm
+etc/wmconfig/xtet42
+etc/wmconfig/xtic
+etc/wmconfig/xtide
+etc/wmconfig/xtimer
+etc/wmconfig/xtraceroute
+etc/wmconfig/xtriangles
+etc/wmconfig/xtris
+etc/wmconfig/xtrojka
+etc/wmconfig/xtron
+etc/wmconfig/xtruco
+etc/wmconfig/xtu
+etc/wmconfig/xtux
+etc/wmconfig/xtypo
+etc/wmconfig/xv
+etc/wmconfig/xvier
+etc/wmconfig/xvmahjongg
+etc/wmconfig/xvmines
+etc/wmconfig/xwave
+etc/wmconfig/xword
+etc/wmconfig/xworld
+etc/wmconfig/xworm
+etc/wmconfig/xzgv
+etc/wmconfig/xzoom
+etc/wmconfig/xzx
+etc/wmconfig/yelp
+etc/wmconfig/zclock
+man/man1/wmconfig.1x
 @dirrm etc/wmconfig