1. Backport two patches from windowmaker-i18n port;

2. add wmicons into RUN_DEPENDS and remove similar functionality from
   this port;
3. due to (1) bump PORTREVISION.

5 files changed, 160 insertions, 98 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 850d46834835..f4adae811e33 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -7,22 +7,21 @@
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.65.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	beta/srcs
 DISTNAME=	WindowMaker-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DATAFILES}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		PropList.2:${PORTSDIR}/devel/libPropList \
 		intl.1:${PORTSDIR}/devel/gettext \
 		Hermes.1:${PORTSDIR}/graphics/Hermes
+RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
@@ -32,7 +31,7 @@ WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE} \
-		LIBS=-L${LOCALBASE}/lib \
+		LIBS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LINGUAS="${LINGUAS}"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
@@ -46,8 +45,6 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
 		wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x
 
-DATAFILES=	WindowMaker-extra-0.1.tar.bz2
-
 .include <bsd.port.pre.mk>
 
 LINGUAS!=	/bin/cat ${FILESDIR}/LINGUAS
@@ -65,17 +62,11 @@ pre-extract:
 .endif
 
 post-patch:
-	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c \
-		${WRKSRC}/WindowMaker/Defaults/*
-
-post-configure:
-	@cd ${WRKDIR}/WindowMaker-extra-0.1; \
-		./configure --prefix=${PREFIX}
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
+	@${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
 
 post-install:
-	@cd ${WRKDIR}/WindowMaker-extra-0.1; \
-		${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
-	${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
+	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
 
 update-LINGUAS: extract
 	cd ${WRKSRC}/po && \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 7fef8f59f134..247107c24370 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1 @@
 MD5 (WindowMaker-0.65.0.tar.bz2) = d17f6b206db4c4157248e36422fc9cbb
-MD5 (WindowMaker-extra-0.1.tar.bz2) = e6fb381da0d207c320f58e7a1fea2a2b
diff --git a/x11-wm/windowmaker/files/patch-am b/x11-wm/windowmaker/files/patch-am
new file mode 100644
index 000000000000..47a7586b7e2f
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-am
@@ -0,0 +1,27 @@
+--- util/wm-oldmenu2new.orig	Wed Jan 20 21:39:18 1999
++++ util/wm-oldmenu2new	Wed Jan 20 21:39:29 1999
+@@ -112,7 +112,7 @@
+ # This is the interesting bit.  Edit the old style menu and
+ # convert into new style property-list menu.
+ #
+-perl - $T <<-'EOF' > $T-p
++%%PERL%% - $T <<-'EOF' > $T-p
+ 	$v=chr(22);
+ 	for (<>) {
+ 		push @foo,$_;
+@@ -127,6 +127,7 @@
+ 	for (@foo2) {
+ 		s/^(\s*)"([^"]*)"\s\s*END/\1),/;
+ 		s/^(\s*)"([^"]*)"\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/;
++		s/^(\s*)"([^"]*)"\s\s*SHEXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1SHEXEC,$v\n\1"\3"$v\n\1),/;
+ 		push @foo,split "\n";
+ 	}
+ 	@foo2=();
+@@ -144,6 +145,7 @@
+ 	for (@foo) {
+ 		s/^(\s*)([^ 	]*)\s\s*END/\1),/;
+ 		s/^(\s*)([^ 	]*)\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/;
++		s/^(\s*)([^ 	]*)\s\s*SHEXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1SHEXEC,$v\n\1"\3"$v\n\1),/;
+ 		push @foo2,split "\n";
+ 	}
+ 	@foo=();
diff --git a/x11-wm/windowmaker/files/patch-wsetfont b/x11-wm/windowmaker/files/patch-wsetfont
new file mode 100644
index 000000000000..b2d89dd0deb1
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-wsetfont
@@ -0,0 +1,127 @@
+--- util/wsetfont.orig	Fri May 18 22:09:24 2001
++++ util/wsetfont	Fri May 18 22:09:40 2001
+@@ -77,7 +77,7 @@
+     "--auto")
+ 	auto="YES";;
+     *)
+-	if echo $i |grep "^--locale=" &>/dev/null; then
++	if echo $i |grep "^--locale=" >/dev/null 2>&1; then
+ 	    new_locale=$(echo $i |sed -e "s|--locale=||" -)
+ 	elif [ -z $family ]; then
+ 	    family=$i
+@@ -115,7 +115,7 @@
+ 
+ for i in $DomainNames; do
+     tmp="Domain$i"
+-    AllKeys="$AllKeys ${!tmp}"
++    AllKeys="$AllKeys `eval echo '${'$tmp'}'`"
+ done
+ 
+ #
+@@ -212,8 +212,8 @@
+ 	family="default"
+     else
+ 	for i in $all_codings; do
+-	    for j in ${!i}; do
+-		if [ "$j" == "${locale%_*}" ]; then
++	    for j in `eval echo '${'$i'}'`; do
++		if [ "$j" = "${locale%_*}" ]; then
+ 		    family="$i"
+ 		    break 2
+ 		fi
+@@ -227,7 +227,7 @@
+ #
+ is_supported=""
+ for i in $Supported; do
+-    if test "$family" == "$i"; then
++    if test "$family" = "$i"; then
+ 	is_supported="YES"
+ 	break
+     fi
+@@ -245,7 +245,7 @@
+ #
+ is_nodef_unable=""
+ for i in $NodefUnable; do
+-    if test "$family" == "$i"; then
++    if test "$family" = "$i"; then
+ 	if test -n "$nodef"; then	# --nodef with one from $NodefUnable
+ 	    echo -e "\n"\
+ 		"Sorry, --nodef argument is not allowed for these font codings:\n"\
+@@ -268,22 +268,22 @@
+     for i in $AllKeys; do
+ 	if test -n "$is_nodef_unable"; then		# japanese,... defaults
+ 	    tmp="$family$i"
+-	    eval $i=${!tmp}
++	    eval $i=`eval echo '${'$tmp'}'`
+ 	else						# rest, load defaults
+ 	    not_font=""
+ 	    for j in $NotFont; do
+-		if test "$i" == "$j"; then
++		if test "$i" = "$j"; then
+ 		    not_font="YES"
+ 		    break
+ 		fi
+ 	    done
+ 	    if test -n "$not_font"; then  # don't append coding (not default!)
+ 		tmp="${family}$i"
+-		eval $i="${!tmp}"
++		eval $i="`eval echo '${'$tmp'}'`"
+ 	    else					# append coding
+ 		tmp="Default$i"
+ 		tmp1="${family}Coding"
+-		eval $i="${!tmp}${!tmp1}"
++		eval $i="`eval echo '${'$tmp'}${'$tmp1'}'`"
+ 	    fi
+ 	fi
+     done
+@@ -305,36 +305,38 @@
+     echo
+     echo "Setting up $i domain file..."
+     tmp="Domain$i"
+-    for j in ${!tmp}; do
++    for j in `eval echo '${'$tmp'}'`; do
+ 	if test -n "$nodef"; then		# --nodef, change coding only
+ 	    not_font=""
+ 	    for k in $NotFont; do
+-		if test "$k" == "$j"; then
++		if test "$k" = "$j"; then
+ 		    not_font="YES"
+ 		    break;
+ 		fi
+ 	    done
+ 	    if test -n "$not_font"; then		# don't append coding
+ 		tmp1="${family}$j"
+-		eval $j=${!tmp1}
++		eval $j=`eval echo '${'$tmp1'}'`
+ 	    else					# append coding
+ #TODO:make this funny sed script a lot smarter to let us make changes in font
+ #     lists, etc... (then we can enable --nodef for NodefUnable codings)
+ #TODO:better (or at least any) check, whether wmaker is installed...
+-		tmp1="${family}Coding"
+-		eval $j=$($WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${!tmp1}/g")
+-		if test -z "${!j}"; then		# failed, load default
++		tmp1="`eval echo '${'${family}Coding'}'`"
++		eval $j=`$WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${tmp1}/g"`
++		if test -z "`eval echo '${'$j'}'`"; then		# failed, load default
+ 		    tmp2="Default$j"
+-		    eval $j=${!tmp2}
++		    eval $j=`eval echo '${'$tmp2'}'`
+ 		fi
+ 	    fi
+ 	fi
+-	tmp1="$j=\"${!j}\""			# cosmetic length workaround
+-	if (( ${#tmp1} > 80 )); then
+-	    tmp1=$(echo "${tmp1:0:76}...\"")
++	tmp1="$j=\"`eval echo '${'$j'}'`\""			# cosmetic length workaround
++        echo '<<<<'
++	if [ ${#tmp1} -lt 80 ]; then
++	    tmp1=`echo $tmp1 | sed -e 's/^\(.\{1,76\}\).*/\1/'`
+ 	fi
++        echo '>>>>'
+ 	echo "$tmp1"
+-	$WDWRITE $i $j \"${!j}\"
++	$WDWRITE $i $j \"`eval echo '${'$j'}'`\"
+     done
+ done
+ echo
+
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 8672b3e2f97a..5e9b063c773f 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -110,33 +110,9 @@ share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
-share/WindowMaker/Icons/Ant.xpm
-share/WindowMaker/Icons/Antennae.xpm
-share/WindowMaker/Icons/Bee48x48.xpm
-share/WindowMaker/Icons/Beer.xpm
-share/WindowMaker/Icons/Bird.xpm
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
-share/WindowMaker/Icons/Book.xpm
-share/WindowMaker/Icons/Bookshelf.xpm
-share/WindowMaker/Icons/Brain.xpm
-share/WindowMaker/Icons/BulletHole.xpm
-share/WindowMaker/Icons/CashRegister.xpm
-share/WindowMaker/Icons/Clipboard.xpm
-share/WindowMaker/Icons/Cola.xpm
-share/WindowMaker/Icons/ColorGNU.xpm
-share/WindowMaker/Icons/Correspondence.dir.xpm
-share/WindowMaker/Icons/CrystalSkull.dir.xpm
-share/WindowMaker/Icons/Daemon.xpm
 share/WindowMaker/Icons/DefaultAppIcon.tiff
