From cdad0218577838b8f0c2392a3a931f97ff5241d6 Mon Sep 17 00:00:00 2001
From: Thomas Gellekum <tg@FreeBSD.org>
Date: Wed, 30 Sep 1998 13:24:40 +0000
Subject: [PATCH] Upgrade to 0.20.1. Make compilable on -current.

Fixes submitted by:	Jeremy Lea <reg@shale.csir.co.za>
---
 x11-wm/windowmaker-i18n/Makefile       | 16 ++++--
 x11-wm/windowmaker-i18n/distinfo       |  3 +-
 x11-wm/windowmaker-i18n/files/patch-ad | 11 ++++-
 x11-wm/windowmaker-i18n/pkg-plist      | 68 ++++++++++++++++++++++++--
 x11-wm/windowmaker/Makefile            | 16 ++++--
 x11-wm/windowmaker/distinfo            |  3 +-
 x11-wm/windowmaker/pkg-plist           | 68 ++++++++++++++++++++++++--
 7 files changed, 164 insertions(+), 21 deletions(-)

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 53fc8155b64c..4d064aac3910 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.20.0
+# Version required:	0.20.1
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.32 1998/09/24 15:13:35 tg Exp $
+# $Id: Makefile,v 1.33 1998/09/27 20:59:11 steve Exp $
 
-DISTNAME=	WindowMaker-0.20.0
-PKGNAME=	windowmaker-0.20.0
+DISTNAME=	WindowMaker-0.20.1
+PKGNAME=	windowmaker-0.20.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
 		http://jgo.local.net/cool_downloads/wm/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	handy@physics.montana.edu
 
@@ -29,9 +30,11 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-gfx-libs="-L${LOCALBASE}/lib" \
 	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include"
 
-MAN1=	convertstyle.1 geticonset.1x getstyle.1x seticons.1x setstyle.1x \
+MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
+DATAFILES=	WindowMaker-data.tar.gz
+
 post-extract:
 	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
 
@@ -49,6 +52,9 @@ pre-install:
 	@(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install)
 
 post-install:
