Subject: pkg/27474: wm/windowmaker update 0.90.0
To: None <gnats-bugs@gnats.NetBSD.org>
From: Francois Briere <fb@peperes.info>
List: pkgsrc-bugs
Date: 10/25/2004 12:33:48
>Number: 27474
>Category: pkg
>Synopsis: update 0.80.2 to 0.90.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Mon Oct 25 16:36:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: Francois Briere
>Release: NetBSD 2.0_RC4
>Organization:
peperes.info
>Environment:
System: NetBSD cthulhu.imaginatif.org 2.0_RC4 NetBSD 2.0_RC4 (GENERIC) #0: Sat Oct 9 14:39:49 CEST 2004 tecneeq@ascent:/home/tecneeq/builds/NetBSD-2.0_RC4-i386-obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
update for wm/windowmaker (0.90.0)
>How-To-Repeat:
A PATCH!
>Fix:
patch -p# < /path/to/patch
--- patch-wmaker-0.90.0.diff begins here ---
Remove this files:
patches/patch-ae
patches/patch-af
patches/patch-ah
Apply the patch: patch -p0 < /path/to/patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 3 Oct 2004 00:18:23 -0000 1.47
+++ Makefile 25 Oct 2004 11:34:32 -0000
@@ -1,16 +1,15 @@
# $NetBSD: Makefile,v 1.47 2004/10/03 00:18:23 tv Exp $
-DISTNAME= WindowMaker-0.80.2
-PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION= 4
-CATEGORIES= x11 wm windowmaker
-MASTER_SITES= ftp://ftp.windowmaker.org/pub/source/release/ \
- ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.windowmaker.org/
-COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone
+DISTNAME= WindowMaker-0.90.0
+PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
+CATEGORIES= x11 wm windowmaker
+MASTER_SITES= ftp://ftp.windowmaker.org/pub/source/release/ \
+ fp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.windowmaker.org/
+COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone
BUILD_USES_MSGFMT= YES
@@ -20,13 +19,15 @@
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
+
CONFIGURE_ARGS+= --enable-usermenu \
--sysconfdir=${PKG_SYSCONFBASEDIR} \
--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
-CONFIGURE_ENV+= LINGUAS=yes
-CONFIGURE_ENV+= CPP_PATH="${CPP}"
+
+CONFIGURE_ENV+= LINGUAS=yes
+CONFIGURE_ENV+= CPP_PATH="${CPP}"
-INSTALL_TARGET= install-strip
+INSTALL_TARGET= install-strip
.include "../../mk/bsd.prefs.mk"
@@ -48,10 +49,9 @@
# kde enable support for kde/kwm window manager hints
# gnome enable support for GNOME window manager hints
# openlook enable support for OPEN LOOK(tm) window manager hints
-# lite remove Window Maker redundancies with KDE and GNOME
-# (this option is broken in WindowMaker 0.65.x)
-#
-WINDOWMAKER_OPTIONS?= gnome kde openlook
+# vdesktop enable support for virtual desktop.
+
+WINDOWMAKER_OPTIONS?= gnome kde openlook vdesktop
BUILD_DEFS+= WINDOWMAKER_OPTIONS
@@ -61,12 +61,12 @@
post-extract:
${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
- ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
- ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
+ ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
+ ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
${WRKSRC}/po/zh_TW.Big5.po
for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
do \
- ${MV} $${manfile} `${ECHO} $${manfile} | ${SED} "s/1x$$/1/"`; \
+ ${MV} $${manfile} `${ECHO} $${manfile} | ${SED} "s/1x$$/1/"`; \
done;
cd ${WRKSRC} && \
for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \
@@ -82,11 +82,11 @@
${TOUCH} ${PREFIX}/share/WindowMaker/Sounds/.directory
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/WindowMaker
cd ${WRKSRC}; ${INSTALL_DATA} \
- README README.GNOME README.KDE README.definable-cursor \
- FAQ FAQ.I18N \
- ${PREFIX}/share/doc/WindowMaker
+ README README.definable-cursor FAQ FAQ.I18N \
+ ${PREFIX}/share/doc/WindowMaker
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/hermes/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- PLIST 22 Sep 2004 08:09:56 -0000 1.9
+++ PLIST 25 Oct 2004 11:34:33 -0000
@@ -1,72 +1,72 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:56 jlam Exp $
-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
-@exec ${MKDIR} %D/GNUstep/Apps/WPrefs.app/xpm
+@comment $NetBSD$
+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
bin/get-wutil-flags
@@ -74,7 +74,6 @@
bin/getstyle
bin/seticons
bin/setstyle
-bin/wcopy
bin/wdread
bin/wdwrite
bin/wkdemenu.pl
@@ -82,11 +81,8 @@
bin/wmagnify
bin/wmaker
bin/wmaker.inst
-bin/wmchlocale
bin/wmsetbg
bin/wmsetup
-bin/wpaste
-bin/wsetfont
bin/wxcopy
bin/wxpaste
include/WINGs/WINGs.h
@@ -102,15 +98,16 @@
lib/libWMaker.a
lib/libWUtil.a
lib/libwraster.la
+lib/pkgconfig/WINGs.pc
+lib/pkgconfig/wmlib.pc
+lib/pkgconfig/wrlib.pc
man/man1/geticonset.1
man/man1/getstyle.1
man/man1/seticons.1
man/man1/setstyle.1
-man/man1/wcopy.1
man/man1/wdwrite.1
man/man1/wmaker.1
man/man1/wmsetbg.1
-man/man1/wsetfont.1
man/man1/wxcopy.1
man/man1/wxpaste.1
man/sk/man1/geticonset.1
@@ -120,7 +117,6 @@
man/sk/man1/wdwrite.1
man/sk/man1/wmaker.1
man/sk/man1/wmsetbg.1
-man/sk/man1/wsetfont.1
man/sk/man1/wxcopy.1
man/sk/man1/wxpaste.1
share/WINGs/Images.tiff
@@ -194,6 +190,7 @@
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
@@ -239,6 +236,11 @@
share/WindowMaker/Themes/OpenStep.style
share/WindowMaker/Themes/Pastel.style
share/WindowMaker/Themes/SteelBlueSilk.style
+share/WindowMaker/WMGLOBAL
+share/WindowMaker/WMRootMenu
+share/WindowMaker/WMState
+share/WindowMaker/WMWindowAttributes
+share/WindowMaker/WindowMaker
share/WindowMaker/autostart.sh
share/WindowMaker/exitscript.sh
share/WindowMaker/menu
@@ -269,7 +271,7 @@
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
@@ -285,22 +287,16 @@
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/doc/WindowMaker/FAQ
share/doc/WindowMaker/FAQ.I18N
share/doc/WindowMaker/README
-share/doc/WindowMaker/README.GNOME
-share/doc/WindowMaker/README.KDE
-share/doc/WindowMaker/README.definable-cursor
-share/examples/WindowMaker/WMGLOBAL
-share/examples/WindowMaker/WMRootMenu
-share/examples/WindowMaker/WMState
-share/examples/WindowMaker/WMWindowAttributes
-share/examples/WindowMaker/WindowMaker
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WINGs.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WPrefs.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WindowMaker.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/WINGs.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WINGs.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WPrefs.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WindowMaker.mo
@@ -311,10 +307,11 @@
${PKGLOCALEDIR}/locale/el/LC_MESSAGES/WindowMaker.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/WPrefs.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/WindowMaker.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/WindowMaker.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/WPrefs.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/WindowMaker.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/WPrefs.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/WindowMaker.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/WINGs.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/WPrefs.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/WindowMaker.mo
${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/WindowMaker.mo
@@ -344,12 +341,9 @@
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/WindowMaker.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WPrefs.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
-@dirrm share/examples/WindowMaker
@dirrm share/doc/WindowMaker
@dirrm share/WindowMaker/Themes
@dirrm share/WindowMaker/Styles
-@dirrm share/WindowMaker/Sounds
-@dirrm share/WindowMaker/SoundSets
@dirrm share/WindowMaker/Pixmaps
@dirrm share/WindowMaker/Icons
@dirrm share/WindowMaker/IconSets
@@ -357,10 +351,7 @@
@dirrm share/WindowMaker
@dirrm share/WINGs
@dirrm man/sk/man1
-@dirrm man/sk
+@dirrm lib/pkgconfig
@dirrm include/WINGs
-@dirrm GNUstep/Apps/WPrefs.app/xpm
-@dirrm GNUstep/Apps/WPrefs.app/tiff
-@dirrm GNUstep/Apps/WPrefs.app
-@dirrm GNUstep/Apps
-@dirrm GNUstep
+@dirrm GNUstep/Applications/WPrefs.app/tiff
+@dirrm GNUstep/Applications/WPrefs.app
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- buildlink3.mk 3 Oct 2004 00:18:23 -0000 1.4
+++ buildlink3.mk 25 Oct 2004 11:34:33 -0000
@@ -12,10 +12,11 @@
.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3
-BUILDLINK_RECOMMENDED.windowmaker+= windowmaker>=0.80.2nb4
+BUILDLINK_RECOMMENDED.windowmaker+= windowmaker>=0.90.0
BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
.endif # WINDOWMAKER_BUILDLINK3_MK
+.include "../../fonts/Xft2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/hermes/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo 8 Jan 2003 19:56:34 -0000 1.18
+++ distinfo 25 Oct 2004 11:34:33 -0000
@@ -1,11 +1,8 @@
$NetBSD: distinfo,v 1.18 2003/01/08 19:56:34 jmmv Exp $
-SHA1 (WindowMaker-0.80.2.tar.bz2) = efc8b3e29f738b44cca6257304ae0951cfd33b43
-Size (WindowMaker-0.80.2.tar.bz2) = 2053988 bytes
-SHA1 (patch-aa) = fdbb341cf48e3496a51589cbd496ca6869d47b87
-SHA1 (patch-ab) = ef1804477a1908e4a53e29bb43cd40399ea0c870
-SHA1 (patch-ac) = e44933c13b86aa11777d929a71add7fb95118d28
-SHA1 (patch-ad) = 040d603c789987f18c6622e12f6044cfae172e15
-SHA1 (patch-ae) = 92abcb4a013b6df1a89f9884780c3d9611056582
-SHA1 (patch-af) = fd60724503f7bc29788be7e72bbe5898ed282c2c
-SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253
+SHA1 (WindowMaker-0.90.0.tar.bz2) = 9207173407f819cfa9ec709e2d51a9d345d06374
+Size (WindowMaker-0.90.0.tar.bz2) = 2196715 bytes
+SHA1 (patch-aa) = 4ce2f9f588c37ded2ee1d8dcae7834a8615ed307
+SHA1 (patch-ab) = 6d1fb177de5b4b3c5e2894f75c70d0a1809a6489
+SHA1 (patch-ac) = 6e38dd63d916aca6180a213cb259abae331dd27b
+SHA1 (patch-ad) = 845684a10b02d194283d29dac5269476304e3f4a
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- patches/patch-aa 25 Dec 2001 15:10:50 -0000 1.7
+++ patches/patch-aa 25 Oct 2004 11:34:33 -0000
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2001/12/25 15:10:50 wiz Exp $
-
---- doc/Makefile.in.orig Tue Dec 18 06:44:16 2001
-+++ doc/Makefile.in
-@@ -97,7 +97,7 @@
+--- doc/Makefile.in.orig 2004-10-24 23:02:00.000000000 -0400
++++ doc/Makefile.in 2004-10-24 23:02:38.000000000 -0400
+@@ -113,7 +113,7 @@
SUBDIRS = sk
--man_MANS = geticonset.1x getstyle.1x seticons.1x setstyle.1x wcopy.1x wdwrite.1x wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x
-+man_MANS = geticonset.1 getstyle.1 seticons.1 setstyle.1 wcopy.1 wdwrite.1 wmaker.1 wmsetbg.1 wsetfont.1 wxcopy.1 wxpaste.1
+-man_MANS = geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
++man_MANS = geticonset.1 getstyle.1 seticons.1 setstyle.1 wdwrite.1 wmaker.1 wmsetbg.1 wxcopy.1 wxpaste.1
EXTRA_DIST = $(man_MANS)
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-ab,v
retrieving revision 1.11
diff -u -r1.11 patch-ab
--- patches/patch-ab 25 Aug 2002 21:50:51 -0000 1.11
+++ patches/patch-ab 25 Oct 2004 11:34:33 -0000
@@ -1,69 +1,11 @@
-$NetBSD: patch-ab,v 1.11 2002/08/25 21:50:51 mjl Exp $
-
---- configure.orig Tue Jul 2 02:37:46 2002
-+++ configure Sun Aug 25 00:59:32 2002
-@@ -9660,43 +9660,18 @@
+--- doc/sk/Makefile.in.orig 2004-10-24 23:05:06.000000000 -0400
++++ doc/sk/Makefile.in 2004-10-24 23:05:39.000000000 -0400
+@@ -112,7 +112,7 @@
+ mandir = @mandir@/sk
-
--supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5"
--supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5"
-+supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN"
-+supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN"
- supported_wings_locales="cs de sk"
-
--for lang in $LINGUAS; do
-- ok=0
-- for l in $supported_locales; do
-- if test "$l" = "$lang"; then
-- ok=1
-- break
-- fi
-- done
-- if test "$ok" = 1; then
-- MOFILES="$MOFILES $lang.mo"
-- else
-- echo "Locale $lang is not supported."
-- fi
-- ok=0
-- for l in $supported_wprefs_locales; do
-- if test "$l" = "$lang"; then
-- ok=1
-- break
-- fi
-- done
-- if test "$ok" = 1; then
-- WPMOFILES="$WPMOFILES $lang.mo"
-- fi
-- ok=0
-- for l in $supported_wings_locales; do
-- if test "$l" = "$lang"; then
-- ok=1
-- break
-- fi
-- done
-- if test "$ok" = 1; then
-- WINGSMOFILES="$WINGSMOFILES $lang.mo"
-- fi
-+for lang in $supported_locales; do
-+ MOFILES="$MOFILES $lang.mo"
-+done
-+for lang in $supported_wprefs_locales; do
-+ WPMOFILES="$WPMOFILES $lang.mo"
-+done
-+for lang in $supported_wings_locales; do
-+ WINGSMOFILES="$WINGSMOFILES $lang.mo"
- done
-
-
-@@ -13432,8 +13407,8 @@
- fi
- fi
-
--LIBRARY_SEARCH_PATH="$lib_search_path"
--HEADER_SEARCH_PATH="$inc_search_path"
-+LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
-+HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
-
+-man_MANS = geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
++man_MANS = geticonset.1 setstyle.1 wxpaste.1 getstyle.1 wdwrite.1 wmsetbg.1 seticons.1 wmaker.1 wxcopy.1
+ EXTRA_DIST = $(man_MANS)
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-ac,v
retrieving revision 1.5
diff -u -r1.5 patch-ac
--- patches/patch-ac 25 Dec 2001 15:10:50 -0000 1.5
+++ patches/patch-ac 25 Oct 2004 11:34:33 -0000
@@ -1,13 +1,11 @@
-$NetBSD: patch-ac,v 1.5 2001/12/25 15:10:50 wiz Exp $
-
---- wrlib/Makefile.in.orig Tue Dec 18 06:44:16 2001
-+++ wrlib/Makefile.in
-@@ -99,7 +99,7 @@
+--- WindowMaker/Defaults/Makefile.in.orig 2004-10-24 23:06:46.000000000 -0400
++++ WindowMaker/Defaults/Makefile.in 2004-10-24 23:06:58.000000000 -0400
+@@ -111,7 +111,7 @@
+ supported_locales = @supported_locales@
+ wprefsdir = @wprefsdir@
- lib_LTLIBRARIES = libwraster.la
+-defsdatadir = $(sysconfdir)/WindowMaker
++defsdatadir = $(datadir)/WindowMaker
--libwraster_la_LDFLAGS = -version-info 4:0:2
-+libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info 4:0:2
-
- bin_SCRIPTS = get-wraster-flags
+ defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-ad,v
retrieving revision 1.7
diff -u -r1.7 patch-ad
--- patches/patch-ad 5 Oct 2001 12:18:58 -0000 1.7
+++ patches/patch-ad 25 Oct 2004 11:34:33 -0000
@@ -1,25 +1,70 @@
-$NetBSD: patch-ad,v 1.7 2001/10/05 12:18:58 wiz Exp $
-
---- src/main.c.orig Thu Oct 4 13:39:18 2001
-+++ src/main.c Fri Oct 5 14:02:59 2001
-@@ -28,6 +28,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <fcntl.h>
-+#include <signal.h>
-
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-@@ -235,6 +236,12 @@
- {
- char *tmp, *ptr;
- char buf[16];
-+ struct sigaction sa;
-+
-+ sa.sa_handler = SIG_DFL;
-+ sigemptyset(&sa.sa_mask);
-+ /* sa.sa_mask = 0; */
-+ sigaction(SIGPIPE, &sa, NULL);
+--- configure.orig 2004-10-25 07:02:50.000000000 -0400
++++ configure 2004-10-25 07:05:51.000000000 -0400
+@@ -21591,46 +21591,21 @@
+
+
+
+-supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5"
+-supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5"
++supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN"
++supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN"
+ supported_wings_locales="bg ca cs de fr sk"
+
+-for lang in $LINGUAS; do
+- ok=0
+- for l in $supported_locales; do
+- if test "$l" = "$lang"; then
+- ok=1
+- break
+- fi
+- done
+- if test "$ok" = 1; then
+- MOFILES="$MOFILES $lang.mo"
+- else
+- echo "Locale $lang is not supported."
+- fi
+- ok=0
+- for l in $supported_wprefs_locales; do
+- if test "$l" = "$lang"; then
+- ok=1
+- break
+- fi
+- done
+- if test "$ok" = 1; then
+- WPMOFILES="$WPMOFILES $lang.mo"
+- fi
+- ok=0
+- for l in $supported_wings_locales; do
+- if test "$l" = "$lang"; then
+- ok=1
+- break
+- fi
+- done
+- if test "$ok" = 1; then
+- WINGSMOFILES="$WINGSMOFILES $lang.mo"
+- fi
++for lang in $supported_locales; do
++ MOFILES="$MOFILES $lang.mo"
+ done
+
++for lang in $supported_wprefs_locales; do
++ WPMOFILES="$WPMOFILES $lang.mo"
++done
+
++for lang in $supported_wings_locales; do
++ WINGSMOFILES="$WINGSMOFILES $lang.mo"
++done
+
+ case $host_os in
+ freebsd*)
+@@ -26029,8 +26004,8 @@
+ fi
+ fi
+
+-LIBRARY_SEARCH_PATH="$lib_search_path"
+-HEADER_SEARCH_PATH="$inc_search_path"
++LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
++HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
+
+
- if (multiHead) {
- int len = strlen(DisplayName)+64;
--- patch-wmaker-0.90.0.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: