Update to the latest, 0.92.

Re-sort pkg-plist was my idea.

Submitted by:	Ports Fury

6 files changed, 86 insertions, 148 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 211311cab9ad..eaa87e913752 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.91.0
+PORTVERSION=	0.92.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	source/release
@@ -35,7 +35,7 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-nlsdir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
-		--with-appspath="${PREFIX}/GNUstep/Apps" \
+		--with-gnustepdir="${PREFIX}/GNUstep" \
 		--disable-debug
 INSTALLS_SHLIB=	yes
 
@@ -43,18 +43,12 @@ MANLANG=	"" sk
 MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
 		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
-OPTIONS=	KDE "Add hooks for kde support" off \
-		XINERAMA "Enable xinerama support" off \
+OPTIONS=	XINERAMA "Enable xinerama support" off \
 		XKB_STATUS "XKB keyboard language status support" off \
-		WM_LINGUAS "Enable support for additional locales" off \
-		WM_VDESKTOP "Experts only!" off
+		WM_LINGUAS "Enable support for additional locales" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--enable-kde
-.endif
-
 .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
@@ -71,15 +65,9 @@ PLIST_SUB=	WM_LINGUAS=""
 PLIST_SUB=	WM_LINGUAS="@comment "
 .endif
 
-.if defined(WITH_WM_VDESKTOP)
-CONFIGURE_ARGS+=	--enable-vdesktop
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e "s|TW\.Big5|TW|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 	@${REINPLACE_CMD} -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
-	@${REINPLACE_CMD} -e "s|-version-info 3:|-version-info 4:|g" ${WRKSRC}/wrlib/Makefile.in
 	@${REINPLACE_CMD} -e "s|Trebuchet MS,Luxi Sans|sans|g" ${WRKSRC}/WindowMaker/Defaults/WMGLOBAL
 	@${REINPLACE_CMD} -e "s|/usr/local/GNUstep|${PREFIX}/GNUstep|g" \
 		${WRKSRC}/WindowMaker/*menu*
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 7a7b2623a205..ff60bd78ee41 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.91.0.tar.bz2) = 9d5e583e6cce5b4d16bb686b0c26c5dc
-SIZE (WindowMaker-0.91.0.tar.bz2) = 2198266
+MD5 (WindowMaker-0.92.0.tar.bz2) = aaac5421b686ed2d3e6ab65229c98097
+SIZE (WindowMaker-0.92.0.tar.bz2) = 2202748
diff --git a/x11-wm/windowmaker/files/patch-net_wm_icon b/x11-wm/windowmaker/files/patch-net_wm_icon
deleted file mode 100644
index df1b252cc2d8..000000000000
--- a/x11-wm/windowmaker/files/patch-net_wm_icon
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wmspec.c.old	Sun Mar 27 19:42:28 2005
-+++ src/wmspec.c	Sun Mar 27 19:43:56 2005
-@@ -381,7 +381,7 @@
-                                 XA_CARDINAL, &actual_type_return, &actual_format_return,
-                                 &nitems_return, &bytes_after_return, &prop_return);
- 
--    if (rc==Success && prop_return) {
-+    if (0 && rc==Success && prop_return) {
-         unsigned int *data = (unsigned int *)prop_return;
-         unsigned int pos = 0, len = 0;
-         unsigned int best_pos = 0, best_tmp = ~0;
diff --git a/x11-wm/windowmaker/files/patch-src::wmspec.c b/x11-wm/windowmaker/files/patch-src::wmspec.c
deleted file mode 100644
index b13b4ade0c49..000000000000
--- a/x11-wm/windowmaker/files/patch-src::wmspec.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/wmspec.c.orig	Sat Oct 23 12:18:47 2004
-+++ src/wmspec.c	Sun Oct 24 02:57:37 2004
-@@ -392,8 +392,8 @@
-         RImage *new_rimage;
- 
-         do {
--            len = data[pos+0]*data[pos+1];
-             unsigned int tmp = pref_sq-len;
-+            len = data[pos+0]*data[pos+1];
-             if (tmp < best_tmp && tmp > 0) {
-                 best_tmp = tmp;
-                 best_pos = pos;
diff --git a/x11-wm/windowmaker/files/patch-src::workspace.c b/x11-wm/windowmaker/files/patch-src::workspace.c
deleted file mode 100644
index 888e4db5f3a8..000000000000
--- a/x11-wm/windowmaker/files/patch-src::workspace.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/workspace.c.orig	Fri Oct 15 06:14:43 2004
-+++ src/workspace.c	Sun Oct 24 22:32:02 2004
-@@ -738,16 +738,20 @@
- vdMouseMoveDesktop(XEvent *event, WMPoint direction)
- {
-     static int lock = False;
--    if (lock) return;
--    lock = True;
- 
-     Bool done = False;
-     Bool moved = True;
--    WScreen *scr = wScreenForRootWindow(event->xcrossing.root);
--    WMPoint old_pos = wmkpoint(event->xcrossing.x_root, event->xcrossing.y_root);
-+    WScreen *scr;
-+    WMPoint old_pos;
-     WMPoint step;
-     int x, y;
-     int resisted = 0;
-+
-+    if (lock) return;
-+    lock = True;
-+
-+    scr = wScreenForRootWindow(event->xcrossing.root);
-+    old_pos = wmkpoint(event->xcrossing.x_root, event->xcrossing.y_root);
- 
-     if (XGrabPointer(dpy, event->xcrossing.window, False,
-                      PointerMotionMask, GrabModeAsync, GrabModeAsync,
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 4aaeab7fe624..d16149add485 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -1,70 +1,70 @@
-GNUstep/Apps/WPrefs.app/WPrefs
-GNUstep/Apps/WPrefs.app/WPrefs.tiff
-GNUstep/Apps/WPrefs.app/WPrefs.xpm
-GNUstep/Apps/WPrefs.app/tiff/advancetonewworkspace.tiff
-GNUstep/Apps/WPrefs.app/tiff/animations.tiff
-GNUstep/Apps/WPrefs.app/tiff/appearance.tiff
-GNUstep/Apps/WPrefs.app/tiff/clip.tiff
-GNUstep/Apps/WPrefs.app/tiff/configs.tiff
-GNUstep/Apps/WPrefs.app/tiff/cycleworkspaces.tiff
-GNUstep/Apps/WPrefs.app/tiff/dock.tiff
-GNUstep/Apps/WPrefs.app/tiff/dontlinkworkspaces.tiff
-GNUstep/Apps/WPrefs.app/tiff/ergonomic.tiff
-GNUstep/Apps/WPrefs.app/tiff/expert.tiff
-GNUstep/Apps/WPrefs.app/tiff/fonts.tiff
-GNUstep/Apps/WPrefs.app/tiff/iconprefs.tiff
-GNUstep/Apps/WPrefs.app/tiff/keyboard.tiff
-GNUstep/Apps/WPrefs.app/tiff/keyboardprefs.tiff
-GNUstep/Apps/WPrefs.app/tiff/keyshortcuts.tiff
-GNUstep/Apps/WPrefs.app/tiff/menualign1.tiff
-GNUstep/Apps/WPrefs.app/tiff/menualign2.tiff
-GNUstep/Apps/WPrefs.app/tiff/menuprefs.tiff
-GNUstep/Apps/WPrefs.app/tiff/menus.tiff
-GNUstep/Apps/WPrefs.app/tiff/moreanim.tiff
-GNUstep/Apps/WPrefs.app/tiff/mousesettings.tiff
-GNUstep/Apps/WPrefs.app/tiff/mousespeed.tiff
-GNUstep/Apps/WPrefs.app/tiff/msty1.tiff
-GNUstep/Apps/WPrefs.app/tiff/msty2.tiff
-GNUstep/Apps/WPrefs.app/tiff/msty3.tiff
-GNUstep/Apps/WPrefs.app/tiff/newstyle.tiff
-GNUstep/Apps/WPrefs.app/tiff/nonopaque.tiff
-GNUstep/Apps/WPrefs.app/tiff/oldstyle.tiff
-GNUstep/Apps/WPrefs.app/tiff/opaque.tiff
-GNUstep/Apps/WPrefs.app/tiff/paths.tiff
-GNUstep/Apps/WPrefs.app/tiff/smooth.tiff
-GNUstep/Apps/WPrefs.app/tiff/sound.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed0.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed0s.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed1.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed1s.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed2.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed2s.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed3.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed3s.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed4.tiff
-GNUstep/Apps/WPrefs.app/tiff/speed4s.tiff
-GNUstep/Apps/WPrefs.app/tiff/tdel.tiff
-GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
-GNUstep/Apps/WPrefs.app/tiff/textr.tiff
-GNUstep/Apps/WPrefs.app/tiff/theme.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer1.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer1s.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer2.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer2s.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer3.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer3s.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer4.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer4s.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer5.tiff
-GNUstep/Apps/WPrefs.app/tiff/timer5s.tiff
-GNUstep/Apps/WPrefs.app/tiff/tnew.tiff
-GNUstep/Apps/WPrefs.app/tiff/whandling.tiff
-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
+GNUstep/Applications/WPrefs.app/WPrefs
+GNUstep/Applications/WPrefs.app/WPrefs.tiff
+GNUstep/Applications/WPrefs.app/WPrefs.xpm
+GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff
+GNUstep/Applications/WPrefs.app/tiff/animations.tiff
+GNUstep/Applications/WPrefs.app/tiff/appearance.tiff
+GNUstep/Applications/WPrefs.app/tiff/clip.tiff
+GNUstep/Applications/WPrefs.app/tiff/configs.tiff
+GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff
+GNUstep/Applications/WPrefs.app/tiff/dock.tiff
+GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff
+GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
+GNUstep/Applications/WPrefs.app/tiff/expert.tiff
+GNUstep/Applications/WPrefs.app/tiff/fonts.tiff
+GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff
+GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff
+GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff
+GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff
+GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff
+GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff
+GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff
+GNUstep/Applications/WPrefs.app/tiff/menus.tiff
+GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff
+GNUstep/Applications/WPrefs.app/tiff/mousesettings.tiff
+GNUstep/Applications/WPrefs.app/tiff/mousespeed.tiff
+GNUstep/Applications/WPrefs.app/tiff/msty1.tiff
+GNUstep/Applications/WPrefs.app/tiff/msty2.tiff
+GNUstep/Applications/WPrefs.app/tiff/msty3.tiff
+GNUstep/Applications/WPrefs.app/tiff/newstyle.tiff
+GNUstep/Applications/WPrefs.app/tiff/nonopaque.tiff
+GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff
+GNUstep/Applications/WPrefs.app/tiff/opaque.tiff
+GNUstep/Applications/WPrefs.app/tiff/paths.tiff
+GNUstep/Applications/WPrefs.app/tiff/smooth.tiff
+GNUstep/Applications/WPrefs.app/tiff/sound.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed0.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed0s.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed1.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed1s.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed2.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed2s.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed3.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed3s.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed4.tiff
+GNUstep/Applications/WPrefs.app/tiff/speed4s.tiff
+GNUstep/Applications/WPrefs.app/tiff/tdel.tiff
+GNUstep/Applications/WPrefs.app/tiff/tedit.tiff
+GNUstep/Applications/WPrefs.app/tiff/textr.tiff
+GNUstep/Applications/WPrefs.app/tiff/theme.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer0.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer0s.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer1.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer1s.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer2.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer2s.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer3.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer3s.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer4.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer4s.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer5.tiff
+GNUstep/Applications/WPrefs.app/tiff/timer5s.tiff
+GNUstep/Applications/WPrefs.app/tiff/tnew.tiff
+GNUstep/Applications/WPrefs.app/tiff/whandling.tiff
+GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff
+GNUstep/Applications/WPrefs.app/tiff/workspace.tiff
+GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
+GNUstep/Applications/WPrefs.app/tiff/xis.tiff
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -327,19 +327,19 @@ share/WindowMaker/xtree.dat
 %%WM_LINGUAS%%share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 %%WM_LINGUAS%%share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
 %%WM_LINGUAS%%share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
-@exec mkdir -p %D/GNUstep/Apps/WPrefs.app/xpm
+@exec mkdir -p %D/GNUstep/Applications/WPrefs.app/xpm
 @exec mkdir -p %D/share/WindowMaker/Sounds
-@dirrm share/WindowMaker/Styles
-@dirrm share/WindowMaker/Sounds
-@dirrm share/WindowMaker/IconSets
-@dirrm share/WindowMaker/Backgrounds
-@dirrm share/WINGs
+@dirrm GNUstep/Applications/WPrefs.app/tiff
+@dirrm GNUstep/Applications/WPrefs.app/xpm
+@dirrm GNUstep/Applications/WPrefs.app
+@dirrm GNUstep/Applications
+@dirrm GNUstep
+@dirrm etc/WindowMaker
+@dirrm include/WINGs
 @dirrm man/sk/man1
 @dirrm man/sk
-@dirrm include/WINGs
-@dirrm etc/WindowMaker
-@dirrm GNUstep/Apps/WPrefs.app/xpm
-@dirrm GNUstep/Apps/WPrefs.app/tiff
-@dirrm GNUstep/Apps/WPrefs.app
-@dirrm GNUstep/Apps
-@dirrm GNUstep
+@dirrm share/WINGs
+@dirrm share/WindowMaker/Backgrounds
+@dirrm share/WindowMaker/IconSets
+@dirrm share/WindowMaker/Sounds
+@dirrm share/WindowMaker/Styles