From owner-freebsd-ports Mon Sep 27 14:10:13 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 425E615648 for ; Mon, 27 Sep 1999 14:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA89010; Mon, 27 Sep 1999 14:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from germanium.xtalwind.net (germanium.xtalwind.net [205.160.242.5]) by hub.freebsd.org (Postfix) with ESMTP id C016014E34 for ; Mon, 27 Sep 1999 14:02:43 -0700 (PDT) (envelope-from jack@germanium.xtalwind.net) Received: (from jack@localhost) by germanium.xtalwind.net (8.9.3/8.9.3) id RAA03154; Mon, 27 Sep 1999 17:02:39 -0400 (EDT) Message-Id: <199909272102.RAA03154@germanium.xtalwind.net> Date: Mon, 27 Sep 1999 17:02:39 -0400 (EDT) From: jack@germanium.xtalwind.net Reply-To: jack@germanium.xtalwind.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/14002: Update of afterstep-devel to patch level 07 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14002 >Category: ports >Synopsis: Update of afterstep-devel to patch level 07 >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 Sep 27 14:10:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: >Release: FreeBSD 3.3-STABLE i386 >Organization: >Environment: >Description: Update afterstep-devel port to patch level 07 (1.7.149) Add a few configure knobs to port Makefile Don't install man pages twice Update PLIST s/xiterm/xterm/ s/that ugly penguin/Chuck/ >How-To-Repeat: >Fix: diff -ruN afterstep-devel.orig/Makefile afterstep-devel/Makefile --- afterstep-devel.orig/Makefile Tue Sep 21 01:37:10 1999 +++ afterstep-devel/Makefile Mon Sep 27 16:05:47 1999 @@ -7,18 +7,34 @@ # DISTNAME= AfterStep-1.7.142 -PKGNAME= afterstep-1.7.142 +PKGNAME= afterstep-1.7.149 CATEGORIES= x11-wm afterstep MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= devel/snapshots +PATCH_SITES= \ + ftp://ftp.afterstep.org/devel/patches/ \ + ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/ \ + ftp://ftp.alpha1.net/pub/mirrors/ftp.afterstep.org/devel/patches/ \ + ftp://ftp.math.uni-bonn.de/pub/mirror/ftp.afterstep.org/pub/devel/patches/ \ + ftp://ftp.dti.ad.jp/pub/X/AfterStep/devel/patches/ \ + ftp://casper.yz.yamagata-u.ac.jp/pub/X11/apps/afterstep/devel/patches/ +PATCHFILES= \ + 1.7.142-01-sasha-png_jpg_warnings.patch.gz \ + 1.7.142-02-tildouf-wharf_transient_and_Audio_fix.patch.gz \ + 1.7.142-03-allanon-icons_and_wharf.patch.gz \ + 1.7.142-04-allanon-desk_and_shaped_icons_and_wharf_reswallow.patch.gz \ + 1.7.142-05-allanon-desks_and_wharf.patch.gz \ + 1.7.142-06-sasha-menus_and_more.patch.gz \ + 1.7.142-07-sasha-winfunctions_scroll.patch.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -INSTALL_TARGET= install install.man MAN1= Animate.1x Audio.1x Auto.1x Banner.1x Cascade.1x Clean.1x \ Form.1x Gnome.1x Ident.1x Pager.1x Save.1x Script.1x Scroll.1x \ Tile.1x Wharf.1x WinList.1x Zharf.1x afterstep.1x asetroot.1x @@ -29,11 +45,28 @@ CONFIGURE_ARGS= --with-png-includes="${LOCALBASE}/include" \ --with-png-libs="${LOCALBASE}/lib" \ --with-jpeg-includes="${LOCALBASE}/include" \ - --with-jpeg-libs="${LOCALBASE}/lib" + --with-jpeg-libs="${LOCALBASE}/lib" \ + --with-helpcommand="xterm -e man" .if defined(USE_I18N) CONFIGURE_ENV+= X_EXTRA_LIBS="-lxpg4" CONFIGURE_ARGS+= --enable-i18n +.endif + +.if defined(DIFFERENT_LOOKNFEELS) +CONFIGURE_ARGS+= --enable-different-looknfeels +.endif + +.if defined(NO_SAVEWINDOWS) +CONFIGURE_ARGS+= --disable-savewindows +.endif + +post-install: + ${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${PREFIX}/share/afterstep/desktop/icons/common/ +.if defined(DIFFERENT_LOOKNFEELS) + @${ECHO_MSG} + @${ECHO_MSG} "===> The WinList module is broken with different-looknfeels. Don't use it." + @${ECHO_MSG} .endif .include diff -ruN afterstep-devel.orig/files/md5 afterstep-devel/files/md5 --- afterstep-devel.orig/files/md5 Wed Sep 8 19:31:39 1999 +++ afterstep-devel/files/md5 Mon Sep 27 11:15:03 1999 @@ -1 +1,8 @@ MD5 (AfterStep-1.7.142.tar.bz2) = 7378c78b10025b1a313ab1c7dad079dd +MD5 (1.7.142-01-sasha-png_jpg_warnings.patch.gz) = c49f966792fbb1ae1b13e553ec08c69e +MD5 (1.7.142-02-tildouf-wharf_transient_and_Audio_fix.patch.gz) = 6c14c7c38594ab3ab931d63bded391cd +MD5 (1.7.142-03-allanon-icons_and_wharf.patch.gz) = 7766e9273411c2471b744ff629354247 +MD5 (1.7.142-04-allanon-desk_and_shaped_icons_and_wharf_reswallow.patch.gz) = f8a0eb3e3cbdf560f0141be212c42f51 +MD5 (1.7.142-05-allanon-desks_and_wharf.patch.gz) = 8de347561133316be76d436ef58aa2b3 +MD5 (1.7.142-06-sasha-menus_and_more.patch.gz) = a67b96a04fceaf8628747ef4fc37b5d9 +MD5 (1.7.142-07-sasha-winfunctions_scroll.patch.gz) = 4fee86b0e52416989051994cdf87ff7f diff -ruN afterstep-devel.orig/patches/patch-ao afterstep-devel/patches/patch-ao --- afterstep-devel.orig/patches/patch-ao Wed Dec 31 19:00:00 1969 +++ afterstep-devel/patches/patch-ao Mon Sep 27 12:09:06 1999 @@ -0,0 +1,11 @@ +--- afterstep/wharf.in.orig Wed Mar 17 03:40:15 1999 ++++ afterstep/wharf.in Mon Sep 27 11:58:51 1999 +@@ -105,7 +105,7 @@ + # + *Wharf Applications FileFolders.xpm,3_dots.xpm Folders + #*Wharf Files Computer.xpm Exec "-" Files & +- *Wharf xiterm linux-penguin.xpm Exec "-" xiterm -sl 500 -vb -fn 10x20 & ++ *Wharf xterm monitor_bsd.xpm Exec "-" xterm -sl 500 -vb -fn 10x20 & + + *Wharf Helpme Info.xpm,3_dots.xpm Folders + *Wharf xman Bookshelf.xpm Exec "-" xman & diff -ruN afterstep-devel.orig/patches/patch-ap afterstep-devel/patches/patch-ap --- afterstep-devel.orig/patches/patch-ap Wed Dec 31 19:00:00 1969 +++ afterstep-devel/patches/patch-ap Mon Sep 27 12:12:42 1999 @@ -0,0 +1,11 @@ +--- afterstep/zharf.in.orig Tue Jul 27 11:38:01 1999 ++++ afterstep/zharf.in Mon Sep 27 12:11:45 1999 +@@ -26,7 +26,7 @@ + *Zharf Disk - Swallow "asfsm" asfsm_lite -bg Grey30 -fg Grey70 -bp None -pbg Grey30 -pfg Grey70 -pbp None + *Zharf Start Start.xpm Popup "0" + *Zharf Swap Install.xpm WindowList +-*Zharf Xiterm linux-penguin.xpm Exec "xiterm" xterm -fg wheat -bg black & ++*Zharf Xterm monitor_bsd.xpm Exec "xterm" xterm -fg wheat -bg black & + *Zharf Netscape netscape.xpm Exec "netscape" netscape & + *Zharf(3x1) - whatever SwallowModule "Pager" Pager 0 @with_desktops_1@ + *Zharf Quit? RedFire.xpm Module "QuitForm" Form QuitForm diff -ruN afterstep-devel.orig/pkg/PLIST afterstep-devel/pkg/PLIST --- afterstep-devel.orig/pkg/PLIST Wed Sep 8 19:31:40 1999 +++ afterstep-devel/pkg/PLIST Mon Sep 27 14:40:00 1999 @@ -2,6 +2,7 @@ bin/afterstepdoc bin/ascommand.pl bin/asetroot +bin/importasmenu bin/ASSound bin/Animate bin/Audio @@ -326,6 +327,7 @@ share/afterstep/desktop/icons/common/mini-folder.xpm share/afterstep/desktop/icons/common/mini-menu.xpm share/afterstep/desktop/icons/common/mini-recycler.xpm +share/afterstep/desktop/icons/common/monitor_bsd.xpm share/afterstep/desktop/icons/common/monitor-e0.xpm share/afterstep/desktop/icons/common/monitor-e1.xpm share/afterstep/desktop/icons/common/monitor-e10.xpm @@ -455,7 +457,6 @@ share/afterstep/non-configurable/3_look.24bpp share/afterstep/non-configurable/3_look.32bpp share/afterstep/non-configurable/3_look.8bpp -share/afterstep/non-configurable/startmenu share/afterstep/pager share/afterstep/scripts/Animate share/afterstep/scripts/BellSetup @@ -740,3 +741,4 @@ @dirrm share/afterstep/start @dirrm share/afterstep/doc @dirrm share/afterstep +@unexec rm -r -f %D/share/afterstep_old 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message