-share/WindowMaker/Icons/Detergent.dir.xpm
-share/WindowMaker/Icons/DoomII.xpm
-share/WindowMaker/Icons/Draw.xpm
-share/WindowMaker/Icons/EscherCube.xpm
-share/WindowMaker/Icons/EscherTriangle.xpm
-share/WindowMaker/Icons/Fish5.dir.xpm
-share/WindowMaker/Icons/Football.xpm
-share/WindowMaker/Icons/FootballUS.xpm
 share/WindowMaker/Icons/Ftp.png
 share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep.xpm
@@ -146,52 +122,22 @@ share/WindowMaker/Icons/GNUstepGlow.tiff
 share/WindowMaker/Icons/GNUstepGlow.xpm
 share/WindowMaker/Icons/GNUterm.tiff
 share/WindowMaker/Icons/GNUterm.xpm
-share/WindowMaker/Icons/Gear.xpm
-share/WindowMaker/Icons/Ghost.xpm
 share/WindowMaker/Icons/GreenWilber.png
-share/WindowMaker/Icons/HP-16C-48.xpm
-share/WindowMaker/Icons/HandOpen.xpm
-share/WindowMaker/Icons/HandPointing.xpm
-share/WindowMaker/Icons/HandPointingLeft.xpm
-share/WindowMaker/Icons/HandPunch.xpm
-share/WindowMaker/Icons/HandReach.xpm
-share/WindowMaker/Icons/HeroSandwich.dir.xpm
 share/WindowMaker/Icons/ICQ.png