+	${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
+	${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
+		${PREFIX}/share/WindowMaker/Pixmaps/
 	if [ "${PORTOBJFORMAT}" = "elf" ]; then \
 		${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so; \
 	else \
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index b6d6c73193be..f5508fc3ee05 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1,2 @@
-MD5 (WindowMaker-0.20.0.tar.gz) = f34b20bd15f7636b197e52fa1b16dada
+MD5 (WindowMaker-0.20.1.tar.gz) = 6ed696ff93b3ecaf155dacbaa32fcfda
+MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 102409029f35..d630e21ea8fe 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,5 +1,14 @@
 --- configure.orig	Wed Sep 23 10:48:39 1998
-+++ configure	Thu Sep 24 09:08:10 1998
++++ configure	Sat Sep 26 01:50:28 1998
+@@ -3570,7 +3570,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgif $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $LIBS"
++LIBS="-lgif $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3576 "configure"
+ #include "confdefs.h"
 @@ -3629,14 +3629,14 @@
  #
  
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 9b45d38ce217..3c20c719f289 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -133,22 +133,19 @@ include/WUtil.h
 include/proplist.h
 include/wraster.h
 lib/libPropList.a
-@exec ranlib %D/%F
 lib/libPropList.so
 lib/libPropList.so.0.8
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
 lib/libWINGs.a
-@exec ranlib %D/%F
 lib/libWMaker.a
-@exec ranlib %D/%F
 lib/libwraster.a
-@exec ranlib %D/%F
 share/WINGs/Images.tiff
 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
@@ -166,8 +163,69 @@ share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
 share/WindowMaker/Icons/defaultAppIcon.tiff
 share/WindowMaker/Icons/defaultAppIcon.xpm
+share/WindowMaker/Pixmaps/Ant.xpm
+share/WindowMaker/Pixmaps/Antennae.xpm
+share/WindowMaker/Pixmaps/Bee48x48.xpm
+share/WindowMaker/Pixmaps/Beer.xpm
+share/WindowMaker/Pixmaps/Bird.xpm
+share/WindowMaker/Pixmaps/Book.xpm
+share/WindowMaker/Pixmaps/Bookshelf.xpm
+share/WindowMaker/Pixmaps/Brain.xpm
+share/WindowMaker/Pixmaps/BulletHole.xpm
+share/WindowMaker/Pixmaps/CashRegister.xpm
+share/WindowMaker/Pixmaps/Clipboard.xpm
+share/WindowMaker/Pixmaps/Cola.xpm
+share/WindowMaker/Pixmaps/ColorGNU.xpm
+share/WindowMaker/Pixmaps/Correspondence.dir.xpm
+share/WindowMaker/Pixmaps/CrystalSkull.dir.xpm
+share/WindowMaker/Pixmaps/Daemon.xpm
+share/WindowMaker/Pixmaps/Detergent.dir.xpm
+share/WindowMaker/Pixmaps/DoomII.xpm
+share/WindowMaker/Pixmaps/Draw.xpm
+share/WindowMaker/Pixmaps/EscherCube.xpm
+share/WindowMaker/Pixmaps/EscherTriangle.xpm
+share/WindowMaker/Pixmaps/Fish5.dir.xpm
+share/WindowMaker/Pixmaps/Football.xpm
+share/WindowMaker/Pixmaps/FootballUS.xpm
+share/WindowMaker/Pixmaps/Gear.xpm
+share/WindowMaker/Pixmaps/Ghost.xpm
+share/WindowMaker/Pixmaps/HP-16C-48.xpm
+share/WindowMaker/Pixmaps/HandOpen.xpm
+share/WindowMaker/Pixmaps/HandPointing.xpm
+share/WindowMaker/Pixmaps/HandPointingLeft.xpm
+share/WindowMaker/Pixmaps/HandPunch.xpm
+share/WindowMaker/Pixmaps/HandReach.xpm
+share/WindowMaker/Pixmaps/HeroSandwich.dir.xpm
+share/WindowMaker/Pixmaps/LadyBug48x48.xpm
+share/WindowMaker/Pixmaps/Microphone.xpm
+share/WindowMaker/Pixmaps/Netscape.xpm
+share/WindowMaker/Pixmaps/NewsAgent.xpm
+share/WindowMaker/Pixmaps/PDF.xpm
+share/WindowMaker/Pixmaps/Padlock.xpm
+share/WindowMaker/Pixmaps/Paint.xpm
+share/WindowMaker/Pixmaps/Pencils.24.xpm
+share/WindowMaker/Pixmaps/Penguin.xpm
+share/WindowMaker/Pixmaps/Radio.xpm
+share/WindowMaker/Pixmaps/Reference.xpm
+share/WindowMaker/Pixmaps/Rumi.xpm
+share/WindowMaker/Pixmaps/Snail.xpm
+share/WindowMaker/Pixmaps/T2-Film.xpm
+share/WindowMaker/Pixmaps/TagIcon.xpm
+share/WindowMaker/Pixmaps/TapeIcon1.xpm
+share/WindowMaker/Pixmaps/TrueDie48.xpm
+share/WindowMaker/Pixmaps/WheelbarrowFull.xpm
+share/WindowMaker/Pixmaps/WordEditor.xpm
+share/WindowMaker/Pixmaps/Wrench-12bit.xpm
+share/WindowMaker/Pixmaps/bomb2.xpm
+share/WindowMaker/Pixmaps/inspect.xpm
+share/WindowMaker/Pixmaps/monitor.xpm
+share/WindowMaker/Pixmaps/paint.xpm
+share/WindowMaker/Pixmaps/tile.black.xpm
+share/WindowMaker/Pixmaps/tile.snow.xpm
 share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
+share/WindowMaker/Pixmaps/tile2.xpm
+share/WindowMaker/Pixmaps/xv.xpm
 share/WindowMaker/README
 share/WindowMaker/Styles/Autumn
 share/WindowMaker/Styles/Black
@@ -198,6 +256,7 @@ 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
@@ -225,6 +284,7 @@ share/WindowMaker/menu.se
 share/WindowMaker/menu.tr
 share/WindowMaker/plmenu
 share/WindowMaker/wmmacros
+@exec mkdir -p %B/Sounds
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 53fc8155b64c..4d064aac3910 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.20.0
+# Version required:	0.20.1
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.32 1998/09/24 15:13:35 tg Exp $
+# $Id: Makefile,v 1.33 1998/09/27 20:59:11 steve Exp $
 
-DISTNAME=	WindowMaker-0.20.0
-PKGNAME=	windowmaker-0.20.0
+DISTNAME=	WindowMaker-0.20.1
+PKGNAME=	windowmaker-0.20.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
 		http://jgo.local.net/cool_downloads/wm/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	handy@physics.montana.edu
 
@@ -29,9 +30,11 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-gfx-libs="-L${LOCALBASE}/lib" \
 	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include"
 
-MAN1=	convertstyle.1 geticonset.1x getstyle.1x seticons.1x setstyle.1x \
+MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
+DATAFILES=	WindowMaker-data.tar.gz
+
 post-extract:
 	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
 
@@ -49,6 +52,9 @@ pre-install:
 	@(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install)
 
 post-install:
+	${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
+	${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
+		${PREFIX}/share/WindowMaker/Pixmaps/
 	if [ "${PORTOBJFORMAT}" = "elf" ]; then \
 		${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so; \
 	else \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index b6d6c73193be..f5508fc3ee05 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1 +1,2 @@
-MD5 (WindowMaker-0.20.0.tar.gz) = f34b20bd15f7636b197e52fa1b16dada
+MD5 (WindowMaker-0.20.1.tar.gz) = 6ed696ff93b3ecaf155dacbaa32fcfda
+MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 9b45d38ce217..3c20c719f289 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -133,22 +133,19 @@ include/WUtil.h
 include/proplist.h
 include/wraster.h
 lib/libPropList.a
-@exec ranlib %D/%F
 lib/libPropList.so
 lib/libPropList.so.0.8
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
 lib/libWINGs.a
-@exec ranlib %D/%F
 lib/libWMaker.a
-@exec ranlib %D/%F
 lib/libwraster.a
-@exec ranlib %D/%F
 share/WINGs/Images.tiff
 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
@@ -166,8 +163,69 @@ share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
 share/WindowMaker/Icons/defaultAppIcon.tiff
 share/WindowMaker/Icons/defaultAppIcon.xpm
+share/WindowMaker/Pixmaps/Ant.xpm
+share/WindowMaker/Pixmaps/Antennae.xpm
+share/WindowMaker/Pixmaps/Bee48x48.xpm
+share/WindowMaker/Pixmaps/Beer.xpm
+share/WindowMaker/Pixmaps/Bird.xpm
+share/WindowMaker/Pixmaps/Book.xpm
+share/WindowMaker/Pixmaps/Bookshelf.xpm
+share/WindowMaker/Pixmaps/Brain.xpm
+share/WindowMaker/Pixmaps/BulletHole.xpm
+share/WindowMaker/Pixmaps/CashRegister.xpm
+share/WindowMaker/Pixmaps/Clipboard.xpm
+share/WindowMaker/Pixmaps/Cola.xpm
+share/WindowMaker/Pixmaps/ColorGNU.xpm
+share/WindowMaker/Pixmaps/Correspondence.dir.xpm
+share/WindowMaker/Pixmaps/CrystalSkull.dir.xpm
+share/WindowMaker/Pixmaps/Daemon.xpm
+share/WindowMaker/Pixmaps/Detergent.dir.xpm
+share/WindowMaker/Pixmaps/DoomII.xpm
+share/WindowMaker/Pixmaps/Draw.xpm
+share/WindowMaker/Pixmaps/EscherCube.xpm
+share/WindowMaker/Pixmaps/EscherTriangle.xpm
+share/WindowMaker/Pixmaps/Fish5.dir.xpm
+share/WindowMaker/Pixmaps/Football.xpm
+share/WindowMaker/Pixmaps/FootballUS.xpm
+share/WindowMaker/Pixmaps/Gear.xpm
+share/WindowMaker/Pixmaps/Ghost.xpm
+share/WindowMaker/Pixmaps/HP-16C-48.xpm
+share/WindowMaker/Pixmaps/HandOpen.xpm
+share/WindowMaker/Pixmaps/HandPointing.xpm
+share/WindowMaker/Pixmaps/HandPointingLeft.xpm
+share/WindowMaker/Pixmaps/HandPunch.xpm
+share/WindowMaker/Pixmaps/HandReach.xpm
+share/WindowMaker/Pixmaps/HeroSandwich.dir.xpm
+share/WindowMaker/Pixmaps/LadyBug48x48.xpm
+share/WindowMaker/Pixmaps/Microphone.xpm
+share/WindowMaker/Pixmaps/Netscape.xpm
+share/WindowMaker/Pixmaps/NewsAgent.xpm
+share/WindowMaker/Pixmaps/PDF.xpm
+share/WindowMaker/Pixmaps/Padlock.xpm
+share/WindowMaker/Pixmaps/Paint.xpm
+share/WindowMaker/Pixmaps/Pencils.24.xpm
+share/WindowMaker/Pixmaps/Penguin.xpm
+share/WindowMaker/Pixmaps/Radio.xpm
+share/WindowMaker/Pixmaps/Reference.xpm
+share/WindowMaker/Pixmaps/Rumi.xpm
+share/WindowMaker/Pixmaps/Snail.xpm
+share/WindowMaker/Pixmaps/T2-Film.xpm
+share/WindowMaker/Pixmaps/TagIcon.xpm
+share/WindowMaker/Pixmaps/TapeIcon1.xpm
+share/WindowMaker/Pixmaps/TrueDie48.xpm
+share/WindowMaker/Pixmaps/WheelbarrowFull.xpm
+share/WindowMaker/Pixmaps/WordEditor.xpm
+share/WindowMaker/Pixmaps/Wrench-12bit.xpm
+share/WindowMaker/Pixmaps/bomb2.xpm
+share/WindowMaker/Pixmaps/inspect.xpm
+share/WindowMaker/Pixmaps/monitor.xpm
+share/WindowMaker/Pixmaps/paint.xpm
+share/WindowMaker/Pixmaps/tile.black.xpm
+share/WindowMaker/Pixmaps/tile.snow.xpm
 share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
+share/WindowMaker/Pixmaps/tile2.xpm
+share/WindowMaker/Pixmaps/xv.xpm
 share/WindowMaker/README
 share/WindowMaker/Styles/Autumn
 share/WindowMaker/Styles/Black
@@ -198,6 +256,7 @@ 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
@@ -225,6 +284,7 @@ share/WindowMaker/menu.se
 share/WindowMaker/menu.tr
 share/WindowMaker/plmenu
 share/WindowMaker/wmmacros
+@exec mkdir -p %B/Sounds
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds