Update to 0.90.0, the latest release from the Window Maker team.

This release adds many new features, including font anti-aliasing.

1. Update LIB_DEPENDS to include Xft
2. Modernize USE_LIBTOOL
3. Hermes is no longer relevant
4. Update man page list and pkg-plist for new version

3 files changed, 24 insertions, 34 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 947e466fad4a..3be4ef897499 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.80.2
-PORTREVISION=	3
+PORTVERSION=	0.90.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	source/release
@@ -18,8 +17,9 @@ COMMENT=	GNUStep-compliant NeXTStep window manager clone
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		Xft.2:${PORTSDIR}/x11-fonts/libXft
+RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -29,7 +29,7 @@ USE_XPM=	yes
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	X11BASE=${X11BASE} \
 		LIBS="-L${LOCALBASE}/lib -lintl" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -41,28 +41,14 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-appspath="${PREFIX}/GNUstep/Apps" \
 		--disable-debug
 
-OPTIONS=	HERMES "Hermes library support" on \
-		XKB_STATUS "XKB STATUS" off \
+OPTIONS=	XKB_STATUS "XKB STATUS" off \
 		KDE "Add hooks for KDE" off
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-WITHOUT_HERMES=	yes
-.endif
-
-.if !defined(WITHOUT_HERMES)
-LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
-CONFIGURE_ARGS+=	--enable-hermes
-.else
-CONFIGURE_ARGS+=	--disable-hermes
-.endif
-
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-
 MANLANG=	"" sk
 MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
-		wcopy.1x wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x
+		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
 LINGUAS!=	${CAT} ${FILESDIR}/LINGUAS
 
@@ -86,8 +72,6 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
-# 	XXX
-	@${INSTALL_MAN} ${PREFIX}/man/man1/wcopy.1x ${PREFIX}/man/sk/man1
 
 update-LINGUAS: extract
 	cd ${WRKSRC}/po && \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 2473eaaf6e7c..029a1bca4308 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.80.2.tar.bz2) = 9f4fabc8831af6c58edf8708ee90126f
-SIZE (WindowMaker-0.80.2.tar.bz2) = 2053988
+MD5 (WindowMaker-0.90.0.tar.bz2) = 1665bdd857cf39a0a080f51d489a52ee
+SIZE (WindowMaker-0.90.0.tar.bz2) = 2196715
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index da88c9f6d53e..ce61ebf4aaef 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -65,6 +65,7 @@ GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff
 GNUstep/Apps/WPrefs.app/tiff/workspace.tiff
 GNUstep/Apps/WPrefs.app/tiff/workspacename.tiff
 GNUstep/Apps/WPrefs.app/tiff/xis.tiff
+bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
 bin/get-wutil-flags
@@ -72,7 +73,6 @@ bin/geticonset
 bin/getstyle
 bin/seticons
 bin/setstyle
-bin/wcopy
 bin/wdread
 bin/wdwrite
 bin/wkdemenu.pl
@@ -80,11 +80,8 @@ bin/wm-oldmenu2new
 bin/wmagnify
 bin/wmaker
 bin/wmaker.inst
-bin/wmchlocale
 bin/wmsetbg
 bin/wmsetup
-bin/wpaste
-bin/wsetfont
 bin/wxcopy
 bin/wxpaste
 etc/WindowMaker/WMGLOBAL
@@ -106,7 +103,10 @@ lib/libWMaker.a
 lib/libWUtil.a
 lib/libwraster.a
 lib/libwraster.so
-lib/libwraster.so.4
+lib/libwraster.so.3
+lib/pkgconfig/wrlib.pc
+lib/pkgconfig/WINGs.pc
+lib/pkgconfig/wmlib.pc
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
@@ -178,6 +178,7 @@ share/WindowMaker/Icons/xdvi.tiff
 share/WindowMaker/Icons/xdvi.xpm
 share/WindowMaker/Icons/xv.tiff
 share/WindowMaker/Icons/xv.xpm
+share/WindowMaker/Pixmaps/swtile.png
 share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
@@ -251,7 +252,7 @@ share/WindowMaker/menu.sk
 share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
 share/WindowMaker/menu.zh_CN
-share/WindowMaker/menu.zh_TW.Big5
+share/WindowMaker/menu.zh_TW
 share/WindowMaker/plmenu
 share/WindowMaker/plmenu.bg
 share/WindowMaker/plmenu.da
@@ -267,11 +268,17 @@ share/WindowMaker/plmenu.pl
 share/WindowMaker/plmenu.ro
 share/WindowMaker/plmenu.sk
 share/WindowMaker/plmenu.zh_CN
-share/WindowMaker/plmenu.zh_TW.Big5
+share/WindowMaker/plmenu.zh_TW
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
+share/locale/be/LC_MESSAGES/WindowMaker.mo
+share/locale/bg/LC_MESSAGES/WINGs.mo
 share/locale/bg/LC_MESSAGES/WPrefs.mo
 share/locale/bg/LC_MESSAGES/WindowMaker.mo
+share/locale/bs/LC_MESSAGES/WindowMaker.mo
+share/locale/ca/LC_MESSAGES/WINGs.mo
+share/locale/ca/LC_MESSAGES/WindowMaker.mo
+share/locale/ca/LC_MESSAGES/WPrefs.mo
 share/locale/cs/LC_MESSAGES/WINGs.mo
 share/locale/cs/LC_MESSAGES/WPrefs.mo
 share/locale/cs/LC_MESSAGES/WindowMaker.mo
@@ -286,6 +293,7 @@ share/locale/et/LC_MESSAGES/WPrefs.mo
 share/locale/et/LC_MESSAGES/WindowMaker.mo
 share/locale/fi/LC_MESSAGES/WPrefs.mo
 share/locale/fi/LC_MESSAGES/WindowMaker.mo
+share/locale/fr/LC_MESSAGES/WINGs.mo
 share/locale/fr/LC_MESSAGES/WPrefs.mo
 share/locale/fr/LC_MESSAGES/WindowMaker.mo
 share/locale/gl/LC_MESSAGES/WindowMaker.mo
@@ -315,8 +323,6 @@ share/locale/sv/LC_MESSAGES/WindowMaker.mo
 share/locale/tr/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 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/GNUstep/Apps/WPrefs.app/xpm
 @exec mkdir -p %D/share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Styles