-share/WindowMaker/Icons/LadyBug48x48.xpm
-share/WindowMaker/Icons/Microphone.xpm
 share/WindowMaker/Icons/Mozilla.png
 share/WindowMaker/Icons/Netscape.png
-share/WindowMaker/Icons/Netscape.xpm
-share/WindowMaker/Icons/NewsAgent.xpm
-share/WindowMaker/Icons/PDF.xpm
-share/WindowMaker/Icons/Padlock.xpm
-share/WindowMaker/Icons/Paint.xpm
 share/WindowMaker/Icons/Pen.png
 share/WindowMaker/Icons/Pencil.png
-share/WindowMaker/Icons/Pencils.24.xpm
-share/WindowMaker/Icons/Penguin.xpm
-share/WindowMaker/Icons/Radio.xpm
 share/WindowMaker/Icons/Real.png
-share/WindowMaker/Icons/Reference.xpm
-share/WindowMaker/Icons/Rumi.xpm
 share/WindowMaker/Icons/Shell.png
-share/WindowMaker/Icons/Snail.xpm
 share/WindowMaker/Icons/Speaker.png
-share/WindowMaker/Icons/T2-Film.xpm
-share/WindowMaker/Icons/TagIcon.xpm
-share/WindowMaker/Icons/TapeIcon1.xpm
 share/WindowMaker/Icons/Terminal.tiff
 share/WindowMaker/Icons/Terminal.xpm
 share/WindowMaker/Icons/TerminalGNUstep.tiff
 share/WindowMaker/Icons/TerminalGNUstep.xpm
 share/WindowMaker/Icons/TerminalLinux.tiff
 share/WindowMaker/Icons/TerminalLinux.xpm
-share/WindowMaker/Icons/TrueDie48.xpm
-share/WindowMaker/Icons/WheelbarrowFull.xpm
-share/WindowMaker/Icons/WordEditor.xpm
-share/WindowMaker/Icons/Wrench-12bit.xpm
 share/WindowMaker/Icons/XChat.png
-share/WindowMaker/Icons/bomb2.xpm
 share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
 share/WindowMaker/Icons/defaultAppIcon.tiff
@@ -200,15 +146,12 @@ share/WindowMaker/Icons/defaultterm.tiff
 share/WindowMaker/Icons/defaultterm.xpm
 share/WindowMaker/Icons/draw.tiff
 share/WindowMaker/Icons/draw.xpm
-share/WindowMaker/Icons/inspect.xpm
 share/WindowMaker/Icons/linuxterm.tiff
 share/WindowMaker/Icons/linuxterm.xpm
 share/WindowMaker/Icons/mixer.tiff
 share/WindowMaker/Icons/mixer.xpm
-share/WindowMaker/Icons/monitor.xpm
 share/WindowMaker/Icons/notepad.tiff
 share/WindowMaker/Icons/notepad.xpm
-share/WindowMaker/Icons/paint.xpm
 share/WindowMaker/Icons/pdf.tiff
 share/WindowMaker/Icons/pdf.xpm
 share/WindowMaker/Icons/ps.tiff
@@ -221,10 +164,6 @@ share/WindowMaker/Icons/sound.tiff
 share/WindowMaker/Icons/sound.xpm
 share/WindowMaker/Icons/staroffice2.tiff
 share/WindowMaker/Icons/staroffice2.xpm
-share/WindowMaker/Icons/tile.black.xpm
-share/WindowMaker/Icons/tile.snow.xpm
-share/WindowMaker/Icons/tile.xpm
-share/WindowMaker/Icons/tile2.xpm
 share/WindowMaker/Icons/timer.tiff
 share/WindowMaker/Icons/timer.xpm
 share/WindowMaker/Icons/wilber.tiff
@@ -274,22 +213,9 @@ share/WindowMaker/Styles/Spring.style
 share/WindowMaker/Styles/Summer.style
 share/WindowMaker/Styles/Traditional.style
 share/WindowMaker/Styles/VioletBlue.style
-share/WindowMaker/Themes/Checker.themed/checker.xpm
-share/WindowMaker/Themes/Checker.themed/style
 share/WindowMaker/Themes/Default.style
-share/WindowMaker/Themes/LeetWM.themed/LeetWM.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb1.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb2.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMTile1.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMtb1.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMtb2.jpg
-share/WindowMaker/Themes/LeetWM.themed/style
-share/WindowMaker/Themes/Night.themed/SeaNight.jpeg
-share/WindowMaker/Themes/Night.themed/style
 share/WindowMaker/Themes/OpenStep.style
 share/WindowMaker/Themes/Pastel.style
-share/WindowMaker/Themes/STEP2000.themed/BlueImage2.jpeg
-share/WindowMaker/Themes/STEP2000.themed/style
 share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
@@ -381,18 +307,10 @@ share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/WindowMaker.mo
 @exec mkdir -p %D/share/WindowMaker/Sounds
-@dirrm share/WindowMaker/Themes/STEP2000.themed
-@dirrm share/WindowMaker/Themes/Night.themed
-@dirrm share/WindowMaker/Themes/LeetWM.themed
-@dirrm share/WindowMaker/Themes/Checker.themed
-@dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
-@dirrm share/WindowMaker/Pixmaps
-@dirrm share/WindowMaker/Icons
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Backgrounds
-@dirrm share/WindowMaker
 @dirrm share/WINGs
 @dirrm include/WINGs
 @dirrm etc/WindowMaker