Date: Wed, 28 Apr 1999 15:40:02 -0700 (PDT) From: Brian Handy <handy@lambic.physics.montana.edu> To: freebsd-ports@FreeBSD.org Subject: Re: ports/11358 Message-ID: <199904282240.PAA71261@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/11358; it has been noted by GNATS.
From: Brian Handy <handy@lambic.physics.montana.edu>
To: freebsd-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/11358
Date: Wed, 28 Apr 1999 16:36:00 -0600 (MDT)
Hey all,
The last supplied patch has serious problems. I've fixed a bunch of
stuff:
* Pixmap paths are now done correctly
* Fixed path to WPrefs.app (This, and the previous bullet, take care of
PR# ports/11218. Please close that PR when you close this one.)
* I've harrassed the wmaker people into making USE_BZIP2 a reality:
saving about a quarter of a MB if I read things right
* WindowMaker-data is obsolete, only use WindowMaker-extra now
The supplied patches are against the 0.52.0 port, please disregard the
previous patch.
Thank you,
Brian
--
diff -urN windowmaker.orig/Makefile windowmaker/Makefile
--- windowmaker.orig/Makefile Thu Apr 15 23:22:48 1999
+++ windowmaker/Makefile Wed Apr 28 15:28:18 1999
@@ -1,12 +1,12 @@
# New ports collection makefile for: WindowMaker
-# Version required: 0.52.0
+# Version required: 0.53.0
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
# $Id: Makefile,v 1.49 1999/04/16 05:22:48 taoka Exp $
-DISTNAME= WindowMaker-0.52.0
-PKGNAME= windowmaker-0.52.0
+DISTNAME= WindowMaker-0.53.0
+PKGNAME= windowmaker-0.53.0
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \
http://jgo.local.net/cool_downloads/wm/
@@ -22,6 +22,7 @@
tiff.4:${PORTSDIR}/graphics/tiff34 \
PropList.1:${PORTSDIR}/devel/libPropList
+USE_BZIP2= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \
@@ -35,20 +36,17 @@
MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \
wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
-DATAFILES= WindowMaker-data.tar.gz \
- WindowMaker-extra-0.1.tar.gz
+DATAFILES= WindowMaker-extra-0.1.tar.bz2
post-patch:
- @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
+ @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c \
+ ${WRKSRC}/WindowMaker/Defaults/*
post-configure:
@cd ${WRKDIR}/WindowMaker-extra-0.1; \
./configure --prefix=${PREFIX}
post-install:
- ${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
- ${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
- ${PREFIX}/share/WindowMaker/Pixmaps/
@cd ${WRKDIR}/WindowMaker-extra-0.1; \
${MAKE} ${MAKE_ARGS} install
diff -urN windowmaker.orig/files/md5 windowmaker/files/md5
--- windowmaker.orig/files/md5 Thu Apr 15 23:22:50 1999
+++ windowmaker/files/md5 Wed Apr 28 13:50:55 1999
@@ -1,3 +1,2 @@
-MD5 (WindowMaker-0.52.0.tar.gz) = e79383dd0518db680403c6f758c465c8
-MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
-MD5 (WindowMaker-extra-0.1.tar.gz) = 07c7700daaaf232bc490f5abaabef085
+MD5 (WindowMaker-0.53.0.tar.bz2) = fecdc560c2c2c98aa1783023aaea9c92
+MD5 (WindowMaker-extra-0.1.tar.bz2) = e6fb381da0d207c320f58e7a1fea2a2b
diff -urN windowmaker.orig/patches/patch-ba windowmaker/patches/patch-ba
--- windowmaker.orig/patches/patch-ba Wed Dec 31 17:00:00 1969
+++ windowmaker/patches/patch-ba Wed Apr 28 15:20:23 1999
@@ -0,0 +1,11 @@
+--- WindowMaker/Defaults/WMState.orig Wed Apr 28 15:06:57 1999
++++ WindowMaker/Defaults/WMState Wed Apr 28 15:08:05 1999
+@@ -17,7 +17,7 @@
+ Position = "0,1";
+ },
+ {
+- Command = "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs";
++ Command = "%%PREFIX%%/GNUstep/Apps/WPrefs.app/WPrefs";
+ Name = groupLeader.WPrefs;
+ AutoLaunch = No;
+ Forced = No;
diff -urN windowmaker.orig/patches/patch-bb windowmaker/patches/patch-bb
--- windowmaker.orig/patches/patch-bb Wed Dec 31 17:00:00 1969
+++ windowmaker/patches/patch-bb Wed Apr 28 15:20:41 1999
@@ -0,0 +1,32 @@
+--- WindowMaker/Defaults/WindowMaker.orig Wed Apr 28 15:11:36 1999
++++ WindowMaker/Defaults/WindowMaker Wed Apr 28 15:18:53 1999
+@@ -8,21 +8,19 @@
+ IconificationStyle = Zoom;
+ IconPath = (
+ "~/GNUstep/Library/Icons",
+- "/usr/local/share/WindowMaker/Icons",
+- "/usr/local/share/WindowMaker/Pixmaps",
+- "/usr/X11R6/include/X11/pixmaps",
++ "%%PREFIX%%/share/WindowMaker/Icons",
++ "%%PREFIX%%/share/WindowMaker/Pixmaps",
++ "%%PREFIX%%/include/X11/pixmaps",
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+- "/usr/local/share/pixmaps",
+- "/usr/share/pixmaps"
++ "%%PREFIX%%/share/pixmaps"
+ );
+ PixmapPath = (
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+ "~/GNUstep/Library/WindowMaker/Backgrounds",
+- "/usr/local/share/WindowMaker/Pixmaps",
+- "/usr/local/share/WindowMaker/Backgrounds",
+- "/usr/X11R6/include/X11/pixmaps",
+- "/usr/local/share/pixmaps",
+- "/usr/share/pixmaps"
++ "%%PREFIX%%/share/WindowMaker/Pixmaps",
++ "%%PREFIX%%/share/WindowMaker/Backgrounds",
++ "%%PREFIX%%/include/X11/pixmaps",
++ "%%PREFIX%%/share/pixmaps"
+ );
+ WindowTitleBalloons = YES;
+ IconSize = 64;
diff -urN windowmaker.orig/pkg/PLIST windowmaker/pkg/PLIST
--- windowmaker.orig/pkg/PLIST Thu Apr 15 23:22:52 1999
+++ windowmaker/pkg/PLIST Wed Apr 28 15:50:00 1999
@@ -1,3 +1,8 @@
+etc/WindowMaker/WMRootMenu
+etc/WindowMaker/WMWindowAttributes
+etc/WindowMaker/WindowMaker
+etc/WindowMaker/WMState
+etc/WindowMaker/WMGLOBAL
GNUstep/Apps/WPrefs.app/WPrefs
GNUstep/Apps/WPrefs.app/WPrefs.tiff
GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -268,69 +273,8 @@
share/WindowMaker/Icons/tile.snow.xpm
share/WindowMaker/Icons/tile.xpm
share/WindowMaker/Icons/tile2.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/README.themes
share/WindowMaker/Styles/Autumn.style
@@ -352,6 +296,8 @@
share/WindowMaker/Styles/Gtk.style
share/WindowMaker/Styles/LightBlue.style
share/WindowMaker/Styles/Pastel.style
+share/WindowMaker/Styles/Pink.style
+share/WindowMaker/Styles/Pumpkin.style
share/WindowMaker/Styles/Purple.style
share/WindowMaker/Styles/Red.style
share/WindowMaker/Styles/RednBlue.style
@@ -380,8 +326,8 @@
share/WindowMaker/menu
share/WindowMaker/menu.ca
share/WindowMaker/menu.cz
+share/WindowMaker/menu.da
share/WindowMaker/menu.de
-share/WindowMaker/menu.dk
share/WindowMaker/menu.el
share/WindowMaker/menu.es
share/WindowMaker/menu.fi
@@ -400,11 +346,13 @@
share/WindowMaker/menu.se
share/WindowMaker/menu.sl
share/WindowMaker/menu.tr
+share/WindowMaker/menu.zh_CN
share/WindowMaker/menu.zh_TW.Big5
share/WindowMaker/plmenu
share/WindowMaker/plmenu.dk
share/WindowMaker/plmenu.fr
share/WindowMaker/plmenu.hr
+share/WindowMaker/plmenu.zh_CN
share/WindowMaker/wmmacros
share/WindowMaker/xtree.dat
@exec mkdir -p %B/Sounds
@@ -425,3 +373,4 @@
@dirrm GNUstep/Apps/WPrefs.app
@dirrm GNUstep/Apps
@dirrm GNUstep
+@dirrm etc/WindowMaker
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199904282240.PAA71261>