From owner-freebsd-ports Mon Apr 5 18:52: 1 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id CD08715551 for ; Mon, 5 Apr 1999 18:51:57 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id SAA00680; Mon, 5 Apr 1999 18:50:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from lambic.physics.montana.edu (lambic.physics.montana.edu [153.90.192.128]) by hub.freebsd.org (Postfix) with ESMTP id D1F821555B for ; Mon, 5 Apr 1999 18:43:07 -0700 (PDT) (envelope-from handy@lambic.physics.montana.edu) Received: (from handy@localhost) by lambic.physics.montana.edu (8.8.8/8.8.7) id TAA05405; Mon, 5 Apr 1999 19:41:05 -0600 (MDT) (envelope-from handy) Message-Id: <199904060141.TAA05405@lambic.physics.montana.edu> Date: Mon, 5 Apr 1999 19:41:05 -0600 (MDT) From: handy@physics.montana.edu Reply-To: handy@physics.montana.edu To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/10975: Window Maker upgrade: 0.52.0 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10975 >Category: ports >Synopsis: Window Maker upgrade: 0.52.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 5 18:50:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Brian Handy >Release: FreeBSD 2.2.8-STABLE i386 >Organization: MSU - Bozeman >Environment: Ported on a 2.2.8 box, but hell...might work anywhere. >Description: Window Maker upgrade. To confuse the issue, they've ripped the generic themes and a bunch of Icons out of the main distro and put them in a separate "WindowMaker-extra-0.1.tar.gz" file. I've looked at this, and I think it's a stupid idea: we now have a source file, a data file, and an 'extras' file, and the latter two don't get installed in the same manner. Sigh. If the committer-to-be would review my kludges to do this, I'd be most appreciative. A simple problem, but I'm at a loss for the best way to approach it. I wouldn't be surprised if this disappears before too long. >How-To-Repeat: >Fix: diff -urN windowmaker.orig/Makefile windowmaker/Makefile --- windowmaker.orig/Makefile Sun Mar 21 19:44:55 1999 +++ windowmaker/Makefile Mon Apr 5 19:17:11 1999 @@ -1,12 +1,12 @@ # New ports collection makefile for: WindowMaker -# Version required: 0.51.2 +# Version required: 0.52.0 # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # # $Id: Makefile,v 1.48 1999/03/22 02:44:55 steve Exp $ -DISTNAME= WindowMaker-0.51.2 -PKGNAME= windowmaker-0.51.2 +DISTNAME= WindowMaker-0.52.0 +PKGNAME= windowmaker-0.52.0 CATEGORIES= x11-wm windowmaker MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \ http://jgo.local.net/cool_downloads/wm/ @@ -35,14 +35,21 @@ MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x -DATAFILES= WindowMaker-data.tar.gz +DATAFILES= WindowMaker-data.tar.gz \ + WindowMaker-extra-0.1.tar.gz post-patch: @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c +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 .include diff -urN windowmaker.orig/files/md5 windowmaker/files/md5 --- windowmaker.orig/files/md5 Sun Mar 21 19:44:58 1999 +++ windowmaker/files/md5 Mon Apr 5 19:10:37 1999 @@ -1,2 +1,3 @@ -MD5 (WindowMaker-0.51.2.tar.gz) = 041b07bf4771cc91bc8ddd29d2a392a2 +MD5 (WindowMaker-0.52.0.tar.gz) = e79383dd0518db680403c6f758c465c8 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82 +MD5 (WindowMaker-extra-0.1.tar.gz) = 07c7700daaaf232bc490f5abaabef085 diff -urN windowmaker.orig/pkg/PLIST windowmaker/pkg/PLIST --- windowmaker.orig/pkg/PLIST Sun Mar 21 19:44:58 1999 +++ windowmaker/pkg/PLIST Mon Apr 5 19:25:07 1999 @@ -158,55 +158,116 @@ share/WINGs/defaultIcon.xpm share/WindowMaker/Backgrounds/BlueImage.jpeg share/WindowMaker/IconSets/Default.iconset +share/WindowMaker/Icons/BitchX.tiff +share/WindowMaker/Icons/DefaultAppIcon.tiff +share/WindowMaker/Icons/GNUstep.tiff +share/WindowMaker/Icons/GNUstep3D.tiff +share/WindowMaker/Icons/GNUstepGlow.tiff +share/WindowMaker/Icons/GNUterm.tiff share/WindowMaker/Icons/clip.tiff -share/WindowMaker/Icons/clip.xpm share/WindowMaker/Icons/clip2.tiff -share/WindowMaker/Icons/clip2.xpm share/WindowMaker/Icons/defaultAppIcon.tiff -share/WindowMaker/Icons/defaultAppIcon.xpm share/WindowMaker/Icons/defaultterm.tiff -share/WindowMaker/Icons/defaultterm.xpm share/WindowMaker/Icons/draw.tiff -share/WindowMaker/Icons/draw.xpm share/WindowMaker/Icons/linuxterm.tiff -share/WindowMaker/Icons/linuxterm.xpm share/WindowMaker/Icons/mixer.tiff -share/WindowMaker/Icons/mixer.xpm share/WindowMaker/Icons/notepad.tiff -share/WindowMaker/Icons/notepad.xpm share/WindowMaker/Icons/pdf.tiff -share/WindowMaker/Icons/pdf.xpm share/WindowMaker/Icons/ps.tiff -share/WindowMaker/Icons/ps.xpm share/WindowMaker/Icons/real.tiff -share/WindowMaker/Icons/real.xpm share/WindowMaker/Icons/sgiterm.tiff -share/WindowMaker/Icons/sgiterm.xpm share/WindowMaker/Icons/sound.tiff -share/WindowMaker/Icons/sound.xpm share/WindowMaker/Icons/staroffice2.tiff -share/WindowMaker/Icons/staroffice2.xpm share/WindowMaker/Icons/timer.tiff -share/WindowMaker/Icons/timer.xpm -share/WindowMaker/Icons/xv.tiff -share/WindowMaker/Icons/xv.xpm share/WindowMaker/Icons/wilber.tiff -share/WindowMaker/Icons/wilber.xpm share/WindowMaker/Icons/write.tiff -share/WindowMaker/Icons/write.xpm share/WindowMaker/Icons/xdvi.tiff -share/WindowMaker/Icons/xdvi.xpm -share/WindowMaker/Icons/BitchX.tiff +share/WindowMaker/Icons/xv.tiff share/WindowMaker/Icons/BitchX.xpm -share/WindowMaker/Icons/DefaultAppIcon.tiff -share/WindowMaker/Icons/GNUstep.tiff share/WindowMaker/Icons/GNUstep.xpm -share/WindowMaker/Icons/GNUstepGlow.tiff -share/WindowMaker/Icons/GNUstepGlow.xpm -share/WindowMaker/Icons/GNUstep3D.tiff share/WindowMaker/Icons/GNUstep3D.xpm -share/WindowMaker/Icons/GNUterm.tiff +share/WindowMaker/Icons/GNUstepGlow.xpm share/WindowMaker/Icons/GNUterm.xpm +share/WindowMaker/Icons/clip.xpm +share/WindowMaker/Icons/clip2.xpm +share/WindowMaker/Icons/defaultAppIcon.xpm +share/WindowMaker/Icons/defaultterm.xpm +share/WindowMaker/Icons/draw.xpm +share/WindowMaker/Icons/linuxterm.xpm +share/WindowMaker/Icons/mixer.xpm +share/WindowMaker/Icons/notepad.xpm +share/WindowMaker/Icons/pdf.xpm +share/WindowMaker/Icons/ps.xpm +share/WindowMaker/Icons/real.xpm +share/WindowMaker/Icons/sgiterm.xpm +share/WindowMaker/Icons/sound.xpm +share/WindowMaker/Icons/staroffice2.xpm +share/WindowMaker/Icons/timer.xpm +share/WindowMaker/Icons/xv.xpm +share/WindowMaker/Icons/wilber.xpm +share/WindowMaker/Icons/write.xpm +share/WindowMaker/Icons/xdvi.xpm +share/WindowMaker/Icons/Ant.xpm +share/WindowMaker/Icons/Antennae.xpm +share/WindowMaker/Icons/Bee48x48.xpm +share/WindowMaker/Icons/Beer.xpm +share/WindowMaker/Icons/Bird.xpm +share/WindowMaker/Icons/Book.xpm +share/WindowMaker/Icons/Bookshelf.xpm +share/WindowMaker/Icons/Brain.xpm +share/WindowMaker/Icons/BulletHole.xpm +share/WindowMaker/Icons/CashRegister.xpm +share/WindowMaker/Icons/Clipboard.xpm +share/WindowMaker/Icons/Cola.xpm +share/WindowMaker/Icons/ColorGNU.xpm +share/WindowMaker/Icons/Correspondence.dir.xpm +share/WindowMaker/Icons/CrystalSkull.dir.xpm +share/WindowMaker/Icons/Daemon.xpm +share/WindowMaker/Icons/Detergent.dir.xpm +share/WindowMaker/Icons/DoomII.xpm +share/WindowMaker/Icons/Draw.xpm +share/WindowMaker/Icons/EscherCube.xpm +share/WindowMaker/Icons/EscherTriangle.xpm +share/WindowMaker/Icons/Fish5.dir.xpm +share/WindowMaker/Icons/Football.xpm +share/WindowMaker/Icons/FootballUS.xpm +share/WindowMaker/Icons/Gear.xpm +share/WindowMaker/Icons/Ghost.xpm +share/WindowMaker/Icons/HP-16C-48.xpm +share/WindowMaker/Icons/HandOpen.xpm +share/WindowMaker/Icons/HandPointing.xpm +share/WindowMaker/Icons/HandPointingLeft.xpm +share/WindowMaker/Icons/HandPunch.xpm +share/WindowMaker/Icons/HandReach.xpm +share/WindowMaker/Icons/HeroSandwich.dir.xpm +share/WindowMaker/Icons/LadyBug48x48.xpm +share/WindowMaker/Icons/Microphone.xpm +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/Pencils.24.xpm +share/WindowMaker/Icons/Penguin.xpm +share/WindowMaker/Icons/Radio.xpm +share/WindowMaker/Icons/Reference.xpm +share/WindowMaker/Icons/Rumi.xpm +share/WindowMaker/Icons/Snail.xpm +share/WindowMaker/Icons/T2-Film.xpm +share/WindowMaker/Icons/TagIcon.xpm +share/WindowMaker/Icons/TapeIcon1.xpm +share/WindowMaker/Icons/TrueDie48.xpm +share/WindowMaker/Icons/WheelbarrowFull.xpm +share/WindowMaker/Icons/WordEditor.xpm +share/WindowMaker/Icons/Wrench-12bit.xpm +share/WindowMaker/Icons/bomb2.xpm +share/WindowMaker/Icons/inspect.xpm +share/WindowMaker/Icons/monitor.xpm +share/WindowMaker/Icons/paint.xpm +share/WindowMaker/Icons/tile.black.xpm +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 @@ -341,6 +402,7 @@ share/WindowMaker/menu.tr share/WindowMaker/menu.zh_TW.Big5 share/WindowMaker/plmenu +share/WindowMaker/plmenu.dk share/WindowMaker/plmenu.fr share/WindowMaker/plmenu.hr share/WindowMaker/wmmacros >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message