From dce3b3662818c0a97d39dd9bc85fe903545b9aeb Mon Sep 17 00:00:00 2001 From: jasoni Date: Fri, 19 Jan 2001 03:44:51 +0000 Subject: [PATCH] update to 0.63.1 --- x11/windowmaker/files/md5 | 6 +-- .../patches/patch-util_wmaker.inst.in | 24 +++++++++++ .../patches/patch-wrlib_Makefile.in | 10 ++--- x11/windowmaker/pkg/PFRAG.shared | 6 +-- x11/windowmaker/pkg/PLIST | 40 ++++++++++++++++--- 5 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 x11/windowmaker/patches/patch-util_wmaker.inst.in diff --git a/x11/windowmaker/files/md5 b/x11/windowmaker/files/md5 index 923ff029e32..e06bbdc9693 100644 --- a/x11/windowmaker/files/md5 +++ b/x11/windowmaker/files/md5 @@ -1,6 +1,6 @@ -MD5 (WindowMaker-0.62.1.tar.gz) = 058fb8a36a1c25b3d70b78d053c114ae +MD5 (WindowMaker-0.63.1.tar.gz) = 04c9570df9d80d3541f0babed73b0cc2 MD5 (WindowMaker-extra-0.1.tar.gz) = 07c7700daaaf232bc490f5abaabef085 -RMD160 (WindowMaker-0.62.1.tar.gz) = 3a07323900d249a66849dc787653ebf005d9c6d8 +RMD160 (WindowMaker-0.63.1.tar.gz) = 0809311cef2d2c3e7a36a179cb08bd2098f31ecc RMD160 (WindowMaker-extra-0.1.tar.gz) = 94334c2c12d20a8fd0cd2a70e54cd3689f043038 -SHA1 (WindowMaker-0.62.1.tar.gz) = a60dc6059b314f79f961825f928777838c461950 +SHA1 (WindowMaker-0.63.1.tar.gz) = 6a64afbe1ae07ff3764543f6548110be68a1bfa7 SHA1 (WindowMaker-extra-0.1.tar.gz) = 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 diff --git a/x11/windowmaker/patches/patch-util_wmaker.inst.in b/x11/windowmaker/patches/patch-util_wmaker.inst.in new file mode 100644 index 00000000000..b8e4545d643 --- /dev/null +++ b/x11/windowmaker/patches/patch-util_wmaker.inst.in @@ -0,0 +1,24 @@ +--- util/wmaker.inst.in 2001/01/08 01:41:27 1.1 ++++ util/wmaker.inst.in 2001/01/08 01:48:25 +@@ -65,12 +65,18 @@ + elif [ "$file" = "WMRootMenu" ]; then + if [ "$LOCALE" ]; then + if [ -f $GLOBALDIR/plmenu.${LOCALE%_*} ]; then +- cp $GLOBALDIR/plmenu.${LOCALE%_*} $GSDIR/Defaults/WMRootMenu ++ sed -e "s|\$HOME/GNUstep|$GSDIR|g" \ ++ -e "s:#wmdatadir#:$GLOBALDIR:g" \ ++ $GLOBALDIR/plmenu.${LOCALE%_*} > $GSDIR/Defaults/WMRootMenu + else +- cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu ++ sed -e "s|\$HOME/GNUstep|$GSDIR|g" \ ++ -e "s:#wmdatadir#:$GLOBALDIR:g" \ ++ $GLOBALDIR/plmenu > $GSDIR/Defaults/WMRootMenu + fi + else +- cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu ++ sed -e "s|\$HOME/GNUstep|$GSDIR|g" \ ++ -e "s:#wmdatadir#:$GLOBALDIR:g" \ ++ $GLOBALDIR/plmenu > $GSDIR/Defaults/WMRootMenu + fi + else + if test "x$GNUSTEP_USER_ROOT" = "x"; then diff --git a/x11/windowmaker/patches/patch-wrlib_Makefile.in b/x11/windowmaker/patches/patch-wrlib_Makefile.in index 3537ca3c888..be640252403 100644 --- a/x11/windowmaker/patches/patch-wrlib_Makefile.in +++ b/x11/windowmaker/patches/patch-wrlib_Makefile.in @@ -1,6 +1,6 @@ ---- wrlib/Makefile.in.orig Sun Apr 2 16:29:40 2000 -+++ wrlib/Makefile.in Sun Apr 2 16:30:10 2000 -@@ -105,7 +105,7 @@ +--- wrlib/Makefile.in.orig Sat Jan 6 17:22:01 2001 ++++ wrlib/Makefile.in Thu Jan 18 20:39:05 2001 +@@ -106,7 +106,7 @@ EXTRA_DIST = test.png tile.xpm ballot_box.xpm include_HEADERS = wraster.h @@ -9,7 +9,7 @@ LTCOMPILE2 = `echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//` -@@ -148,7 +148,7 @@ +@@ -149,7 +149,7 @@ libwraster_la_DEPENDENCIES = @ALLOCA@ libwraster_la_OBJECTS = LookupCmap.lo StdCmap.lo CrCmap.lo DelCmap.lo \ CmapAlloc.lo raster.lo draw.lo color.lo load.lo save.lo gradient.lo \ @@ -18,7 +18,7 @@ rotate.lo convolve.lo nxpm.lo xpm.lo xutil.lo ppm.lo png.lo jpeg.lo \ tiff.lo gif.lo PROGRAMS = $(noinst_PROGRAMS) -@@ -449,11 +449,11 @@ +@@ -450,11 +450,11 @@ # cant compile asm stuff with optimizations diff --git a/x11/windowmaker/pkg/PFRAG.shared b/x11/windowmaker/pkg/PFRAG.shared index 81846737bfa..9b0e2198456 100644 --- a/x11/windowmaker/pkg/PFRAG.shared +++ b/x11/windowmaker/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1 2000/07/20 06:02:05 brad Exp $ -lib/libwraster.so.2.0 -DYNLIBDIR(%B) +@comment $OpenBSD: PFRAG.shared,v 1.2 2001/01/19 03:44:51 jasoni Exp $ +lib/libwraster.so.2.1 +DYNLIBDIR(%D/lib) diff --git a/x11/windowmaker/pkg/PLIST b/x11/windowmaker/pkg/PLIST index 6582e2e5b34..ae40ac48000 100644 --- a/x11/windowmaker/pkg/PLIST +++ b/x11/windowmaker/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.19 2000/08/18 21:36:31 jasoni Exp $ +@comment $OpenBSD: PLIST,v 1.20 2001/01/19 03:44:51 jasoni Exp $ GNUstep/Apps/WPrefs.app/WPrefs GNUstep/Apps/WPrefs.app/WPrefs.tiff GNUstep/Apps/WPrefs.app/WPrefs.xpm @@ -76,23 +76,27 @@ bin/setstyle bin/wdwrite bin/wkdemenu.pl bin/wm-oldmenu2new +bin/wmagnify bin/wmaker bin/wmaker.inst bin/wmsetbg +bin/wmsetup bin/wsetfont bin/wxcopy bin/wxpaste -include/WINGs.h -include/WINGsP.h +include/WINGs/WINGs.h +include/WINGs/WINGsP.h +include/WINGs/WUtil.h +include/WINGs/wtabledelegates.h +include/WINGs/wtableview.h include/WMaker.h -include/WUtil.h include/wraster.h +lib/libExtraWINGs.a lib/libWINGs.a lib/libWMaker.a lib/libWUtil.a lib/libwraster.a lib/libwraster.la -%%SHARED%% man/man1/geticonset.1x man/man1/getstyle.1x man/man1/seticons.1x @@ -141,6 +145,7 @@ share/WindowMaker/Icons/EscherTriangle.xpm share/WindowMaker/Icons/Fish5.dir.xpm share/WindowMaker/Icons/Football.xpm share/WindowMaker/Icons/FootballUS.xpm +share/WindowMaker/Icons/Ftp.png share/WindowMaker/Icons/GNUstep.tiff share/WindowMaker/Icons/GNUstep.xpm share/WindowMaker/Icons/GNUstep3D.tiff @@ -151,6 +156,7 @@ share/WindowMaker/Icons/GNUterm.tiff share/WindowMaker/Icons/GNUterm.xpm share/WindowMaker/Icons/Gear.xpm share/WindowMaker/Icons/Ghost.xpm +share/WindowMaker/Icons/GreenWilber.png share/WindowMaker/Icons/HP-16C-48.xpm share/WindowMaker/Icons/HandOpen.xpm share/WindowMaker/Icons/HandPointing.xpm @@ -158,19 +164,27 @@ share/WindowMaker/Icons/HandPointingLeft.xpm share/WindowMaker/Icons/HandPunch.xpm share/WindowMaker/Icons/HandReach.xpm share/WindowMaker/Icons/HeroSandwich.dir.xpm +share/WindowMaker/Icons/ICQ.png share/WindowMaker/Icons/LadyBug48x48.xpm share/WindowMaker/Icons/Microphone.xpm +share/WindowMaker/Icons/Mozilla.png +share/WindowMaker/Icons/Netscape.png share/WindowMaker/Icons/Netscape.xpm share/WindowMaker/Icons/NewsAgent.xpm share/WindowMaker/Icons/PDF.xpm share/WindowMaker/Icons/Padlock.xpm share/WindowMaker/Icons/Paint.xpm +share/WindowMaker/Icons/Pen.png +share/WindowMaker/Icons/Pencil.png share/WindowMaker/Icons/Pencils.24.xpm share/WindowMaker/Icons/Penguin.xpm share/WindowMaker/Icons/Radio.xpm +share/WindowMaker/Icons/Real.png share/WindowMaker/Icons/Reference.xpm share/WindowMaker/Icons/Rumi.xpm +share/WindowMaker/Icons/Shell.png share/WindowMaker/Icons/Snail.xpm +share/WindowMaker/Icons/Speaker.png share/WindowMaker/Icons/T2-Film.xpm share/WindowMaker/Icons/TagIcon.xpm share/WindowMaker/Icons/TapeIcon1.xpm @@ -184,6 +198,7 @@ share/WindowMaker/Icons/TrueDie48.xpm share/WindowMaker/Icons/WheelbarrowFull.xpm share/WindowMaker/Icons/WordEditor.xpm share/WindowMaker/Icons/Wrench-12bit.xpm +share/WindowMaker/Icons/XChat.png share/WindowMaker/Icons/bomb2.xpm share/WindowMaker/Icons/clip.tiff share/WindowMaker/Icons/clip.xpm @@ -251,7 +266,11 @@ share/WindowMaker/Styles/Golden.style share/WindowMaker/Styles/Green.style share/WindowMaker/Styles/GreyBlue.style share/WindowMaker/Styles/Gtk.style +share/WindowMaker/Styles/IRednBlue.style +share/WindowMaker/Styles/Interlace.style share/WindowMaker/Styles/LightBlue.style +share/WindowMaker/Styles/NewBlue.style +share/WindowMaker/Styles/NightSky.style share/WindowMaker/Styles/Pastel.style share/WindowMaker/Styles/Pink.style share/WindowMaker/Styles/Pumpkin.style @@ -283,6 +302,7 @@ share/WindowMaker/Themes/SteelBlueSilk.style share/WindowMaker/autostart.sh share/WindowMaker/exitscript.sh share/WindowMaker/menu +share/WindowMaker/menu.bg share/WindowMaker/menu.ca share/WindowMaker/menu.cz share/WindowMaker/menu.da @@ -302,6 +322,7 @@ share/WindowMaker/menu.nl share/WindowMaker/menu.no share/WindowMaker/menu.pl share/WindowMaker/menu.pt +share/WindowMaker/menu.ro share/WindowMaker/menu.ru share/WindowMaker/menu.se share/WindowMaker/menu.sl @@ -309,17 +330,21 @@ share/WindowMaker/menu.tr share/WindowMaker/menu.zh_CN share/WindowMaker/menu.zh_TW.Big5 share/WindowMaker/plmenu +share/WindowMaker/plmenu.bg share/WindowMaker/plmenu.da share/WindowMaker/plmenu.de +share/WindowMaker/plmenu.es share/WindowMaker/plmenu.fi share/WindowMaker/plmenu.fr share/WindowMaker/plmenu.hr share/WindowMaker/plmenu.it share/WindowMaker/plmenu.ko share/WindowMaker/plmenu.pl +share/WindowMaker/plmenu.ro share/WindowMaker/plmenu.zh_CN share/WindowMaker/wmmacros share/WindowMaker/xtree.dat +%%SHARED%% @dirrm share/WindowMaker/Themes/STEP2000.themed @dirrm share/WindowMaker/Themes/Night.themed @dirrm share/WindowMaker/Themes/LeetWM.themed @@ -334,6 +359,11 @@ share/WindowMaker/xtree.dat @dirrm share/WindowMaker/Backgrounds @dirrm share/WindowMaker @dirrm share/WINGs +@exec mkdir -p %D/lib/locale +@dirrm lib/locale +@dirrm include/WINGs +@exec mkdir -p %D/GNUstep/Apps/WPrefs.app/xpm +@dirrm GNUstep/Apps/WPrefs.app/xpm @dirrm GNUstep/Apps/WPrefs.app/tiff @dirrm GNUstep/Apps/WPrefs.app @dirrm GNUstep/Apps