Update for "windowmaker" package to version 0.50.2 supplied by

Johnny C. Lam in PR pkg/6815.

9 files changed, 183 insertions, 58 deletions

diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 1264024c2d2..b4dc7e92dc2 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 1998/12/05 21:38:42 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/01/16 12:35:43 tron Exp $
 
-DISTNAME=		WindowMaker-0.20.3
-PKGNAME=		windowmaker-0.20.3
+DISTNAME=		WindowMaker-0.50.2
+PKGNAME=		windowmaker-0.50.2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 			ftp://ftp.windowmaker.org/pub/contrib/icons/
@@ -17,24 +17,85 @@ DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		png-1.0.2:../../graphics/png
 DEPENDS+=		tiff-3.4:../../graphics/tiff
 
+CONFLICTS=		windowmaker-*
+
+USE_LIBTOOL=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/share/locale \
+			--with-gfx-incs="-I${LOCALBASE}/include \
+				-I${LOCALBASE}/include/giflib" \
+			--with-gfx-libs=-L${LOCALBASE}/lib \
+			--with-modelock
 CONFIGURE_ENV+=		INSTALL="${INSTALL}" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			INSTALL_DATA="${INSTALL_DATA}" \
 			INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-CONFLICTS=		windowmaker-0.6.3 windowmaker-0.16.1 windowmaker-0.20.2
+PLIST_SRC=		${WRKDIR}/.PLIST_SRC_WM
 
-USE_X11=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/share/locale \
-			--with-gfx-incs="-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
-			--with-gfx-libs=-L${LOCALBASE}/lib
+.include "../../mk/bsd.prefs.mk"
+
+# LINGUAS is a space-separated list of locales.  If it is defined, then
+# i18n-support is compiled into Window Maker and the locales specified
+# are installed.
+#
+.if defined(LINGUAS)
+DEPENDS+=		gettext-0.10.35:../../devel/gettext
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LINGUAS="${LINGUAS}"
+
+# Enable multi-byte character support for languages that need it.
+# Currently, those are: ja, ko
+#
+.for lang in ja ko
+.if (${LINGUAS:M${lang}} != "")
+ENABLE_WM_KANJI=	yes
+.endif
+.endfor
+.if defined(ENABLE_WM_KANJI)
+CONFIGURE_ARGS+=	--enable-kanji
+.endif # ENABLE_WM_KANJI
+.endif # LINGUAS
+
+# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
+# to support.  Currently supported options:
+#
+#	kde		KDE WM-compliance
+#	lite		remove Window Maker redundancies with KDE
+#	gnome		GNOME-compliance
+#
+# Default: not defined
+#
+.for option in ${WINDOWMAKER_OPTIONS}
+CONFIGURE_ARGS+=	--enable-${option}
+.endfor
+
+pre-configure:
+	@${ECHO} "To compile with i18n support, set the variable LINGUAS"
+	@${ECHO} "to the list of locales to install."
 
 post-install:
 	(cd ${WRKDIR}/WindowMaker-data/pixmaps/ ; for i in * ; do \
-	 ${INSTALL_DATA} $$i ${PREFIX}/share/WindowMaker/Pixmaps/ ; \
+	 ${INSTALL_DATA} "$$i" ${PREFIX}/share/WindowMaker/Pixmaps/ ; \
 	 done )
 	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/Sounds
 	${TOUCH} ${PREFIX}/share/WindowMaker/Sounds/.keep_me
+	${INSTALL_DATA} ${WRKSRC}/README.GNOME ${PREFIX}/share/WindowMaker
+	${INSTALL_DATA} ${WRKSRC}/README.KDE ${PREFIX}/share/WindowMaker
+	@${CAT} ${PKGDIR}/PLIST.nolinguas >${PLIST_SRC}
+.if defined(LINGUAS)
+	@(for lang in ${LINGUAS}; do \
+	    if [ -f ${WRKSRC}/po/$${lang}.mo ]; then \
+		${ECHO} share/locale/$${lang}/LC_MESSAGES/WindowMaker.mo; \
+	    fi; \
+	    if [ -f ${WRKSRC}/WPrefs.app/po/$${lang}.mo ]; then \
+		${ECHO} share/locale/$${lang}/LC_MESSAGES/WPrefs.mo; \
+	    fi; \
+	    ${ECHO} @dirrm share/locale/$${lang}/LC_MESSAGES; \
+	    ${ECHO} @dirrm share/locale/$${lang}; \
+	done) >>${PLIST_SRC}
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/windowmaker/files/md5 b/x11/windowmaker/files/md5
index 58282c3b8d7..f97145444b4 100644
--- a/x11/windowmaker/files/md5
+++ b/x11/windowmaker/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.5 1998/12/05 21:38:43 tron Exp $
+$NetBSD: md5,v 1.6 1999/01/16 12:35:44 tron Exp $
 
-MD5 (WindowMaker-0.20.3.tar.gz) = fb79baa4ae084a0747a5d3683eebc686
+MD5 (WindowMaker-0.50.2.tar.gz) = 985288b835085d5a3d79652a7becf1c9
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff --git a/x11/windowmaker/patches/patch-aa b/x11/windowmaker/patches/patch-aa
index 261182520b2..26f01201e4b 100644
--- a/x11/windowmaker/patches/patch-aa
+++ b/x11/windowmaker/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 1998/11/26 19:21:32 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/01/16 12:35:44 tron Exp $
 
---- doc/Makefile.in.orig	Fri Oct 23 08:03:58 1998
-+++ doc/Makefile.in	Mon Nov 23 17:55:34 1998
-@@ -137,7 +137,7 @@
+--- doc/Makefile.in.orig	Sat Jan  9 20:55:55 1999
++++ doc/Makefile.in	Mon Jan 11 09:44:13 1999
+@@ -142,7 +142,7 @@
  	for i in $$list; do \
  	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
  	  else file=$$i; fi; \
 -	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//' | sed -e 's/[a-z]*$$//'`; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//' -e 's/[a-z]*$$//'`; \
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
  	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
diff --git a/x11/windowmaker/patches/patch-ab b/x11/windowmaker/patches/patch-ab
new file mode 100644
index 00000000000..c7406f5120e
--- /dev/null
+++ b/x11/windowmaker/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.5 1999/01/16 12:38:09 tron Exp $
+
+--- configure.orig	Sat Jan  9 20:55:54 1999
++++ configure	Mon Jan 11 22:15:49 1999
+@@ -1240,8 +1240,8 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# Use NetBSD's pkglibtool.
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags=
diff --git a/x11/windowmaker/patches/patch-ac b/x11/windowmaker/patches/patch-ac
new file mode 100644
index 00000000000..1dbd88d2dfd
--- /dev/null
+++ b/x11/windowmaker/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 1999/01/16 12:38:09 tron Exp $
+
+--- libPropList/configure.orig	Sat Jan  9 20:55:55 1999
++++ libPropList/configure	Mon Jan 11 22:43:46 1999
+@@ -1196,8 +1196,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# Use LIBTOOL passed from environment.
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags=
diff --git a/x11/windowmaker/patches/patch-ad b/x11/windowmaker/patches/patch-ad
new file mode 100644
index 00000000000..4d381348bc5
--- /dev/null
+++ b/x11/windowmaker/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 1999/01/16 12:38:10 tron Exp $
+
+--- WPrefs.app/po/Makefile.in.orig	Fri Jan 15 07:08:16 1999
++++ WPrefs.app/po/Makefile.in	Fri Jan 15 09:13:25 1999
+@@ -235,7 +235,7 @@
+ 			$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
+ 			chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
+ 			chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
+-			$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
++			$(INSTALL_DATA) $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
+ 		fi; \
+ 	done
+ 
diff --git a/x11/windowmaker/patches/patch-ae b/x11/windowmaker/patches/patch-ae
new file mode 100644
index 00000000000..2c051bc803a
--- /dev/null
+++ b/x11/windowmaker/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 1999/01/16 12:38:10 tron Exp $
+
+--- po/Makefile.in.orig	Tue Jan 12 07:48:53 1999
++++ po/Makefile.in	Fri Jan 15 09:12:40 1999
+@@ -243,7 +243,7 @@
+ 			$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
+ 			chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
+ 			chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
+-			$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
++			$(INSTALL_DATA) $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
+ 		fi; \
+ 	done
+ 
diff --git a/x11/windowmaker/pkg/DESCR b/x11/windowmaker/pkg/DESCR
index 040a16861b5..225f39fafd5 100644
--- a/x11/windowmaker/pkg/DESCR
+++ b/x11/windowmaker/pkg/DESCR
@@ -1,4 +1,4 @@
-WindowMaker is a window manager designed to emulate the look
+Window Maker is a window manager designed to emulate the look
 and feel of part of the NEXTSTEP(tm) GUI. It's supposed to be fast,
 relatively small, feature rich and easy to configure, with
 a simple and elegant appearance borrowed from NEXTSTEP(tm).
diff --git a/x11/windowmaker/pkg/PLIST b/x11/windowmaker/pkg/PLIST.nolinguas
index 2796f5b815f..6e987322a0d 100644
--- a/x11/windowmaker/pkg/PLIST
+++ b/x11/windowmaker/pkg/PLIST.nolinguas
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1998/12/05 21:38:43 tron Exp $
+@comment $NetBSD: PLIST.nolinguas,v 1.1 1999/01/16 12:38:50 tron Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -116,6 +116,7 @@ GNUstep/Apps/WPrefs.app/xpm/whandling.xpm
 GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm
 GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
+bin/WINGs-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -128,16 +129,18 @@ bin/wmsetbg
 bin/wsetfont
 bin/wxcopy
 bin/wxpaste
-include/WMaker.h
-include/proplist.h
-include/wraster.h
 include/WINGs.h
 include/WINGsP.h
+include/WMaker.h
 include/WUtil.h
+include/proplist.h
+include/wraster.h
 lib/libPropList.a
+lib/libPropList.so.1.1
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libwraster.a
+lib/libwraster.so.1.1
 man/man1/geticonset.1
 man/man1/getstyle.1
 man/man1/seticons.1
@@ -152,14 +155,12 @@ share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/Backgrounds/BlueWaves.jpeg
-share/WindowMaker/Backgrounds/SeaNight.jpeg
 share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
 share/WindowMaker/Defaults/WindowMaker
-share/WindowMaker/IconSets/Default
+share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep.xpm
 share/WindowMaker/Icons/GNUstep3D.tiff
@@ -234,43 +235,46 @@ share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/Pixmaps/tile2.xpm
 share/WindowMaker/Pixmaps/xv.xpm
 share/WindowMaker/README
+share/WindowMaker/README.GNOME
+share/WindowMaker/README.KDE
+share/WindowMaker/README.themes
 share/WindowMaker/Sounds/.keep_me
-share/WindowMaker/Styles/Autumn
-share/WindowMaker/Styles/Black
-share/WindowMaker/Styles/Blue
-share/WindowMaker/Styles/BlueAluminum
-share/WindowMaker/Styles/BlueDawn
-share/WindowMaker/Styles/BlueishGreen
-share/WindowMaker/Styles/Brown
-share/WindowMaker/Styles/Chumbo
-share/WindowMaker/Styles/Copper
-share/WindowMaker/Styles/DarkBlue
-share/WindowMaker/Styles/DarkRed
-share/WindowMaker/Styles/Fire
-share/WindowMaker/Styles/Food
-share/WindowMaker/Styles/Golden
-share/WindowMaker/Styles/Green
-share/WindowMaker/Styles/GreyBlue
-share/WindowMaker/Styles/Gtk
-share/WindowMaker/Styles/LightBlue
-share/WindowMaker/Styles/Pastel
-share/WindowMaker/Styles/Pink
-share/WindowMaker/Styles/Pumpkin
-share/WindowMaker/Styles/Purple
-share/WindowMaker/Styles/Red
-share/WindowMaker/Styles/RednBlue
-share/WindowMaker/Styles/ShinyBrown
-share/WindowMaker/Styles/Summer
-share/WindowMaker/Styles/Traditional
-share/WindowMaker/Styles/VioletBlue
-share/WindowMaker/Themes/BlueWaves
-share/WindowMaker/Themes/Default
-share/WindowMaker/Themes/Night
-share/WindowMaker/Themes/OpenStep
-share/WindowMaker/Themes/Pastel
+share/WindowMaker/Styles/Autumn.style
+share/WindowMaker/Styles/Black.style
+share/WindowMaker/Styles/BlackTexture.style
+share/WindowMaker/Styles/Blue.style
+share/WindowMaker/Styles/BlueDawn.style
+share/WindowMaker/Styles/BlueishGreen.style
+share/WindowMaker/Styles/Brown.style
+share/WindowMaker/Styles/Chumbo.style
+share/WindowMaker/Styles/Copper.style
+share/WindowMaker/Styles/DarkBlue.style
+share/WindowMaker/Styles/DarkRed.style
+share/WindowMaker/Styles/Fire.style
+share/WindowMaker/Styles/Food.style
+share/WindowMaker/Styles/Golden.style
+share/WindowMaker/Styles/Green.style
+share/WindowMaker/Styles/GreyBlue.style
+share/WindowMaker/Styles/Gtk.style
+share/WindowMaker/Styles/LightBlue.style
+share/WindowMaker/Styles/Pastel.style
+share/WindowMaker/Styles/Purple.style
+share/WindowMaker/Styles/Red.style
+share/WindowMaker/Styles/RednBlue.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/Night.themed/SeaNight.jpeg
+share/WindowMaker/Themes/Night.themed/style
+share/WindowMaker/Themes/OpenStep.style
+share/WindowMaker/Themes/Pastel.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
+share/WindowMaker/menu.ca
 share/WindowMaker/menu.cz
 share/WindowMaker/menu.de
 share/WindowMaker/menu.dk
@@ -281,6 +285,7 @@ share/WindowMaker/menu.fr
 share/WindowMaker/menu.gl
 share/WindowMaker/menu.he
 share/WindowMaker/menu.hr
+share/WindowMaker/menu.hu
 share/WindowMaker/menu.it
 share/WindowMaker/menu.ja
 share/WindowMaker/menu.ko
@@ -292,6 +297,8 @@ share/WindowMaker/menu.se
 share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
 share/WindowMaker/plmenu
+share/WindowMaker/plmenu.fr
+share/WindowMaker/plmenu.hr
 share/WindowMaker/wmmacros
 @dirrm GNUstep/Apps/WPrefs.app/tiff
 @dirrm GNUstep/Apps/WPrefs.app/xpm
@@ -306,5 +313,7 @@ share/WindowMaker/wmmacros
 @dirrm share/WindowMaker/Pixmaps
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Styles
+@dirrm share/WindowMaker/Themes/Checker.themed
+@dirrm share/WindowMaker/Themes/Night.themed
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker